diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 38a1597848e..9502a9c404d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -18,6 +18,7 @@ apps/cli/src/auth @bitwarden/team-auth-dev
 apps/desktop/src/auth @bitwarden/team-auth-dev
 apps/web/src/app/auth @bitwarden/team-auth-dev
 libs/auth @bitwarden/team-auth-dev
+libs/user-core @bitwarden/team-auth-dev
 # web connectors used for auth
 apps/web/src/connectors @bitwarden/team-auth-dev
 bitwarden_license/bit-web/src/app/auth @bitwarden/team-auth-dev
@@ -39,6 +40,7 @@ libs/tools @bitwarden/team-tools-dev
 apps/web/src/app/dirt @bitwarden/team-data-insights-and-reporting-dev
 bitwarden_license/bit-common/src/dirt @bitwarden/team-data-insights-and-reporting-dev
 bitwarden_license/bit-web/src/app/dirt @bitwarden/team-data-insights-and-reporting-dev
+libs/dirt @bitwarden/team-data-insights-and-reporting-dev
 
 ## Localization/Crowdin (Platform and Tools team)
 apps/browser/src/_locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev
@@ -80,13 +82,18 @@ bitwarden_license/bit-web/src/app/billing @bitwarden/team-billing-dev
 apps/browser/src/platform @bitwarden/team-platform-dev
 apps/cli/src/platform @bitwarden/team-platform-dev
 apps/desktop/macos @bitwarden/team-platform-dev
+apps/desktop/scripts @bitwarden/team-platform-dev
 apps/desktop/src/platform @bitwarden/team-platform-dev
+apps/desktop/resources @bitwarden/team-platform-dev
 apps/web/src/app/platform @bitwarden/team-platform-dev
 libs/angular/src/platform @bitwarden/team-platform-dev
 libs/common/src/platform @bitwarden/team-platform-dev
 libs/common/spec @bitwarden/team-platform-dev
 libs/common/src/state-migrations @bitwarden/team-platform-dev
 libs/platform @bitwarden/team-platform-dev
+libs/storage-core @bitwarden/team-platform-dev
+libs/logging @bitwarden/team-platform-dev
+libs/storage-test-utils @bitwarden/team-platform-dev
 # Web utils used across app and connectors
 apps/web/src/utils/ @bitwarden/team-platform-dev
 # Web core and shared files
@@ -116,6 +123,9 @@ apps/web/src/translation-constants.ts @bitwarden/team-platform-dev
 .github/workflows/version-auto-bump.yml @bitwarden/team-platform-dev
 # ESLint custom rules
 libs/eslint @bitwarden/team-platform-dev
+# Typescript tooling
+tsconfig.base.json @bitwarden/team-platform-dev
+nx.json @bitwarden/team-platform-dev
 
 ## Autofill team files ##
 apps/browser/src/autofill @bitwarden/team-autofill-dev
@@ -136,6 +146,7 @@ libs/components @bitwarden/team-ui-foundation
 libs/ui @bitwarden/team-ui-foundation
 apps/browser/src/platform/popup/layout @bitwarden/team-ui-foundation
 apps/browser/src/popup/app-routing.animations.ts @bitwarden/team-ui-foundation
+apps/browser/src/popup/components/extension-anon-layout-wrapper @bitwarden/team-ui-foundation
 apps/web/src/app/layouts @bitwarden/team-ui-foundation
 
 
@@ -188,3 +199,4 @@ apps/web/src/locales/en/messages.json
 # To track that effort please see https://bitwarden.atlassian.net/browse/PM-21636
 **/tsconfig.json @bitwarden/team-platform-dev
 **/jest.config.js @bitwarden/team-platform-dev
+**/project.jsons @bitwarden/team-platform-dev
diff --git a/.github/ISSUE_TEMPLATE/browser.yml b/.github/ISSUE_TEMPLATE/browser.yml
index 23a0e4276bf..6f5c9dd0051 100644
--- a/.github/ISSUE_TEMPLATE/browser.yml
+++ b/.github/ISSUE_TEMPLATE/browser.yml
@@ -1,4 +1,4 @@
-name: Browser Bug Report
+name: Browser Extension Bug Report
 description: File a bug report
 labels: [bug, browser]
 body:
diff --git a/.github/ISSUE_TEMPLATE/desktop.yml b/.github/ISSUE_TEMPLATE/desktop.yml
index 6fd6f1d1c2b..129ba510664 100644
--- a/.github/ISSUE_TEMPLATE/desktop.yml
+++ b/.github/ISSUE_TEMPLATE/desktop.yml
@@ -73,6 +73,7 @@ body:
         - Homebrew
         - Chocolatey
         - Snap
+        - Flatpak
         - Other
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/web.yml b/.github/ISSUE_TEMPLATE/web.yml
index 80429112fbd..d7989e40af1 100644
--- a/.github/ISSUE_TEMPLATE/web.yml
+++ b/.github/ISSUE_TEMPLATE/web.yml
@@ -1,4 +1,4 @@
-name: Web Bug Report
+name: Web App Bug Report
 description: File a bug report
 labels: [bug, web]
 body:
@@ -77,6 +77,7 @@ body:
         - Opera
         - Brave
         - Vivaldi
+        - DuckDuckGo
     validations:
       required: true
   - type: input
diff --git a/.github/codecov.yml b/.github/codecov.yml
index d9d59f9de28..ba4c4b48163 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -44,6 +44,7 @@ component_management:
     - component_id: key-management-keys
       name: Key Management - Keys
       paths:
+        - apps/desktop/src/key-management/electron-key.service.ts
         - libs/key-management/src/kdf-config.service.ts
         - libs/key-management/src/key.service.ts
         - libs/common/src/key-management/master-password/**
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index f30bc06e4a2..09afb97174f 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -144,6 +144,10 @@
         "@electron/notarize",
         "@electron/rebuild",
         "@ngtools/webpack",
+        "@nx/devkit",
+        "@nx/eslint",
+        "@nx/jest",
+        "@nx/js",
         "@types/chrome",
         "@types/firefox-webext-browser",
         "@types/glob",
@@ -204,11 +208,13 @@
         "scopeguard",
         "security-framework",
         "security-framework-sys",
+        "semver",
         "serde",
         "serde_json",
         "simplelog",
         "style-loader",
         "sysinfo",
+        "ts-node",
         "ts-loader",
         "tsconfig-paths-webpack-plugin",
         "type-fest",
@@ -413,6 +419,12 @@
       allowedVersions: "1.0.0",
       description: "Higher versions of lowdb are not compatible with CommonJS",
     },
+    {
+      // Pin types as well since we are not upgrading past v1 (and also v2+ does not need separate types).
+      matchPackageNames: ["@types/lowdb"],
+      allowedVersions: "< 2.0.0",
+      description: "Higher versions of lowdb do not need separate types",
+    },
   ],
   ignoreDeps: ["@types/koa-bodyparser", "bootstrap", "node-ipc", "@bitwarden/sdk-internal"],
 }
diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt
index 653f6591c7f..db5097e5268 100644
--- a/.github/whitelist-capital-letters.txt
+++ b/.github/whitelist-capital-letters.txt
@@ -34,3 +34,4 @@
 ./apps/browser/src/safari/safari/Info.plist
 ./apps/browser/src/safari/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 ./SECURITY.md
+./libs/nx-plugin/src/generators/files/README.md__tmpl__
diff --git a/.github/workflows/auto-branch-updater.yml b/.github/workflows/auto-branch-updater.yml
index dc4a43fc34e..3f67388fd0c 100644
--- a/.github/workflows/auto-branch-updater.yml
+++ b/.github/workflows/auto-branch-updater.yml
@@ -22,6 +22,8 @@ jobs:
     env:
       _BOT_EMAIL: 106330231+bitwarden-devops-bot@users.noreply.github.com
       _BOT_NAME: bitwarden-devops-bot
+    permissions:
+      contents: write
     steps:
       - name: Setup
         id: setup
diff --git a/.github/workflows/auto-reply-discussions.yml b/.github/workflows/auto-reply-discussions.yml
index 8becc7471c5..83970ab3619 100644
--- a/.github/workflows/auto-reply-discussions.yml
+++ b/.github/workflows/auto-reply-discussions.yml
@@ -8,6 +8,9 @@ jobs:
   reply:
     name: Auto-reply
     runs-on: ubuntu-22.04
+    permissions:
+      discussions: write
+      contents: read
 
     steps:
       - name: Get discussion label and template name
diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml
index f7b8eeabefe..c75298a3e92 100644
--- a/.github/workflows/build-browser.yml
+++ b/.github/workflows/build-browser.yml
@@ -41,6 +41,8 @@ defaults:
   run:
     shell: bash
 
+permissions: {}
+
 jobs:
   setup:
     name: Setup
@@ -266,6 +268,29 @@ jobs:
         working-directory: browser-source/
         run: npm link ../sdk-internal
 
+      - name: Check source file size
+        if: ${{ startsWith(matrix.name, 'firefox') }}
+        run: |
+          # Declare variable as indexed array
+          declare -a FILES
+
+          # Search for source files that are greater than 4M
+          TARGET_DIR='./browser-source/apps/browser'
+          while IFS=' ' read -r RESULT; do
+              FILES+=("$RESULT")
+          done < <(find $TARGET_DIR -size +4M)
+
+          # Validate results and provide messaging
+          if [[ ${#FILES[@]} -ne 0 ]]; then
+              echo "File(s) exceeds size limit: 4MB"
+              for FILE in ${FILES[@]}; do
+                  echo "- $(du --si $FILE)"
+              done
+              echo "ERROR Firefox rejects extension uploads that contain files larger than 4MB"
+              # Invoke failure
+              exit 1
+          fi
+
       - name: Build extension
         run: npm run ${{ matrix.npm_command }}
         working-directory: browser-source/apps/browser
@@ -441,7 +466,7 @@ jobs:
           secrets: "crowdin-api-token"
 
       - name: Upload Sources
-        uses: crowdin/github-action@30849777a3cba6ee9a09e24e195272b8287a0a5b # v1.20.4
+        uses: crowdin/github-action@f214c8723025f41fc55b2ad26e67b60b80b1885d # v2.7.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml
index e89ca59a297..ac314a4c33a 100644
--- a/.github/workflows/build-cli.yml
+++ b/.github/workflows/build-cli.yml
@@ -46,10 +46,13 @@ defaults:
   run:
     working-directory: apps/cli
 
+permissions:
+  contents: read
+
 jobs:
   setup:
     name: Setup
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       package_version: ${{ steps.retrieve-package-version.outputs.package_version }}
       node_version: ${{ steps.retrieve-node-version.outputs.node_version }}
@@ -58,7 +61,7 @@ jobs:
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{  github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Get Package Version
         id: retrieve-package-version
@@ -68,7 +71,6 @@ jobs:
 
       - name: Get Node Version
         id: retrieve-node-version
-        working-directory: ./
         run: |
           NODE_NVMRC=$(cat .nvmrc)
           NODE_VERSION=${NODE_NVMRC/v/''}
@@ -82,25 +84,25 @@ jobs:
           has_secrets=${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL != '' }}
           echo "has_secrets=$has_secrets" >> $GITHUB_OUTPUT
 
+
   cli:
     name: CLI ${{ matrix.os.base }}${{ matrix.os.target_suffix }} - ${{ matrix.license_type.readable }}
     strategy:
       matrix:
         os:
-         [
-          { base: "linux", distro: "ubuntu-22.04", target_suffix: "" },
-          { base: "linux", distro: "ubuntu-22.04-arm", target_suffix: "-arm64" },
-          { base: "mac", distro: "macos-13", target_suffix: "" },
-          { base: "mac", distro: "macos-14", target_suffix: "-arm64" }
-         ]
+          [
+            { base: "linux", distro: "ubuntu-22.04", target_suffix: "" },
+            { base: "linux", distro: "ubuntu-22.04-arm", target_suffix: "-arm64" },
+            { base: "mac", distro: "macos-13", target_suffix: "" },
+            { base: "mac", distro: "macos-14", target_suffix: "-arm64" }
+          ]
         license_type:
           [
             { build_prefix: "oss", artifact_prefix: "-oss", readable: "open source license" },
             { build_prefix: "bit", artifact_prefix: "", readable: "commercial license" }
           ]
     runs-on: ${{ matrix.os.distro }}
-    needs:
-      - setup
+    needs: setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
@@ -110,7 +112,7 @@ jobs:
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{  github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Setup Unix Vars
         run: |
@@ -152,11 +154,69 @@ jobs:
       - name: Build & Package Unix
         run: npm run dist:${{ matrix.license_type.build_prefix }}:${{ env.SHORT_RUNNER_OS }}${{ matrix.os.target_suffix }} --quiet
 
+      - name: Login to Azure
+        if: ${{ matrix.os.base == 'mac' && needs.setup.outputs.has_secrets == 'true' }}
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
+        with:
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+
+      - name: Get certificates
+        if: ${{ matrix.os.base == 'mac' && needs.setup.outputs.has_secrets == 'true' }}
+        run: |
+          mkdir -p $HOME/certificates
+
+          az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/devid-app-cert |
+            jq -r .value | base64 -d > $HOME/certificates/devid-app-cert.p12
+
+      - name: Set up keychain
+        if: ${{ matrix.os.base == 'mac' && needs.setup.outputs.has_secrets == 'true' }}
+        env:
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          security create-keychain -p $KEYCHAIN_PASSWORD build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain
+          security set-keychain-settings -lut 1200 build.keychain
+
+          security import "$HOME/certificates/devid-app-cert.p12" -k build.keychain -P "" \
+            -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild
+
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain
+
+      - name: Sign binary
+        if: ${{ matrix.os.base == 'mac' && needs.setup.outputs.has_secrets == 'true' }}
+        env:
+          MACOS_CERTIFICATE_NAME: "Developer ID Application: 8bit Solutions LLC"
+        run: codesign --sign "$MACOS_CERTIFICATE_NAME" --verbose=3 --force --options=runtime --entitlements ./entitlements.plist --timestamp ./dist/${{ matrix.license_type.build_prefix }}/${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}/bw
+
       - name: Zip Unix
         run: |
           cd ./dist/${{ matrix.license_type.build_prefix }}/${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}
           zip ../../bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-${{ env._PACKAGE_VERSION }}.zip ./bw
 
+      - name: Set up private auth key
+        if: ${{ matrix.os.base == 'mac' && needs.setup.outputs.has_secrets == 'true' }}
+        run: |
+          mkdir ~/private_keys
+          cat << EOF > ~/private_keys/AuthKey_6TV9MKN3GP.p8
+          ${{ secrets.APP_STORE_CONNECT_AUTH_KEY }}
+          EOF
+
+      - name: Notarize app
+        if: ${{ matrix.os.base == 'mac' && needs.setup.outputs.has_secrets == 'true' }}
+        env:
+          APP_STORE_CONNECT_TEAM_ISSUER: ${{ secrets.APP_STORE_CONNECT_TEAM_ISSUER }}
+          APP_STORE_CONNECT_AUTH_KEY: 6TV9MKN3GP
+          APP_STORE_CONNECT_AUTH_KEY_PATH: ~/private_keys/AuthKey_6TV9MKN3GP.p8
+        run: |
+          echo "Create keychain profile"
+          xcrun notarytool store-credentials "notarytool-profile" --key-id "$APP_STORE_CONNECT_AUTH_KEY" --key "$APP_STORE_CONNECT_AUTH_KEY_PATH" --issuer "$APP_STORE_CONNECT_TEAM_ISSUER"
+
+          codesign --sign "Developer ID Application: 8bit Solutions LLC" --verbose=3 --force --options=runtime --timestamp ./dist/bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-${{ env._PACKAGE_VERSION }}.zip
+
+          echo "Notarize app"
+          xcrun notarytool submit ./dist/bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-${{ env._PACKAGE_VERSION }}.zip --keychain-profile "notarytool-profile" --wait
+
       - name: Version Test
         run: |
           unzip "./dist/bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-${{ env._PACKAGE_VERSION }}.zip" -d "./test"
@@ -168,13 +228,6 @@ jobs:
             exit 1
           fi
 
-      - name: Create checksums Unix
-        run: |
-          cd ./dist
-          shasum -a 256 bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-${{ env._PACKAGE_VERSION }}.zip \
-            | awk '{split($0, a); print a[1]}' > bw${{
-          matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-sha256-${{ env._PACKAGE_VERSION }}.txt
-
       - name: Upload unix zip asset
         uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
@@ -182,12 +235,21 @@ jobs:
           path: apps/cli/dist/bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-${{ env._PACKAGE_VERSION }}.zip
           if-no-files-found: error
 
-      - name: Upload unix checksum asset
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-        with:
-          name: bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-sha256-${{ env._PACKAGE_VERSION }}.txt
-          path: apps/cli/dist/bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}${{ matrix.os.target_suffix }}-sha256-${{ env._PACKAGE_VERSION }}.txt
-          if-no-files-found: error
+      # We want to confirm the CLI is runnable using the dependencies defined in `apps/cli/package.json`.
+      - name: Remove node_modules (root)
+        run: rm -rf node_modules
+        working-directory: ./
+
+      - name: Remove package.json (root)
+        run: rm package.json
+        working-directory: ./
+
+      - name: Install (CLI)
+        run: npm i
+
+      - name: Output help
+        run: node ./build/bw.js --help
+
 
   cli-windows:
     name: Windows - ${{ matrix.license_type.readable }}
@@ -199,8 +261,7 @@ jobs:
             { build_prefix: "bit", artifact_prefix: "", readable: "commercial license" }
           ]
     runs-on: windows-2022
-    needs:
-      - setup
+    needs: setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
@@ -364,11 +425,6 @@ jobs:
             Throw "Version test failed."
           }
 
-      - name: Create checksums Windows
-        run: |
-          checksum -f="./dist/bw${{ matrix.license_type.artifact_prefix }}-windows-${env:_PACKAGE_VERSION}.zip" `
-            -t sha256 | Out-File -Encoding ASCII ./dist/bw${{ matrix.license_type.artifact_prefix }}-windows-sha256-${env:_PACKAGE_VERSION}.txt
-
       - name: Upload windows zip asset
         uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
@@ -376,13 +432,6 @@ jobs:
           path: apps/cli/dist/bw${{ matrix.license_type.artifact_prefix }}-windows-${{ env._PACKAGE_VERSION }}.zip
           if-no-files-found: error
 
-      - name: Upload windows checksum asset
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-        with:
-          name: bw${{ matrix.license_type.artifact_prefix }}-windows-sha256-${{ env._PACKAGE_VERSION }}.txt
-          path: apps/cli/dist/bw${{ matrix.license_type.artifact_prefix }}-windows-sha256-${{ env._PACKAGE_VERSION }}.txt
-          if-no-files-found: error
-
       - name: Upload Chocolatey asset
         if: matrix.license_type.build_prefix == 'bit'
         uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
@@ -442,13 +491,6 @@ jobs:
         with:
           path: apps/cli/dist/snap
 
-      - name: Create checksum
-        run: |
-          cd dist/snap
-          ls -alth
-          sha256sum bw_${{ env._PACKAGE_VERSION }}_amd64.snap \
-            | awk '{split($0, a); print a[1]}' > bw-snap-sha256-${{ env._PACKAGE_VERSION }}.txt
-
       - name: Install Snap
         run: sudo snap install dist/snap/bw*.snap --dangerous
 
@@ -473,18 +515,11 @@ jobs:
           path: apps/cli/dist/snap/bw_${{ env._PACKAGE_VERSION }}_amd64.snap
           if-no-files-found: error
 
-      - name: Upload snap checksum asset
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-        with:
-          name: bw-snap-sha256-${{ env._PACKAGE_VERSION }}.txt
-          path: apps/cli/dist/snap/bw-snap-sha256-${{ env._PACKAGE_VERSION }}.txt
-          if-no-files-found: error
-
 
   check-failures:
     name: Check for failures
     if: always()
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - setup
       - cli
diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index fab0df693cb..a022fe7fd0f 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -46,6 +46,9 @@ defaults:
   run:
     shell: bash
 
+permissions:
+  contents: read
+
 jobs:
   electron-verify:
     name: Verify Electron Version
@@ -425,7 +428,7 @@ jobs:
       - name: Install AST
         run: dotnet tool install --global AzureSignTool --version 4.0.1
 
-      - name: Set up environmentF
+      - name: Set up environment
         run: choco install checksum --no-progress
 
       - name: Print environment
@@ -499,7 +502,7 @@ jobs:
         run: |
           npm run pack:win
 
-      - name: Pack & Sign (dev)
+      - name: Pack & Sign
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
         env:
           ELECTRON_BUILDER_SIGN: 1
@@ -1413,7 +1416,7 @@ jobs:
           secrets: "crowdin-api-token"
 
       - name: Upload Sources
-        uses: crowdin/github-action@30849777a3cba6ee9a09e24e195272b8287a0a5b # v1.20.4
+        uses: crowdin/github-action@f214c8723025f41fc55b2ad26e67b60b80b1885d # v2.7.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
index 275b867390e..745376b46d8 100644
--- a/.github/workflows/build-web.yml
+++ b/.github/workflows/build-web.yml
@@ -51,6 +51,8 @@ env:
   _AZ_REGISTRY: bitwardenprod.azurecr.io
   _GITHUB_PR_REPO_NAME: ${{ github.event.pull_request.head.repo.full_name }}
 
+permissions: {}
+
 jobs:
   setup:
     name: Setup
@@ -309,7 +311,7 @@ jobs:
       - name: Scan Docker image
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
         id: container-scan
-        uses: anchore/scan-action@869c549e657a088dc0441b08ce4fc0ecdac2bb65 # v5.3.0
+        uses: anchore/scan-action@2c901ab7378897c01b8efaa2d0c9bf519cc64b9e # v6.2.0
         with:
           image: ${{ steps.image-name.outputs.name }}
           fail-build: false
@@ -351,7 +353,7 @@ jobs:
           secrets: "crowdin-api-token"
 
       - name: Upload Sources
-        uses: crowdin/github-action@30849777a3cba6ee9a09e24e195272b8287a0a5b # v1.20.4
+        uses: crowdin/github-action@f214c8723025f41fc55b2ad26e67b60b80b1885d # v2.7.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
index 47f3b310504..78733bc5a8b 100644
--- a/.github/workflows/chromatic.yml
+++ b/.github/workflows/chromatic.yml
@@ -7,7 +7,9 @@ on:
       - "rc"
       - "hotfix-rc"
   pull_request_target:
-    types: [opened, synchronize]
+    types: [opened, synchronize, reopened]
+    branches:
+      - "main"
 
 jobs:
   check-run:
diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml
index 40ddfe7739f..12a771fd3c0 100644
--- a/.github/workflows/enforce-labels.yml
+++ b/.github/workflows/enforce-labels.yml
@@ -4,6 +4,9 @@ on:
   workflow_call:
   pull_request:
     types: [labeled, unlabeled, opened, edited, synchronize]
+permissions:
+  contents: read
+  pull-requests: read
 jobs:
   enforce-label:
     name: EnforceLabel
diff --git a/.github/workflows/lint-crowdin-config.yml b/.github/workflows/lint-crowdin-config.yml
new file mode 100644
index 00000000000..adb5950e3a0
--- /dev/null
+++ b/.github/workflows/lint-crowdin-config.yml
@@ -0,0 +1,45 @@
+name: Lint Crowdin Config
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    paths:
+      - '**/crowdin.yml'
+permissions: {}
+
+jobs:
+  lint-crowdin-config:
+    name: Lint Crowdin Config ${{ matrix.app.name }}
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        app: [
+          { name: 'web', project_id: '308189', config_path: 'apps/web/crowdin.yml' },
+          { name: 'desktop', project_id: '299360', config_path: 'apps/desktop/crowdin.yml' },
+          { name: 'browser', project_id: '268134', config_path: 'apps/browser/crowdin.yml' }
+        ]
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 1  
+      - name: Login to Azure
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
+        with:
+          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+      - name: Retrieve secrets
+        id: retrieve-secrets
+        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        with:
+          keyvault: "bitwarden-ci"
+          secrets: "crowdin-api-token"
+      - name: Lint ${{ matrix.app.name }} config
+        uses: crowdin/github-action@f214c8723025f41fc55b2ad26e67b60b80b1885d # v2.7.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ matrix.app.project_id }}
+          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
+        with:
+          dryrun_action: true
+          command: 'config lint'
+          command_args: '--verbose -c ${{ matrix.app.config_path }}'
\ No newline at end of file
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 4fbef027c7c..4246d623f04 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -22,6 +22,9 @@ defaults:
   run:
     shell: bash
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     name: Lint
diff --git a/.github/workflows/locales-lint.yml b/.github/workflows/locales-lint.yml
index 8c9447ea50f..0c8148d4c28 100644
--- a/.github/workflows/locales-lint.yml
+++ b/.github/workflows/locales-lint.yml
@@ -8,6 +8,9 @@ on:
     paths:
       - '**/messages.json'
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     name: Lint
diff --git a/.github/workflows/release-browser.yml b/.github/workflows/release-browser.yml
index 498f8748959..ac79287f84d 100644
--- a/.github/workflows/release-browser.yml
+++ b/.github/workflows/release-browser.yml
@@ -22,6 +22,8 @@ jobs:
   setup:
     name: Setup
     runs-on: ubuntu-22.04
+    permissions:
+      contents: read
     outputs:
       release_version: ${{ steps.version.outputs.version }}
     steps:
@@ -53,6 +55,8 @@ jobs:
     name: Locales Test
     runs-on: ubuntu-22.04
     needs: setup
+    permissions:
+      contents: read
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -89,6 +93,8 @@ jobs:
     needs:
       - setup
       - locales-test
+    permissions:
+      contents: write
     steps:
       - name: Download latest Release build artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
index 519fee1989b..2d7be2e186e 100644
--- a/.github/workflows/release-cli.yml
+++ b/.github/workflows/release-cli.yml
@@ -18,6 +18,9 @@ defaults:
   run:
     working-directory: apps/cli
 
+permissions:
+  contents: read
+
 jobs:
   setup:
     name: Setup
@@ -52,6 +55,8 @@ jobs:
     name: Release
     runs-on: ubuntu-22.04
     needs: setup
+    permissions:
+      contents: write
     steps:
       - name: Download all Release artifacts
         if: ${{ inputs.release_type != 'Dry Run' }}
@@ -78,24 +83,15 @@ jobs:
           PKG_VERSION: ${{ needs.setup.outputs.release_version }}
         with:
           artifacts: "apps/cli/bw-oss-windows-${{ env.PKG_VERSION }}.zip,
-                      apps/cli/bw-oss-windows-sha256-${{ env.PKG_VERSION }}.txt,
                       apps/cli/bw-windows-${{ env.PKG_VERSION }}.zip,
-                      apps/cli/bw-windows-sha256-${{ env.PKG_VERSION }}.txt,
                       apps/cli/bw-oss-macos-${{ env.PKG_VERSION }}.zip,
-                      apps/cli/bw-oss-macos-sha256-${{ env.PKG_VERSION }}.txt,
                       apps/cli/bw-oss-macos-arm64-${{ env.PKG_VERSION }}.zip,
-                      apps/cli/bw-oss-macos-arm64-sha256-${{ env.PKG_VERSION }}.txt,
                       apps/cli/bw-macos-${{ env.PKG_VERSION }}.zip,
-                      apps/cli/bw-macos-sha256-${{ env.PKG_VERSION }}.txt,
                       apps/cli/bw-macos-arm64-${{ env.PKG_VERSION }}.zip,
-                      apps/cli/bw-macos-arm64-sha256-${{ env.PKG_VERSION }}.txt,
                       apps/cli/bw-oss-linux-${{ env.PKG_VERSION }}.zip,
-                      apps/cli/bw-oss-linux-sha256-${{ env.PKG_VERSION }}.txt,
                       apps/cli/bw-linux-${{ env.PKG_VERSION }}.zip,
-                      apps/cli/bw-linux-sha256-${{ env.PKG_VERSION }}.txt,
                       apps/cli/bitwarden-cli.${{ env.PKG_VERSION }}.nupkg,
                       apps/cli/bw_${{ env.PKG_VERSION }}_amd64.snap,
-                      apps/cli/bw-snap-sha256-${{ env.PKG_VERSION }}.txt,
                       apps/cli/bitwarden-cli-${{ env.PKG_VERSION }}-npm-build.zip"
           commit: ${{ github.sha }}
           tag: cli-v${{ env.PKG_VERSION }}
diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
index 57143747a86..5ce0da4cb4b 100644
--- a/.github/workflows/release-desktop.yml
+++ b/.github/workflows/release-desktop.yml
@@ -17,10 +17,15 @@ defaults:
   run:
     shell: bash
 
+permissions:
+  contents: read
+
 jobs:
   setup:
     name: Setup
     runs-on: ubuntu-22.04
+    permissions:
+      contents: write
     outputs:
       release_version: ${{ steps.version.outputs.version }}
       release_channel: ${{ steps.release_channel.outputs.channel }}
@@ -89,12 +94,6 @@ jobs:
         working-directory: apps/desktop/artifacts
         run: mv Bitwarden-${{ env.PKG_VERSION }}-universal.pkg Bitwarden-${{ env.PKG_VERSION }}-universal.pkg.archive
 
-      - name: Get checksum files
-        uses: bitwarden/gh-actions/get-checksum@main
-        with:
-          packages_dir: "apps/desktop/artifacts"
-          file_path: "apps/desktop/artifacts/sha256-checksums.txt"
-
       - name: Create Release
         uses: ncipollo/release-action@cdcc88a9acf3ca41c16c37bb7d21b9ad48560d87 # v1.15.0
         if: ${{ steps.release_channel.outputs.channel == 'latest' && github.event.inputs.release_type != 'Dry Run' }}
@@ -125,8 +124,7 @@ jobs:
             apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-universal.pkg.archive,
             apps/desktop/artifacts/${{ env.RELEASE_CHANNEL }}.yml,
             apps/desktop/artifacts/${{ env.RELEASE_CHANNEL }}-linux.yml,
-            apps/desktop/artifacts/${{ env.RELEASE_CHANNEL }}-mac.yml,
-            apps/desktop/artifacts/sha256-checksums.txt"
+            apps/desktop/artifacts/${{ env.RELEASE_CHANNEL }}-mac.yml"
           commit: ${{ github.sha }}
           tag: desktop-v${{ env.PKG_VERSION }}
           name: Desktop v${{ env.PKG_VERSION }}
diff --git a/.github/workflows/release-web.yml b/.github/workflows/release-web.yml
index 0301b814796..5a3c29d29fc 100644
--- a/.github/workflows/release-web.yml
+++ b/.github/workflows/release-web.yml
@@ -18,6 +18,8 @@ jobs:
   setup:
     name: Setup
     runs-on: ubuntu-22.04
+    permissions:
+      contents: read
     outputs:
       release_version: ${{ steps.version.outputs.version }}
       tag_version: ${{ steps.version.outputs.tag }}
@@ -50,6 +52,8 @@ jobs:
     runs-on: ubuntu-22.04
     needs:
       - setup
+    permissions:
+      contents: write
     steps:
       - name: Download latest build artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
diff --git a/.github/workflows/repository-management.yml b/.github/workflows/repository-management.yml
index 8ab74adf543..d91e0a12afd 100644
--- a/.github/workflows/repository-management.yml
+++ b/.github/workflows/repository-management.yml
@@ -36,8 +36,7 @@ on:
         description: "New version override (leave blank for automatic calculation, example: '2024.1.0')"
         required: false
         type: string
-
-
+permissions: {}
 jobs:
   setup:
     name: Setup
@@ -57,51 +56,11 @@ jobs:
           fi
 
           echo "branch=$BRANCH" >> $GITHUB_OUTPUT
-
-
-  cut_branch:
-    name: Cut branch
-    if: ${{ needs.setup.outputs.branch == 'rc' }}
-    needs: setup
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Generate GH App token
-        uses: actions/create-github-app-token@30bf6253fa41bdc8d1501d202ad15287582246b4 # v2.0.3
-        id: app-token
-        with:
-          app-id: ${{ secrets.BW_GHAPP_ID }}
-          private-key: ${{ secrets.BW_GHAPP_KEY }}
-
-      - name: Check out target ref
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          ref: ${{ inputs.target_ref }}
-          token: ${{ steps.app-token.outputs.token }}
-
-      - name: Check if ${{ needs.setup.outputs.branch }} branch exists
-        env:
-          BRANCH_NAME: ${{ needs.setup.outputs.branch }}
-        run: |
-          if [[ $(git ls-remote --heads origin $BRANCH_NAME) ]]; then
-            echo "$BRANCH_NAME already exists! Please delete $BRANCH_NAME before running again." >> $GITHUB_STEP_SUMMARY
-            exit 1
-          fi
-
-      - name: Cut branch
-        env:
-          BRANCH_NAME: ${{ needs.setup.outputs.branch }}
-        run: |
-          git switch --quiet --create $BRANCH_NAME
-          git push --quiet --set-upstream origin $BRANCH_NAME
-
-
   bump_version:
     name: Bump Version
     if: ${{ always() }}
     runs-on: ubuntu-24.04
-    needs:
-      - cut_branch
-      - setup
+    needs: setup
     outputs:
       version_browser: ${{ steps.set-final-version-output.outputs.version_browser }}
       version_cli: ${{ steps.set-final-version-output.outputs.version_cli }}
@@ -441,15 +400,13 @@ jobs:
       - name: Push changes
         if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
         run: git push
-
-
-  cherry_pick:
-    name: Cherry-Pick Commit(s)
+  cut_branch:
+    name: Cut branch
     if: ${{ needs.setup.outputs.branch == 'rc' }}
-    runs-on: ubuntu-24.04
     needs:
-      - bump_version
       - setup
+      - bump_version
+    runs-on: ubuntu-24.04
     steps:
       - name: Generate GH App token
         uses: actions/create-github-app-token@30bf6253fa41bdc8d1501d202ad15287582246b4 # v2.0.3
@@ -458,43 +415,24 @@ jobs:
           app-id: ${{ secrets.BW_GHAPP_ID }}
           private-key: ${{ secrets.BW_GHAPP_KEY }}
 
-      - name: Check out main branch
+      - name: Check out target ref
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          fetch-depth: 0
-          ref: main
+          ref: ${{ inputs.target_ref }}
           token: ${{ steps.app-token.outputs.token }}
 
-      - name: Configure Git
+      - name: Check if ${{ needs.setup.outputs.branch }} branch exists
+        env:
+          BRANCH_NAME: ${{ needs.setup.outputs.branch }}
         run: |
-          git config --local user.email "actions@github.com"
-          git config --local user.name "Github Actions"
+          if [[ $(git ls-remote --heads origin $BRANCH_NAME) ]]; then
+            echo "$BRANCH_NAME already exists! Please delete $BRANCH_NAME before running again." >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
 
-      - name: Perform cherry-pick(s)
+      - name: Cut branch
+        env:
+          BRANCH_NAME: ${{ needs.setup.outputs.branch }}
         run: |
-          # Function for cherry-picking
-          cherry_pick () {
-            local package_path="apps/$1/package.json"
-            local source_branch=$2
-            local destination_branch=$3
-
-            # Get project commit/version from source branch
-            git switch $source_branch
-            SOURCE_COMMIT=$(git log --reverse --pretty=format:"%H" --max-count=1 $package_path)
-            SOURCE_VERSION=$(cat $package_path | jq -r '.version')
-
-            # Get project commit/version from destination branch
-            git switch $destination_branch
-            DESTINATION_VERSION=$(cat $package_path | jq -r '.version')
-
-            if [[ "$DESTINATION_VERSION" != "$SOURCE_VERSION" ]]; then
-              git cherry-pick --strategy-option=theirs -x $SOURCE_COMMIT
-              git push -u origin $destination_branch
-            fi
-          }
-
-          # Cherry-pick from 'main' into 'rc'
-          cherry_pick browser main rc
-          cherry_pick cli main rc
-          cherry_pick desktop main rc
-          cherry_pick web main rc
+          git switch --quiet --create $BRANCH_NAME
+          git push --quiet --set-upstream origin $BRANCH_NAME
\ No newline at end of file
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
index 585115ef6dd..59ef1e0734e 100644
--- a/.github/workflows/scan.yml
+++ b/.github/workflows/scan.yml
@@ -74,7 +74,7 @@ jobs:
           ref: ${{  github.event.pull_request.head.sha }}
 
       - name: Scan with SonarCloud
-        uses: sonarsource/sonarqube-scan-action@bfd4e558cda28cda6b5defafb9232d191be8c203 # v4.2.1
+        uses: sonarsource/sonarqube-scan-action@2500896589ef8f7247069a56136f8dc177c27ccf # v5.2.0
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         with:
diff --git a/.github/workflows/stale-bot.yml b/.github/workflows/stale-bot.yml
index abb292f53f3..13acde2b0fc 100644
--- a/.github/workflows/stale-bot.yml
+++ b/.github/workflows/stale-bot.yml
@@ -8,6 +8,11 @@ jobs:
   stale:
     name: 'Check for stale issues and PRs'
     runs-on: ubuntu-22.04
+    permissions:
+      actions: write
+      contents: read
+      issues: write
+      pull-requests: write
     steps:
       - name: 'Run stale action'
         uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 64cc86f1db6..a8bfd368884 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,6 +10,8 @@ on:
   pull_request:
     types: [ opened, synchronize ]
 
+permissions: {}
+
 jobs:
 
   testing:
@@ -134,7 +136,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Install rust
-        uses: dtolnay/rust-toolchain@c5a29ddb4d9d194e7c84ec8c3fba61b1c31fee8c # stable
+        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
         with:
           toolchain: stable
           components: llvm-tools
diff --git a/.gitignore b/.gitignore
index e865fa6a8fb..0fa968aa47c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,9 @@ build
 # Testing
 coverage
 junit.xml
+## The "base" root level folder is expected for some local tests that do
+## comparisons between the current branch and a base branch (usually main)
+base/
 
 # Misc
 *.crx
diff --git a/.nvmrc b/.nvmrc
index 9a2a0e219c9..53d1c14db37 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v20
+v22
diff --git a/.storybook/format-args-for-code-snippet.ts b/.storybook/format-args-for-code-snippet.ts
new file mode 100644
index 00000000000..bf36c153c0a
--- /dev/null
+++ b/.storybook/format-args-for-code-snippet.ts
@@ -0,0 +1,33 @@
+import { argsToTemplate, StoryObj } from "@storybook/angular";
+
+type RenderArgType<T> = StoryObj<T>["args"];
+
+export const formatArgsForCodeSnippet = <ComponentType extends Record<string, any>>(
+  args: RenderArgType<ComponentType>,
+) => {
+  const nonNullArgs = Object.entries(args as ComponentType).filter(
+    ([_, value]) => value !== null && value !== undefined,
+  );
+  const functionArgs = nonNullArgs.filter(([_, value]) => typeof value === "function");
+  const argsToFormat = nonNullArgs.filter(([_, value]) => typeof value !== "function");
+
+  const argsToTemplateIncludeKeys = [...functionArgs].map(
+    ([key, _]) => key as keyof RenderArgType<ComponentType>,
+  );
+
+  const formattedNonFunctionArgs = argsToFormat
+    .map(([key, value]) => {
+      if (typeof value === "boolean") {
+        return `[${key}]="${value}"`;
+      }
+
+      if (Array.isArray(value)) {
+        const formattedArray = value.map((v) => `'${v}'`).join(", ");
+        return `[${key}]="[${formattedArray}]"`;
+      }
+      return `${key}="${value}"`;
+    })
+    .join(" ");
+
+  return `${formattedNonFunctionArgs} ${argsToTemplate(args as ComponentType, { include: argsToTemplateIncludeKeys })}`;
+};
diff --git a/.storybook/main.ts b/.storybook/main.ts
index d5d116e99be..879e87fe376 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -8,6 +8,8 @@ const config: StorybookConfig = {
   stories: [
     "../libs/auth/src/**/*.mdx",
     "../libs/auth/src/**/*.stories.@(js|jsx|ts|tsx)",
+    "../libs/dirt/card/src/**/*.mdx",
+    "../libs/dirt/card/src/**/*.stories.@(js|jsx|ts|tsx)",
     "../libs/tools/send/send-ui/src/**/*.mdx",
     "../libs/tools/send/send-ui/src/**/*.stories.@(js|jsx|ts|tsx)",
     "../libs/vault/src/**/*.mdx",
@@ -20,8 +22,6 @@ const config: StorybookConfig = {
     "../apps/browser/src/**/*.stories.@(js|jsx|ts|tsx)",
     "../bitwarden_license/bit-web/src/**/*.mdx",
     "../bitwarden_license/bit-web/src/**/*.stories.@(js|jsx|ts|tsx)",
-    "../libs/tools/card/src/**/*.mdx",
-    "../libs/tools/card/src/**/*.stories.@(js|jsx|ts|tsx)",
     "../libs/angular/src/**/*.stories.@(js|jsx|ts|tsx)",
   ],
   addons: [
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
index a948fce0428..59b5287f3a3 100644
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -41,7 +41,12 @@ const preview: Preview = {
         order: ["Documentation", ["Introduction", "Colors", "Icons"], "Component Library"],
       },
     },
-    docs: { source: { type: "dynamic", excludeDecorators: true } },
+    docs: {
+      source: {
+        type: "dynamic",
+        excludeDecorators: true,
+      },
+    },
     backgrounds: {
       disable: true,
     },
diff --git a/apps/browser/jest.config.js b/apps/browser/jest.config.js
index 73f5ada287a..14cd959810e 100644
--- a/apps/browser/jest.config.js
+++ b/apps/browser/jest.config.js
@@ -1,18 +1,17 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
 /** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
-    { "@bitwarden/common/spec": ["../../libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
 };
diff --git a/apps/browser/package.json b/apps/browser/package.json
index c44743add7c..70dd0d7a241 100644
--- a/apps/browser/package.json
+++ b/apps/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/browser",
-  "version": "2025.5.1",
+  "version": "2025.7.0",
   "scripts": {
     "build": "npm run build:chrome",
     "build:chrome": "cross-env BROWSER=chrome MANIFEST_VERSION=3 NODE_OPTIONS=\"--max-old-space-size=8192\" webpack",
diff --git a/apps/browser/src/_locales/ar/messages.json b/apps/browser/src/_locales/ar/messages.json
index 48ae14fc1ce..02734de942b 100644
--- a/apps/browser/src/_locales/ar/messages.json
+++ b/apps/browser/src/_locales/ar/messages.json
@@ -1173,6 +1173,12 @@
     "message": "أوه لا! لم نتمكن من حفظ هذا. حاول إدخال التفاصيل يدويا.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "اسأل عن تحديث تسجيل الدخول الحالي"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "الميزة غير متوفرة"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "مطلوب نقل مفتاح التشفير. الرجاء تسجيل الدخول بواسطة مخزن الويب لتحديث مفتاح التشفير الخاص بك."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "العضوية المميزة"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "مفتاح SSH"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "جديد $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "تعيين رمز PIN الخاص بك لإلغاء قفل Bitwarden. سيتم إعادة تعيين إعدادات PIN الخاصة بك إذا قمت بتسجيل الخروج بالكامل من التطبيق."
   },
-  "setYourPinCode1": {
-    "message": "سيتم استخدام رَقَم التعريف الشخصي الخاص بك لفتح Bitwarden بدلاً من كلمة المرور الرئيسية. سيتم حذف رَقَم التعريف الشخصي الخاص بك إذا قمت بتسجيل الخروج بالكامل من Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "رمز PIN مطلوب."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "استخدم كلمة المرور هذه"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "استخدم اسم المستخدم هذا"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "لقد حالت سياسة المؤسسة دون استيراد العناصر إلى خزانتك الشخصية."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "النطاقات",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "تغيير"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "تغيير كلمة المرور - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "كل الإرسالات",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "إخفاء النص بشكل افتراضي"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "يجب عليك تأكيد بريدك الإلكتروني لاستخدام هذه الميزة. يمكنك تأكيد بريدك الإلكتروني في خزانة الويب."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "تحديث كلمة المرور الرئيسية"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "كلمة المرور الرئيسية مكشوفة"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "طلب موافقة المدير"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/az/messages.json b/apps/browser/src/_locales/az/messages.json
index c9096bce0d6..64fa77c8683 100644
--- a/apps/browser/src/_locales/az/messages.json
+++ b/apps/browser/src/_locales/az/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Bunu saxlaya bilmədik. Məlumatları manual daxil etməyə çalışın.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "Parolunuzu dəyişdirdikdən sonra yeni parolunuzla giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saat ərzində çıxış sonlandırılacaq."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Hesabın geri qaytarılması prosesini tamamlamaq üçün ana parolunuzu dəyişdirin."
+  },
   "enableChangedPasswordNotification": {
     "message": "Mövcud girişin güncəllənməsini soruş"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Özəllik əlçatmazdır"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Şifrələmə açarının daşınması tələb olunur. Şifrələmə açarınızı güncəlləmək üçün lütfən veb seyfinizə giriş edin."
+  "legacyEncryptionUnsupported": {
+    "message": "Köhnə şifrələmə artıq dəstəklənmir. Hesabınızı geri qaytarmaq üçün lütfən dəstəklə əlaqə saxlayın."
   },
   "premiumMembership": {
     "message": "Premium üzvlük"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH açarı"
   },
+  "typeNote": {
+    "message": "Not"
+  },
   "newItemHeader": {
     "message": "Yeni $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Bitwarden-in kilidini açmaq üçün PIN kodunuzu ayarlayın. Tətbiqdən tam çıxış etdikdə PIN ayarlarınız sıfırlanacaq."
   },
-  "setYourPinCode1": {
-    "message": "Bitwarden kilidini açmaq üçün ana parolunuzun əvəzinə PIN-iniz istifadə ediləcək. Bitwarden-dən tamamilə çıxış etdikdə PIN-iniz sıfırlanacaq."
+  "setPinCode": {
+    "message": "Bitwarden-in kilidini açmaq üçün bu PIN-i istifadə edə bilərsiniz. Tətbiqdən tam çıxış etsəniz, PIN-iniz sıfırlanacaq."
   },
   "pinRequired": {
     "message": "PIN kod lazımdır."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Bu parolu istifadə et"
   },
+  "useThisPassphrase": {
+    "message": "Bu keçid ifadəsini istifadə et"
+  },
   "useThisUsername": {
     "message": "Bu istifadəçi adını istifadə et"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Bir təşkilat siyasəti, elementlərin fərdi seyfinizə köçürülməsini əngəllədi."
   },
+  "restrictCardTypeImport": {
+    "message": "Kart element növləri daxilə köçürülə bilmir"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "1 və ya daha çox təşkilat tərəfindən təyin edilən bir siyasət, kartların seyfinizə köçürülməsini əngəlləyir."
+  },
   "domainsTitle": {
     "message": "Domenlər",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Dəyişdir"
   },
+  "changePassword": {
+    "message": "Parolu dəyişdir",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Parolu dəyişdir - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Riskli parollar"
+  },
   "atRiskPasswords": {
     "message": "Riskli parollar"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Bu saytdakı parolunuz risk altındadır. $ORGANIZATION$ onu dəyişdirməyinizi tələb edir.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$, bu parolun risk altında olduğu üçün dəyişdirməyinizi istəyir. Parolu dəyişdirmək üçün hesabınızın ayarlarına gedin.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Riskli bir parolu incələ və dəyişdir"
   },
@@ -2674,6 +2719,10 @@
     "message": "Bütün \"Send\"lər",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Maksimal müraciət sayına çatıldı",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Mətni ilkin olaraq gizlət"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Bu özəlliyi istifadə etmək üçün e-poçtunuzu doğrulamalısınız. E-poçtunuzu veb seyfdə doğrulaya bilərsiniz."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Ana parol uğurla təyin edildi"
+  },
   "updatedMasterPassword": {
     "message": "Güncəllənmiş ana parol"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Tələb göndərildi"
   },
+  "masterPasswordChanged": {
+    "message": "Ana parol saxlanıldı"
+  },
   "exposedMasterPassword": {
     "message": "İfşa olunmuş ana parol"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Admin təsdiqini tələb et"
   },
+  "unableToCompleteLogin": {
+    "message": "Giriş prosesi tamamlana bilmir"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Güvəndiyiniz bir cihazda giriş etməli və ya inzibatçınızdan sizə bir parol təyin etməsini xahiş etməlisiniz."
+  },
   "ssoIdentifierRequired": {
     "message": "Təşkilat SSO identifikatoru tələb olunur."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "İstifadəçiyə güvən"
   },
-  "sendsNoItemsTitle": {
-    "message": "Aktiv \"Send\" yoxdur",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Şifrələnmiş məlumatları hər kəslə güvənli şəkildə paylaşmaq üçün \"Send\"i istifadə edin.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send, həssas məlumatlar təhlükəsizdir",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Ortaq formatlar",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI uyuşma aşkarlaması, Bitwarden-in avto-doldurma təkliflərini necə müəyyən etdiyini göstərir.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Müntəzəm ifadə\", kimlik məlumatlarının ifşa olunma riskini artıran qabaqcıl bir seçimdir.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"İlə başlayır\", kimlik məlumatlarının ifşa olunma riskini artıran qabaqcıl bir seçimdir.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Uyuşma aşkarlaması barədə daha çox",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Qabaqcıl seçimlər",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Brauzer ayarları ilə davam edilsin?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "PIN ilə kilid açma təyini"
   },
+  "unlockWithBiometricSet": {
+    "message": "Kilidi biometriklə aç ayarı"
+  },
   "authenticating": {
     "message": "Kimlik doğrulama"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "Bu səhifəyə baxmaq icazəniz yoxdur. Fərqli hesabla giriş etməyə çalışın."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly brauzerinizdə dəstəklənmir və ya fəal deyil. WebAssembly, Bitwarden tətbiqini istifadə etmək üçün tələb olunur.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/be/messages.json b/apps/browser/src/_locales/be/messages.json
index 0dd5ff4163f..eb721e76850 100644
--- a/apps/browser/src/_locales/be/messages.json
+++ b/apps/browser/src/_locales/be/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Пытацца пра абнаўленні існуючага лагіна"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Функцыя недаступна"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Прэміяльны статус"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Ключ SSH"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "Новы $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Прызначце PIN-код для разблакіроўкі Bitwarden. Налады PIN-кода будуць скінуты, калі вы калі-небудзь цалкам выйдзеце з праграмы."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "Патрабуецца PIN-код."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Выкарыстоўваць гэты пароль"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Выкарыстоўваць гэта імя карыстальніка"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Дамены",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Усе Send’ы",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Вы павінны праверыць свой адрас электроннай пошты, каб выкарыстоўваць гэту функцыю. Зрабіць гэта можна ў вэб-сховішчы."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Асноўны пароль абноўлены"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Скампраметаваны асноўны пароль"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Запытаць ухваленне адміністратара"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "Няма актыўных Send'аў",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Выкарыстоўвайце Send'ы, каб бяспечна абагуляць зашыфраваную інфармацыю з іншымі.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/bg/messages.json b/apps/browser/src/_locales/bg/messages.json
index 0bf8dbce2b0..dad53b42e36 100644
--- a/apps/browser/src/_locales/bg/messages.json
+++ b/apps/browser/src/_locales/bg/messages.json
@@ -1173,6 +1173,12 @@
     "message": "О, не! Запазването не беше успешно. Опитайте да въведете данните ръчно.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "След като промените паролата си, ще трябва да се впишете отново с новата си парола. Сесиите на други устройства също ще бъдат прекратени в рамките на един час."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Променете главната си парола, за да завършите възстановяването на акаунта."
+  },
   "enableChangedPasswordNotification": {
     "message": "Питане за обновяване на съществуващ запис"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Функцията е недостъпна"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Необходима е промяна на шифриращия ключ. Впишете се в трезора си по уеб, за да обновите своя шифриращ ключ."
+  "legacyEncryptionUnsupported": {
+    "message": "Остарелият метод на шифроване вече не се поддържа. Моля, свържете се с поддръжката, за да възстановите акаунта си."
   },
   "premiumMembership": {
     "message": "Платен абонамент"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH ключ"
   },
+  "typeNote": {
+    "message": "Бележка"
+  },
   "newItemHeader": {
     "message": "Ново $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Задайте ПИН за отключване на Bitwarden. Настройките за ПИН се изчистват при всяко пълно излизане от програмата."
   },
-  "setYourPinCode1": {
-    "message": "Вашият ПИН ще бъде ползван за отключване на Битуорден, вместо главната парола. Той ще бъде нулиран, ако някога се отпишете напълно от Битуорден."
+  "setPinCode": {
+    "message": "Може да използвате този ПИН за отключване на Битуорден. Вашият ПИН ще се нулира ако в някакъв момент се отпишете напълно от приложението."
   },
   "pinRequired": {
     "message": "Необходим е ПИН."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Използване на тази парола"
   },
+  "useThisPassphrase": {
+    "message": "Използване на тази парола-фраза"
+  },
   "useThisUsername": {
     "message": "Използване на това потребителско име"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Политика на организацията забранява да внасяте елементи в личния си трезор."
   },
+  "restrictCardTypeImport": {
+    "message": "Картовите елементи не могат да бъдат внесени"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Политика, зададена от 1 или повече организации, не позволява да внасяте карти в трезорите си."
+  },
   "domainsTitle": {
     "message": "Домейни",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Промяна"
   },
+  "changePassword": {
+    "message": "Промяна на паролата",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Промяна на паролата – $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Парола в риск"
+  },
   "atRiskPasswords": {
     "message": "Пароли в риск"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Вашата парола за този уеб сайт е в риск. $ORGANIZATION$ изисква от Вас да я смените.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ иска от Вас да смените тази парола, защото е в риск. Отидете в настройките на акаунта си, за да смените паролата си.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Преглед и промяна на една парола в риск"
   },
@@ -2674,6 +2719,10 @@
     "message": "Всички изпращания",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Достигнат е максималният брой достъпвания",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Скриване на текста по подразбиране"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Трябва да потвърдите е-пощата си, за да използвате тази функционалност. Можете да го направите в уеб-трезора."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Главната парола е зададена успешно"
+  },
   "updatedMasterPassword": {
     "message": "Главната парола е променена"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Заявката е изпратена"
   },
+  "masterPasswordChanged": {
+    "message": "Главната парола е запазена"
+  },
   "exposedMasterPassword": {
     "message": "Разкрита главна парола"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Подаване на заявка за одобрение от администратор"
   },
+  "unableToCompleteLogin": {
+    "message": "Вписването не може да бъде завършено"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Трябва да се впишете на доверено устройство или да помолите администратора си да Ви зададе парола."
+  },
   "ssoIdentifierRequired": {
     "message": "Идентификаторът за еднократна идентификация на организация е задължителен."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Даване на доверие на потребителя"
   },
-  "sendsNoItemsTitle": {
-    "message": "Няма активни Изпращания",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Използвайте Изпращане, за да споделите безопасно шифрована информация с някого.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Изпращайте чувствителна информация сигурно",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Често използвани формати",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Разпознаването на съвпадения чрез адреса е начинът, по който Битуорден определя кои елементи да предложи за автоматично попълване.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "„Регулярен израз“ е по-сложен метод, който е и по-рисков, тъй като може да застраши сигурността на данните за вписване.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "„Започва с“ е по-сложен метод, който е и по-рисков, тъй като може да застраши сигурността на данните за вписване.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Повече относно разпознаването на съвпадения",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Разширени настройки",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Продължаване към настройките на браузъра?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Зададен е ПИН код за отключване"
   },
+  "unlockWithBiometricSet": {
+    "message": "Отключване с биометричен набор"
+  },
   "authenticating": {
     "message": "Удостоверяване"
   },
@@ -5060,7 +5136,7 @@
     "description": "Represents the ~ key in screen reader content as a readable word"
   },
   "backtickCharacterDescriptor": {
-    "message": "Backtick",
+    "message": "Обратен апостроф",
     "description": "Represents the ` key in screen reader content as a readable word"
   },
   "exclamationCharacterDescriptor": {
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "Нямате права за преглед на тази страница. Опитайте да се впишете с друг акаунт."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly не е включено или не се поддържа от Вашия браузър. За ползването на приложението на Битуорден е необходимо WebAssembly да работи.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/bn/messages.json b/apps/browser/src/_locales/bn/messages.json
index f7f28115faa..d70378f146c 100644
--- a/apps/browser/src/_locales/bn/messages.json
+++ b/apps/browser/src/_locales/bn/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "বৈশিষ্ট্য অনুপলব্ধ"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "প্রিমিয়াম সদস্য"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Bitwarden আনলক করার জন্য আপনার পিন কোডটি সেট করুন। আপনি যদি অ্যাপ্লিকেশনটি থেকে পুরোপুরি লগ আউট করেন তবে আপনার পিন সেটিংস রিসেট করা হবে।"
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "পিন কোড প্রয়োজন।"
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "প্রধান পাসওয়ার্ড আপডেট করা হয়েছে"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/bs/messages.json b/apps/browser/src/_locales/bs/messages.json
index 1dc35addd8e..afe20ff55ca 100644
--- a/apps/browser/src/_locales/bs/messages.json
+++ b/apps/browser/src/_locales/bs/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN code is required."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/ca/messages.json b/apps/browser/src/_locales/ca/messages.json
index 9517257ac3a..29859f03dd0 100644
--- a/apps/browser/src/_locales/ca/messages.json
+++ b/apps/browser/src/_locales/ca/messages.json
@@ -3,7 +3,7 @@
     "message": "Bitwarden"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Logotip de Bitwarden"
   },
   "extName": {
     "message": "Bitwarden - Gestor de contrasenyes",
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Demana d'actualitzar els inicis de sessió existents"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Característica no disponible"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Cal migrar la clau de xifratge. Inicieu la sessió a la caixa forta web per actualitzar la clau de xifratge."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Subscripció Premium"
@@ -1621,10 +1627,10 @@
     "message": "Mostra suggeriments d'emplenament automàtic als camps del formulari"
   },
   "showInlineMenuIdentitiesLabel": {
-    "message": "Display identities as suggestions"
+    "message": "Mostra identitats com a suggeriments"
   },
   "showInlineMenuCardsLabel": {
-    "message": "Display cards as suggestions"
+    "message": "Mostra targetes com a suggeriments"
   },
   "showInlineMenuOnIconSelectionLabel": {
     "message": "Mostra suggeriments quan la icona està seleccionada"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Clau SSH"
   },
+  "typeNote": {
+    "message": "Nota"
+  },
   "newItemHeader": {
     "message": "Nou $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Configureu el vostre codi PIN per desbloquejar Bitwarden. La configuració del PIN es restablirà si tanqueu la sessió definitivament."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "Es necessita el codi PIN."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Utilitzeu aquesta contrasenya"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Utilitzeu aquest nom d'usuari"
   },
@@ -2219,7 +2231,7 @@
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "vaultCustomization": {
-    "message": "Vault customization"
+    "message": "Personalització de la caixa forta"
   },
   "vaultTimeoutAction": {
     "message": "Acció quan acabe el temps d'espera de la caixa forta"
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Una política d'organització ha bloquejat la importació d'elements a la vostra caixa forta individual."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Dominis",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Canvia"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Tots els Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Amaga el text per defecte"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Heu de verificar el correu electrònic per utilitzar aquesta característica. Podeu verificar el vostre correu electrònic a la caixa forta web."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "La contrasenya mestra s'ha configurat correctament"
+  },
   "updatedMasterPassword": {
     "message": "Contrasenya mestra actualitzada"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Sol·licitud enviada"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Contrasenya mestra exposada"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Sol·liciteu l'aprovació de l'administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Es requereix un identificador SSO de l'organització."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No hi ha Sends actius",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Utilitzeu Send per compartir informació xifrada de manera segura amb qualsevol persona.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Formats comuns",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Voleu continuar a la configuració del navegador?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Desbloqueja amb conjunt biomètric"
+  },
   "authenticating": {
     "message": "S'està autenticant"
   },
@@ -5253,7 +5329,7 @@
     "message": "Change at-risk password"
   },
   "settingsVaultOptions": {
-    "message": "Vault options"
+    "message": "Opcions de la caixa forta"
   },
   "emptyVaultDescription": {
     "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/cs/messages.json b/apps/browser/src/_locales/cs/messages.json
index b213e0aee7d..05135190fb4 100644
--- a/apps/browser/src/_locales/cs/messages.json
+++ b/apps/browser/src/_locales/cs/messages.json
@@ -1003,7 +1003,7 @@
     "message": "Prohledat složku"
   },
   "searchCollection": {
-    "message": "Prohledat kolekci"
+    "message": "Prohledat sbírku"
   },
   "searchType": {
     "message": "Typ hledání"
@@ -1173,6 +1173,12 @@
     "message": "Ale ne! Nemohli jsme to uložit. Zkuste zadat podrobnosti ručně.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "Po změně hesla se budete muset přihlásit pomocí svého nového hesla. Aktivní relace na jiných zařízeních budou odhlášeny do jedné hodiny."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Pro dokončení obnovy účtu změňte hlavní heslo."
+  },
   "enableChangedPasswordNotification": {
     "message": "Zeptat se na aktualizaci existujícího přihlášení"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Funkce je nedostupná"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Vyžaduje se migrace šifrovacího klíče. Pro aktualizaci šifrovacího klíče se přihlaste přes webový trezor."
+  "legacyEncryptionUnsupported": {
+    "message": "Staré šifrování již není podporováno. Kontaktujte podporu pro obnovení Vašeho účtu."
   },
   "premiumMembership": {
     "message": "Prémiové členství"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH klíč"
   },
+  "typeNote": {
+    "message": "Poznámka"
+  },
   "newItemHeader": {
     "message": "Nové $TYPE$",
     "placeholders": {
@@ -1965,10 +1974,10 @@
     "message": "Zpět"
   },
   "collections": {
-    "message": "Kolekce"
+    "message": "Sbírky"
   },
   "nCollections": {
-    "message": "$COUNT$ kolekcí",
+    "message": "$COUNT$ sbírek",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2111,7 +2120,7 @@
     "message": "Nepatříte do žádné organizace. Organizace umožňují bezpečné sdílení položek s ostatními uživateli."
   },
   "noCollectionsInList": {
-    "message": "Žádné kolekce k zobrazení."
+    "message": "Žádné sbírky k zobrazení."
   },
   "ownership": {
     "message": "Vlastnictví"
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Nastavte svůj PIN kód pro odemknutí trezoru. Pokud se zcela odhlásíte z aplikace bude Váš aktuální PIN resetován."
   },
-  "setYourPinCode1": {
-    "message": "Váš PIN bude použit k odemknutí Bitwardenu namísto hlavního hesla. Pokud se někdy plně odhlásíte z Bitwarden, Váš PIN kód se obnoví."
+  "setPinCode": {
+    "message": "Tento PIN můžete použít k odemknutí Bitwardenu. Váš PIN bude resetován, pokud seněkdy úplně odhlásíte z aplikace."
   },
   "pinRequired": {
     "message": "Je vyžadován PIN kód."
@@ -2184,7 +2193,7 @@
     "message": "Vyžadovat hlavní heslo při restartu prohlížeče"
   },
   "selectOneCollection": {
-    "message": "Musíte vybrat alespoň jednu kolekci."
+    "message": "Musíte vybrat alespoň jednu sbírku."
   },
   "cloneItem": {
     "message": "Duplikovat položku"
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Použít toto heslo"
   },
+  "useThisPassphrase": {
+    "message": "Použít tuto heslovou frázi"
+  },
   "useThisUsername": {
     "message": "Použít toto uživatelské jméno"
   },
@@ -2473,7 +2485,7 @@
     "message": "Tuto akci nelze provést v postranním panelu, zkuste akci znovu v novém okně."
   },
   "personalOwnershipSubmitError": {
-    "message": "Z důvodu podnikových zásad nemůžete ukládat položky do svého osobního trezoru. Změňte vlastnictví položky na organizaci a poté si vyberte z dostupných kolekcí."
+    "message": "Z důvodu podnikových zásad nemůžete ukládat položky do svého osobního trezoru. Změňte vlastnictví položky na organizaci a poté si vyberte dostupných sbírek."
   },
   "personalOwnershipPolicyInEffect": {
     "message": "Zásady organizace ovlivňují možnosti vlastnictví."
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Zásady organizace zablokovaly importování položek do Vašeho osobního trezoru."
   },
+  "restrictCardTypeImport": {
+    "message": "Nelze importovat typy položek karty"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Zásady nastavené 1 nebo více organizací Vám brání v importu karet do Vašeho trezoru."
+  },
   "domainsTitle": {
     "message": "Domény",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Změnit"
   },
+  "changePassword": {
+    "message": "Změnit heslo",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Změnit heslo - $ITEMNAME$",
     "placeholders": {
@@ -2521,11 +2543,14 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Ohrožené heslo"
+  },
   "atRiskPasswords": {
     "message": "Ohrožená hesla"
   },
   "atRiskPasswordDescSingleOrg": {
-    "message": "$ORGANIZATION$ Vás žádá o změnu 1 hesla, protože je v ohrožení.",
+    "message": "$ORGANIZATION$ Vás žádá o změnu 1 hesla, protože je ohroženo.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2534,7 +2559,7 @@
     }
   },
   "atRiskPasswordsDescSingleOrgPlural": {
-    "message": "$ORGANIZATION$ Vás žádá o změnu $COUNT$ hesel, protože jsou v ohrožení.",
+    "message": "$ORGANIZATION$ Vás žádá o změnu $COUNT$ hesel, protože jsou ohrožena.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2547,7 +2572,7 @@
     }
   },
   "atRiskPasswordsDescMultiOrgPlural": {
-    "message": "Vaše organizace Vás žádají o změnu $COUNT$ hesel, protože jsou v ohrožení.",
+    "message": "Vaše organizace Vás žádají o změnu $COUNT$ hesel, protože jsou ohrožena.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Vaše heslo pro tuto stránku je ohrožené. $ORGANIZATION$ Vás požádala, abyste jej změnili.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ chce, abyste změnili toto heslo, protože je ohrožené. Přejděte do nastavení účtu a změňte heslo.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Zkontrolovat a změnit jedno ohrožené heslo"
   },
@@ -2574,20 +2619,20 @@
     "message": "Aktualizujte svá nastavení, abyste mohli rychle automaticky vyplňovat hesla a generovat nová hesla."
   },
   "reviewAtRiskLogins": {
-    "message": "Kontrola rizikových přihlášení"
+    "message": "Kontrola ohrožených přihlášení"
   },
   "reviewAtRiskPasswords": {
-    "message": "Kontrola rizikových hesel"
+    "message": "Kontrola ohrožených hesel"
   },
   "reviewAtRiskLoginsSlideDesc": {
     "message": "Hesla Vaší organizace jsou ohrožena, protože jsou slabá, opakovaně používaná nebo odhalená.",
     "description": "Description of the review at-risk login slide on the at-risk password page carousel"
   },
   "reviewAtRiskLoginSlideImgAltPeriod": {
-    "message": "Ilustrace seznamu přihlášení, která jsou riziková."
+    "message": "Ilustrace seznamu přihlášení, která jsou ohrožená."
   },
   "generatePasswordSlideDesc": {
-    "message": "Rychle vygeneruje silné, unikátní heslo s nabídkou automatického vyplňování Bitwarden na rizikových stránkách.",
+    "message": "Rychle vygeneruje silné, unikátní heslo s nabídkou automatického vyplňování Bitwarden na ohrožených stránkách.",
     "description": "Description of the generate password slide on the at-risk password page carousel"
   },
   "generatePasswordSlideImgAltPeriod": {
@@ -2674,6 +2719,10 @@
     "message": "Všechny Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Dosažen maximální počet přístupů",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Ve výchozím nastavení skrýt text"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Abyste mohli tuto funkci používat, musíte ověřit svůj e-mail. Svůj e-mail můžete ověřit ve webovém trezoru."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Hlavní heslo bylo úspěšně nastaveno"
+  },
   "updatedMasterPassword": {
     "message": "Hlavní heslo bylo aktualizováno"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Požadavek odeslán"
   },
+  "masterPasswordChanged": {
+    "message": "Hlavní heslo bylo uloženo"
+  },
   "exposedMasterPassword": {
     "message": "Odhalené hlavní heslo"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Žádost o schválení správcem"
   },
+  "unableToCompleteLogin": {
+    "message": "Nelze dokončit přihlášení"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Musíte se přihlásit na důvěryhodném zařízení nebo požádat správce, aby Vám přiřadil heslo."
+  },
   "ssoIdentifierRequired": {
     "message": "Je vyžadován SSO identifikátor organizace."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Důvěřovat uživateli"
   },
-  "sendsNoItemsTitle": {
-    "message": "Žádná aktivní Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Použijte Send pro bezpečné sdílení šifrovaných informací s kýmkoliv.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Posílejte citlivé informace bezpečně",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -3960,7 +4013,7 @@
     "message": "Zvolte složku"
   },
   "selectImportCollection": {
-    "message": "Zvolte kolekci"
+    "message": "Zvolte sbírku"
   },
   "importTargetHint": {
     "message": "Pokud chcete obsah importovaného souboru přesunout do složky $DESTINATION$, vyberte tuto volbu",
@@ -4146,7 +4199,7 @@
     "message": "Zkuste to znovu nebo vyhledejte e-mail od LastPass pro ověření, že jste to Vy."
   },
   "collection": {
-    "message": "Kolekce"
+    "message": "Sbírka"
   },
   "lastPassYubikeyDesc": {
     "message": "Vložte YubiKey spojený s Vaším účtem LastPass do USB portu Vašeho počítače a stiskněte jeho tlačítko."
@@ -4209,6 +4262,26 @@
     "message": "Společné formáty",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Detekce shody URI je způsob, jakým Bitwarden identifikuje návrhy automatického vyplňování.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regulární výraz\" je pokročilá volba se zvýšeným rizikem odhalení přihlašovacích údajů.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Začíná na\" je pokročilá volba se zvýšeným rizikem odhalení přihlašovacích údajů.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Další informace o detekci shody",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Rozšířené volby",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Pokračovat do nastavení prohlížeče?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -4410,7 +4483,7 @@
     "message": "Žádné hodnoty ke zkopírování"
   },
   "assignToCollections": {
-    "message": "Přiřadit ke kolekcím"
+    "message": "Přiřadit ke sbírkám"
   },
   "copyEmail": {
     "message": "Kopírovat e-mail"
@@ -4434,7 +4507,7 @@
     "message": "Vzhled"
   },
   "errorAssigningTargetCollection": {
-    "message": "Chyba při přiřazování cílové kolekce."
+    "message": "Chyba při přiřazování do cílové sbírky."
   },
   "errorAssigningTargetFolder": {
     "message": "Chyba při přiřazování cílové složky."
@@ -4726,10 +4799,10 @@
     "message": "Přiřadit"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Jen členové organizace s přístupem k těmto kolekcím budou moci vidět položku."
+    "message": "Jen členové organizace s přístupem k těmto sbírkám budou moci vidět položku."
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Jen členové organizace s přístupem k těmto kolekcím budou moci vidět položky."
+    "message": "Jen členové organizace s přístupem k těmto sbírkám budou moci vidět položky."
   },
   "bulkCollectionAssignmentWarning": {
     "message": "Vybrali jste $TOTAL_COUNT$ položek. Nemůžete aktualizovat $READONLY_COUNT$ položek, protože nemáte oprávnění k úpravám.",
@@ -4830,7 +4903,7 @@
     }
   },
   "selectCollectionsToAssign": {
-    "message": "Vyberte kolekce pro přiřazení"
+    "message": "Vyberte sbírky pro přiřazení"
   },
   "personalItemTransferWarningSingular": {
     "message": "1 položka bude trvale převedena do vybrané organizace. Tuto položku již nebudete vlastnit."
@@ -4867,7 +4940,7 @@
     }
   },
   "successfullyAssignedCollections": {
-    "message": "Kolekce byly úspěšně přiřazeny"
+    "message": "Sbírky byly úspěšně přiřazeny"
   },
   "nothingSelected": {
     "message": "Nevybrali jste žádné položky."
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "PIN pro odemknutí byl nastaven"
   },
+  "unlockWithBiometricSet": {
+    "message": "Odemknout pomocí biometrie"
+  },
   "authenticating": {
     "message": "Ověřování"
   },
@@ -5235,7 +5311,7 @@
     "message": "SSH klíč byl úspěšně importován"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "Nemůžete odebrat kolekce s oprávněními jen pro zobrazení: $COLLECTIONS$",
+    "message": "Nemůžete odebrat sbírky s oprávněními jen pro zobrazení: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "Nemáte oprávnění k zobrazení této stránky. Zkuste se přihlásit jiným účtem."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly není ve Vašem prohlížeči podporováno nebo není povoleno. WebAssembly je vyžadováno pro použití aplikace Bitwarden.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/cy/messages.json b/apps/browser/src/_locales/cy/messages.json
index ee74d1e45e2..c5cbbdd189c 100644
--- a/apps/browser/src/_locales/cy/messages.json
+++ b/apps/browser/src/_locales/cy/messages.json
@@ -3,7 +3,7 @@
     "message": "Bitwarden"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Logo Bitwarden"
   },
   "extName": {
     "message": "Rheolydd cyfrineiriau Bitwarden",
@@ -335,7 +335,7 @@
     "message": "Mwy gan Bitwarden"
   },
   "continueToBitwardenDotCom": {
-    "message": "Continue to bitwarden.com?"
+    "message": "Parhau i bitwarden.com?"
   },
   "bitwardenForBusiness": {
     "message": "Bitwarden for Business"
@@ -668,13 +668,13 @@
     "message": "Mae eich cell ar glo. Gwiriwch eich hunaniaeth i barhau."
   },
   "yourVaultIsLockedV2": {
-    "message": "Your vault is locked"
+    "message": "Mae eich cell ar glo"
   },
   "yourAccountIsLocked": {
-    "message": "Your account is locked"
+    "message": "Mae eich cyfrif ar glo"
   },
   "or": {
-    "message": "or"
+    "message": "neu"
   },
   "unlock": {
     "message": "Datgloi"
@@ -762,7 +762,7 @@
     "message": "Your master password cannot be recovered if you forget it!"
   },
   "masterPassHintLabel": {
-    "message": "Master password hint"
+    "message": "Awgrym o'ch prif gyfrinair"
   },
   "errorOccurred": {
     "message": "Bu gwall"
@@ -799,13 +799,13 @@
     "message": "Mae eich cyfrif wedi cael ei greu!"
   },
   "youHaveBeenLoggedIn": {
-    "message": "You have been logged in!"
+    "message": "Rydych wedi cael eich mewngofnodi!"
   },
   "youSuccessfullyLoggedIn": {
     "message": "You successfully logged in"
   },
   "youMayCloseThisWindow": {
-    "message": "You may close this window"
+    "message": "Gallwch cau'r ffenestr hon bellach"
   },
   "masterPassSent": {
     "message": "Rydym ni wedi anfon ebost atoch gydag awgrym ar gyfer eich prif gyfrinair."
@@ -860,7 +860,7 @@
     "message": "Logged out"
   },
   "loggedOutDesc": {
-    "message": "You have been logged out of your account."
+    "message": "Rydych wedi cael eich allgofnodi o'ch cyfrif."
   },
   "loginExpired": {
     "message": "Mae eich sesiwn wedi dod i ben."
@@ -872,13 +872,13 @@
     "message": "Mewngofnodi i Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Enter the code sent to your email"
+    "message": "Rhowch y cod a anfonwyd i'ch ebost"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "Rhowch y cod o'ch ap dilysu"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Press your YubiKey to authenticate"
+    "message": "Gwasgwch eich YubiKey i ddilysu"
   },
   "duoTwoFactorRequiredPageSubtitle": {
     "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
@@ -929,13 +929,13 @@
     "message": "Make your account more secure by setting up two-step login in the Bitwarden web app."
   },
   "twoStepLoginConfirmationTitle": {
-    "message": "Continue to web app?"
+    "message": "Parhau i'r ap gwe?"
   },
   "editedFolder": {
     "message": "Ffolder wedi'i chadw"
   },
   "deleteFolderConfirmation": {
-    "message": "Are you sure you want to delete this folder?"
+    "message": "Ydych chi'n sicr yr hoffech chi ddileu'r ffolder hon?"
   },
   "deletedFolder": {
     "message": "Ffolder wedi'i dileu"
@@ -1076,11 +1076,11 @@
     "description": "Aria label for the new item button in notification bar confirmation message when error is prompted"
   },
   "notificationEditTooltip": {
-    "message": "Edit before saving",
+    "message": "Golygu cyn cadw",
     "description": "Tooltip and Aria label for edit button on cipher item"
   },
   "newNotification": {
-    "message": "New notification"
+    "message": "Hysbysiad newydd"
   },
   "labelWithNotification": {
     "message": "$LABEL$: New notification",
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Gofyn i ddiweddaru manylion mewngofnodi sy'n bodoli eisoes"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Aelodaeth uwch"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Allwedd SSH"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "$TYPE$ newydd",
     "placeholders": {
@@ -2090,7 +2099,7 @@
     "message": "Tynnu"
   },
   "default": {
-    "message": "Default"
+    "message": "Rhagosodiad"
   },
   "dateUpdated": {
     "message": "Updated",
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "Mae angen cod PIN."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Defnyddio'r cyfrinair hwn"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Defnyddio'r enw defnyddiwr hwn"
   },
@@ -2219,7 +2231,7 @@
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "vaultCustomization": {
-    "message": "Vault customization"
+    "message": "Addasu'r gell"
   },
   "vaultTimeoutAction": {
     "message": "Vault timeout action"
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "Cyfrineiriau mewn perygl"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Pob Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Diweddarwyd y prif gyfrinair"
   },
@@ -3125,7 +3177,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Defnyddiwch $RECOMMENDED$ neu fwy o eiriau i gynhyrchu cyfrinymadrodd cryff.",
+    "message": " Defnyddiwch $RECOMMENDED$ neu fwy o eiriau i gynhyrchu cyfrinymadrodd cryf.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4016,7 +4069,7 @@
     "message": "Passkey"
   },
   "accessing": {
-    "message": "Accessing"
+    "message": "Yn cysylltu â"
   },
   "loggedInExclamation": {
     "message": "Logged in!"
@@ -4173,7 +4226,7 @@
     "message": "Account limit reached. Log out of an account to add another."
   },
   "active": {
-    "message": "active"
+    "message": "gweithredol"
   },
   "locked": {
     "message": "locked"
@@ -4209,6 +4262,26 @@
     "message": "Fformatau cyffredin",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -4647,7 +4720,7 @@
     "message": "Delete website"
   },
   "defaultLabel": {
-    "message": "Default ($VALUE$)",
+    "message": "Rhagosodiad ($VALUE$)",
     "description": "A label that indicates the default value for a field with the current default value in parentheses.",
     "placeholders": {
       "value": {
@@ -4696,10 +4769,10 @@
     }
   },
   "enableAnimations": {
-    "message": "Enable animations"
+    "message": "Galluogi animeiddio"
   },
   "showAnimations": {
-    "message": "Show animations"
+    "message": "Dangos animeiddio"
   },
   "addAccount": {
     "message": "Ychwanegu cyfrif"
@@ -4923,7 +4996,7 @@
     "message": "Text Sends"
   },
   "accountActions": {
-    "message": "Account actions"
+    "message": "Gweithredoedd y cyfrif"
   },
   "showNumberOfAutofillSuggestions": {
     "message": "Show number of login autofill suggestions on extension icon"
@@ -4932,7 +5005,7 @@
     "message": "Show quick copy actions on Vault"
   },
   "systemDefault": {
-    "message": "System default"
+    "message": "Rhagosodiad y sytem"
   },
   "enterprisePolicyRequirementsApplied": {
     "message": "Enterprise policy requirements have been applied to this setting"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5199,13 +5275,13 @@
     "message": "Beta"
   },
   "extensionWidth": {
-    "message": "Extension width"
+    "message": "Lled yr estyniad"
   },
   "wide": {
-    "message": "Wide"
+    "message": "Llydan"
   },
   "extraWide": {
-    "message": "Extra wide"
+    "message": "Llydan iawn"
   },
   "sshKeyWrongPassword": {
     "message": "The password you entered is incorrect."
@@ -5253,7 +5329,7 @@
     "message": "Change at-risk password"
   },
   "settingsVaultOptions": {
-    "message": "Vault options"
+    "message": "Dewisiadau'r gell"
   },
   "emptyVaultDescription": {
     "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/da/messages.json b/apps/browser/src/_locales/da/messages.json
index da24e1bcfb9..5737ba66b8d 100644
--- a/apps/browser/src/_locales/da/messages.json
+++ b/apps/browser/src/_locales/da/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Bed om at opdatere eksisterende login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Funktion ikke tilgængelig"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Krypteringsnøglemigrering nødvendig. Log ind gennem web-boksen for at opdatere krypteringsnøglen."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium-medlemskab"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH-nøgle"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "Ny $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Indstil din pinkode til at låse Bitwarden op. Dine pin-indstillinger nulstilles, hvis du nogensinde logger helt ud af programmet."
   },
-  "setYourPinCode1": {
-    "message": "PIN-koden vil blive brugt til oplåsning af Bitwarden i stedet for hovedadgangskoden. PIN-koden nulstilles, hvis man logger helt ud af Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "Pinkode er påkrævet."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Anvend denne adgangskode"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Anvend dette brugernavn"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "En organisationspolitik hindrer import af emner til den individuelle boks."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domæner",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Alle Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Skjul tekst som standard"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Du skal bekræfte din e-mail for at bruge denne funktion. Du kan bekræfte din e-mail i web-boksen."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Hovedadgangskode opdateret"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Kompromitteret hovedadgangskode"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Anmod om admin-godkendelse"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organisations SSO-identifikator kræves."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "Ingen aktive Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Brug Send til at dele krypterede oplysninger sikkert med nogen.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Almindelige formater",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Fortsæt til Browserindstillinger?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Godkender"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/de/messages.json b/apps/browser/src/_locales/de/messages.json
index f7303885551..352705ec281 100644
--- a/apps/browser/src/_locales/de/messages.json
+++ b/apps/browser/src/_locales/de/messages.json
@@ -1060,7 +1060,7 @@
     "message": "Soll Bitwarden sich dieses Passwort merken?"
   },
   "notificationAddSave": {
-    "message": "Ja, jetzt speichern"
+    "message": "Speichern"
   },
   "notificationViewAria": {
     "message": "$ITEMNAME$ anzeigen, öffnet sich in neuem Fenster",
@@ -1173,6 +1173,12 @@
     "message": "Oh nein! Das konnten wir nicht speichern. Versuch, die Details manuell einzugeben.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Nach dem Aktualisieren bestehender Zugangsdaten fragen"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Funktion nicht verfügbar"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Verschlüsselungscode-Migration erforderlich. Bitte melde dich über den Web-Tresor an, um deinen Verschlüsselungscode zu aktualisieren."
+  "legacyEncryptionUnsupported": {
+    "message": "Die veraltete Verschlüsselung wird nicht mehr unterstützt. Bitte kontaktiere den Support, um dein Konto wiederherzustellen."
   },
   "premiumMembership": {
     "message": "Premium-Mitgliedschaft"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH-Schlüssel"
   },
+  "typeNote": {
+    "message": "Notiz"
+  },
   "newItemHeader": {
     "message": "Neue $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Gebe deinen PIN-Code für das Entsperren von Bitwarden ein. Deine PIN-Einstellungen werden zurückgesetzt, wenn du dich vollständig von der Anwendung abmeldest."
   },
-  "setYourPinCode1": {
-    "message": "Deine PIN wird verwendet, um Bitwarden anstatt deines Master-Passworts zu entsperren. Deine PIN wird zurückgesetzt, wenn du dich jemals vollständig von Bitwarden abgemeldet hast."
+  "setPinCode": {
+    "message": "Du kannst diese PIN verwenden, um Bitwarden zu entsperren. Deine PIN wird zurückgesetzt, wenn du dich vollständig aus der Anwendung abmeldest."
   },
   "pinRequired": {
     "message": "PIN-Code ist erforderlich."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Dieses Passwort verwenden"
   },
+  "useThisPassphrase": {
+    "message": "Diese Passphrase verwenden"
+  },
   "useThisUsername": {
     "message": "Diesen Benutzernamen verwenden"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Eine Organisationsrichtlinie hat das Importieren von Einträgen in deinen persönlichen Tresor deaktiviert."
   },
+  "restrictCardTypeImport": {
+    "message": "Karten-Eintragstypen können nicht importiert werden"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Eine von einer oder mehreren Organisationen festgelegte Richtlinie verhindert, dass du Karten in deinen Tresor importieren kannst."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Ändern"
   },
+  "changePassword": {
+    "message": "Passwort ändern",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Passwort ändern - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Gefährdetes Passwort"
+  },
   "atRiskPasswords": {
     "message": "Gefährdete Passwörter"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Dein Passwort für diese Website ist gefährdet. $ORGANIZATION$ hat darum gebeten, dass du es änderst.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ möchte, dass du dieses Passwort änderst, da es gefährdet ist. Wechsel zu deinen Kontoeinstellungen, um das Passwort zu ändern.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Überprüfe und ändere ein gefährdetes Passwort"
   },
@@ -2674,6 +2719,10 @@
     "message": "Alle Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Maximale Zugriffsanzahl erreicht",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Text standardmäßig ausblenden"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Du musst deine E-Mail Adresse verifizieren, um diese Funktion nutzen zu können. Du kannst deine E-Mail im Web-Tresor verifizieren."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master-Passwort erfolgreich eingerichtet"
+  },
   "updatedMasterPassword": {
     "message": "Master-Passwort aktualisiert"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Anfrage gesendet"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Kompromittiertes Master-Passwort"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Admin-Genehmigung anfragen"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "SSO-Kennung der Organisation erforderlich."
   },
@@ -3607,20 +3668,12 @@
   "trustUser": {
     "message": "Benutzer vertrauen"
   },
-  "sendsNoItemsTitle": {
-    "message": "Keine aktiven Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Verwende Send, um verschlüsselte Informationen sicher mit anderen zu teilen.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Sensible Informationen sicher versenden",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Teile Dateien und Daten sicher mit jedem auf jeder Plattform. Deine Informationen bleiben Ende-zu-Ende-Verschlüsselt, während die Verbreitung begrenzt wird.",
+    "message": "Teile Dateien und Daten sicher mit jedem auf jeder Plattform. Deine Informationen bleiben Ende-zu-Ende-verschlüsselt, während die Verbreitung begrenzt wird.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -4209,6 +4262,26 @@
     "message": "Gängigste Formate",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Weiter zu den Browsereinstellungen?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Entsperr-PIN festgelegt"
   },
+  "unlockWithBiometricSet": {
+    "message": "Mit Biometrie entsperren eingerichtet"
+  },
   "authenticating": {
     "message": "Authentifizierung"
   },
@@ -5256,7 +5332,7 @@
     "message": "Tresoroptionen"
   },
   "emptyVaultDescription": {
-    "message": "Der Tresor schützt mehr als nur deine Passwörter. Speicher hier sicher Zugangsdaten, Ausweise, Karten und Notizen."
+    "message": "Der Tresor schützt mehr als nur deine Passwörter. Speicher hier sicher Zugangsdaten, Identitäten, Karten und Notizen."
   },
   "introCarouselLabel": {
     "message": "Willkommen bei Bitwarden"
@@ -5367,15 +5443,19 @@
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": ", um deine Zugangsdaten sicher aufzubewahren.",
+    "message": ", um dir zu helfen, deine Zugangsdaten sicher zu halten.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Generiere ganz einfach starke und einzigartige Passwörter, indem du auf den \"Passwort generieren\"-Button klickst, um deine Zugangsdaten sicher aufzubewahren.",
+    "message": "Generiere ganz einfach starke und einzigartige Passwörter, indem du auf den \"Passwort generieren\"-Button klickst, um dir zu helfen, deine Zugangsdaten sicher zu halten.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
     "message": "Du hast keine Berechtigung, diese Seite anzuzeigen. Versuche dich mit einem anderen Konto anzumelden."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly wird von deinem Browser nicht unterstützt oder ist nicht aktiviert. WebAssembly wird benötigt, um die Bitwarden-App nutzen zu können.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/el/messages.json b/apps/browser/src/_locales/el/messages.json
index ed81dfa744e..960de6670d5 100644
--- a/apps/browser/src/_locales/el/messages.json
+++ b/apps/browser/src/_locales/el/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ζητήστε να ενημερώσετε την υπάρχουσα σύνδεση"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Μη διαθέσιμη λειτουργία"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Απαιτείται μεταφορά κλειδιού κρυπτογράφησης. Παρακαλούμε συνδεθείτε μέσω του διαδικτυακού θησαυ/κίου για να ενημερώσετε το κλειδί κρυπτογράφησης."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Συνδρομή Premium"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Κλειδί SSH"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "Νέα $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Ορίστε τον κωδικό PIN για να ξεκλειδώσετε το Bitwarden. Οι ρυθμίσεις PIN θα επαναρυθμιστούν αν αποσυνδεθείτε πλήρως από την εφαρμογή."
   },
-  "setYourPinCode1": {
-    "message": "Το PIN σας θα χρησιμοποιείται για το ξεκλείδωμα του Bitwarden αντί του κύριου κωδικού πρόσβασης. Αν αποσυνδεθείτε εντελώς από το Bitwarden, θα γίνει επαναφορά του PIN σας."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "Απαιτείται κωδικός PIN."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Χρήση αυτού του κωδικού πρόσβασης"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Χρήση αυτού του ονόματος χρήστη"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Μια οργανωτική πολιτική έχει αποτρέψει την εισαγωγή στοιχείων στο προσωπικό θησαυ/κιο σας."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Τομείς",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Αλλαγή"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Αλλαγή κωδικού πρόσβασης - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "Κωδικοί πρόσβασης σε κίνδυνο"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Όλα τα Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Απόκρυψη κειμένου από προεπιλογή"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Πρέπει να επαληθεύσετε το email σας για να χρησιμοποιήσετε αυτή τη δυνατότητα. Μπορείτε να επαληθεύσετε το email σας στο web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Ενημερώθηκε ο κύριος κωδικός πρόσβασης"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Εκτεθειμένος Κύριος Κωδικός Πρόσβασης"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Αίτηση έγκρισης διαχειριστή"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Απαιτείται αναγνωριστικό οργανισμού SSO."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "Κανένα ενεργό Send",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Χρήση Send για ασφαλή κοινοποίηση κρυπτογραφημένων πληροφοριών με οποιονδήποτε.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Κοινοί τύποι",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Συνεχίστε στις ρυθμίσεις περιηγητή;",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Ταυτοποίηση"
   },
@@ -5223,16 +5299,16 @@
     "message": "Enter password"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "Το κλειδί SSH δεν είναι έγκυρο"
   },
   "sshKeyTypeUnsupported": {
-    "message": "The SSH key type is not supported"
+    "message": "Ο τύπος κλειδιού SSH δεν υποστηρίζεται"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "Εισαγωγή κλειδιού από το πρόχειρο"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "Επιτυχής εισαγωγή κλειδιού SSH"
   },
   "cannotRemoveViewOnlyCollections": {
     "message": "Δεν μπορείτε να αφαιρέσετε συλλογές που έχουν μόνο δικαιώματα Προβολής: $COLLECTIONS$",
@@ -5286,10 +5362,10 @@
     "message": "Save unlimited passwords across unlimited devices with Bitwarden mobile, browser, and desktop apps."
   },
   "nudgeBadgeAria": {
-    "message": "1 notification"
+    "message": "1 ειδοποίηση"
   },
   "emptyVaultNudgeTitle": {
-    "message": "Import existing passwords"
+    "message": "Εισαγωγή υπαρχόντων κωδικών πρόσβασης"
   },
   "emptyVaultNudgeBody": {
     "message": "Use the importer to quickly transfer logins to Bitwarden without manually adding them."
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index feb5a7706f3..ee8cd412625 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN code is required."
@@ -2484,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2515,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2524,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2558,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2677,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2879,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3411,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3525,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3610,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4211,6 +4261,26 @@
   "commonImportFormats": {
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
+  },
+   "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."  
+  },
+   "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+   "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption":{
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
   },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
@@ -5039,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5380,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/en_GB/messages.json b/apps/browser/src/_locales/en_GB/messages.json
index 5eecf989894..aab61eca30e 100644
--- a/apps/browser/src/_locales/en_GB/messages.json
+++ b/apps/browser/src/_locales/en_GB/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN code is required."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organisation policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organisations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organisation SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/en_IN/messages.json b/apps/browser/src/_locales/en_IN/messages.json
index adb3cf6ec32..eaf11a04e57 100644
--- a/apps/browser/src/_locales/en_IN/messages.json
+++ b/apps/browser/src/_locales/en_IN/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN code is required."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organisation policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organisations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated Master Password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organisation SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/es/messages.json b/apps/browser/src/_locales/es/messages.json
index 94d02848b5f..724d07f4404 100644
--- a/apps/browser/src/_locales/es/messages.json
+++ b/apps/browser/src/_locales/es/messages.json
@@ -881,13 +881,13 @@
     "message": "Pulsa tu YubiKey para identificarte"
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Se requiere inicio de sesión en dos pasos para tu cuenta. Sigue los pasos siguientes para terminar de iniciar sesión."
+    "message": "Se requiere el inicio de sesión en dos pasos de Duo en tu cuenta. Sigue los siguientes pasos para terminar de iniciar sesión."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "Sigue los pasos de abajo para terminar de iniciar sesión."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Sigue los siguientes pasos para terminar de iniciar sesión con tu clave de seguridad."
   },
   "restartRegistration": {
     "message": "Reiniciar registro"
@@ -1076,14 +1076,14 @@
     "description": "Aria label for the new item button in notification bar confirmation message when error is prompted"
   },
   "notificationEditTooltip": {
-    "message": "Edit before saving",
+    "message": "Editar antes de guardar",
     "description": "Tooltip and Aria label for edit button on cipher item"
   },
   "newNotification": {
-    "message": "New notification"
+    "message": "Nueva notificación"
   },
   "labelWithNotification": {
-    "message": "$LABEL$: New notification",
+    "message": "$LABEL$: Nueva notificación",
     "description": "Label for the notification with a new login suggestion.",
     "placeholders": {
       "label": {
@@ -1093,15 +1093,15 @@
     }
   },
   "notificationLoginSaveConfirmation": {
-    "message": "saved to Bitwarden.",
+    "message": "guardado en Bitwarden.",
     "description": "Shown to user after item is saved."
   },
   "notificationLoginUpdatedConfirmation": {
-    "message": "updated in Bitwarden.",
+    "message": "actualizado en Bitwarden.",
     "description": "Shown to user after item is updated."
   },
   "selectItemAriaLabel": {
-    "message": "Select $ITEMTYPE$, $ITEMNAME$",
+    "message": "Seleccionar $ITEMTYPE$, $ITEMNAME$",
     "description": "Used by screen readers. $1 is the item type (like vault or folder), $2 is the selected item name.",
     "placeholders": {
       "itemType": {
@@ -1113,27 +1113,27 @@
     }
   },
   "saveAsNewLoginAction": {
-    "message": "Save as new login",
+    "message": "Guardar como nuevo inicio de sesión",
     "description": "Button text for saving login details as a new entry."
   },
   "updateLoginAction": {
-    "message": "Update login",
+    "message": "Actualizar inicio de sesión",
     "description": "Button text for updating an existing login entry."
   },
   "unlockToSave": {
-    "message": "Unlock to save this login",
+    "message": "Desbloquea para guardar este inicio de sesión",
     "description": "User prompt to take action in order to save the login they just entered."
   },
   "saveLogin": {
-    "message": "Save login",
+    "message": "Guardar inicio de sesión",
     "description": "Prompt asking the user if they want to save their login details."
   },
   "updateLogin": {
-    "message": "Update existing login",
+    "message": "Actualizar inicio de sesión existente",
     "description": "Prompt asking the user if they want to update an existing login entry."
   },
   "loginSaveSuccess": {
-    "message": "Login saved",
+    "message": "Inicio de sesión guardado",
     "description": "Message displayed when login details are successfully saved."
   },
   "loginUpdateSuccess": {
@@ -1141,7 +1141,7 @@
     "description": "Message displayed when login details are successfully updated."
   },
   "loginUpdateTaskSuccess": {
-    "message": "Great job! You took the steps to make you and $ORGANIZATION$ more secure.",
+    "message": "¡Buen trabajo! Has dado los pasos para que tú y $ORGANIZATION$ seáis más seguros.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1150,7 +1150,7 @@
     "description": "Shown to user after login is updated."
   },
   "loginUpdateTaskSuccessAdditional": {
-    "message": "Thank you for making $ORGANIZATION$ more secure. You have $TASK_COUNT$ more passwords to update.",
+    "message": "Gracias por hacer $ORGANIZATION$ más seguro. Tienes $TASK_COUNT$ contraseñas más que actualizar.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1162,7 +1162,7 @@
     "description": "Shown to user after login is updated."
   },
   "nextSecurityTaskAction": {
-    "message": "Change next password",
+    "message": "Cambiar siguiente contraseña",
     "description": "Message prompting user to undertake completion of another security task."
   },
   "saveFailure": {
@@ -1170,9 +1170,15 @@
     "description": "Error message shown when the system fails to save login details."
   },
   "saveFailureDetails": {
-    "message": "Oh no! We couldn't save this. Try entering the details manually.",
+    "message": "¡Oh no! No pudimos guardar esto. Intenta introducir los datos manualmente.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Solicitar la actualización de los datos de inicio de sesión existentes"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Característica no disponible"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Se requiere migración de la clave de cifrado. Por favor, inicie sesión a través de la caja fuerte para actualizar su clave de cifrado."
+  "legacyEncryptionUnsupported": {
+    "message": "La encriptación antigua ya no está soportada. Por favor, contacta con soporte para recuperar tu cuenta."
   },
   "premiumMembership": {
     "message": "Membresía Premium"
@@ -1411,7 +1417,7 @@
     "message": "Comprar Premium"
   },
   "premiumPurchaseAlertV2": {
-    "message": "You can purchase Premium from your account settings on the Bitwarden web app."
+    "message": "Puedes comprar el Premium desde los ajustes de tu cuenta en la aplicación web de Bitwarden."
   },
   "premiumCurrentMember": {
     "message": "¡Eres un miembro Premium!"
@@ -1474,14 +1480,14 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "No volver a preguntar en este dispositivo durante 30 días"
   },
   "selectAnotherMethod": {
-    "message": "Select another method",
+    "message": "Selecciona otro método",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use your recovery code"
+    "message": "Usa tu código de recuperación"
   },
   "insertU2f": {
     "message": "Inserta tu llave de seguridad en el puerto USB de tu equipo. Si tiene un botón, púlsalo."
@@ -1493,10 +1499,10 @@
     "message": "Autenticar WebAuthn"
   },
   "readSecurityKey": {
-    "message": "Read security key"
+    "message": "Leer clave de seguridad"
   },
   "awaitingSecurityKeyInteraction": {
-    "message": "Awaiting security key interaction..."
+    "message": "Esperando interacción de la clave de seguridad..."
   },
   "loginUnavailable": {
     "message": "Entrada no disponible"
@@ -1511,7 +1517,7 @@
     "message": "Opciones de la autenticación en dos pasos"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "Selecciona un método de inicio de sesión en dos pasos"
   },
   "recoveryCodeDesc": {
     "message": "¿Has perdido el acceso a todos tus métodos de autenticación en dos pasos? Utiliza tu código de recuperación para deshabilitar todos los métodos de autenticación en dos pasos de tu cuenta."
@@ -1600,13 +1606,13 @@
     "message": "Sugerencias de autocompletar"
   },
   "autofillSpotlightTitle": {
-    "message": "Easily find autofill suggestions"
+    "message": "Encuentra fácilmente sugerencias de autocompletado"
   },
   "autofillSpotlightDesc": {
-    "message": "Turn off your browser's autofill settings, so they don't conflict with Bitwarden."
+    "message": "Desactiva los ajustes de autocompletado de tu navegador para que no entren en conflicto con Bitwarden."
   },
   "turnOffBrowserAutofill": {
-    "message": "Turn off $BROWSER$ autofill",
+    "message": "Desactivar autocompletado de $BROWSER$",
     "placeholders": {
       "browser": {
         "content": "$1",
@@ -1615,22 +1621,22 @@
     }
   },
   "turnOffAutofill": {
-    "message": "Turn off autofill"
+    "message": "Desactivar autocompletado"
   },
   "showInlineMenuLabel": {
-    "message": "Show autofill suggestions on form fields"
+    "message": "Mostrar sugerencias de autocompletado en campos de formulario"
   },
   "showInlineMenuIdentitiesLabel": {
-    "message": "Display identities as suggestions"
+    "message": "Mostrar identidades como sugerencias"
   },
   "showInlineMenuCardsLabel": {
     "message": "Mostrar tarjetas como sugerencias"
   },
   "showInlineMenuOnIconSelectionLabel": {
-    "message": "Display suggestions when icon is selected"
+    "message": "Mostrar sugerencias cuando el icono esté seleccionado"
   },
   "showInlineMenuOnFormFieldsDescAlt": {
-    "message": "Applies to all logged in accounts."
+    "message": "Se aplica a todas las cuentas a las que se haya iniciado sesión."
   },
   "turnOffBrowserBuiltInPasswordManagerSettings": {
     "message": "Desactive la configuración del gestor de contraseñas del navegador para evitar conflictos."
@@ -1693,13 +1699,13 @@
     "message": "Abrir caja fuerte en la barra lateral"
   },
   "commandAutofillLoginDesc": {
-    "message": "Autofill the last used login for the current website"
+    "message": "Autocompletar el último inicio de sesión usado para el sitio web actual"
   },
   "commandAutofillCardDesc": {
-    "message": "Autofill the last used card for the current website"
+    "message": "Autocompletar la última tarjeta usada para el sitio web actual"
   },
   "commandAutofillIdentityDesc": {
-    "message": "Autofill the last used identity for the current website"
+    "message": "Autocompletar la última identidad usada para el sitio web actual"
   },
   "commandGeneratePasswordDesc": {
     "message": "Generar y copiar una nueva contraseña aleatoria al portapapeles."
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Llave SSH"
   },
+  "typeNote": {
+    "message": "Nota"
+  },
   "newItemHeader": {
     "message": "Nuevo $TYPE$",
     "placeholders": {
@@ -1959,7 +1968,7 @@
     "message": "Borrar historial del generador"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "Si continúas, todas las entradas se eliminarán permanentemente del historial del generador. ¿Estás seguro de que quieres continuar?"
   },
   "back": {
     "message": "Atrás"
@@ -2024,7 +2033,7 @@
     "description": "Domain name. Ex. website.com"
   },
   "baseDomainOptionRecommended": {
-    "message": "Base domain (recommended)",
+    "message": "Dominio base (recomendado)",
     "description": "Domain name. Ex. website.com"
   },
   "domainName": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Establece tu código PIN para desbloquear Bitwarden. Tus ajustes de PIN se reiniciarán si alguna vez cierras tu sesión completamente de la aplicación."
   },
-  "setYourPinCode1": {
-    "message": "Su PIN se utilizará para desbloquear Bitwarden en lugar de su contraseña maestra. Su PIN se restablecerá si alguna vez cierra completamente la sesión de Bitwarden."
+  "setPinCode": {
+    "message": "Puedes usar este PIN para desbloquear Bitwarden. Tu PIN se reiniciará si alguna vez cierras la sesión de la aplicación por completo."
   },
   "pinRequired": {
     "message": "Código PIN requerido."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Usar esta contraseña"
   },
+  "useThisPassphrase": {
+    "message": "Usar esta frase de contraseña"
+  },
   "useThisUsername": {
     "message": "Usar este nombre de usuario"
   },
@@ -2374,7 +2386,7 @@
     "message": "Política de privacidad"
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Tu nueva contraseña no puede ser igual a tu contraseña actual."
   },
   "hintEqualsPassword": {
     "message": "Tu contraseña no puede ser idéntica a la pista de contraseña."
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Una política organizacional ha bloqueado la importación de elementos a su caja fuerte personal."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Una política establecida en 1 o más organizaciones te impide importar tarjetas a tus cajas fuertes."
+  },
   "domainsTitle": {
     "message": "Dominios",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Cambiar"
   },
+  "changePassword": {
+    "message": "Cambiar contraseña",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Cambiar contraseña - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Contraseña en riesgo"
+  },
   "atRiskPasswords": {
     "message": "Contraseñas de riesgo"
   },
@@ -2547,7 +2572,7 @@
     }
   },
   "atRiskPasswordsDescMultiOrgPlural": {
-    "message": "Your organizations are requesting you change the $COUNT$ passwords because they are at-risk.",
+    "message": "Tus organizaciones te están solicitando que cambies las $COUNT$ contraseñas porque están en riesgo.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2555,11 +2580,31 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "La contraseña para este sitio está en riesgo. $ORGANIZATION$ ha solicitado que la cambies.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ quiere que cambies esta contraseña porque está en riesgo. Navega a los ajustes de tu cuenta para cambiar la contraseña.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
-    "message": "Review and change one at-risk password"
+    "message": "Revisa y cambia una contraseña en riesgo"
   },
   "reviewAndChangeAtRiskPasswordsPlural": {
-    "message": "Review and change $COUNT$ at-risk passwords",
+    "message": "Revisa y cambia $COUNT$ contraseñas en riesgo",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2574,7 +2619,7 @@
     "message": "Update your settings so you can quickly autofill your passwords and generate new ones"
   },
   "reviewAtRiskLogins": {
-    "message": "Review at-risk logins"
+    "message": "Revisar inicios de sesión en riesgo"
   },
   "reviewAtRiskPasswords": {
     "message": "Revisar contraseñas de riesgo"
@@ -2587,7 +2632,7 @@
     "message": "Illustration of a list of logins that are at-risk."
   },
   "generatePasswordSlideDesc": {
-    "message": "Quickly generate a strong, unique password with the Bitwarden autofill menu on the at-risk site.",
+    "message": "Genera rápidamente una contraseña segura y única con el menú de autocompletado de Bitwarden en el sitio en riesgo.",
     "description": "Description of the generate password slide on the at-risk password page carousel"
   },
   "generatePasswordSlideImgAltPeriod": {
@@ -2644,7 +2689,7 @@
     "description": "Displayed under the limit views field on Send"
   },
   "limitSendViewsCount": {
-    "message": "$ACCESSCOUNT$ views left",
+    "message": "$ACCESSCOUNT$ visualizaciones restantes",
     "description": "Displayed under the limit views field on Send",
     "placeholders": {
       "accessCount": {
@@ -2674,8 +2719,12 @@
     "message": "Todos los Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Número máximo de accesos alcanzado",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
-    "message": "Hide text by default"
+    "message": "Ocultar texto por defecto"
   },
   "expired": {
     "message": "Caducado"
@@ -2722,7 +2771,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
-    "message": "Are you sure you want to permanently delete this Send?",
+    "message": "¿Estás seguro de que quieres eliminar permanentemente este Send?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
@@ -2733,7 +2782,7 @@
     "message": "Fecha de eliminación"
   },
   "deletionDateDescV2": {
-    "message": "The Send will be permanently deleted on this date.",
+    "message": "El Send se borrará permanentemente en esta fecha.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
@@ -2755,7 +2804,7 @@
     "message": "Personalizado"
   },
   "sendPasswordDescV3": {
-    "message": "Add an optional password for recipients to access this Send.",
+    "message": "Añade una contraseña opcional para que los destinatarios accedan a este Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
@@ -2778,15 +2827,15 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSendSuccessfully": {
-    "message": "Send created successfully!",
+    "message": "¡Send creado con éxito!",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInHoursSingle": {
-    "message": "The Send will be available to anyone with the link for the next 1 hour.",
+    "message": "El Send estará disponible a cualquiera que tenga el enlace durante la próxima hora.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInHours": {
-    "message": "The Send will be available to anyone with the link for the next $HOURS$ hours.",
+    "message": "El Send estará disponible a cualquier que tenga el enlace durante las próximas $HOURS$ horas.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
     "placeholders": {
       "hours": {
@@ -2796,11 +2845,11 @@
     }
   },
   "sendExpiresInDaysSingle": {
-    "message": "The Send will be available to anyone with the link for the next 1 day.",
+    "message": "El Send estará disponible a cualquier que tenga el enlace durante el próximo día.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInDays": {
-    "message": "The Send will be available to anyone with the link for the next $DAYS$ days.",
+    "message": "El Send estará disponible a cualquier que tenga el enlace durante los próximos $DAYS$ días.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
     "placeholders": {
       "days": {
@@ -2810,7 +2859,7 @@
     }
   },
   "sendLinkCopied": {
-    "message": "Send link copied",
+    "message": "Enlace del Send copiado",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Debes verificar tu correo electrónico para usar esta función. Puedes verificar tu correo electrónico en la caja fuerte web."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Contraseña maestra actualizada"
   },
@@ -2948,7 +3000,7 @@
     }
   },
   "vaultTimeoutPolicyInEffect1": {
-    "message": "$HOURS$ hour(s) and $MINUTES$ minute(s) maximum.",
+    "message": "$HOURS$ hora(s) y $MINUTES$ minuto(s) como máximo.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -3125,7 +3177,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Use $RECOMMENDED$ words or more to generate a strong passphrase.",
+    "message": " Usa $RECOMMENDED$ palabras o más para generar una frase de contraseña segura.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3170,7 +3222,7 @@
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Choose a domain that is supported by the selected service",
+    "message": "Elige un dominio que esté soportado por el servicio seleccionado",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
@@ -3226,7 +3278,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "message": "$SERVICENAME$ ha rechazado tu solicitud. Por favor, contacta con tu proveedor del servicio para obtener asistencia.",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -3236,7 +3288,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ ha rechazado tu solicitud $ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Solicitud enviada"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Contraseña maestra comprometida"
   },
@@ -3505,10 +3560,10 @@
     "message": "Se requiere aprobación del dispositivo. Seleccione una opción de aprobación a continuación:"
   },
   "deviceApprovalRequiredV2": {
-    "message": "Device approval required"
+    "message": "Aprobación del dispositivo requerida"
   },
   "selectAnApprovalOptionBelow": {
-    "message": "Select an approval option below"
+    "message": "Selecciona una opción de aprobación abajo"
   },
   "rememberThisDevice": {
     "message": "Recordar este dispositivo"
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Solicitar aprobación del administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Se requiere un identificador único de inicio de sesión de la organización."
   },
@@ -3578,22 +3639,22 @@
     "message": "Falta el correo electrónico del usuario"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "Correo electrónico del usuario activo no encontrado. Cerrando sesión."
   },
   "deviceTrusted": {
     "message": "Dispositivo de confianza"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Confiar en la organización"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Confiar"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "No confiar"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "La organización no es de confianza"
   },
   "emergencyAccessTrustWarning": {
     "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
@@ -3605,22 +3666,14 @@
     "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
   },
   "trustUser": {
-    "message": "Trust user"
-  },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+    "message": "Confiar con el usuario"
   },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "Envía información sensible de forma segura",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "Comparte archivos y datos de forma segura con cualquiera, en cualquier plataforma. Tu información permanecerá encriptada de extremo a extremo, limitando su exposición.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -3777,7 +3830,7 @@
     "description": "Text to display in overlay when the account is locked."
   },
   "unlockYourAccountToViewAutofillSuggestions": {
-    "message": "Unlock your account to view autofill suggestions",
+    "message": "Desbloquea tu cuenta para ver sugerencias de autocompletado",
     "description": "Text to display in overlay when the account is locked."
   },
   "unlockAccount": {
@@ -3785,7 +3838,7 @@
     "description": "Button text to display in overlay when the account is locked."
   },
   "unlockAccountAria": {
-    "message": "Unlock your account, opens in a new window",
+    "message": "Desbloquea tu cuenta, se abre en una nueva ventana",
     "description": "Screen reader text (aria-label) for unlock account button in overlay"
   },
   "totpCodeAria": {
@@ -3793,7 +3846,7 @@
     "description": "Aria label for the totp code displayed in the inline menu for autofill"
   },
   "totpSecondsSpanAria": {
-    "message": "Time remaining before current TOTP expires",
+    "message": "Tiempo restante antes de que el TOTP actual expire",
     "description": "Aria label for the totp seconds displayed in the inline menu for autofill"
   },
   "fillCredentialsFor": {
@@ -3817,11 +3870,11 @@
     "description": "Screen reader text (aria-label) for new item button in overlay"
   },
   "newLogin": {
-    "message": "New login",
+    "message": "Nuevo inicio de sesión",
     "description": "Button text to display within inline menu when there are no matching items on a login field"
   },
   "addNewLoginItemAria": {
-    "message": "Add new vault login item, opens in a new window",
+    "message": "Añadir nuevo elemento de inicio de sesión a la caja fuerte, se abre en una nueva ventana",
     "description": "Screen reader text (aria-label) for new login button within inline menu"
   },
   "newCard": {
@@ -4016,10 +4069,10 @@
     "message": "Clave de acceso"
   },
   "accessing": {
-    "message": "Accessing"
+    "message": "Accediendo"
   },
   "loggedInExclamation": {
-    "message": "Logged in!"
+    "message": "¡Sesión iniciada!"
   },
   "passkeyNotCopied": {
     "message": "La clave de acceso no se copiará"
@@ -4031,7 +4084,7 @@
     "message": "Verificación requerida por el sitio inicial. Esta característica aún no está implementada para cuentas sin contraseña maestra."
   },
   "logInWithPasskeyQuestion": {
-    "message": "Log in with passkey?"
+    "message": "¿Iniciar sesión con clave de acceso?"
   },
   "passkeyAlreadyExists": {
     "message": "Ya existe una clave de acceso para esta aplicación."
@@ -4043,10 +4096,10 @@
     "message": "No tiene un inicio de sesión que coincida para este sitio."
   },
   "noMatchingLoginsForSite": {
-    "message": "No matching logins for this site"
+    "message": "No hay inicios de sesión coincidentes para este sitio"
   },
   "searchSavePasskeyNewLogin": {
-    "message": "Search or save passkey as new login"
+    "message": "Busca o guarda la clave de acceso como nuevo inicio de sesión"
   },
   "confirm": {
     "message": "Confirmar"
@@ -4058,10 +4111,10 @@
     "message": "Guardar clave de acceso como nuevo inicio de sesión"
   },
   "chooseCipherForPasskeySave": {
-    "message": "Choose a login to save this passkey to"
+    "message": "Elige un inicio de sesión al que guardar esta clave de acceso"
   },
   "chooseCipherForPasskeyAuth": {
-    "message": "Choose a passkey to log in with"
+    "message": "Elige una clave de acceso para iniciar sesión en"
   },
   "passkeyItem": {
     "message": "Elemento de clave de acceso"
@@ -4209,12 +4262,32 @@
     "message": "Formatos comunes",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
-    "message": "Continue to browser settings?",
+    "message": "¿Continuar a los ajustes del navegador?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
   },
   "confirmContinueToHelpCenter": {
-    "message": "Continue to Help Center?",
+    "message": "¿Continuar al Centro de Ayuda?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant Help Center page"
   },
   "confirmContinueToHelpCenterPasswordManagementContent": {
@@ -4287,10 +4360,10 @@
     "message": "Clave de acceso eliminada"
   },
   "autofillSuggestions": {
-    "message": "Autofill suggestions"
+    "message": "Sugerencias de autocompletado"
   },
   "itemSuggestions": {
-    "message": "Suggested items"
+    "message": "Elementos sugeridos"
   },
   "autofillSuggestionsTip": {
     "message": "Guarda un elemento de inicio de sesión para este sitio para autocompletar"
@@ -4355,7 +4428,7 @@
     }
   },
   "viewItemTitleWithField": {
-    "message": "View item - $ITEMNAME$ - $FIELD$",
+    "message": "Ver elemento - $ITEMNAME$ - $FIELD$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4379,7 +4452,7 @@
     }
   },
   "autofillTitleWithField": {
-    "message": "Autofill - $ITEMNAME$ - $FIELD$",
+    "message": "Autocompletar - $ITEMNAME$ - $FIELD$",
     "description": "Title for a button that autofills a login item.",
     "placeholders": {
       "itemname": {
@@ -4393,7 +4466,7 @@
     }
   },
   "copyFieldValue": {
-    "message": "Copy $FIELD$, $VALUE$",
+    "message": "Copiar $FIELD$, $VALUE$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -4410,7 +4483,7 @@
     "message": "No hay valores para copiar"
   },
   "assignToCollections": {
-    "message": "Assign to collections"
+    "message": "Asignar a colecciones"
   },
   "copyEmail": {
     "message": "Copiar correo electrónico"
@@ -4540,25 +4613,25 @@
     }
   },
   "downloadBitwarden": {
-    "message": "Download Bitwarden"
+    "message": "Descargar Bitwarden"
   },
   "downloadBitwardenOnAllDevices": {
-    "message": "Download Bitwarden on all devices"
+    "message": "Descargar Bitwarden en todos los dispositivos"
   },
   "getTheMobileApp": {
-    "message": "Get the mobile app"
+    "message": "Obtén la aplicación móvil"
   },
   "getTheMobileAppDesc": {
     "message": "Access your passwords on the go with the Bitwarden mobile app."
   },
   "getTheDesktopApp": {
-    "message": "Get the desktop app"
+    "message": "Obtén la aplicación de escritorio"
   },
   "getTheDesktopAppDesc": {
     "message": "Access your vault without a browser, then set up unlock with biometrics to expedite unlocking in both the desktop app and browser extension."
   },
   "downloadFromBitwardenNow": {
-    "message": "Download from bitwarden.com now"
+    "message": "Descarga desde bitwarden.com ahora"
   },
   "getItOnGooglePlay": {
     "message": "Consíguela en Google Play"
@@ -4582,10 +4655,10 @@
     "message": "Filter vault"
   },
   "filterApplied": {
-    "message": "One filter applied"
+    "message": "Un filtro aplicado"
   },
   "filterAppliedPlural": {
-    "message": "$COUNT$ filters applied",
+    "message": "$COUNT$ filtros aplicados",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4619,10 +4692,10 @@
     "message": "Credenciales de inicio de sesión"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "Clave de autenticador"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "Opciones de autocompletado"
   },
   "websiteUri": {
     "message": "Página web (URI)"
@@ -4638,7 +4711,7 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Sitio web añadido"
   },
   "addWebsite": {
     "message": "Añadir página web"
@@ -4681,7 +4754,7 @@
     "message": "Tarjeta caducada"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "Si la has renovado, actualiza la información de la tarjeta"
   },
   "cardDetails": {
     "message": "Datos de la tarjeta"
@@ -4711,7 +4784,7 @@
     "message": "Datos"
   },
   "passkeys": {
-    "message": "Passkeys",
+    "message": "Claves de acceso",
     "description": "A section header for a list of passkeys."
   },
   "passwords": {
@@ -4726,13 +4799,13 @@
     "message": "Asignar"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Only organization members with access to these collections will be able to see the item."
+    "message": "Solo los miembros de la organización con acceso a estas colecciones podrán ver el elemento."
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Only organization members with access to these collections will be able to see the items."
+    "message": "Solo los miembros de la organización con acceso a estas colecciones podrán ver los elementos."
   },
   "bulkCollectionAssignmentWarning": {
-    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "message": "Has seleccionado $TOTAL_COUNT$ elementos. No puedes actualizar $READONLY_COUNT$ de los elementos porque no tienes permisos de edición.",
     "placeholders": {
       "total_count": {
         "content": "$1",
@@ -4756,10 +4829,10 @@
     "message": "Etiqueta de campo"
   },
   "textHelpText": {
-    "message": "Use text fields for data like security questions"
+    "message": "Usa campos de texto para datos como preguntas de seguridad"
   },
   "hiddenHelpText": {
-    "message": "Use hidden fields for sensitive data like a password"
+    "message": "Usa campos ocultos para datos sensibles como una contraseña"
   },
   "checkBoxHelpText": {
     "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
@@ -4830,10 +4903,10 @@
     }
   },
   "selectCollectionsToAssign": {
-    "message": "Select collections to assign"
+    "message": "Selecciona colecciones para asignar"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+    "message": "1 elemento será transferido permanentemente a la organización seleccionada. Ya no serás el propietario de este elemento."
   },
   "personalItemsTransferWarningPlural": {
     "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
@@ -4867,13 +4940,13 @@
     }
   },
   "successfullyAssignedCollections": {
-    "message": "Successfully assigned collections"
+    "message": "Colecciones asignadas correctamente"
   },
   "nothingSelected": {
-    "message": "You have not selected anything."
+    "message": "No has seleccionado nada."
   },
   "itemsMovedToOrg": {
-    "message": "Items moved to $ORGNAME$",
+    "message": "Elementos movidos a $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4882,7 +4955,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Item moved to $ORGNAME$",
+    "message": "Elemento movido a $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4926,13 +4999,13 @@
     "message": "Acciones de cuenta"
   },
   "showNumberOfAutofillSuggestions": {
-    "message": "Show number of login autofill suggestions on extension icon"
+    "message": "Mostrar número de sugerencias de autocompletado de inicios de sesión en el icono de la extensión"
   },
   "showQuickCopyActions": {
     "message": "Show quick copy actions on Vault"
   },
   "systemDefault": {
-    "message": "System default"
+    "message": "Predeterminado del sistema"
   },
   "enterprisePolicyRequirementsApplied": {
     "message": "Enterprise policy requirements have been applied to this setting"
@@ -4974,10 +5047,10 @@
     "message": "File saved to device. Manage from your device downloads."
   },
   "showCharacterCount": {
-    "message": "Show character count"
+    "message": "Mostrar número de caracteres"
   },
   "hideCharacterCount": {
-    "message": "Hide character count"
+    "message": "Ocultar número de caracteres"
   },
   "itemsInTrash": {
     "message": "Elementos en la papelera"
@@ -5001,10 +5074,10 @@
     "message": "No tiene permiso de editar este elemento"
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+    "message": "El desbloqueo biométrico no está disponible porque primero es necesario desbloquear con PIN o contraseña."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Biometric unlock is currently unavailable."
+    "message": "El desbloqueo biométrico no está disponible actualmente."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
     "message": "Biometric unlock is unavailable due to misconfigured system files."
@@ -5013,10 +5086,10 @@
     "message": "Biometric unlock is unavailable due to misconfigured system files."
   },
   "biometricsStatusHelptextDesktopDisconnected": {
-    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+    "message": "El desbloqueo biométrico no está disponible porque la aplicación de escritorio de Bitwarden está cerrada."
   },
   "biometricsStatusHelptextNotEnabledInDesktop": {
-    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "message": "El desbloqueo biométrico no está disponible porque no está habilitado para $EMAIL$ en la aplicación de escritorio Bitwarden.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -5025,16 +5098,19 @@
     }
   },
   "biometricsStatusHelptextUnavailableReasonUnknown": {
-    "message": "Biometric unlock is currently unavailable for an unknown reason."
+    "message": "El desbloqueo biométrico no está disponible actualmente por una razón desconocida."
   },
   "unlockVault": {
-    "message": "Unlock your vault in seconds"
+    "message": "Desbloquea tu caja fuete en segundos"
   },
   "unlockVaultDesc": {
     "message": "You can customize your unlock and timeout settings to more quickly access your vault."
   },
   "unlockPinSet": {
-    "message": "Unlock PIN set"
+    "message": "Desbloqueo con PIN establecido"
+  },
+  "unlockWithBiometricSet": {
+    "message": "Desbloqueo con biometría establecido"
   },
   "authenticating": {
     "message": "Autenticando"
@@ -5223,16 +5299,16 @@
     "message": "Introduzca la contraseña"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "La clave SSH es inválida"
   },
   "sshKeyTypeUnsupported": {
-    "message": "The SSH key type is not supported"
+    "message": "El tipo de clave SSH no está soportado"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "Importar clave desde el portapapeles"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "Clave SSH importada con éxito"
   },
   "cannotRemoveViewOnlyCollections": {
     "message": "No puedes eliminar colecciones con permisos de solo visualización: $COLLECTIONS$",
@@ -5253,16 +5329,16 @@
     "message": "Cambiar contraseña de riesgo"
   },
   "settingsVaultOptions": {
-    "message": "Vault options"
+    "message": "Opciones de la caja fuerte"
   },
   "emptyVaultDescription": {
     "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
   },
   "introCarouselLabel": {
-    "message": "Welcome to Bitwarden"
+    "message": "Bienvenido a Bitwarden"
   },
   "securityPrioritized": {
-    "message": "Security, prioritized"
+    "message": "Seguridad, priorizada"
   },
   "securityPrioritizedBody": {
     "message": "Save logins, cards, and identities to your secure vault. Bitwarden uses zero-knowledge, end-to-end encryption to protect what’s important to you."
@@ -5271,7 +5347,7 @@
     "message": "Quick and easy login"
   },
   "quickLoginBody": {
-    "message": "Set up biometric unlock and autofill to log into your accounts without typing a single letter."
+    "message": "Configura el desbloqueo biométrico y el autocompletado para iniciar sesión en tus cuentas sin tener que escribir ni una sola letra."
   },
   "secureUser": {
     "message": "Level up your logins"
@@ -5280,25 +5356,25 @@
     "message": "Utilice el generador para crear y guardar contraseñas fuertes y únicas para todas sus cuentas."
   },
   "secureDevices": {
-    "message": "Your data, when and where you need it"
+    "message": "Tus datos, dónde y cuándo los necesites"
   },
   "secureDevicesBody": {
     "message": "Guarda contraseñas ilimitadas a través de dispositivos ilimitados con aplicaciones móviles, de navegador y de escritorio de Bitwarden."
   },
   "nudgeBadgeAria": {
-    "message": "1 notification"
+    "message": "1 notificación"
   },
   "emptyVaultNudgeTitle": {
-    "message": "Import existing passwords"
+    "message": "Importar contraseñas existentes"
   },
   "emptyVaultNudgeBody": {
-    "message": "Use the importer to quickly transfer logins to Bitwarden without manually adding them."
+    "message": "Usa el importador para transferir rápidamente inicios de sesión a Bitwarden sin añadirlos manualmente."
   },
   "emptyVaultNudgeButton": {
-    "message": "Import now"
+    "message": "Importar ahora"
   },
   "hasItemsVaultNudgeTitle": {
-    "message": "Welcome to your vault!"
+    "message": "¡Bienvenido a tu caja fuerte!"
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5310,7 +5386,7 @@
     "message": "Search your vault for something else"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Ahorra tiempo con el autocompletado"
   },
   "newLoginNudgeBodyOne": {
     "message": "Include a",
@@ -5318,7 +5394,7 @@
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Sitio web",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
@@ -5334,16 +5410,16 @@
     "message": "With cards, easily autofill payment forms securely and accurately."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Simplifica la creación de cuentas"
   },
   "newIdentityNudgeBody": {
     "message": "With identities, quickly autofill long registration or contact forms."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Mantén tus datos sensibles seguros"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Con las notas, almacena de forma segura datos sensibles como datos bancarios o de seguros."
   },
   "newSshNudgeTitle": {
     "message": "Developer-friendly SSH access"
@@ -5354,20 +5430,20 @@
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Más información sobre el agente SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "Crea contraseñas rápidamente"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "Crea fácilmente contraseñas seguras y únicas haciendo clic en",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "para ayudarte a mantener tus inicios de sesión seguros.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
@@ -5376,6 +5452,10 @@
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
-    "message": "You do not have permissions to view this page. Try logging in with a different account."
+    "message": "No tienes permisos para ver esta página. Intenta iniciar sesión con otra cuenta."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/et/messages.json b/apps/browser/src/_locales/et/messages.json
index 26b4bf69fb4..99e7b72a524 100644
--- a/apps/browser/src/_locales/et/messages.json
+++ b/apps/browser/src/_locales/et/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Paku olemasolevate andmete uuendamist"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Funktsioon pole saadaval"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium versioon"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "Uus $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Määra Bitwardeni lahtilukustamiseks PIN kood. Rakendusest täielikult välja logides nullitakse ka PIN koodi seaded."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "Nõutakse PIN koodi."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Kasuta seda parooli"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Kasuta seda kasutajanime"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Kõik Sendid",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Selle funktsiooni kasutamiseks pead kinnitama oma e-posti aadressi. Saad seda teha veebihoidlas."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Uuendas ülemparooli"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Ülemparool on haavatav"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Küsi admini kinnitust"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Nõutav on organisatsiooni SSO identifikaator."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/eu/messages.json b/apps/browser/src/_locales/eu/messages.json
index b3f525d7be5..393f922463e 100644
--- a/apps/browser/src/_locales/eu/messages.json
+++ b/apps/browser/src/_locales/eu/messages.json
@@ -6,7 +6,7 @@
     "message": "Bitwarden logo"
   },
   "extName": {
-    "message": "Bitwarden Password Manager",
+    "message": "Bitwarden pasahitz kudeatzailea",
     "description": "Extension name, MUST be less than 40 characters (Safari restriction)"
   },
   "extDesc": {
@@ -17,7 +17,7 @@
     "message": "Saioa hasi edo sortu kontu berri bat zure kutxa gotorrera sartzeko."
   },
   "inviteAccepted": {
-    "message": "Invitation accepted"
+    "message": "Gonbidapena onartua"
   },
   "createAccount": {
     "message": "Sortu kontua"
@@ -32,13 +32,13 @@
     "message": "Use single sign-on"
   },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "Ongi etorri berriro ere"
   },
   "setAStrongPassword": {
-    "message": "Set a strong password"
+    "message": "Pasahitz sendo bat ezarri"
   },
   "finishCreatingYourAccountBySettingAPassword": {
-    "message": "Finish creating your account by setting a password"
+    "message": "Amaitu zure kontua sortzen pasahitza ezarriz"
   },
   "enterpriseSingleSignOn": {
     "message": "Enpresentzako saio hasiera bakarra"
@@ -150,7 +150,7 @@
     "message": "Kopiatu segurtasun-kodea"
   },
   "copyName": {
-    "message": "Copy name"
+    "message": "Izena kopiatu"
   },
   "copyCompany": {
     "message": "Copy company"
@@ -186,14 +186,14 @@
     "message": "Copy website"
   },
   "copyNotes": {
-    "message": "Copy notes"
+    "message": "Kopiatu oharrak"
   },
   "copy": {
-    "message": "Copy",
+    "message": "Kopiatu",
     "description": "Copy to clipboard"
   },
   "fill": {
-    "message": "Fill",
+    "message": "Bete",
     "description": "This string is used on the vault page to indicate autofilling. Horizontal space is limited in the interface here so try and keep translations as concise as possible."
   },
   "autoFill": {
@@ -209,10 +209,10 @@
     "message": "Auto-bete nortasuna"
   },
   "fillVerificationCode": {
-    "message": "Fill verification code"
+    "message": "Bete egiaztapen-kodea"
   },
   "fillVerificationCodeAria": {
-    "message": "Fill Verification Code",
+    "message": "Bete egiaztapen-kodea",
     "description": "Aria label for the heading displayed the inline menu for totp code autofill"
   },
   "generatePasswordCopied": {
@@ -231,7 +231,7 @@
     "message": "Nortasunik ez"
   },
   "addLoginMenu": {
-    "message": "Add login"
+    "message": "Gehitu logina"
   },
   "addCardMenu": {
     "message": "Gehitu txartela"
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Galdetu uneko saio-hasiera eguneratzeko"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Ezaugarria ez dago erabilgarri"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium bazkidea"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Ezarri zure PIN kodea Bitwarden desblokeatzeko. Zure PIN-aren konfigurazioa berrezarriko da, noizbait aplikaziotik erabat saioa ixten baduzu."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN-a beharrezkoa da."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Send guztiak",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Emaila egiaztatu behar duzu funtzio hau erabiltzeko. Emaila web-eko kutxa gotorrean egiazta dezakezu."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Pasahitz nagusia eguneratuta"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Eskatu administratzailearen onarpena"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5187,13 +5263,13 @@
     "message": "Lowercase"
   },
   "uppercaseAriaLabel": {
-    "message": "Uppercase"
+    "message": "Maiuskulak"
   },
   "generatedPassword": {
-    "message": "Generated password"
+    "message": "Sortutako pasahitza"
   },
   "compactMode": {
-    "message": "Compact mode"
+    "message": "Modu trinkoa"
   },
   "beta": {
     "message": "Beta"
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/fa/messages.json b/apps/browser/src/_locales/fa/messages.json
index 33a779a7909..fb9380d5317 100644
--- a/apps/browser/src/_locales/fa/messages.json
+++ b/apps/browser/src/_locales/fa/messages.json
@@ -41,7 +41,7 @@
     "message": "ایجاد حساب کاربری خود را با تنظیم کلمه عبور تکمیل کنید"
   },
   "enterpriseSingleSignOn": {
-    "message": "ورود به سیستم پروژه"
+    "message": "ورود یکپارچه سازمانی"
   },
   "cancel": {
     "message": "انصراف"
@@ -258,13 +258,13 @@
     "message": "حساب ایمیل"
   },
   "requestHint": {
-    "message": "درخواست راهنمایی"
+    "message": "درخواست یادآور"
   },
   "requestPasswordHint": {
     "message": "درخواست یادآور کلمه عبور"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "نشانی ایمیل حساب کاربری خود را وارد کنید تا راهنمای کلمه عبور برای شما ارسال شود"
+    "message": "نشانی ایمیل حساب کاربری خود را وارد کنید تا یادآور کلمه عبور برای شما ارسال شود"
   },
   "getMasterPasswordHint": {
     "message": "دریافت یادآور کلمه عبور اصلی"
@@ -294,7 +294,7 @@
     "message": "با برنامه وب ادامه می‌دهید؟"
   },
   "continueToWebAppDesc": {
-    "message": "ویژگی‌های بیشتر حساب Bitwarden خود را در برنامه وب کاوش کنید."
+    "message": "ویژگی‌های بیشتر حساب کاربری Bitwarden خود را در برنامه وب کاوش کنید."
   },
   "continueToHelpCenter": {
     "message": "به مرکز راهنمایی ادامه می‌دهید؟"
@@ -316,11 +316,11 @@
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "yourAccountsFingerprint": {
-    "message": "عبارت اثر انگشت حساب شما",
+    "message": "عبارت اثر انگشت حساب کاربری شما",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "twoStepLogin": {
-    "message": "ورود دو مرحله ای"
+    "message": "ورود دو مرحله‌ای"
   },
   "logOut": {
     "message": "خروج"
@@ -407,7 +407,7 @@
     "message": "برای سامان‌دهی موردهای گاوصندوق خود پوشه ایجاد کنید"
   },
   "deleteFolderPermanently": {
-    "message": "مطمئنید می‌خواهید این پوشه را برای همیشه پاک کنید؟"
+    "message": "آیا مطمئنید می‌خواهید این پوشه را برای همیشه پاک کنید؟"
   },
   "deleteFolder": {
     "message": "حذف پوشه"
@@ -428,7 +428,7 @@
     "message": "انجمن‌های Bitwarden را کاوش کنید"
   },
   "contactSupport": {
-    "message": "پیام به پشتیبانیBitwarden"
+    "message": "پیام به پشتیبانی Bitwarden"
   },
   "sync": {
     "message": "همگام‌سازی"
@@ -575,13 +575,13 @@
     "message": "مورد علاقه"
   },
   "unfavorite": {
-    "message": "حذف از علایق"
+    "message": "حذف از مورد علاقه"
   },
   "itemAddedToFavorites": {
     "message": "به موارد مورد علاقه افزوده شد"
   },
   "itemRemovedFromFavorites": {
-    "message": "از علایق حذف شد"
+    "message": "از مورد علاقه حذف شد"
   },
   "notes": {
     "message": "یادداشت‌ها"
@@ -635,7 +635,7 @@
     "message": "باز کردن امکانات"
   },
   "unlockMethodNeededToChangeTimeoutActionDesc": {
-    "message": "یک روش بازگشایی برای پایان زمان مجاز تنظیم کنید."
+    "message": "یک روش باز کردن قفل برای پایان زمان مجاز راه‌اندازی کنید."
   },
   "unlockMethodNeeded": {
     "message": "یک روش باز کردن قفل را در تنظیمات راه‌اندازی کنید"
@@ -653,7 +653,7 @@
     "message": "به این افزونه امتیاز دهید"
   },
   "browserNotSupportClipboard": {
-    "message": "مرورگر شما از کپی کلیپ بورد آسان پشتیبانی نمی‌کند. به جای آن به صورت دستی کپی کنید."
+    "message": "مرورگر شما از کپی حافظه موقت آسان پشتیبانی نمی‌کند. به جای آن به صورت دستی کپی کنید."
   },
   "verifyYourIdentity": {
     "message": "هویت خود را تأیید کنید"
@@ -741,10 +741,10 @@
     "message": "4 ساعت"
   },
   "onLocked": {
-    "message": "در قفل سیستم"
+    "message": "هنگام قفل سیستم"
   },
   "onRestart": {
-    "message": "هنگام راه اندازی مجدد"
+    "message": "هنگام راه‌اندازی مجدد"
   },
   "never": {
     "message": "هرگز"
@@ -799,7 +799,7 @@
     "message": "حساب کاربری جدید شما ایجاد شده است!"
   },
   "youHaveBeenLoggedIn": {
-    "message": "شما با موفقیت وارد شدید!"
+    "message": "شما وارد شدید!"
   },
   "youSuccessfullyLoggedIn": {
     "message": "شما با موفقیت وارد شدید"
@@ -808,7 +808,7 @@
     "message": "می‌توانید این پنجره را ببندید"
   },
   "masterPassSent": {
-    "message": "ما یک ایمیل همراه با راهنمای کلمه عبور اصلی برایتان ارسال کردیم."
+    "message": "ما یک ایمیل همراه با یادآور کلمه عبور اصلی برایتان ارسال کردیم."
   },
   "verificationCodeRequired": {
     "message": "کد تأیید مورد نیاز است."
@@ -820,7 +820,7 @@
     "message": "کد تأیید نامعتبر است"
   },
   "valueCopied": {
-    "message": " کپی شده",
+    "message": "$VALUE$ کپی شد",
     "description": "Value has been copied to the clipboard.",
     "placeholders": {
       "value": {
@@ -848,7 +848,7 @@
     "message": "Bitwarden می‌تواند کدهای تأیید دو مرحله‌ای را ذخیره و پر کند. کلید را کپی کرده و در این فیلد قرار دهید."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden می‌تواند کدهای تأیید دو مرحله‌ای را ذخیره و پر کند. برای اسکن کد QR احراز هویت کننده این وب‌سایت، روی آیکون دوربین کلیک کنید یا کلید را کپی کرده و در این فیلد قرار دهید."
+    "message": "Bitwarden می‌تواند کدهای تأیید دو مرحله‌ای را ذخیره و پر کند. برای اسکن کد QR احراز هویت کننده این وب‌سایت، روی نماد دوربین کلیک کنید یا کلید را کپی کرده و در این فیلد قرار دهید."
   },
   "learnMoreAboutAuthenticators": {
     "message": "درباره احراز هویت کننده‌ها بیشتر بدانید"
@@ -860,7 +860,7 @@
     "message": "خارج شد"
   },
   "loggedOutDesc": {
-    "message": "شما از حساب خود خارج شده‌اید."
+    "message": "شما از حساب کاربری خود خارج شده‌اید."
   },
   "loginExpired": {
     "message": "نشست ورود شما منقضی شده است."
@@ -923,7 +923,7 @@
     "message": "پوشه اضافه شد"
   },
   "twoStepLoginConfirmation": {
-    "message": "ورود دو مرحله ای باعث می‌شود که حساب کاربری شما با استفاده از یک دستگاه دیگر مانند کلید امنیتی، برنامه احراز هویت، پیامک، تماس تلفنی و یا ایمیل، اعتبار خود را با ایمنی بیشتر اثبات کند. ورود دو مرحله ای می تواند در bitwarden.com فعال شود. آیا می‌خواهید از سایت بازدید کنید؟"
+    "message": "ورود دو مرحله‌ای باعث می شود که حساب کاربری شما با استفاده از یک دستگاه دیگر مانند کلید امنیتی، برنامه احراز هویت، پیامک، تماس تلفنی و یا رایانامه، اعتبار خود را با ایمنی بیشتر اثبات کند. ورود دو مرحله‌ای می‌تواند در bitwarden.com راه‌اندازی شود. آیا می‌خواهید از سایت بازدید کنید؟"
   },
   "twoStepLoginConfirmationContent": {
     "message": "با راه‌اندازی ورود دو مرحله‌ای در برنامه وب Bitwarden، حساب کاربری خود را ایمن‌تر کنید."
@@ -982,16 +982,16 @@
     "message": "مورد ذخیره شد"
   },
   "deleteItemConfirmation": {
-    "message": "واقعاً می‌خواهید این آیتم را به سطل زباله ارسال کنید؟"
+    "message": "واقعاً می‌خواهید این مورد را به سطل زباله ارسال کنید؟"
   },
   "deletedItem": {
-    "message": "مورد به زباله‌ها فرستاده شد"
+    "message": "مورد به سطل زباله فرستاده شد"
   },
   "overwritePassword": {
     "message": "بازنویسی کلمه عبور"
   },
   "overwritePasswordConfirmation": {
-    "message": "آیا از بازنویسی بر روی پسورد فعلی مطمئن هستید؟"
+    "message": "آیا از بازنویسی بر روی کلمه عبور فعلی مطمئن هستید؟"
   },
   "overwriteUsername": {
     "message": "بازنویسی نام کاربری"
@@ -1022,7 +1022,7 @@
     "message": "در صورتی که موردی در گاوصندوق شما یافت نشد، درخواست افزودن کنید."
   },
   "addLoginNotificationDescAlt": {
-    "message": "اگر موردی در گاوصندوق شما یافت نشد، درخواست افزودن آن را بدهید. این مورد برای همه حساب‌های وارد شده اعمال می‌شود."
+    "message": "اگر موردی در گاوصندوق شما یافت نشد، درخواست افزودن آن را بدهید. این مورد برای همه حساب‌های کاربری وارد شده اعمال می‌شود."
   },
   "showCardsInVaultViewV2": {
     "message": "همیشه کارت‌ها را به‌عنوان پیشنهادهای پر کردن خودکار در نمای گاوصندوق نمایش بده"
@@ -1049,11 +1049,11 @@
     "message": "برای پر کردن، روی موردها در پیشنهادهای پرکردن خودکار کلیک کنید"
   },
   "clearClipboard": {
-    "message": "پاکسازی کلیپ بورد",
+    "message": "پاکسازی حافظه موقت",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "clearClipboardDesc": {
-    "message": "به صورت خودکار، مقادیر کپی شده را از کلیپ بورد پاک کن.",
+    "message": "به صورت خودکار، مقادیر کپی شده را از حافظه موقت پاک کن.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "notificationAddDesc": {
@@ -1173,6 +1173,12 @@
     "message": "اوه نه! نتوانستیم این را ذخیره کنیم. لطفاً جزئیات را به‌صورت دستی وارد کنید.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "درخواست برای به‌روزرسانی ورود به سیستم موجود"
   },
@@ -1180,13 +1186,13 @@
     "message": "هنگامی که تغییری در یک وب‌سایت شناسایی شد، درخواست به‌روزرسانی کلمه عبور ورود کن."
   },
   "changedPasswordNotificationDescAlt": {
-    "message": "هنگامی که تغییری در کلمه عبور یک ورود در وب‌سایت شناسایی شود، درخواست به‌روزرسانی آن را بده. این مورد برای همه حساب‌های وارد شده اعمال می‌شود."
+    "message": "هنگامی که تغییری در کلمه عبور یک ورود در وب‌سایت شناسایی شود، درخواست به‌روزرسانی آن را بده. این مورد برای همه حساب‌های کاربری وارد شده اعمال می‌شود."
   },
   "enableUsePasskeys": {
-    "message": "برای ذخیره و استفاده از passkey اجازه بگیر"
+    "message": "درخواست برای ذخیره و استفاده از کلیدهای عبور"
   },
   "usePasskeysDesc": {
-    "message": "درخواست ذخیره کلیدهای عبور جدید یا ورود با کلیدهای عبوری که در گاوصندوق شما ذخیره شده‌اند. این مورد برای همه حساب‌های وارد شده اعمال می‌شود."
+    "message": "درخواست ذخیره کلیدهای عبور جدید یا ورود با کلیدهای عبوری که در گاوصندوق شما ذخیره شده‌اند. این مورد برای همه حساب‌های کاربری وارد شده اعمال می‌شود."
   },
   "notificationChangeDesc": {
     "message": "آیا مایل به به‌روزرسانی این کلمه عبور در Bitwarden هستید؟"
@@ -1207,7 +1213,7 @@
     "message": "نمایش گزینه‌های منوی زمینه"
   },
   "contextMenuItemDesc": {
-    "message": "از یک کلیک ثانویه برای دسترسی به تولید کلمه عبور و ورودهای منطبق برای وب سایت استفاده کن."
+    "message": "از یک کلیک ثانویه برای دسترسی به تولید کلمه عبور و ورودهای منطبق برای وب‌سایت استفاده کن."
   },
   "contextMenuItemDescAlt": {
     "message": "برای دسترسی به تولید کلمه عبور و ورودهای منطبق با وب‌سایت، از کلیک ثانویه استفاده کنید. این مورد برای همه حساب‌های کاربری وارد شده اعمال می‌شود."
@@ -1226,7 +1232,7 @@
     "message": "تغییر رنگ پوسته برنامه."
   },
   "themeDescAlt": {
-    "message": "تغییر تم رنگی برنامه. این مورد برای همه حساب‌های کاربری وارد شده اعمال می‌شود."
+    "message": "تغییر پوسته رنگی برنامه. این مورد برای همه حساب‌های کاربری وارد شده اعمال می‌شود."
   },
   "dark": {
     "message": "تاریک",
@@ -1255,7 +1261,7 @@
     "message": "این کلمه عبور برای برون ریزی و درون ریزی این پرونده استفاده می‌شود"
   },
   "accountRestrictedOptionDescription": {
-    "message": "برای رمزگذاری برون ریزی و محدود کردن درون ریزی فقط به حساب کاربری فعلی Bitwarden، از کلید رمزگذاری حساب خود که از نام کاربری و کلمه عبور اصلی حساب شما مشتق شده است استفاده کنید."
+    "message": "برای رمزگذاری برون ریزی و محدود کردن درون ریزی فقط به حساب کاربری فعلی Bitwarden، از کلید رمزگذاری حساب کاربری خود که از نام کاربری و کلمه عبور اصلی حساب کاربری شما مشتق شده است استفاده کنید."
   },
   "passwordProtectedOptionDescription": {
     "message": "یک کلمه عبور برای پرونده به‌منظور رمزگذاری تنظیم کنید تا برون ریزی و درون ریزی آن به هر حساب Bitwarden با استفاده از کلمه عبور رمزگشایی شود."
@@ -1270,7 +1276,7 @@
     "message": "عدم تطابق \"کلمه عبور پرونده\" و \"تأیید کلمه عبور پرونده\" با یکدیگر."
   },
   "warning": {
-    "message": "اخطار",
+    "message": "هشدار",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
   "warningCapitalized": {
@@ -1284,7 +1290,7 @@
     "message": "این برون ریزی شامل داده‌های گاوصندوق در یک قالب رمزنگاری نشده است. شما نباید آن را از طریق یک راه ارتباطی نا امن (مثل ایمیل) ذخیره یا ارسال کنید. به محض اینکه کارتان با آن تمام شد، آن را حذف کنید."
   },
   "encExportKeyWarningDesc": {
-    "message": "این برون ریزی با استفاده از کلید رمزگذاری حساب شما، اطلاعاتتان را رمزگذاری می کند. اگر زمانی کلید رمزگذاری حساب خود را بچرخانید، باید دوباره خروجی بگیرید، چون قادر به رمزگشایی این پرونده برون ریزی نخواهید بود."
+    "message": "این برون ریزی با استفاده از کلید رمزگذاری حساب کاربری شما، اطلاعاتتان را رمزگذاری می کند. اگر زمانی کلید رمزگذاری حساب کاربری خود را تغییر دهید، باید دوباره خروجی بگیرید، چون قادر به رمزگشایی این پرونده برون ریزی نخواهید بود."
   },
   "encExportAccountWarningDesc": {
     "message": "کلیدهای رمزگذاری حساب برای هر حساب کاربری Bitwarden منحصر به فرد است، بنابراین نمی‌توانید برون ریزی رمزگذاری شده را به حساب دیگری وارد کنید."
@@ -1330,7 +1336,7 @@
     "message": "کپی کد تأیید"
   },
   "attachments": {
-    "message": "پیوست ها"
+    "message": "پیوست‌ها"
   },
   "deleteAttachment": {
     "message": "حذف پیوست"
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "ویژگی موجود نیست"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "انتقال کلید رمزگذاری مورد نیاز است. لطفاً از طریق گاوصندوق وب وارد شوید تا کلید رمزگذاری خود را به روز کنید."
+  "legacyEncryptionUnsupported": {
+    "message": "رمزنگاری قدیمی دیگر پشتیبانی نمی‌شود. لطفاً برای بازیابی حساب کاربری خود با پشتیبانی تماس بگیرید."
   },
   "premiumMembership": {
     "message": "عضویت پرمیوم"
@@ -1387,16 +1393,16 @@
     "message": "برای عضویت پرمیوم ثبت نام کنید و دریافت کنید:"
   },
   "ppremiumSignUpStorage": {
-    "message": "۱ گیگابایت فضای ذخیره سازی رمزگذاری شده برای پیوست های پرونده."
+    "message": "۱ گیگابایت فضای ذخیره‌سازی رمزگذاری شده برای پیوست‌های پرونده."
   },
   "premiumSignUpEmergency": {
     "message": "دسترسی اضطراری."
   },
   "premiumSignUpTwoStepOptions": {
-    "message": "گزینه های ورود اضافی دو مرحله ای مانند YubiKey و Duo."
+    "message": "گزینه‌های ورود اضافی دو مرحله‌ای مانند YubiKey و Duo."
   },
   "ppremiumSignUpReports": {
-    "message": "گزارش‌های بهداشت کلمه عبور، سلامت حساب و نقض داده‌ها برای ایمن نگهداشتن گاوصندوق شما."
+    "message": "گزارش‌های بهداشت کلمه عبور، سلامت حساب کاربری و نقض داده‌ها برای ایمن نگهداشتن گاوصندوق شما."
   },
   "ppremiumSignUpTotp": {
     "message": "تولید کننده کد تأیید (2FA) از نوع TOTP برای ورودهای در گاوصندوقتان."
@@ -1411,7 +1417,7 @@
     "message": "خرید پرمیوم"
   },
   "premiumPurchaseAlertV2": {
-    "message": "می‌توانید نسخه پرمیوم را از تنظیمات حساب کاربری خود در اپلیکیشن وب Bitwarden خریداری کنید."
+    "message": "می‌توانید نسخه پرمیوم را از تنظیمات حساب کاربری خود در برنامه وب Bitwarden خریداری کنید."
   },
   "premiumCurrentMember": {
     "message": "شما یک عضو پرمیوم هستید!"
@@ -1423,7 +1429,7 @@
     "message": "ارتقا به نسخه پرمیوم و دریافت:"
   },
   "premiumPrice": {
-    "message": "تمامش فقط $PRICE$ در سال!",
+    "message": "تمامش فقط $PRICE$ /سال!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -1447,10 +1453,10 @@
     "message": "TOTP را به صورت خودکار کپی کن"
   },
   "disableAutoTotpCopyDesc": {
-    "message": "اگر یک ورود دارای یک کلید احراز هویت باشد، هنگام پر کردن خودکار ورود، کد تأیید TOTP را در کلیپ بورد خود کپی کن."
+    "message": "اگر یک ورود دارای یک کلید احراز هویت باشد، هنگام پر کردن خودکار ورود، کد تأیید TOTP را در حافظه موقت خود کپی کن."
   },
   "enableAutoBiometricsPrompt": {
-    "message": "درخواست بیومتریک هنگام راه اندازی"
+    "message": "درخواست بیومتریک هنگام راه‌اندازی"
   },
   "premiumRequired": {
     "message": "در نسخه پرمیوم کار می‌کند"
@@ -1484,7 +1490,7 @@
     "message": "از کد بازیابی‌تان استفاده کنید"
   },
   "insertU2f": {
-    "message": "کلید امنیتی خود را وارد پورت USB رایانه کنید، اگر دکمه ای دارد آن را بفشارید."
+    "message": "کلید امنیتی خود را وارد پورت USB رایانه کنید، اگر دکمه‌ای دارد آن را بفشارید."
   },
   "openInNewTab": {
     "message": "گشودن در زبانهٔ جدید"
@@ -1502,7 +1508,7 @@
     "message": "ورود به سیستم در دسترس نیست"
   },
   "noTwoStepProviders": {
-    "message": "ورود دو مرحله‌ای برای این حساب فعال است، با این حال، هیچ یک از ارائه‌دهندگان دو مرحله‌ای پیکربندی شده توسط این مرورگر وب پشتیبانی نمی‌شوند."
+    "message": "ورود دو مرحله‌ای برای این حساب کاربری فعال است، با این حال، هیچ یک از ارائه‌دهندگان دو مرحله‌ای پیکربندی شده توسط این مرورگر وب پشتیبانی نمی‌شوند."
   },
   "noTwoStepProviders2": {
     "message": "لطفاً از یک مرورگر وب پشتیبانی شده (مانند کروم) استفاده کنید و یا ارائه دهندگان اضافی را که از مرورگر وب بهتر پشتیانی می‌کنند را اضافه کنید (مانند یک برنامه احراز هویت)."
@@ -1541,10 +1547,10 @@
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "webAuthnTitle": {
-    "message": "FIDO2 WebAuthn\n"
+    "message": "FIDO2 WebAuthn"
   },
   "webAuthnDesc": {
-    "message": "برای دسترسی به حساب خود از هر کلید امنیتی فعال شده WebAuthn استفاده کنید."
+    "message": "برای دسترسی به حساب کاربری خود از هر کلید امنیتی فعال شده WebAuthn استفاده کنید."
   },
   "emailTitle": {
     "message": "ایمیل"
@@ -1587,7 +1593,7 @@
     "message": "نشانی سرور اعلان‌ها"
   },
   "iconsUrl": {
-    "message": "نشانی سرور آیکون ها"
+    "message": "نشانی سرور نمادها"
   },
   "environmentSaved": {
     "message": "نشانی‌های اینترنتی محیط ذخیره شد"
@@ -1627,7 +1633,7 @@
     "message": "نمایش کارت‌ها به‌عنوان پیشنهاد"
   },
   "showInlineMenuOnIconSelectionLabel": {
-    "message": "نمایش پیشنهادها هنگام انتخاب آیکون"
+    "message": "نمایش پیشنهادها هنگام انتخاب نماد"
   },
   "showInlineMenuOnFormFieldsDescAlt": {
     "message": "برای تمام حساب‌های کاربری وارد شده اعمال می‌شود."
@@ -1647,7 +1653,7 @@
     "description": "Overlay appearance select option for showing the field on focus of the input element"
   },
   "autofillOverlayVisibilityOnButtonClick": {
-    "message": "وقتی آیکون پر کردن خودکار انتخاب شود",
+    "message": "وقتی نماد پر کردن خودکار انتخاب شود",
     "description": "Overlay appearance select option for showing the field on click of the overlay icon"
   },
   "enableAutoFillOnPageLoadSectionTitle": {
@@ -1675,7 +1681,7 @@
     "message": "می‌توانید پر کردن خودکار هنگام بارگیری صفحه را برای موارد ورود به سیستم از نمای ویرایش مورد خاموش کنید."
   },
   "itemAutoFillOnPageLoad": {
-    "message": "پر کردن خودکار بارگذاری صفحه (درصورت فعال بودن در گزینه ها)"
+    "message": "پر کردن خودکار بارگذاری صفحه (درصورت فعال بودن در گزینه‌ها)"
   },
   "autoFillOnPageLoadUseDefault": {
     "message": "استفاده از تنظیمات پیش‌فرض"
@@ -1693,16 +1699,16 @@
     "message": "باز کردن گاوصندوق در نوار کناری"
   },
   "commandAutofillLoginDesc": {
-    "message": "آخرین ورودی مورد استفاده برای وب سایت فعلی را به صورت خودکار پر کنید"
+    "message": "آخرین ورودی مورد استفاده برای وب‌سایت فعلی را به صورت خودکار پر کنید"
   },
   "commandAutofillCardDesc": {
-    "message": "آخرین کارت مورد استفاده برای وب سایت فعلی را به صورت خودکار پر کنید"
+    "message": "آخرین کارت مورد استفاده برای وب‌سایت فعلی را به صورت خودکار پر کنید"
   },
   "commandAutofillIdentityDesc": {
-    "message": "آخرین هویت مورد استفاده برای وب سایت فعلی را به صورت خودکار پر کنید"
+    "message": "آخرین هویت مورد استفاده برای وب‌سایت فعلی را به صورت خودکار پر کنید"
   },
   "commandGeneratePasswordDesc": {
-    "message": "یک کلمه عبور تصادفی جدید ایجاد کنید و آن را در کلیپ بورد کپی کنید"
+    "message": "یک کلمه عبور تصادفی جدید ایجاد کنید و آن را در حافظه موقت کپی کنید"
   },
   "commandLockVaultDesc": {
     "message": "قفل گاوصندوق"
@@ -1806,7 +1812,7 @@
     "message": "جولای"
   },
   "august": {
-    "message": "آگوست‌"
+    "message": "اوت‌"
   },
   "september": {
     "message": "سپتامبر"
@@ -1842,7 +1848,7 @@
     "message": "دکتر"
   },
   "mx": {
-    "message": "عنوان"
+    "message": "بی جنسیت"
   },
   "firstName": {
     "message": "نام"
@@ -1890,7 +1896,7 @@
     "message": "نشانی ۳"
   },
   "cityTown": {
-    "message": "شهر / شهرک"
+    "message": "شهر / شهرستان"
   },
   "stateProvince": {
     "message": "ایالت / استان"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "کلید SSH"
   },
+  "typeNote": {
+    "message": "یادداشت"
+  },
   "newItemHeader": {
     "message": "$TYPE$ جدید",
     "placeholders": {
@@ -1980,7 +1989,7 @@
     "message": "مورد علاقه‌ها"
   },
   "popOutNewWindow": {
-    "message": "به یک پنجره جدید پاپ بزن"
+    "message": "در پنجره‌ای جدید باز کن"
   },
   "refresh": {
     "message": "تازه کردن"
@@ -2008,7 +2017,7 @@
     "message": "بررسی کنید که آیا کلمه عبور افشا شده است."
   },
   "passwordExposed": {
-    "message": "این کلمه عبور $VALUE$ بار در رخنه داده‌ها افشا شده است. باید آن را تغییر دهید.",
+    "message": "این کلمه عبور $VALUE$ بار در نقض داده‌ها افشا شده است. باید آن را تغییر دهید.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -2017,7 +2026,7 @@
     }
   },
   "passwordSafe": {
-    "message": "این کلمه عبور در هیچ رخنه داده ای شناخته نشده است. استفاده از آن باید ایمن باشد."
+    "message": "این کلمه عبور در هیچ یک از نقض‌های داده شناخته شده یافت نشد. استفاده از آن باید ایمن باشد."
   },
   "baseDomain": {
     "message": "دامنه پایه",
@@ -2054,10 +2063,10 @@
     "description": "Default URI match detection for autofill."
   },
   "toggleOptions": {
-    "message": "گزینه های تبدیل"
+    "message": "سوئیچ گزینه‌ها"
   },
   "toggleCurrentUris": {
-    "message": "تغییر وضعیت نشانی های اینترنتی فعلی",
+    "message": "تغییر وضعیت نشانی‌های اینترنتی فعلی",
     "description": "Toggle the display of the URIs of the currently open tabs in the browser."
   },
   "currentUri": {
@@ -2142,7 +2151,7 @@
     "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
   },
   "unlockWithPin": {
-    "message": "باز کردن با پین"
+    "message": "باز کردن با کد پین"
   },
   "setYourPinTitle": {
     "message": "تنظیم کد پین"
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "کد پین خود را برای باز کردن Bitwarden تنظیم کنید. اگر به طور کامل از برنامه خارج شوید، تنظیمات پین شما از بین می‌رود."
   },
-  "setYourPinCode1": {
-    "message": "کد پین شما برای باز کردن Bitwarden به جای کلمه عبور اصلی استفاده خواهد شد. در صورتی که کاملاً از Bitwarden خارج شوید، کد پین شما ریست خواهد شد."
+  "setPinCode": {
+    "message": "شما می‌توانید از این کد پین برای باز کردن قفل Bitwarden استفاده کنید. در صورتی که کامل از برنامه خارج شوید، کد پین شما مجدداً تنظیم خواهد شد."
   },
   "pinRequired": {
     "message": "کد پین الزامیست."
@@ -2163,10 +2172,10 @@
     "message": "کد پین معتبر نیست."
   },
   "tooManyInvalidPinEntryAttemptsLoggingOut": {
-    "message": "تعداد تلاش‌های ناموفق پین زیاد شد. خارج می‌شوید."
+    "message": "تعداد تلاش‌های ناموفق کد پین زیاد شد. خارج می‌شوید."
   },
   "unlockWithBiometrics": {
-    "message": "با استفاده از بیومتریک باز کنید"
+    "message": "باز کردن قفل با بیومتریک"
   },
   "unlockWithMasterPassword": {
     "message": "باز کردن قفل با کلمه عبور اصلی"
@@ -2190,7 +2199,7 @@
     "message": "مورد شبیه"
   },
   "clone": {
-    "message": "شبیه سازی"
+    "message": "شبیه‌سازی"
   },
   "passwordGenerator": {
     "message": "تولید کننده کلمه عبور"
@@ -2199,11 +2208,14 @@
     "message": "تولید کننده نام کاربری"
   },
   "useThisEmail": {
-    "message": "از این ایمیل استفاده شود"
+    "message": "از این ایمیل استفاده کن"
   },
   "useThisPassword": {
     "message": "از این کلمه عبور استفاده کن"
   },
+  "useThisPassphrase": {
+    "message": "از این عبارت عبور استفاده کن"
+  },
   "useThisUsername": {
     "message": "از این نام کاربری استفاده کن"
   },
@@ -2232,17 +2244,17 @@
     "description": "Verb form: to make secure or inaccessible by"
   },
   "trash": {
-    "message": "زباله‌ها",
+    "message": "سطل زباله",
     "description": "Noun: a special folder to hold deleted items"
   },
   "searchTrash": {
-    "message": "جستجوی زباله‌ها"
+    "message": "جستجوی سطل زباله"
   },
   "permanentlyDeleteItem": {
     "message": "حذف دائمی مورد"
   },
   "permanentlyDeleteItemConfirmation": {
-    "message": "مطمئن هستید که می‌خواهید این مورد را برای همیشه پاک کنید؟"
+    "message": "آیا مطمئن هستید که می‌خواهید این مورد را برای همیشه پاک کنید؟"
   },
   "permanentlyDeletedItem": {
     "message": "مورد برای همیشه حذف شد"
@@ -2281,7 +2293,7 @@
     "message": "آیا هنوز می‌خواهید این ورود را پر کنید؟"
   },
   "autofillIframeWarning": {
-    "message": "فرم توسط دامنه ای متفاوت از نشانی اینترنتی ورود به سیستم ذخیره شده شما میزبانی می‌شود. به هر حال برای پر کردن خودکار، تأیید را انتخاب کنید یا برای توقف، لغو را انتخاب کنید."
+    "message": "فرم توسط دامنه‌ای متفاوت از نشانی اینترنتی ورود به سیستم ذخیره شده شما میزبانی می‌شود. به هر حال برای پر کردن خودکار، تأیید را انتخاب کنید یا برای توقف، لغو را انتخاب کنید."
   },
   "autofillIframeWarningTip": {
     "message": "برای جلوگیری از این هشدار در آینده، این نشانی اینترنتی، $HOSTNAME$، را در مورد ورود Bitwarden خود برای این سایت ذخیره کنید.",
@@ -2377,7 +2389,7 @@
     "message": "کلمه عبور جدید شما نمی‌تواند با کلمه عبور فعلی‌تان یکسان باشد."
   },
   "hintEqualsPassword": {
-    "message": "اشاره به کلمه عبور شما نمی‌تواند همان کلمه عبور شما باشد."
+    "message": "یادآور کلمه عبور شما نمی‌تواند همان کلمه عبور شما باشد."
   },
   "ok": {
     "message": "تأیید"
@@ -2419,10 +2431,10 @@
     "message": "ارتباط دسکتاپ قطع شد"
   },
   "nativeMessagingWrongUserDesc": {
-    "message": "برنامه دسکتاپ به یک حساب دیگر وارد شده است. لطفاً اطمینان حاصل کنید که هر دو برنامه به یک حساب وارد شده اند."
+    "message": "برنامه دسکتاپ به یک حساب کاربری دیگر وارد شده است. لطفاً اطمینان حاصل کنید که هر دو برنامه به یک حساب کاربری وارد شده اند."
   },
   "nativeMessagingWrongUserTitle": {
-    "message": "عدم مطابقت حساب کاربری"
+    "message": "عدم تطابق حساب کاربری"
   },
   "nativeMessagingWrongUserKeyTitle": {
     "message": "عدم تطابق کلید بیومتریک"
@@ -2431,10 +2443,10 @@
     "message": "باز کردن قفل بیومتریک ناموفق بود. کلید مخفی بیومتریک نتوانست گاوصندوق را باز کند. لطفاً دوباره تنظیمات بیومتریک را انجام دهید."
   },
   "biometricsNotEnabledTitle": {
-    "message": "بیومتریک برپا نشده"
+    "message": "بیومتریک راه‌اندازی نشده"
   },
   "biometricsNotEnabledDesc": {
-    "message": "بیومتریک مرورگر ابتدا نیاز به فعالسازی بیومتریک دسکتاپ در تنظیمات دارد."
+    "message": "بیومتریک مرورگر ابتدا نیاز به فعال‌سازی بیومتریک دسکتاپ در تنظیمات دارد."
   },
   "biometricsNotSupportedTitle": {
     "message": "بیومتریک پشتیبانی نمی‌شود"
@@ -2473,7 +2485,7 @@
     "message": "این عمل را نمی‌توان در نوار کناری انجام داد، لطفاً اقدام را در پنجره بازشو بازخوانی کنید."
   },
   "personalOwnershipSubmitError": {
-    "message": "به دلیل سیاست پرمیوم، برای ذخیره موارد در گاوصندوق شخصی خود محدود شده اید. گزینه مالکیت را به یک سازمان تغییر دهید و مجموعه های موجود را انتخاب کنید."
+    "message": "به دلیل سیاست پرمیوم، برای ذخیره موارد در گاوصندوق شخصی خود محدود شده‌اید. گزینه مالکیت را به یک سازمان تغییر دهید و مجموعه‌های موجود را انتخاب کنید."
   },
   "personalOwnershipPolicyInEffect": {
     "message": "سیاست سازمانی بر تنظیمات مالکیت شما تأثیر می‌گذارد."
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "یک سیاست سازمانی، درون ریزی موارد به گاوصندوق فردی شما را مسدود کرده است."
   },
+  "restrictCardTypeImport": {
+    "message": "نمی‌توان انواع مورد کارت را درون ریزی کرد"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "یک سیاست تعیین شده توسط یک یا چند سازمان، مانع از درون ریزی کارت‌ها به گاوصندوق‌های شما شده است."
+  },
   "domainsTitle": {
     "message": "دامنه‌ها",
     "description": "A category title describing the concept of web domains"
@@ -2492,10 +2510,10 @@
     "message": "اطلاعات بیشتر درباره دامنه‌های مسدود شده"
   },
   "excludedDomains": {
-    "message": "دامنه های مستثنی"
+    "message": "دامنه‌های مستثنی"
   },
   "excludedDomainsDesc": {
-    "message": "Bitwarden برای ذخیره جزئیات ورود به سیستم این دامنه ها سوال نمی‌کند. برای اینکه تغییرات اعمال شود باید صفحه را تازه کنید."
+    "message": "Bitwarden برای ذخیره جزئیات ورود به سیستم این دامنه‌ها سوال نمی‌کند. برای اینکه تغییرات اعمال شود باید صفحه را تازه کنید."
   },
   "excludedDomainsDescAlt": {
     "message": "Bitwarden برای هیچ یک از حساب‌های کاربری وارد شده، درخواست ذخیره اطلاعات ورود برای این دامنه‌ها را نخواهد داد. برای اعمال تغییرات باید صفحه را تازه‌سازی کنید."
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "تغییر"
   },
+  "changePassword": {
+    "message": "تغییر رمز عبور",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "تغییر کلمه عبور - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "کلمه عبور در معرض خطر"
+  },
   "atRiskPasswords": {
     "message": "کلمات عبور در معرض خطر"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "کلمه عبور شما برای این سایت در معرض خطر است. $ORGANIZATION$ درخواست کرده است که آن را تغییر دهید.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ از شما می‌خواهد این کلمه عبور را تغییر دهید چون در معرض خطر است. برای تغییر کلمه عبور به تنظیمات حساب کاربری خود مراجعه کنید.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "بررسی و تغییر یک کلمه عبور در معرض خطر"
   },
@@ -2671,9 +2716,13 @@
     "message": "پرونده"
   },
   "allSends": {
-    "message": "همه ارسال ها",
+    "message": "همه ارسال‌ها",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "به حداکثر تعداد دسترسی رسیده است",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "متن را به‌صورت پیش‌فرض مخفی کن"
   },
@@ -2711,7 +2760,7 @@
     "message": "غیرفعال شد"
   },
   "removePasswordConfirmation": {
-    "message": "مطمئنید که می‌خواهید کلمه عبور حذف شود؟"
+    "message": "آیا مطمئنید که می‌خواهید کلمه عبور حذف شود؟"
   },
   "deleteSend": {
     "message": "ارسال حذف شد",
@@ -2829,10 +2878,10 @@
     "message": "برای انتخاب پرونده، پسوند را در نوار کناری باز کنید (در صورت امکان) یا با کلیک بر روی این بنر پنجره جدیدی باز کنید."
   },
   "sendFirefoxFileWarning": {
-    "message": "برای انتخاب یک پرونده با استفاده از Firefox، افزونه را در نوار کناری باز کنید یا با کلیک بر روی این بنر پنجره جدیدی باز کنید."
+    "message": "برای انتخاب یک پرونده با استفاده از فایرفاکس، افزونه را در نوار کناری باز کنید یا با کلیک بر روی این بنر پنجره جدیدی باز کنید."
   },
   "sendSafariFileWarning": {
-    "message": "برای انتخاب پرونده ای با استفاده از Safari، با کلیک روی این بنر پنجره جدیدی باز کنید."
+    "message": "برای انتخاب پرونده‌ای با استفاده از سافاری، با کلیک روی این بنر پنجره جدیدی باز کنید."
   },
   "popOut": {
     "message": "باز کردن در پنجره جداگانه"
@@ -2876,17 +2925,20 @@
   "emailVerificationRequiredDesc": {
     "message": "برای استفاده از این ویژگی باید ایمیل خود را تأیید کنید. می‌توانید ایمیل خود را در گاوصندوق وب تأیید کنید."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "کلمه عبور اصلی با موفقیت تنظیم شد"
+  },
   "updatedMasterPassword": {
-    "message": "کلمه عبور اصلی به‌روز شد"
+    "message": "کلمه عبور اصلی به‌روزرسانی شد"
   },
   "updateMasterPassword": {
     "message": "به‌روزرسانی کلمه عبور اصلی"
   },
   "updateMasterPasswordWarning": {
-    "message": "کلمه عبور اصلی شما اخیراً توسط سرپرست سازمان‌تان تغییر کرده است. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روز کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
+    "message": "کلمه عبور اصلی شما اخیراً توسط مدیر سازمان‌تان تغییر کرده است. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روزرسانی کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه‌های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
   },
   "updateWeakMasterPasswordWarning": {
-    "message": "کلمه عبور اصلی شما با یک یا چند سیاست سازمان‌تان مطابقت ندارد. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روز کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
+    "message": "کلمه عبور اصلی شما با یک یا چند سیاست سازمان‌تان مطابقت ندارد. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روزرسانی کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه‌های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
   },
   "tdeDisabledMasterPasswordRequired": {
     "message": "سازمان شما رمزگذاری دستگاه‌های مورد اعتماد را غیرفعال کرده است. لطفاً برای دسترسی به گاوصندوق خود یک کلمه عبور اصلی تنظیم کنید."
@@ -2895,7 +2947,7 @@
     "message": "ثبت نام خودکار"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "این سازمان دارای سیاست سازمانی ای است که به طور خودکار شما را در بازنشانی کلمه عبور ثبت نام می‌کند. این ثبت نام به مدیران سازمان اجازه می‌دهد تا کلمه عبور اصلی شما را تغییر دهند."
+    "message": "این سازمان دارای سیاست سازمانی است که به طور خودکار شما را در بازیابی کلمه عبور ثبت نام می‌کند. این ثبت نام به مدیران سازمان اجازه می‌دهد تا کلمه عبور اصلی شما را تغییر دهند."
   },
   "selectFolder": {
     "message": "پوشه را انتخاب کنید..."
@@ -2922,7 +2974,7 @@
     }
   },
   "verificationRequired": {
-    "message": "تایید لازم است",
+    "message": "تأیید لازم است",
     "description": "Default title for the user verification dialog."
   },
   "hours": {
@@ -2935,7 +2987,7 @@
     "message": "نیازمندی‌های سیاست سازمانی بر گزینه‌های زمان پایان نشست شما اعمال شده است"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "سیاست‌های سازمانتان بر مهلت زمانی گاوصندوق شما تأثیر می‌گذارد. حداکثر زمان مجاز گاوصندوق $HOURS$ ساعت و $MINUTES$ دقیقه است",
+    "message": "سیاست‌های سازمان‌تان بر مهلت زمانی گاوصندوق شما تأثیر می‌گذارد. حداکثر زمان مجاز گاوصندوق $HOURS$ ساعت و $MINUTES$ دقیقه است.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2974,7 +3026,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "سیاست‌های سازمانتان بر مهلت زمانی گاوصندوق شما تأثیر می‌گذارد. حداکثر زمان مجاز گاوصندوق $HOURS$ ساعت و $MINUTES$ دقیقه است. عملگر مهلت زمانی گاوصندوق شما روی $ACTION$ تنظیم شده است.",
+    "message": "سیاست‌های سازمان‌تان بر مهلت زمانی گاوصندوق شما تأثیر می‌گذارد. حداکثر زمان مجاز گاوصندوق $HOURS$ ساعت و $MINUTES$ دقیقه است. عملگر مهلت زمانی گاوصندوق شما روی $ACTION$ تنظیم شده است.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -3000,7 +3052,7 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "مهلت زمانی شما بیش از محدودیت های تعیین شده توسط سازمانتان است."
+    "message": "مهلت زمانی شما بیش از محدودیت‌های تعیین شده توسط سازمان‌تان است."
   },
   "vaultExportDisabled": {
     "message": "برون ریزی گاوصندوق غیرفعال شده است"
@@ -3033,10 +3085,10 @@
     "message": "کلمه عبور اصلی حذف شد"
   },
   "leaveOrganizationConfirmation": {
-    "message": "آيا مطمئن هستيد که می خواهيد سازمان های انتخاب شده را ترک کنيد؟"
+    "message": "آيا مطمئنید که می‌خواهيد سازمان انتخاب شده را ترک کنيد؟"
   },
   "leftOrganization": {
-    "message": "شما از سازمان خارج شده اید."
+    "message": "شما از سازمان خارج شده‌اید."
   },
   "toggleCharacterCount": {
     "message": "تغییر تعداد کاراکترها"
@@ -3139,7 +3191,7 @@
     "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
   },
   "plusAddressedEmailDesc": {
-    "message": "از قابلیت های آدرس دهی فرعی ارائه دهنده ایمیل خود استفاده کنید."
+    "message": "از قابلیت‌های آدرس دهی فرعی ارائه دهنده ایمیل خود استفاده کنید."
   },
   "catchallEmail": {
     "message": "دریافت همه ایمیل‌ها"
@@ -3270,7 +3322,7 @@
     }
   },
   "forwarderNoUrl": {
-    "message": "آدرس $SERVICENAME$ نامعتبر.",
+    "message": "نشانی $SERVICENAME$ نامعتبر.",
     "description": "Displayed when the url of the forwarding service wasn't supplied.",
     "placeholders": {
       "servicename": {
@@ -3385,7 +3437,7 @@
     "message": "یک اعلان به دستگاه شما ارسال شده است."
   },
   "notificationSentDevicePart1": {
-    "message": "قفل Bitwarden را در دستگاه خود یا در... باز کنید"
+    "message": "قفل Bitwarden را روی دستگاه خود باز کنید یا روی"
   },
   "notificationSentDeviceAnchor": {
     "message": "برنامه وب"
@@ -3408,20 +3460,23 @@
   "logInRequestSent": {
     "message": "درخواست ارسال شد"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "کلمه عبور اصلی افشا شده"
   },
   "exposedMasterPasswordDesc": {
-    "message": "کلمه عبور در نقض داده پیدا شد. از یک کلمه عبور منحصر به فرد برای محافظت از حساب خود استفاده کنید. آیا مطمئنید که می‌خواهید از یک کلمه عبور افشا شده استفاده کنید؟"
+    "message": "کلمه عبور در افشای داده پیدا شد. از یک کلمه عبور منحصربه‌فرد برای محافظت از حساب کاربری خود استفاده کنید. آیا مطمئنید که می‌خواهید از یک کلمه عبور افشا شده استفاده کنید؟"
   },
   "weakAndExposedMasterPassword": {
     "message": "کلمه عبور اصلی ضعیف و افشا شده"
   },
   "weakAndBreachedMasterPasswordDesc": {
-    "message": "کلمه عبور ضعیف شناسایی و در یک نقض داده پیدا شد. از یک کلمه عبور قوی و منحصر به فرد برای محافظت از حساب خود استفاده کنید. آیا مطمئنید که می‌خواهید از این کلمه عبور استفاده کنید؟"
+    "message": "کلمه عبور ضعیف شناسایی و در یک افشای داده پیدا شد. از یک کلمه عبور قوی و منحصربه‌فرد برای محافظت از حساب کاربری خود استفاده کنید. آیا مطمئنید که می‌خواهید از این کلمه عبور استفاده کنید؟"
   },
   "checkForBreaches": {
-    "message": "نقض اطلاعات شناخته شده برای این کلمه عبور را بررسی کنید"
+    "message": "بررسی نقض‌های داده شناخته شده برای این کلمه عبور"
   },
   "important": {
     "message": "مهم:"
@@ -3472,7 +3527,7 @@
     "message": "مدیریت میان‌برها"
   },
   "autofillShortcut": {
-    "message": "میانبر صفحه کلید پر کردن خودکار"
+    "message": "میان‌بر صفحه کلید پر کردن خودکار"
   },
   "autofillLoginShortcutNotSet": {
     "message": "میان‌بر ورود خودکار تنظیم نشده است. این مورد را در تنظیمات مرورگر تغییر دهید."
@@ -3487,7 +3542,7 @@
     }
   },
   "autofillShortcutTextSafari": {
-    "message": "میانبر پر کردن خودکار پیش‌فرض: $COMMAND$.",
+    "message": "میان‌بر پر کردن خودکار پیش‌فرض: $COMMAND$.",
     "placeholders": {
       "command": {
         "content": "$1",
@@ -3522,11 +3577,17 @@
   "requestAdminApproval": {
     "message": "درخواست تأیید مدیر"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "شناسه سازمان SSO مورد نیاز است."
   },
   "creatingAccountOn": {
-    "message": "در حال ساخت حساب روی"
+    "message": "در حال ساخت حساب کاربری روی"
   },
   "checkYourEmail": {
     "message": "ایمیل خود را چک کنید"
@@ -3587,7 +3648,7 @@
     "message": "اعتماد به سازمان"
   },
   "trust": {
-    "message": "اطمینان"
+    "message": "اعتماد"
   },
   "doNotTrust": {
     "message": "اعتماد نکنید"
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "به کاربر اعتماد کنید"
   },
-  "sendsNoItemsTitle": {
-    "message": "ارسال‌های فعالی نیست",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "از ارسال برای اشتراک‌گذاری امن اطلاعات رمزگذاری شده با هر کسی استفاده کنید.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "اطلاعات حساس را به‌صورت ایمن ارسال کنید",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -3858,7 +3911,7 @@
     "message": "خطای درون ریزی"
   },
   "importErrorDesc": {
-    "message": "مشکلی با داده‌هایی که سعی کردید وارد کنید وجود داشت. لطفاً خطاهای فهرست شده زیر را در فایل منبع خود برطرف کرده و دوباره امتحان کنید."
+    "message": "مشکلی با داده‌هایی که سعی کردید درون ریزی کنید وجود داشت. لطفاً خطاهای فهرست شده در زیر را در پرونده منبع خود برطرف کرده و دوباره امتحان کنید."
   },
   "resolveTheErrorsBelowAndTryAgain": {
     "message": "خطاهای زیر را برطرف کرده و دوباره امتحان کنید."
@@ -3930,7 +3983,7 @@
     "message": "خطا در اتصال به سرویس Duo. از روش ورود دو مرحله‌ای دیگری استفاده کنید یا برای دریافت کمک با Duo تماس بگیرید."
   },
   "duoRequiredForAccount": {
-    "message": "ورود دو مرحله ای Duo برای حساب کاربری شما لازم است."
+    "message": "ورود دو مرحله‌ای Duo برای حساب کاربری شما لازم است."
   },
   "popoutExtension": {
     "message": "باز کردن پنجره جداگانه افزونه"
@@ -3939,10 +3992,10 @@
     "message": "اجرای Duo"
   },
   "importFormatError": {
-    "message": "داده‌ها به درستی قالب‌بندی نشده‌اند. لطفا فایل وارد شده خود را بررسی و دوباره امتحان کنید."
+    "message": "داده‌ها به درستی قالب‌بندی نشده‌اند. لطفاً پرونده درون ریزی شده خود را بررسی و دوباره امتحان کنید."
   },
   "importNothingError": {
-    "message": "چیزی وارد نشد."
+    "message": "چیزی درون ریزی نشد."
   },
   "importEncKeyError": {
     "message": "خطا در رمزگشایی پرونده‌ی درون ریزی شده. کلید رمزگذاری شما با کلید رمزگذاری استفاده شده برای درون ریزی داده‌ها مطابقت ندارد."
@@ -3954,7 +4007,7 @@
     "message": "مقصد"
   },
   "learnAboutImportOptions": {
-    "message": "درباره گزینه‌های برون ریزی خود بیاموزید"
+    "message": "درباره گزینه‌های درون ریزی خود بیاموزید"
   },
   "selectImportFolder": {
     "message": "یک پوشه انتخاب کنید"
@@ -3963,7 +4016,7 @@
     "message": "انتخاب یک مجموعه"
   },
   "importTargetHint": {
-    "message": "اگر می‌خواهید محتوای فایل وارد شده به $DESTINATION$ منتقل شود، این گزینه را انتخاب کنید",
+    "message": "اگر می‌خواهید محتوای پرونده درون ریزی شده به $DESTINATION$ منتقل شود، این گزینه را انتخاب کنید",
     "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.",
     "placeholders": {
       "destination": {
@@ -4025,10 +4078,10 @@
     "message": "کلید عبور کپی نمی‌شود"
   },
   "passkeyNotCopiedAlert": {
-    "message": "کلید عبور در مورد شبیه سازی شده کپی نمی‌شود. آیا می‌خواهید به شبیه سازی این مورد ادامه دهید؟"
+    "message": "کلید عبور در مورد شبیه‌سازی شده کپی نمی‌شود. آیا می‌خواهید به شبیه‌سازی این مورد ادامه دهید؟"
   },
   "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
-    "message": "تأیید توسط سایت آغازگر الزامی است. این ویژگی هنوز برای حساب‌های بدون کلمه عبور اصلی اجرا نشده است."
+    "message": "تأیید توسط سایت آغازگر الزامی است. این ویژگی هنوز برای حساب‌های کاربری بدون کلمه عبور اصلی اجرا نشده است."
   },
   "logInWithPasskeyQuestion": {
     "message": "با کلید عبور وارد می‌شوید؟"
@@ -4040,10 +4093,10 @@
     "message": "هیچ کلمه عبوری برای این برنامه یافت نشد."
   },
   "noMatchingPasskeyLogin": {
-    "message": "شما هیچ ورود مشابهی برای این سایت ندارید."
+    "message": "شما هیچ ورود مشابهی برای این وب‌سایت ندارید."
   },
   "noMatchingLoginsForSite": {
-    "message": "ورود منطبق برای این سایت یافت نشد"
+    "message": "ورود منطبق برای این وب‌سایت یافت نشد"
   },
   "searchSavePasskeyNewLogin": {
     "message": "جستجو یا ذخیره کلید عبور به عنوان ورود جدید"
@@ -4133,7 +4186,7 @@
     "message": "لطفاً برای ورود، از اطلاعات کاربری شرکت خود استفاده کنید."
   },
   "seeDetailedInstructions": {
-    "message": "دستورالعمل‌های کامل را در سایت راهنمای ما مشاهده کنید در",
+    "message": "دستورالعمل‌های کامل را در وب‌سایت راهنمای ما مشاهده کنید در",
     "description": "This is followed a by a hyperlink to the help website."
   },
   "importDirectlyFromLastPass": {
@@ -4155,7 +4208,7 @@
     "message": "تعویض حساب کاربری"
   },
   "switchAccounts": {
-    "message": "تعویض حساب‌ها"
+    "message": "تعویض حساب‌های کاربری"
   },
   "switchToAccount": {
     "message": "تعویض به حساب کاربری"
@@ -4170,7 +4223,7 @@
     "message": "حساب کاربری در درسترس"
   },
   "accountLimitReached": {
-    "message": "محدودیت حساب کاربری تکمیل شد. برای افزودن حساب کاربری دیگر، از یک حساب خارج شوید."
+    "message": "محدودیت حساب کاربری تکمیل شد. برای افزودن حساب کاربری دیگر، از یک حساب کاربری خارج شوید."
   },
   "active": {
     "message": "فعال"
@@ -4194,7 +4247,7 @@
     "message": "فقط یک بار"
   },
   "alwaysForThisSite": {
-    "message": "همیشه برای این سایت"
+    "message": "همیشه برای این وب‌سایت"
   },
   "domainAddedToExcludedDomains": {
     "message": "دامنه $DOMAIN$ به دامنه‌های مستثنی اضافه شد.",
@@ -4209,6 +4262,26 @@
     "message": "فرمت‌های رایج",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "تشخیص تطابق نشانی اینترنتی روشی است که Bitwarden برای شناسایی پیشنهادهای پر کردن خودکار استفاده می‌کند.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"عبارت منظم\" یک گزینه پیشرفته است که خطر افشای اطلاعات ورود را افزایش می‌دهد.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"شروع با\" یک گزینه پیشرفته است که خطر افشای اطلاعات ورود را افزایش می‌دهد.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "اطلاعات بیشتر درباره‌ی تشخیص تطابق",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "تنظیمات پیشرفته",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "ادامه به تنظیمات مرورگر؟",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -4293,7 +4366,7 @@
     "message": "موارد پیشنهادی"
   },
   "autofillSuggestionsTip": {
-    "message": "یک مورد ورود برای این سایت ذخیره کنید تا به‌صورت خودکار پر شود"
+    "message": "یک مورد ورود برای این وب‌سایت ذخیره کنید تا به‌صورت خودکار پر شود"
   },
   "yourVaultIsEmpty": {
     "message": "گاوصندوق‌تان خالی است"
@@ -4345,7 +4418,7 @@
     }
   },
   "viewItemTitle": {
-    "message": "مشاهده آیتم - $ITEMNAME$",
+    "message": "مشاهده مورد - $ITEMNAME$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4419,7 +4492,7 @@
     "message": "کپی تلفن"
   },
   "copyAddress": {
-    "message": "کپی آدرس"
+    "message": "کپی نشانی"
   },
   "adminConsole": {
     "message": "کنسول مدیر"
@@ -4644,7 +4717,7 @@
     "message": "افزودن وب‌سایت"
   },
   "deleteWebsite": {
-    "message": "حذف وبسایت"
+    "message": "حذف وب‌سایت"
   },
   "defaultLabel": {
     "message": "پیش‌فرض ($VALUE$)",
@@ -4657,7 +4730,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "نمایش تطبیق سایت $WEBSITE$",
+    "message": "نمایش شناسایی تطابق برای $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4666,7 +4739,7 @@
     }
   },
   "hideMatchDetection": {
-    "message": "مخفی کردن تطبیق سایت $WEBSITE$",
+    "message": "مخفی کردن شناسایی تطابق $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4768,7 +4841,7 @@
     "message": "وقتی در پر کردن خودکار برای یک وب‌سایت خاص به مشکل برخوردید، از فیلد مرتبط استفاده کنید."
   },
   "linkedLabelHelpText": {
-    "message": "شناسه Html، نام، aria-label یا محل نگهدار فیلد را وارد کنید."
+    "message": "شناسه html، نام، aria-label یا محل نگهدار فیلد را وارد کنید."
   },
   "editField": {
     "message": "ویرایش فیلد"
@@ -4870,7 +4943,7 @@
     "message": "مجموعه‌ها با موفقیت اختصاص داده شدند"
   },
   "nothingSelected": {
-    "message": "شما چیزی را انتخاب نکرده اید."
+    "message": "شما چیزی را انتخاب نکرده‌اید."
   },
   "itemsMovedToOrg": {
     "message": "موارد به $ORGNAME$ منتقل شدند",
@@ -4926,7 +4999,7 @@
     "message": "فعالیت‌های حساب کاربری"
   },
   "showNumberOfAutofillSuggestions": {
-    "message": "نمایش تعداد پیشنهادهای پر کردن خودکار ورود در آیکون افزونه"
+    "message": "نمایش تعداد پیشنهادهای پر کردن خودکار ورود در نماد افزونه"
   },
   "showQuickCopyActions": {
     "message": "نمایش عملیات کپی سریع در گاوصندوق"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "بازکردن قفل کد پین تنظیم شد"
   },
+  "unlockWithBiometricSet": {
+    "message": "باز کردن قفل با بیومتریک تنظیم شد"
+  },
   "authenticating": {
     "message": "در حال احراز هویت"
   },
@@ -5271,7 +5347,7 @@
     "message": "ورود سریع و آسان"
   },
   "quickLoginBody": {
-    "message": "قفل بیومتریک و پر کردن خودکار را تنظیم کنید تا بدون وارد کردن حتی یک حرف وارد حساب‌های خود شوید."
+    "message": "قفل بیومتریک و پر کردن خودکار را تنظیم کنید تا بدون وارد کردن حتی یک حرف وارد حساب‌های کاربری خود شوید."
   },
   "secureUser": {
     "message": "ورودهای خود را ارتقا دهید"
@@ -5283,7 +5359,7 @@
     "message": "داده‌های شما، زمانی که نیاز دارید و در جایی که نیاز دارید"
   },
   "secureDevicesBody": {
-    "message": "کلمه‌های عبور نامحدود را در دستگاه‌های نامحدود با اپلیکیشن‌های موبایل، مرورگر و دسکتاپ Bitwarden ذخیره کنید."
+    "message": "کلمه‌های عبور نامحدود را در دستگاه‌های نامحدود با برنامه‌های موبایل، مرورگر و دسکتاپ Bitwarden ذخیره کنید."
   },
   "nudgeBadgeAria": {
     "message": "۱ اعلان"
@@ -5372,10 +5448,14 @@
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "با کلیک روی دکمه تولید رمز عبور، به‌راحتی کلمات عبور قوی و منحصر به‌ فرد ایجاد کنید تا ورودهای شما ایمن باقی بمانند.",
+    "message": "با کلیک روی دکمه تولید کلمه عبور، به‌راحتی کلمات عبور قوی و منحصر به‌ فرد ایجاد کنید تا ورودهای شما ایمن باقی بمانند.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
     "message": "شما اجازه دسترسی به این صفحه را ندارید. لطفاً با حساب کاربری دیگری وارد شوید."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly در مرورگر شما پشتیبانی نمی‌شود یا فعال نیست. برای استفاده از برنامه Bitwarden، فعال بودن WebAssembly الزامی است.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/fi/messages.json b/apps/browser/src/_locales/fi/messages.json
index 8e5eede202a..85c47f2733b 100644
--- a/apps/browser/src/_locales/fi/messages.json
+++ b/apps/browser/src/_locales/fi/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Voi ei! Emme voineet tallentaa tätä. Yritä syöttää tiedot manuaalisesti.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Kysy päivitetäänkö kirjautumistieto"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Ominaisuus ei ole käytettävissä"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Salausavaimen siirto vaaditaan. Päivitä salausavaimesi kirjautumalla verkkoholviin."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium-jäsenyys"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH-avain"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "Uusi $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Aseta PIN-koodi Bitwardenin avaukselle. PIN-asetukset tyhjentyvät, jos kirjaudut laajennuksesta kokonaan ulos."
   },
-  "setYourPinCode1": {
-    "message": "PIN-koodia käytetään pääsalasanasi sijasta Bitwarenin avaukseen. Määritetty PIN-koodi tyhjennetään, jos kirjaudut kokonaan ulos Bitwardenista."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN-koodi vaaditaan."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Käytä tätä salasanaa"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Käytä tätä käyttäjätunnusta"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Organisaatiokäytäntö estää kohteiden tuonnin yksityiseen holviisi."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Verkkotunnukset",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Vaihda"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Vaihda salasana - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "Vaarantuneet salasanat"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Tarkasta ja vaihda yksi vaarantunut salasana"
   },
@@ -2674,6 +2719,10 @@
     "message": "Kaikki Sendit",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Piilota teksti oletuksena"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Sinun on vahvistettava sähköpostiosoitteesi käyttääksesi ominaisuutta. Voit vahvistaa osoitteesi verkkoholvissa."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Pääsalasanasi on vaihdettu"
   },
@@ -3018,7 +3070,7 @@
     "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Organisaation nimi"
   },
   "keyConnectorDomain": {
     "message": "Key Connector domain"
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Pyyntö lähetetty"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Paljastunut pääsalasana"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Pyydä hyväksyntää ylläpidolta"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organisaation kertakirjautumistunniste tarvitaan."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Luota käyttäjään"
   },
-  "sendsNoItemsTitle": {
-    "message": "Aktiivisia Sendejä ei ole",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Sendillä voit jakaa salattuja tietoja turvallisesti kenelle tahansa.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Yleiset muodot",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Avataanko selaimen asetukset?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Todennetaan"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/fil/messages.json b/apps/browser/src/_locales/fil/messages.json
index e8e45249773..4e3f94cb474 100644
--- a/apps/browser/src/_locales/fil/messages.json
+++ b/apps/browser/src/_locales/fil/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Tanungin ang update ng umiiral na login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Hindi magagamit ang tampok"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Kinakailangan ang paglilipat ng encryption key. Mangyaring mag-login sa pamamagitan ng web vault upang i-update ang iyong encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Pagiging miyembro ng premium"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Itakda ang iyong PIN code para sa pag-unlock ng Bitwarden. Ang iyong mga setting ng PIN ay ma-reset kung kailanman ay lubusang lumabas ka mula sa application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "Kinakailangan ang PIN code."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Hinarang ng isang patakaran ng organisasyon ang pag-import ng mga item sa iyong vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Lahat ng Mga Padala",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Kailangan mong i-verify ang iyong email upang gamitin ang tampok na ito. Maaari mong i-verify ang iyong email sa web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "I-update ang master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Nakalantad na Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/fr/messages.json b/apps/browser/src/_locales/fr/messages.json
index 736fd21349e..efcc28ddcea 100644
--- a/apps/browser/src/_locales/fr/messages.json
+++ b/apps/browser/src/_locales/fr/messages.json
@@ -3,7 +3,7 @@
     "message": "Bitwarden"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Logo de Bitwarden"
   },
   "extName": {
     "message": "Gestionnaire de mots de passe Bitwarden",
@@ -887,7 +887,7 @@
     "message": "Suivez les étapes ci-dessous afin de réussir à vous connecter."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Suivez les étapes ci-dessous pour terminer la connexion avec votre clé de sécurité."
   },
   "restartRegistration": {
     "message": "Redémarrer l'inscription"
@@ -1080,7 +1080,7 @@
     "description": "Tooltip and Aria label for edit button on cipher item"
   },
   "newNotification": {
-    "message": "New notification"
+    "message": "Nouvelle notification"
   },
   "labelWithNotification": {
     "message": "$LABEL$: New notification",
@@ -1093,11 +1093,11 @@
     }
   },
   "notificationLoginSaveConfirmation": {
-    "message": "saved to Bitwarden.",
+    "message": "enregistré dans Bitwarden.",
     "description": "Shown to user after item is saved."
   },
   "notificationLoginUpdatedConfirmation": {
-    "message": "updated in Bitwarden.",
+    "message": "mis à jour dans Bitwarden.",
     "description": "Shown to user after item is updated."
   },
   "selectItemAriaLabel": {
@@ -1121,15 +1121,15 @@
     "description": "Button text for updating an existing login entry."
   },
   "unlockToSave": {
-    "message": "Unlock to save this login",
+    "message": "Déverrouiller pour enregistrer l'identifiant",
     "description": "User prompt to take action in order to save the login they just entered."
   },
   "saveLogin": {
-    "message": "Save login",
+    "message": "Enregistrer l'identifiant",
     "description": "Prompt asking the user if they want to save their login details."
   },
   "updateLogin": {
-    "message": "Update existing login",
+    "message": "Mettre à jour de l'identifiant existant",
     "description": "Prompt asking the user if they want to update an existing login entry."
   },
   "loginSaveSuccess": {
@@ -1162,7 +1162,7 @@
     "description": "Shown to user after login is updated."
   },
   "nextSecurityTaskAction": {
-    "message": "Change next password",
+    "message": "Changer le mot de passe suivant",
     "description": "Message prompting user to undertake completion of another security task."
   },
   "saveFailure": {
@@ -1173,6 +1173,12 @@
     "message": "Oh non ! Nous n'avons pas pu enregistrer cela. Essayez de saisir les détails manuellement.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Demander de mettre à jour un identifiant existant"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Fonctionnalité indisponible"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Migration de la clé de chiffrement nécessaire. Veuillez vous connecter sur le coffre web pour mettre à jour votre clé de chiffrement."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Adhésion Premium"
@@ -1606,7 +1612,7 @@
     "message": "Turn off your browser's autofill settings, so they don't conflict with Bitwarden."
   },
   "turnOffBrowserAutofill": {
-    "message": "Turn off $BROWSER$ autofill",
+    "message": "Désactiver le remplissage automatique de $BROWSER$",
     "placeholders": {
       "browser": {
         "content": "$1",
@@ -1615,7 +1621,7 @@
     }
   },
   "turnOffAutofill": {
-    "message": "Turn off autofill"
+    "message": "Désactiver la saisie automatique"
   },
   "showInlineMenuLabel": {
     "message": "Afficher les suggestions de saisie automatique dans les champs d'un formulaire"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Clé SSH"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "Créer un(e) $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Définissez votre code PIN pour déverrouiller Bitwarden. Les paramètres relatifs à votre code PIN seront réinitialisés si vous vous déconnectez complètement de l'application."
   },
-  "setYourPinCode1": {
-    "message": "Votre code PIN sera utilisé pour déverrouiller Bitwarden au lieu de votre mot de passe principal. Votre code PIN sera réinitialisé si vous vous déconnectez complètement de Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "Le code PIN est requis."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Utiliser ce mot de passe"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Utiliser ce nom d'utilisateur"
   },
@@ -2374,7 +2386,7 @@
     "message": "Politique de confidentialité"
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Votre nouveau mot de passe ne peut être le même que votre mot de passe actuel."
   },
   "hintEqualsPassword": {
     "message": "Votre indice de mot de passe ne peut pas être identique à votre mot de passe."
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Une politique d'organisation a bloqué l'import d'éléments dans votre coffre personel."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domaines",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Modifier"
   },
+  "changePassword": {
+    "message": "Changer le mot de passe",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Modifier le mot de passe - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Mot de passe à risque"
+  },
   "atRiskPasswords": {
     "message": "Mots de passe à risque"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Examiner et modifier un mot de passe à risque"
   },
@@ -2674,6 +2719,10 @@
     "message": "Tous les Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Masquer le texte par défaut"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Vous devez vérifier votre courriel pour utiliser cette fonctionnalité. Vous pouvez vérifier votre courriel dans le coffre web."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Mot de passe principal mis à jour"
   },
@@ -3018,7 +3070,7 @@
     "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Nom de l'organisation"
   },
   "keyConnectorDomain": {
     "message": "Key Connector domain"
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Demande envoyée"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Mot de passe principal exposé"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Demander l'approbation de l'administrateur"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Identifiant SSO de l'organisation requis."
   },
@@ -3584,13 +3645,13 @@
     "message": "Appareil de confiance"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Faire confiance à l'organisation"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Faire confiance"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Ne pas faire confiance"
   },
   "organizationNotTrusted": {
     "message": "Organization is not trusted"
@@ -3605,15 +3666,7 @@
     "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
   },
   "trustUser": {
-    "message": "Trust user"
-  },
-  "sendsNoItemsTitle": {
-    "message": "Pas de Send actif",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Utilisez Send pour partager en toute sécurité des informations chiffrées avec tout le monde.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+    "message": "Faire confiance à l'utilisateur"
   },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
@@ -3751,7 +3804,7 @@
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
   "turnOffMasterPasswordPromptToEditField": {
-    "message": "Désactivez la resaisie du mot de passe maître pour éditer ce champ",
+    "message": "Désactivez la ressaisie du mot de passe principal pour modifier ce champ",
     "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
   },
   "toggleSideNavigation": {
@@ -4209,6 +4262,26 @@
     "message": "Formats communs",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Options avancées",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continuer vers les paramètres du navigateur ?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -4540,19 +4613,19 @@
     }
   },
   "downloadBitwarden": {
-    "message": "Download Bitwarden"
+    "message": "Télécharger Bitwarden"
   },
   "downloadBitwardenOnAllDevices": {
-    "message": "Download Bitwarden on all devices"
+    "message": "Télécharger Bitwarden sur tous les appareils"
   },
   "getTheMobileApp": {
-    "message": "Get the mobile app"
+    "message": "Télécharger l'application mobile"
   },
   "getTheMobileAppDesc": {
     "message": "Access your passwords on the go with the Bitwarden mobile app."
   },
   "getTheDesktopApp": {
-    "message": "Get the desktop app"
+    "message": "Télécharger l'application de bureau"
   },
   "getTheDesktopAppDesc": {
     "message": "Access your vault without a browser, then set up unlock with biometrics to expedite unlocking in both the desktop app and browser extension."
@@ -4564,7 +4637,7 @@
     "message": "Get it on Google Play"
   },
   "downloadOnTheAppStore": {
-    "message": "Download on the App Store"
+    "message": "Télécharger depuis l’App Store"
   },
   "permanentlyDeleteAttachmentConfirmation": {
     "message": "Êtes-vous sûr de vouloir supprimer définitivement cette pièce jointe ?"
@@ -4771,10 +4844,10 @@
     "message": "Entrez l'identifiant html, le nom, l'étiquette aria ou l'espace réservé du champ."
   },
   "editField": {
-    "message": "Éditer le champ"
+    "message": "Modifier le champ"
   },
   "editFieldLabel": {
-    "message": "Éditer $LABEL$",
+    "message": "Modifier $LABEL$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -5028,7 +5101,7 @@
     "message": "Le déverrouillage par biométrie n'est pas disponible actuellement pour une raison inconnue."
   },
   "unlockVault": {
-    "message": "Unlock your vault in seconds"
+    "message": "Déverouillez votre coffre en quelques secondes"
   },
   "unlockVaultDesc": {
     "message": "You can customize your unlock and timeout settings to more quickly access your vault."
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authentification"
   },
@@ -5253,22 +5329,22 @@
     "message": "Changer le mot de passe à risque"
   },
   "settingsVaultOptions": {
-    "message": "Vault options"
+    "message": "Options du coffre"
   },
   "emptyVaultDescription": {
     "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
   },
   "introCarouselLabel": {
-    "message": "Welcome to Bitwarden"
+    "message": "Bienvenue sur Bitwarden"
   },
   "securityPrioritized": {
-    "message": "Security, prioritized"
+    "message": "Priorité à la sécurité"
   },
   "securityPrioritizedBody": {
     "message": "Save logins, cards, and identities to your secure vault. Bitwarden uses zero-knowledge, end-to-end encryption to protect what’s important to you."
   },
   "quickLogin": {
-    "message": "Quick and easy login"
+    "message": "Connexion rapide et facile"
   },
   "quickLoginBody": {
     "message": "Set up biometric unlock and autofill to log into your accounts without typing a single letter."
@@ -5295,10 +5371,10 @@
     "message": "Use the importer to quickly transfer logins to Bitwarden without manually adding them."
   },
   "emptyVaultNudgeButton": {
-    "message": "Import now"
+    "message": "Importer maintenant"
   },
   "hasItemsVaultNudgeTitle": {
-    "message": "Welcome to your vault!"
+    "message": "Bienvenue dans votre coffre !"
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autofill items for the current page"
@@ -5310,7 +5386,7 @@
     "message": "Search your vault for something else"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Gagnez du temps avec le remplissage automatique"
   },
   "newLoginNudgeBodyOne": {
     "message": "Include a",
@@ -5318,7 +5394,7 @@
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Site internet",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
@@ -5354,7 +5430,7 @@
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "En savoir plus sur l'agent SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/gl/messages.json b/apps/browser/src/_locales/gl/messages.json
index e10287f3e7b..71841239698 100644
--- a/apps/browser/src/_locales/gl/messages.json
+++ b/apps/browser/src/_locales/gl/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ofrecer actualizar as credenciais xa gardadas"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Función non dispoñible"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Requírese mudar a clave de cifrado. Por favor, inicia sesión na aplicación web para actualizala."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Plan Prémium"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Clave SSH"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "Novo $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Crea un PIN para abrir a caixa forte. Se algunha vez pechas a sesión en Bitwarden perderase a configuración deste PIN."
   },
-  "setYourPinCode1": {
-    "message": "O PIN empregarase no lugar do contrasinal mestre para abrir a caixa forte. Se pechas a sesión en Bitwarden perderase a configuración do PIN."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN requirido."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Usar este contrasinal"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Usar este nome de usuario"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Unha directiva da empresa impide importar entradas á túa caixa forte individual."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Dominios",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Todos os Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Ocultar texto por defecto"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Debes verificar o teu correo electrónico para empregar esta función. Podes facelo dende a aplicación web."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Contrasinal mestre actualizado"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Contrasinal mestre filtrado"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Solicitar aprobación do administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Identificador SSO da organización requirido."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "Sen Sends activos",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Usar send para compartir información cifrada con quen queiras.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Formatos comúns",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Ir ós axustes do navegador?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Autenticando"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/he/messages.json b/apps/browser/src/_locales/he/messages.json
index 1b264d9a70a..b9a0a3dada4 100644
--- a/apps/browser/src/_locales/he/messages.json
+++ b/apps/browser/src/_locales/he/messages.json
@@ -3,7 +3,7 @@
     "message": "Bitwarden"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "הלוגו של Bitwarden"
   },
   "extName": {
     "message": "מנהל הסיסמאות Bitwarden",
@@ -1173,6 +1173,12 @@
     "message": "או לא! לא יכלנו לשמור זאת. נסה להזין את הפרטים באופן ידני.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "שאל אם לעדכן פרטי כניסה קיימת"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "התכונה אינה זמינה"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "נדרשת הגירת מפתח הצפנה. נא להיכנס דרך כספת הרשת כדי לעדכן את מפתח ההצפנה שלך."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "חברות פרימיום"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "מפתח SSH"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "$TYPE$ חדש",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "קבע קוד PIN לביטול נעילת Bitwarden. הגדרות הPIN יאופסו אם תבצע יציאה מהתוכנה."
   },
-  "setYourPinCode1": {
-    "message": "ה־PIN שלך ישמש לביטול נעילת Bitwarden במקום הסיסמה הראשית שלך. ה־PIN שלך יאופס אם אי פעם תצא באופן מלא מ־Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "נדרש קוד PIN."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "השתמש בסיסמה זו"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "השתמש בשם משתמש זה"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "מדיניות ארגון חסמה ייבוא פריטים אל תוך הכספת האישית שלך."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "דומיינים",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "שינוי"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "שנה סיסמה - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "סיסמאות בסיכון"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "סקור ושנה סיסמה אחת בסיכון"
   },
@@ -2674,6 +2719,10 @@
     "message": "כל הסֵנְדים",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "מספר הגישות המרבי הושג",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "הסתר טקסט כברירת מחדל"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "עליך לאמת את הדוא\"ל שלך כדי להשתמש בתכונה זו. ניתן לאמת את הדוא\"ל שלך בכספת הרשת."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "סיסמה ראשית עודכנה"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "בקשה נשלחה"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "סיסמה ראשית חשופה"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "בקש אישור מנהל"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "נדרש מזהה SSO של הארגון."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "אין סֵנְדים פעילים",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "השתמש בסֵנְד כדי לשתף באופן מאובטח מידע מוצפן עם כל אחד.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "פורמטים נפוצים",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "להמשיך אל הגדרות הדפדפן?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "מאמת"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/hi/messages.json b/apps/browser/src/_locales/hi/messages.json
index 61c0fbe9963..74fc419d7f1 100644
--- a/apps/browser/src/_locales/hi/messages.json
+++ b/apps/browser/src/_locales/hi/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "मौजूदा लॉगिन को अपडेट करने के लिए कहें"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature Unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium Membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "नोट"
+  },
   "newItemHeader": {
     "message": "नया $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "बिटवर्डन को अनलॉक करने के लिए अपना पिन कोड सेट करें यदि आप कभी भी आवेदन से पूरी तरह लॉग आउट करते हैं तो आपकी पिन सेटिंग्स रीसेट हो जाएंगी।"
   },
-  "setYourPinCode1": {
-    "message": "बिटवर्डन को अनलॉक करने के लिए आपके मास्टर पासवर्ड के बजाय आपके पिन का उपयोग किया जाएगा। यदि आप कभी भी बिटवर्डन से पूरी तरह लॉग आउट हो जाते हैं तो आपका पिन रीसेट हो जाएगा।"
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "पिन-कोड आवश्यक है |"
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "सभी Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "इस सुविधा का उपयोग करने के लिए आपको अपने ईमेल को सत्यापित करना होगा। आप वेब वॉल्ट में अपने ईमेल को सत्यापित कर सकते हैं।"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "अपडेट किया गया मास्टर पासवर्ड"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "उपयोगकर्ता पर भरोसा रखें"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/hr/messages.json b/apps/browser/src/_locales/hr/messages.json
index ad32937c740..6434a09bcfb 100644
--- a/apps/browser/src/_locales/hr/messages.json
+++ b/apps/browser/src/_locales/hr/messages.json
@@ -887,7 +887,7 @@
     "message": "Prati korake za dovršetak prijave."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Prati korake za dovršetak prijave svojim sigurnosnim ključem."
   },
   "restartRegistration": {
     "message": "Ponovno pokreni registraciju"
@@ -1063,7 +1063,7 @@
     "message": "Spremi"
   },
   "notificationViewAria": {
-    "message": "View $ITEMNAME$, opens in new window",
+    "message": "Pogledaj $ITEMNAME$, otvara u novom prozoru",
     "placeholders": {
       "itemName": {
         "content": "$1"
@@ -1072,18 +1072,18 @@
     "description": "Aria label for the view button in notification bar confirmation message"
   },
   "notificationNewItemAria": {
-    "message": "New Item, opens in new window",
+    "message": "Nova stavka, otvara u novom prozoru",
     "description": "Aria label for the new item button in notification bar confirmation message when error is prompted"
   },
   "notificationEditTooltip": {
-    "message": "Edit before saving",
+    "message": "Uredi prije spremanja",
     "description": "Tooltip and Aria label for edit button on cipher item"
   },
   "newNotification": {
-    "message": "New notification"
+    "message": "Nova obavijest"
   },
   "labelWithNotification": {
-    "message": "$LABEL$: New notification",
+    "message": "$LABEL$: Nova obavijest",
     "description": "Label for the notification with a new login suggestion.",
     "placeholders": {
       "label": {
@@ -1093,15 +1093,15 @@
     }
   },
   "notificationLoginSaveConfirmation": {
-    "message": "saved to Bitwarden.",
+    "message": "spremljeno u Bitwarden.",
     "description": "Shown to user after item is saved."
   },
   "notificationLoginUpdatedConfirmation": {
-    "message": "updated in Bitwarden.",
+    "message": "ažurirano u Bitwarenu.",
     "description": "Shown to user after item is updated."
   },
   "selectItemAriaLabel": {
-    "message": "Select $ITEMTYPE$, $ITEMNAME$",
+    "message": "Odaberi $ITEMTYPE$, $ITEMNAME$",
     "description": "Used by screen readers. $1 is the item type (like vault or folder), $2 is the selected item name.",
     "placeholders": {
       "itemType": {
@@ -1121,15 +1121,15 @@
     "description": "Button text for updating an existing login entry."
   },
   "unlockToSave": {
-    "message": "Unlock to save this login",
+    "message": "Otključaj za spremanje ove prijave",
     "description": "User prompt to take action in order to save the login they just entered."
   },
   "saveLogin": {
-    "message": "Save login",
+    "message": "Spremi prijavu",
     "description": "Prompt asking the user if they want to save their login details."
   },
   "updateLogin": {
-    "message": "Update existing login",
+    "message": "Ažuriraj postojeću prijavu",
     "description": "Prompt asking the user if they want to update an existing login entry."
   },
   "loginSaveSuccess": {
@@ -1141,7 +1141,7 @@
     "description": "Message displayed when login details are successfully updated."
   },
   "loginUpdateTaskSuccess": {
-    "message": "Great job! You took the steps to make you and $ORGANIZATION$ more secure.",
+    "message": "Odlično! Ti i $ORGANIZATION$ ste sada sigurniji.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1150,7 +1150,7 @@
     "description": "Shown to user after login is updated."
   },
   "loginUpdateTaskSuccessAdditional": {
-    "message": "Thank you for making $ORGANIZATION$ more secure. You have $TASK_COUNT$ more passwords to update.",
+    "message": "Hvala što je $ORGANIZATION$ sada sigurnija. Imaš još $TASK_COUNT$ lozinku za ažuriranje.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1162,7 +1162,7 @@
     "description": "Shown to user after login is updated."
   },
   "nextSecurityTaskAction": {
-    "message": "Change next password",
+    "message": "Promjeni sljedeću lozinku",
     "description": "Message prompting user to undertake completion of another security task."
   },
   "saveFailure": {
@@ -1173,6 +1173,12 @@
     "message": "Ups! Nismo mogli ovo spasiti. Pokušaj ručno unijeti detalje.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "Nakon promjene lozinke, moraš se prijaviti s novom lozinkom. Aktivne sesije na drugim uređajima bit će odjavljene u roku od jednog sata."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Promijeni svoju glavnu lozinku za dovršetak oporavka računa."
+  },
   "enableChangedPasswordNotification": {
     "message": "Upitaj za ažuriranje trenutne prijave"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Značajka nije dostupna"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Potrebna je migracija ključa za šifriranje. Prijavi se na web trezoru za ažuriranje ključa za šifriranje."
+  "legacyEncryptionUnsupported": {
+    "message": "Zastarjelo šifriranje više nije podržano. Obrati se podršci za oporavak računa."
   },
   "premiumMembership": {
     "message": "Premium članstvo"
@@ -1600,13 +1606,13 @@
     "message": "Prijedlozi auto-ispune"
   },
   "autofillSpotlightTitle": {
-    "message": "Easily find autofill suggestions"
+    "message": "Jednostavno pronađi prijedloge auto-ispune"
   },
   "autofillSpotlightDesc": {
-    "message": "Turn off your browser's autofill settings, so they don't conflict with Bitwarden."
+    "message": "Isključi postavke auto-ispune preglenika kako se ne bi kosile s Bitwardenom."
   },
   "turnOffBrowserAutofill": {
-    "message": "Turn off $BROWSER$ autofill",
+    "message": "Isključi auto-ispunu za $BROWSER$",
     "placeholders": {
       "browser": {
         "content": "$1",
@@ -1615,7 +1621,7 @@
     }
   },
   "turnOffAutofill": {
-    "message": "Turn off autofill"
+    "message": "Isključi auto-ispunu"
   },
   "showInlineMenuLabel": {
     "message": "Prikaži prijedloge auto-ispune na poljima obrazaca"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH ključ"
   },
+  "typeNote": {
+    "message": "Bilješka"
+  },
   "newItemHeader": {
     "message": "Novi $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Postavi svoj PIN kôd za otključavanje Bitwardena. Postavke PIN-a se resetiraju ako se potpuno odjaviš iz aplikacije."
   },
-  "setYourPinCode1": {
-    "message": "Tvoj PIN će se koristiti za otključavanje Bitwardena umjesto glavne lozinke. PIN će se restirati ukoliko se odjaviš iz Bitwardena. "
+  "setPinCode": {
+    "message": "Ovim PIN-om možeš otključati Bitwarden. Tvoj PIN će se resetirati ako se ikada potpuno odjaviš iz aplikacije."
   },
   "pinRequired": {
     "message": "Potreban je PIN."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Koristi ovu lozinku"
   },
+  "useThisPassphrase": {
+    "message": "Koristi ovu fraznu lozinku"
+  },
   "useThisUsername": {
     "message": "Koristi ovo korisničko ime"
   },
@@ -2374,7 +2386,7 @@
     "message": "Pravila privatnosti"
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Tvoja nova lozinka ne može biti ista kao tvoja trenutna lozinka."
   },
   "hintEqualsPassword": {
     "message": "Podsjetnik za lozinku ne može biti isti kao lozinka."
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Organizacijsko pravilo onemogućuje uvoz stavki u tvoj osobni trezor."
   },
+  "restrictCardTypeImport": {
+    "message": "Ne mogu uvesti stavke vrste Platna kartica"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Pravila jedne ili više organizacija onemogućuju uvoz stavke vrste Platna kartica u tvoj trezor."
+  },
   "domainsTitle": {
     "message": "Domene",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Promijeni"
   },
+  "changePassword": {
+    "message": "Promijeni lozinku",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Promijeni lozinku - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Rizična lozinka"
+  },
   "atRiskPasswords": {
     "message": "Rizične lozinke"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Tvoja lozinka za ovo mjesto je rizična. $ORGANIZATION$ zahtijeva da ju promijeniš.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ želi da promjeniš ovu lozinku jer je rizična. Promijeni lozinku u postavkama računa.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Pregledaj i promijeni jednu rizičnu lozinku"
   },
@@ -2584,14 +2629,14 @@
     "description": "Description of the review at-risk login slide on the at-risk password page carousel"
   },
   "reviewAtRiskLoginSlideImgAltPeriod": {
-    "message": "Illustration of a list of logins that are at-risk."
+    "message": "Ilustracija liste rizičnih prijava."
   },
   "generatePasswordSlideDesc": {
     "message": "Brzo generiraj jake, jedinstvene lozinke koristeći Bitwarden dijalog auto-ispune direktno na stranici.",
     "description": "Description of the generate password slide on the at-risk password page carousel"
   },
   "generatePasswordSlideImgAltPeriod": {
-    "message": "Illustration of the Bitwarden autofill menu displaying a generated password."
+    "message": "Ilustracija Bitwarden dijaloga auto-ispune s prikazom generirane lozinke."
   },
   "updateInBitwarden": {
     "message": "Ažuriraj u Bitwardenu"
@@ -2601,7 +2646,7 @@
     "description": "Description of the update in Bitwarden slide on the at-risk password page carousel"
   },
   "updateInBitwardenSlideImgAltPeriod": {
-    "message": "Illustration of a Bitwarden’s notification prompting the user to update the login."
+    "message": "Ilustracija Bitwarden upita za ažuriranje prijave."
   },
   "turnOnAutofill": {
     "message": "Uključi auto-ispunu"
@@ -2674,6 +2719,10 @@
     "message": "Svi Sendovi",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Dostignut najveći broj pristupanja",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Zadano sakrij tekst"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Moraš ovjeriti svoju e-poštu u mrežnom trezoru za koritšenje ove značajke."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Glavna lozinka uspješno postavljena"
+  },
   "updatedMasterPassword": {
     "message": "Glavna lozinka ažurirana"
   },
@@ -3015,13 +3067,13 @@
     "message": "Nije nađen jedinstveni identifikator."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Glavna lozinka više nije obavezna za članove sljedeće organizacije. Provjeri prikazanu domenu sa svojim administratorom."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Naziv Organizacije"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Domena konektora ključa"
   },
   "leaveOrganization": {
     "message": "Napusti organizaciju"
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Zahtjev poslan"
   },
+  "masterPasswordChanged": {
+    "message": "Glavna lozinka promijenjena"
+  },
   "exposedMasterPassword": {
     "message": "Ukradena glavna lozinka"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Zatraži odobrenje administratora"
   },
+  "unableToCompleteLogin": {
+    "message": "Nije moguće dovršiti prijavu"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Moraš se prijaviti na pouzdanom uređaju ili zamoliti administratora da ti dodijeli lozinku."
+  },
   "ssoIdentifierRequired": {
     "message": "Potreban je identifikator organizacije."
   },
@@ -3584,43 +3645,35 @@
     "message": "Uređaj pouzdan"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Vjeruj organizaciji"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Vjeruj"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Nemoj vjerovati"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Organizacija nije pouzdana"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Radi sigurnosti tvojeg računa, potvrdi samo ako je ovom korisniku odobren pristup u nuždi i ako se otisak prsta podudara s onim prikazanim u računu"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Radi sigurnosti tvojeg računa, nastavi samo ako si član ove organizacije, imaš omogućen oporavak računa i otisak prsta prikazan u nastavku odgovara otisku prsta organizacije."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Ova organizacija ima poslovno pravilo koje će te prijaviti za oporavak računa. Prijava će omogućiti administratorima organizacije da promijene tvoju lozinku. Nastavi samo ako prepoznaješ ovu organizaciju i ako se fraza otiska prsta prikazana u nastavku podudara s otiskom prsta organizacije."
   },
   "trustUser": {
-    "message": "Trust user"
-  },
-  "sendsNoItemsTitle": {
-    "message": "Nema aktivnih Sendova",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Koristi Send za sigurno slanje šifriranih podataka bilo kome.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+    "message": "Vjeruj korisniku"
   },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "Sigurno pošalji osjetljive podatke",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "Sigurno dijeli datoteke i podatke s bilo kime, na bilo kojoj platformi. Tvoji podaci ostaju kriptirani uz ograničenje izloženosti.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -4209,6 +4262,26 @@
     "message": "Uobičajeni oblici",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Otkrivanje podudaranja URI-ja je način na koji Bitwarden identificira prijedloge za auto-ispunu.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "„Regularni izraz” je napredna mogućnost s povećanim rizikom od otkrivanja vjerodajnica.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "„Počinje s” je napredna mogućnost s povećnim rizikom od otkrivanja vjerodajnica.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Više o otkrivanju podudaranja",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Napredne mogućnosti",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Nastavi na postavke preglednika?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -4355,7 +4428,7 @@
     }
   },
   "viewItemTitleWithField": {
-    "message": "View item - $ITEMNAME$ - $FIELD$",
+    "message": "Pogledaj stavku - $ITEMNAME$ - $FIELD$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4379,7 +4452,7 @@
     }
   },
   "autofillTitleWithField": {
-    "message": "Autofill - $ITEMNAME$ - $FIELD$",
+    "message": "Auto-ispuna - $ITEMNAME$ - $FIELD$",
     "description": "Title for a button that autofills a login item.",
     "placeholders": {
       "itemname": {
@@ -4540,31 +4613,31 @@
     }
   },
   "downloadBitwarden": {
-    "message": "Download Bitwarden"
+    "message": "Preuzmi Bitwarden"
   },
   "downloadBitwardenOnAllDevices": {
-    "message": "Download Bitwarden on all devices"
+    "message": "Preuzmi Bitwarden na svim uređajima"
   },
   "getTheMobileApp": {
-    "message": "Get the mobile app"
+    "message": "Nabavi mobilnu aplikaciju"
   },
   "getTheMobileAppDesc": {
-    "message": "Access your passwords on the go with the Bitwarden mobile app."
+    "message": "Pristupi svojim lozinkama bilo gdje s Bitwarden mobilnom aplikacijom."
   },
   "getTheDesktopApp": {
-    "message": "Get the desktop app"
+    "message": "Nabavi aplikaciju za stolna računala"
   },
   "getTheDesktopAppDesc": {
-    "message": "Access your vault without a browser, then set up unlock with biometrics to expedite unlocking in both the desktop app and browser extension."
+    "message": "Pristupi svojem trezoru bez preglednika, a zatim postavi otključavanje biometrijom za brže otključavanje aplikacije za stolna računala i prošitenja preglednika."
   },
   "downloadFromBitwardenNow": {
-    "message": "Download from bitwarden.com now"
+    "message": "Odmah preusmi s bitwarden.com"
   },
   "getItOnGooglePlay": {
-    "message": "Get it on Google Play"
+    "message": "Nabavi u Google Play"
   },
   "downloadOnTheAppStore": {
-    "message": "Download on the App Store"
+    "message": "Nabavi u App Store"
   },
   "permanentlyDeleteAttachmentConfirmation": {
     "message": "Sigurno želiš trajno izbrisati ovaj privitak?"
@@ -5028,13 +5101,16 @@
     "message": "Biometrijsko otključavanje trenutno nije dostupno iz nepoznatog razloga."
   },
   "unlockVault": {
-    "message": "Unlock your vault in seconds"
+    "message": "Otključaj svoj trezor u trenu"
   },
   "unlockVaultDesc": {
-    "message": "You can customize your unlock and timeout settings to more quickly access your vault."
+    "message": "Možeš prilagoditi postavke otključavanja i vremena isteka za brže pristupanje svojem trezoru."
   },
   "unlockPinSet": {
-    "message": "Unlock PIN set"
+    "message": "PIN za otključavanje podešen"
+  },
+  "unlockWithBiometricSet": {
+    "message": "Otključavanje biometrijom postavljeno"
   },
   "authenticating": {
     "message": "Autentifikacija"
@@ -5048,7 +5124,7 @@
     "description": "Notification message for when a password has been regenerated"
   },
   "saveToBitwarden": {
-    "message": "Save to Bitwarden",
+    "message": "Spremi u Bitwarden",
     "description": "Confirmation message for saving a login to Bitwarden"
   },
   "spaceCharacterDescriptor": {
@@ -5253,129 +5329,133 @@
     "message": "Promijeni rizičnu lozinku"
   },
   "settingsVaultOptions": {
-    "message": "Vault options"
+    "message": "Mogućnosti trezora"
   },
   "emptyVaultDescription": {
-    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+    "message": "Trezor štiti više od lozinki. Sigurno spremi prijave, identitete, kartice i bilješke."
   },
   "introCarouselLabel": {
-    "message": "Welcome to Bitwarden"
+    "message": "Dobrodošli u Bitwarden"
   },
   "securityPrioritized": {
-    "message": "Security, prioritized"
+    "message": "Sigurnost je imperativ"
   },
   "securityPrioritizedBody": {
-    "message": "Save logins, cards, and identities to your secure vault. Bitwarden uses zero-knowledge, end-to-end encryption to protect what’s important to you."
+    "message": "Spremi prijave, kartice i identitete u svoj sigurni trezor. Bitwarden koristi end-to-end enkripciju bez znanja kako bi zaštitio ono što ti je važno."
   },
   "quickLogin": {
-    "message": "Quick and easy login"
+    "message": "Brza i jednostavna prijava"
   },
   "quickLoginBody": {
-    "message": "Set up biometric unlock and autofill to log into your accounts without typing a single letter."
+    "message": "Uključi biometrijsko otključavanje i auto-ispunu za prijavu bez utipkavanja ijednog slova."
   },
   "secureUser": {
-    "message": "Level up your logins"
+    "message": "Podigni svoje prijave na višu razinu"
   },
   "secureUserBody": {
-    "message": "Use the generator to create and save strong, unique passwords for all your accounts."
+    "message": "Koristi generator za stvaranje i spremanje jakih, jedinstvenih lozinki za sve svoje račune."
   },
   "secureDevices": {
-    "message": "Your data, when and where you need it"
+    "message": "Tvoji podaci kada god i gdje god su ti potrebni"
   },
   "secureDevicesBody": {
-    "message": "Save unlimited passwords across unlimited devices with Bitwarden mobile, browser, and desktop apps."
+    "message": "Spremi neograničen broj lozinki na neograničenom broju uređaja s Bitwarden mobilnom aplikacijom, proširenjem za preglednik i aplikacijom za stolna računala."
   },
   "nudgeBadgeAria": {
-    "message": "1 notification"
+    "message": "1 obavijest"
   },
   "emptyVaultNudgeTitle": {
-    "message": "Import existing passwords"
+    "message": "Uvezi postojeće lozinke"
   },
   "emptyVaultNudgeBody": {
-    "message": "Use the importer to quickly transfer logins to Bitwarden without manually adding them."
+    "message": "Koristi uvoz za brzi prijenos prijava u Bitwarden bez ručnog dodavanja."
   },
   "emptyVaultNudgeButton": {
-    "message": "Import now"
+    "message": "Uvezi odmah"
   },
   "hasItemsVaultNudgeTitle": {
-    "message": "Welcome to your vault!"
+    "message": "Dobrodošli u svoj trezor!"
   },
   "hasItemsVaultNudgeBodyOne": {
-    "message": "Autofill items for the current page"
+    "message": "Auto-ispuni stavke za trenutnu stranicu"
   },
   "hasItemsVaultNudgeBodyTwo": {
-    "message": "Favorite items for easy access"
+    "message": "Favoriti za brzi pristup"
   },
   "hasItemsVaultNudgeBodyThree": {
-    "message": "Search your vault for something else"
+    "message": "Nađi nešto drugo u svom trezoru"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Uštedi vrijeme s auto-ispunom"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Uključi",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "web stranicu",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "kako bi ova prijava bila predložena u auto-ispuni.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Jednostavna online kupnja"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "S karticama jednostavno i sigurno automatski ispunjavaš obrasce za plaćanje."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Pojednostavi stvaranje računa"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "S identitetima brzo automatski ispunjavaš duge registracijske i kontaktne obrasce."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Čuvaj svoje osjetljive podatke na sigurnom"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "S bilješkama sigurno pohrani svoje osjetljive podatke poput podataka o banci ili osiguranju."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "SSH pristup prilagođen programerima"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Pohrani svoje ključeve i poveži se sa SSH agentom za brzu, šifriranu autentifikaciju.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Saznaj više o SSH agentu",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "Brzo stvori lozinke"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "Jednostavno stvori jake i jedinstvene lozinke odabirom tipke",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "kako bi tvoje prijave ostale sigurne.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "Jednostavno stvori jake i sigurne lozinke odabirom tipke Generiraj lozinku kako bi tvoje prijave ostale sigurne.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
-    "message": "You do not have permissions to view this page. Try logging in with a different account."
+    "message": "Nemaš dozvolu za pregled ove stranice. Pokušaj se prijaviti s drugim računom."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly ili nije podržan ili nije omogućen u tvom pregledniku. WebAssembly je potreban za korištenje Bitwarden aplikacije.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/hu/messages.json b/apps/browser/src/_locales/hu/messages.json
index 50607787cd7..5391b266a93 100644
--- a/apps/browser/src/_locales/hu/messages.json
+++ b/apps/browser/src/_locales/hu/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "A jelszó megváltoztatása után be kell jelentkezni az új jelszóval. Az aktív munkamenetek más eszközökön egy órán belül kijelentkeznek."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Módosítsuk a mesterjelszót a fiók helyreállításának befejezéséhez."
+  },
   "enableChangedPasswordNotification": {
     "message": "Létező bejelentkezés frissítés kérése"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "A funkció nem érhető el."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Titkosítási kulcs migráció szükséges. Jelentkezzünk be a webes széfen keresztül a titkosítási kulcs frissítéséhez."
+  "legacyEncryptionUnsupported": {
+    "message": "A régi titkosítás már nem támogatott. Lépjünk kapcsolatba a támogatással a fiók helyreállításához."
   },
   "premiumMembership": {
     "message": "Prémium tagság"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH kulcs"
   },
+  "typeNote": {
+    "message": "Jegyzet"
+  },
   "newItemHeader": {
     "message": "Új $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "A pinkód beállítása a Bitwarden feloldásához. A pinkód beállítás alaphelyzetbe kerül, ha teljesen kijelentkezünk az alkalmazásból."
   },
-  "setYourPinCode1": {
-    "message": "A Bitwarden feloldásához a PIN kódot használjuk a mesterjelszó helyett. A PIN kód alaphelyzetbe kerül, ha teljesen kijelentkezünk a Bitwardenből."
+  "setPinCode": {
+    "message": "Ezt a PIN kódot használhatjuk a Bitwarden feloldásához. A PIN kód alaphelyzetbe kerül, ha valaha is teljesen kijelentkezünk az alkalmazásból."
   },
   "pinRequired": {
     "message": "A pinkód szükséges."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Jelszó használata"
   },
+  "useThisPassphrase": {
+    "message": "Jelmondat használata"
+  },
   "useThisUsername": {
     "message": "Felhasználónév használata"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "A szervezeti politika blokkolta az elemek importálását az egyedi széfbe."
   },
+  "restrictCardTypeImport": {
+    "message": "A kártya elem típusokat nem lehet importálni."
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Egy vagy több szervezet által beállított szabályzat megakadályozza a kártyák importálását a széfekbe."
+  },
   "domainsTitle": {
     "message": "Tartomány",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Módosítás"
   },
+  "changePassword": {
+    "message": "Jelszó módosítása",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Jelszó módosítás - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Veszélyes jelszó"
+  },
   "atRiskPasswords": {
     "message": "Veszélyes jelszavak"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "A webhely jelszava veszélyben van. $ORGANIZATION$ kérte a megváltoztatását.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ azt akarja, hogy változtassuk meg ezt a jelszót, mert veszélyben van. A jelszó módosításához navigáljunk fiók beállításokhoz.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Tekintsük át és módosítsuk az egyik veszélyeztetett jelszót."
   },
@@ -2674,6 +2719,10 @@
     "message": "Összes Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "A maximális hozzáférések száma elérésre került.",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Szöveg elrejtése alapértelmezetten"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "A funkció használatához igazolni kell email címet. Az email cím a webtárban ellenőrizhető."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "A mesterjelszó sikeresen beállításra került."
+  },
   "updatedMasterPassword": {
     "message": "A mesterjelszó frissítésre került."
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "A kérés elküldésre került."
   },
+  "masterPasswordChanged": {
+    "message": "A mesterjelszó mentésre került."
+  },
   "exposedMasterPassword": {
     "message": "Kiszivárgott mesterjelszó"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Adminisztrátori jóváhagyás kérés"
   },
+  "unableToCompleteLogin": {
+    "message": "Nem lehet befejezni a bejelentkezést."
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Be kell jelentkezni egy megbízható eszközön vagy meg kell kérni az adminisztrátort, hogy rendeljen hozzá egy jelszót."
+  },
   "ssoIdentifierRequired": {
     "message": "A szervezeti SSO azonosító megadása szükséges."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Megbízható felhasználó"
   },
-  "sendsNoItemsTitle": {
-    "message": "Nincsenek natív Send elemek.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "A Send használatával biztonságosan megoszthatjuk a titkosított információkat bárkivel.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Érzékeny információt küldése biztonságosan",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Általános formátumok",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Az URI egyezés észlelése az, ahogyan a Bitwarden azonosítja az automatikus kitöltési javaslatokat.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "A \"Normál kifejezés“ egy fejlett opció, amely a hitelesítő adatok növekvő kiszivárgásának kockázatával.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "A \"Kezdés\" egy fejlett opció, amely a hitelesítő adatok kiszivárgásának növekvő kockázatával.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Bővebben az egyezés felismerésről",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Haladó opciók",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "PIN beállítás feloldása"
   },
+  "unlockWithBiometricSet": {
+    "message": "Feloldás biometrikusan"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "Nincs jogosultság az oldal megtekintéséhez. Próbáljunk meg másik fiókkal bejelentkezni."
+  },
+  "wasmNotSupported": {
+    "message": "A WebAssembly nem támogatott a böngészőben vagy nincs engedélyezve. A WebAssembly szükséges a Bitwarden alkalmazás használatához.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/id/messages.json b/apps/browser/src/_locales/id/messages.json
index a12137d696a..dc1ec15cede 100644
--- a/apps/browser/src/_locales/id/messages.json
+++ b/apps/browser/src/_locales/id/messages.json
@@ -1072,7 +1072,7 @@
     "description": "Aria label for the view button in notification bar confirmation message"
   },
   "notificationNewItemAria": {
-    "message": "New Item, opens in new window",
+    "message": "Benda baru, buka di jendela baru",
     "description": "Aria label for the new item button in notification bar confirmation message when error is prompted"
   },
   "notificationEditTooltip": {
@@ -1093,15 +1093,15 @@
     }
   },
   "notificationLoginSaveConfirmation": {
-    "message": "saved to Bitwarden.",
+    "message": "telah disimpan ke Bitwarden.",
     "description": "Shown to user after item is saved."
   },
   "notificationLoginUpdatedConfirmation": {
-    "message": "updated in Bitwarden.",
+    "message": "telah diperbarui di Bitwarden.",
     "description": "Shown to user after item is updated."
   },
   "selectItemAriaLabel": {
-    "message": "Select $ITEMTYPE$, $ITEMNAME$",
+    "message": "Pilih $ITEMTYPE$, $ITEMNAME$",
     "description": "Used by screen readers. $1 is the item type (like vault or folder), $2 is the selected item name.",
     "placeholders": {
       "itemType": {
@@ -1121,7 +1121,7 @@
     "description": "Button text for updating an existing login entry."
   },
   "unlockToSave": {
-    "message": "Unlock to save this login",
+    "message": "Buka untuk menyimpan login ini",
     "description": "User prompt to take action in order to save the login they just entered."
   },
   "saveLogin": {
@@ -1173,6 +1173,12 @@
     "message": "Oh tidak! Kami tidak bisa menyimpan ini. Cobalah memasukkan rincian secara manual.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Tanyakan untuk memperbarui masuk yang sudah ada"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Fitur Tidak Tersedia"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Kunci enkripsi migrasi dibutuhkan. Silakan masuk melalui brankas web untuk memperbarui kunci enkripsi Anda."
+  "legacyEncryptionUnsupported": {
+    "message": "Enkripsi usang tidak lagi didukung. Silakan hubungi pendukung untuk memulihkan akun Anda."
   },
   "premiumMembership": {
     "message": "Keanggotaan Premium"
@@ -1600,13 +1606,13 @@
     "message": "Saran isi otomatis"
   },
   "autofillSpotlightTitle": {
-    "message": "Easily find autofill suggestions"
+    "message": "Temukan saran isi otomatis dengan mudah"
   },
   "autofillSpotlightDesc": {
-    "message": "Turn off your browser's autofill settings, so they don't conflict with Bitwarden."
+    "message": "Matikan pengaturan isi otomatis peramban Anda, sehingga tidak bertentangan dengan Bitwarden."
   },
   "turnOffBrowserAutofill": {
-    "message": "Turn off $BROWSER$ autofill",
+    "message": "Matikan isi otomatis $BROWSER$",
     "placeholders": {
       "browser": {
         "content": "$1",
@@ -1615,7 +1621,7 @@
     }
   },
   "turnOffAutofill": {
-    "message": "Turn off autofill"
+    "message": "Matikan isi otomatis"
   },
   "showInlineMenuLabel": {
     "message": "Tampilkan saran isi otomatis pada kolom formulir"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Kunci SSH"
   },
+  "typeNote": {
+    "message": "Catatan"
+  },
   "newItemHeader": {
     "message": "$TYPE$ baru",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Setel kode PIN Anda untuk membuka kunci Bitwarden. Pengaturan PIN Anda akan diatur ulang jika Anda pernah keluar sepenuhnya dari aplikasi."
   },
-  "setYourPinCode1": {
-    "message": "PIN Anda akan digunakan untuk membuka Bitwarden alih-alih dengan kata sandi utama Anda. PIN Anda akan diatur ulang apabila Anda pernah keluar sepenuhnya dari Bitwarden."
+  "setPinCode": {
+    "message": "Anda dapat menggunakan PIN ini untuk membuka Bitwarden. PIN Anda akan diatur ulang jika Anda keluar dari semua sesi aplikasi."
   },
   "pinRequired": {
     "message": "Membutuhkan kode PIN."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Gunakan kata sandi ini"
   },
+  "useThisPassphrase": {
+    "message": "Gunakan frasa sandi ini"
+  },
   "useThisUsername": {
     "message": "Gunakan nama pengguna ini"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Sebuah kebijakan organisasi telah menghalangi mengimpor benda-benda ke brankas pribadi Anda."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domain",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Ubah"
   },
+  "changePassword": {
+    "message": "Ubah kata sandi",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Ubah kata sandi - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Kata sandi yang berisiko"
+  },
   "atRiskPasswords": {
     "message": "Kata sandi yang berrisiko"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Kata sandi Anda untuk situs ini dalam bahaya. $ORGANIZATION$ telah meminta Anda untuk mengubahnya.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ ingin Anda untuk mengubah kata sandi ini karena kata sandi itu dalam bahaya. Pergi ke pengaturan akun Anda untuk mengubah kata sandinya.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Tinjau dan ubah satu kata sandi berrisiko"
   },
@@ -2674,6 +2719,10 @@
     "message": "Semua Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Jumlah akses maksimum tercapai",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Sembunyikan teks secara bawaan"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Anda harus memverifikasi email Anda untuk menggunakan fitur ini. Anda dapat memverifikasi email Anda di brankas web."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Kata Sandi Utama Telah Diperbarui"
   },
@@ -3015,13 +3067,13 @@
     "message": "Tidak ada pengidentifikasi unik yang ditemukan."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Sebuah kata sandi utama tidak lagi dibutuhkan untuk para anggota dari organisasi berikut. Silakan konfirmasi domain berikut kepada pengelola organisasi Anda."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Nama organisasi"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Domain penghubung kunci"
   },
   "leaveOrganization": {
     "message": "Tinggalkan Organisasi"
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Permintaan terkirim"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Kata Sandi Utama yang Terpapar"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Minta persetujuan admin"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Pengenal SSO organisasi diperlukan."
   },
@@ -3607,20 +3668,12 @@
   "trustUser": {
     "message": "Percayai pengguna"
   },
-  "sendsNoItemsTitle": {
-    "message": "Tidak ada Send yang aktif",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Gunakan Send untuk membagikan informasi terenkripsi secara aman dengan siapapun.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "Kirim informasi sensitif dengan aman",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "Bagikan berkas-berkas dan data secara aman dengan siapa saja, pada platform apapun. Informasi Anda akan tetap terenkripsi dari ujung-ke-ujung sembari membatasi paparan.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -4209,6 +4262,26 @@
     "message": "Format umum",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Lanjutkan ke pengaturan peramban?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -4561,10 +4634,10 @@
     "message": "Unduh dari bitwarden.com sekarang"
   },
   "getItOnGooglePlay": {
-    "message": "Get it on Google Play"
+    "message": "Dapatkan di Google Play"
   },
   "downloadOnTheAppStore": {
-    "message": "Download on the App Store"
+    "message": "Unduh di App Store"
   },
   "permanentlyDeleteAttachmentConfirmation": {
     "message": "Apakah Anda yakin ingin menghapus lampiran ini selamanya?"
@@ -4867,13 +4940,13 @@
     }
   },
   "successfullyAssignedCollections": {
-    "message": "Successfully assigned collections"
+    "message": "Berhasil menetapkan koleksi"
   },
   "nothingSelected": {
-    "message": "You have not selected anything."
+    "message": "Anda belum memilih apa pun."
   },
   "itemsMovedToOrg": {
-    "message": "Items moved to $ORGNAME$",
+    "message": "Benda dipindah ke $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4882,7 +4955,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Item moved to $ORGNAME$",
+    "message": "Benda dipindah ke $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4891,7 +4964,7 @@
     }
   },
   "reorderFieldDown": {
-    "message": "$LABEL$ moved down, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ dipindah ke bawah, posisi $INDEX$ dari $LENGTH$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4911,25 +4984,25 @@
     "message": "Lokasi Item"
   },
   "fileSend": {
-    "message": "File Send"
+    "message": "Berkas Send"
   },
   "fileSends": {
-    "message": "File Sends"
+    "message": "Berkas-berkas Send"
   },
   "textSend": {
-    "message": "Text Send"
+    "message": "Teks Send"
   },
   "textSends": {
-    "message": "Text Sends"
+    "message": "Teks Send"
   },
   "accountActions": {
     "message": "Tindakan akun"
   },
   "showNumberOfAutofillSuggestions": {
-    "message": "Show number of login autofill suggestions on extension icon"
+    "message": "Tampilkan jumlah saran isi otomatis login pada ikon pengaya"
   },
   "showQuickCopyActions": {
-    "message": "Show quick copy actions on Vault"
+    "message": "Tampilkan tindakan salin cepat pada Vault"
   },
   "systemDefault": {
     "message": "Baku sistem"
@@ -4965,58 +5038,58 @@
     "message": "Coba lagi"
   },
   "vaultCustomTimeoutMinimum": {
-    "message": "Minimum custom timeout is 1 minute."
+    "message": "Minimal tenggat waktu ubahsuai adalah 1 menit."
   },
   "additionalContentAvailable": {
-    "message": "Additional content is available"
+    "message": "Konten tambahan telah tersedia"
   },
   "fileSavedToDevice": {
-    "message": "File saved to device. Manage from your device downloads."
+    "message": "Berkas tersimpan di perangkat. Kelola dari unduhan perangkat Anda."
   },
   "showCharacterCount": {
     "message": "Tunjukkan cacah karakter"
   },
   "hideCharacterCount": {
-    "message": "Hide character count"
+    "message": "Sembunyikan jumlah karakter"
   },
   "itemsInTrash": {
-    "message": "Items in trash"
+    "message": "Benda-benda di tempat sampah"
   },
   "noItemsInTrash": {
-    "message": "No items in trash"
+    "message": "Tidak ada benda di tempat sampah"
   },
   "noItemsInTrashDesc": {
-    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+    "message": "Benda-benda yang Anda hapus akan muncul di sini dan akan dihapus selamanya setelah 30 hari"
   },
   "trashWarning": {
-    "message": "Items that have been in trash more than 30 days will automatically be deleted"
+    "message": "Benda-benda yang berada di tempat sampah lebih dari 30 hari akan dihapus secara otomatis"
   },
   "restore": {
-    "message": "Restore"
+    "message": "Pulihkan"
   },
   "deleteForever": {
-    "message": "Delete forever"
+    "message": "Hapus selamanya"
   },
   "noEditPermissions": {
-    "message": "You don't have permission to edit this item"
+    "message": "Anda tidak memiliki izin untuk menyunting benda ini"
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+    "message": "Buka dengan biometrik tidak tersedia karena memerlukan PIN atau kata sandi untuk membuka terlebih dahulu."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Biometric unlock is currently unavailable."
+    "message": "Buka dengan biometrik tidak tersedia untuk saat ini."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Buka dengan biometrik tidak tersedia karena pengaturan berkas-berkas sistem yang tidak sesuai."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Buka dengan biometrik tidak tersedia karena pengaturan berkas-berkas sistem yang tidak sesuai."
   },
   "biometricsStatusHelptextDesktopDisconnected": {
-    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+    "message": "Buka dengan biometrik tidak tersedia karena aplikasi destop Bitwarden tertutup."
   },
   "biometricsStatusHelptextNotEnabledInDesktop": {
-    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "message": "Buka dengan biometrik tidak tersedia karena tidak dinyalakan untuk $EMAIL$ pada aplikasi destop Bitwarden.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -5025,22 +5098,25 @@
     }
   },
   "biometricsStatusHelptextUnavailableReasonUnknown": {
-    "message": "Biometric unlock is currently unavailable for an unknown reason."
+    "message": "Buka dengan biometrik tidak tersedia untuk saat ini karena alasan yang tidak diketahui."
   },
   "unlockVault": {
-    "message": "Unlock your vault in seconds"
+    "message": "Buka brankas Anda dalam hitungan detik"
   },
   "unlockVaultDesc": {
-    "message": "You can customize your unlock and timeout settings to more quickly access your vault."
+    "message": "Anda dapat mengubahsuai pengaturan membuka dan waktu tenggat Anda agar dapat lebih cepat mengakses brankas Anda."
   },
   "unlockPinSet": {
-    "message": "Unlock PIN set"
+    "message": "PIN untuk membuka telah diatur"
+  },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
   },
   "authenticating": {
-    "message": "Authenticating"
+    "message": "Sedang memeriksa keaslian"
   },
   "fillGeneratedPassword": {
-    "message": "Fill generated password",
+    "message": "Isi kata sandi yang dihasilkan",
     "description": "Heading for the password generator within the inline menu"
   },
   "passwordRegenerated": {
@@ -5048,7 +5124,7 @@
     "description": "Notification message for when a password has been regenerated"
   },
   "saveToBitwarden": {
-    "message": "Save to Bitwarden",
+    "message": "Simpan ke Bitwarden",
     "description": "Confirmation message for saving a login to Bitwarden"
   },
   "spaceCharacterDescriptor": {
@@ -5253,67 +5329,67 @@
     "message": "Ubah kata sandi yang berrisiko"
   },
   "settingsVaultOptions": {
-    "message": "Vault options"
+    "message": "Pilihan brankas"
   },
   "emptyVaultDescription": {
-    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+    "message": "Brankas melindungi lebih dari kata sandi Anda. Simpan login aman, pengenal, kartu dan catatan secara aman di sini."
   },
   "introCarouselLabel": {
-    "message": "Welcome to Bitwarden"
+    "message": "Selamat datang ke Bitwarden"
   },
   "securityPrioritized": {
-    "message": "Security, prioritized"
+    "message": "Keamanan, diutamakan"
   },
   "securityPrioritizedBody": {
-    "message": "Save logins, cards, and identities to your secure vault. Bitwarden uses zero-knowledge, end-to-end encryption to protect what’s important to you."
+    "message": "Simpan login, kartu, dan pengenal ke brankas aman Anda. Bitwarden menggunakan ketidaktahuan, enkripsi dari ujung-ke-ujung untuk melindungi apa yang penting bagi Anda."
   },
   "quickLogin": {
-    "message": "Quick and easy login"
+    "message": "Masuk dengan cepat dan mudah"
   },
   "quickLoginBody": {
-    "message": "Set up biometric unlock and autofill to log into your accounts without typing a single letter."
+    "message": "Atur buka dengan biometrik dan isi otomatis untuk masuk ke akun-akun Anda tanpa mengetik sebuah huruf."
   },
   "secureUser": {
-    "message": "Level up your logins"
+    "message": "Tingkatkan login Anda"
   },
   "secureUserBody": {
-    "message": "Use the generator to create and save strong, unique passwords for all your accounts."
+    "message": "Gunakan penghasil untuk membuat dan menyimpan kata sandi yang kuat dan unit untuk semua akun Anda."
   },
   "secureDevices": {
-    "message": "Your data, when and where you need it"
+    "message": "Data Anda, kapanpun dan dimanapun Anda membutuhkannya"
   },
   "secureDevicesBody": {
-    "message": "Save unlimited passwords across unlimited devices with Bitwarden mobile, browser, and desktop apps."
+    "message": "Simpan kata sandi tak terbatas lintas perangkat tak terbatas dengan Bitwarden untuk ponsel, peramban, dan aplikasi destop."
   },
   "nudgeBadgeAria": {
-    "message": "1 notification"
+    "message": "1 pemberitahuan"
   },
   "emptyVaultNudgeTitle": {
-    "message": "Import existing passwords"
+    "message": "Impor kata sandi yang sudah ada"
   },
   "emptyVaultNudgeBody": {
-    "message": "Use the importer to quickly transfer logins to Bitwarden without manually adding them."
+    "message": "Gunakan pengimpor untuk memindakan login dengan cepat ke Bitwarden tanpa menambahkannya secara manual."
   },
   "emptyVaultNudgeButton": {
-    "message": "Import now"
+    "message": "Impor sekarang"
   },
   "hasItemsVaultNudgeTitle": {
-    "message": "Welcome to your vault!"
+    "message": "Selamat datang di brankas Anda!"
   },
   "hasItemsVaultNudgeBodyOne": {
-    "message": "Autofill items for the current page"
+    "message": "Benda-benda isi otomatis untuk halaman saat ini"
   },
   "hasItemsVaultNudgeBodyTwo": {
-    "message": "Favorite items for easy access"
+    "message": "Benda yang disukai untuk akses cepat"
   },
   "hasItemsVaultNudgeBodyThree": {
-    "message": "Search your vault for something else"
+    "message": "Cari brankas Anda untuk sesuatu yang lain"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Hemat waktu dengan isi otomatis"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Sertakan",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
@@ -5359,23 +5435,27 @@
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "Buat kata sandi dengan cepat"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "Buat kata sandi yang kuat dan unik dengan mudah dengan menekan pada",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "untuk membantu Anda menyimpan login Anda dengan aman.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "Buat kata sandi yang kuat dan unik dengan mudah dengan menekan pada tombol Buat kata sandi untuk membantu Anda menyimpan login Anda dengan aman.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
-    "message": "You do not have permissions to view this page. Try logging in with a different account."
+    "message": "Anda tidak memiliki izin untuk melihat halaman ini. Coba masuk dengan akun yang berbeda."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly tidak didukung atau tidak dinyalakan oleh peramban Anda. Web Assembly diperlukan untuk menggunakan aplikasi Bitwarden.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/it/messages.json b/apps/browser/src/_locales/it/messages.json
index 9a5d2c65bb6..f4829ecabec 100644
--- a/apps/browser/src/_locales/it/messages.json
+++ b/apps/browser/src/_locales/it/messages.json
@@ -3,7 +3,7 @@
     "message": "Bitwarden"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Logo di Bitwarden"
   },
   "extName": {
     "message": "Bitwarden Password Manager",
@@ -23,7 +23,7 @@
     "message": "Crea account"
   },
   "newToBitwarden": {
-    "message": "Sei un nuovo utente?"
+    "message": "Sei nuovo su Bitwarden?"
   },
   "logInWithPasskey": {
     "message": "Accedi con passkey"
@@ -32,7 +32,7 @@
     "message": "Usa il Single Sign-On"
   },
   "welcomeBack": {
-    "message": "Bentornat*"
+    "message": "Bentornato/a"
   },
   "setAStrongPassword": {
     "message": "Imposta una password robusta"
@@ -132,7 +132,7 @@
     "message": "Copia password"
   },
   "copyPassphrase": {
-    "message": "Copia passphrase"
+    "message": "Copia frase segreta"
   },
   "copyNote": {
     "message": "Copia nota"
@@ -462,13 +462,13 @@
     "message": "Genera password"
   },
   "generatePassphrase": {
-    "message": "Genera passphrase"
+    "message": "Genera frase segreta"
   },
   "passwordGenerated": {
     "message": "Parola d'accesso generata"
   },
   "passphraseGenerated": {
-    "message": "Frase d'accesso generata"
+    "message": "Frase segreta generata"
   },
   "usernameGenerated": {
     "message": "Nome utente generato"
@@ -887,7 +887,7 @@
     "message": "Segui i passaggi qui sotto per completare l'accesso."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Segui i passaggi seguenti per finire di accedere con la tua chiave di sicurezza."
   },
   "restartRegistration": {
     "message": "Ricomincia la registrazione"
@@ -1063,7 +1063,7 @@
     "message": "Salva"
   },
   "notificationViewAria": {
-    "message": "View $ITEMNAME$, opens in new window",
+    "message": "Visualizza $ITEMNAME$, si apre in una nuova finestra",
     "placeholders": {
       "itemName": {
         "content": "$1"
@@ -1072,18 +1072,18 @@
     "description": "Aria label for the view button in notification bar confirmation message"
   },
   "notificationNewItemAria": {
-    "message": "New Item, opens in new window",
+    "message": "Nuovo elemento, si apre in una nuova finestra",
     "description": "Aria label for the new item button in notification bar confirmation message when error is prompted"
   },
   "notificationEditTooltip": {
-    "message": "Edit before saving",
+    "message": "Modifica prima di salvare",
     "description": "Tooltip and Aria label for edit button on cipher item"
   },
   "newNotification": {
-    "message": "New notification"
+    "message": "Nuova notifica"
   },
   "labelWithNotification": {
-    "message": "$LABEL$: New notification",
+    "message": "$LABEL$: Nuova notifica",
     "description": "Label for the notification with a new login suggestion.",
     "placeholders": {
       "label": {
@@ -1093,15 +1093,15 @@
     }
   },
   "notificationLoginSaveConfirmation": {
-    "message": "saved to Bitwarden.",
+    "message": "salvato in Bitwarden.",
     "description": "Shown to user after item is saved."
   },
   "notificationLoginUpdatedConfirmation": {
-    "message": "updated in Bitwarden.",
+    "message": "aggiornato in Bitwarden.",
     "description": "Shown to user after item is updated."
   },
   "selectItemAriaLabel": {
-    "message": "Select $ITEMTYPE$, $ITEMNAME$",
+    "message": "Seleziona $ITEMTYPE$, $ITEMNAME$",
     "description": "Used by screen readers. $1 is the item type (like vault or folder), $2 is the selected item name.",
     "placeholders": {
       "itemType": {
@@ -1113,35 +1113,35 @@
     }
   },
   "saveAsNewLoginAction": {
-    "message": "Salva come nuovo accesso",
+    "message": "Salva come nuovo login",
     "description": "Button text for saving login details as a new entry."
   },
   "updateLoginAction": {
-    "message": "Aggiorna accesso",
+    "message": "Aggiorna login",
     "description": "Button text for updating an existing login entry."
   },
   "unlockToSave": {
-    "message": "Unlock to save this login",
+    "message": "Sblocca per salvare questo login",
     "description": "User prompt to take action in order to save the login they just entered."
   },
   "saveLogin": {
-    "message": "Save login",
+    "message": "Salva il login",
     "description": "Prompt asking the user if they want to save their login details."
   },
   "updateLogin": {
-    "message": "Update existing login",
+    "message": "Aggiorna login esistente",
     "description": "Prompt asking the user if they want to update an existing login entry."
   },
   "loginSaveSuccess": {
-    "message": "Accesso salvato",
+    "message": "Login salvato",
     "description": "Message displayed when login details are successfully saved."
   },
   "loginUpdateSuccess": {
-    "message": "Accesso aggiornato",
+    "message": "Login aggiornato",
     "description": "Message displayed when login details are successfully updated."
   },
   "loginUpdateTaskSuccess": {
-    "message": "Great job! You took the steps to make you and $ORGANIZATION$ more secure.",
+    "message": "Congratulazioni! Hai reso $ORGANIZATION$ e te stesso più sicuri.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1150,7 +1150,7 @@
     "description": "Shown to user after login is updated."
   },
   "loginUpdateTaskSuccessAdditional": {
-    "message": "Thank you for making $ORGANIZATION$ more secure. You have $TASK_COUNT$ more passwords to update.",
+    "message": "Grazie per aver reso $ORGANIZATION$ più sicuro. Hai altre $TASK_COUNT$ password da aggiornare.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1162,7 +1162,7 @@
     "description": "Shown to user after login is updated."
   },
   "nextSecurityTaskAction": {
-    "message": "Change next password",
+    "message": "Cambia la prossima password",
     "description": "Message prompting user to undertake completion of another security task."
   },
   "saveFailure": {
@@ -1170,9 +1170,15 @@
     "description": "Error message shown when the system fails to save login details."
   },
   "saveFailureDetails": {
-    "message": "Oh no! Non abbiamo potuto salvarlo. Prova a inserire manualmente i dettagli.",
+    "message": "Oh no! Il salvataggio non è riuscito. Prova a inserire i dati manualmente.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Chiedi di aggiornare il login esistente"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Funzionalità non disponibile"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Migrazione della chiave di crittografia obbligatoria. Accedi tramite la cassaforte web per aggiornare la tua chiave di crittografia."
+  "legacyEncryptionUnsupported": {
+    "message": "La crittografia legacy non è più supportata. Contatta l'assistenza per recuperare il tuo account."
   },
   "premiumMembership": {
     "message": "Abbonamento Premium"
@@ -1600,13 +1606,13 @@
     "message": "Suggerimenti per il riempimento automatico"
   },
   "autofillSpotlightTitle": {
-    "message": "Easily find autofill suggestions"
+    "message": "Trova facilmente suggerimenti di riempimento automatico"
   },
   "autofillSpotlightDesc": {
-    "message": "Turn off your browser's autofill settings, so they don't conflict with Bitwarden."
+    "message": "Disattiva le impostazioni di riempimento automatico del tuo browser, in modo da non entrare in conflitto con Bitwarden."
   },
   "turnOffBrowserAutofill": {
-    "message": "Turn off $BROWSER$ autofill",
+    "message": "Disattiva il riempimento automatico di $BROWSER$",
     "placeholders": {
       "browser": {
         "content": "$1",
@@ -1615,7 +1621,7 @@
     }
   },
   "turnOffAutofill": {
-    "message": "Turn off autofill"
+    "message": "Disattiva il riempimento automatico"
   },
   "showInlineMenuLabel": {
     "message": "Mostra suggerimenti di riempimento automatico nei campi del modulo"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Chiave SSH"
   },
+  "typeNote": {
+    "message": "Nota"
+  },
   "newItemHeader": {
     "message": "Nuovo $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Imposta il tuo codice PIN per sbloccare Bitwarden. Le tue impostazioni PIN saranno resettate se esci completamente dall'app."
   },
-  "setYourPinCode1": {
-    "message": "Il tuo PIN sarà usato per sbloccare Bitwarden invece della password principale. Il PIN sarà ripristinato se ti disconnetterai completamente da Bitwarden."
+  "setPinCode": {
+    "message": "Puoi usare il PIN per sbloccare Bitwarden. Il PIN sarà disattivato ogni volta che ti scolleghi dall'account."
   },
   "pinRequired": {
     "message": "Codice PIN obbligatorio."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Usa questa password"
   },
+  "useThisPassphrase": {
+    "message": "Usa questa frase segreta"
+  },
   "useThisUsername": {
     "message": "Usa questo nome utente"
   },
@@ -2374,7 +2386,7 @@
     "message": "Informativa sulla Privacy"
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "La tua nuova password non può essere la stessa della tua password attuale."
   },
   "hintEqualsPassword": {
     "message": "Il suggerimento della password non può essere uguale alla password."
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Una politica dell'organizzazione ti impedisce di importare elementi nella tua cassaforte individuale."
   },
+  "restrictCardTypeImport": {
+    "message": "Impossibile importare elementi di tipo carta"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Non puoi importare carte nelle tue casseforti a causa di una politica impostata da una o più organizzazioni."
+  },
   "domainsTitle": {
     "message": "Domini",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Cambia"
   },
+  "changePassword": {
+    "message": "Cambia password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Cambia parola d'accesso - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Password a rischio"
+  },
   "atRiskPasswords": {
     "message": "Parola d'accesso a rischio"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "La tua password per questo sito è a rischio. $ORGANIZATION$ ha richiesto di modificarla.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ ti chiede di cambiare la tua password perché è a rischio. Vai alle impostazioni del tuo account per la modifica.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Rivedi e modifica una parola d'accesso a rischio"
   },
@@ -2580,18 +2625,18 @@
     "message": "Rivedi parole d'accesso a rischio"
   },
   "reviewAtRiskLoginsSlideDesc": {
-    "message": "Le parole d'accesso dell'organizzazione sono a rischio perché sono deboli, riutilizzate, e/o esposte.",
+    "message": "Le password dell'organizzazione sono a rischio perché sono deboli, riutilizzate, e/o esposte.",
     "description": "Description of the review at-risk login slide on the at-risk password page carousel"
   },
   "reviewAtRiskLoginSlideImgAltPeriod": {
-    "message": "Illustration of a list of logins that are at-risk."
+    "message": "Illustrazione di una lista di login a rischio."
   },
   "generatePasswordSlideDesc": {
     "message": "Genera rapidamente una parola d'accesso forte e unica con il menu' di riempimento automatico Bitwarden nel sito a rischio.",
     "description": "Description of the generate password slide on the at-risk password page carousel"
   },
   "generatePasswordSlideImgAltPeriod": {
-    "message": "Illustration of the Bitwarden autofill menu displaying a generated password."
+    "message": "Illustrazione del menu di riempimento automatico Bitwarden che mostra una password generata."
   },
   "updateInBitwarden": {
     "message": "Aggiorna in Bitwarden"
@@ -2601,7 +2646,7 @@
     "description": "Description of the update in Bitwarden slide on the at-risk password page carousel"
   },
   "updateInBitwardenSlideImgAltPeriod": {
-    "message": "Illustration of a Bitwarden’s notification prompting the user to update the login."
+    "message": "Illustrazione di una notifica Bitwarden che richiede all'utente di aggiornare il login."
   },
   "turnOnAutofill": {
     "message": "Attiva riempimento automatico"
@@ -2674,6 +2719,10 @@
     "message": "Tutti i Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Raggiunto il limite massimo degli accessi",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Nascondi testo come default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Devi verificare la tua email per usare questa funzionalità. Puoi verificare la tua email nella cassaforte web."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Password principale aggiornata"
   },
@@ -3015,13 +3067,13 @@
     "message": "Nessun identificatore univoco trovato."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "La password principale non è più richiesta per i membri dell'organizzazione. Per favore, conferma il dominio qui sotto con l'amministratore."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Nome organizzazione"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Dominio Key Connector"
   },
   "leaveOrganization": {
     "message": "Lascia organizzazione"
@@ -3057,7 +3109,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "Solo gli elementi della cassaforte personale associati a $EMAIL$, includendo gli allegati, saranno esportati. Gli elementi della cassaforte dell'organizzazione non saranno inclusi",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3125,7 +3177,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Usa $RECOMMENDED$ parole o più per generare una passphrase forte.",
+    "message": " Usa $RECOMMENDED$ parole o più per generare una frase segreta forte.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Richiesta inviata"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Password principale violata"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Richiedi approvazione dell'amministratore"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Identificatore SSO dell'organizzazione obbligatorio."
   },
@@ -3584,43 +3645,35 @@
     "message": "Dispositivo fidato"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Fidati dell'organizzazione"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Fidati"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Non considerare affidabile"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "L'organizzazione non è fidata"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Per la sicurezza del tuo account, conferma solo se hai concesso l'accesso di emergenza a questo utente e le loro impronte digitali corrispondono a quelle contenute nel loro account"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Per la sicurezza del tuo account, procedi solo se sei un membro di questa organizzazione, il recupero dell'account è abilitato e l'impronta digitale visualizzata di seguito corrisponde all'impronta digitale dell'organizzazione."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Questa organizzazione ha una politica Enterprise che ti iscriverà al recupero dell'account. La registrazione consentirà agli amministratori dell'organizzazione di modificare la password. Procedi solo se riconosci questa organizzazione e la frase di impronta digitale mostrata di seguito corrisponde all'impronta digitale dell'organizzazione."
   },
   "trustUser": {
-    "message": "Trust user"
-  },
-  "sendsNoItemsTitle": {
-    "message": "Nessun Send attivo",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Utilizza un Send per condividere in modo sicuro le informazioni con qualsiasi utente.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+    "message": "Fidati dell'utente"
   },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "Invia informazioni sensibili in modo sicuro",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "Condividi file e dati in modo sicuro con chiunque, su qualsiasi piattaforma. Le tue informazioni saranno crittografate end-to-end.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -3821,7 +3874,7 @@
     "description": "Button text to display within inline menu when there are no matching items on a login field"
   },
   "addNewLoginItemAria": {
-    "message": "Aggiungi un nuovo elemento \"login\" alla cassaforte, apri in una nuova finestra",
+    "message": "Aggiungi un nuovo elemento 'login' alla cassaforte (si apre in una nuova finestra)",
     "description": "Screen reader text (aria-label) for new login button within inline menu"
   },
   "newCard": {
@@ -4209,6 +4262,26 @@
     "message": "Formati comuni",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continua sulle impostazioni del browser?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -4355,7 +4428,7 @@
     }
   },
   "viewItemTitleWithField": {
-    "message": "View item - $ITEMNAME$ - $FIELD$",
+    "message": "Visualizza elemento - $ITEMNAME$ - $FIELD$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4379,7 +4452,7 @@
     }
   },
   "autofillTitleWithField": {
-    "message": "Autofill - $ITEMNAME$ - $FIELD$",
+    "message": "Riempimento automatico - $ITEMNAME$ - $FIELD$",
     "description": "Title for a button that autofills a login item.",
     "placeholders": {
       "itemname": {
@@ -4540,31 +4613,31 @@
     }
   },
   "downloadBitwarden": {
-    "message": "Download Bitwarden"
+    "message": "Scarica Bitwarden"
   },
   "downloadBitwardenOnAllDevices": {
-    "message": "Download Bitwarden on all devices"
+    "message": "Scarica Bitwarden su tutti i dispositivi"
   },
   "getTheMobileApp": {
-    "message": "Get the mobile app"
+    "message": "Scarica l'app mobile"
   },
   "getTheMobileAppDesc": {
-    "message": "Access your passwords on the go with the Bitwarden mobile app."
+    "message": "Accedi alle tue password ovunque con l'app Bitwarden per dispositivi mobili."
   },
   "getTheDesktopApp": {
-    "message": "Get the desktop app"
+    "message": "Scarica l'app desktop"
   },
   "getTheDesktopAppDesc": {
-    "message": "Access your vault without a browser, then set up unlock with biometrics to expedite unlocking in both the desktop app and browser extension."
+    "message": "Accedi alla tua cassaforte senza browser, quindi imposta lo sblocco biometrico per accelerare l'accesso sia all'app desktop che all'estensione."
   },
   "downloadFromBitwardenNow": {
-    "message": "Download from bitwarden.com now"
+    "message": "Scarica ora da bitwarden.com"
   },
   "getItOnGooglePlay": {
-    "message": "Get it on Google Play"
+    "message": "Disponible su Google Play"
   },
   "downloadOnTheAppStore": {
-    "message": "Download on the App Store"
+    "message": "Scarica dall'App Store"
   },
   "permanentlyDeleteAttachmentConfirmation": {
     "message": "Sei sicuro di voler eliminare definitivamente questo allegato?"
@@ -5028,13 +5101,16 @@
     "message": "Lo sblocco biometrico non è attualmente disponibile per un motivo sconosciuto."
   },
   "unlockVault": {
-    "message": "Unlock your vault in seconds"
+    "message": "Sblocca la cassaforte in secondi"
   },
   "unlockVaultDesc": {
-    "message": "You can customize your unlock and timeout settings to more quickly access your vault."
+    "message": "Puoi personalizzare le impostazioni di sblocco e timeout per accedere più rapidamente alla tua cassaforte."
   },
   "unlockPinSet": {
-    "message": "Unlock PIN set"
+    "message": "Sblocca PIN impostato"
+  },
+  "unlockWithBiometricSet": {
+    "message": "Sblocca con i dati biometrici"
   },
   "authenticating": {
     "message": "Autenticazione"
@@ -5048,7 +5124,7 @@
     "description": "Notification message for when a password has been regenerated"
   },
   "saveToBitwarden": {
-    "message": "Save to Bitwarden",
+    "message": "Salva su Bitwarden",
     "description": "Confirmation message for saving a login to Bitwarden"
   },
   "spaceCharacterDescriptor": {
@@ -5253,129 +5329,133 @@
     "message": "Cambia parola d'accesso a rischio"
   },
   "settingsVaultOptions": {
-    "message": "Vault options"
+    "message": "Opzioni cassaforte"
   },
   "emptyVaultDescription": {
-    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+    "message": "La cassaforte protegge e tiene al sicuro non solo le password, ma anche le passkey, i nomi utente, le identità, le carte e le note."
   },
   "introCarouselLabel": {
-    "message": "Welcome to Bitwarden"
+    "message": "Benvenuto su Bitwarden"
   },
   "securityPrioritized": {
-    "message": "Security, prioritized"
+    "message": "Sicurezza alla massima priorità"
   },
   "securityPrioritizedBody": {
-    "message": "Save logins, cards, and identities to your secure vault. Bitwarden uses zero-knowledge, end-to-end encryption to protect what’s important to you."
+    "message": "Salva login, carte e identità nella tua cassaforte sicura. Bitwarden usa la crittografia end-to-end e zero-knowledge per proteggere i tuoi dati."
   },
   "quickLogin": {
-    "message": "Quick and easy login"
+    "message": "Autenticazione facile e veloce"
   },
   "quickLoginBody": {
-    "message": "Set up biometric unlock and autofill to log into your accounts without typing a single letter."
+    "message": "Imposta lo sblocco biometrico e il riempimento automatico per accedere ai tuoi account senza digitare una sola lettera."
   },
   "secureUser": {
-    "message": "Level up your logins"
+    "message": "Porta i tuoi login al livello successivo"
   },
   "secureUserBody": {
-    "message": "Use the generator to create and save strong, unique passwords for all your accounts."
+    "message": "Usa il generatore per creare e salvare password forti e uniche per tutti i tuoi account."
   },
   "secureDevices": {
-    "message": "Your data, when and where you need it"
+    "message": "I tuoi dati, dove e quando ti servono"
   },
   "secureDevicesBody": {
-    "message": "Save unlimited passwords across unlimited devices with Bitwarden mobile, browser, and desktop apps."
+    "message": "Salva tutte le password che vuoi su un numero illimitato di dispositivi con le app Bitwarden per browser, mobile e desktop."
   },
   "nudgeBadgeAria": {
-    "message": "1 notification"
+    "message": "1 notifica"
   },
   "emptyVaultNudgeTitle": {
-    "message": "Import existing passwords"
+    "message": "Importa password esistenti"
   },
   "emptyVaultNudgeBody": {
-    "message": "Use the importer to quickly transfer logins to Bitwarden without manually adding them."
+    "message": "Usa l'importatore per trasferire rapidamente i login su Bitwarden senza aggiungerli manualmente."
   },
   "emptyVaultNudgeButton": {
-    "message": "Import now"
+    "message": "Importa ora"
   },
   "hasItemsVaultNudgeTitle": {
-    "message": "Welcome to your vault!"
+    "message": "Benvenuto nella tua cassaforte!"
   },
   "hasItemsVaultNudgeBodyOne": {
-    "message": "Autofill items for the current page"
+    "message": "Riempimento automatico per questa pagina"
   },
   "hasItemsVaultNudgeBodyTwo": {
-    "message": "Favorite items for easy access"
+    "message": "Trova facilmente gli elementi più usati grazie ai Preferiti"
   },
   "hasItemsVaultNudgeBodyThree": {
-    "message": "Search your vault for something else"
+    "message": "Cerca altro nella tua cassaforte"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Accedi in un attimo grazie al riempimento automatico"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Includi",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Sito",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "questo login appare come suggerimento per il riempimento automatico.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Accesso e pagamento online semplificati"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Con le carte memorizzate, riempi i campi di pagamento in modo facile e veloce."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Semplifica la creazione di account"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Con le identità, riempi in un attimo i moduli di registrazione per la creazione di account."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Mantieni al sicuro i tuoi dati sensibili"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Usa le note per memorizzare in modo sicuro i dati sensibili come i dettagli bancari o assicurativi."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Accesso SSH ideale per gli sviluppatori"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Memorizza le chiavi e connettiti con l'agente SSH per un'autenticazione crittografata veloce.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Scopri di più sull'agente SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "Crea rapidamente password sicure"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "Crea facilmente password forti e uniche cliccando su",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "per aiutarti a mantenere i tuoi login al sicuro.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "Crea facilmente password forti e uniche cliccando sul pulsante 'Genera password' per aiutarti a mantenere al sicuro i tuoi login.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
-    "message": "You do not have permissions to view this page. Try logging in with a different account."
+    "message": "Non hai i permessi per visualizzare questa pagina. Prova ad accedere con un altro account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly non è supportato dal browser o non è abilitato. WebAssembly è richiesto per utilizzare l'app Bitwarden.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/ja/messages.json b/apps/browser/src/_locales/ja/messages.json
index 5c235bdea43..783a9ff0eb1 100644
--- a/apps/browser/src/_locales/ja/messages.json
+++ b/apps/browser/src/_locales/ja/messages.json
@@ -1173,6 +1173,12 @@
     "message": "保存できませんでした。詳細を手動で入力してください。",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "既存のログイン情報の更新を尋ねる"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "サービスが利用できません"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "暗号化キーの移行が必要です。暗号化キーを更新するには、ウェブ保管庫からログインしてください。"
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "プレミアム会員"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH 鍵"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "$TYPE$ を新規作成",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Bitwarden のロックを解除するための PIN コードを設定します。アプリから完全にログアウトすると、PIN 設定はリセットされます。"
   },
-  "setYourPinCode1": {
-    "message": "あなたの PIN はマスターパスワードの代わりに Bitwarden のロックを解除するために使用されます。Bitwarden から完全にログアウトすると PIN がリセットされます。"
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN コードが必要です。"
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "このパスワードを使用する"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "このユーザー名を使用する"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "組織のポリシーにより、個々の保管庫へのアイテムのインポートがブロックされました。"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "ドメイン",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "変更"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "パスワードの変更 - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "リスクがあるパスワード"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "1 件の危険なパスワードを確認・変更する"
   },
@@ -2674,6 +2719,10 @@
     "message": "すべての Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "デフォルトでテキストを隠す"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "この機能を使用するにはメールアドレスを確認する必要があります。ウェブ保管庫でメールアドレスを確認できます。"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "マスターパスワードを更新しました"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "リクエストが送信されました"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "流出したマスターパスワード"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "管理者の承認を要求する"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "組織の SSO ID が必要です。"
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "アクティブな Send なし",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Send を使用すると暗号化された情報を誰とでも安全に共有できます。",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "一般的な形式",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "ブラウザの設定に進みますか？",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "認証中"
   },
@@ -5253,7 +5329,7 @@
     "message": "危険なパスワードの変更"
   },
   "settingsVaultOptions": {
-    "message": "Vault options"
+    "message": "保管庫オプション"
   },
   "emptyVaultDescription": {
     "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/ka/messages.json b/apps/browser/src/_locales/ka/messages.json
index 7f36bb3568f..efbf97e9a92 100644
--- a/apps/browser/src/_locales/ka/messages.json
+++ b/apps/browser/src/_locales/ka/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN code is required."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "დომენები",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "ავთენტიკაცია"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/km/messages.json b/apps/browser/src/_locales/km/messages.json
index 4775d1f7af0..ecc7da63e79 100644
--- a/apps/browser/src/_locales/km/messages.json
+++ b/apps/browser/src/_locales/km/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN code is required."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/kn/messages.json b/apps/browser/src/_locales/kn/messages.json
index ac36d911e89..d4e4498a322 100644
--- a/apps/browser/src/_locales/kn/messages.json
+++ b/apps/browser/src/_locales/kn/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "ವೈಶಿಷ್ಟ್ಯ ಲಭ್ಯವಿಲ್ಲ"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "ಪ್ರೀಮಿಯಂ ಸದಸ್ಯತ್ವ"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "ಬಿಟ್‌ವಾರ್ಡೆನ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಪಿನ್ ಕೋಡ್ ಅನ್ನು ಹೊಂದಿಸಿ. ನೀವು ಎಂದಾದರೂ ಅಪ್ಲಿಕೇಶನ್‌ನಿಂದ ಸಂಪೂರ್ಣವಾಗಿ ಲಾಗ್ out ಟ್ ಆಗಿದ್ದರೆ ನಿಮ್ಮ ಪಿನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸಲಾಗುತ್ತದೆ."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "ಪಿನ್ ಕೋಡ್ ಅಗತ್ಯವಿದೆ."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "ಎಲ್ಲಾ ಕಳುಹಿಸುತ್ತದೆ",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬಳಸಲು ನಿಮ್ಮ ಇಮೇಲ್ ಅನ್ನು ನೀವು ಪರಿಶೀಲಿಸಬೇಕು. ವೆಬ್ ವಾಲ್ಟ್ನಲ್ಲಿ ನಿಮ್ಮ ಇಮೇಲ್ ಅನ್ನು ನೀವು ಪರಿಶೀಲಿಸಬಹುದು."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/ko/messages.json b/apps/browser/src/_locales/ko/messages.json
index 5a496cde98a..d5eba5ccbd8 100644
--- a/apps/browser/src/_locales/ko/messages.json
+++ b/apps/browser/src/_locales/ko/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "현재 로그인으로 업데이트할 건지 묻기"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "기능 사용할 수 없음"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "암호화 키 마이그레이션이 필요합니다. 웹 볼트를 통해 로그인하여 암호화 키를 업데이트하세요."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "프리미엄 멤버십"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH 키"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "새 $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Bitwarden 잠금해제에 사용될 PIN 코드를 설정합니다. 이 애플리케이션에서 완전히 로그아웃할 경우 PIN 설정이 초기화됩니다."
   },
-  "setYourPinCode1": {
-    "message": "PIN은 마스터 비밀번호 대신 Bitwarden 잠금해제에 사용됩니다. Bitwarden에서 완전히 로그아웃하면 PIN이 재설정됩니다."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN 코드가 필요합니다."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "이 비밀번호 사용"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "이 사용자 이름 사용"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "조직 정책으로 인해 개별 보관함으로 항목을 가져오는 것이 차단되었습니다."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "도메인",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "모든 Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "기본적으로 텍스트 숨기기"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "이 기능을 사용하려면 이메일 인증이 필요합니다. 웹 보관함에서 이메일을 인증할 수 있습니다."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "마스터 비밀번호 변경됨"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "노출된 마스터 비밀번호"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "관리자 인증 필요"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "조직의 SSO 식별자가 필요합니다"
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "활성화된 Send없음",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Send를 사용하여 암호화된 정보를 어느 사람과도 안전하게 공유합니다.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "일반적인 형식",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "브라우저 설정으로 이동하시겠습니까?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "인증 중"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/lt/messages.json b/apps/browser/src/_locales/lt/messages.json
index f790c226437..33f3b0f0ed6 100644
--- a/apps/browser/src/_locales/lt/messages.json
+++ b/apps/browser/src/_locales/lt/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Paprašyti atnaujinti esamą prisijungimą"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Funkcija neprieinama"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Reikalinga šifravimo rakto migracija. Prisijunkite per žiniatinklio saugyklą, kad atnaujintumėte šifravimo raktą."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium narystė"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "Naujas $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Nustatykite savo PIN kodą, kad atrakintumėte „Bitwarden“. Jūsų PIN nustatymai bus nustatyti iš naujo, jei kada nors visiškai atsijungsite nuo programos."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN kodas yra privalomas."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Organizacijos politika blokavo elementų importavimą į Jūsų individualią saugyklą."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domenai",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Visi siuntimai",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Turite patvirtinti savo el. paštą, kad galėtumėte naudotis šia funkcija. Savo el. pašto adresą galite patvirtinti žiniatinklio saugykloje."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Naujasis pagrindinis slaptažodis"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Prašyti administratoriaus patvirtinimo"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organizacijos SSO identifikatorius yra reikalingas."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "Nėra aktyvų „Sends“",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Naudokite „Send“, kad saugiai bendrintumėte užšifruotą informaciją su bet kuriuo asmeniu.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/lv/messages.json b/apps/browser/src/_locales/lv/messages.json
index f47b5f7645e..2235baef2ab 100644
--- a/apps/browser/src/_locales/lv/messages.json
+++ b/apps/browser/src/_locales/lv/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Ak nē! Mēs nevarējā šo saglabāt. Jāmēģina pašrocīgi ievadīt informāciju.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "Pēc savas paroles nomainīšanas būs nepieciešams pieteikties ar jauno paroli. Spēkā esošajās sesijās citās ierīcēs stundas laikā notiks atteikšanās."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Jānomaina sava galvenā'parole, lai pabeigtu konta atkopi."
+  },
   "enableChangedPasswordNotification": {
     "message": "Vaicāt atjaunināt esošu pieteikšanās vienumu"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Iespēja nav pieejama"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Nepieciešama šifrēšanas atslēgas nomaiņa. Lūgums pieteikties tīmekļa glabātavā, lai atjauninātu savu šifrēšanas atslēgu."
+  "legacyEncryptionUnsupported": {
+    "message": "Mantota šifrēšana vairs netiek atbalstīta. Lūgums sazināties ar atbalstu, lai atkoptu savu kontu."
   },
   "premiumMembership": {
     "message": "Premium dalība"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH atslēga"
   },
+  "typeNote": {
+    "message": "Piezīme"
+  },
   "newItemHeader": {
     "message": "Jauns/a $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Iestatīt PIN kodu Bitwarden atslēgšanai. PIN iestatījumi tiks atiestatīti pēc pilnīgas izrakstīšanās no lietotnes."
   },
-  "setYourPinCode1": {
-    "message": "PIN būs izmantojams galvenās paroles vietā, lai atslēgtu Bitwarden. PIN tiks atiestatīts, ja kādreiz notiks pilnīga izrakstīšanās no Bitwarden."
+  "setPinCode": {
+    "message": "Šo PIN var izmantot, lai atslēgtu Bitwarden. PIN tiks atiestatīts pēc pilnīgas atteikšanās lietotnē."
   },
   "pinRequired": {
     "message": "Ir nepieciešams PIN kods."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Izmantot šo paroli"
   },
+  "useThisPassphrase": {
+    "message": "Izmantot šo paroles vārdkopu"
+  },
   "useThisUsername": {
     "message": "Izmantot šo lietotājvārdu"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Apvienības nosacījums neļauj ievietot ārējos vienumus savā personīgajā glabātavā."
   },
+  "restrictCardTypeImport": {
+    "message": "Nevar ievietot karšu vienumu veidus"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Pamatnostādne, ko ir iestatījusi viena vai vairākas apvienības, liedz karšu ievietošanu savās glabātavās."
+  },
   "domainsTitle": {
     "message": "Domēna vārdi",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Mainīt"
   },
+  "changePassword": {
+    "message": "Mainīt paroli",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Mainīt paroli - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Riskam pakļauta parole"
+  },
   "atRiskPasswords": {
     "message": "Riskam pakļautās paroles"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Šīs vietnes parole ir pakļauta riskam. $ORGANIZATION$ pieprasīja, lai tā tiktu nomainīta.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ vēlas, lai šī parole tiktu nomainīta, jo tā ir pakļauta riskam. Jādodas uz sava konta iestatījumiem, lai nomainītu paroli.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Pārskatīt un mainīt vienu riskam pakļautu paroli"
   },
@@ -2674,6 +2719,10 @@
     "message": "Visi Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Sasniegts lielākais pieļaujamais piekļuves reižu skaits",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Pēc noklusējuma paslēpt tekstu"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Ir nepieciešams apliecināt savu e-pasta adresi, lai būtu iespējams izmantot šo iespēju. To var izdarīt tīmekļa glabātavā."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Galvenā parole sekmīgi iestatīta"
+  },
   "updatedMasterPassword": {
     "message": "Galvenā parole atjaunināta"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Pieprasījums nosūtīts"
   },
+  "masterPasswordChanged": {
+    "message": "Galvenā parole saglabāta"
+  },
   "exposedMasterPassword": {
     "message": "Noplūdusi galvenā parole"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Pieprasīt pārvaldītāja apstiprinājumu"
   },
+  "unableToCompleteLogin": {
+    "message": "Nevar pabeigt pieteikšanos"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Nepieciešams pieteikties uzticamā ierīcē vai vaicāt pārvaldītājam, lai piešķir paroli."
+  },
   "ssoIdentifierRequired": {
     "message": "Ir nepieciešams apvienības SSO identifikators."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Uzticēties lietotājam"
   },
-  "sendsNoItemsTitle": {
-    "message": "Nav spēkā esošu Send",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Send ir izmantojams, lai ar ikvienu droši kopīgotu šifrētu informāciju.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Drošā veidā nosūti jūtīgu informāciju",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Izplatīti veidoli",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI atbilstības noteikšana ir veids, kā Bitwarden atpazīst automātiskās aizpildes ieteikumus.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regulārā izteiksme\" ir lietpratējiem paredzēta iespēja ar paaugstinātu piekļuves datu atklāšanas bīstamību.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Sākas ar' ir lietpratējiem paredzēta iespēja ar paaugstinātu piekļuves datu atklāšanas bīstamību.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Vairāk par atbilstības noteikšanu",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Papildu iespējas",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Pāriet uz pārlūka iestatījumiem?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Atslēgšanas PIN iestatīts"
   },
+  "unlockWithBiometricSet": {
+    "message": "Atslēgt ar biometriju"
+  },
   "authenticating": {
     "message": "Autentificē"
   },
@@ -5362,7 +5438,7 @@
     "message": "Ātra paroļu izveidošana"
   },
   "generatorNudgeBodyOne": {
-    "message": "Vienkārša spēcīgu un neatkārtojamu paroļu izveidošana ar pogu",
+    "message": "Vienkārša spēcīgu un neatkārtojamu paroļu izveidošana ar",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "Nav atļaujas apskatīt šo lapu. Jāmēģina pieteikties ar citu kontu."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly šajā pārlūkā netiek atbalstīts vai nav iespējots. WebAssebly ir nepieciešams, lai izmantotu Bitwarden lietotni.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/ml/messages.json b/apps/browser/src/_locales/ml/messages.json
index ab0120a40e2..7c0050906b0 100644
--- a/apps/browser/src/_locales/ml/messages.json
+++ b/apps/browser/src/_locales/ml/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "സവിശേഷത ലഭ്യമല്ല"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "പ്രീമിയം അംഗത്വം"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Bitwarden അൺലോക്കുചെയ്യുന്നതിന് തങ്ങളുടെ പിൻ കോഡ് സജ്ജമാക്കുക. തങ്ങൾ എപ്പോഴെങ്കിലും അപ്ലിക്കേഷനിൽ നിന്ന് പൂർണ്ണമായി ലോഗ് ഔട്ട് ചെയ്യുകയാണെങ്കിൽ, പിൻ ക്രമീകരണങ്ങൾ പുനസജ്ജമാക്കും."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "പിൻ കോഡ് നിർബന്ധമാണ്."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/mr/messages.json b/apps/browser/src/_locales/mr/messages.json
index 625bf093ba9..feb3377a2f1 100644
--- a/apps/browser/src/_locales/mr/messages.json
+++ b/apps/browser/src/_locales/mr/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN code is required."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/my/messages.json b/apps/browser/src/_locales/my/messages.json
index 4775d1f7af0..ecc7da63e79 100644
--- a/apps/browser/src/_locales/my/messages.json
+++ b/apps/browser/src/_locales/my/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN code is required."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/nb/messages.json b/apps/browser/src/_locales/nb/messages.json
index a11d5de6e2a..59a8ca94c9d 100644
--- a/apps/browser/src/_locales/nb/messages.json
+++ b/apps/browser/src/_locales/nb/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Spør om å oppdatere eksisterende innlogginger"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Egenskapen er utilgjengelig"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium-medlemskap"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH-nøkkel"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "Ny $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Angi PIN-koden din for å låse opp Bitwarden. PIN-innstillingene tilbakestilles hvis du logger deg helt ut av programmet."
   },
-  "setYourPinCode1": {
-    "message": "PIN-koden din vil bli brukt til å låse opp Bitwarden i stedet for hovedpassordet ditt. PIN-koden din tilbakestilles hvis du noen gang logger deg helt ut av Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN-kode er påkrevd."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Bruk dette passordet"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Bruk dette brukernavnet"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "En organisasjonsretningslinje har blokkert import av gjenstander til ditt individuelle hvelv."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domener",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Endre"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Endre passord - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Alle Send-er",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Skjul tekst som standard"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Du må bekrefte e-posten din for å bruke denne funksjonen. Du kan bekrefte e-postadressen din i netthvelvet."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Oppdaterte hovedpassordet"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Forespørsel sendt"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Eksponert hovedpassord"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Be om administratorgodkjennelse"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Stol på brukler"
   },
-  "sendsNoItemsTitle": {
-    "message": "Ingen aktive Send",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Bruk Send til å dele kryptert informasjon med noen.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Vanlige formater",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Vil du fortsette til nettleserinnstillingene?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Autentiserer"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/ne/messages.json b/apps/browser/src/_locales/ne/messages.json
index 4775d1f7af0..ecc7da63e79 100644
--- a/apps/browser/src/_locales/ne/messages.json
+++ b/apps/browser/src/_locales/ne/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN code is required."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/nl/messages.json b/apps/browser/src/_locales/nl/messages.json
index 67a784459b2..71134c7a33b 100644
--- a/apps/browser/src/_locales/nl/messages.json
+++ b/apps/browser/src/_locales/nl/messages.json
@@ -468,7 +468,7 @@
     "message": "Wachtwoord gegenereerd"
   },
   "passphraseGenerated": {
-    "message": "Wachtwoorden gegenereerd"
+    "message": "Wachtwoordzin gegenereerd"
   },
   "usernameGenerated": {
     "message": "Gebruikersnaam gegenereerd"
@@ -1173,6 +1173,12 @@
     "message": "Oh nee! We konden dit niet opslaan. Probeer de gegevens handmatig in te voeren.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "Na het wijzigen van je wachtwoord moet je inloggen met je nieuwe wachtwoord. Actieve sessies op andere apparaten worden binnen één uur uitgelogd."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Wijzig je hoofdwachtwoord om je account te herstellen."
+  },
   "enableChangedPasswordNotification": {
     "message": "Vraag om bijwerken bestaande login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Functionaliteit niet beschikbaar"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Migratie van de encryptiesleutel vereist. Login via de website om je sleutel te bij te werken."
+  "legacyEncryptionUnsupported": {
+    "message": "Oude versleuteling wordt niet langer ondersteund. Neem contact op voor ondersteuning om je account te herstellen."
   },
   "premiumMembership": {
     "message": "Premium-abonnement"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH-sleutel"
   },
+  "typeNote": {
+    "message": "Notitie"
+  },
   "newItemHeader": {
     "message": "Nieuwe $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Stel je PIN-code in voor het ontgrendelen van Bitwarden. Je PIN-code wordt opnieuw ingesteld als je je ooit volledig afmeldt bij de applicatie."
   },
-  "setYourPinCode1": {
-    "message": "Je pincode wordt gebruikt om Bitwarden te ontgrendelen in plaats van je hoofdwachtwoord. Je pincode wordt opnieuw ingesteld als je ooit volledig uitlogt op Bitwarden."
+  "setPinCode": {
+    "message": "Je kunt deze PIN gebruiken voor het ontgrendelen van Bitwarden. Je PIN wordt opnieuw ingesteld als je je ooit volledig afmeldt bij de applicatie."
   },
   "pinRequired": {
     "message": "PIN-code is vereist."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Dit wachtwoord gebruiken"
   },
+  "useThisPassphrase": {
+    "message": "Deze wachtwoordzin gebruiken"
+  },
   "useThisUsername": {
     "message": "Deze gebruikersnaam gebruiken"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Organisatiebeleid heeft het importeren van items in je persoonlijke kluis geblokkeerd."
   },
+  "restrictCardTypeImport": {
+    "message": "Kan kaart item types niet importeren"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Een beleid ingesteld door 1 of meer organisaties voorkomt dat je kaarten naar je kluizen kunt importeren."
+  },
   "domainsTitle": {
     "message": "Domeinen",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Wijzigen"
   },
+  "changePassword": {
+    "message": "Wachtwoord wijzigen",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Wachtwoord wijzigen - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Risicovolle wachtwoorden"
+  },
   "atRiskPasswords": {
     "message": "Risicovolle wachtwoorden"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Je wachtwoord voor deze website is een risico. $ORGANIZATION$ vraagt je deze te veranderen.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wil dat je dit wachtwoord verandert omdat het in gevaar is. Navigeer naar je accountinstellingen om het wachtwoord te wijzigen.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Eén risicovol wachtwoord beoordelen en wijzigen"
   },
@@ -2674,6 +2719,10 @@
     "message": "Alle Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Maximum aantal keren benaderd",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Tekst standaard verbergen"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Je moet je e-mailadres verifiëren om deze functie te gebruiken. Je kunt je e-mailadres verifiëren in de kluis."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Hoofdwachtwoord succesvol ingesteld"
+  },
   "updatedMasterPassword": {
     "message": "Hoofdwachtwoord bijgewerkt"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Verzoek verzonden"
   },
+  "masterPasswordChanged": {
+    "message": "Hoofdwachtwoord gewijzigd"
+  },
   "exposedMasterPassword": {
     "message": "Gelekt hoofdwachtwoord"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Goedkeuring van beheerder vragen"
   },
+  "unableToCompleteLogin": {
+    "message": "Kan login niet voltooien"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Je moet inloggen op een vertrouwd apparaat of je beheerder vragen om je een wachtwoord toe te wijzen."
+  },
   "ssoIdentifierRequired": {
     "message": "Organisatie SSO-identificatie vereist."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Gebruiker vertrouwen"
   },
-  "sendsNoItemsTitle": {
-    "message": "Geen actieve Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Gebruik Send voor het veilig delen van versleutelde informatie met wie dan ook.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Gevoelige informatie veilig versturen",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Veelvoorkomende formaten",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI-matche-detectie is hoe Bitwarden invulsuggesties herkent.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Reguliere expressie\" is een geavanceerde optie met een verhoogd risico op het blootstellen van inloggegevens.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Begint met\" is een geavanceerde optie met een verhoogd risico op het blootstellen van inloggegevens.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Lees meer over overeenkomstdetectie",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Geavanceerde opties",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Doorgaan naar browserinstellingen?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "PIN-code ontgrendelen instellen"
   },
+  "unlockWithBiometricSet": {
+    "message": "Met biometrische set ontgrendelen"
+  },
   "authenticating": {
     "message": "Aan het inloggen"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "Je hebt geen rechten om deze pagina te bekijken. Probeer in te loggen met een ander account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly wordt niet ondersteund in je browser of is niet ingeschakeld. WebAssembly is vereist om de Bitwarden-app te gebruiken.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/nn/messages.json b/apps/browser/src/_locales/nn/messages.json
index 4775d1f7af0..ecc7da63e79 100644
--- a/apps/browser/src/_locales/nn/messages.json
+++ b/apps/browser/src/_locales/nn/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN code is required."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/or/messages.json b/apps/browser/src/_locales/or/messages.json
index 4775d1f7af0..ecc7da63e79 100644
--- a/apps/browser/src/_locales/or/messages.json
+++ b/apps/browser/src/_locales/or/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN code is required."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/pl/messages.json b/apps/browser/src/_locales/pl/messages.json
index eb391f5e34b..b4b62d7968c 100644
--- a/apps/browser/src/_locales/pl/messages.json
+++ b/apps/browser/src/_locales/pl/messages.json
@@ -3,18 +3,18 @@
     "message": "Bitwarden"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Logo Bitwarden"
   },
   "extName": {
-    "message": "Menedżer Haseł Bitwarden",
+    "message": "Menedżer haseł Bitwarden",
     "description": "Extension name, MUST be less than 40 characters (Safari restriction)"
   },
   "extDesc": {
-    "message": "W domu, w pracy, lub w ruchu, Bitwarden z łatwością zabezpiecza Twoje hasła, passkeys i poufne informacje",
+    "message": "W domu, w pracy lub w podróży Bitwarden zabezpiecza wszystkie hasła, klucze dostępu i poufne informacje.",
     "description": "Extension description, MUST be less than 112 characters (Safari restriction)"
   },
   "loginOrCreateNewAccount": {
-    "message": "Zaloguj się lub utwórz nowe konto, aby uzyskać dostęp do Twojego bezpiecznego sejfu."
+    "message": "Zaloguj się lub utwórz nowe konto, aby uzyskać dostęp do bezpiecznego sejfu."
   },
   "inviteAccepted": {
     "message": "Zaproszenie zostało zaakceptowane"
@@ -23,13 +23,13 @@
     "message": "Utwórz konto"
   },
   "newToBitwarden": {
-    "message": "Nowy użytkownik Bitwarden?"
+    "message": "Nowy w Bitwarden?"
   },
   "logInWithPasskey": {
-    "message": "Zaloguj się używając klucza dostępu"
+    "message": "Logowaniem kluczem dostępu"
   },
   "useSingleSignOn": {
-    "message": "Użyj jednokrotnego logowania"
+    "message": "Użyj logowania jednokrotnego"
   },
   "welcomeBack": {
     "message": "Witaj ponownie"
@@ -38,7 +38,7 @@
     "message": "Ustaw silne hasło"
   },
   "finishCreatingYourAccountBySettingAPassword": {
-    "message": "Ukończ tworzenie konta poprzez ustawienie hasła"
+    "message": "Zakończ tworzenie konta poprzez ustawienie hasła"
   },
   "enterpriseSingleSignOn": {
     "message": "Logowanie jednokrotne"
@@ -65,7 +65,7 @@
     "message": "Podpowiedź do hasła głównego może pomóc Ci przypomnieć hasło, jeśli je zapomnisz."
   },
   "masterPassHintText": {
-    "message": "Jeśli zapomnisz hasła, podpowiedź hasła może zostać wysłana na Twój adres e-mail. $CURRENT$ z $MAXIMUM$ znaków.",
+    "message": "Podpowiedź do hasła zostanie wysłana na adres e-mail, jeśli je zapomnisz. Liczba znaków: $CURRENT$ / $MAXIMUM$.",
     "placeholders": {
       "current": {
         "content": "$1",
@@ -84,7 +84,7 @@
     "message": "Podpowiedź do hasła głównego (opcjonalnie)"
   },
   "passwordStrengthScore": {
-    "message": "Siła hasła: $SCORE$",
+    "message": "Siła hasła wynosi $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -105,7 +105,7 @@
     }
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Zakończ dołączanie do tej organizacji przez ustawienie hasła głównego."
+    "message": "Zakończ dołączanie do organizacji poprzez ustawienie hasła głównego."
   },
   "tab": {
     "message": "Karta"
@@ -132,7 +132,7 @@
     "message": "Kopiuj hasło"
   },
   "copyPassphrase": {
-    "message": "Skopiuj hasło wyrazowe"
+    "message": "Kopiuj hasło wyrazowe"
   },
   "copyNote": {
     "message": "Kopiuj notatkę"
@@ -159,19 +159,19 @@
     "message": "Kopiuj numer PESEL"
   },
   "copyPassportNumber": {
-    "message": "Skopiuj numer paszportu"
+    "message": "Kopiuj numer paszportu"
   },
   "copyLicenseNumber": {
-    "message": "Kopiuj numer licencji"
+    "message": "Kopiuj numer prawa jazdy"
   },
   "copyPrivateKey": {
-    "message": "Skopiuj klucz prywatny"
+    "message": "Kopiuj klucz prywatny"
   },
   "copyPublicKey": {
-    "message": "Skopiuj klucz publiczny"
+    "message": "Kopiuj klucz publiczny"
   },
   "copyFingerprint": {
-    "message": "Skopiuj odcisk palca"
+    "message": "Kopiuj odcisk klucza"
   },
   "copyCustomField": {
     "message": "Kopiuj $FIELD$",
@@ -193,26 +193,26 @@
     "description": "Copy to clipboard"
   },
   "fill": {
-    "message": "Wypełnij",
+    "message": "Uzupełnij",
     "description": "This string is used on the vault page to indicate autofilling. Horizontal space is limited in the interface here so try and keep translations as concise as possible."
   },
   "autoFill": {
     "message": "Autouzupełnianie"
   },
   "autoFillLogin": {
-    "message": "Autouzupełnianie logowania"
+    "message": "Uzupełnij dane logowania"
   },
   "autoFillCard": {
-    "message": "Autouzupełnianie karty"
+    "message": "Uzupełnij kartę"
   },
   "autoFillIdentity": {
-    "message": "Autouzupełnianie tożsamości"
+    "message": "Uzupełnij tożsamość"
   },
   "fillVerificationCode": {
-    "message": "Wypełnij kod weryfikacyjny"
+    "message": "Uzupełnij kod weryfikacyjny"
   },
   "fillVerificationCodeAria": {
-    "message": "Wypełnij kod weryfikacyjny",
+    "message": "Uzupełnij kod weryfikacyjny",
     "description": "Aria label for the heading displayed the inline menu for totp code autofill"
   },
   "generatePasswordCopied": {
@@ -246,7 +246,7 @@
     "message": "Zaloguj się do sejfu"
   },
   "autoFillInfo": {
-    "message": "Brak danych logowania do użycia przez autouzupełnienie na obecnej karcie przeglądarki."
+    "message": "Brak dostępnych danych logowania dla obecnej karty przeglądarki."
   },
   "addLogin": {
     "message": "Dodaj dane logowania"
@@ -258,13 +258,13 @@
     "message": "Adres e-mail konta"
   },
   "requestHint": {
-    "message": "Poproś o podpowiedź"
+    "message": "Uzyskaj podpowiedź"
   },
   "requestPasswordHint": {
-    "message": "Poproś o podpowiedź do hasła"
+    "message": "Uzyskaj podpowiedź do hasła"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Wprowadź adres e-mail swojego konta, a podpowiedź hasła zostanie wysłana do Ciebie"
+    "message": "Wpisz adres e-mail konta. Podpowiedź do hasła zostanie wysłana na adres e-mail"
   },
   "getMasterPasswordHint": {
     "message": "Uzyskaj podpowiedź do hasła głównego"
@@ -291,32 +291,32 @@
     "message": "Zmień hasło główne"
   },
   "continueToWebApp": {
-    "message": "Kontynuować do aplikacji internetowej?"
+    "message": "Przejść do aplikacji internetowej?"
   },
   "continueToWebAppDesc": {
-    "message": "Odkryj więcej funkcji swojego konta Bitwarden w aplikacji internetowej."
+    "message": "Odkryj więcej funkcji konta Bitwarden w aplikacji internetowej."
   },
   "continueToHelpCenter": {
-    "message": "Kontynuować do centrum pomocy?"
+    "message": "Przejść do centrum pomocy?"
   },
   "continueToHelpCenterDesc": {
     "message": "Dowiedz się więcej o tym, jak korzystać z centrum pomocy Bitwarden."
   },
   "continueToBrowserExtensionStore": {
-    "message": "Kontynuować do sklepu z rozszerzeniami przeglądarki?"
+    "message": "Przejść do sklepu z rozszerzeniami przeglądarki?"
   },
   "continueToBrowserExtensionStoreDesc": {
-    "message": "Pomóż innym dowiedzieć się, czy Bitwarden jest dla nich odpowiedni. Odwiedź swój sklep z rozszerzeniami do przeglądarki i zostaw ocenę."
+    "message": "Pomóż innym sprawdzić, czy Bitwarden jest dla nich odpowiedni. Odwiedź sklep z rozszerzeniami przeglądarki i zostaw ocenę."
   },
   "changeMasterPasswordOnWebConfirmation": {
-    "message": "Możesz zmienić swoje hasło główne w aplikacji internetowej Bitwarden."
+    "message": "Możesz zmienić hasło główne w aplikacji internetowej Bitwarden."
   },
   "fingerprintPhrase": {
     "message": "Unikalny identyfikator konta",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "yourAccountsFingerprint": {
-    "message": "Unikalny identyfikator Twojego konta",
+    "message": "Twój unikalny identyfikator konta",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "twoStepLogin": {
@@ -335,7 +335,7 @@
     "message": "Więcej od Bitwarden"
   },
   "continueToBitwardenDotCom": {
-    "message": "Kontynuować do bitwarden.com?"
+    "message": "Przejść do bitwarden.com?"
   },
   "bitwardenForBusiness": {
     "message": "Bitwarden dla biznesu"
@@ -344,7 +344,7 @@
     "message": "Bitwarden Authenticator"
   },
   "continueToAuthenticatorPageDesc": {
-    "message": "Bitwarden Authenticator pozwala na przechowywanie kluczy uwierzytelniających i generowanie kodów TOTP do dwuetapowego procesu weryfikacji. Dowiedz się więcej na stronie bitwarden.com"
+    "message": "Bitwarden Authenticator umożliwia przechowywanie kluczy uwierzytelniających i generowanie kodów TOTP dla weryfikacji dwustopniowej. Dowiedz się wiecej na bitwarden.com"
   },
   "bitwardenSecretsManager": {
     "message": "Menedżer sekretów Bitwarden"
@@ -362,7 +362,7 @@
     "message": "Darmowy plan rodzinny"
   },
   "freeBitwardenFamiliesPageDesc": {
-    "message": "Masz prawo do bezpłatengo planu rodzinnego Bitwarden. Zrealizuj tę ofertę już dziś w aplikacji internetowej."
+    "message": "Kwalifikujesz się do bezpłatnego planu rodzinnego. Skorzystaj z oferty już dziś w aplikacji internetowej."
   },
   "version": {
     "message": "Wersja"
@@ -398,16 +398,16 @@
     "message": "Nazwa folderu"
   },
   "folderHintText": {
-    "message": "Zagnieżdżaj foldery dodając nazwę folderu nadrzędnego, a następnie “/”. Przykład: Społeczne/Fora"
+    "message": "Utwórz podfolder, dodając nazwę folderu nadrzędnego przed znakiem „/”. Przykład: Social/Forums"
   },
   "noFoldersAdded": {
     "message": "Nie dodano folderów"
   },
   "createFoldersToOrganize": {
-    "message": "Twórz foldery, aby zorganizować elementy swojego sejfu"
+    "message": "Twórz foldery, aby zorganizować elementy sejfu"
   },
   "deleteFolderPermanently": {
-    "message": "Czy na pewno chcesz trwale usunąć ten folder?"
+    "message": "Czy na pewno chcesz usunąć trwale folder?"
   },
   "deleteFolder": {
     "message": "Usuń folder"
@@ -425,7 +425,7 @@
     "message": "Centrum pomocy Bitwarden"
   },
   "communityForums": {
-    "message": "Przeglądaj fora społeczności Bitwarden"
+    "message": "Odwiedź forum społeczności Bitwarden"
   },
   "contactSupport": {
     "message": "Skontaktuj się z pomocą techniczną Bitwarden"
@@ -447,7 +447,7 @@
     "description": "Short for 'credential generator'."
   },
   "passGenInfo": {
-    "message": "Automatycznie wygeneruj silne, unikatowe hasła dla swoich loginów."
+    "message": "Automatycznie generuj silne i unikalne hasła."
   },
   "bitWebVaultApp": {
     "message": "Aplikacja internetowa Bitwarden"
@@ -474,7 +474,7 @@
     "message": "Nazwa użytkownika została wygenerowana"
   },
   "emailGenerated": {
-    "message": "E-mail został wygenerowany"
+    "message": "Adres e-mail został wygenerowany"
   },
   "regeneratePassword": {
     "message": "Wygeneruj ponownie hasło"
@@ -490,7 +490,7 @@
     "description": "Card header for password generator include block"
   },
   "uppercaseDescription": {
-    "message": "Uwzględnij wielkie litery",
+    "message": "Wielkie litery",
     "description": "Tooltip for the password generator uppercase character checkbox"
   },
   "uppercaseLabel": {
@@ -498,7 +498,7 @@
     "description": "Label for the password generator uppercase character checkbox"
   },
   "lowercaseDescription": {
-    "message": "Uwzględnij małe litery",
+    "message": "Małe litery",
     "description": "Full description for the password generator lowercase character checkbox"
   },
   "lowercaseLabel": {
@@ -506,7 +506,7 @@
     "description": "Label for the password generator lowercase character checkbox"
   },
   "numbersDescription": {
-    "message": "Uwzględnij cyfry",
+    "message": "Cyfry",
     "description": "Full description for the password generator numbers checkbox"
   },
   "numbersLabel": {
@@ -514,7 +514,7 @@
     "description": "Label for the password generator numbers checkbox"
   },
   "specialCharactersDescription": {
-    "message": "Uwzględnij znaki specjalne",
+    "message": "Znaki specjalne",
     "description": "Full description for the password generator special characters checkbox"
   },
   "numWords": {
@@ -531,10 +531,10 @@
     "message": "Uwzględnij cyfry"
   },
   "minNumbers": {
-    "message": "Minimalna liczba cyfr"
+    "message": "Min. liczba cyfr"
   },
   "minSpecial": {
-    "message": "Minimalna liczba znaków specjalnych"
+    "message": "Min. liczba znaków specjalnych"
   },
   "avoidAmbiguous": {
     "message": "Unikaj niejednoznacznych znaków",
@@ -551,10 +551,10 @@
     "message": "Edytuj"
   },
   "view": {
-    "message": "Zobacz"
+    "message": "Pokaż"
   },
   "noItemsInList": {
-    "message": "Brak elementów."
+    "message": "Brak elementów do wyświetlenia."
   },
   "itemInformation": {
     "message": "Informacje o elemencie"
@@ -566,22 +566,22 @@
     "message": "Hasło"
   },
   "totp": {
-    "message": "Sekret uwierzytelniania"
+    "message": "Klucz uwierzytelniający"
   },
   "passphrase": {
     "message": "Hasło wyrazowe"
   },
   "favorite": {
-    "message": "Ulubione"
+    "message": "Dodaj do ulubionych"
   },
   "unfavorite": {
     "message": "Usuń z ulubionych"
   },
   "itemAddedToFavorites": {
-    "message": "Element dodany do ulubionych"
+    "message": "Element został dodany do ulubionych"
   },
   "itemRemovedFromFavorites": {
-    "message": "Element usunięty z ulubionych"
+    "message": "Element został usunięty z ulubionych"
   },
   "notes": {
     "message": "Notatki"
@@ -602,16 +602,16 @@
     "message": "Usuń element"
   },
   "viewItem": {
-    "message": "Zobacz element"
+    "message": "Pokaż element"
   },
   "launch": {
     "message": "Uruchom"
   },
   "launchWebsite": {
-    "message": "Otwórz stronę"
+    "message": "Uruchom stronę internetową"
   },
   "launchWebsiteName": {
-    "message": "Otwórz stronę internetową $ITEMNAME$",
+    "message": "Uruchom stronę internetową $ITEMNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -620,10 +620,10 @@
     }
   },
   "website": {
-    "message": "Strona"
+    "message": "Strona internetowa"
   },
   "toggleVisibility": {
-    "message": "Pokaż / Ukryj"
+    "message": "Pokaż / ukryj"
   },
   "manage": {
     "message": "Zarządzaj"
@@ -635,13 +635,13 @@
     "message": "Opcje odblokowania"
   },
   "unlockMethodNeededToChangeTimeoutActionDesc": {
-    "message": "Ustaw metodę odblokowania, aby zmienić czas blokowania sejfu."
+    "message": "Ustaw metodę odblokowania, aby zmienić sposób blokowania sejfu."
   },
   "unlockMethodNeeded": {
-    "message": "Ustaw metodę odblokowania w Ustawieniach"
+    "message": "Ustaw metodę odblokowania w ustawieniach"
   },
   "sessionTimeoutHeader": {
-    "message": "Limit czasu sesji"
+    "message": "Blokada aplikacji"
   },
   "vaultTimeoutHeader": {
     "message": "Blokowanie sejfu"
@@ -656,7 +656,7 @@
     "message": "Przeglądarka nie obsługuje łatwego kopiowania schowka. Skopiuj element ręcznie."
   },
   "verifyYourIdentity": {
-    "message": "Potwierdź swoją tożsamość"
+    "message": "Zweryfikuj tożsamość"
   },
   "weDontRecognizeThisDevice": {
     "message": "Nie rozpoznajemy tego urządzenia. Wpisz kod wysłany na Twój e-mail, aby zweryfikować tożsamość."
@@ -668,10 +668,10 @@
     "message": "Sejf jest zablokowany. Zweryfikuj swoją tożsamość, aby kontynuować."
   },
   "yourVaultIsLockedV2": {
-    "message": "Twój sejf jest zablokowany"
+    "message": "Sejf jest zablokowany"
   },
   "yourAccountIsLocked": {
-    "message": "Twoje konto jest zablokowane"
+    "message": "Konto jest zablokowane"
   },
   "or": {
     "message": "lub"
@@ -699,13 +699,13 @@
     "message": "Blokowanie sejfu"
   },
   "vaultTimeout1": {
-    "message": "Limit czasu"
+    "message": "Blokada aplikacji"
   },
   "lockNow": {
     "message": "Zablokuj"
   },
   "lockAll": {
-    "message": "Zablokuj wszystkie"
+    "message": "Zablokuj wszystko"
   },
   "immediately": {
     "message": "Natychmiast"
@@ -759,7 +759,7 @@
     "message": "Hasło główne"
   },
   "masterPassImportant": {
-    "message": "Twoje hasło główne nie może zostać odzyskane, jeśli je zapomnisz!"
+    "message": "Zapomniane hasło główne nie może zostać odzyskane!"
   },
   "masterPassHintLabel": {
     "message": "Podpowiedź do hasła głównego"
@@ -780,7 +780,7 @@
     "message": "Wymagane jest ponowne wpisanie hasła głównego."
   },
   "masterPasswordMinlength": {
-    "message": "Hasło główne musi zawierać co najmniej $VALUE$ znaki(-ów).",
+    "message": "Hasło główne musi składać się z co najmniej $VALUE$ znaków.",
     "description": "The Master Password must be at least a specific number of characters long.",
     "placeholders": {
       "value": {
@@ -796,10 +796,10 @@
     "message": "Konto zostało utworzone! Teraz możesz się zalogować."
   },
   "newAccountCreated2": {
-    "message": "Twoje nowe konto zostało utworzone!"
+    "message": "Nowe konto zostało utworzone!"
   },
   "youHaveBeenLoggedIn": {
-    "message": "Zalogowano Cię!"
+    "message": "Zalogowano!"
   },
   "youSuccessfullyLoggedIn": {
     "message": "Zalogowałeś się pomyślnie"
@@ -808,7 +808,7 @@
     "message": "Możesz zamknąć to okno"
   },
   "masterPassSent": {
-    "message": "Wysłaliśmy Tobie wiadomość e-mail z podpowiedzią do hasła głównego."
+    "message": "Wysłaliśmy wiadomość z podpowiedzią do hasła głównego."
   },
   "verificationCodeRequired": {
     "message": "Kod weryfikacyjny jest wymagany."
@@ -833,25 +833,25 @@
     "message": "Nie można zastosować autouzupełnienia na tej stronie. Skopiuj i wklej informacje ręcznie."
   },
   "totpCaptureError": {
-    "message": "Nie można zeskanować kodu QR z bieżącej strony"
+    "message": "Nie można zeskanować kodu QR z obecnej strony"
   },
   "totpCaptureSuccess": {
     "message": "Klucz uwierzytelniający został dodany"
   },
   "totpCapture": {
-    "message": "Zeskanuj kod QR z bieżącej strony"
+    "message": "Zeskanuj kod QR z obecnej strony"
   },
   "totpHelperTitle": {
-    "message": "Spraw, aby dwuetapowa weryfikacja była bezproblemowa"
+    "message": "Bezproblemowa weryfikacja dwustopniowa"
   },
   "totpHelper": {
-    "message": "Bitwarden może przechowywać i wypełniać kody weryfikacyjne. Skopiuj i wklej klucz do tego pola."
+    "message": "Bitwarden może przechowywać i uzupełniać kody weryfikacyjne. Skopiuj i wklej klucz do tego pola."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden może przechowywać i wypełniać kody weryfikacyjne. Wybierz ikonę aparatu, aby zrobić zrzut ekranu z kodem QR lub skopiuj i wklej klucz do tego pola."
+    "message": "Bitwarden może przechowywać i uzupełniać kody weryfikacyjne. Wybierz ikonę aparatu, aby zrobić zrzut ekranu z kodem QR lub skopiuj i wklej klucz do tego pola."
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Dowiedz się więcej o uwierzytelniaczach"
+    "message": "Dowiedz się więcej o uwierzytelnianiu"
   },
   "copyTOTP": {
     "message": "Kopiuj klucz uwierzytelniający (TOTP)"
@@ -872,25 +872,25 @@
     "message": "Zaloguj się do Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Wpisz kod wysłany na Twój adres e-mail"
+    "message": "Wpisz kod został wysłany na adres e-mail"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
     "message": "Wpisz kod z aplikacji uwierzytelniającej"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Naciśnij YubiKey aby uwierzytelnić"
+    "message": "Naciśnij klucz YubiKey, aby uwierzytelnić"
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Logowanie dwustopniowe Duo jest wymagane dla twojego konta. Wykonaj poniższe kroki, by dokończyć logowanie"
+    "message": "Logowanie dwustopniowe Duo jest wymagane. Wykonaj poniższe kroki, aby zakończyć logowanie."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Wykonaj poniższe kroki, by dokończyć logowanie"
+    "message": "Wykonaj poniższe kroki, by zakończyć logowanie."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
     "message": "Wykonaj poniższe kroki, aby zakończyć logowanie za pomocą klucza bezpieczeństwa."
   },
   "restartRegistration": {
-    "message": "Zrestartuj rejestrację"
+    "message": "Zacznij rejestrację od początku"
   },
   "expiredLink": {
     "message": "Link wygasł"
@@ -923,19 +923,19 @@
     "message": "Folder został dodany"
   },
   "twoStepLoginConfirmation": {
-    "message": "Logowanie dwustopniowe sprawia, że konto jest bardziej bezpieczne poprzez wymuszenie potwierdzenia logowania z innego urządzenia, takiego jak z klucza bezpieczeństwa, aplikacji uwierzytelniającej, wiadomości SMS, telefonu lub adresu e-mail. Logowanie dwustopniowe możesz włączyć w sejfie internetowym bitwarden.com. Czy chcesz przejść do tej strony?"
+    "message": "Logowanie dwustopniowe zwiększa bezpieczeństwo konta, wymagając weryfikacji logowania za pomocą innego urządzenia, takiego jak klucz bezpieczeństwa, aplikacja uwierzytelniająca, wiadomość SMS, połączenie telefoniczne lub wiadomość e-mail. Logowanie dwustopniowe możesz skonfigurować w sejfie internetowym bitwarden.com. Czy chcesz przejść do strony?"
   },
   "twoStepLoginConfirmationContent": {
     "message": "Spraw, aby Twoje konto było bezpieczniejsze poprzez skonfigurowanie dwustopniowego logowania w aplikacji internetowej Bitwarden."
   },
   "twoStepLoginConfirmationTitle": {
-    "message": "Kontynuować do aplikacji internetowej?"
+    "message": "Przejść do aplikacji internetowej?"
   },
   "editedFolder": {
     "message": "Folder został zapisany"
   },
   "deleteFolderConfirmation": {
-    "message": "Czy na pewno chcesz usunąć ten folder?"
+    "message": "Czy na pewno chcesz usunąć folder?"
   },
   "deletedFolder": {
     "message": "Folder został usunięty"
@@ -944,7 +944,7 @@
     "message": "Samouczek"
   },
   "gettingStartedTutorialVideo": {
-    "message": "Obejrzyj samouczek, aby dowiedzieć się, jak najlepiej wykorzystać rozszerzenie przeglądarki."
+    "message": "Zobacz samouczek, aby dowiedzieć się, jak najlepiej wykorzystać rozszerzenie przeglądarki."
   },
   "syncingComplete": {
     "message": "Synchronizacja została zakończona"
@@ -982,7 +982,7 @@
     "message": "Element został zapisany"
   },
   "deleteItemConfirmation": {
-    "message": "Czy na pewno chcesz to usunąć?"
+    "message": "Czy na pewno chcesz usunąć?"
   },
   "deletedItem": {
     "message": "Element został przeniesiony do kosza"
@@ -1013,19 +1013,19 @@
     "description": "This is the folder for uncategorized items"
   },
   "enableAddLoginNotification": {
-    "message": "Poproś o dodanie danych logowania"
+    "message": "Proponuj zapisywanie danych logowania"
   },
   "vaultSaveOptionsTitle": {
     "message": "Opcje zapisywania w sejfie"
   },
   "addLoginNotificationDesc": {
-    "message": "\"Dodaj powiadomienia logowania\" automatycznie wyświetla monit o zapisanie nowych danych logowania do sejfu przy każdym pierwszym logowaniu."
+    "message": "Proponuj dodanie elementu, jeśli nie ma go w sejfie."
   },
   "addLoginNotificationDescAlt": {
-    "message": "Poproś o dodanie elementu, jeśli nie zostanie znaleziony w Twoim sejfie. Dotyczy wszystkich zalogowanych kont."
+    "message": "Proponuj dodanie elementu, jeśli nie ma go w sejfie. Dotyczy wszystkich zalogowanych kont."
   },
   "showCardsInVaultViewV2": {
-    "message": "Zawsze pokazuj karty jako sugestie autouzupełniania w widoku sejfu"
+    "message": "Pokazuj zawsze karty w sugestiach autouzupełniania"
   },
   "showCardsCurrentTab": {
     "message": "Pokaż karty na stronie głównej"
@@ -1034,7 +1034,7 @@
     "message": "Pokaż elementy karty na stronie głównej, aby ułatwić autouzupełnianie."
   },
   "showIdentitiesInVaultViewV2": {
-    "message": "Zawsze pokazuj tożsamości jako sugestie autouzupełniania w widoku sejfu"
+    "message": "Pokazuj zawsze tożsamości w sugestiach autouzupełniania"
   },
   "showIdentitiesCurrentTab": {
     "message": "Pokaż tożsamości na stronie głównej"
@@ -1043,10 +1043,10 @@
     "message": "Pokaż elementy tożsamości na stronie głównej, aby ułatwić autouzupełnianie."
   },
   "clickToAutofillOnVault": {
-    "message": "Kliknij na dane logowania, aby autouzupełnić w widoku Sejfu"
+    "message": "Kliknij na elementy, aby je uzupełnić"
   },
   "clickToAutofill": {
-    "message": "Kliknij elementy w sugestii autouzupełniania, aby wypełnić"
+    "message": "Kliknij na elementy w sugestiach, aby je uzupełnić"
   },
   "clearClipboard": {
     "message": "Wyczyść schowek",
@@ -1057,7 +1057,7 @@
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "notificationAddDesc": {
-    "message": "Czy Bitwarden powinien zapisać to hasło?"
+    "message": "Zapisać hasło?"
   },
   "notificationAddSave": {
     "message": "Zapisz"
@@ -1113,7 +1113,7 @@
     }
   },
   "saveAsNewLoginAction": {
-    "message": "Zapisz jako nowy login",
+    "message": "Zapisz jako nowy dane logowania",
     "description": "Button text for saving login details as a new entry."
   },
   "updateLoginAction": {
@@ -1121,7 +1121,7 @@
     "description": "Button text for updating an existing login entry."
   },
   "unlockToSave": {
-    "message": "Odblokuj, aby zapisać ten login",
+    "message": "Odblokuj, aby zapisać dane logowania",
     "description": "User prompt to take action in order to save the login they just entered."
   },
   "saveLogin": {
@@ -1129,11 +1129,11 @@
     "description": "Prompt asking the user if they want to save their login details."
   },
   "updateLogin": {
-    "message": "Zaktualizować istniejące dane logowania?",
+    "message": "Zaktualizuj obecne dane logowania",
     "description": "Prompt asking the user if they want to update an existing login entry."
   },
   "loginSaveSuccess": {
-    "message": "Dane logowania zapisane",
+    "message": "Dane logowania zostały zapisane",
     "description": "Message displayed when login details are successfully saved."
   },
   "loginUpdateSuccess": {
@@ -1141,7 +1141,7 @@
     "description": "Message displayed when login details are successfully updated."
   },
   "loginUpdateTaskSuccess": {
-    "message": "Świetna robota! Podjęto kroki mające na celu zwiększenie bezpieczeństwa Twojego oraz $ORGANIZATION$.",
+    "message": "Dobra robota! Twoje konto i organizacja $ORGANIZATION$ jest bezpieczniejsza.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1166,30 +1166,36 @@
     "description": "Message prompting user to undertake completion of another security task."
   },
   "saveFailure": {
-    "message": "Błąd podczas zapisywania",
+    "message": "Wystąpił błąd podczas zapisywania",
     "description": "Error message shown when the system fails to save login details."
   },
   "saveFailureDetails": {
-    "message": "O nie! Nie mogliśmy zapisać tego. Spróbuj wprowadzić szczegóły ręcznie.",
+    "message": "O nie! Nie mogliśmy tego zapisać. Wpisz szczegóły ręcznie.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "Po zmianie hasła musisz się zalogować przy użyciu nowego hasła. Aktywne sesje na innych urządzeniach zostaną wylogowane w ciągu jednej godziny."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Zmień hasło główne, aby zakończyć odzyskiwanie konta."
+  },
   "enableChangedPasswordNotification": {
-    "message": "Poproś o aktualizację istniejących danych logowania"
+    "message": "Proponuj aktualizuję obecnych danych logowania"
   },
   "changedPasswordNotificationDesc": {
-    "message": "Poproś o aktualizację hasła danych logowania po wykryciu zmiany w witrynie."
+    "message": "Proponuj aktualizację hasła po wykryciu zmiany na stronie internetowej."
   },
   "changedPasswordNotificationDescAlt": {
-    "message": "Poproś o aktualizację hasła, gdy zmiana zostanie wykryta na stronie. Dotyczy wszystkich zalogowanych kont."
+    "message": "Proponuj aktualizację hasła po wykryciu zmiany na stronie internetowej. Dotyczy wszystkich zalogowanych kont."
   },
   "enableUsePasskeys": {
-    "message": "Pytaj o zapisywanie i używanie kluczy dostępu"
+    "message": "Proponuj zapisywanie i używanie kluczy dostępu"
   },
   "usePasskeysDesc": {
-    "message": "Pytaj o zapisywanie nowych kluczy dostępu albo danych logowania z kluczy w Twoim sejfie. Dotyczy wszystkich zalogowanych kont."
+    "message": "Pytaj o zapisywanie nowych kluczy dostępu i używanie obecnych. Dotyczy wszystkich zalogowanych kont."
   },
   "notificationChangeDesc": {
-    "message": "Czy chcesz zaktualizować to hasło w Bitwarden?"
+    "message": "Czy chcesz zaktualizować hasło w Bitwarden?"
   },
   "notificationChangeSave": {
     "message": "Zaktualizuj"
@@ -1204,7 +1210,7 @@
     "message": "Dodatkowe opcje"
   },
   "enableContextMenuItem": {
-    "message": "Pokaż opcje menu kontekstowego"
+    "message": "Pokaż opcje w menu kontekstowym"
   },
   "contextMenuItemDesc": {
     "message": "Użyj drugiego kliknięcia, aby uzyskać dostęp do generowania haseł i pasujących danych logowania do witryny."
@@ -1226,7 +1232,7 @@
     "message": "Zmień motyw kolorystyczny aplikacji."
   },
   "themeDescAlt": {
-    "message": "Zmień kolor motywu aplikacji. Dotyczy wszystkich zalogowanych kont."
+    "message": "Zmień motyw kolorystyczny aplikacji. Dotyczy wszystkich zalogowanych kont."
   },
   "dark": {
     "message": "Ciemny",
@@ -1249,16 +1255,16 @@
     "message": "Plik będzie chroniony hasłem, które będzie wymagane do odszyfrowania pliku."
   },
   "filePassword": {
-    "message": "Hasło do pliku"
+    "message": "Hasło pliku"
   },
   "exportPasswordDescription": {
     "message": "Hasło będzie używane do eksportowania i importowania pliku"
   },
   "accountRestrictedOptionDescription": {
-    "message": "Użyj klucza szyfrowania konta, pochodzącego z nazwy użytkownika konta i hasła głównego, aby zaszyfrować eksport i ograniczyć import tylko do bieżącego konta Bitwarden."
+    "message": "Użyj klucza szyfrowania konta, pochodzącego z nazwy użytkownika konta i hasła głównego, aby zaszyfrować eksport i ograniczyć import tylko do obecnego konta Bitwarden."
   },
   "passwordProtectedOptionDescription": {
-    "message": "Ustaw hasło dla pliku, aby zaszyfrować eksport i zaimportować je na dowolne konto Bitwarden przy użyciu hasła do odszyfrowania."
+    "message": "Ustaw hasło pliku, aby zaszyfrować eksport i zaimportować je na dowolne konto Bitwarden przy użyciu hasła do odszyfrowania."
   },
   "exportTypeHeading": {
     "message": "Rodzaj eksportu"
@@ -1267,10 +1273,10 @@
     "message": "Konto ograniczone"
   },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
-    "message": "“Hasło pliku” i “Potwierdź hasło pliku“ nie pasują do siebie."
+    "message": "Hasła pliku nie pasują do siebie."
   },
   "warning": {
-    "message": "UWAGA",
+    "message": "OSTRZEŻENIE",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
   "warningCapitalized": {
@@ -1296,13 +1302,13 @@
     "message": "Udostępnione"
   },
   "bitwardenForBusinessPageDesc": {
-    "message": "Bitwarden dla biznesu pozwala na udostępnianie zawartości sejfu innym osobom za pośrednictwem organizacji. Dowiedz się wiecej na bitwarden.com."
+    "message": "Bitwarden dla biznesu pozwala na udostępnianie zawartości sejfu innym użytkownikom za pośrednictwem organizacji. Dowiedz się więcej na stronie bitwarden.com."
   },
   "moveToOrganization": {
     "message": "Przenieś do organizacji"
   },
   "movedItemToOrg": {
-    "message": "Element $ITEMNAME$ został przeniesiony do organizacji $ORGNAME$",
+    "message": "Przeniesiono $ITEMNAME$ do $ORGNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -1315,7 +1321,7 @@
     }
   },
   "moveToOrgDesc": {
-    "message": "Wybierz organizację, do której chcesz przenieść ten element. Ta czynność spowoduje utratę własności elementu i przenosi te uprawnienia do organizacji."
+    "message": "Wybierz organizację, do której chcesz przenieść element. Przeniesienie spowoduje zmianę własności elementu na organizację."
   },
   "learnMore": {
     "message": "Dowiedz się więcej"
@@ -1336,7 +1342,7 @@
     "message": "Usuń załącznik"
   },
   "deleteAttachmentConfirmation": {
-    "message": "Czy na pewno chcesz usunąć ten załącznik?"
+    "message": "Czy na pewno chcesz usunąć załącznik?"
   },
   "deletedAttachment": {
     "message": "Załącznik został usunięty"
@@ -1354,7 +1360,7 @@
     "message": "Plik"
   },
   "fileToShare": {
-    "message": "Plik do udostępnienia"
+    "message": "Plik wysyłki"
   },
   "selectFile": {
     "message": "Wybierz plik"
@@ -1365,26 +1371,26 @@
   "featureUnavailable": {
     "message": "Funkcja jest niedostępna"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Wymagana jest migracja klucza szyfrowania. Zaloguj się przez sejf internetowy, aby zaktualizować klucz szyfrowania."
+  "legacyEncryptionUnsupported": {
+    "message": "Starsze szyfrowanie nie jest już obsługiwane. Skontaktuj się z pomocą techniczną, aby odzyskać swoje konto."
   },
   "premiumMembership": {
-    "message": "Konto Premium"
+    "message": "Konto premium"
   },
   "premiumManage": {
-    "message": "Zarządzaj kontem Premium"
+    "message": "Zarządzaj kontem premium"
   },
   "premiumManageAlert": {
-    "message": "Kontem Premium możesz zarządzać na stronie sejfu bitwarden.com. Czy chcesz otworzyć tę stronę?"
+    "message": "Zarządzaj kontem premium na stronie internetowej bitwarden.com. Czy chcesz otworzyć stronę?"
   },
   "premiumRefresh": {
-    "message": "Odśwież konto Premium"
+    "message": "Odśwież konto premium"
   },
   "premiumNotCurrentMember": {
-    "message": "Nie posiadasz obecnie konta Premium."
+    "message": "Nie masz konta premium."
   },
   "premiumSignUpAndGet": {
-    "message": "Zarejestruj konto Premium, aby otrzymać:"
+    "message": "Ulepsz konto do wersji premium, aby otrzymać:"
   },
   "ppremiumSignUpStorage": {
     "message": "1 GB miejsca na zaszyfrowane załączniki."
@@ -1393,13 +1399,13 @@
     "message": "Dostęp awaryjny."
   },
   "premiumSignUpTwoStepOptions": {
-    "message": "Własnościowe opcje logowania dwuetapowego, takie jak YubiKey i Duo."
+    "message": "Specjalne opcje logowania dwustopniowego, takie jak YubiKey i Duo."
   },
   "ppremiumSignUpReports": {
     "message": "Raporty bezpieczeństwa haseł, stanu konta i raporty wycieków danych, aby Twoje dane były bezpieczne."
   },
   "ppremiumSignUpTotp": {
-    "message": "Generator kodów weryfikacyjnych TOTP (2FA) dla danych logowania w Twoim sejfie."
+    "message": "Generator kodów weryfikacyjnych TOTP dla danych logowania w sejfie."
   },
   "ppremiumSignUpSupport": {
     "message": "Priorytetowe wsparcie klienta."
@@ -1408,22 +1414,22 @@
     "message": "Wszystkie przyszłe funkcje premium. Więcej już wkrótce!"
   },
   "premiumPurchase": {
-    "message": "Kup konto Premium"
+    "message": "Kup konto premium"
   },
   "premiumPurchaseAlertV2": {
-    "message": "Możesz kupić Premium w ustawieniach konta w aplikacji internetowej Bitwarden."
+    "message": "Możesz kupić konto premium w aplikacji internetowej Bitwarden."
   },
   "premiumCurrentMember": {
-    "message": "Posiadasz konto Premium!"
+    "message": "Masz konto premium!"
   },
   "premiumCurrentMemberThanks": {
     "message": "Dziękujemy za wspieranie Bitwarden."
   },
   "premiumFeatures": {
-    "message": "Uaktualnij do wersji Premium i otrzymaj:"
+    "message": "Ulepsz konto do wersji premium i otrzymaj:"
   },
   "premiumPrice": {
-    "message": "Wszystko to jedynie za $PRICE$ /rok!",
+    "message": "Tylko $PRICE$ / rok!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -1432,7 +1438,7 @@
     }
   },
   "premiumPriceV2": {
-    "message": "Wszystko tylko za $PRICE$ rocznie!",
+    "message": "Tylko $PRICE$ rocznie!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -1447,16 +1453,16 @@
     "message": "Kopiuj kod TOTP automatycznie"
   },
   "disableAutoTotpCopyDesc": {
-    "message": "Jeśli dane logowania posiadają dołączony klucz uwierzytelniający TOTP, kod weryfikacyjny jest automatycznie kopiowany do schowka przy każdym autouzupełnianiu danych logowania."
+    "message": "Automatycznie kopiuje kod TOTP do schowka podczas autouzupełniania."
   },
   "enableAutoBiometricsPrompt": {
     "message": "Poproś o dane biometryczne przy uruchomieniu"
   },
   "premiumRequired": {
-    "message": "Konto Premium jest wymagane"
+    "message": "Konto premium jest wymagane"
   },
   "premiumRequiredDesc": {
-    "message": "Konto Premium jest wymagane, aby skorzystać z tej funkcji."
+    "message": "Konto premium jest wymagane, aby skorzystać z tej funkcji."
   },
   "authenticationTimeout": {
     "message": "Limit czasu uwierzytelniania"
@@ -1465,7 +1471,7 @@
     "message": "Upłynął limit czasu uwierzytelniania. Uruchom ponownie proces logowania."
   },
   "verificationCodeEmailSent": {
-    "message": "Kod weryfikacyjny został wysłany na adres $EMAIL$.",
+    "message": "Wiadomość weryfikacyjna została wysłana na adres $EMAIL$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1523,21 +1529,21 @@
     "message": "Aplikacja uwierzytelniająca"
   },
   "authenticatorAppDescV2": {
-    "message": "Wprowadź kod wygenerowany przez aplikację uwierzytelniającą, jak Bitwarden Authenticator.",
+    "message": "Wpisz kod wygenerowany przez aplikację uwierzytelniającą, taką jak Bitwarden Authenticator.",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
     "message": "Klucz bezpieczeństwa Yubico OTP"
   },
   "yubiKeyDesc": {
-    "message": "Użyj YubiKey jako metody dostępu do konta. Działa z YubiKey 4, 4 Nano, 4C i urządzeniami NEO."
+    "message": "Użyj klucza YubiKey, aby uzyskać dostęp do konta. Działa z urządzeniami YubiKey 4, 4 Nano, 4C i NEO."
   },
   "duoDescV2": {
-    "message": "Wprowadź kod wygenerowany przez Duo Security.",
+    "message": "Wpisz kod wygenerowany przez Duo Security.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
-    "message": "Weryfikacja dostępu do Twojej organizacji z użyciem Duo Security poprzez aplikację Duo Mobile, SMS, połączenie telefoniczne lub klucz bezpieczeństwa U2F.",
+    "message": "Weryfikacja Duo Security za pomocą aplikacji Duo Mobile, wiadomości SMS, połączenia telefonicznego lub klucza bezpieczeństwa U2F.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "webAuthnTitle": {
@@ -1556,7 +1562,7 @@
     "message": "Samodzielnie hostowane środowisko"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Określ bazowy adres URL swojej instalacji Bitwarden. Przykład: https://bitwarden.company.com"
+    "message": "Określ podstawowy adres URL instalacji Bitwarden. Przykład: https://bitwarden.mojafirma.pl"
   },
   "selfHostedCustomEnvHeader": {
     "message": "Dla zaawansowanych konfiguracji możesz określić podstawowy adres URL niezależnie dla każdej usługi."
@@ -1571,7 +1577,7 @@
     "message": "Adres URL serwera"
   },
   "selfHostBaseUrl": {
-    "message": "URL samodzielnie hostowanego serwera",
+    "message": "Adres URL hostowanego serwera",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "apiUrl": {
@@ -1593,7 +1599,7 @@
     "message": "Adresy URL środowiska zostały zapisane"
   },
   "showAutoFillMenuOnFormFields": {
-    "message": "Pokaż menu autouzupełniania na polach formularza",
+    "message": "Pokaż menu autouzupełniania w polach formularza",
     "description": "Represents the message for allowing the user to enable the autofill overlay"
   },
   "autofillSuggestionsSectionTitle": {
@@ -1615,19 +1621,19 @@
     }
   },
   "turnOffAutofill": {
-    "message": "Wyłącz autouzupełnienie"
+    "message": "Wyłącz autouzupełnianie"
   },
   "showInlineMenuLabel": {
     "message": "Pokaż sugestie autouzupełniania na polach formularza"
   },
   "showInlineMenuIdentitiesLabel": {
-    "message": "Pokazuj tożsamości jako sugestie"
+    "message": "Pokaż tożsamości w sugestiach"
   },
   "showInlineMenuCardsLabel": {
-    "message": "Pokazuj karty jako sugestie"
+    "message": "Pokaż karty w sugestiach"
   },
   "showInlineMenuOnIconSelectionLabel": {
-    "message": "Wyświetlaj sugestie, kiedy ikona jest zaznaczona"
+    "message": "Pokaż sugestie po kliknięciu ikony"
   },
   "showInlineMenuOnFormFieldsDescAlt": {
     "message": "Dotyczy wszystkich zalogowanych kont."
@@ -1651,16 +1657,16 @@
     "description": "Overlay appearance select option for showing the field on click of the overlay icon"
   },
   "enableAutoFillOnPageLoadSectionTitle": {
-    "message": "Włącz autouzupełnianie po załadowaniu strony"
+    "message": "Autouzupełnianie po załadowaniu strony"
   },
   "enableAutoFillOnPageLoad": {
-    "message": "Włącz autouzupełnianie po załadowaniu strony"
+    "message": "Uzupełniaj po załadowaniu strony"
   },
   "enableAutoFillOnPageLoadDesc": {
-    "message": "Jeśli zostanie wykryty formularz logowania, automatycznie uzupełnij dane logowania po załadowaniu strony."
+    "message": "Dane logowania zostaną uzupełnione po wykryciu formularza logowania na stronie."
   },
   "experimentalFeature": {
-    "message": "Zaatakowane lub niezaufane witryny internetowe mogą wykorzystać funkcję autouzupełniania podczas wczytywania strony, aby wyrządzić szkody."
+    "message": "Zaatakowane strony internetowe mogą wykorzystywać autouzupełnianie do przejęcia danych logowania."
   },
   "learnMoreAboutAutofillOnPageLoadLinkText": {
     "message": "Dowiedz się więcej o ryzyku"
@@ -1681,10 +1687,10 @@
     "message": "Użyj domyślnego ustawienia"
   },
   "autoFillOnPageLoadYes": {
-    "message": "Automatycznie uzupełniaj po załadowaniu strony"
+    "message": "Uzupełniaj po załadowaniu strony"
   },
   "autoFillOnPageLoadNo": {
-    "message": "Nie uzupełniaj automatycznie po załadowaniu strony"
+    "message": "Nie uzupełniaj po załadowaniu strony"
   },
   "commandOpenPopup": {
     "message": "Otwórz sejf w oknie"
@@ -1696,13 +1702,13 @@
     "message": "Autouzupełnianie korzysta z ostatnio używanych danych logowania na tej stronie"
   },
   "commandAutofillCardDesc": {
-    "message": "Autouzupełnianie korzysta z ostatnio używanych danych karty na tej stronie"
+    "message": "Autouzupełnianie korzysta z ostatnio używanej karty na tej stronie"
   },
   "commandAutofillIdentityDesc": {
     "message": "Autouzupełnianie korzysta z ostatnio używanej tożsamości na tej stronie"
   },
   "commandGeneratePasswordDesc": {
-    "message": "Wygeneruj nowe losowe hasło i skopiuj je do schowka."
+    "message": "Wygeneruj nowe hasło i skopiuj je do schowka"
   },
   "commandLockVaultDesc": {
     "message": "Zablokuj sejf"
@@ -1729,7 +1735,7 @@
     "message": "Tekst"
   },
   "cfTypeHidden": {
-    "message": "Pole maskowane"
+    "message": "Ukryty tekst"
   },
   "cfTypeBoolean": {
     "message": "Wartość logiczna"
@@ -1749,16 +1755,16 @@
     "message": "Kliknięcie poza okno, w celu sprawdzenia wiadomość z kodem weryfikacyjnym spowoduje, że zostanie ono zamknięte. Czy chcesz otworzyć nowe okno tak, aby się nie zamknęło?"
   },
   "popupU2fCloseMessage": {
-    "message": "Ta przeglądarka nie może przetworzyć żądania U2F w tym oknie. Czy chcesz otworzyć nowe okno przeglądarki, aby zalogować się przy pomocy klucza U2F?"
+    "message": "Ta przeglądarka nie może przetworzyć żądania U2F w wyskakującym oknie. Czy chcesz otworzyć nowe okno przeglądarki, aby zalogować się przy pomocy klucza U2F?"
   },
   "enableFavicon": {
-    "message": "Pokaż ikony witryn"
+    "message": "Pokaż ikony stron internetowych"
   },
   "faviconDesc": {
     "message": "Pokaż rozpoznawalny obraz obok danych logowania."
   },
   "faviconDescAlt": {
-    "message": "Pokaż rozpoznawalny obraz obok każdego logowania. Dotyczy wszystkich zalogowanych kont."
+    "message": "Pokaż rozpoznawalny obraz obok danych logowania. Dotyczy wszystkich zalogowanych kont."
   },
   "enableBadgeCounter": {
     "message": "Pokaż licznik na ikonie"
@@ -1833,7 +1839,7 @@
     "message": "Pan"
   },
   "mrs": {
-    "message": "Mrs"
+    "message": "Pani (Mrs)"
   },
   "ms": {
     "message": "Pani"
@@ -1857,7 +1863,7 @@
     "message": "Imię i nazwisko"
   },
   "identityName": {
-    "message": "Nazwa profilu"
+    "message": "Nowa tożsamość"
   },
   "company": {
     "message": "Firma"
@@ -1875,7 +1881,7 @@
     "message": "Adres e-mail"
   },
   "phone": {
-    "message": "Telefon"
+    "message": "Numer telefonu"
   },
   "address": {
     "message": "Adres"
@@ -1911,7 +1917,7 @@
     "message": "Dane logowania"
   },
   "typeSecureNote": {
-    "message": "Bezpieczna notatka"
+    "message": "Notatka"
   },
   "typeCard": {
     "message": "Karta"
@@ -1922,8 +1928,11 @@
   "typeSshKey": {
     "message": "Klucz SSH"
   },
+  "typeNote": {
+    "message": "Notatka"
+  },
   "newItemHeader": {
-    "message": "Nowy $TYPE$",
+    "message": "$TYPE$",
     "placeholders": {
       "type": {
         "content": "$1",
@@ -1932,7 +1941,7 @@
     }
   },
   "editItemHeader": {
-    "message": "Edytuj $TYPE$",
+    "message": "$TYPE$",
     "placeholders": {
       "type": {
         "content": "$1",
@@ -1941,7 +1950,7 @@
     }
   },
   "viewItemHeader": {
-    "message": "Zobacz $TYPE$",
+    "message": "Pokaż $TYPE$",
     "placeholders": {
       "type": {
         "content": "$1",
@@ -1962,7 +1971,7 @@
     "message": "Jeśli zatwierdzisz, wszystkie wygenerowane hasła zostaną usunięte z historii generatora. Czy chcesz kontynuować mimo to?"
   },
   "back": {
-    "message": "Powrót"
+    "message": "Wstecz"
   },
   "collections": {
     "message": "Kolekcje"
@@ -1980,7 +1989,7 @@
     "message": "Ulubione"
   },
   "popOutNewWindow": {
-    "message": "Wyświetl w nowym oknie"
+    "message": "Otwórz w nowym oknie"
   },
   "refresh": {
     "message": "Odśwież"
@@ -1995,7 +2004,7 @@
     "message": "Dane logowania"
   },
   "secureNotes": {
-    "message": "Bezpieczne notatki"
+    "message": "Notatki"
   },
   "sshKeys": {
     "message": "Klucze SSH"
@@ -2008,7 +2017,7 @@
     "message": "Sprawdź, czy hasło zostało ujawnione."
   },
   "passwordExposed": {
-    "message": "To hasło znajduje się w $VALUE$ wykradzionej(ych) bazie(ach) danych. Należy je zmienić.",
+    "message": "Hasło zostało ujawnione $VALUE$ raz(y) w wyciekach danych. Zmień je.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -2017,14 +2026,14 @@
     }
   },
   "passwordSafe": {
-    "message": "To hasło nie znajduje się w żadnej znanej wykradzionej bazie danych. Powinno być bezpieczne."
+    "message": "Hasło nie znajduje się w żadnym znanym wycieku danych. Powinno być bezpieczne."
   },
   "baseDomain": {
     "message": "Domena podstawowa",
     "description": "Domain name. Ex. website.com"
   },
   "baseDomainOptionRecommended": {
-    "message": "Domena podstawowa (rekomendowana)",
+    "message": "Domena podstawowa (domyślne)",
     "description": "Domain name. Ex. website.com"
   },
   "domainName": {
@@ -2075,7 +2084,7 @@
     "message": "Wszystkie elementy"
   },
   "noPasswordsInList": {
-    "message": "Brak haseł."
+    "message": "Brak haseł do wyświetlenia."
   },
   "clearHistory": {
     "message": "Wyczyść historię"
@@ -2090,7 +2099,7 @@
     "message": "Usuń"
   },
   "default": {
-    "message": "Domyślny"
+    "message": "Domyślne"
   },
   "dateUpdated": {
     "message": "Zaktualizowano",
@@ -2105,7 +2114,7 @@
     "description": "ex. Date this password was updated"
   },
   "neverLockWarning": {
-    "message": "Czy na pewno chcesz użyć opcji \"Nigdy\"? Ustawienie opcji blokady na \"Nigdy\" przechowuje klucz szyfrowania Twojego sejfu na urządzeniu. Jeśli używasz tej opcji upewnij się, że odpowiednio zabezpieczasz swoje urządzenie."
+    "message": "Czy na pewno chcesz użyć opcji „Nigdy”? Ustawienie blokady na „Nigdy” spowoduje przechowywanie klucza szyfrowania sejfu na urządzeniu. Upewnij się, że urządzenie jest odpowiednio chronione."
   },
   "noOrganizationsList": {
     "message": "Nie należysz do żadnej organizacji. Organizacje pozwalają na bezpieczne udostępnianie elementów innym użytkownikom."
@@ -2117,7 +2126,7 @@
     "message": "Właściciel"
   },
   "whoOwnsThisItem": {
-    "message": "Kto jest właścicielem tego elementu?"
+    "message": "Kto jest właścicielem elementu?"
   },
   "strong": {
     "message": "Silne",
@@ -2132,7 +2141,7 @@
     "description": "ex. A weak password. Scale: Weak -> Good -> Strong"
   },
   "weakMasterPassword": {
-    "message": "Słabe hasło główne"
+    "message": "Hasło główne jest słabe"
   },
   "weakMasterPasswordDesc": {
     "message": "Wybrane przez Ciebie hasło główne jest słabe. Powinieneś użyć silniejszego hasła (lub frazy), aby właściwie chronić swoje konto Bitwarden. Czy na pewno chcesz użyć tego hasła głównego?"
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Ustaw kod PIN do odblokowywania aplikacji Bitwarden. Ustawienia odblokowywania kodem PIN zostaną zresetowane po wylogowaniu."
   },
-  "setYourPinCode1": {
-    "message": "Twój PIN będzie używany do odblokowania Bitwardena zamiast hasła głównego. Twój kod PIN zostanie zresetowany jeśli kiedykolwiek wylogujesz się z Bitwarden."
+  "setPinCode": {
+    "message": "Możesz użyć tego kodu PIN, aby odblokować Bitwarden. Twój kod PIN zostanie zresetowany, jeśli kiedykolwiek wylogujesz się z aplikacji."
   },
   "pinRequired": {
     "message": "Kod PIN jest wymagany."
@@ -2166,10 +2175,10 @@
     "message": "Zbyt wiele nieprawidłowych prób wpisywania PIN. Wylogowywanie."
   },
   "unlockWithBiometrics": {
-    "message": "Odblokuj danymi biometrycznymi"
+    "message": "Odblokuj biometrią"
   },
   "unlockWithMasterPassword": {
-    "message": "Odblokuj za pomocą głównego hasła"
+    "message": "Odblokuj hasłem głównym"
   },
   "awaitDesktop": {
     "message": "Oczekiwanie na potwierdzenie z aplikacji desktopowej"
@@ -2196,7 +2205,7 @@
     "message": "Generator hasła"
   },
   "usernameGenerator": {
-    "message": "Generator nazw użytkownika"
+    "message": "Generator nazwy użytkownika"
   },
   "useThisEmail": {
     "message": "Użyj tego adresu e-mail"
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Użyj tego hasła"
   },
+  "useThisPassphrase": {
+    "message": "Użyj tego hasła wyrazowego"
+  },
   "useThisUsername": {
     "message": "Użyj tej nazwy użytkownika"
   },
@@ -2225,7 +2237,7 @@
     "message": "Sposób blokowania sejfu"
   },
   "vaultTimeoutAction1": {
-    "message": "Akcja po przekroczeniu limitu czasu"
+    "message": "Sposób blokady"
   },
   "lock": {
     "message": "Zablokuj",
@@ -2242,7 +2254,7 @@
     "message": "Usuń trwale element"
   },
   "permanentlyDeleteItemConfirmation": {
-    "message": "Czy na pewno chcesz usunąć trwale ten element?"
+    "message": "Czy na pewno chcesz usunąć trwale element?"
   },
   "permanentlyDeletedItem": {
     "message": "Element został trwale usunięty"
@@ -2260,25 +2272,25 @@
     "message": "Po wylogowaniu się z sejfu musisz ponownie zalogować się, aby uzyskać do niego dostęp. Czy na pewno chcesz użyć tego ustawienia?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
-    "message": "Potwierdź sposób blokowania sejfu"
+    "message": "Potwierdź sposób blokady"
   },
   "autoFillAndSave": {
-    "message": "Automatycznie uzupełnij i zapisz"
+    "message": "Uzupełnij i zapisz"
   },
   "fillAndSave": {
-    "message": "Wypełnij i zapisz"
+    "message": "Uzupełnij i zapisz"
   },
   "autoFillSuccessAndSavedUri": {
     "message": "URI został zapisany i automatycznie uzupełniony"
   },
   "autoFillSuccess": {
-    "message": "Element został automatycznie uzupełniony "
+    "message": "Element został automatycznie uzupełniony"
   },
   "insecurePageWarning": {
-    "message": "Ostrzeżenie: Jest to niezabezpieczona strona HTTP i wszelkie przekazane informacje mogą być potencjalnie widoczne i zmienione przez innych. Ten login został pierwotnie zapisany na stronie bezpiecznej (HTTPS)."
+    "message": "Ostrzeżenie: Jest to niezabezpieczona strona HTTP, to wszelkie przesłane informacje mogą być potencjalnie widoczne i zmienione przez inne osoby. Logowanie zostało pierwotnie zapisane na bezpiecznej stronie (HTTPS)."
   },
   "insecurePageWarningFillPrompt": {
-    "message": "Nadal chcesz uzupełnić ten login?"
+    "message": "Czy chcesz uzupełnić dane logowania?"
   },
   "autofillIframeWarning": {
     "message": "Formularz jest hostowany przez inną domenę niż zapisany adres URI dla tego loginu. Wybierz OK, aby i tak automatycznie wypełnić lub anuluj, aby zatrzymać."
@@ -2296,7 +2308,7 @@
     "message": "Ustaw hasło główne"
   },
   "currentMasterPass": {
-    "message": "Aktualne hasło główne"
+    "message": "Obecne hasło główne"
   },
   "newMasterPass": {
     "message": "Nowe hasło główne"
@@ -2347,7 +2359,7 @@
     "message": "Nowe hasło główne nie spełnia wymaganych zasad."
   },
   "receiveMarketingEmailsV2": {
-    "message": "Uzyskaj poradę, ogłoszenia i możliwości badawcze od Bitwarden w swojej skrzynce odbiorczej."
+    "message": "Otrzymuj porady, ogłoszenia i możliwości badawcze od Bitwarden na swoją skrzynkę odbiorczą."
   },
   "unsubscribe": {
     "message": "Anuluj subskrypcję"
@@ -2356,7 +2368,7 @@
     "message": "w każdej chwili."
   },
   "byContinuingYouAgreeToThe": {
-    "message": "Kontynuując, zgadzasz się na"
+    "message": "Kontynuując, akceptujesz"
   },
   "and": {
     "message": "i"
@@ -2374,7 +2386,7 @@
     "message": "Polityka prywatności"
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Twoje nowe hasło nie może być takie samo jak Twoje aktualne hasło."
+    "message": "Nowe hasło nie może być takie samo jak obecne."
   },
   "hintEqualsPassword": {
     "message": "Podpowiedź do hasła nie może być taka sama jak hasło."
@@ -2383,16 +2395,16 @@
     "message": "Ok"
   },
   "errorRefreshingAccessToken": {
-    "message": "Błąd podczas odświeżania tokenu"
+    "message": "Wystąpił błąd podczas odświeżania tokena"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "Nie znaleziono tokenu odświeżającego ani kluczy API. Spróbuj wylogować się i zalogować ponownie."
+    "message": "Nie znaleziono tokena odświeżania ani kluczy API. Zaloguj się ponownie."
   },
   "desktopSyncVerificationTitle": {
     "message": "Weryfikacja synchronizacji z aplikacją desktopową"
   },
   "desktopIntegrationVerificationText": {
-    "message": "Zweryfikuj aplikację desktopową z wyświetlonym identyfikatorem: "
+    "message": "Zweryfikuj aplikację desktopową z odciskiem klucza: "
   },
   "desktopIntegrationDisabledTitle": {
     "message": "Połączenie z przeglądarką jest wyłączone"
@@ -2407,7 +2419,7 @@
     "message": "Aplikacja desktopowa Bitwarden, przed odblokowaniem danymi biometrycznymi, musi zostać ponownie uruchomiona."
   },
   "errorEnableBiometricTitle": {
-    "message": "Nie można włączyć danych biometrycznych"
+    "message": "Nie można włączyć biometrii"
   },
   "errorEnableBiometricDesc": {
     "message": "Operacja została anulowana przez aplikację desktopową"
@@ -2425,37 +2437,37 @@
     "message": "Konto jest niezgodne"
   },
   "nativeMessagingWrongUserKeyTitle": {
-    "message": "Klucz biometryczny jest niepoprawny"
+    "message": "Klucz biometrii jest nieprawidłowy"
   },
   "nativeMessagingWrongUserKeyDesc": {
     "message": "Odblokowanie biometryczne się nie powiodło. Sekretny klucz biometryczny nie odblokował sejfu. Spróbuj skonfigurować biometrię ponownie."
   },
   "biometricsNotEnabledTitle": {
-    "message": "Dane biometryczne są wyłączone"
+    "message": "Biometria jest wyłączona"
   },
   "biometricsNotEnabledDesc": {
     "message": "Aby włączyć dane biometryczne w przeglądarce, musisz włączyć tę samą funkcję w ustawianiach aplikacji desktopowej."
   },
   "biometricsNotSupportedTitle": {
-    "message": "Dane biometryczne nie są obsługiwane"
+    "message": "Biometria nie jest obsługiwana"
   },
   "biometricsNotSupportedDesc": {
-    "message": "Dane biometryczne przeglądarki nie są obsługiwane na tym urządzeniu."
+    "message": "Biometria przeglądarki nie jest obsługiwana na tym urządzeniu."
   },
   "biometricsNotUnlockedTitle": {
-    "message": "Użytkownik zablokowany lub wylogowany"
+    "message": "Użytkownik jest zablokowany lub wylogowany"
   },
   "biometricsNotUnlockedDesc": {
-    "message": "Odblokuj tego użytkownika w aplikacji desktopowej i spróbuj ponownie."
+    "message": "Odblokuj użytkownika w aplikacji desktopowej i spróbuj ponownie."
   },
   "biometricsNotAvailableTitle": {
-    "message": "Odblokowanie biometryczne jest niedostępne"
+    "message": "Odblokowanie biometrią jest niedostępne"
   },
   "biometricsNotAvailableDesc": {
-    "message": "Odblokowanie biometryczne jest obecnie niedostępne. Spróbuj ponownie później."
+    "message": "Odblokowanie biometrią jest obecnie niedostępne. Spróbuj ponownie później."
   },
   "biometricsFailedTitle": {
-    "message": "Dane biometryczne są błędne"
+    "message": "Logowanie biometrią nie powiodło się"
   },
   "biometricsFailedDesc": {
     "message": "Dane biometryczne nie mogę być użyte, rozważ użycie hasła głównego lub wylogowanie. Jeśli się to powtarza, skontaktuj się z pomocą techniczną Bitwarden."
@@ -2473,7 +2485,7 @@
     "message": "Ta operacja nie może zostać wykonana na pasku bocznym. Spróbuj ponownie w nowym oknie."
   },
   "personalOwnershipSubmitError": {
-    "message": "Ze względu na zasadę przedsiębiorstwa, nie możesz zapisywać elementów w osobistym sejfie. Zmień właściciela elementu na organizację i wybierz jedną z dostępnych kolekcji."
+    "message": "Ze względu na zasadę organizacji, nie możesz zapisywać elementów w osobistym sejfie. Zmień właściciela elementu na organizację i wybierz jedną z dostępnych kolekcji."
   },
   "personalOwnershipPolicyInEffect": {
     "message": "Zasada organizacji ma wpływ na opcję własności elementów."
@@ -2481,30 +2493,36 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Polityka organizacji zablokowała importowanie elementów do Twojego sejfu."
   },
+  "restrictCardTypeImport": {
+    "message": "Nie można zaimportować karty"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Polityka ustawiona przez 1 lub więcej organizacji uniemożliwia importowanie kart do sejfów."
+  },
   "domainsTitle": {
     "message": "Domeny",
     "description": "A category title describing the concept of web domains"
   },
   "blockedDomains": {
-    "message": "Zablokowane domeny"
+    "message": "Blokowane domeny"
   },
   "learnMoreAboutBlockedDomains": {
-    "message": "Dowiedz się więcej o zablokowanych domenach"
+    "message": "Dowiedz się więcej o blokowanych domenach"
   },
   "excludedDomains": {
     "message": "Wykluczone domeny"
   },
   "excludedDomainsDesc": {
-    "message": "Aplikacja Bitwarden nie będzie proponować zapisywania danych logowania dla tych domen. Musisz odświeżyć stronę, aby zastosowywać zmiany."
+    "message": "Bitwarden nie będzie proponował zapisywania danych logowania dla tych domen. Odśwież stronę, aby zastosowywać zmiany."
   },
   "excludedDomainsDescAlt": {
-    "message": "Aplikacja Bitwarden nie będzie proponować zapisywania danych logowania dla tych domen dla wszystkich zalogowanych kont. Musisz odświeżyć stronę, aby zastosowywać zmiany."
+    "message": "Bitwarden nie będzie proponował zapisywania danych logowania dla tych domen dla wszystkich zalogowanych kont. Odśwież stronę, aby zastosowywać zmiany."
   },
   "blockedDomainsDesc": {
-    "message": "Autouzupełnianie i inne powiązane funkcje nie będą oferowane dla tych stron. Aby zmiany zaczęły obowiązywać, musisz odświeżyć stronę."
+    "message": "Autouzupełnianie będzie zablokowane dla tych stron internetowych. Zmiany zaczną obowiązywać po odświeżeniu strony."
   },
   "autofillBlockedNoticeV2": {
-    "message": "Autouzupełnianie jest zablokowane dla tej witryny."
+    "message": "Autouzupełnianie będzie zablokowane dla tych stron intenretowych."
   },
   "autofillBlockedNoticeGuidance": {
     "message": "Zmień to w ustawieniach"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Zmień"
   },
+  "changePassword": {
+    "message": "Zmień hasło",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Zmień hasło - $ITEMNAME$",
     "placeholders": {
@@ -2521,11 +2543,14 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Zagrożone hasło"
+  },
   "atRiskPasswords": {
     "message": "Zagrożone hasła"
   },
   "atRiskPasswordDescSingleOrg": {
-    "message": "$ORGANIZATION$ prosi o zmianę jednego hasła, ponieważ jest ono zagrożone.",
+    "message": "Organizacja $ORGANIZATION$ prosi o zmianę 1 hasła, ponieważ jest ono zagrożone.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2534,7 +2559,7 @@
     }
   },
   "atRiskPasswordsDescSingleOrgPlural": {
-    "message": "$ORGANIZATION$ prosi o zmianę $COUNT$ haseł, ponieważ są one zagrożone.",
+    "message": "Organizacja $ORGANIZATION$ prosi o zmianę $COUNT$ haseł, ponieważ są one zagrożone.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2547,7 +2572,7 @@
     }
   },
   "atRiskPasswordsDescMultiOrgPlural": {
-    "message": "Twoje organizacje proszą o zmianę $COUNT$ haseł, ponieważ są one zagrożone.",
+    "message": "Twoja organizacja prosi o zmianę $COUNT$ haseł, ponieważ są one zagrożone.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2555,8 +2580,28 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Hasło dla tej strony internetowej jest zagrożone. Organizacja $ORGANIZATION$ prosi o jego zmianę.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "Organizacja $ORGANIZATION$ prosi o zmianę hasła, ponieważ jest ono zagrożone. Przejdź do ustawień konta, aby zmienić hasło.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
-    "message": "Przejrzyj i zmień jedno zagrożone hasło"
+    "message": "Sprawdź i zmień 1 zagrożone hasło"
   },
   "reviewAndChangeAtRiskPasswordsPlural": {
     "message": "Przejrzyj i zmień $COUNT$ zagrożonych haseł  ",
@@ -2574,10 +2619,10 @@
     "message": "Zaktualizuj swoje ustawienia, aby szybko autouzupełniać hasła i generować nowe"
   },
   "reviewAtRiskLogins": {
-    "message": "Przejrzyj zagrożone loginy"
+    "message": "Sprawdź zagrożone dane logowania"
   },
   "reviewAtRiskPasswords": {
-    "message": "Przejrzyj zagrożone hasła"
+    "message": "Sprawdź zagrożone hasła"
   },
   "reviewAtRiskLoginsSlideDesc": {
     "message": "Twoje hasła organizacji są zagrożone, ponieważ są słabe, ponownie używane i/lub narażone.",
@@ -2591,10 +2636,10 @@
     "description": "Description of the generate password slide on the at-risk password page carousel"
   },
   "generatePasswordSlideImgAltPeriod": {
-    "message": "Ilustracja menu autouzupełniania Bitwardena pokazująca wygenerowane hasło."
+    "message": "Ilustracja menu autouzupełniania Bitwarden pokazująca wygenerowane hasło."
   },
   "updateInBitwarden": {
-    "message": "Aktualizacja w Bitwarden"
+    "message": "Zaktualizuj w Bitwarden"
   },
   "updateInBitwardenSlideDesc": {
     "message": "Bitwarden poprosi Cię o aktualizację hasła w menedżerze haseł.",
@@ -2604,7 +2649,7 @@
     "message": "Ilustracja powiadomienia Bitwardena, skłaniająca użytkownika do zaktualizowania danych logowania."
   },
   "turnOnAutofill": {
-    "message": "Włącz autouzupełnienie"
+    "message": "Włącz autouzupełnianie"
   },
   "turnedOnAutofill": {
     "message": "Włączono autouzupełnianie"
@@ -2622,7 +2667,7 @@
     }
   },
   "excludedDomainsInvalidDomain": {
-    "message": "$DOMAIN$ nie jest prawidłową nazwą domeny",
+    "message": "Domena $DOMAIN$ nie jest prawidłowa",
     "placeholders": {
       "domain": {
         "content": "$1",
@@ -2631,16 +2676,16 @@
     }
   },
   "blockedDomainsSavedSuccess": {
-    "message": "Zmiany w zablokowanych domenach zapisane"
+    "message": "Blokowane domeny zostały zapisane"
   },
   "excludedDomainsSavedSuccess": {
-    "message": "Zmiany w wykluczonych domenach zapisane"
+    "message": "Wykluczone domeny zostały zapisane"
   },
   "limitSendViews": {
-    "message": "Limit wyświetleń"
+    "message": "Maksymalna liczba wyświetleń"
   },
   "limitSendViewsHint": {
-    "message": "Nikt nie może wyświetlić Send po osiągnieciu limitu.",
+    "message": "Po osiągnięciu limitu wysyłka będzie niedostępna.",
     "description": "Displayed under the limit views field on Send"
   },
   "limitSendViewsCount": {
@@ -2654,18 +2699,18 @@
     }
   },
   "send": {
-    "message": "Wyślij",
+    "message": "Wysyłki",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDetails": {
-    "message": "Szczegóły Send",
+    "message": "Szczegóły wysyłki",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeText": {
     "message": "Tekst"
   },
   "sendTypeTextToShare": {
-    "message": "Tekst do udostępnienia"
+    "message": "Tekst wysyłki"
   },
   "sendTypeFile": {
     "message": "Plik"
@@ -2674,14 +2719,18 @@
     "message": "Wszystkie wysyłki",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Maksymalna liczba dostępów została osiągnięta",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
-    "message": "Domyślnie ukryj tekst"
+    "message": "Ukryj domyślnie tekst wysyłki"
   },
   "expired": {
     "message": "Wygasła"
   },
   "passwordProtected": {
-    "message": "Chroniona hasłem"
+    "message": "Zabezpieczone hasłem"
   },
   "copyLink": {
     "message": "Kopiuj link"
@@ -2708,7 +2757,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "disabled": {
-    "message": "Wyłączona"
+    "message": "Wyłączone"
   },
   "removePasswordConfirmation": {
     "message": "Czy na pewno chcesz usunąć hasło?"
@@ -2718,11 +2767,11 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendConfirmation": {
-    "message": "Czy na pewno chcesz usunąć tę wysyłkę?",
+    "message": "Czy na pewno chcesz usunąć wysyłkę?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
-    "message": "Czy na pewno chcesz trwale usunąć to Send?",
+    "message": "Czy na pewno chcesz usunąć trwale wysyłkę?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
@@ -2733,7 +2782,7 @@
     "message": "Data usunięcia"
   },
   "deletionDateDescV2": {
-    "message": "Send zostanie trwale usunięte w tej dacie.",
+    "message": "W tym dniu wysyłka zostanie trwale usunięta.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
@@ -2752,10 +2801,10 @@
     }
   },
   "custom": {
-    "message": "Niestandardowe"
+    "message": "Niestandardowa"
   },
   "sendPasswordDescV3": {
-    "message": "Zabezpiecz tę wiadomość hasłem, które będzie wymagane, aby uzyskać do niej dostęp.",
+    "message": "Zabezpiecz wysyłkę opcjonalnym hasłem.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
@@ -2770,7 +2819,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDisabledWarning": {
-    "message": "Ze względu na zasadę przedsiębiorstwa, tylko Ty możesz usunąć obecną wysyłkę.",
+    "message": "Ze względu na zasadę organizacji, tylko Ty możesz usunąć obecną wysyłkę.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
@@ -2778,15 +2827,15 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSendSuccessfully": {
-    "message": "Send został stworzony!",
+    "message": "Wysyłka została utworzona!",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInHoursSingle": {
-    "message": "Wiadomość będzie dostępna dla każdego z dostępem do tego linku przez następną godzinę.",
+    "message": "Wysyłka będzie dostępna przez 1 godz.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInHours": {
-    "message": "Wiadomość będzie dostępna dla każdego z dostępem do tego linku przez następne $HOURS$ godzin.",
+    "message": "Wysyłka będzie dostępna przez $HOURS$ godz.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
     "placeholders": {
       "hours": {
@@ -2796,11 +2845,11 @@
     }
   },
   "sendExpiresInDaysSingle": {
-    "message": "Wiadomość będzie dostępna dla każdego z dostępem do tego linku przez 1 dzień.",
+    "message": "Wysyłka będzie dostępna przez 1 dzień.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInDays": {
-    "message": "Wiadomość będzie dostępna dla każdego z dostępem do tego linku przez następne $DAYS$ dni.",
+    "message": "Wysyłka będzie dostępna przez $DAYS$ dni.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
     "placeholders": {
       "days": {
@@ -2810,7 +2859,7 @@
     }
   },
   "sendLinkCopied": {
-    "message": "Link Send został skopiowany",
+    "message": "Link wysyłki został skopiowany",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
@@ -2818,21 +2867,21 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendFilePopoutDialogText": {
-    "message": "Otworzyć rozszerzenie w nowym oknie?",
+    "message": "Otworzyć rozszerzenie w oknie?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendFilePopoutDialogDesc": {
-    "message": "Aby utworzyć plik Send, musisz wysunąć rozszerzenie do nowego okna.",
+    "message": "Otwórz okno rozszerzenia, aby utworzyć wysyłkę pliku.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLinuxChromiumFileWarning": {
-    "message": "Aby wybrać plik, otwórz rozszerzenie na pasku bocznym (jeśli to możliwe) lub w nowym oknie."
+    "message": "Aby wybrać plik, otwórz rozszerzenie na pasku bocznym lub w oknie."
   },
   "sendFirefoxFileWarning": {
-    "message": "Aby wybrać plik za pomocą przeglądarki Firefox, otwórz rozszerzenie w nowym oknie."
+    "message": "Aby wybrać plik, otwórz rozszerzenie na pasku bocznym lub w oknie."
   },
   "sendSafariFileWarning": {
-    "message": "Aby wybrać plik za pomocą przeglądarki Safari, otwórz rozszerzenie w nowym oknie."
+    "message": "Aby wybrać plik, otwórz rozszerzenie w oknie."
   },
   "popOut": {
     "message": "Odepnij"
@@ -2853,10 +2902,10 @@
     "message": "Data i czas usunięcia są wymagane."
   },
   "dateParsingError": {
-    "message": "Wystąpił błąd podczas zapisywania dat usunięcia i wygaśnięcia."
+    "message": "Wystąpił błąd podczas zapisywania daty usunięcia i wygaśnięcia."
   },
   "hideYourEmail": {
-    "message": "Ukryj mój adres e-mail przed oglądającymi."
+    "message": "Ukryj mój adres e-mail przed odbiorcami."
   },
   "passwordPrompt": {
     "message": "Potwierdź hasłem głównym"
@@ -2865,16 +2914,19 @@
     "message": "Potwierdź hasło główne"
   },
   "passwordConfirmationDesc": {
-    "message": "Ta operacja jest chroniona. Aby kontynuować, wpisz ponownie hasło główne."
+    "message": "Operacja jest chroniona. Aby kontynuować, wpisz ponownie hasło główne."
   },
   "emailVerificationRequired": {
     "message": "Weryfikacja adresu e-mail jest wymagana"
   },
   "emailVerifiedV2": {
-    "message": "E-mail zweryfikowany"
+    "message": "Adres e-mail został zweryfikowany"
   },
   "emailVerificationRequiredDesc": {
-    "message": "Musisz zweryfikować adres e-mail, aby korzystać z tej funkcji. Adres możesz zweryfikować w sejfie internetowym."
+    "message": "Musisz zweryfikować adres e-mail, aby skorzystać z tej funkcji. Adres możesz zweryfikować w sejfie internetowym."
+  },
+  "masterPasswordSuccessfullySet": {
+    "message": "Hasło główne zostało ustawione"
   },
   "updatedMasterPassword": {
     "message": "Hasło główne zostało zaktualizowane"
@@ -2883,10 +2935,10 @@
     "message": "Zaktualizuj hasło główne"
   },
   "updateMasterPasswordWarning": {
-    "message": "Hasło główne zostało zmienione przez administratora Twojej organizacji. Musisz je zaktualizować, aby uzyskać dostęp do sejfu. Ta czynność spowoduje wylogowanie z bieżącej sesji, przez co konieczne będzie ponowne zalogowanie się. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę."
+    "message": "Hasło główne zostało zmienione przez administratora Twojej organizacji. Aby uzyskać dostęp do sejfu, zaktualizuj hasło główne. Kontynuowanie spowoduje wylogowanie z obecnej sesji i konieczność ponownego zalogowania się. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę."
   },
   "updateWeakMasterPasswordWarning": {
-    "message": "Twoje hasło główne nie spełnia jednej lub kilku zasad organizacji. Aby uzyskać dostęp do sejfu, musisz teraz zaktualizować swoje hasło główne. Kontynuacja wyloguje Cię z bieżącej sesji, wymagając zalogowania się ponownie. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie jedną godzinę."
+    "message": "Hasło główne nie spełnia co najmniej jednej zasady organizacji. Aby uzyskać dostęp do sejfu, zaktualizuj hasło główne. Kontynuowanie spowoduje wylogowanie z obecnej sesji i konieczność ponownego zalogowania się. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę."
   },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Twoja organizacja wyłączyła szyfrowanie zaufanego urządzenia. Ustaw hasło główne, aby uzyskać dostęp do sejfu."
@@ -2895,7 +2947,7 @@
     "message": "Automatyczne rejestrowanie użytkowników"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "Ta organizacja posługuje się zasadą, która automatycznie rejestruje użytkowników do resetowania hasła. Rejestracja umożliwia administratorom organizacji zmianę Twojego hasła głównego."
+    "message": "Zasada organizacji umożliwia administratorom organizacji zmianę Twojego hasła głównego."
   },
   "selectFolder": {
     "message": "Wybierz folder..."
@@ -2913,7 +2965,7 @@
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
-    "message": "z $TOTAL$ elementów",
+    "message": "z $TOTAL$",
     "placeholders": {
       "total": {
         "content": "$1",
@@ -2922,7 +2974,7 @@
     }
   },
   "verificationRequired": {
-    "message": "Wymagana weryfikacja",
+    "message": "Weryfikacja jest wymagana",
     "description": "Default title for the user verification dialog."
   },
   "hours": {
@@ -2932,10 +2984,10 @@
     "message": "Minuty"
   },
   "vaultTimeoutPolicyAffectingOptions": {
-    "message": "Wymagania polityki przedsiębiorstwa zostały zastosowane do twoich opcji przekrocznia limitu czasu"
+    "message": "Zasady organizacji zostały zastosowane do opcji blokowania sejfu"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Zasady organizacji mają wpływ czas blokowania sejfu. Maksymalny dozwolony czas wynosi $HOURS$ godz. i $MINUTES$ min.",
+    "message": "Zasady organizacji mają wpływ na czas blokowania sejfu. Maksymalny dozwolony czas wynosi $HOURS$ godz. i $MINUTES$ min.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2948,7 +3000,7 @@
     }
   },
   "vaultTimeoutPolicyInEffect1": {
-    "message": "$HOURS$ godzin(y) i $MINUTES$ minut(y) maksymalnie.",
+    "message": "Maksymalnie $HOURS$ godz. i $MINUTES$ min.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2961,7 +3013,7 @@
     }
   },
   "vaultTimeoutPolicyMaximumError": {
-    "message": "Limit czasu przekracza ograniczenie ustawione przez Twoją organizację: $HOURS$ godzin(y) i $MINUTES$ minut(y) maksymalnie",
+    "message": "Czas blokowania sejfu przekracza zasady organizacji. Maksymalny dozwolony czas wynosi $HOURS$ godz. i $MINUTES$ min.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2991,7 +3043,7 @@
     }
   },
   "vaultTimeoutActionPolicyInEffect": {
-    "message": "Zasady organizacji ustawiły czas blokowania sejfu na $ACTION$.",
+    "message": "Zasady organizacji wymuszają sposób blokowania sejfu na $ACTION$.",
     "placeholders": {
       "action": {
         "content": "$1",
@@ -3000,7 +3052,7 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Czas blokowania sejfu przekracza limit określony przez organizację."
+    "message": "Czas blokowania aplikacji przekracza limit określony przez organizację."
   },
   "vaultExportDisabled": {
     "message": "Eksportowanie sejfu jest niedostępne"
@@ -3009,19 +3061,19 @@
     "message": "Co najmniej jedna zasada organizacji uniemożliwia wyeksportowanie osobistego sejfu."
   },
   "copyCustomFieldNameInvalidElement": {
-    "message": "Nie można zidentyfikować poprawnego elementu formularza. Spróbuj sprawdzić kod HTML."
+    "message": "Nie można zidentyfikować prawidłowego elementu formularza. Sprawdź kod HTML."
   },
   "copyCustomFieldNameNotUnique": {
     "message": "Nie znaleziono unikatowego identyfikatora."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "Hasło główne nie jest już wymagane dla członków następującej organizacji. Proszę potwierdzić poniższą domenę u administratora organizacji."
+    "message": "Hasło główne nie jest już wymagane dla członków następującej organizacji. Potwierdź poniższą domenę z administratorem organizacji."
   },
   "organizationName": {
     "message": "Nazwa organizacji"
   },
   "keyConnectorDomain": {
-    "message": "Domena Key Connector'a"
+    "message": "Domena Key Connector"
   },
   "leaveOrganization": {
     "message": "Opuść organizację"
@@ -3033,13 +3085,13 @@
     "message": "Hasło główne zostało usunięte"
   },
   "leaveOrganizationConfirmation": {
-    "message": "Czy na pewno chcesz opuścić tę organizację?"
+    "message": "Czy na pewno chcesz opuścić organizację?"
   },
   "leftOrganization": {
-    "message": "Nie należysz już do tej organizacji."
+    "message": "Opuszczono organizację."
   },
   "toggleCharacterCount": {
-    "message": "Pokaż / Ukryj licznik znaków"
+    "message": "Pokaż / ukryj licznik znaków"
   },
   "sessionTimeout": {
     "message": "Twoja sesja wygasła. Zaloguj się ponownie."
@@ -3048,7 +3100,7 @@
     "message": "Eksportowanie osobistego sejfu"
   },
   "exportingIndividualVaultDescription": {
-    "message": "Z sejfu zostaną wyeksportowane tylko elementy powiązane z $EMAIL$. Elementy z sejfu organizacji nie będą uwzględnione. Tylko informacje o elemencie zostaną wyeksportowane i nie będą zawierać powiązanych załączników.",
+    "message": "Wyeksportowane zostaną tylko osobiste elementy konta $EMAIL$. Elementy organizacji nie zostaną uwzględnione. Wyeksportowane zostaną tylko informacje o elementach sejfu i nie będą one zawierać powiązanych załączników.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3098,7 +3150,7 @@
     "message": "Wygeneruj nazwę użytkownika"
   },
   "generateEmail": {
-    "message": "Wygeneruj e-mail"
+    "message": "Wygeneruj adres e-mail"
   },
   "spinboxBoundariesHint": {
     "message": "Wartość musi być pomiędzy $MIN$ a $MAX$.",
@@ -3115,7 +3167,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " Użyj $RECOMMENDED$ znaków lub więcej, aby wygenerować silne hasło.",
+    "message": "Użyj co najmniej $RECOMMENDED$ znaków, aby utworzyć silne hasło.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3125,7 +3177,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Użyj $RECOMMENDED$ słów lub więcej, aby wygenerować silne hasło.",
+    "message": "Użyj co najmniej $RECOMMENDED$ słów, aby wygenerować silne hasło wyrazowe.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3148,13 +3200,13 @@
     "message": "Użyj skonfigurowanej skrzynki catch-all w swojej domenie."
   },
   "random": {
-    "message": "Losowa"
+    "message": "Losowe"
   },
   "randomWord": {
     "message": "Losowe słowo"
   },
   "websiteName": {
-    "message": "Nazwa strony"
+    "message": "Nazwa strony internetowej"
   },
   "service": {
     "message": "Usługa"
@@ -3163,7 +3215,7 @@
     "message": "Alias przekierowania"
   },
   "forwardedEmailDesc": {
-    "message": "Wygeneruj alias adresu e-mail z zewnętrznej usługi przekierowania."
+    "message": "Wygeneruj alias za pomocą zewnętrznej usługi."
   },
   "forwarderDomainName": {
     "message": "Domena adresu e-mail",
@@ -3202,7 +3254,7 @@
     }
   },
   "forwaderInvalidToken": {
-    "message": "Nieprawidłowy token API dla $SERVICENAME$",
+    "message": "Token API $SERVICENAME$ jest nieprawidłowy",
     "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -3212,7 +3264,7 @@
     }
   },
   "forwaderInvalidTokenWithMessage": {
-    "message": "Nieprawidłowy token API dla $SERVICENAME$, błąd: $ERRORMESSAGE$",
+    "message": "Token API $SERVICENAME$ jest nieprawidłowy: $ERRORMESSAGE$",
     "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -3226,7 +3278,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ odrzucił Twoje żądanie. Skontaktuj się z dostawcą usług w celu uzyskania pomocy.",
+    "message": "$SERVICENAME$ odrzucił żądanie. Skontaktuj się z dostawcą usługi w celu uzyskania pomocy.",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -3236,7 +3288,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ odrzucił Twoje żądanie: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ odrzucił żądanie: $ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -3250,7 +3302,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Nie można uzyskać ID maskowanego konta e-mail dla $SERVICENAME$.",
+    "message": "Nie można uzyskać identyfikatora konta e-mail $SERVICENAME$.",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -3260,7 +3312,7 @@
     }
   },
   "forwarderNoDomain": {
-    "message": "Nieprawidłowa domena $SERVICENAME$.",
+    "message": "Domena $SERVICENAME$ jest nieprawidłowa.",
     "description": "Displayed when the domain is empty or domain authorization failed at the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -3270,7 +3322,7 @@
     }
   },
   "forwarderNoUrl": {
-    "message": "Nieprawidłowy adres URL $SERVICENAME$.",
+    "message": "Adres URL $SERVICENAME$ jest nieprawidłowy.",
     "description": "Displayed when the url of the forwarding service wasn't supplied.",
     "placeholders": {
       "servicename": {
@@ -3280,7 +3332,7 @@
     }
   },
   "forwarderUnknownError": {
-    "message": "Wystąpił nieznany błąd w $SERVICENAME$.",
+    "message": "Wystąpił nieznany błąd $SERVICENAME$.",
     "description": "Displayed when the forwarding service failed due to an unknown error.",
     "placeholders": {
       "servicename": {
@@ -3313,7 +3365,7 @@
     "message": "Błąd serwera Key Connector: upewnij się, że serwer Key Connector jest dostępny i działa poprawnie."
   },
   "premiumSubcriptionRequired": {
-    "message": "Wymagana jest subskrypcja Premium"
+    "message": "Wymagana jest subskrypcja premium"
   },
   "organizationIsDisabled": {
     "message": "Organizacja została zawieszona."
@@ -3322,7 +3374,7 @@
     "message": "Nie można uzyskać dostępu do elementów w zawieszonych organizacjach. Skontaktuj się z właścicielem organizacji, aby uzyskać pomoc."
   },
   "loggingInTo": {
-    "message": "Logowanie do $DOMAIN$",
+    "message": "Logowanie na $DOMAIN$",
     "placeholders": {
       "domain": {
         "content": "$1",
@@ -3385,7 +3437,7 @@
     "message": "Powiadomienie zostało wysłane na urządzenie."
   },
   "notificationSentDevicePart1": {
-    "message": "Odblokuj Bitwarden na swoim urządzeniu lub w"
+    "message": "Odblokuj Bitwarden na urządzeniu lub w"
   },
   "notificationSentDeviceAnchor": {
     "message": "aplikacji internetowej"
@@ -3394,13 +3446,13 @@
     "message": "Upewnij się, że fraza odcisku palca zgadza się z tą poniżej, zanim zatwierdzisz."
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "Powiadomienie zostało wysłane na twoje urządzenie"
+    "message": "Powiadomienie zostało wysłane na urządzenie"
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
     "message": "Zostaniesz powiadomiony po zatwierdzeniu prośby"
   },
   "needAnotherOptionV1": {
-    "message": "Potrzebujesz innego sposobu?"
+    "message": "Potrzebujesz innej opcji?"
   },
   "loginInitiated": {
     "message": "Logowanie rozpoczęte"
@@ -3408,17 +3460,20 @@
   "logInRequestSent": {
     "message": "Żądanie wysłane"
   },
+  "masterPasswordChanged": {
+    "message": "Hasło główne zostało zapisane"
+  },
   "exposedMasterPassword": {
-    "message": "Ujawnione hasło główne"
+    "message": "Hasło główne zostało ujawnione"
   },
   "exposedMasterPasswordDesc": {
     "message": "Hasło ujawnione w wyniku naruszenia ochrony danych. Użyj unikalnego hasła, aby chronić swoje konto. Czy na pewno chcesz użyć ujawnionego hasła?"
   },
   "weakAndExposedMasterPassword": {
-    "message": "Słabe i ujawnione hasło główne"
+    "message": "Hasło główne jest słabe i ujawnione"
   },
   "weakAndBreachedMasterPasswordDesc": {
-    "message": "Słabe hasło ujawnione w wyniku naruszenia ochrony danych. Użyj silnego i unikalnego hasła, aby chronić swoje konto. Czy na pewno chcesz użyć tego hasła?"
+    "message": "Hasło jest słabe i zostało ujawnione w wycieku danych. Użyj mocnego i unikalnego hasła, aby chronić konto. Czy na pewno chcesz użyć tego hasła?"
   },
   "checkForBreaches": {
     "message": "Sprawdź znane naruszenia ochrony danych tego hasła"
@@ -3427,7 +3482,7 @@
     "message": "Ważne:"
   },
   "masterPasswordHint": {
-    "message": "Twoje hasło główne nie może zostać odzyskane, jeśli je zapomnisz!"
+    "message": "Zapomniane hasło główne nie może zostać odzyskane!"
   },
   "characterMinimum": {
     "message": "Minimum znaków: $LENGTH$",
@@ -3445,7 +3500,7 @@
     "message": "Jak autouzupełniać"
   },
   "autofillSelectInfoWithCommand": {
-    "message": "Wybierz element z tego ekranu, użyj skrótu $COMMAND$ lub zobacz inne opcje w ustawieniach.",
+    "message": "Wybierz element, użyj skrótu $COMMAND$ lub zobacz inne opcje w ustawieniach.",
     "placeholders": {
       "command": {
         "content": "$1",
@@ -3457,7 +3512,7 @@
     "message": "Wybierz element z tego ekranu lub zobacz inne opcje w ustawieniach."
   },
   "gotIt": {
-    "message": "Rozumiem"
+    "message": "Ok"
   },
   "autofillSettings": {
     "message": "Ustawienia autouzupełniania"
@@ -3472,13 +3527,13 @@
     "message": "Zarządzaj skrótami"
   },
   "autofillShortcut": {
-    "message": "Skrót klawiaturowy autouzupełniania"
+    "message": "Skrót klawiszowy autouzupełniania"
   },
   "autofillLoginShortcutNotSet": {
     "message": "Skrót autouzupełniania nie jest ustawiony. Zmień to w ustawieniach przeglądarki."
   },
   "autofillLoginShortcutText": {
-    "message": "Skrót autouzupełniania to: $COMMAND$. Zmień to w ustawieniach przeglądarki.",
+    "message": "Skrót autouzupełniania to $COMMAND$. Zmień skróty w ustawieniach przeglądarki.",
     "placeholders": {
       "command": {
         "content": "$1",
@@ -3511,7 +3566,7 @@
     "message": "Wybierz opcję zatwierdzenia poniżej"
   },
   "rememberThisDevice": {
-    "message": "Zapamiętaj to urządzenie"
+    "message": "Zapamiętaj urządzenie"
   },
   "uncheckIfPublicDevice": {
     "message": "Odznacz, jeśli używasz publicznego urządzenia"
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Poproś administratora o zatwierdzenie"
   },
+  "unableToCompleteLogin": {
+    "message": "Nie można ukończyć logowania"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Musisz zalogować się na zaufanym urządzeniu lub poprosić administratora o przypisanie hasła."
+  },
   "ssoIdentifierRequired": {
     "message": "Identyfikator organizacji jest wymagany."
   },
@@ -3538,13 +3599,13 @@
     "message": "i kontynuuj tworzenie konta."
   },
   "noEmail": {
-    "message": "Brak wiadomości e-mail?"
+    "message": "Brak wiadomości?"
   },
   "goBack": {
     "message": "Wróć"
   },
   "toEditYourEmailAddress": {
-    "message": "aby edytować swój adres e-mail."
+    "message": ", aby edytować adres e-mail."
   },
   "eu": {
     "message": "UE",
@@ -3560,7 +3621,7 @@
     "message": "Wyświetl"
   },
   "accountSuccessfullyCreated": {
-    "message": "Konto pomyślnie utworzone!"
+    "message": "Konto zostało utworzone!"
   },
   "adminApprovalRequested": {
     "message": "Poproszono administratora o zatwierdzenie"
@@ -3569,10 +3630,10 @@
     "message": "Twoja prośba została wysłana do Twojego administratora."
   },
   "troubleLoggingIn": {
-    "message": "Problem z zalogowaniem?"
+    "message": "Problem z logowaniem?"
   },
   "loginApproved": {
-    "message": "Logowanie zatwierdzone"
+    "message": "Logowanie zostało potwierdzone"
   },
   "userEmailMissing": {
     "message": "Brak adresu e-mail użytkownika"
@@ -3602,25 +3663,17 @@
     "message": "Dla zapewnienia bezpieczeństwa konta kontynuuj tylko wtedy, gdy jesteś członkiem tej organizacji, włączono odzyskiwanie konta, a odcisk palca wyświetlany poniżej pasuje do odcisku palca organizacji."
   },
   "orgTrustWarning1": {
-    "message": "Polityka korporacyjna tej organizacji umożliwia zapisanie Cię do programu odzyskiwania kont. Rejestracja umożliwi administratorom organizacji zmianę Twojego hasła. Możesz kontynuować tylko wtedy, gdy znasz tę organizację, a odcisk palca pokazany poniżej pasuje do odcisku palca tej organizacji."
+    "message": "Zasada organizacji pozwala administratorom organizacji na zmianę Twojego hasła. Kontynuuj tylko wtedy, gdy rozpoznajesz organizację, a unikalny identyfikator pasuje do organizacji."
   },
   "trustUser": {
     "message": "Zaufaj użytkownikowi"
   },
-  "sendsNoItemsTitle": {
-    "message": "Brak aktywnych wysyłek",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Użyj wysyłki, aby bezpiecznie dzielić się zaszyfrowanymi informacjami ze wszystkimi.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
-    "message": "Wysyłaj bezpiecznie poufne informacje",
+    "message": "Wysyłaj poufne informacje w bezpieczny sposób",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Udostępniaj pliki i dane bezpiecznie każdemu, na każdej platformie. Twoje dane pozostaną zaszyfrowane end-to-end przy jednoczesnym ograniczeniu narażenia.",
+    "message": "Udostępniaj pliki i teksty każdemu, na dowolnej platformie. Informacje będę szyfrowane end-to-end, zapewniając poufność.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -3633,7 +3686,7 @@
     "message": "Szukaj"
   },
   "inputMinLength": {
-    "message": "Dane wejściowe muszą zawierać co najmniej $COUNT$ znaki(-ów).",
+    "message": "Dane wejściowe muszą składać się z co najmniej $COUNT$ znaków.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3678,17 +3731,17 @@
     }
   },
   "multipleInputEmails": {
-    "message": "Co najmniej 1 e-mail jest nieprawidłowy"
+    "message": "Co najmniej 1 adres e-mail jest nieprawidłowy"
   },
   "inputTrimValidator": {
     "message": "Tekst nie może zawierać tylko spacji.",
     "description": "Notification to inform the user that a form's input can't contain only whitespace."
   },
   "inputEmail": {
-    "message": "Dane wejściowe nie są adresem e-mail."
+    "message": "To nie jest adres e-mail."
   },
   "fieldsNeedAttention": {
-    "message": "Pola powyżej wymagające Twojej uwagi: $COUNT$.",
+    "message": "Pola wymagające uwagi: $COUNT$.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3697,10 +3750,10 @@
     }
   },
   "singleFieldNeedsAttention": {
-    "message": "1 pole wymaga Twojej uwagi."
+    "message": "1 pole wymaga uwagi."
   },
   "multipleFieldsNeedAttention": {
-    "message": "Pola wymagające Twojej uwagi: $COUNT$.",
+    "message": "Pola wymagające uwagi: $COUNT$.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3718,7 +3771,7 @@
     "message": "Pobieranie opcji..."
   },
   "multiSelectNotFound": {
-    "message": "Nie znaleziono żadnych pozycji"
+    "message": "Nie znaleziono elementów"
   },
   "multiSelectClearAll": {
     "message": "Wyczyść wszystko"
@@ -3777,7 +3830,7 @@
     "description": "Text to display in overlay when the account is locked."
   },
   "unlockYourAccountToViewAutofillSuggestions": {
-    "message": "Odblokuj swoje konto, aby zobaczyć sugestie autouzupełniania",
+    "message": "Odblokuj konto, aby zobaczyć sugestie autouzupełniania",
     "description": "Text to display in overlay when the account is locked."
   },
   "unlockAccount": {
@@ -3789,7 +3842,7 @@
     "description": "Screen reader text (aria-label) for unlock account button in overlay"
   },
   "totpCodeAria": {
-    "message": "Kod weryfikacyjny jednorazowego hasła oparty na czasie",
+    "message": "Kod weryfikacyjny TOTP",
     "description": "Aria label for the totp code displayed in the inline menu for autofill"
   },
   "totpSecondsSpanAria": {
@@ -3797,7 +3850,7 @@
     "description": "Aria label for the totp seconds displayed in the inline menu for autofill"
   },
   "fillCredentialsFor": {
-    "message": "Wypełnij dane logowania dla",
+    "message": "Uzupełnij dane logowania dla",
     "description": "Screen reader text for when overlay item is in focused"
   },
   "partialUsername": {
@@ -3841,7 +3894,7 @@
     "description": "Screen reader text (aria-label) for new identity button within inline menu"
   },
   "bitwardenOverlayMenuAvailable": {
-    "message": "Dostępne menu autouzupełniania Bitwarden. Naciśnij przycisk strzałki w dół, aby wybrać.",
+    "message": "Dostępne menu autouzupełniania Bitwarden. Kliknij strzałkę w dół, aby wybrać.",
     "description": "Screen reader text for announcing when the overlay opens on the page"
   },
   "turnOn": {
@@ -3855,7 +3908,7 @@
     "description": "Used for the header of the import dialog, the import button and within the file-password-prompt"
   },
   "importError": {
-    "message": "Błąd importu"
+    "message": "Błąd importowania"
   },
   "importErrorDesc": {
     "message": "Wystąpił problem z danymi, które chcesz zaimportować. Rozwiąż poniższe problemy w Twoim pliku i spróbuj ponownie."
@@ -3867,7 +3920,7 @@
     "message": "Opis"
   },
   "importSuccess": {
-    "message": "Importowanie danych zakończone sukcesem"
+    "message": "Dane zostały zaimportowane"
   },
   "importSuccessNumberOfItems": {
     "message": "Zaimportowano elementów: $AMOUNT$.",
@@ -3885,10 +3938,10 @@
     "message": "Weryfikacja dla tej akcji jest wymagana. Ustaw kod PIN, aby kontynuować."
   },
   "setPin": {
-    "message": "Ustaw PIN"
+    "message": "Ustaw kod PIN"
   },
   "verifyWithBiometrics": {
-    "message": "Weryfikuj za pomocą biometrii"
+    "message": "Zweryfikuj biometrią"
   },
   "awaitingConfirmation": {
     "message": "Oczekiwanie na potwierdzenie"
@@ -3903,16 +3956,16 @@
     "message": "Użyj hasła głównego"
   },
   "usePin": {
-    "message": "Użyj PINu"
+    "message": "Użyj kodu PIN"
   },
   "useBiometrics": {
     "message": "Użyj biometrii"
   },
   "enterVerificationCodeSentToEmail": {
-    "message": "Wpisz kod weryfikacyjny, który został wysłany na adres e-mail."
+    "message": "Wpisz kod weryfikacyjny wysłany na adres e-mail."
   },
   "resendCode": {
-    "message": "Wysłać kod ponownie"
+    "message": "Wyślij ponownie kod"
   },
   "total": {
     "message": "Łącznie"
@@ -3927,16 +3980,16 @@
     }
   },
   "duoHealthCheckResultsInNullAuthUrlError": {
-    "message": "Wystąpił błąd podczas połączenia z usługą Duo. Aby uzyskać pomoc, użyj innej metody dwustopniowego logowania lub skontaktuj się z Duo."
+    "message": "Wystąpił błąd podczas połączenia z usługą Duo. Użyj innej metody logowania dwustopniowego lub skontaktuj się z Duo w celu uzyskania pomocy."
   },
   "duoRequiredForAccount": {
-    "message": "Dwustopniowe logowanie Duo jest wymagane dla Twojego konta."
+    "message": "Konto wymaga logowania dwustopniowego Duo."
   },
   "popoutExtension": {
     "message": "Otwórz rozszerzenie w nowym oknie"
   },
   "launchDuo": {
-    "message": "Uruchom DUO"
+    "message": "Uruchom Duo"
   },
   "importFormatError": {
     "message": "Dane nie są poprawnie sformatowane. Sprawdź importowany plik i spróbuj ponownie."
@@ -3988,7 +4041,7 @@
     "message": "Nie wybrano pliku"
   },
   "orCopyPasteFileContents": {
-    "message": "lub skopiuj/wklej treść pliku"
+    "message": "lub wklej zawartość pliku"
   },
   "instructionsFor": {
     "message": "Instrukcja dla $NAME$",
@@ -4016,7 +4069,7 @@
     "message": "Klucz dostępu"
   },
   "accessing": {
-    "message": "Uzyskiwanie dostępu"
+    "message": "Logowanie na"
   },
   "loggedInExclamation": {
     "message": "Zalogowano!"
@@ -4025,28 +4078,28 @@
     "message": "Klucz dostępu nie zostanie skopiowany"
   },
   "passkeyNotCopiedAlert": {
-    "message": "Klucz dostępu nie zostanie skopiowany do sklonowanego elementu. Czy chcesz kontynuować klonowanie tego elementu?"
+    "message": "Klucz dostępu nie zostanie skopiowany do sklonowanego elementu. Czy chcesz kontynuować klonowanie elementu?"
   },
   "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
     "message": "Weryfikacja jest wymagana przez stronę inicjującą. Ta funkcja nie jest jeszcze zaimplementowana dla kont bez hasła głównego."
   },
   "logInWithPasskeyQuestion": {
-    "message": "Zalogować za pomocą klucza dostępu?"
+    "message": "Zalogować się kluczem dostępu?"
   },
   "passkeyAlreadyExists": {
-    "message": "Klucz dostępu już istnieje dla tej aplikacji."
+    "message": "Klucz dostępu dla tej aplikacji już istnieje."
   },
   "noPasskeysFoundForThisApplication": {
     "message": "Nie znaleziono klucza dostępu dla tej aplikacji."
   },
   "noMatchingPasskeyLogin": {
-    "message": "Nie masz pasujących danych logowania do tej witryny."
+    "message": "Brak pasujących danych logowania do tej strony."
   },
   "noMatchingLoginsForSite": {
-    "message": "Brak pasujących loginów dla tej witryny"
+    "message": "Brak pasujących danych logowania dla tej strony"
   },
   "searchSavePasskeyNewLogin": {
-    "message": "Wyszukaj albo zapisz klucz dostępu jako nowy login"
+    "message": "Wyszukaj albo zapisz klucz dostępu jako nowe dane logowania"
   },
   "confirm": {
     "message": "Potwierdź"
@@ -4070,7 +4123,7 @@
     "message": "Zastąpić klucz dostępu?"
   },
   "overwritePasskeyAlert": {
-    "message": "Ten element zawiera już klucz dostępu. Czy na pewno chcesz nadpisać bieżący klucza dostępu?"
+    "message": "Element zawiera już klucz dostępu. Czy na pewno chcesz zastąpić obecny klucz dostępu?"
   },
   "featureNotSupported": {
     "message": "Funkcja nie jest jeszcze obsługiwana"
@@ -4088,13 +4141,13 @@
     "message": "Nieprawidłowa nazwa użytkownika lub hasło"
   },
   "incorrectPassword": {
-    "message": "Błędne hasło"
+    "message": "Hasło jest nieprawidłowe"
   },
   "incorrectCode": {
-    "message": "Błędny kod"
+    "message": "Kod jest nieprawidłowy"
   },
   "incorrectPin": {
-    "message": "Niepoprawny PIN"
+    "message": "Kod PIN jest nieprawidłowy"
   },
   "multifactorAuthenticationFailed": {
     "message": "Uwierzytelnianie wieloskładnikowe nie powiodło się"
@@ -4103,7 +4156,7 @@
     "message": "Dołącz udostępnione foldery"
   },
   "lastPassEmail": {
-    "message": "E-mail LastPass"
+    "message": "Adres e-mail LastPass"
   },
   "importingYourAccount": {
     "message": "Importowanie konta..."
@@ -4127,7 +4180,7 @@
     "message": "Wymagane uwierzytelnianie LastPass"
   },
   "awaitingSSO": {
-    "message": "Oczekiwanie na uwierzytelnianie SSO"
+    "message": "Oczekiwanie na logowanie jednokrotne"
   },
   "awaitingSSODesc": {
     "message": "Kontynuuj logowanie przy użyciu danych firmowych."
@@ -4149,7 +4202,7 @@
     "message": "Kolekcja"
   },
   "lastPassYubikeyDesc": {
-    "message": "Włóż YubiKey powiązany z Twoim kontem LastPass do portu USB komputera, a następnie naciśnij jego przycisk."
+    "message": "Włóż klucz YubiKey powiązany z kontem LastPass do portu USB urządzenia, a następnie dotknij jego przycisku."
   },
   "switchAccount": {
     "message": "Przełącz konto"
@@ -4197,7 +4250,7 @@
     "message": "Zawsze dla tej witryny"
   },
   "domainAddedToExcludedDomains": {
-    "message": "$DOMAIN$ dodana do wykluczonych domen.",
+    "message": "Domena $DOMAIN$ została dodana do wykluczonych domen.",
     "placeholders": {
       "domain": {
         "content": "$1",
@@ -4209,32 +4262,52 @@
     "message": "Popularne formaty",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Wykrywanie URI polega na tym, jak Bitwarden identyfikuje sugestie autouzupełniania.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "„Wyrażenie regularne” jest zaawansowaną opcją zwiększającą ryzyko ujawnienia danych logowania.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "„Rozpoczyna się od” jest zaawansowaną opcją zwiększającą ryzyko ujawnienia danych logowania.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Dowiedz się więcej o wykrywaniu dopasowania",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Ustawienia zaawansowane",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
-    "message": "Kontynuować do ustawień przeglądarki?",
+    "message": "Przejść do ustawień przeglądarki?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
   },
   "confirmContinueToHelpCenter": {
-    "message": "Kontynuować do centrum pomocy?",
+    "message": "Przejść do centrum pomocy?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant Help Center page"
   },
   "confirmContinueToHelpCenterPasswordManagementContent": {
-    "message": "Zmień ustawienia autouzupełniania przeglądarki i zarządzania hasłami.",
+    "message": "Zmień ustawienia autouzupełniania i haseł przeglądarki.",
     "description": "Body content for dialog which asks if the user wants to proceed to the Help Center's page about browser password management settings"
   },
   "confirmContinueToHelpCenterKeyboardShortcutsContent": {
-    "message": "Możesz przeglądać i ustawiać skróty klawiaturowe rozszerzeń w ustawieniach przeglądarki.",
+    "message": "Możesz zmieniać skróty rozszerzenia w ustawieniach przeglądarki.",
     "description": "Body content for dialog which asks if the user wants to proceed to the Help Center's page about browser keyboard shortcut settings"
   },
   "confirmContinueToBrowserPasswordManagementSettingsContent": {
-    "message": "Zmień ustawienia autouzupełniania przeglądarki i zarządzania hasłami.",
+    "message": "Zmień ustawienia autouzupełniania i haseł przeglądarki.",
     "description": "Body content for dialog which asks if the user wants to proceed to the browser's password management settings page"
   },
   "confirmContinueToBrowserKeyboardShortcutSettingsContent": {
-    "message": "Możesz przeglądać i ustawiać skróty klawiaturowe rozszerzeń w ustawieniach przeglądarki.",
+    "message": "Możesz zmieniać skróty rozszerzenia w ustawieniach przeglądarki.",
     "description": "Body content for dialog which asks if the user wants to proceed to the browser's keyboard shortcut settings page"
   },
   "overrideDefaultBrowserAutofillTitle": {
-    "message": "Czy Bitwarden ma być domyślnym menadżerem haseł?",
+    "message": "Czy ustawić Bitwarden jako domyślny menadżer haseł?",
     "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior"
   },
   "overrideDefaultBrowserAutofillDescription": {
@@ -4258,7 +4331,7 @@
     "description": "Button text for the setting that allows overriding the default browser autofill settings"
   },
   "saveCipherAttemptSuccess": {
-    "message": "Pomyślnie zapisano dane logowania!",
+    "message": "Dane logowania zostały zapisane!",
     "description": "Notification message for when saving credentials has succeeded."
   },
   "passwordSaved": {
@@ -4266,7 +4339,7 @@
     "description": "Notification message for when saving credentials has succeeded."
   },
   "updateCipherAttemptSuccess": {
-    "message": "Pomyślnie zaktualizowano dane logowania!",
+    "message": "Dane logowania zostały zaktualizowane!",
     "description": "Notification message for when updating credentials has succeeded."
   },
   "passwordUpdated": {
@@ -4274,7 +4347,7 @@
     "description": "Notification message for when updating credentials has succeeded."
   },
   "saveCipherAttemptFailed": {
-    "message": "Błąd podczas zapisywania danych logowania. Sprawdź konsolę, aby uzyskać szczegóły.",
+    "message": "Wystąpił błąd podczas zapisywania danych logowania. Sprawdź konsolę, aby sprawdzić szczegóły.",
     "description": "Notification message for when saving credentials has failed."
   },
   "success": {
@@ -4293,19 +4366,19 @@
     "message": "Sugerowane elementy"
   },
   "autofillSuggestionsTip": {
-    "message": "Zapisz element logowania dla tej witryny, aby automatycznie wypełnić"
+    "message": "Zapisz dane logowania"
   },
   "yourVaultIsEmpty": {
-    "message": "Twój sejf jest pusty"
+    "message": "Sejf jest pusty"
   },
   "noItemsMatchSearch": {
-    "message": "Żaden element nie pasuje do Twojego wyszukiwania"
+    "message": "Brak pasujących elementów"
   },
   "clearFiltersOrTryAnother": {
     "message": "Wyczyść filtry lub użyj innej frazy"
   },
   "copyInfoTitle": {
-    "message": "Skopiuj informacje - $ITEMNAME$",
+    "message": "Kopiuj informacje - $ITEMNAME$",
     "description": "Title for a button that opens a menu with options to copy information from an item.",
     "placeholders": {
       "itemname": {
@@ -4315,7 +4388,7 @@
     }
   },
   "copyNoteTitle": {
-    "message": "Skopiuj notatkę - $ITEMNAME$",
+    "message": "Kopiuj notatkę - $ITEMNAME$",
     "description": "Title for a button copies a note to the clipboard.",
     "placeholders": {
       "itemname": {
@@ -4345,7 +4418,7 @@
     }
   },
   "viewItemTitle": {
-    "message": "Zobacz element - $ITEMNAME$",
+    "message": "Pokaż element - $ITEMNAME$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4355,7 +4428,7 @@
     }
   },
   "viewItemTitleWithField": {
-    "message": "Zobacz element - $ITEMNAME$ - $FIELD$",
+    "message": "Pokaż element - $ITEMNAME$ - $FIELD$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4369,7 +4442,7 @@
     }
   },
   "autofillTitle": {
-    "message": "Autouzupełnij - $ITEMNAME$",
+    "message": "Uzupełnij - $ITEMNAME$",
     "description": "Title for a button that autofills a login item.",
     "placeholders": {
       "itemname": {
@@ -4379,7 +4452,7 @@
     }
   },
   "autofillTitleWithField": {
-    "message": "Autouzupełnij - $ITEMNAME$ - $FIELD$",
+    "message": "Uzupełnij - $ITEMNAME$ - $FIELD$",
     "description": "Title for a button that autofills a login item.",
     "placeholders": {
       "itemname": {
@@ -4413,16 +4486,16 @@
     "message": "Przypisz do kolekcji"
   },
   "copyEmail": {
-    "message": "Skopiuj e-mail"
+    "message": "Kopiuj adres e-mail"
   },
   "copyPhone": {
-    "message": "Skopiuj telefon"
+    "message": "Kopiuj numer telefonu"
   },
   "copyAddress": {
-    "message": "Skopiuj adres"
+    "message": "Kopiuj adres"
   },
   "adminConsole": {
-    "message": "Konsola Administracyjna"
+    "message": "Konsola administratora"
   },
   "accountSecurity": {
     "message": "Bezpieczeństwo konta"
@@ -4440,7 +4513,7 @@
     "message": "Wystąpił błąd podczas przypisywania folderu."
   },
   "viewItemsIn": {
-    "message": "Zobacz elementy w $NAME$",
+    "message": "Pokaż elementy w $NAME$",
     "description": "Button to view the contents of a folder or collection",
     "placeholders": {
       "name": {
@@ -4460,7 +4533,7 @@
     }
   },
   "new": {
-    "message": "Nowy"
+    "message": "Nowy element"
   },
   "removeItem": {
     "message": "Usuń $NAME$",
@@ -4473,7 +4546,7 @@
     }
   },
   "itemsWithNoFolder": {
-    "message": "Elementy bez folderu"
+    "message": "Nieprzypisane"
   },
   "itemDetails": {
     "message": "Szczegóły elementu"
@@ -4501,19 +4574,19 @@
     "message": "Historia elementu"
   },
   "lastEdited": {
-    "message": "Ostatnio edytowany"
+    "message": "Zaktualizowano"
   },
   "ownerYou": {
     "message": "Właściciel: Ty"
   },
   "linked": {
-    "message": "Powiązane"
+    "message": "Powiązane pole"
   },
   "copySuccessful": {
-    "message": "Kopiowanie zakończone sukcesem"
+    "message": "Skopiowano"
   },
   "upload": {
-    "message": "Wyślij"
+    "message": "Prześlij"
   },
   "addAttachment": {
     "message": "Dodaj załącznik"
@@ -4558,7 +4631,7 @@
     "message": "Uzyskaj dostęp do sejfu bez przeglądarki, a następnie ustaw odblokowanie biometryczne, aby przyspieszyć odblokowanie zarówno w aplikacji desktopowej, jak i w rozszerzeniu przeglądarki."
   },
   "downloadFromBitwardenNow": {
-    "message": "Pobierz teraz z bitwarden.com"
+    "message": "Pobierz z bitwarden.com"
   },
   "getItOnGooglePlay": {
     "message": "Pobierz z Google Play"
@@ -4567,7 +4640,7 @@
     "message": "Pobierz z App Store"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Czy na pewno chcesz trwale usunąć ten załącznik?"
+    "message": "Czy na pewno chcesz usunąć trwale załącznik?"
   },
   "premium": {
     "message": "Premium"
@@ -4597,7 +4670,7 @@
     "message": "Dane osobowe"
   },
   "identification": {
-    "message": "Tożsamość"
+    "message": "Identyfikacja"
   },
   "contactInfo": {
     "message": "Daje kontaktowe"
@@ -4638,7 +4711,7 @@
     }
   },
   "websiteAdded": {
-    "message": "Strona dodana"
+    "message": "Strona internetowa została dodana"
   },
   "addWebsite": {
     "message": "Dodaj stronę internetową"
@@ -4647,7 +4720,7 @@
     "message": "Usuń stronę internetową"
   },
   "defaultLabel": {
-    "message": "Domyślnie ($VALUE$)",
+    "message": "Domyślne ($VALUE$)",
     "description": "A label that indicates the default value for a field with the current default value in parentheses.",
     "placeholders": {
       "value": {
@@ -4657,7 +4730,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "Pokaż wykrywanie dopasowań $WEBSITE$",
+    "message": "Pokaż wykrywanie dopasowania $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4666,7 +4739,7 @@
     }
   },
   "hideMatchDetection": {
-    "message": "Ukryj wykrywanie dopasowań $WEBSITE$",
+    "message": "Ukryj wykrywanie dopasowania $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4675,7 +4748,7 @@
     }
   },
   "autoFillOnPageLoad": {
-    "message": "Włącz autouzupełnianie po załadowaniu strony?"
+    "message": "Włączyć autouzupełnianie po załadowaniu strony?"
   },
   "cardExpiredTitle": {
     "message": "Karta wygasła"
@@ -4705,7 +4778,7 @@
     "message": "Dodaj konto"
   },
   "loading": {
-    "message": "Wczytywanie"
+    "message": "Ładowanie"
   },
   "data": {
     "message": "Dane"
@@ -4719,7 +4792,7 @@
     "description": "A section header for a list of passwords."
   },
   "logInWithPasskeyAriaLabel": {
-    "message": "Zaloguj się za pomocą klucza dostępu",
+    "message": "Logowaniem kluczem dostępu",
     "description": "ARIA label for the inline menu button that logs in with a passkey."
   },
   "assign": {
@@ -4750,7 +4823,7 @@
     "message": "Dodaj"
   },
   "fieldType": {
-    "message": "Typ pola"
+    "message": "Rodzaj pola"
   },
   "fieldLabel": {
     "message": "Etykieta pola"
@@ -4833,7 +4906,7 @@
     "message": "Wybierz kolekcje do przypisania"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 element zostanie trwale przeniesiony do wybranej organizacji. Nie będziesz już posiadać tego elementu."
+    "message": "Element zostanie przeniesiony do organizacji. Nie będziesz już właścicielem elementu."
   },
   "personalItemsTransferWarningPlural": {
     "message": "$PERSONAL_ITEMS_COUNT$ elementów zostanie trwale przeniesionych do wybranej organizacji. Nie będziesz już posiadać tych elementów.",
@@ -4845,7 +4918,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 przedmiot zostanie trwale przeniesiony do $ORG$. Nie będziesz już posiadać tego przedmiotu.",
+    "message": "Element zostanie przeniesiony do organizacji $ORG$. Nie będziesz już właścicielem elementu.",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -4867,13 +4940,13 @@
     }
   },
   "successfullyAssignedCollections": {
-    "message": "Pomyślnie przypisano kolekcje"
+    "message": "Przypisano kolekcje"
   },
   "nothingSelected": {
     "message": "Nie zaznaczyłeś żadnych elementów."
   },
   "itemsMovedToOrg": {
-    "message": "Elementy przeniesione do $ORGNAME$",
+    "message": "Elementy zostały przeniesione do organizacji $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4882,7 +4955,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Element przeniesiony do $ORGNAME$",
+    "message": "Element został przeniesiony do organizacji $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4911,13 +4984,13 @@
     "message": "Lokalizacja elementu"
   },
   "fileSend": {
-    "message": "Wysyłka pliku"
+    "message": "Plik wysyłki"
   },
   "fileSends": {
     "message": "Wysyłki plików"
   },
   "textSend": {
-    "message": "Wysyłka tekstu"
+    "message": "Tekst wysyłki"
   },
   "textSends": {
     "message": "Wysyłki tekstów"
@@ -4926,16 +4999,16 @@
     "message": "Akcje konta"
   },
   "showNumberOfAutofillSuggestions": {
-    "message": "Pokaż liczbę sugestii autouzupełniania logowania na ikonie rozszerzenia"
+    "message": "Pokaż liczbę sugestii autouzupełniania na ikonie rozszerzenia"
   },
   "showQuickCopyActions": {
-    "message": "Pokaż akcje szybkiego kopiowania w Sejfie"
+    "message": "Pokaż akcje szybkiego kopiowania w sejfie"
   },
   "systemDefault": {
     "message": "Domyślny systemu"
   },
   "enterprisePolicyRequirementsApplied": {
-    "message": "Do tego ustalenia zastosowano wymogi polityki przedsiębiorstw"
+    "message": "Zastosowano wymagania zasady organizacji"
   },
   "sshPrivateKey": {
     "message": "Klucz prywatny"
@@ -4944,28 +5017,28 @@
     "message": "Klucz publiczny"
   },
   "sshFingerprint": {
-    "message": "Odcisk palca"
+    "message": "Odcisk klucza"
   },
   "sshKeyAlgorithm": {
-    "message": "Typ klucza"
+    "message": "Rodzaj klucza"
   },
   "sshKeyAlgorithmED25519": {
     "message": "ED25519"
   },
   "sshKeyAlgorithmRSA2048": {
-    "message": "RSA 2048-bitowy"
+    "message": "RSA 2048-bit"
   },
   "sshKeyAlgorithmRSA3072": {
-    "message": "RSA 3072-bitowy"
+    "message": "RSA 3072-bit"
   },
   "sshKeyAlgorithmRSA4096": {
-    "message": "RSA 4096-bitowy"
+    "message": "RSA 4096-bit"
   },
   "retry": {
     "message": "Powtórz"
   },
   "vaultCustomTimeoutMinimum": {
-    "message": "Minimalny limit czasu niestandardowego wynosi 1 minutę."
+    "message": "Minimalny niestandardowy czas to 1 minuta."
   },
   "additionalContentAvailable": {
     "message": "Dostępna jest dodatkowa zawartość"
@@ -5001,22 +5074,22 @@
     "message": "Nie masz uprawnień do edycji tego elementu"
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Odblokowanie odciskiem palca jest niedostępne, ponieważ najpierw wymagane jest odblokowanie kodem PIN lub hasłem."
+    "message": "Odblokowanie biometrią jest niedostępne, ponieważ najpierw wymagane jest odblokowanie kodem PIN lub hasłem."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Odblokowanie biometryczne jest obecnie niedostępne."
+    "message": "Odblokowanie biometrią jest obecnie niedostępne."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "Odblokowanie biometryczne jest niedostępne z powodu nieprawidłowej konfiguracji plików systemowych."
+    "message": "Odblokowanie biometrią jest niedostępne z powodu nieprawidłowej konfiguracji plików systemowych."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "Odblokowanie biometryczne jest niedostępne z powodu nieprawidłowej konfiguracji plików systemowych."
+    "message": "Odblokowanie biometrią jest niedostępne z powodu nieprawidłowej konfiguracji plików systemowych."
   },
   "biometricsStatusHelptextDesktopDisconnected": {
-    "message": "Odblokowanie odciskiem palca jest niedostępne, ponieważ aplikacja desktopowa Bitwarden jest zamknięta."
+    "message": "Odblokowanie biometrią jest niedostępne z powodu zamkniętej aplikacji desktopowej Bitwarden."
   },
   "biometricsStatusHelptextNotEnabledInDesktop": {
-    "message": "Odblokowanie biometryczne jest niedostępne, ponieważ nie jest włączone dla $EMAIL$ w aplikacji desktopowej Bitwarden.",
+    "message": "Odblokowanie biometrią jest niedostępne, ponieważ nie zostało włączone dla konta $EMAIL$ w aplikacji desktopowej Bitwarden.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -5028,13 +5101,16 @@
     "message": "Odblokowanie biometryczne jest obecnie niedostępne z nieznanego powodu."
   },
   "unlockVault": {
-    "message": "Odblokuj swój sejf w kilka sekund"
+    "message": "Odblokuj sejf w kilka sekund"
   },
   "unlockVaultDesc": {
-    "message": "Możesz dostosować ustawienia odblokowania i limitu czasu, aby szybciej uzyskać dostęp do sejfu."
+    "message": "Możesz dostosować sposób i czas blokowania sejfu, aby uzyskać szybszy dostęp do sejfu."
   },
   "unlockPinSet": {
-    "message": "Ustaw kod PIN odblokowujący"
+    "message": "Kod PIN został ustawiony"
+  },
+  "unlockWithBiometricSet": {
+    "message": "Odblokuj biometrią"
   },
   "authenticating": {
     "message": "Uwierzytelnianie"
@@ -5072,23 +5148,23 @@
     "description": "Represents the @ key in screen reader content as a readable word"
   },
   "hashSignCharacterDescriptor": {
-    "message": "Hashtag",
+    "message": "Kratka",
     "description": "Represents the # key in screen reader content as a readable word"
   },
   "dollarSignCharacterDescriptor": {
-    "message": "Znak dolara",
+    "message": "Dolar",
     "description": "Represents the $ key in screen reader content as a readable word"
   },
   "percentSignCharacterDescriptor": {
-    "message": "Znak procenta",
+    "message": "Procent",
     "description": "Represents the % key in screen reader content as a readable word"
   },
   "caretCharacterDescriptor": {
-    "message": "Daszek",
+    "message": "Kareta",
     "description": "Represents the ^ key in screen reader content as a readable word"
   },
   "ampersandCharacterDescriptor": {
-    "message": "Ampersand",
+    "message": "Et",
     "description": "Represents the & key in screen reader content as a readable word"
   },
   "asteriskCharacterDescriptor": {
@@ -5096,15 +5172,15 @@
     "description": "Represents the * key in screen reader content as a readable word"
   },
   "parenLeftCharacterDescriptor": {
-    "message": "Prawy nawias okrągły",
+    "message": "Lewy nawias",
     "description": "Represents the ( key in screen reader content as a readable word"
   },
   "parenRightCharacterDescriptor": {
-    "message": "Prawy nawias okrągły",
+    "message": "Prawy nawias",
     "description": "Represents the ) key in screen reader content as a readable word"
   },
   "hyphenCharacterDescriptor": {
-    "message": "Znak podkreślenia",
+    "message": "Podkreślnik",
     "description": "Represents the _ key in screen reader content as a readable word"
   },
   "underscoreCharacterDescriptor": {
@@ -5116,7 +5192,7 @@
     "description": "Represents the + key in screen reader content as a readable word"
   },
   "equalsCharacterDescriptor": {
-    "message": "Znak równości",
+    "message": "Równa się",
     "description": "Represents the = key in screen reader content as a readable word"
   },
   "braceLeftCharacterDescriptor": {
@@ -5136,11 +5212,11 @@
     "description": "Represents the ] key in screen reader content as a readable word"
   },
   "pipeCharacterDescriptor": {
-    "message": "Pionowa kreska",
+    "message": "Kreska pionowa",
     "description": "Represents the | key in screen reader content as a readable word"
   },
   "backSlashCharacterDescriptor": {
-    "message": "Ukośnik wsteczny",
+    "message": "Ukośnik lewy",
     "description": "Represents the back slash key in screen reader content as a readable word"
   },
   "colonCharacterDescriptor": {
@@ -5160,11 +5236,11 @@
     "description": "Represents the ' key in screen reader content as a readable word"
   },
   "lessThanCharacterDescriptor": {
-    "message": "Mniejszy niż",
+    "message": "Mniej niż",
     "description": "Represents the < key in screen reader content as a readable word"
   },
   "greaterThanCharacterDescriptor": {
-    "message": "Większy niż",
+    "message": "Więcej niż",
     "description": "Represents the > key in screen reader content as a readable word"
   },
   "commaCharacterDescriptor": {
@@ -5208,7 +5284,7 @@
     "message": "Bardzo szerokie"
   },
   "sshKeyWrongPassword": {
-    "message": "Wprowadzone hasło jest nieprawidłowe."
+    "message": "Hasło jest nieprawidłowe."
   },
   "importSshKey": {
     "message": "Importuj"
@@ -5217,22 +5293,22 @@
     "message": "Potwierdź hasło"
   },
   "enterSshKeyPasswordDesc": {
-    "message": "Wprowadź hasło dla klucza SSH."
+    "message": "Wpisz hasło klucza SSH."
   },
   "enterSshKeyPassword": {
-    "message": "Wprowadź hasło"
+    "message": "Wpisz hasło"
   },
   "invalidSshKey": {
     "message": "Klucz SSH jest nieprawidłowy"
   },
   "sshKeyTypeUnsupported": {
-    "message": "Typ klucza SSH nie jest obsługiwany"
+    "message": "Ten klucz SSH nie jest obsługiwany"
   },
   "importSshKeyFromClipboard": {
     "message": "Importuj klucz ze schowka"
   },
   "sshKeyImported": {
-    "message": "Klucz SSH zaimportowano pomyślnie"
+    "message": "Klucz SSH został zaimportowany"
   },
   "cannotRemoveViewOnlyCollections": {
     "message": "Nie można usunąć kolekcji z uprawnieniami tylko do przeglądania: $COLLECTIONS$",
@@ -5244,13 +5320,13 @@
     }
   },
   "updateDesktopAppOrDisableFingerprintDialogTitle": {
-    "message": "Zaktualizuj aplikację na komputer"
+    "message": "Zaktualizuj aplikację desktopową"
   },
   "updateDesktopAppOrDisableFingerprintDialogMessage": {
     "message": "Aby używać odblokowywania biometrycznego, zaktualizuj aplikację na komputerze lub wyłącz odblokowywanie odciskiem palca w ustawieniach aplikacji na komputerze."
   },
   "changeAtRiskPassword": {
-    "message": "Zmień hasło zagrożone"
+    "message": "Zmień zagrożone hasło"
   },
   "settingsVaultOptions": {
     "message": "Ustawienia Sejfu"
@@ -5262,43 +5338,43 @@
     "message": "Witaj w Bitwarden"
   },
   "securityPrioritized": {
-    "message": "Bezpieczeństwo priorytetem"
+    "message": "Priorytetowe bezpieczeństwo"
   },
   "securityPrioritizedBody": {
-    "message": "Zapisz dane logowania, karty i tożsamości w bezpiecznym sejfie. Bitwarden stosuje szyfrowanie end-to-end z wiedzą zerową, aby chronić to, co jest dla Ciebie ważne."
+    "message": "Zapisz dane logowania, karty i tożsamości w bezpiecznym sejfie. Bitwarden używa szyfrowania end-to-end w celu ochrony tego, co jest dla Ciebie ważne."
   },
   "quickLogin": {
     "message": "Szybkie i łatwe logowanie"
   },
   "quickLoginBody": {
-    "message": "Skonfiguruj odblokowanie i autouzupełnianie biometryczne, aby zalogować się na swoje konta bez wpisywania pojedynczej litery."
+    "message": "Skonfiguruj odblokowywanie biometryczne i autouzupełnianie, aby logować się do swoich kont bez wpisywania nawet jednej litery."
   },
   "secureUser": {
-    "message": "Ulepsz swoje loginy"
+    "message": "Ulepsz swoje dane logowania"
   },
   "secureUserBody": {
-    "message": "Użyj generatora do tworzenia i zapisywania silnych, unikalnych haseł dla wszystkich kont."
+    "message": "Użyj generatora, aby utworzyć i zapisać silne, unikalne hasła do wszystkich swoich kont."
   },
   "secureDevices": {
     "message": "Twoje dane, kiedy i gdzie potrzebujesz"
   },
   "secureDevicesBody": {
-    "message": "Zapisuj nieograniczoną liczbę haseł na nieograniczonej liczbie urządzeń dzięki aplikacjom Bitwarden na urządzenia mobilne, przeglądarki i komputery stacjonarne."
+    "message": "Zapisuj nieograniczoną liczbę haseł dzięki aplikacjom Bitwarden, które są dostępne na urządzeniach mobilnych, w przeglądarkach i na komputerach."
   },
   "nudgeBadgeAria": {
     "message": "1 powiadomienie"
   },
   "emptyVaultNudgeTitle": {
-    "message": "Importuj istniejące hasła"
+    "message": "Importuj obecne hasła"
   },
   "emptyVaultNudgeBody": {
-    "message": "Użyj importera, aby szybko przenieść loginy do Bitwarden bez ręcznego dodawania ich."
+    "message": "Przenieś dane logowania do Bitwarden w sposób automatyczny."
   },
   "emptyVaultNudgeButton": {
     "message": "Importuj teraz"
   },
   "hasItemsVaultNudgeTitle": {
-    "message": "Witaj w Twoim Sejfie!"
+    "message": "Witaj w sejfie!"
   },
   "hasItemsVaultNudgeBodyOne": {
     "message": "Autouzupełnianie elementów dla bieżącej strony"
@@ -5307,23 +5383,23 @@
     "message": "Ulubione elementy dla szybkiego dostępu"
   },
   "hasItemsVaultNudgeBodyThree": {
-    "message": "Przeszukaj swój sejf w poszukiwaniu czegoś innego"
+    "message": "Przeszukaj sejf w poszukiwaniu czegoś innego"
   },
   "newLoginNudgeTitle": {
     "message": "Oszczędzaj czas dzięki autouzupełnianiu"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Dołącz",
+    "message": "Dodaj",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "stronę internetową, ",
+    "message": "stronę internetową",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "aby ten login pojawił się jako sugestia autouzupełniania.",
+    "message": ", aby dane logowania pojawiały się jako sugestia autouzupełniania.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
@@ -5331,25 +5407,25 @@
     "message": "Bezproblemowe zamówienia online"
   },
   "newCardNudgeBody": {
-    "message": "Z kartami łatwe autouzupełnianie formularzy płatności w sposób bezpieczny i dokładny."
+    "message": "Dzięki kartom możesz łatwo i bezpiecznie uzupełniać formularze płatności."
   },
   "newIdentityNudgeTitle": {
-    "message": "Uprość tworzenie kont"
+    "message": "Łatwe tworzenie kont"
   },
   "newIdentityNudgeBody": {
-    "message": "Z tożsamościami, szybko autouzupełnij długie formularze rejestracyjne lub kontaktowe."
+    "message": "Dzięki tożsamościom możesz szybko uzupełniać długie formularze rejestracyjne i kontaktowe."
   },
   "newNoteNudgeTitle": {
-    "message": "Zachowaj bezpieczeństwo wrażliwych danych"
+    "message": "Chroń wrażliwe dane"
   },
   "newNoteNudgeBody": {
-    "message": "Z notatkami bezpiecznie przechowuj dane szczególnie chronione, takie jak dane bankowe lub ubezpieczeniowe."
+    "message": "Dzięki notatkom możesz bezpiecznie przechowywać poufne dane, takie jak bankowe lub ubezpieczeniowe."
   },
   "newSshNudgeTitle": {
-    "message": "Przyjazny dla deweloperów dostęp SSH"
+    "message": "Dostęp SSH przyjazny dla programistów"
   },
   "newSshNudgeBodyOne": {
-    "message": "Przechowuj swoje klucze i połącz się z agentem SSH dla szybkiego, szyfrowanego uwierzytelniania.",
+    "message": "Przechowuj klucze i łącz się z agentem SSH w celu szybkiego, szyfrowanego uwierzytelniania.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
@@ -5359,23 +5435,27 @@
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Szybko twórz hasła"
+    "message": "Szybkie tworzenie haseł"
   },
   "generatorNudgeBodyOne": {
-    "message": "Łatwo twórz silne i unikalne hasła, klikając na",
+    "message": "Twórz silne i unikalne hasła, klikając przycisk",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": ", aby pomóc Ci zachować bezpieczeństwo Twoich danych logowania.",
+    "message": ", aby zapewnić bezpieczeństwo danych logowania.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Łatwo twórz silne i unikalne hasła, klikając na Wygeneruj Hasło, aby pomóc Ci zachować bezpieczeństwo Twoich danych logowania.",
+    "message": "Twórz silne i unikalne hasła, klikając przycisk Wygeneruj hasło, aby zapewnić bezpieczeństwo danych logowania.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
     "message": "Nie masz uprawnień do przeglądania tej strony. Spróbuj zalogować się na inne konto."
+  },
+  "wasmNotSupported": {
+    "message": "Zestaw WebAssembly nie jest obsługiwany w przeglądarce lub nie jest włączony. Do korzystania z aplikacji Bitwarden wymagany jest zestaw WebAssembre.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/pt_BR/messages.json b/apps/browser/src/_locales/pt_BR/messages.json
index c0b83248edf..4d0e4148782 100644
--- a/apps/browser/src/_locales/pt_BR/messages.json
+++ b/apps/browser/src/_locales/pt_BR/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Ops! Não foi possível salvar isso. Tente digitar os detalhes manualmente.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Pedir para atualizar os dados de login existentes"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Funcionalidade Indisponível"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "É necessário migrar sua chave de criptografia. Faça login através do cofre web para atualizar sua chave de criptografia."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Assinatura Premium"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Chave SSH"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "Nova $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Defina o seu código PIN para desbloquear o Bitwarden. Suas configurações de PIN serão redefinidas se alguma vez você encerrar completamente toda a sessão do aplicativo."
   },
-  "setYourPinCode1": {
-    "message": "O seu PIN será usado para desbloquear o Bitwarden em vez da sua senha mestra. O seu PIN será redefinido se terminar sessão completa do Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "O código PIN é necessário."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use esta senha"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use este nome de usuário"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "A política da organização bloqueou a importação de itens para o seu cofre."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domínios",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Alterar"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Alterar senha - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "Senhas em risco"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Revisar e alterar uma senha vulnerável"
   },
@@ -2674,6 +2719,10 @@
     "message": "Todos os Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Ocultar texto por padrão"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Você precisa verificar o seu e-mail para usar este recurso. Você pode verificar seu e-mail no cofre web."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Senha mestra atualizada"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Pedido enviado"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Senha mestra comprometida"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Solicitar aprovação do administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Identificador SSO da organização é necessário."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "Nenhum Send ativo",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use o Send para compartilhar informação criptografa com qualquer um.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Formatos comuns",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continuar nas configurações do navegador?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Autenticando"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/pt_PT/messages.json b/apps/browser/src/_locales/pt_PT/messages.json
index a144f5767d4..8f06014b6b2 100644
--- a/apps/browser/src/_locales/pt_PT/messages.json
+++ b/apps/browser/src/_locales/pt_PT/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh não! Não conseguimos guardar isto. Tente introduzir os detalhes manualmente.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "Depois de ter alterado a sua palavra-passe, é necessário iniciar sessão com a sua nova palavra-passe. As sessões ativas noutros dispositivos serão interrompidas dentro de uma hora."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Altere a sua palavra-passe mestra para concluir a recuperação da conta."
+  },
   "enableChangedPasswordNotification": {
     "message": "Pedir para atualizar credencial existente"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Funcionalidade indisponível"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "É necessária a migração da chave de encriptação. Inicie sessão através do cofre Web para atualizar a sua chave de encriptação."
+  "legacyEncryptionUnsupported": {
+    "message": "A encriptação herdada já não é suportada. Por favor, contacte o suporte para recuperar a sua conta."
   },
   "premiumMembership": {
     "message": "Subscrição Premium"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Chave SSH"
   },
+  "typeNote": {
+    "message": "Nota"
+  },
   "newItemHeader": {
     "message": "Novo(a) $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Defina o seu código PIN para desbloquear o Bitwarden. As suas definições de PIN serão redefinidas se alguma vez terminar sessão por completo da aplicação."
   },
-  "setYourPinCode1": {
-    "message": "O seu PIN será utilizado para desbloquear o Bitwarden em vez da sua palavra-passe mestra. O seu PIN será reposto se alguma vez terminar totalmente a sessão no Bitwarden."
+  "setPinCode": {
+    "message": "Pode utilizar este PIN para desbloquear o Bitwarden. O seu PIN será reposto se alguma vez terminar sessão completamente da aplicação."
   },
   "pinRequired": {
     "message": "É necessário o código PIN."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Utilizar esta palavra-passe"
   },
+  "useThisPassphrase": {
+    "message": "Utilizar esta frase de acesso"
+  },
   "useThisUsername": {
     "message": "Utilizar este nome de utilizador"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Uma política da organização bloqueou a importação de itens para o seu cofre individual."
   },
+  "restrictCardTypeImport": {
+    "message": "Não é possível importar tipos de itens de cartão"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Uma política definida por 1 ou mais organizações impede-o de importar cartões para os seus cofres."
+  },
   "domainsTitle": {
     "message": "Domínios",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Alterar"
   },
+  "changePassword": {
+    "message": "Alterar palavra-passe",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Alterar palavra-passe - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Palavra-passe em risco"
+  },
   "atRiskPasswords": {
     "message": "Palavras-passe em risco"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "A sua palavra-passe deste site está em risco. A $ORGANIZATION$ pediu-lhe que a alterasse.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "A $ORGANIZATION$ pretende que altere esta palavra-passe porque está em risco. Navegue até às definições da sua conta para alterar a palavra-passe.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Rever e alterar uma palavra-passe em risco"
   },
@@ -2674,6 +2719,10 @@
     "message": "Todos os Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Número máximo de acessos atingido",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Ocultar texto por predefinição"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Tem de verificar o seu e-mail para utilizar esta funcionalidade. Pode verificar o seu e-mail no cofre Web."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Palavra-passe mestra definida com sucesso"
+  },
   "updatedMasterPassword": {
     "message": "Palavra-passe mestra atualizada"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Pedido enviado"
   },
+  "masterPasswordChanged": {
+    "message": "Palavra-passe mestra guardada"
+  },
   "exposedMasterPassword": {
     "message": "Palavra-passe mestra exposta"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Pedir aprovação do administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Não é possível concluir o início de sessão"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Tem de iniciar sessão num dispositivo de confiança ou pedir ao seu administrador que lhe atribua uma palavra-passe."
+  },
   "ssoIdentifierRequired": {
     "message": "É necessário o identificador de SSO da organização."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Confiar no utilizador"
   },
-  "sendsNoItemsTitle": {
-    "message": "Sem Sends ativos",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Utilize o Send para partilhar de forma segura informações encriptadas com qualquer pessoa.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Envie informações sensíveis com segurança",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Formatos comuns",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "A deteção de correspondência de URI é a forma como o Bitwarden identifica sugestões de preenchimento automático.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "A \"expressão regular\" é uma opção avançada com um risco acrescido de exposição de credenciais.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Começa com\" é uma opção avançada com um risco acrescido de exposição de credenciais.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Mais informações sobre a deteção de correspondências",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Opções avançadas",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continuar para as definições do navegador?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -4833,7 +4906,7 @@
     "message": "Selecione as coleções a atribuir"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 será permanentemente transferido para a organização selecionada. Este item deixará de lhe pertencer."
+    "message": "1 item será permanentemente transferido para a organização selecionada. Este item deixará de lhe pertencer."
   },
   "personalItemsTransferWarningPlural": {
     "message": "$PERSONAL_ITEMS_COUNT$ itens serão permanentemente transferidos para a organização selecionada. Estes itens deixarão de lhe pertencer.",
@@ -4845,7 +4918,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 será permanentemente transferido para a $ORG$. Este item deixará de lhe pertencer.",
+    "message": "1 item será permanentemente transferido para a $ORG$. Este item deixará de lhe pertencer.",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Definição do PIN de desbloqueio"
   },
+  "unlockWithBiometricSet": {
+    "message": "Desbloquear com conjunto biométrico"
+  },
   "authenticating": {
     "message": "A autenticar"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "Não tem permissões para ver esta página. Tente iniciar sessão com uma conta diferente."
+  },
+  "wasmNotSupported": {
+    "message": "O WebAssembly não é suportado no seu navegador ou não está ativado. O WebAssembly é necessário para utilizar a app Bitwarden.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/ro/messages.json b/apps/browser/src/_locales/ro/messages.json
index 2aabf825399..02fc0054e73 100644
--- a/apps/browser/src/_locales/ro/messages.json
+++ b/apps/browser/src/_locales/ro/messages.json
@@ -23,16 +23,16 @@
     "message": "Creare cont"
   },
   "newToBitwarden": {
-    "message": "New to Bitwarden?"
+    "message": "Nou pe Bitwarden?"
   },
   "logInWithPasskey": {
-    "message": "Log in with passkey"
+    "message": "Autentificare cu parolă"
   },
   "useSingleSignOn": {
-    "message": "Use single sign-on"
+    "message": "Autentificare unică"
   },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "Bine ați revenit"
   },
   "setAStrongPassword": {
     "message": "Setați o parolă puternică"
@@ -84,7 +84,7 @@
     "message": "Indiciu pentru parola principală (opțional)"
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "Nivelul de siguranța al parolei $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -132,7 +132,7 @@
     "message": "Copiere parolă"
   },
   "copyPassphrase": {
-    "message": "Copy passphrase"
+    "message": "Copiază întrebarea de siguranța"
   },
   "copyNote": {
     "message": "Copiere notă"
@@ -165,13 +165,13 @@
     "message": "Copiați numărul de licență"
   },
   "copyPrivateKey": {
-    "message": "Copy private key"
+    "message": "Copiază cheia de siguranța privată"
   },
   "copyPublicKey": {
-    "message": "Copy public key"
+    "message": "Copiază cheia de siguranța publică"
   },
   "copyFingerprint": {
-    "message": "Copy fingerprint"
+    "message": "Copiați amprenta"
   },
   "copyCustomField": {
     "message": "Copiază $FIELD$",
@@ -189,11 +189,11 @@
     "message": "Copiază notițele"
   },
   "copy": {
-    "message": "Copy",
+    "message": "Copiați",
     "description": "Copy to clipboard"
   },
   "fill": {
-    "message": "Fill",
+    "message": "Completați",
     "description": "This string is used on the vault page to indicate autofilling. Horizontal space is limited in the interface here so try and keep translations as concise as possible."
   },
   "autoFill": {
@@ -209,10 +209,10 @@
     "message": "Autocompletare identitate"
   },
   "fillVerificationCode": {
-    "message": "Fill verification code"
+    "message": "Completați codul de verificare"
   },
   "fillVerificationCodeAria": {
-    "message": "Fill Verification Code",
+    "message": "Completați Codul de Verificare",
     "description": "Aria label for the heading displayed the inline menu for totp code autofill"
   },
   "generatePasswordCopied": {
@@ -407,7 +407,7 @@
     "message": "Create folders to organize your vault items"
   },
   "deleteFolderPermanently": {
-    "message": "Are you sure you want to permanently delete this folder?"
+    "message": "Ești sigur că dorești să ștergi permanent acest fișier?"
   },
   "deleteFolder": {
     "message": "Ștergere dosar"
@@ -462,19 +462,19 @@
     "message": "Generare parolă"
   },
   "generatePassphrase": {
-    "message": "Generate passphrase"
+    "message": "Creează întrebarea de siguranța"
   },
   "passwordGenerated": {
-    "message": "Password generated"
+    "message": "Parola creată"
   },
   "passphraseGenerated": {
-    "message": "Passphrase generated"
+    "message": "Întrebare de siguranța creată"
   },
   "usernameGenerated": {
-    "message": "Username generated"
+    "message": "Nume de utilizator creat"
   },
   "emailGenerated": {
-    "message": "Email generated"
+    "message": "E-mail creat"
   },
   "regeneratePassword": {
     "message": "Regenerare parolă"
@@ -490,7 +490,7 @@
     "description": "Card header for password generator include block"
   },
   "uppercaseDescription": {
-    "message": "Include uppercase characters",
+    "message": "Includeți caractere mari",
     "description": "Tooltip for the password generator uppercase character checkbox"
   },
   "uppercaseLabel": {
@@ -498,7 +498,7 @@
     "description": "Label for the password generator uppercase character checkbox"
   },
   "lowercaseDescription": {
-    "message": "Include lowercase characters",
+    "message": "Includeți caractere mici",
     "description": "Full description for the password generator lowercase character checkbox"
   },
   "lowercaseLabel": {
@@ -506,7 +506,7 @@
     "description": "Label for the password generator lowercase character checkbox"
   },
   "numbersDescription": {
-    "message": "Include numbers",
+    "message": "Includeți cifre",
     "description": "Full description for the password generator numbers checkbox"
   },
   "numbersLabel": {
@@ -514,7 +514,7 @@
     "description": "Label for the password generator numbers checkbox"
   },
   "specialCharactersDescription": {
-    "message": "Include special characters",
+    "message": "Includeți caractere speciale",
     "description": "Full description for the password generator special characters checkbox"
   },
   "numWords": {
@@ -537,7 +537,7 @@
     "message": "Minim de caractere speciale"
   },
   "avoidAmbiguous": {
-    "message": "Avoid ambiguous characters",
+    "message": "Evită caracterele ambigue",
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "generatorPolicyInEffect": {
@@ -587,7 +587,7 @@
     "message": "Note"
   },
   "privateNote": {
-    "message": "Private note"
+    "message": "Notă privată"
   },
   "note": {
     "message": "Notă"
@@ -656,7 +656,7 @@
     "message": "Browserul dvs. nu acceptă copierea în clipboard. Transcrieți datele manual."
   },
   "verifyYourIdentity": {
-    "message": "Verify your identity"
+    "message": "Verificați- vă identitatea"
   },
   "weDontRecognizeThisDevice": {
     "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
@@ -671,10 +671,10 @@
     "message": "Your vault is locked"
   },
   "yourAccountIsLocked": {
-    "message": "Your account is locked"
+    "message": "Contul dumneavoastră este blocat"
   },
   "or": {
-    "message": "or"
+    "message": "sau"
   },
   "unlock": {
     "message": "Deblocare"
@@ -851,7 +851,7 @@
     "message": "Bitwarden poate stoca și completa coduri de verificare în doi pași. Selectați pictograma camerei foto pentru a face o captură de ecran a codului QR de autentificare al acestui site, sau copiați și lipiți cheia în acest câmp."
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "Află mai multe despre autentificatori"
   },
   "copyTOTP": {
     "message": "Copiați cheia de autentificare (TOTP)"
@@ -875,7 +875,7 @@
     "message": "Enter the code sent to your email"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "Introdu codul din aplicația de autentificare"
   },
   "pressYourYubiKeyToAuthenticate": {
     "message": "Press your YubiKey to authenticate"
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Solicitați actualizarea autentificării existente"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Funcție indisponibilă"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Este necesară migrarea cheilor de criptare. Autentificați-vă prin intermediul seifului web pentru a vă actualiza cheia de criptare."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Abonament Premium"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Stabiliți codul PIN de deblocare Bitwarden. Setările codului PIN vor fi reinițializate dacă vă deconectați vreodată din aplicație."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "Codul PIN este necesar."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Toate Send-urile",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Trebuie să vă verificați e-mailul pentru a utiliza această caracteristică. Puteți verifica e-mailul în seiful web."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Parola principală actualizată"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Parolă principală compromisă"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Cereți aprobarea administratorului"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Identificatorul SSO al organizației este necesar."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/ru/messages.json b/apps/browser/src/_locales/ru/messages.json
index a23ab4172f8..2c9aa0f4d45 100644
--- a/apps/browser/src/_locales/ru/messages.json
+++ b/apps/browser/src/_locales/ru/messages.json
@@ -1173,6 +1173,12 @@
     "message": "О нет! Мы не смогли сохранить это. Попробуйте ввести данные вручную.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "После смены пароля потребуется авторизоваться с новым паролем. Активные сессии на других устройствах будут завершены в течение одного часа."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Измените мастер-пароль, чтобы завершить восстановление аккаунта."
+  },
   "enableChangedPasswordNotification": {
     "message": "Спрашивать при обновлении существующего логина"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Функция недоступна"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Требуется миграция ключа шифрования. Чтобы обновить ключ шифрования, войдите через веб-хранилище."
+  "legacyEncryptionUnsupported": {
+    "message": "Устаревшее шифрование больше не поддерживается. Для восстановления аккаунта обратитесь в службу поддержки."
   },
   "premiumMembership": {
     "message": "Премиум"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Ключ SSH"
   },
+  "typeNote": {
+    "message": "Заметка"
+  },
   "newItemHeader": {
     "message": "Новый $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Установите PIN-код для разблокировки Bitwarden. Настройки PIN-кода будут сброшены, если вы когда-либо полностью выйдете из приложения."
   },
-  "setYourPinCode1": {
-    "message": "Ваш PIN-код будет использоваться для разблокировки Bitwarden вместо мастер-пароля. PIN-код будет сброшен, если вы выйдете из Bitwarden."
+  "setPinCode": {
+    "message": "Вы можете использовать этот PIN-код для разблокировки Bitwarden. PIN-код будет сброшен, если вы когда-либо полностью выйдете из приложения."
   },
   "pinRequired": {
     "message": "Необходим PIN-код."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Использовать этот пароль"
   },
+  "useThisPassphrase": {
+    "message": "Использовать эту парольную фразу"
+  },
   "useThisUsername": {
     "message": "Использовать это имя пользователя"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Импорт элементов в ваше личное хранилище отключен политикой организации."
   },
+  "restrictCardTypeImport": {
+    "message": "Невозможно импортировать элементы карт"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Политика, установленная 1 или более организациями, не позволяет импортировать карты в ваши хранилища."
+  },
   "domainsTitle": {
     "message": "Домены",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Изменить"
   },
+  "changePassword": {
+    "message": "Изменить пароль",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Изменить пароль - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Пароль, подверженный риску"
+  },
   "atRiskPasswords": {
     "message": "Пароли, подверженные риску"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Ваш пароль для этого сайта подвержен риску. Организация $ORGANIZATION$ попросила вас изменить его.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "Организация $ORGANIZATION$ просит вас изменить этот пароль, поскольку он подвержен риску. Перейдите в настройки аккаунта для изменения пароля.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Проверить и изменить один пароль, подверженный риску"
   },
@@ -2674,6 +2719,10 @@
     "message": "Все Send’ы",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Достигнут максимум обращений",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Скрыть текст по умолчанию"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Для использования этой функции необходимо подтвердить ваш email. Вы можете это сделать в веб-хранилище."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Мастер-пароль успешно установлен"
+  },
   "updatedMasterPassword": {
     "message": "Мастер-пароль обновлен"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Запрос отправлен"
   },
+  "masterPasswordChanged": {
+    "message": "Мастер-пароль сохранен"
+  },
   "exposedMasterPassword": {
     "message": "Мастер-пароль скомпрометирован"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Запросить одобрение администратора"
   },
+  "unableToCompleteLogin": {
+    "message": "Не удалось завершить вход"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Вам необходимо авторизоваться с доверенного устройства или попросить вашего администратора назначить вам пароль."
+  },
   "ssoIdentifierRequired": {
     "message": "Требуется идентификатор SSO организации."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Доверенный пользователь"
   },
-  "sendsNoItemsTitle": {
-    "message": "Нет активных Send",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Используйте Send для безопасного обмена зашифрованной информацией с кем угодно.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Безопасная отправка конфиденциальной информации",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Основные форматы",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Обнаружение совпадения URI - это способ, с помощью которого Bitwarden идентифицирует предложения по автозаполнению.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Регулярное выражение\" - это расширенный вариант с повышенным риском раскрытия учетных данных.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Начинается с\" - это расширенный вариант с повышенным риском раскрытия учетных данных.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Подробнее об обнаружении совпадений",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Расширенные настройки",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Перейти к настройкам браузера?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Установить PIN--код разблокировки"
   },
+  "unlockWithBiometricSet": {
+    "message": "Разблокировать с помощью биометрии"
+  },
   "authenticating": {
     "message": "Аутентификация"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "У вас нет прав для просмотра этой страницы. Попробуйте авторизоваться под другим аккаунтом."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly не поддерживается вашим браузером или не включен. WebAssembly необходим для использования приложения Bitwarden.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/si/messages.json b/apps/browser/src/_locales/si/messages.json
index eafbf9c584e..aa88e12ba39 100644
--- a/apps/browser/src/_locales/si/messages.json
+++ b/apps/browser/src/_locales/si/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "විශේෂාංගය ලබාගත නොහැක"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "වාරික සාමාජිකත්වය"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "බිට්වර්ඩන් අගුළු ඇරීමට ඔබේ PIN අංකය කේතය සකසන්න. ඔබ කවදා හෝ යෙදුමෙන් සම්පූර්ණයෙන්ම පුරනය වී ඇත්නම් ඔබගේ PIN සැකසුම් නැවත සකසනු ඇත."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN කේතය අවශ්ය වේ."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "සියලු යවයි",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "මෙම අංගය භාවිතා කිරීම සඳහා ඔබේ විද්යුත් තැපෑල සත්යාපනය කළ යුතුය. වෙබ් සුරක්ෂිතාගාරයේ ඔබගේ විද්යුත් තැපෑල සත්යාපනය කළ හැකිය."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "යාවත්කාලීන කරන ලද මාස්ටර් මුරපදය"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/sk/messages.json b/apps/browser/src/_locales/sk/messages.json
index 016f4ca1f5a..356617ea25c 100644
--- a/apps/browser/src/_locales/sk/messages.json
+++ b/apps/browser/src/_locales/sk/messages.json
@@ -474,7 +474,7 @@
     "message": "Používateľské meno vygenerované"
   },
   "emailGenerated": {
-    "message": "E-mail vygenoravný"
+    "message": "E-mail vygenerovaný"
   },
   "regeneratePassword": {
     "message": "Vygenerovať nové heslo"
@@ -1173,6 +1173,12 @@
     "message": "Ale nie! Nepodarilo sa nám to uložiť. Skúste zadať údaje manuálne.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "Po zmene hesla sa musíte prihlásiť pomocou nového hesla. Aktívne relácie na iných zariadeniach budú do jednej hodiny odhlásené."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Zmeňte hlavné heslo, aby ste dokončili obnovenie účtu."
+  },
   "enableChangedPasswordNotification": {
     "message": "Požiadať o aktualizáciu existujúceho prihlasovania"
   },
@@ -1213,11 +1219,11 @@
     "message": "Sekundárnym kliknutím získate prístup k vygenerovaniu hesiel a zodpovedajúcim prihláseniam pre webovú stránku. Platí pre všetky prihlásené účty."
   },
   "defaultUriMatchDetection": {
-    "message": "Predvolené mapovanie",
+    "message": "Predvolený spôsob zisťovania zhody URI",
     "description": "Default URI match detection for autofill."
   },
   "defaultUriMatchDetectionDesc": {
-    "message": "Vyberte si predvolený spôsob mapovania, ktorý bude použitý pre prihlasovacie údaje pri využití funkcí ako je napríklad automatické vypĺňanie hesiel."
+    "message": "Vyberte predvolený spôsob zisťovania zhody, ktorý bude použitý pre prihlasovacie údaje pri využití funkcií, ako je napríklad automatické vypĺňanie hesiel."
   },
   "theme": {
     "message": "Motív"
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Funkcia nie je k dispozícii"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Vyžaduje sa migrácia šifrovacieho kľúča. Na aktualizáciu šifrovacieho kľúča sa prihláste cez webový trezor."
+  "legacyEncryptionUnsupported": {
+    "message": "Staršie šifrovanie už nie je podporované. Ak chcete obnoviť svoj účet, obráťte sa na podporu."
   },
   "premiumMembership": {
     "message": "Prémiové členstvo"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Kľúč SSH"
   },
+  "typeNote": {
+    "message": "Poznámka"
+  },
   "newItemHeader": {
     "message": "Nové $TYPE$",
     "placeholders": {
@@ -2046,11 +2055,11 @@
     "description": "A programming term, also known as 'RegEx'."
   },
   "matchDetection": {
-    "message": "Spôsob mapovania",
+    "message": "Zisťovanie zhody",
     "description": "URI match detection for autofill."
   },
   "defaultMatchDetection": {
-    "message": "Predvolené mapovanie",
+    "message": "Predvolené zisťovanie zhody",
     "description": "Default URI match detection for autofill."
   },
   "toggleOptions": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Nastaviť kód PIN na odomykanie Bitwardenu. Nastavenie PIN sa vynuluje, ak sa úplne odhlásite z aplikácie."
   },
-  "setYourPinCode1": {
-    "message": "Na odomknutie Bitwardenu sa namiesto hlavného hesla použije váš PIN. Váš PIN sa resetuje, ak sa niekedy úplne odhlásite zo Bitwardenu."
+  "setPinCode": {
+    "message": "Tento PIN môžete použiť na odomknutie Bitwardenu. PIN sa resetuje, ak sa úplne odhlásite z aplikácie."
   },
   "pinRequired": {
     "message": "Kód PIN je povinný."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Použiť toto heslo"
   },
+  "useThisPassphrase": {
+    "message": "Použiť túto prístupovú frázu"
+  },
   "useThisUsername": {
     "message": "Použiť toto používateľské meno"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Zásady organizácie zablokovali importovanie položiek do vášho osobného trezoru."
   },
+  "restrictCardTypeImport": {
+    "message": "Položky typu karta sa nedajú importovať"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Politika nastavená 1 alebo viacerými organizáciami vám bráni v importovaní kariet do vašich trezorov."
+  },
   "domainsTitle": {
     "message": "Domény",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Zmeniť"
   },
+  "changePassword": {
+    "message": "Zmeniť heslo",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Zmeniť heslo - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Rizikové heslo"
+  },
   "atRiskPasswords": {
     "message": "Rizikové heslá"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Vaše heslo pre túto stránku je rizikové. Organizácia $ORGANIZATION$ vás požiadala o jeho zmenu.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ chce, aby ste toto heslo zmenili, pretože je rizikové. Prejdite do nastavení svojho účtu a zmeňte heslo.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Skontrolujte a zmeňte jedno ohrozené heslo"
   },
@@ -2674,6 +2719,10 @@
     "message": "Všetky Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Bol dosiahnutý maximálny počet prístupov",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "V predvolenom nastavení skryť text"
   },
@@ -2859,7 +2908,7 @@
     "message": "Skryť moju e-mailovú adresu pri zobrazení."
   },
   "passwordPrompt": {
-    "message": "Znova zadajte hlavné heslo"
+    "message": "Vyzvať na zadanie hesla"
   },
   "passwordConfirmation": {
     "message": "Potvrdenie hlavného hesla"
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Na použitie tejto funkcie musíte overiť svoj e-mail. Svoj e-mail môžete overiť vo webovom trezore."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Hlavné heslo bolo úspešne nastavené"
+  },
   "updatedMasterPassword": {
     "message": "Hlavné heslo aktualizované"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Požiadavka bola odoslaná"
   },
+  "masterPasswordChanged": {
+    "message": "Hlavné heslo uložené"
+  },
   "exposedMasterPassword": {
     "message": "Odhalené hlavné heslo"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Žiadosť o schválenie správcom"
   },
+  "unableToCompleteLogin": {
+    "message": "Nepodarilo sa dokončiť prihlásenie"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Musíte sa prihlásiť na dôveryhodnom zariadení alebo požiadať správcu o priradenie hesla."
+  },
   "ssoIdentifierRequired": {
     "message": "Pole identifikátora SSO je povinné."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Dôverovať používateľovi"
   },
-  "sendsNoItemsTitle": {
-    "message": "Žiadne aktívne Sendy",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Použite Send na bezpečné zdieľanie zašifrovaných informácii s kýmkoľvek.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send, citlivé informácie bezpečne",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Bežné formáty",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Zisťovanie zhody URI je spôsob, akým Bitwarden identifikuje návrhy na automatické vypĺňanie.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regulárny výraz\" je pokročilá možnosť so zvýšeným rizikom odhalenia prihlasovacích údajov.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Začína na\" je rozšírená možnosť so zvýšeným rizikom odhalenia prihlasovacích údajov.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Viac informácií o zisťovaní zhody",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Rozšírené možnosti",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Pokračovať do nastavení prehliadača?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -4410,7 +4483,7 @@
     "message": "Nie je čo kopírovať"
   },
   "assignToCollections": {
-    "message": "Prideliť k zbierkam"
+    "message": "Priradiť ku zbierkam"
   },
   "copyEmail": {
     "message": "Skopírovať e-mail"
@@ -4657,7 +4730,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "Zobraziť spôsob mapovania $WEBSITE$",
+    "message": "Zobraziť zisťovanie zhody $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4666,7 +4739,7 @@
     }
   },
   "hideMatchDetection": {
-    "message": "Skryť spôsob mapovania $WEBSITE$",
+    "message": "Skryť spôsob zisťovania zhody $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4732,7 +4805,7 @@
     "message": "Položky si budú môcť pozrieť len členovia organizácie s prístupom k týmto zbierkam."
   },
   "bulkCollectionAssignmentWarning": {
-    "message": "Vybrali ste $TOTAL_COUNT$ položky. Nemôžete aktualizovať $READONLY_COUNT$ položky(-iek), pretože nemáte oprávnenie na úpravu.",
+    "message": "Vybrali ste položky ($TOTAL_COUNT$). Nemôžete aktualizovať $READONLY_COUNT$ položky(-iek), pretože nemáte oprávnenie na úpravu.",
     "placeholders": {
       "total_count": {
         "content": "$1",
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "PIN na odomknutie nastavený"
   },
+  "unlockWithBiometricSet": {
+    "message": "Odomknutie biometrickými údajmi nastavené"
+  },
   "authenticating": {
     "message": "Overuje sa"
   },
@@ -5372,10 +5448,14 @@
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Jednoducho vytvorte silné a jedinečné heslá kliknutím na tlačidlo Generovať heslo, aby zabezpečili prihlasovacie údaje.",
+    "message": "Jednoducho vytvorte silné a jedinečné heslá kliknutím na tlačidlo Generovať heslo, aby ste zabezpečili prihlasovacie údaje.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
     "message": "Nemáte oprávnenie na zobrazenie tejto stránky. Skúste sa prihlásiť pomocou iného účtu."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly nie je vo vašom prehliadači podporovaný alebo nie je povolený. Na používanie Bitwardenu sa vyžaduje WebAssembly.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/sl/messages.json b/apps/browser/src/_locales/sl/messages.json
index 3f84455be88..72f058254e4 100644
--- a/apps/browser/src/_locales/sl/messages.json
+++ b/apps/browser/src/_locales/sl/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Predlagaj posodobitev obstoječe prijave"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Funkcija ni na voljo."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium članstvo"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Za odklep Bitwardna si nastavite PIN-kodo. PIN-koda bo ponastavljena, če se boste popolnoma odjavili iz aplikacije."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "Potrebna je PIN-koda."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Vse pošiljke",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Za uporabo te funkcionalnosti morate potrditi svoj e-naslov. To lahko storite v spletnem trezorju."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Posodobi glavno geslo"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/sr/messages.json b/apps/browser/src/_locales/sr/messages.json
index dae425fcfd3..4ac75bde569 100644
--- a/apps/browser/src/_locales/sr/messages.json
+++ b/apps/browser/src/_locales/sr/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Ох не! Нисмо могли да то сачувамо. Покушајте да ручно унесете детаље.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "Након промене лозинке, мораћете да се пријавите са новом лозинком. Активне сесије на другим уређајима биће одјављене у року од једног сата."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Промените главну лозинку да бисте завршили опоравак налога."
+  },
   "enableChangedPasswordNotification": {
     "message": "Питај за ажурирање постојеће пријаве"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Функција је недоступна"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Потребна је миграција кључа за шифровање. Пријавите се преко веб сефа да бисте ажурирали кључ за шифровање."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy енкрипција више није подржана. Молимо контактирајте подршку за повраћај налога."
   },
   "premiumMembership": {
     "message": "Премијум чланство"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH кључ"
   },
+  "typeNote": {
+    "message": "Белешка"
+  },
   "newItemHeader": {
     "message": "Нови $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Поставите свој ПИН код за откључавање Bitwarden-а. Поставке ПИН-а ће се ресетовати ако се икада потпуно одјавите из апликације."
   },
-  "setYourPinCode1": {
-    "message": "Ваш ПИН ће се користити за откључавање Bitwarden-а уместо ваше главне лозинке. Ваш ПИН ће се ресетовати ако се икада потпуно одјавите са Bitwarden-а."
+  "setPinCode": {
+    "message": "Можете употребити овај ПИН да би деблокирали Bitwarden. Ваш ПИН ће се ресетовати ако се икада у потпуности одјавите из апликације."
   },
   "pinRequired": {
     "message": "ПИН је обавезан."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Употреби ову лозинку"
   },
+  "useThisPassphrase": {
+    "message": "Употреби ову приступну фразу"
+  },
   "useThisUsername": {
     "message": "Употреби ово корисничко име"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Политика организације је блокирала увоз ставки у ваш појединачни сеф."
   },
+  "restrictCardTypeImport": {
+    "message": "Не могу увозити врсте картица"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Политика која је поставила 1 или више организација спречава вас да се увозе картице у сефу."
+  },
   "domainsTitle": {
     "message": "Домени",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Промени"
   },
+  "changePassword": {
+    "message": "Промени лозинку",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Промена лозинке - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Лозинка под ризиком"
+  },
   "atRiskPasswords": {
     "message": "Лозинке под ризиком"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Ваша лозинка за ову страницу је ризична. $ORGANIZATION$ је затражио да је промените.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ жели да промените ову лозинку јер је ризична. Идите до поставки вашег налога да бисте променили лозинку.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Прегледајте и промените једну лозинку за ризик"
   },
@@ -2674,6 +2719,10 @@
     "message": "Све „Send“",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Достигнут максималан број приступа",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Сакриј текст подразумевано"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Морате да потврдите е-пошту да бисте користили ову функцију. Можете да потврдите е-пошту у веб сефу."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Главна лозинка успешно постављена"
+  },
   "updatedMasterPassword": {
     "message": "Главна лозинка ажурирана"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Захтев је послат"
   },
+  "masterPasswordChanged": {
+    "message": "Главна лозинка сачувана"
+  },
   "exposedMasterPassword": {
     "message": "Изложена главна лозинка"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Затражити одобрење администратора"
   },
+  "unableToCompleteLogin": {
+    "message": "Није могуће завршити пријаву"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Потребно је да се пријавите на поузданом уређају или да замолите администратора да вам додели лозинку."
+  },
   "ssoIdentifierRequired": {
     "message": "Потребан је SSO идентификатор организације."
   },
@@ -3607,20 +3668,12 @@
   "trustUser": {
     "message": "Повери кориснику"
   },
-  "sendsNoItemsTitle": {
-    "message": "Нема активних Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Употребите Send да безбедно делите шифроване информације са било ким.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "Шаљите безбедно осетљиве информације",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "Делите датотеке и податке безбедно са било ким, на било којој платформи. Ваше информације ће остати шифроване од почетка-до-краја уз ограничење изложености.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -4209,6 +4262,26 @@
     "message": "Уобичајени формати",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Детекција подударања URI-ја је начин на који Bitwarden идентификује предлоге за ауто-попуњавање.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "„Регуларни израз“ је напредна опција са повећаним ризиком од откривања акредитива.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "„Почни са“ је напредна опција са повећаним ризиком од откривања акредитива.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Више о откривању подударања",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Напредне опције",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Желите ли да наставите на подешавања претраживача?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5028,13 +5101,16 @@
     "message": "Биометријско откључавање није доступно из непознатог разлога."
   },
   "unlockVault": {
-    "message": "Unlock your vault in seconds"
+    "message": "Откључајте сеф у секунди"
   },
   "unlockVaultDesc": {
-    "message": "You can customize your unlock and timeout settings to more quickly access your vault."
+    "message": "Можете да прилагодите своје поставке за откључавање и истек времена да бисте брзо приступили сефу."
   },
   "unlockPinSet": {
-    "message": "Unlock PIN set"
+    "message": "Постављен ПИН деблокирања"
+  },
+  "unlockWithBiometricSet": {
+    "message": "Откључај биометријом"
   },
   "authenticating": {
     "message": "Аутентификација"
@@ -5359,23 +5435,27 @@
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "Брзо креирајте лозинке"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "Лако креирајте снажне и јединствене лозинке кликом на",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "да вам помогне да задржите своје пријаве сигурно.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "Лако креирајте снажне и јединствене лозинке кликом на дугме „Генерирате лозинку“ да вам помогне да чувате своје пријаве на сигурно.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
     "message": "Немате дозволе за преглед ове странице. Покушајте да се пријавите са другим налогом."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly није подржано или није уапљено на вашем прегледачу. WebAssembly је потребно да би се користила апликација Bitwarden.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/sv/messages.json b/apps/browser/src/_locales/sv/messages.json
index f57209122ef..ff20cdd2ed9 100644
--- a/apps/browser/src/_locales/sv/messages.json
+++ b/apps/browser/src/_locales/sv/messages.json
@@ -3,7 +3,7 @@
     "message": "Bitwarden"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Bitwardens logotyp"
   },
   "extName": {
     "message": "Bitwarden Lösenordshanterare",
@@ -84,7 +84,7 @@
     "message": "Huvudlösenordsledtråd (valfri)"
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "Lösenordsstyrka $SCORE$ (score)",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -105,7 +105,7 @@
     }
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Finish joining this organization by setting a master password."
+    "message": "Avsluta anslutningen till denna organisation genom att ange ett huvudlösenord."
   },
   "tab": {
     "message": "Flik"
@@ -246,7 +246,7 @@
     "message": "Logga in i ditt valv"
   },
   "autoFillInfo": {
-    "message": "Det finns inga inloggningar tillgängliga för automatisk ifyllnad på den nuvarande fliken."
+    "message": "Det finns inga inloggningar tillgängliga för autofyll på den nuvarande fliken."
   },
   "addLogin": {
     "message": "Lägg till en inloggning"
@@ -264,7 +264,7 @@
     "message": "Begär lösenordsledtråd"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Enter your account email address and your password hint will be sent to you"
+    "message": "Ange din e-postadress för kontot så skickas en lösenordshint till dig"
   },
   "getMasterPasswordHint": {
     "message": "Hämta huvudlösenordsledtråd"
@@ -350,7 +350,7 @@
     "message": "Bitwarden Hemlighetshanterare"
   },
   "continueToSecretsManagerPageDesc": {
-    "message": "Securely store, manage, and share developer secrets with Bitwarden Secrets Manager. Learn more on the bitwarden.com website."
+    "message": "Lagra, hantera och dela utvecklarhemligheter på ett säkert sätt med Bitwarden Secrets Manager. Läs mer på webbplatsen bitwarden.com."
   },
   "passwordlessDotDev": {
     "message": "Passwordless.dev"
@@ -359,10 +359,10 @@
     "message": "Skapa smidiga och säkra inloggningsupplevelser fria från traditionella lösenord med Passwordless.dev. Läs mer på bitwarden.com hemsidan."
   },
   "freeBitwardenFamilies": {
-    "message": "Free Bitwarden Families"
+    "message": "Gratis Bitwarden Familjer"
   },
   "freeBitwardenFamiliesPageDesc": {
-    "message": "You are eligible for Free Bitwarden Families. Redeem this offer today in the web app."
+    "message": "Du är berättigad till gratis Bitwarden Families. Lös in erbjudandet idag i webbappen."
   },
   "version": {
     "message": "Version"
@@ -383,7 +383,7 @@
     "message": "Redigera mapp"
   },
   "editFolderWithName": {
-    "message": "Edit folder: $FOLDERNAME$",
+    "message": "Redigera mapp: $FOLDERNAME$",
     "placeholders": {
       "foldername": {
         "content": "$1",
@@ -398,7 +398,7 @@
     "message": "Mappnamn"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Nästla en mapp genom att lägga till namnet på den överordnade mappen följt av \"/\". Exempel: Sociala/Forums"
   },
   "noFoldersAdded": {
     "message": "Inga mappar tillagda"
@@ -407,7 +407,7 @@
     "message": "Skapa mappar för att organisera dina valvobjekt"
   },
   "deleteFolderPermanently": {
-    "message": "Are you sure you want to permanently delete this folder?"
+    "message": "Är du säker på att du vill radera den här mappen permanent?"
   },
   "deleteFolder": {
     "message": "Radera mapp"
@@ -541,7 +541,7 @@
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "generatorPolicyInEffect": {
-    "message": "Enterprise policy requirements have been applied to your generator options.",
+    "message": "Företagets policykrav har tillämpats på dina generatoralternativ.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "searchVault": {
@@ -566,7 +566,7 @@
     "message": "Lösenord"
   },
   "totp": {
-    "message": "Authenticator secret"
+    "message": "Autentiserarens hemlighet"
   },
   "passphrase": {
     "message": "Lösenfras"
@@ -575,7 +575,7 @@
     "message": "Favorit"
   },
   "unfavorite": {
-    "message": "Unfavorite"
+    "message": "Ta bort favorit"
   },
   "itemAddedToFavorites": {
     "message": "Objekt tillagt i favoriter"
@@ -635,7 +635,7 @@
     "message": "Upplåsningsalternativ"
   },
   "unlockMethodNeededToChangeTimeoutActionDesc": {
-    "message": "Set up an unlock method to change your vault timeout action."
+    "message": "Konfigurera en upplåsningsmetod för att ändra timeout-åtgärden för valvet."
   },
   "unlockMethodNeeded": {
     "message": "Ställ in en upplåsningsmetod i Inställningar"
@@ -659,7 +659,7 @@
     "message": "Verifiera din identitet"
   },
   "weDontRecognizeThisDevice": {
-    "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
+    "message": "Vi känner inte igen den här enheten. Ange koden som skickats till din e-post för att verifiera din identitet."
   },
   "continueLoggingIn": {
     "message": "Fortsätt logga in"
@@ -814,7 +814,7 @@
     "message": "Verifieringskod krävs."
   },
   "webauthnCancelOrTimeout": {
-    "message": "The authentication was cancelled or took too long. Please try again."
+    "message": "Autentiseringen avbröts eller tog för lång tid. Vänligen försök igen."
   },
   "invalidVerificationCode": {
     "message": "Ogiltig verifieringskod"
@@ -839,16 +839,16 @@
     "message": "Autentiseringsnyckel tillagd"
   },
   "totpCapture": {
-    "message": "Scan authenticator QR code from current webpage"
+    "message": "Skanna QR-koden för autentisering från aktuell webbsida"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "Gör tvåstegsverifiering sömlös"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden kan lagra och fylla i 2-stegs verifieringskoder. Kopiera och klistra in nyckeln i detta fält."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden kan lagra och fylla i 2-stegsverifieringskoder. Välj kameraikonen för att ta en skärmdump av den här webbplatsens QR-kod för autentisering, eller kopiera och klistra in nyckeln i det här fältet."
   },
   "learnMoreAboutAuthenticators": {
     "message": "Läs mer om autentiserare"
@@ -872,34 +872,34 @@
     "message": "Logga in på Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Enter the code sent to your email"
+    "message": "Ange koden som skickats till din e-post"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "Ange koden från din autentiseringsapp"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Press your YubiKey to authenticate"
+    "message": "Tryck på din YubiKey för att autentisera"
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "Tvåstegsinloggning med Duo krävs för ditt konto. Följ stegen nedan för att slutföra inloggningen."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "Följ stegen nedan för att slutföra inloggningen."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Följ stegen nedan för att slutföra inloggningen med din säkerhetsnyckel."
   },
   "restartRegistration": {
-    "message": "Restart registration"
+    "message": "Starta om registrering"
   },
   "expiredLink": {
-    "message": "Expired link"
+    "message": "Utgången länk"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "Please restart registration or try logging in."
+    "message": "Starta om registreringen eller försök logga in."
   },
   "youMayAlreadyHaveAnAccount": {
-    "message": "You may already have an account"
+    "message": "Du kanske redan har ett konto"
   },
   "logOutConfirmation": {
     "message": "Är du säker på att du vill logga ut?"
@@ -911,7 +911,7 @@
     "message": "Nej"
   },
   "location": {
-    "message": "Location"
+    "message": "Plats"
   },
   "unexpectedError": {
     "message": "Ett okänt fel har inträffat."
@@ -926,10 +926,10 @@
     "message": "Tvåstegsverifiering gör ditt konto säkrare genom att kräva att du verifierar din inloggning med en annan enhet, t.ex. en säkerhetsnyckel, autentiseringsapp, SMS, telefonsamtal eller e-post. Tvåstegsverifiering kan aktiveras i Bitwardens webbvalv. Vill du besöka webbplatsen nu?"
   },
   "twoStepLoginConfirmationContent": {
-    "message": "Make your account more secure by setting up two-step login in the Bitwarden web app."
+    "message": "Gör ditt konto säkrare genom att konfigurera tvåstegsverifiering i Bitwardens webbapp."
   },
   "twoStepLoginConfirmationTitle": {
-    "message": "Continue to web app?"
+    "message": "Fortsätt till webbapp?"
   },
   "editedFolder": {
     "message": "Mapp sparad"
@@ -1016,37 +1016,37 @@
     "message": "Be om att lägga till inloggning"
   },
   "vaultSaveOptionsTitle": {
-    "message": "Save to vault options"
+    "message": "Alternativ för att spara i valvet"
   },
   "addLoginNotificationDesc": {
     "message": "Be om att lägga till ett objekt om det inte finns i ditt valv."
   },
   "addLoginNotificationDescAlt": {
-    "message": "Ask to add an item if one isn't found in your vault. Applies to all logged in accounts."
+    "message": "Be att få lägga till ett objekt om det inte finns i ditt valv. Gäller för alla inloggade konton."
   },
   "showCardsInVaultViewV2": {
-    "message": "Always show cards as Autofill suggestions on Vault view"
+    "message": "Visa alltid kort som Autofyll-förslag i Vault-vyn"
   },
   "showCardsCurrentTab": {
     "message": "Visa kort på fliksida"
   },
   "showCardsCurrentTabDesc": {
-    "message": "Lista kortobjekt på fliksidan för enkel automatisk fyllning."
+    "message": "Lista kortobjekt på fliksidan för enkel autofyll."
   },
   "showIdentitiesInVaultViewV2": {
-    "message": "Always show identities as Autofill suggestions on Vault view"
+    "message": "Visa alltid identiteter som Autofyll-förslag i Vault-vyn"
   },
   "showIdentitiesCurrentTab": {
     "message": "Visa identiteter på fliksidan"
   },
   "showIdentitiesCurrentTabDesc": {
-    "message": "Lista identitetsobjekt på fliksidan för enkel automatisk fyllning."
+    "message": "Lista identitetsobjekt på fliksidan för enkel autofyll."
   },
   "clickToAutofillOnVault": {
-    "message": "Click items to autofill on Vault view"
+    "message": "Klicka på objekt som ska fyllas i automatiskt i Vault-vyn"
   },
   "clickToAutofill": {
-    "message": "Click items in autofill suggestion to fill"
+    "message": "Klicka på objekt i autofyllförslaget för att fylla i"
   },
   "clearClipboard": {
     "message": "Rensa urklipp",
@@ -1063,7 +1063,7 @@
     "message": "Spara"
   },
   "notificationViewAria": {
-    "message": "View $ITEMNAME$, opens in new window",
+    "message": "Visa $ITEMNAME$, öppnas i nytt fönster",
     "placeholders": {
       "itemName": {
         "content": "$1"
@@ -1072,18 +1072,18 @@
     "description": "Aria label for the view button in notification bar confirmation message"
   },
   "notificationNewItemAria": {
-    "message": "New Item, opens in new window",
+    "message": "Nytt föremål, öppnas i nytt fönster",
     "description": "Aria label for the new item button in notification bar confirmation message when error is prompted"
   },
   "notificationEditTooltip": {
-    "message": "Edit before saving",
+    "message": "Redigera innan du sparar",
     "description": "Tooltip and Aria label for edit button on cipher item"
   },
   "newNotification": {
-    "message": "New notification"
+    "message": "Nytt meddelande"
   },
   "labelWithNotification": {
-    "message": "$LABEL$: New notification",
+    "message": "$LABEL$: Nytt meddelande",
     "description": "Label for the notification with a new login suggestion.",
     "placeholders": {
       "label": {
@@ -1093,15 +1093,15 @@
     }
   },
   "notificationLoginSaveConfirmation": {
-    "message": "saved to Bitwarden.",
+    "message": "sparades till Bitwarden.",
     "description": "Shown to user after item is saved."
   },
   "notificationLoginUpdatedConfirmation": {
-    "message": "updated in Bitwarden.",
+    "message": "uppdaterad i Bitwarden.",
     "description": "Shown to user after item is updated."
   },
   "selectItemAriaLabel": {
-    "message": "Select $ITEMTYPE$, $ITEMNAME$",
+    "message": "Välj $ITEMTYPE$, $ITEMNAME$",
     "description": "Used by screen readers. $1 is the item type (like vault or folder), $2 is the selected item name.",
     "placeholders": {
       "itemType": {
@@ -1113,35 +1113,35 @@
     }
   },
   "saveAsNewLoginAction": {
-    "message": "Save as new login",
+    "message": "Spara som ny inloggning",
     "description": "Button text for saving login details as a new entry."
   },
   "updateLoginAction": {
-    "message": "Update login",
+    "message": "Uppdatera inloggning",
     "description": "Button text for updating an existing login entry."
   },
   "unlockToSave": {
-    "message": "Unlock to save this login",
+    "message": "Lås upp för att spara denna inloggning",
     "description": "User prompt to take action in order to save the login they just entered."
   },
   "saveLogin": {
-    "message": "Save login",
+    "message": "Spara inloggning",
     "description": "Prompt asking the user if they want to save their login details."
   },
   "updateLogin": {
-    "message": "Update existing login",
+    "message": "Uppdatera befintlig inloggning",
     "description": "Prompt asking the user if they want to update an existing login entry."
   },
   "loginSaveSuccess": {
-    "message": "Login saved",
+    "message": "Inloggning sparad",
     "description": "Message displayed when login details are successfully saved."
   },
   "loginUpdateSuccess": {
-    "message": "Login updated",
+    "message": "Inloggning uppdaterad",
     "description": "Message displayed when login details are successfully updated."
   },
   "loginUpdateTaskSuccess": {
-    "message": "Great job! You took the steps to make you and $ORGANIZATION$ more secure.",
+    "message": "Bra jobbat! Du tog stegen för att göra dig och $ORGANIZATION$ säkrare.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1150,7 +1150,7 @@
     "description": "Shown to user after login is updated."
   },
   "loginUpdateTaskSuccessAdditional": {
-    "message": "Thank you for making $ORGANIZATION$ more secure. You have $TASK_COUNT$ more passwords to update.",
+    "message": "Tack för att du gör $ORGANIZATION$ säkrare. Du har $TASK_COUNT$ fler lösenord att uppdatera.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1162,17 +1162,23 @@
     "description": "Shown to user after login is updated."
   },
   "nextSecurityTaskAction": {
-    "message": "Change next password",
+    "message": "Ändra nästa lösenord",
     "description": "Message prompting user to undertake completion of another security task."
   },
   "saveFailure": {
-    "message": "Error saving",
+    "message": "Fel i sparandet",
     "description": "Error message shown when the system fails to save login details."
   },
   "saveFailureDetails": {
-    "message": "Oh no! We couldn't save this. Try entering the details manually.",
+    "message": "Åh nej! Vi kunde inte spara detta. Försök att ange uppgifterna manuellt.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "När du har ändrat ditt lösenord måste du logga in med det nya lösenordet. Aktiva sessioner på andra enheter kommer att loggas ut inom en timme."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Ändra ditt huvudlösenord för att slutföra återställningen av kontot."
+  },
   "enableChangedPasswordNotification": {
     "message": "Be om att uppdatera befintlig inloggning"
   },
@@ -1180,7 +1186,7 @@
     "message": "Be om att uppdatera ett lösenord när en ändring upptäcks på en webbplats."
   },
   "changedPasswordNotificationDescAlt": {
-    "message": "Ask to update a login's password when a change is detected on a website. Applies to all logged in accounts."
+    "message": "Be att få uppdatera lösenordet för en inloggning när en ändring upptäcks på en webbplats. Gäller för alla inloggade konton."
   },
   "enableUsePasskeys": {
     "message": "Be om att spara och använda lösennycklar"
@@ -1195,7 +1201,7 @@
     "message": "Uppdatera"
   },
   "notificationUnlockDesc": {
-    "message": "Lås upp ditt Bitwarden-valv för att slutföra begäran om automatisk ifyllnad."
+    "message": "Lås upp ditt Bitwarden-valv för att slutföra begäran om autofyll."
   },
   "notificationUnlock": {
     "message": "Lås upp"
@@ -1207,17 +1213,17 @@
     "message": "Visa alternativ för snabbmenyn"
   },
   "contextMenuItemDesc": {
-    "message": "Använd ett andra klick för att komma åt lösenordsgenerering och matchande inloggningar för webbplatsen. "
+    "message": "Använd ett andra klick för att komma åt lösenordsgenerering och matchande inloggningar för webbplatsen."
   },
   "contextMenuItemDescAlt": {
-    "message": "Use a secondary click to access password generation and matching logins for the website. Applies to all logged in accounts."
+    "message": "Använd ett sekundärt klick för att få tillgång till lösenordsgenerering och matchande inloggningar för webbplatsen. Gäller för alla inloggade konton."
   },
   "defaultUriMatchDetection": {
     "message": "Standardmatchning för URI",
     "description": "Default URI match detection for autofill."
   },
   "defaultUriMatchDetectionDesc": {
-    "message": "Välj standardalternativet för hur matchning av URI är hanterat för inloggningar när du utför operationer såsom automatisk ifyllnad."
+    "message": "Välj standardalternativet för hur matchning av URI är hanterat för inloggningar när du utför operationer såsom autofyll."
   },
   "theme": {
     "message": "Tema"
@@ -1246,35 +1252,35 @@
     "message": "Filformat"
   },
   "fileEncryptedExportWarningDesc": {
-    "message": "This file export will be password protected and require the file password to decrypt."
+    "message": "Den här filexporten kommer att vara lösenordsskyddad och kräver filens lösenord för att dekryptera."
   },
   "filePassword": {
     "message": "Fillösenord"
   },
   "exportPasswordDescription": {
-    "message": "This password will be used to export and import this file"
+    "message": "Detta lösenord kommer att användas för att exportera och importera denna fil"
   },
   "accountRestrictedOptionDescription": {
-    "message": "Use your account encryption key, derived from your account's username and Master Password, to encrypt the export and restrict import to only the current Bitwarden account."
+    "message": "Använd ditt kontos krypteringsnyckel, som härrör från ditt kontos användarnamn och huvudlösenord, för att kryptera exporten och begränsa importen till endast det aktuella Bitwarden-kontot."
   },
   "passwordProtectedOptionDescription": {
-    "message": "Set a file password to encrypt the export and import it to any Bitwarden account using the password for decryption."
+    "message": "Ange ett lösenord för filen för att kryptera exporten och importera den till valfritt Bitwarden-konto med lösenordet för dekryptering."
   },
   "exportTypeHeading": {
     "message": "Exporttyp"
   },
   "accountRestricted": {
-    "message": "Account restricted"
+    "message": "Konto med restriktioner"
   },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
-    "message": "“File password”  and “Confirm file password“ do not match."
+    "message": "\"Fillösenord\" och \"Bekräfta fillösenord\" stämmer inte överens."
   },
   "warning": {
     "message": "VARNING",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
   "warningCapitalized": {
-    "message": "Warning",
+    "message": "Varning",
     "description": "Warning (should maintain locale-relevant capitalization)"
   },
   "confirmVaultExport": {
@@ -1296,7 +1302,7 @@
     "message": "Delad"
   },
   "bitwardenForBusinessPageDesc": {
-    "message": "Bitwarden for Business allows you to share your vault items with others by using an organization. Learn more on the bitwarden.com website."
+    "message": "Med Bitwarden for Business kan du dela dina valvobjekt med andra genom att använda en organisation. Läs mer på webbplatsen bitwarden.com."
   },
   "moveToOrganization": {
     "message": "Flytta till organisation"
@@ -1354,7 +1360,7 @@
     "message": "Fil"
   },
   "fileToShare": {
-    "message": "File to share"
+    "message": "Fil att dela"
   },
   "selectFile": {
     "message": "Välj en fil"
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Funktion ej tillgänglig"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Migrering av krypteringsnyckel krävs. Logga in på webbvalvet för att uppdatera din krypteringsnyckel."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy-kryptering stöds inte längre. Vänligen kontakta support för att återställa ditt konto."
   },
   "premiumMembership": {
     "message": "Premium-medlemskap"
@@ -1411,7 +1417,7 @@
     "message": "Köp Premium"
   },
   "premiumPurchaseAlertV2": {
-    "message": "You can purchase Premium from your account settings on the Bitwarden web app."
+    "message": "Du kan köpa Premium från dina kontoinställningar i Bitwardens webbapp."
   },
   "premiumCurrentMember": {
     "message": "Du är en premium-medlem!"
@@ -1459,10 +1465,10 @@
     "message": "Ett premium-medlemskap krävs för att använda den här funktionen."
   },
   "authenticationTimeout": {
-    "message": "Authentication timeout"
+    "message": "Timeout för autentisering"
   },
   "authenticationSessionTimedOut": {
-    "message": "The authentication session timed out. Please restart the login process."
+    "message": "Autentiseringssessionen timade ut. Vänligen starta om inloggningsprocessen."
   },
   "verificationCodeEmailSent": {
     "message": "Verifieringsmeddelande har skickats till $EMAIL$.",
@@ -1474,29 +1480,29 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "Fråga inte igen på den här enheten i 30 dagar"
   },
   "selectAnotherMethod": {
-    "message": "Select another method",
+    "message": "Välj en annan metod",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use your recovery code"
+    "message": "Använd din återställningskod"
   },
   "insertU2f": {
     "message": "Sätt i din säkerhetsnyckel i en av datorns USB-portar. Om nyckeln har en knapp, sätt fingret på den."
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "Öppna i ny flik"
   },
   "webAuthnAuthenticate": {
     "message": "Autentisera WebAuthn"
   },
   "readSecurityKey": {
-    "message": "Read security key"
+    "message": "Läs säkerhetsnyckel"
   },
   "awaitingSecurityKeyInteraction": {
-    "message": "Awaiting security key interaction..."
+    "message": "Väntar på interaktion med säkerhetsnyckel..."
   },
   "loginUnavailable": {
     "message": "Inloggning ej tillgänglig"
@@ -1511,7 +1517,7 @@
     "message": "Alternativ för tvåstegsverifiering"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "Välj metod för tvåstegsverifiering"
   },
   "recoveryCodeDesc": {
     "message": "Förlorat åtkomst till alla dina metoder för tvåstegsverifiering? Använd din återställningskod för att inaktivera tvåstegsverifiering på ditt konto."
@@ -1523,7 +1529,7 @@
     "message": "Autentiseringsapp"
   },
   "authenticatorAppDescV2": {
-    "message": "Enter a code generated by an authenticator app like Bitwarden Authenticator.",
+    "message": "Ange en kod som genererats av en autentiseringsapp som Bitwarden Authenticator.",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
@@ -1556,13 +1562,13 @@
     "message": "Egen-hostad miljö"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com"
+    "message": "Ange bas-URL:en för din självhostade Bitwarden-installation. Exempel: https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
-    "message": "For advanced configuration, you can specify the base URL of each service independently."
+    "message": "För avancerad konfiguration kan du ange bas-URL för varje tjänst separat."
   },
   "selfHostedEnvFormInvalid": {
-    "message": "You must add either the base Server URL or at least one custom environment."
+    "message": "Du måste lägga till antingen serverns bas-URL eller minst en anpassad miljö."
   },
   "customEnvironment": {
     "message": "Anpassad miljö"
@@ -1571,7 +1577,7 @@
     "message": "Server-URL"
   },
   "selfHostBaseUrl": {
-    "message": "Self-host server URL",
+    "message": "Självhostad server-URL",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "apiUrl": {
@@ -1593,20 +1599,20 @@
     "message": "Miljö-URL:erna har sparats"
   },
   "showAutoFillMenuOnFormFields": {
-    "message": "Visa menyn för automatisk ifyllnad på formulärfält",
+    "message": "Visa menyn för autofyll på formulärfält",
     "description": "Represents the message for allowing the user to enable the autofill overlay"
   },
   "autofillSuggestionsSectionTitle": {
     "message": "Förslag för autofyll"
   },
   "autofillSpotlightTitle": {
-    "message": "Easily find autofill suggestions"
+    "message": "Hitta förslag på autofyll enkelt"
   },
   "autofillSpotlightDesc": {
-    "message": "Turn off your browser's autofill settings, so they don't conflict with Bitwarden."
+    "message": "Stäng av webbläsarens autofyllinställningar så att de inte orsakar konflikt med Bitwarden."
   },
   "turnOffBrowserAutofill": {
-    "message": "Turn off $BROWSER$ autofill",
+    "message": "Stäng av $BROWSER$ autofyll",
     "placeholders": {
       "browser": {
         "content": "$1",
@@ -1615,7 +1621,7 @@
     }
   },
   "turnOffAutofill": {
-    "message": "Turn off autofill"
+    "message": "Stäng av autofyll"
   },
   "showInlineMenuLabel": {
     "message": "Visa förslag för autofyll i formulärfält"
@@ -1627,13 +1633,13 @@
     "message": "Visa kort som förslag"
   },
   "showInlineMenuOnIconSelectionLabel": {
-    "message": "Display suggestions when icon is selected"
+    "message": "Visa förslag när ikonen markerats"
   },
   "showInlineMenuOnFormFieldsDescAlt": {
-    "message": "Applies to all logged in accounts."
+    "message": "Gäller för alla inloggade konton."
   },
   "turnOffBrowserBuiltInPasswordManagerSettings": {
-    "message": "Turn off your browser's built in password manager settings to avoid conflicts."
+    "message": "Stäng av webbläsarens inbyggda lösenordshanterarinställningar för att undvika konflikter."
   },
   "turnOffBrowserBuiltInPasswordManagerSettingsLink": {
     "message": "Redigera webbläsarinställningar."
@@ -1643,11 +1649,11 @@
     "description": "Overlay setting select option for disabling autofill overlay"
   },
   "autofillOverlayVisibilityOnFieldFocus": {
-    "message": "When field is selected (on focus)",
+    "message": "När fältet är markerat (i fokus)",
     "description": "Overlay appearance select option for showing the field on focus of the input element"
   },
   "autofillOverlayVisibilityOnButtonClick": {
-    "message": "När ikonen för automatisk ifyllnad är vald",
+    "message": "När ikonen för autofyll är vald",
     "description": "Overlay appearance select option for showing the field on click of the overlay icon"
   },
   "enableAutoFillOnPageLoadSectionTitle": {
@@ -1693,13 +1699,13 @@
     "message": "Öppna valvet i sidofältet"
   },
   "commandAutofillLoginDesc": {
-    "message": "Autofill the last used login for the current website"
+    "message": "Autofyll den senast använda inloggningen för den aktuella webbplatsen"
   },
   "commandAutofillCardDesc": {
-    "message": "Autofill the last used card for the current website"
+    "message": "Autofyll det senast använda kortet för den aktuella webbplatsen"
   },
   "commandAutofillIdentityDesc": {
-    "message": "Autofill the last used identity for the current website"
+    "message": "Autofyll den senast använda identiteten för den aktuella webbplatsen"
   },
   "commandGeneratePasswordDesc": {
     "message": "Skapa och kopiera ett nytt slumpmässigt lösenord till urklipp."
@@ -1723,7 +1729,7 @@
     "message": "Dra för att sortera"
   },
   "dragToReorder": {
-    "message": "Drag to reorder"
+    "message": "Dra för att ändra ordning"
   },
   "cfTypeText": {
     "message": "Text"
@@ -1758,7 +1764,7 @@
     "message": "Visa en identifierbar bild bredvid varje inloggning."
   },
   "faviconDescAlt": {
-    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
+    "message": "Visa en igenkännbar bild bredvid varje inloggning. Gäller för alla inloggade konton."
   },
   "enableBadgeCounter": {
     "message": "Visa aktivitetsräknaren"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH-nyckel"
   },
+  "typeNote": {
+    "message": "Anteckning"
+  },
   "newItemHeader": {
     "message": "Ny $TYPE$",
     "placeholders": {
@@ -1959,7 +1968,7 @@
     "message": "Rensa generatorhistorik"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "Om du fortsätter kommer alla poster att raderas permanent från generatorns historik. Är du säker på att du vill fortsätta?"
   },
   "back": {
     "message": "Tillbaka"
@@ -1998,7 +2007,7 @@
     "message": "Säkra anteckningar"
   },
   "sshKeys": {
-    "message": "SSH Keys"
+    "message": "SSH-nycklar"
   },
   "clear": {
     "message": "Rensa",
@@ -2081,10 +2090,10 @@
     "message": "Rensa historik"
   },
   "nothingToShow": {
-    "message": "Nothing to show"
+    "message": "Inget tillgängligt innehåll"
   },
   "nothingGeneratedRecently": {
-    "message": "You haven't generated anything recently"
+    "message": "Du har inte genererat något nyligen"
   },
   "remove": {
     "message": "Ta bort"
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Ange en PIN-kod för att låsa upp Bitwarden. Dina PIN-inställningar återställs om du någonsin loggar ut helt från programmet."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "Du kan använda denna PIN-kod för att låsa upp Bitwarden. Din PIN-kod kommer att återställas om du någonsin loggar ut helt från programmet."
   },
   "pinRequired": {
     "message": "PIN-kod krävs."
@@ -2181,7 +2190,7 @@
     "message": "Lås med huvudlösenordet vid omstart av webbläsaren"
   },
   "lockWithMasterPassOnRestart1": {
-    "message": "Require master password on browser restart"
+    "message": "Kräv huvudlösenord vid omstart av webbläsaren"
   },
   "selectOneCollection": {
     "message": "Du måste markera minst en samling."
@@ -2196,36 +2205,39 @@
     "message": "Lösenordsgenerator"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Användarnamnsgenerator"
   },
   "useThisEmail": {
-    "message": "Use this email"
+    "message": "Använd denna e-post"
   },
   "useThisPassword": {
-    "message": "Use this password"
+    "message": "Använd detta lösenord"
+  },
+  "useThisPassphrase": {
+    "message": "Använd denna lösenfras"
   },
   "useThisUsername": {
-    "message": "Use this username"
+    "message": "Använd detta användarnamn"
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "Säkert lösenord genererat! Glöm inte att även uppdatera ditt lösenord på webbplatsen."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Använd generatorn",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "för att skapa ett starkt unikt lösenord",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "vaultCustomization": {
-    "message": "Vault customization"
+    "message": "Anpassning av valv"
   },
   "vaultTimeoutAction": {
     "message": "Åtgärd när valvets tidsgräns överskrids"
   },
   "vaultTimeoutAction1": {
-    "message": "Timeout action"
+    "message": "Åtgärd vid timeout"
   },
   "lock": {
     "message": "Lås",
@@ -2272,7 +2284,7 @@
     "message": "Fyllde i objektet automatiskt och sparade URI:n"
   },
   "autoFillSuccess": {
-    "message": "Fyllde i objektet automatiskt"
+    "message": "Fyllde i objektet automatiskt "
   },
   "insecurePageWarning": {
     "message": "Varning: Detta är en icke säkrad HTTP-sida, och all information du skickar kan potentiellt ses och ändras av andra. Denna inloggning sparades ursprungligen på en säker (HTTPS) sida."
@@ -2347,16 +2359,16 @@
     "message": "Ditt nya huvudlösenord uppfyller inte kraven i policyn."
   },
   "receiveMarketingEmailsV2": {
-    "message": "Get advice, announcements, and research opportunities from Bitwarden in your inbox."
+    "message": "Få råd, nyheter och forskningsmöjligheter från Bitwarden i din inkorg."
   },
   "unsubscribe": {
-    "message": "Unsubscribe"
+    "message": "Avprenumerera"
   },
   "atAnyTime": {
     "message": "när som helst."
   },
   "byContinuingYouAgreeToThe": {
-    "message": "By continuing, you agree to the"
+    "message": "Genom att fortsätta godkänner du"
   },
   "and": {
     "message": "och"
@@ -2374,7 +2386,7 @@
     "message": "Integritetspolicy"
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Ditt nya lösenord får inte vara samma som ditt nuvarande lösenord."
   },
   "hintEqualsPassword": {
     "message": "Din lösenordsledtråd får inte vara samma som ditt lösenord."
@@ -2383,10 +2395,10 @@
     "message": "OK"
   },
   "errorRefreshingAccessToken": {
-    "message": "Access Token Refresh Error"
+    "message": "Fel vid uppdatering av åtkomsttoken"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "No refresh token or API keys found. Please try logging out and logging back in."
+    "message": "Ingen uppdateringstoken eller API-nyckel hittades. Försök att logga ut och logga in igen."
   },
   "desktopSyncVerificationTitle": {
     "message": "Verifiering av synkronisering med skrivbordsprogrammet"
@@ -2425,10 +2437,10 @@
     "message": "Kontoavvikelse"
   },
   "nativeMessagingWrongUserKeyTitle": {
-    "message": "Biometric key missmatch"
+    "message": "Missmatchning av biometrisk nyckel"
   },
   "nativeMessagingWrongUserKeyDesc": {
-    "message": "Biometric unlock failed. The biometric secret key failed to unlock the vault. Please try to set up biometrics again."
+    "message": "Biometrisk upplåsning misslyckades. Den biometriska hemliga nyckeln kunde inte låsa upp valvet. Försök att ställa in biometri igen."
   },
   "biometricsNotEnabledTitle": {
     "message": "Biometri är inte aktiverat"
@@ -2443,16 +2455,16 @@
     "message": "Biometri i webbläsaren stöds inte på den här enheten."
   },
   "biometricsNotUnlockedTitle": {
-    "message": "User locked or logged out"
+    "message": "Användaren är låst eller utloggad"
   },
   "biometricsNotUnlockedDesc": {
     "message": "Lås upp den här användaren i skrivbordsprogrammet och försök igen."
   },
   "biometricsNotAvailableTitle": {
-    "message": "Biometric unlock unavailable"
+    "message": "Biometrisk upplåsning ej tillgänglig"
   },
   "biometricsNotAvailableDesc": {
-    "message": "Biometric unlock is currently unavailable. Please try again later."
+    "message": "Biometrisk upplåsning är för närvarande inte tillgänglig. Vänligen försök igen senare."
   },
   "biometricsFailedTitle": {
     "message": "Biometri misslyckades"
@@ -2479,17 +2491,23 @@
     "message": "En organisationspolicy påverkar dina ägarskapsalternativ."
   },
   "personalOwnershipPolicyInEffectImports": {
-    "message": "An organization policy has blocked importing items into your individual vault."
+    "message": "En organisationspolicy har blockerat import av objekt till ditt individuella valv."
+  },
+  "restrictCardTypeImport": {
+    "message": "Det går inte att importera typer av kortposter"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "En policy som har fastställts av en eller flera organisationer hindrar dig från att importera kort till dina valv."
   },
   "domainsTitle": {
     "message": "Domäner",
     "description": "A category title describing the concept of web domains"
   },
   "blockedDomains": {
-    "message": "Blocked domains"
+    "message": "Blockerade domäner"
   },
   "learnMoreAboutBlockedDomains": {
-    "message": "Learn more about blocked domains"
+    "message": "Läs mer om blockerade domäner"
   },
   "excludedDomains": {
     "message": "Exkluderade domäner"
@@ -2498,22 +2516,26 @@
     "message": "Bitwarden kommer inte att fråga om att få spara inloggningsuppgifter för dessa domäner. Du måste uppdatera sidan för att ändringarna ska träda i kraft."
   },
   "excludedDomainsDescAlt": {
-    "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
+    "message": "Bitwarden kommer inte att be om att få spara inloggningsuppgifter för dessa domäner för alla inloggade konton. Du måste uppdatera sidan för att ändringarna ska träda i kraft."
   },
   "blockedDomainsDesc": {
-    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+    "message": "Autofyll och andra relaterade funktioner kommer inte att erbjudas för dessa webbplatser. Du måste uppdatera sidan för att ändringarna ska träda i kraft."
   },
   "autofillBlockedNoticeV2": {
-    "message": "Autofill is blocked for this website."
+    "message": "Autofyll är blockerat för den här webbplatsen."
   },
   "autofillBlockedNoticeGuidance": {
     "message": "Ändra detta i inställningar"
   },
   "change": {
-    "message": "Change"
+    "message": "Ändra"
+  },
+  "changePassword": {
+    "message": "Ändra lösenord",
+    "description": "Change password button for browser at risk notification on login."
   },
   "changeButtonTitle": {
-    "message": "Change password - $ITEMNAME$",
+    "message": "Byt lösenord - $ITEMNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -2521,11 +2543,14 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Lösenord med risk"
+  },
   "atRiskPasswords": {
-    "message": "At-risk passwords"
+    "message": "Lösenord i riskzonen"
   },
   "atRiskPasswordDescSingleOrg": {
-    "message": "$ORGANIZATION$ is requesting you change one password because it is at-risk.",
+    "message": "$ORGANIZATION$ ber dig att ändra ett lösenord eftersom det är i riskzonen.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2534,7 +2559,7 @@
     }
   },
   "atRiskPasswordsDescSingleOrgPlural": {
-    "message": "$ORGANIZATION$ is requesting you change the $COUNT$ passwords because they are at-risk.",
+    "message": "$ORGANIZATION$ begär att du ändrar $COUNT$-lösenorden eftersom de är i riskzonen.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2547,7 +2572,7 @@
     }
   },
   "atRiskPasswordsDescMultiOrgPlural": {
-    "message": "Your organizations are requesting you change the $COUNT$ passwords because they are at-risk.",
+    "message": "Dina organisationer begär att du ändrar $COUNT$-lösenorden eftersom de är i riskzonen.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2555,11 +2580,31 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Ditt lösenord för den här webbplatsen är i fara. $ORGANIZATION$ har begärt att du ändrar det.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ vill att du ändrar det här lösenordet eftersom det är i riskzonen. Navigera till dina kontoinställningar för att ändra lösenordet.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
-    "message": "Review and change one at-risk password"
+    "message": "Granska och ändra ett risklösenord"
   },
   "reviewAndChangeAtRiskPasswordsPlural": {
-    "message": "Review and change $COUNT$ at-risk passwords",
+    "message": "Granska och ändra $COUNT$ riskfyllda lösenord",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2568,40 +2613,40 @@
     }
   },
   "changeAtRiskPasswordsFaster": {
-    "message": "Change at-risk passwords faster"
+    "message": "Ändra riskfyllda lösenord snabbare"
   },
   "changeAtRiskPasswordsFasterDesc": {
-    "message": "Update your settings so you can quickly autofill your passwords and generate new ones"
+    "message": "Uppdatera dina inställningar så att du snabbt kan autofylla dina lösenord och generera nya"
   },
   "reviewAtRiskLogins": {
-    "message": "Review at-risk logins"
+    "message": "Granska riskfyllda inloggningar"
   },
   "reviewAtRiskPasswords": {
-    "message": "Review at-risk passwords"
+    "message": "Granska riskfyllda lösenord"
   },
   "reviewAtRiskLoginsSlideDesc": {
-    "message": "Your organization passwords are at-risk because they are weak, reused, and/or exposed.",
+    "message": "Lösenorden i din organisation är i riskzonen eftersom de är svaga, återanvända och/eller exponerade.",
     "description": "Description of the review at-risk login slide on the at-risk password page carousel"
   },
   "reviewAtRiskLoginSlideImgAltPeriod": {
-    "message": "Illustration of a list of logins that are at-risk."
+    "message": "Illustration av en lista över inloggningar som är i riskzonen."
   },
   "generatePasswordSlideDesc": {
-    "message": "Quickly generate a strong, unique password with the Bitwarden autofill menu on the at-risk site.",
+    "message": "Skapa snabbt ett starkt, unikt lösenord med Bitwardens autofyllmeny på riskwebbplatsen.",
     "description": "Description of the generate password slide on the at-risk password page carousel"
   },
   "generatePasswordSlideImgAltPeriod": {
-    "message": "Illustration of the Bitwarden autofill menu displaying a generated password."
+    "message": "Illustration av Bitwardens autofyllmeny som visar ett genererat lösenord."
   },
   "updateInBitwarden": {
-    "message": "Update in Bitwarden"
+    "message": "Uppdatera i Bitwarden"
   },
   "updateInBitwardenSlideDesc": {
-    "message": "Bitwarden will then prompt you to update the password in the password manager.",
+    "message": "Bitwarden kommer då att uppmana dig att uppdatera lösenordet i lösenordshanteraren.",
     "description": "Description of the update in Bitwarden slide on the at-risk password page carousel"
   },
   "updateInBitwardenSlideImgAltPeriod": {
-    "message": "Illustration of a Bitwarden’s notification prompting the user to update the login."
+    "message": "Illustration av ett Bitwarden-meddelande som uppmanar användaren att uppdatera inloggningen."
   },
   "turnOnAutofill": {
     "message": "Aktivera autofyll"
@@ -2610,7 +2655,7 @@
     "message": "Aktiverade autofyll"
   },
   "dismiss": {
-    "message": "Dismiss"
+    "message": "Stäng"
   },
   "websiteItemLabel": {
     "message": "Webbplats $number$ (URI)",
@@ -2631,20 +2676,20 @@
     }
   },
   "blockedDomainsSavedSuccess": {
-    "message": "Blocked domain changes saved"
+    "message": "Blockerade domänändringar sparas"
   },
   "excludedDomainsSavedSuccess": {
-    "message": "Excluded domain changes saved"
+    "message": "Ändringar för exkluderad domän sparas"
   },
   "limitSendViews": {
-    "message": "Limit views"
+    "message": "Begränsa antalet visningar"
   },
   "limitSendViewsHint": {
-    "message": "No one can view this Send after the limit is reached.",
+    "message": "Ingen kan se denna sändning efter att gränsen har nåtts.",
     "description": "Displayed under the limit views field on Send"
   },
   "limitSendViewsCount": {
-    "message": "$ACCESSCOUNT$ views left",
+    "message": "$ACCESSCOUNT$ visningar kvar",
     "description": "Displayed under the limit views field on Send",
     "placeholders": {
       "accessCount": {
@@ -2658,14 +2703,14 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDetails": {
-    "message": "Send details",
+    "message": "Skicka information",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeText": {
     "message": "Text"
   },
   "sendTypeTextToShare": {
-    "message": "Text to share"
+    "message": "Text att dela"
   },
   "sendTypeFile": {
     "message": "Fil"
@@ -2674,8 +2719,12 @@
     "message": "Alla Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max antal åtkomster har uppnåtts",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
-    "message": "Hide text by default"
+    "message": "Dölj text som standard"
   },
   "expired": {
     "message": "Utgången"
@@ -2722,7 +2771,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
-    "message": "Are you sure you want to permanently delete this Send?",
+    "message": "Är du säker på att du vill ta bort det här meddelandet permanent?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
@@ -2733,7 +2782,7 @@
     "message": "Raderingsdatum"
   },
   "deletionDateDescV2": {
-    "message": "The Send will be permanently deleted on this date.",
+    "message": "Sändningen kommer att raderas permanent på detta datum.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
@@ -2755,7 +2804,7 @@
     "message": "Anpassad"
   },
   "sendPasswordDescV3": {
-    "message": "Add an optional password for recipients to access this Send.",
+    "message": "Lägg till ett valfritt lösenord för att mottagarna ska få åtkomst till detta meddelande.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
@@ -2778,15 +2827,15 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSendSuccessfully": {
-    "message": "Send created successfully!",
+    "message": "Skicka skapad framgångsrikt!",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInHoursSingle": {
-    "message": "The Send will be available to anyone with the link for the next 1 hour.",
+    "message": "Sändningen kommer att vara tillgänglig för alla med länken under den kommande 1 timmen.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInHours": {
-    "message": "The Send will be available to anyone with the link for the next $HOURS$ hours.",
+    "message": "Sändningen kommer att vara tillgänglig för alla som har länken under de närmaste $HOURS$ timmarna.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
     "placeholders": {
       "hours": {
@@ -2796,11 +2845,11 @@
     }
   },
   "sendExpiresInDaysSingle": {
-    "message": "The Send will be available to anyone with the link for the next 1 day.",
+    "message": "Sändningen kommer att vara tillgänglig för alla som har länken under den kommande 1 dagen.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInDays": {
-    "message": "The Send will be available to anyone with the link for the next $DAYS$ days.",
+    "message": "Send kommer att vara tillgänglig för alla som har länken under de närmaste $DAYS$-dagarna.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
     "placeholders": {
       "days": {
@@ -2810,7 +2859,7 @@
     }
   },
   "sendLinkCopied": {
-    "message": "Send link copied",
+    "message": "Skicka länk kopierad",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
@@ -2818,11 +2867,11 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendFilePopoutDialogText": {
-    "message": "Pop out extension?",
+    "message": "Pop out-förlängning?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendFilePopoutDialogDesc": {
-    "message": "To create a file Send, you need to pop out the extension to a new window.",
+    "message": "För att skapa en fil Skicka, måste du popa ut förlängningen till ett nytt fönster.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLinuxChromiumFileWarning": {
@@ -2835,7 +2884,7 @@
     "message": "För att välja en fil med Safari, öppna ett nytt fönster genom att klicka på denna banner."
   },
   "popOut": {
-    "message": "Pop out"
+    "message": "Popa ut"
   },
   "sendFileCalloutHeader": {
     "message": "Innan du börjar"
@@ -2856,7 +2905,7 @@
     "message": "Det gick inte att spara raderings- och utgångsdatum."
   },
   "hideYourEmail": {
-    "message": "Hide your email address from viewers."
+    "message": "Dölj din e-postadress från tittarna."
   },
   "passwordPrompt": {
     "message": "Återupprepa huvudlösenord"
@@ -2871,11 +2920,14 @@
     "message": "E-postverifiering krävs"
   },
   "emailVerifiedV2": {
-    "message": "Email verified"
+    "message": "E-post verifierad"
   },
   "emailVerificationRequiredDesc": {
     "message": "Du måste verifiera din e-postadress för att använda den här funktionen. Du kan verifiera din e-postadress i webbvalvet."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Masterlösenordet har ställts in"
+  },
   "updatedMasterPassword": {
     "message": "Huvudlösenord uppdaterades"
   },
@@ -2889,7 +2941,7 @@
     "message": "Ditt huvudlösenord följer inte ett eller flera av din organisations regler. För att komma åt ditt valv så måste du ändra ditt huvudlösenord nu. Om du gör det kommer du att loggas du ut ur din nuvarande session så du måste logga in på nytt. Aktiva sessioner på andra enheter kommer fortsatt vara aktiva i upp till en timme."
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
+    "message": "Din organisation har inaktiverat betrodd enhetskryptering. Ange ett huvudlösenord för att komma åt ditt valv."
   },
   "resetPasswordPolicyAutoEnroll": {
     "message": "Automatiskt deltagande"
@@ -2932,10 +2984,10 @@
     "message": "Minuter"
   },
   "vaultTimeoutPolicyAffectingOptions": {
-    "message": "Enterprise policy requirements have been applied to your timeout options"
+    "message": "Företagets policykrav har tillämpats på dina timeout-alternativ"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Dina organisationsprinciper påverkar ditt valvs tid för timeout. Maximal tillåten tid innan timeout är $HOURS$ timmar och $MINUTES$ minuter",
+    "message": "Dina organisationsprinciper påverkar ditt valvs tid för timeout. Maximal tillåten tid innan timeout är $HOURS$ timmar och $MINUTES$ minuter.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2948,7 +3000,7 @@
     }
   },
   "vaultTimeoutPolicyInEffect1": {
-    "message": "$HOURS$ hour(s) and $MINUTES$ minute(s) maximum.",
+    "message": "$HOURS$ timme(n) och $MINUTES$ minut(er) maximalt.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2961,7 +3013,7 @@
     }
   },
   "vaultTimeoutPolicyMaximumError": {
-    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "message": "Tidsgränsen överskrider den begränsning som har fastställts av din organisation: $HOURS$ timme(n) och $MINUTES$ minut(er) max",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2974,7 +3026,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is $HOURS$ hour(s) and $MINUTES$ minute(s). Your vault timeout action is set to $ACTION$.",
+    "message": "Din organisations policyer påverkar valvets timeout. Högsta tillåtna timeout för valvet är $HOURS$ timme(n) och $MINUTES$ minut(er). Åtgärden för valvets timeout är inställd på $ACTION$.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2991,7 +3043,7 @@
     }
   },
   "vaultTimeoutActionPolicyInEffect": {
-    "message": "Your organization policies have set your vault timeout action to $ACTION$.",
+    "message": "I organisationens policyer har timeoutåtgärden för valvet ställts in på $ACTION$.",
     "placeholders": {
       "action": {
         "content": "$1",
@@ -3015,13 +3067,13 @@
     "message": "Ingen unik identifierare hittades."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Ett huvudlösenord krävs inte längre för medlemmar i följande organisation. Vänligen bekräfta domänen nedan med din organisationsadministratör."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Organisationsnamn"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Key Connector-domän"
   },
   "leaveOrganization": {
     "message": "Lämna organisation"
@@ -3048,7 +3100,7 @@
     "message": "Exporterar individuellt valv"
   },
   "exportingIndividualVaultDescription": {
-    "message": "Only the individual vault items associated with $EMAIL$ will be exported. Organization vault items will not be included. Only vault item information will be exported and will not include associated attachments.",
+    "message": "Endast de enskilda valvobjekt som är associerade med $EMAIL$ exporteras. Valvobjekt för organisationer kommer inte att inkluderas. Endast information om valvobjektet exporteras och inkluderar inte tillhörande bilagor.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3057,7 +3109,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "Endast de enskilda valvobjekten inklusive bilagor som är associerade med $EMAIL$ exporteras. Organisationens valvobjekt kommer inte att inkluderas",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3066,10 +3118,10 @@
     }
   },
   "exportingOrganizationVaultTitle": {
-    "message": "Exporting organization vault"
+    "message": "Exportera organisationsvalv"
   },
   "exportingOrganizationVaultDesc": {
-    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. Items in individual vaults or other organizations will not be included.",
+    "message": "Endast det organisationsvalv som är associerat med $ORGANIZATION$ exporteras. Objekt i enskilda valv eller andra organisationer kommer inte att inkluderas.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -3081,24 +3133,24 @@
     "message": "Fel"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Dekrypteringsfel"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "Bitwarden kunde inte dekryptera valvföremålet/valvföremålen som listas nedan."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "Kontakta kundtjänst",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "för att undvika ytterligare dataförlust.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "generateUsername": {
     "message": "Generera användarnamn"
   },
   "generateEmail": {
-    "message": "Generate email"
+    "message": "Generera e-post"
   },
   "spinboxBoundariesHint": {
     "message": "Värde måste vara mellan $MIN$ och $MAX$.",
@@ -3170,7 +3222,7 @@
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Choose a domain that is supported by the selected service",
+    "message": "Välj en domän som stöds av den valda tjänsten",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
@@ -3226,7 +3278,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "message": "$SERVICENAME$ avvisade din begäran. Vänligen kontakta din tjänsteleverantör för hjälp.",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -3236,7 +3288,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ avvisade din begäran: $ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -3250,7 +3302,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Unable to obtain $SERVICENAME$ masked email account ID.",
+    "message": "Det gick inte att få $SERVICENAME$ maskerat ID för e-postkonto.",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -3280,7 +3332,7 @@
     }
   },
   "forwarderUnknownError": {
-    "message": "Unknown $SERVICENAME$ error occurred.",
+    "message": "Okänt $SERVICENAME$-fel inträffade.",
     "description": "Displayed when the forwarding service failed due to an unknown error.",
     "placeholders": {
       "servicename": {
@@ -3290,7 +3342,7 @@
     }
   },
   "forwarderUnknownForwarder": {
-    "message": "Unknown forwarder: '$SERVICENAME$'.",
+    "message": "Okänd vidarebefordrare: '$SERVICENAME$'.",
     "description": "Displayed when the forwarding service is not supported.",
     "placeholders": {
       "servicename": {
@@ -3385,28 +3437,31 @@
     "message": "En avisering har skickats till din enhet."
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the"
+    "message": "Lås upp Bitwarden på din enhet eller på"
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "webbapp"
   },
   "notificationSentDevicePart2": {
-    "message": "Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Kontrollera att fingeravtrycksfrasen stämmer överens med den nedan innan du godkänner."
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "A notification was sent to your device"
+    "message": "Ett meddelande har skickats till din enhet"
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "You will be notified once the request is approved"
+    "message": "Du kommer att få ett meddelande när begäran har godkänts"
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "Behöver du ett annat alternativ?"
   },
   "loginInitiated": {
     "message": "Inloggning påbörjad"
   },
   "logInRequestSent": {
-    "message": "Request sent"
+    "message": "Begäran skickad"
+  },
+  "masterPasswordChanged": {
+    "message": "Huvudlösenordet sparades"
   },
   "exposedMasterPassword": {
     "message": "Huvudlösenordet har exponerats"
@@ -3445,7 +3500,7 @@
     "message": "Hur du fyller i automatiskt"
   },
   "autofillSelectInfoWithCommand": {
-    "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.",
+    "message": "Välj ett objekt från den här skärmen, använd genvägen $COMMAND$ eller utforska andra alternativ i inställningarna.",
     "placeholders": {
       "command": {
         "content": "$1",
@@ -3454,7 +3509,7 @@
     }
   },
   "autofillSelectInfoWithoutCommand": {
-    "message": "Select an item from this screen, or explore other options in settings."
+    "message": "Välj ett objekt från den här skärmen eller utforska andra alternativ i inställningarna."
   },
   "gotIt": {
     "message": "Förstått"
@@ -3478,7 +3533,7 @@
     "message": "Kortkommandot för autofyll av inloggning är inte inställt. Du kan ändra det i webbläsarens inställningar."
   },
   "autofillLoginShortcutText": {
-    "message": "The autofill login shortcut is $COMMAND$. Manage all shortcuts in the browser's settings.",
+    "message": "Genvägen för autofyll-inloggning är $COMMAND$. Hantera alla genvägar i webbläsarens inställningar.",
     "placeholders": {
       "command": {
         "content": "$1",
@@ -3499,22 +3554,22 @@
     "message": "Öppnas i ett nytt fönster"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Remember this device to make future logins seamless"
+    "message": "Kom ihåg den här enheten för att göra framtida inloggningar smidiga"
   },
   "deviceApprovalRequired": {
-    "message": "Device approval required. Select an approval option below:"
+    "message": "Godkännande av enhet krävs. Välj ett alternativ för godkännande nedan:"
   },
   "deviceApprovalRequiredV2": {
-    "message": "Device approval required"
+    "message": "Godkännande av utrustning krävs"
   },
   "selectAnApprovalOptionBelow": {
-    "message": "Select an approval option below"
+    "message": "Välj ett godkännandealternativ nedan"
   },
   "rememberThisDevice": {
     "message": "Kom ihåg denna enhet"
   },
   "uncheckIfPublicDevice": {
-    "message": "Uncheck if using a public device"
+    "message": "Avmarkera om du använder en offentlig enhet"
   },
   "approveFromYourOtherDevice": {
     "message": "Godkänn från din andra enhet"
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Be om godkännande från administratör"
   },
+  "unableToCompleteLogin": {
+    "message": "Kunde inte slutföra inloggningen"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Du måste logga in på en betrodd enhet eller fråga din administratör att tilldela dig ett lösenord."
+  },
   "ssoIdentifierRequired": {
     "message": "Organisationens SSO-identifierare krävs."
   },
@@ -3535,7 +3596,7 @@
     "message": "Följ länken i e-postmeddelandet som skickats till"
   },
   "andContinueCreatingYourAccount": {
-    "message": "and continue creating your account."
+    "message": "och fortsätt att skapa ditt konto."
   },
   "noEmail": {
     "message": "Ingen e-post?"
@@ -3557,7 +3618,7 @@
     "message": "Allmänt"
   },
   "display": {
-    "message": "Display"
+    "message": "Visa"
   },
   "accountSuccessfullyCreated": {
     "message": "Ditt konto har skapats!"
@@ -3578,49 +3639,41 @@
     "message": "Användarens e-postadress saknas"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "E-postadressen för aktiv användare hittades inte. Loggar ut dig."
   },
   "deviceTrusted": {
     "message": "Enhet betrodd"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Lita på organisation"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Förtroende"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Lita inte på"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Organisationen är inte betrodd"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "För att skydda ditt konto ska du bara bekräfta om du har beviljat nödåtkomst till den här användaren och om fingeravtrycket matchar det som visas på användarens konto"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "För att skydda ditt konto ska du bara fortsätta om du är medlem i den här organisationen, har aktiverat kontoåterställning och om det fingeravtryck som visas nedan matchar organisationens fingeravtryck."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Den här organisationen har en företagspolicy som gör att du kan anmäla dig till kontoåterställning. Registreringen gör det möjligt för organisationens administratörer att ändra ditt lösenord. Fortsätt bara om du känner igen den här organisationen och om fingeravtrycksfrasen som visas nedan matchar organisationens fingeravtryck."
   },
   "trustUser": {
-    "message": "Trust user"
-  },
-  "sendsNoItemsTitle": {
-    "message": "Inga aktiva Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+    "message": "Lita på användare"
   },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "Skicka känslig information på ett säkert sätt",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "Dela filer och data på ett säkert sätt med vem som helst, på vilken plattform som helst. Din information kommer att förbli krypterad från början till slut samtidigt som exponeringen begränsas.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -3642,7 +3695,7 @@
     }
   },
   "inputMaxLength": {
-    "message": "Input must not exceed $COUNT$ characters in length.",
+    "message": "Inmatningen får inte vara längre än $COUNT$ tecken.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3660,7 +3713,7 @@
     }
   },
   "inputMinValue": {
-    "message": "Input value must be at least $MIN$.",
+    "message": "Inmatningsvärdet måste vara minst $MIN$.",
     "placeholders": {
       "min": {
         "content": "$1",
@@ -3669,7 +3722,7 @@
     }
   },
   "inputMaxValue": {
-    "message": "Input value must not exceed $MAX$.",
+    "message": "Inmatningsvärdet får inte överstiga $MAX$.",
     "placeholders": {
       "max": {
         "content": "$1",
@@ -3681,7 +3734,7 @@
     "message": "En eller flera e-postadresser är ogiltiga"
   },
   "inputTrimValidator": {
-    "message": "Input must not contain only whitespace.",
+    "message": "Inmatningen får inte innehålla enbart blanksteg.",
     "description": "Notification to inform the user that a form's input can't contain only whitespace."
   },
   "inputEmail": {
@@ -3697,10 +3750,10 @@
     }
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "1 fält behöver din uppmärksamhet."
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "$COUNT$-fälten behöver din uppmärksamhet.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3755,7 +3808,7 @@
     "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
   },
   "toggleSideNavigation": {
-    "message": "Toggle side navigation"
+    "message": "Växla sidonavigering"
   },
   "skipToContent": {
     "message": "Hoppa till innehåll"
@@ -3777,7 +3830,7 @@
     "description": "Text to display in overlay when the account is locked."
   },
   "unlockYourAccountToViewAutofillSuggestions": {
-    "message": "Unlock your account to view autofill suggestions",
+    "message": "Lås upp ditt konto för att visa förslag för autofyll",
     "description": "Text to display in overlay when the account is locked."
   },
   "unlockAccount": {
@@ -3785,15 +3838,15 @@
     "description": "Button text to display in overlay when the account is locked."
   },
   "unlockAccountAria": {
-    "message": "Unlock your account, opens in a new window",
+    "message": "Lås upp ditt konto, öppnas i ett nytt fönster",
     "description": "Screen reader text (aria-label) for unlock account button in overlay"
   },
   "totpCodeAria": {
-    "message": "Time-based One-Time Password Verification Code",
+    "message": "Tidsbaserat engångslösenord Verifieringskod",
     "description": "Aria label for the totp code displayed in the inline menu for autofill"
   },
   "totpSecondsSpanAria": {
-    "message": "Time remaining before current TOTP expires",
+    "message": "Återstående tid innan aktuell TOTP löper ut",
     "description": "Aria label for the totp seconds displayed in the inline menu for autofill"
   },
   "fillCredentialsFor": {
@@ -3801,7 +3854,7 @@
     "description": "Screen reader text for when overlay item is in focused"
   },
   "partialUsername": {
-    "message": "Partial username",
+    "message": "Delvis användarnamn",
     "description": "Screen reader text for when a login item is focused where a partial username is displayed. SR will announce this phrase before reading the text of the partial username"
   },
   "noItemsToShow": {
@@ -3821,7 +3874,7 @@
     "description": "Button text to display within inline menu when there are no matching items on a login field"
   },
   "addNewLoginItemAria": {
-    "message": "Add new vault login item, opens in a new window",
+    "message": "Lägg till nytt valvinloggningsobjekt, öppnas i ett nytt fönster",
     "description": "Screen reader text (aria-label) for new login button within inline menu"
   },
   "newCard": {
@@ -3829,7 +3882,7 @@
     "description": "Button text to display within inline menu when there are no matching items on a credit card field"
   },
   "addNewCardItemAria": {
-    "message": "Add new vault card item, opens in a new window",
+    "message": "Lägg till ny valvkortsartikel, öppnas i nytt fönster",
     "description": "Screen reader text (aria-label) for new card button within inline menu"
   },
   "newIdentity": {
@@ -3837,7 +3890,7 @@
     "description": "Button text to display within inline menu when there are no matching items on an identity field"
   },
   "addNewIdentityItemAria": {
-    "message": "Add new vault identity item, opens in a new window",
+    "message": "Lägg till ny valvidentitetsartikel, öppnas i nytt fönster",
     "description": "Screen reader text (aria-label) for new identity button within inline menu"
   },
   "bitwardenOverlayMenuAvailable": {
@@ -3927,13 +3980,13 @@
     }
   },
   "duoHealthCheckResultsInNullAuthUrlError": {
-    "message": "Error connecting with the Duo service. Use a different two-step login method or contact Duo for assistance."
+    "message": "Fel vid anslutning till Duo-tjänsten. Använd en annan tvåstegsinloggningsmetod eller kontakta Duo för hjälp."
   },
   "duoRequiredForAccount": {
-    "message": "Duo two-step login is required for your account."
+    "message": "Tvåstegsinloggning med Duo krävs för ditt konto."
   },
   "popoutExtension": {
-    "message": "Popout extension"
+    "message": "Popout-förlängning"
   },
   "launchDuo": {
     "message": "Starta Duo"
@@ -3963,7 +4016,7 @@
     "message": "Välj en samling"
   },
   "importTargetHint": {
-    "message": "Select this option if you want the imported file contents moved to a $DESTINATION$",
+    "message": "Välj det här alternativet om du vill att innehållet i den importerade filen ska flyttas till en $DESTINATION$",
     "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.",
     "placeholders": {
       "destination": {
@@ -4010,16 +4063,16 @@
     "message": "Bekräfta fillösenord"
   },
   "exportSuccess": {
-    "message": "Vault data exported"
+    "message": "Valvdata exporteras"
   },
   "typePasskey": {
     "message": "Nyckel"
   },
   "accessing": {
-    "message": "Accessing"
+    "message": "Åtkomst via"
   },
   "loggedInExclamation": {
-    "message": "Logged in!"
+    "message": "Inloggad!"
   },
   "passkeyNotCopied": {
     "message": "Lösennyckeln kommer inte kopieras"
@@ -4043,7 +4096,7 @@
     "message": "Det finns ingen matchande inloggning för denna webbplats."
   },
   "noMatchingLoginsForSite": {
-    "message": "No matching logins for this site"
+    "message": "Inga matchande inloggningar för denna webbplats"
   },
   "searchSavePasskeyNewLogin": {
     "message": "Sök eller spara nyckel som ny inloggning"
@@ -4058,10 +4111,10 @@
     "message": "Spara nyckel som ny inloggning"
   },
   "chooseCipherForPasskeySave": {
-    "message": "Choose a login to save this passkey to"
+    "message": "Välj en inloggning som du vill spara nyckeln till"
   },
   "chooseCipherForPasskeyAuth": {
-    "message": "Choose a passkey to log in with"
+    "message": "Välj en lösenordskod att logga in med"
   },
   "passkeyItem": {
     "message": "Lösennyckelobjekt"
@@ -4127,10 +4180,10 @@
     "message": "LastPass autentisering krävs"
   },
   "awaitingSSO": {
-    "message": "Awaiting SSO authentication"
+    "message": "Väntar på SSO-autentisering"
   },
   "awaitingSSODesc": {
-    "message": "Please continue to log in using your company credentials."
+    "message": "Fortsätt att logga in med dina företagsuppgifter."
   },
   "seeDetailedInstructions": {
     "message": "Se detaljerade instruktioner på vår hjälpsida på",
@@ -4143,7 +4196,7 @@
     "message": "Importera från CSV"
   },
   "lastPassTryAgainCheckEmail": {
-    "message": "Try again or look for an email from LastPass to verify it's you."
+    "message": "Försök igen eller leta efter ett e-postmeddelande från LastPass för att verifiera att det är du."
   },
   "collection": {
     "message": "Samling"
@@ -4164,13 +4217,13 @@
     "message": "Aktivt konto"
   },
   "bitwardenAccount": {
-    "message": "Bitwarden account"
+    "message": "Bitwarden-konto"
   },
   "availableAccounts": {
     "message": "Tillgängliga konton"
   },
   "accountLimitReached": {
-    "message": "Account limit reached. Log out of an account to add another."
+    "message": "Kontogränsen har nåtts. Logga ut från ett konto för att lägga till ett annat."
   },
   "active": {
     "message": "aktiv"
@@ -4185,7 +4238,7 @@
     "message": "server"
   },
   "hostedAt": {
-    "message": "hosted at"
+    "message": "värd på"
   },
   "useDeviceOrHardwareKey": {
     "message": "Använd din enhet eller hårdvarunyckel"
@@ -4197,7 +4250,7 @@
     "message": "Alltid för denna webbplats"
   },
   "domainAddedToExcludedDomains": {
-    "message": "$DOMAIN$ added to excluded domains.",
+    "message": "$DOMAIN$ tillagd till uteslutna domäner.",
     "placeholders": {
       "domain": {
         "content": "$1",
@@ -4209,8 +4262,28 @@
     "message": "Vanliga format",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Detektering av URI-matchning är hur Bitwarden identifierar autofyllförslag.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Reguljär uttryck\" är ett avancerat alternativ med ökad risk för att röja inloggningsuppgifter.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Börjar med\" är ett avancerat alternativ med ökad risk för att röja inloggningsuppgifter.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Mer om matchdetektering",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Avancerade inställningar",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
-    "message": "Continue to browser settings?",
+    "message": "Fortsätt till webbläsarinställningar?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
   },
   "confirmContinueToHelpCenter": {
@@ -4218,19 +4291,19 @@
     "description": "Title for dialog which asks if the user wants to proceed to a relevant Help Center page"
   },
   "confirmContinueToHelpCenterPasswordManagementContent": {
-    "message": "Change your browser's autofill and password management settings.",
+    "message": "Ändra inställningarna för autofyll och lösenordshantering i din webbläsare.",
     "description": "Body content for dialog which asks if the user wants to proceed to the Help Center's page about browser password management settings"
   },
   "confirmContinueToHelpCenterKeyboardShortcutsContent": {
-    "message": "You can view and set extension shortcuts in your browser's settings.",
+    "message": "Du kan se och ställa in genvägar för tillägg i webbläsarens inställningar.",
     "description": "Body content for dialog which asks if the user wants to proceed to the Help Center's page about browser keyboard shortcut settings"
   },
   "confirmContinueToBrowserPasswordManagementSettingsContent": {
-    "message": "Change your browser's autofill and password management settings.",
+    "message": "Ändra inställningarna för autofyll och lösenordshantering i din webbläsare.",
     "description": "Body content for dialog which asks if the user wants to proceed to the browser's password management settings page"
   },
   "confirmContinueToBrowserKeyboardShortcutSettingsContent": {
-    "message": "You can view and set extension shortcuts in your browser's settings.",
+    "message": "Du kan se och ställa in genvägar för tillägg i webbläsarens inställningar.",
     "description": "Body content for dialog which asks if the user wants to proceed to the browser's keyboard shortcut settings page"
   },
   "overrideDefaultBrowserAutofillTitle": {
@@ -4238,7 +4311,7 @@
     "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior"
   },
   "overrideDefaultBrowserAutofillDescription": {
-    "message": "Ignoring this option may cause conflicts between Bitwarden autofill suggestions and your browser's.",
+    "message": "Att ignorera det här alternativet kan orsaka konflikter mellan Bitwardens autofyllförslag och webbläsarens.",
     "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior"
   },
   "overrideDefaultBrowserAutoFillSettings": {
@@ -4246,11 +4319,11 @@
     "description": "Label for the setting that allows overriding the default browser autofill settings"
   },
   "privacyPermissionAdditionNotGrantedTitle": {
-    "message": "Unable to set Bitwarden as the default password manager",
+    "message": "Det går inte att ställa in Bitwarden som standardlösenordshanterare",
     "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings"
   },
   "privacyPermissionAdditionNotGrantedDescription": {
-    "message": "You must grant browser privacy permissions to Bitwarden to set it as the default password manager.",
+    "message": "Du måste ge Bitwarden sekretessbehörighet för webbläsaren för att kunna ange den som standardlösenordshanterare.",
     "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings"
   },
   "makeDefault": {
@@ -4258,27 +4331,27 @@
     "description": "Button text for the setting that allows overriding the default browser autofill settings"
   },
   "saveCipherAttemptSuccess": {
-    "message": "Credentials saved successfully!",
+    "message": "Legitimationen har sparats framgångsrikt!",
     "description": "Notification message for when saving credentials has succeeded."
   },
   "passwordSaved": {
-    "message": "Password saved!",
+    "message": "Lösenordet sparat!",
     "description": "Notification message for when saving credentials has succeeded."
   },
   "updateCipherAttemptSuccess": {
-    "message": "Credentials updated successfully!",
+    "message": "Legitimationen har uppdaterats!",
     "description": "Notification message for when updating credentials has succeeded."
   },
   "passwordUpdated": {
-    "message": "Password updated!",
+    "message": "Lösenord uppdaterat!",
     "description": "Notification message for when updating credentials has succeeded."
   },
   "saveCipherAttemptFailed": {
-    "message": "Error saving credentials. Check console for details.",
+    "message": "Fel vid sparande av inloggningsuppgifter. Kontrollera konsolen för detaljer.",
     "description": "Notification message for when saving credentials has failed."
   },
   "success": {
-    "message": "Success"
+    "message": "Lyckades"
   },
   "removePasskey": {
     "message": "Ta bort passkey"
@@ -4287,13 +4360,13 @@
     "message": "Passkey borttagen"
   },
   "autofillSuggestions": {
-    "message": "Autofill suggestions"
+    "message": "Förslag för autofyll"
   },
   "itemSuggestions": {
-    "message": "Suggested items"
+    "message": "Föreslagna föremål"
   },
   "autofillSuggestionsTip": {
-    "message": "Save a login item for this site to autofill"
+    "message": "Spara ett inloggningsobjekt för den här webbplatsen för autofyll"
   },
   "yourVaultIsEmpty": {
     "message": "Ditt valv är tomt"
@@ -4302,10 +4375,10 @@
     "message": "Inga objekt matchar din sökning"
   },
   "clearFiltersOrTryAnother": {
-    "message": "Clear filters or try another search term"
+    "message": "Rensa filter eller försök med en annan sökterm"
   },
   "copyInfoTitle": {
-    "message": "Copy info - $ITEMNAME$",
+    "message": "Kopiera information - $ITEMNAME$",
     "description": "Title for a button that opens a menu with options to copy information from an item.",
     "placeholders": {
       "itemname": {
@@ -4325,7 +4398,7 @@
     }
   },
   "moreOptionsLabel": {
-    "message": "More options, $ITEMNAME$",
+    "message": "Fler alternativ, $ITEMNAME$",
     "description": "Aria label for a button that opens a menu with more options for an item.",
     "placeholders": {
       "itemname": {
@@ -4335,7 +4408,7 @@
     }
   },
   "moreOptionsTitle": {
-    "message": "More options - $ITEMNAME$",
+    "message": "Fler alternativ - $ITEMNAME$",
     "description": "Title for a button that opens a menu with more options for an item.",
     "placeholders": {
       "itemname": {
@@ -4355,7 +4428,7 @@
     }
   },
   "viewItemTitleWithField": {
-    "message": "View item - $ITEMNAME$ - $FIELD$",
+    "message": "Visa objekt - $ITEMNAME$ - $FIELD$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4369,7 +4442,7 @@
     }
   },
   "autofillTitle": {
-    "message": "Autofill - $ITEMNAME$",
+    "message": "Autofyll - $ITEMNAME$",
     "description": "Title for a button that autofills a login item.",
     "placeholders": {
       "itemname": {
@@ -4379,7 +4452,7 @@
     }
   },
   "autofillTitleWithField": {
-    "message": "Autofill - $ITEMNAME$ - $FIELD$",
+    "message": "Autofyll - $ITEMNAME$ - $FIELD$",
     "description": "Title for a button that autofills a login item.",
     "placeholders": {
       "itemname": {
@@ -4393,7 +4466,7 @@
     }
   },
   "copyFieldValue": {
-    "message": "Copy $FIELD$, $VALUE$",
+    "message": "Kopiera $FIELD$, $VALUE$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -4407,10 +4480,10 @@
     }
   },
   "noValuesToCopy": {
-    "message": "No values to copy"
+    "message": "Inga värden att kopiera"
   },
   "assignToCollections": {
-    "message": "Assign to collections"
+    "message": "Tilldela till samlingar"
   },
   "copyEmail": {
     "message": "Kopiera e-postadress"
@@ -4422,7 +4495,7 @@
     "message": "Kopiera adress"
   },
   "adminConsole": {
-    "message": "Admin Console"
+    "message": "Adminkonsol"
   },
   "accountSecurity": {
     "message": "Kontosäkerhet"
@@ -4434,10 +4507,10 @@
     "message": "Utseende"
   },
   "errorAssigningTargetCollection": {
-    "message": "Error assigning target collection."
+    "message": "Fel vid tilldelning av målsamling."
   },
   "errorAssigningTargetFolder": {
-    "message": "Error assigning target folder."
+    "message": "Fel vid tilldelning av målmapp."
   },
   "viewItemsIn": {
     "message": "Visa objekt i $NAME$",
@@ -4482,7 +4555,7 @@
     "message": "Objektnamn"
   },
   "organizationIsDeactivated": {
-    "message": "Organization is deactivated"
+    "message": "Organisationen är avaktiverad"
   },
   "owner": {
     "message": "Ägare"
@@ -4492,7 +4565,7 @@
     "description": "Used as a label to indicate that the user is the owner of an item."
   },
   "contactYourOrgAdmin": {
-    "message": "Items in deactivated organizations cannot be accessed. Contact your organization owner for assistance."
+    "message": "Det går inte att komma åt objekt i inaktiverade organisationer. Kontakta din organisationsägare för hjälp."
   },
   "additionalInformation": {
     "message": "Ytterligare information"
@@ -4501,16 +4574,16 @@
     "message": "Objekthistorik"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "Senast ändrat"
   },
   "ownerYou": {
     "message": "Ägare: Du"
   },
   "linked": {
-    "message": "Linked"
+    "message": "Länkad"
   },
   "copySuccessful": {
-    "message": "Copy Successful"
+    "message": "Kopiering lyckades"
   },
   "upload": {
     "message": "Ladda upp"
@@ -4540,52 +4613,52 @@
     }
   },
   "downloadBitwarden": {
-    "message": "Download Bitwarden"
+    "message": "Ladda ner Bitwarden"
   },
   "downloadBitwardenOnAllDevices": {
-    "message": "Download Bitwarden on all devices"
+    "message": "Ladda ner Bitwarden på alla enheter"
   },
   "getTheMobileApp": {
-    "message": "Get the mobile app"
+    "message": "Hämta mobilappen"
   },
   "getTheMobileAppDesc": {
-    "message": "Access your passwords on the go with the Bitwarden mobile app."
+    "message": "Få tillgång till dina lösenord när du är på språng med Bitwardens mobilapp."
   },
   "getTheDesktopApp": {
-    "message": "Get the desktop app"
+    "message": "Hämta skrivbordsappen"
   },
   "getTheDesktopAppDesc": {
-    "message": "Access your vault without a browser, then set up unlock with biometrics to expedite unlocking in both the desktop app and browser extension."
+    "message": "Öppna ditt valv utan en webbläsare och ställ sedan in upplåsning med biometri för att påskynda upplåsningen i både skrivbordsappen och webbläsartillägget."
   },
   "downloadFromBitwardenNow": {
-    "message": "Download from bitwarden.com now"
+    "message": "Ladda ner från bitwarden.com nu"
   },
   "getItOnGooglePlay": {
-    "message": "Get it on Google Play"
+    "message": "Hämta den på Google Play"
   },
   "downloadOnTheAppStore": {
-    "message": "Download on the App Store"
+    "message": "Ladda ner på App Store"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "Är du säker på att du vill radera den här bilagan permanent?"
   },
   "premium": {
     "message": "Premium"
   },
   "freeOrgsCannotUseAttachments": {
-    "message": "Free organizations cannot use attachments"
+    "message": "Fria organisationer kan inte använda bilagor"
   },
   "filters": {
-    "message": "Filters"
+    "message": "Filter"
   },
   "filterVault": {
     "message": "Filtrera valv"
   },
   "filterApplied": {
-    "message": "One filter applied"
+    "message": "Ett filter tillämpat"
   },
   "filterAppliedPlural": {
-    "message": "$COUNT$ filters applied",
+    "message": "$COUNT$ filter tillämpas",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4603,7 +4676,7 @@
     "message": "Kontaktuppgifter"
   },
   "downloadAttachment": {
-    "message": "Download - $ITEMNAME$",
+    "message": "Ladda ner - $ITEMNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -4612,7 +4685,7 @@
     }
   },
   "cardNumberEndsWith": {
-    "message": "card number ends with",
+    "message": "kortnummer slutar med",
     "description": "Used within the inline menu to provide an aria description when users are attempting to fill a card cipher."
   },
   "loginCredentials": {
@@ -4638,7 +4711,7 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Webbplats tillagd"
   },
   "addWebsite": {
     "message": "Lägg till webbplats"
@@ -4657,7 +4730,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "Show match detection $WEBSITE$",
+    "message": "Visa matchningsdetektering $WEBSITE",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4666,7 +4739,7 @@
     }
   },
   "hideMatchDetection": {
-    "message": "Hide match detection $WEBSITE$",
+    "message": "Detektering av dold matchning $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4675,19 +4748,19 @@
     }
   },
   "autoFillOnPageLoad": {
-    "message": "Autofill on page load?"
+    "message": "Autofyll vid sidladdning?"
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Utgått kort"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "Om du har förnyat kortet ska du uppdatera kortinformationen"
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "Begär kort"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "$BRAND$ detaljer",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -4726,13 +4799,13 @@
     "message": "Tilldela"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Only organization members with access to these collections will be able to see the item."
+    "message": "Endast organisationsmedlemmar med tillgång till dessa samlingar kan se objektet."
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Only organization members with access to these collections will be able to see the items."
+    "message": "Endast organisationsmedlemmar med tillgång till dessa samlingar kan se objekten."
   },
   "bulkCollectionAssignmentWarning": {
-    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "message": "Du har valt $TOTAL_COUNT$ artiklar. Du kan inte uppdatera $READONLY_COUNT$ av objekten eftersom du inte har redigeringsbehörighet.",
     "placeholders": {
       "total_count": {
         "content": "$1",
@@ -4762,13 +4835,13 @@
     "message": "Använd dolda fält för känslig data, som t. ex. ett lösenord"
   },
   "checkBoxHelpText": {
-    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+    "message": "Använd kryssrutor om du vill fylla i en kryssruta i ett formulär automatiskt, t.ex. för att komma ihåg e-post"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "Använd ett länkat fält när du har problem med autofyll för en viss webbplats."
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "Ange fältets html-id, namn, aria-label eller platshållare."
   },
   "editField": {
     "message": "Redigera fält"
@@ -4792,7 +4865,7 @@
     }
   },
   "fieldAdded": {
-    "message": "$LABEL$ added",
+    "message": "$LABEL$ tillagd",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4801,7 +4874,7 @@
     }
   },
   "reorderToggleButton": {
-    "message": "Reorder $LABEL$. Use arrow key to move item up or down.",
+    "message": "Ordna om $LABEL$. Använd piltangenten för att flytta objektet uppåt eller nedåt.",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4810,10 +4883,10 @@
     }
   },
   "reorderWebsiteUriButton": {
-    "message": "Reorder website URI. Use arrow key to move item up or down."
+    "message": "Ordna om webbplatsens URI. Använd piltangenten för att flytta objektet uppåt eller nedåt."
   },
   "reorderFieldUp": {
-    "message": "$LABEL$ moved up, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ flyttas upp, position $INDEX$ av $LENGTH$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4830,13 +4903,13 @@
     }
   },
   "selectCollectionsToAssign": {
-    "message": "Select collections to assign"
+    "message": "Välj samlingar som ska tilldelas"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+    "message": "1 objekt kommer att permanent överföras till den valda organisationen. Du kommer inte längre att äga detta objekt."
   },
   "personalItemsTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ objekt kommer att överföras permanent till den valda organisationen. Du kommer inte längre att äga dessa objekt.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -4845,7 +4918,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "message": "1 objekt kommer att överföras permanent till $ORG$. Du kommer inte längre att äga det här objektet.",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -4854,7 +4927,7 @@
     }
   },
   "personalItemsWithOrgTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ objekt kommer att överföras permanent till $ORG$. Du kommer inte längre att äga dessa objekt.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -4867,13 +4940,13 @@
     }
   },
   "successfullyAssignedCollections": {
-    "message": "Successfully assigned collections"
+    "message": "Framgångsrikt tilldelade samlingar"
   },
   "nothingSelected": {
-    "message": "You have not selected anything."
+    "message": "Du har inte valt något."
   },
   "itemsMovedToOrg": {
-    "message": "Items moved to $ORGNAME$",
+    "message": "Objekt flyttade till $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4882,7 +4955,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Item moved to $ORGNAME$",
+    "message": "Objektet flyttat till $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4891,7 +4964,7 @@
     }
   },
   "reorderFieldDown": {
-    "message": "$LABEL$ moved down, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ flyttas ner, position $INDEX$ av $LENGTH$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4908,34 +4981,34 @@
     }
   },
   "itemLocation": {
-    "message": "Item Location"
+    "message": "Föremålets placering"
   },
   "fileSend": {
-    "message": "File Send"
+    "message": "Skicka fil"
   },
   "fileSends": {
-    "message": "File Sends"
+    "message": "Skicka filer"
   },
   "textSend": {
-    "message": "Text Send"
+    "message": "Skicka text"
   },
   "textSends": {
-    "message": "Text Sends"
+    "message": "Text skickas"
   },
   "accountActions": {
     "message": "Kontoåtgärder"
   },
   "showNumberOfAutofillSuggestions": {
-    "message": "Show number of login autofill suggestions on extension icon"
+    "message": "Visa antal autofyllförslag för inloggning på tilläggsikonen"
   },
   "showQuickCopyActions": {
-    "message": "Show quick copy actions on Vault"
+    "message": "Visa snabbkopieringsåtgärder på Vault"
   },
   "systemDefault": {
     "message": "Systemstandard"
   },
   "enterprisePolicyRequirementsApplied": {
-    "message": "Enterprise policy requirements have been applied to this setting"
+    "message": "Krav på företagspolicy har tillämpats på denna inställning"
   },
   "sshPrivateKey": {
     "message": "Privat nyckel"
@@ -4965,13 +5038,13 @@
     "message": "Försök igen"
   },
   "vaultCustomTimeoutMinimum": {
-    "message": "Minimum custom timeout is 1 minute."
+    "message": "Minsta anpassade timeout är 1 minut."
   },
   "additionalContentAvailable": {
-    "message": "Additional content is available"
+    "message": "Ytterligare innehåll är tillgängligt"
   },
   "fileSavedToDevice": {
-    "message": "File saved to device. Manage from your device downloads."
+    "message": "Fil sparad till enhet. Hantera nedladdningar från din enhet."
   },
   "showCharacterCount": {
     "message": "Visa antal tecken"
@@ -4980,43 +5053,43 @@
     "message": "Dölj antal tecken"
   },
   "itemsInTrash": {
-    "message": "Items in trash"
+    "message": "Föremål i papperskorgen"
   },
   "noItemsInTrash": {
-    "message": "No items in trash"
+    "message": "Inga objekt i papperskorgen"
   },
   "noItemsInTrashDesc": {
-    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+    "message": "Objekt som du raderar kommer att visas här och raderas permanent efter 30 dagar"
   },
   "trashWarning": {
-    "message": "Items that have been in trash more than 30 days will automatically be deleted"
+    "message": "Objekt som har legat i papperskorgen i mer än 30 dagar raderas automatiskt"
   },
   "restore": {
     "message": "Återställ"
   },
   "deleteForever": {
-    "message": "Delete forever"
+    "message": "Ta bort permanent"
   },
   "noEditPermissions": {
-    "message": "You don't have permission to edit this item"
+    "message": "Du har inte behörighet att redigera detta objekt"
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+    "message": "Biometrisk upplåsning är inte tillgänglig eftersom upplåsning med PIN-kod eller lösenord krävs först."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Biometric unlock is currently unavailable."
+    "message": "Biometrisk upplåsning är för närvarande inte tillgänglig."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Biometrisk upplåsning är inte tillgänglig på grund av felkonfigurerade systemfiler."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Biometrisk upplåsning är inte tillgänglig på grund av felkonfigurerade systemfiler."
   },
   "biometricsStatusHelptextDesktopDisconnected": {
-    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+    "message": "Biometrisk upplåsning är inte tillgänglig eftersom Bitwardens skrivbordsapp är stängd."
   },
   "biometricsStatusHelptextNotEnabledInDesktop": {
-    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "message": "Biometrisk upplåsning är inte tillgänglig eftersom den inte är aktiverad för $EMAIL$ i Bitwardens skrivbordsapp.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -5025,34 +5098,37 @@
     }
   },
   "biometricsStatusHelptextUnavailableReasonUnknown": {
-    "message": "Biometric unlock is currently unavailable for an unknown reason."
+    "message": "Biometrisk upplåsning är för närvarande inte tillgänglig av okänd anledning."
   },
   "unlockVault": {
-    "message": "Unlock your vault in seconds"
+    "message": "Lås upp ditt valv på några sekunder"
   },
   "unlockVaultDesc": {
-    "message": "You can customize your unlock and timeout settings to more quickly access your vault."
+    "message": "Du kan anpassa dina inställningar för upplåsning och timeout för att snabbare komma åt ditt valv."
   },
   "unlockPinSet": {
-    "message": "Unlock PIN set"
+    "message": "Lås upp PIN-koden"
+  },
+  "unlockWithBiometricSet": {
+    "message": "Lås upp med biometriuppsättning"
   },
   "authenticating": {
-    "message": "Authenticating"
+    "message": "Autentisering"
   },
   "fillGeneratedPassword": {
-    "message": "Fill generated password",
+    "message": "Fyll i genererat lösenord",
     "description": "Heading for the password generator within the inline menu"
   },
   "passwordRegenerated": {
-    "message": "Password regenerated",
+    "message": "Lösenord förnyat",
     "description": "Notification message for when a password has been regenerated"
   },
   "saveToBitwarden": {
-    "message": "Save to Bitwarden",
+    "message": "Spara till Bitwarden",
     "description": "Confirmation message for saving a login to Bitwarden"
   },
   "spaceCharacterDescriptor": {
-    "message": "Space",
+    "message": "Mellanslag",
     "description": "Represents the space key in screen reader content as a readable word"
   },
   "tildeCharacterDescriptor": {
@@ -5060,7 +5136,7 @@
     "description": "Represents the ~ key in screen reader content as a readable word"
   },
   "backtickCharacterDescriptor": {
-    "message": "Backtick",
+    "message": "Bakvänd apostrof",
     "description": "Represents the ` key in screen reader content as a readable word"
   },
   "exclamationCharacterDescriptor": {
@@ -5068,27 +5144,27 @@
     "description": "Represents the ! key in screen reader content as a readable word"
   },
   "atSignCharacterDescriptor": {
-    "message": "At sign",
+    "message": "Vid skylt",
     "description": "Represents the @ key in screen reader content as a readable word"
   },
   "hashSignCharacterDescriptor": {
-    "message": "Hash sign",
+    "message": "Hash-tecken",
     "description": "Represents the # key in screen reader content as a readable word"
   },
   "dollarSignCharacterDescriptor": {
-    "message": "Dollar sign",
+    "message": "Dollartecken",
     "description": "Represents the $ key in screen reader content as a readable word"
   },
   "percentSignCharacterDescriptor": {
-    "message": "Percent sign",
+    "message": "Procenttecken",
     "description": "Represents the % key in screen reader content as a readable word"
   },
   "caretCharacterDescriptor": {
-    "message": "Caret",
+    "message": "Cirkumflex",
     "description": "Represents the ^ key in screen reader content as a readable word"
   },
   "ampersandCharacterDescriptor": {
-    "message": "Ampersand",
+    "message": "Och",
     "description": "Represents the & key in screen reader content as a readable word"
   },
   "asteriskCharacterDescriptor": {
@@ -5096,19 +5172,19 @@
     "description": "Represents the * key in screen reader content as a readable word"
   },
   "parenLeftCharacterDescriptor": {
-    "message": "Left parenthesis",
+    "message": "Vänster parentes",
     "description": "Represents the ( key in screen reader content as a readable word"
   },
   "parenRightCharacterDescriptor": {
-    "message": "Right parenthesis",
+    "message": "Höger parentes",
     "description": "Represents the ) key in screen reader content as a readable word"
   },
   "hyphenCharacterDescriptor": {
-    "message": "Underscore",
+    "message": "Understreck",
     "description": "Represents the _ key in screen reader content as a readable word"
   },
   "underscoreCharacterDescriptor": {
-    "message": "Hyphen",
+    "message": "Bindestreck",
     "description": "Represents the - key in screen reader content as a readable word"
   },
   "plusCharacterDescriptor": {
@@ -5116,23 +5192,23 @@
     "description": "Represents the + key in screen reader content as a readable word"
   },
   "equalsCharacterDescriptor": {
-    "message": "Equals",
+    "message": "Lika med",
     "description": "Represents the = key in screen reader content as a readable word"
   },
   "braceLeftCharacterDescriptor": {
-    "message": "Left brace",
+    "message": "Vänster stag",
     "description": "Represents the { key in screen reader content as a readable word"
   },
   "braceRightCharacterDescriptor": {
-    "message": "Right brace",
+    "message": "Höger stag",
     "description": "Represents the } key in screen reader content as a readable word"
   },
   "bracketLeftCharacterDescriptor": {
-    "message": "Left bracket",
+    "message": "Vänster konsol",
     "description": "Represents the [ key in screen reader content as a readable word"
   },
   "bracketRightCharacterDescriptor": {
-    "message": "Right bracket",
+    "message": "Höger konsol",
     "description": "Represents the ] key in screen reader content as a readable word"
   },
   "pipeCharacterDescriptor": {
@@ -5140,39 +5216,39 @@
     "description": "Represents the | key in screen reader content as a readable word"
   },
   "backSlashCharacterDescriptor": {
-    "message": "Back slash",
+    "message": "Bakvänt snedstreck",
     "description": "Represents the back slash key in screen reader content as a readable word"
   },
   "colonCharacterDescriptor": {
-    "message": "Colon",
+    "message": "Kolon",
     "description": "Represents the : key in screen reader content as a readable word"
   },
   "semicolonCharacterDescriptor": {
-    "message": "Semicolon",
+    "message": "Semikolon",
     "description": "Represents the ; key in screen reader content as a readable word"
   },
   "doubleQuoteCharacterDescriptor": {
-    "message": "Double quote",
+    "message": "Dubbla citat",
     "description": "Represents the double quote key in screen reader content as a readable word"
   },
   "singleQuoteCharacterDescriptor": {
-    "message": "Single quote",
+    "message": "Enstaka offert",
     "description": "Represents the ' key in screen reader content as a readable word"
   },
   "lessThanCharacterDescriptor": {
-    "message": "Less than",
+    "message": "Mindre än",
     "description": "Represents the < key in screen reader content as a readable word"
   },
   "greaterThanCharacterDescriptor": {
-    "message": "Greater than",
+    "message": "Större än",
     "description": "Represents the > key in screen reader content as a readable word"
   },
   "commaCharacterDescriptor": {
-    "message": "Comma",
+    "message": "Komma",
     "description": "Represents the , key in screen reader content as a readable word"
   },
   "periodCharacterDescriptor": {
-    "message": "Period",
+    "message": "Punkt",
     "description": "Represents the . key in screen reader content as a readable word"
   },
   "questionCharacterDescriptor": {
@@ -5180,7 +5256,7 @@
     "description": "Represents the ? key in screen reader content as a readable word"
   },
   "forwardSlashCharacterDescriptor": {
-    "message": "Forward slash",
+    "message": "Framåtriktat snedstreck",
     "description": "Represents the / key in screen reader content as a readable word"
   },
   "lowercaseAriaLabel": {
@@ -5190,52 +5266,52 @@
     "message": "Versal"
   },
   "generatedPassword": {
-    "message": "Generated password"
+    "message": "Genererat lösenord"
   },
   "compactMode": {
-    "message": "Compact mode"
+    "message": "Kompakt läge"
   },
   "beta": {
     "message": "Beta"
   },
   "extensionWidth": {
-    "message": "Extension width"
+    "message": "Förlängning bredd"
   },
   "wide": {
-    "message": "Wide"
+    "message": "Bred"
   },
   "extraWide": {
-    "message": "Extra wide"
+    "message": "Extra bred"
   },
   "sshKeyWrongPassword": {
-    "message": "The password you entered is incorrect."
+    "message": "Lösenordet du har angett är felaktigt."
   },
   "importSshKey": {
-    "message": "Import"
+    "message": "Importera"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirm password"
+    "message": "Bekräfta lösenord"
   },
   "enterSshKeyPasswordDesc": {
-    "message": "Enter the password for the SSH key."
+    "message": "Ange lösenordet för SSH-nyckeln."
   },
   "enterSshKeyPassword": {
-    "message": "Enter password"
+    "message": "Ange lösenord"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "SSH-nyckeln är ogiltig"
   },
   "sshKeyTypeUnsupported": {
-    "message": "The SSH key type is not supported"
+    "message": "SSH-nyckeltypen stöds inte"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "Importera nyckel från urklipp"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "SSH-nyckel importerad framgångsrikt"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Du kan inte ta bort samlingar med behörigheten Visa endast: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -5244,138 +5320,142 @@
     }
   },
   "updateDesktopAppOrDisableFingerprintDialogTitle": {
-    "message": "Please update your desktop application"
+    "message": "Uppdatera din desktop-applikation"
   },
   "updateDesktopAppOrDisableFingerprintDialogMessage": {
-    "message": "To use biometric unlock, please update your desktop application, or disable fingerprint unlock in the desktop settings."
+    "message": "Om du vill använda biometrisk upplåsning måste du uppdatera din skrivbordsapplikation eller inaktivera fingeravtrycksupplåsning i skrivbordsinställningarna."
   },
   "changeAtRiskPassword": {
-    "message": "Change at-risk password"
+    "message": "Ändra lösenord för riskgrupper"
   },
   "settingsVaultOptions": {
-    "message": "Vault options"
+    "message": "Alternativ för valv"
   },
   "emptyVaultDescription": {
-    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+    "message": "Valvet skyddar mer än bara dina lösenord. Förvara säkra inloggningar, ID-handlingar, kort och anteckningar säkert här."
   },
   "introCarouselLabel": {
-    "message": "Welcome to Bitwarden"
+    "message": "Välkommen till Bitwarden"
   },
   "securityPrioritized": {
-    "message": "Security, prioritized"
+    "message": "Säkerhet, prioriterad"
   },
   "securityPrioritizedBody": {
-    "message": "Save logins, cards, and identities to your secure vault. Bitwarden uses zero-knowledge, end-to-end encryption to protect what’s important to you."
+    "message": "Spara inloggningar, kort och identiteter i ditt säkra valv. Bitwarden använder nollkännedom, end-to-end-kryptering för att skydda det som är viktigt för dig."
   },
   "quickLogin": {
-    "message": "Quick and easy login"
+    "message": "Snabb och enkel inloggning"
   },
   "quickLoginBody": {
-    "message": "Set up biometric unlock and autofill to log into your accounts without typing a single letter."
+    "message": "Ställ in biometrisk upplåsning och autofyll för att logga in på dina konton utan att skriva en enda bokstav."
   },
   "secureUser": {
-    "message": "Level up your logins"
+    "message": "Höj nivån på dina inloggningar"
   },
   "secureUserBody": {
-    "message": "Use the generator to create and save strong, unique passwords for all your accounts."
+    "message": "Använd generatorn för att skapa och spara starka, unika lösenord för alla dina konton."
   },
   "secureDevices": {
-    "message": "Your data, when and where you need it"
+    "message": "Dina data, när och där du behöver dem"
   },
   "secureDevicesBody": {
-    "message": "Save unlimited passwords across unlimited devices with Bitwarden mobile, browser, and desktop apps."
+    "message": "Spara obegränsat antal lösenord på obegränsat antal enheter med Bitwardens mobil-, webbläsar- och skrivbordsappar."
   },
   "nudgeBadgeAria": {
-    "message": "1 notification"
+    "message": "1 meddelande"
   },
   "emptyVaultNudgeTitle": {
-    "message": "Import existing passwords"
+    "message": "Importera befintliga lösenord"
   },
   "emptyVaultNudgeBody": {
-    "message": "Use the importer to quickly transfer logins to Bitwarden without manually adding them."
+    "message": "Använd importören för att snabbt överföra inloggningar till Bitwarden utan att lägga till dem manuellt."
   },
   "emptyVaultNudgeButton": {
-    "message": "Import now"
+    "message": "Importera nu"
   },
   "hasItemsVaultNudgeTitle": {
-    "message": "Welcome to your vault!"
+    "message": "Välkommen till ditt valv!"
   },
   "hasItemsVaultNudgeBodyOne": {
-    "message": "Autofill items for the current page"
+    "message": "Autofyll objekt för den aktuella sidan"
   },
   "hasItemsVaultNudgeBodyTwo": {
-    "message": "Favorite items for easy access"
+    "message": "Favoritartiklar för enkel åtkomst"
   },
   "hasItemsVaultNudgeBodyThree": {
-    "message": "Search your vault for something else"
+    "message": "Sök i ditt valv efter något annat"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Spara tid med autofyll"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Inkludera ett",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Webbplats",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "så att den här inloggningen visas som ett förslag för autofyll.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Sömlös utcheckning online"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Med kort kan du enkelt autofylla betalningsformulär på ett säkert och exakt sätt."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Förenkla skapandet av konton"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Med identiteter kan du snabbt autofylla långa registrerings- eller kontaktformulär."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Håll dina känsliga uppgifter säkra"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Med anteckningar kan du säkert lagra känslig information som bank- eller försäkringsuppgifter."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Utvecklarvänlig SSH-åtkomst"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Förvara dina nycklar och anslut till SSH-agenten för snabb, krypterad autentisering.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Läs mer om SSH-agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "Skapa lösenord snabbt"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "Skapa enkelt starka och unika lösenord genom att klicka på",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "för att hjälpa dig att hålla dina inloggningar säkra.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "Skapa enkelt starka och unika lösenord genom att klicka på knappen Generera lösenord så att du kan hålla dina inloggningar säkra.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
-    "message": "You do not have permissions to view this page. Try logging in with a different account."
+    "message": "Du har inte behörighet att visa den här sidan. Försök att logga in med ett annat konto."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly stöds inte av din webbläsare eller är inte aktiverat. WebAssembly krävs för att använda Bitwarden-appen.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/te/messages.json b/apps/browser/src/_locales/te/messages.json
index 4775d1f7af0..ecc7da63e79 100644
--- a/apps/browser/src/_locales/te/messages.json
+++ b/apps/browser/src/_locales/te/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "Ask to update existing login"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium membership"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "PIN code is required."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "All Sends",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Authenticating"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/th/messages.json b/apps/browser/src/_locales/th/messages.json
index fd9bac62391..c085b7557e0 100644
--- a/apps/browser/src/_locales/th/messages.json
+++ b/apps/browser/src/_locales/th/messages.json
@@ -3,42 +3,42 @@
     "message": "bitwarden"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "โลโก้ Bitwarden"
   },
   "extName": {
-    "message": "Bitwarden Password Manager",
+    "message": "Bitwarden - จัดการรหัสผ่าน",
     "description": "Extension name, MUST be less than 40 characters (Safari restriction)"
   },
   "extDesc": {
-    "message": "At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information",
+    "message": "ไม่ว่าจะอยู่ที่ไหน Bitwarden ก็สามารถปกป้องรหัสผ่าน พาสคีย์ และข้อมูลสำคัญของคุณได้อย่างง่ายดาย",
     "description": "Extension description, MUST be less than 112 characters (Safari restriction)"
   },
   "loginOrCreateNewAccount": {
     "message": "ล็อกอิน หรือ สร้างบัญชีใหม่ เพื่อใช้งานตู้นิรภัยของคุณ"
   },
   "inviteAccepted": {
-    "message": "Invitation accepted"
+    "message": "ตอบรับคำเชิญแล้ว"
   },
   "createAccount": {
     "message": "สร้างบัญชี"
   },
   "newToBitwarden": {
-    "message": "New to Bitwarden?"
+    "message": "เพิ่งเริ่มใช้ Bitwarden ใช่ไหม?"
   },
   "logInWithPasskey": {
-    "message": "Log in with passkey"
+    "message": "เข้าสู่ระบบด้วยพาสคีย์"
   },
   "useSingleSignOn": {
-    "message": "Use single sign-on"
+    "message": "ใช้การลงชื่อเพียงครั้งเดียว"
   },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "ยินดีต้อนรับกลับมา"
   },
   "setAStrongPassword": {
-    "message": "Set a strong password"
+    "message": "ตั้งรหัสผ่านที่รัดกุม"
   },
   "finishCreatingYourAccountBySettingAPassword": {
-    "message": "Finish creating your account by setting a password"
+    "message": "ดำเนินการสร้างบัญชีของคุณให้เสร็จสมบูรณ์โดยการตั้งรหัสผ่าน"
   },
   "enterpriseSingleSignOn": {
     "message": "Enterprise Single Sign-On"
@@ -65,7 +65,7 @@
     "message": "คำใบ้เกี่ยวกับรหัสผ่านหลักสามารถช่วยให้คุณนึกรหัสผ่านหลักออกได้หากลืม"
   },
   "masterPassHintText": {
-    "message": "If you forget your password, the password hint can be sent to your email. $CURRENT$/$MAXIMUM$ character maximum.",
+    "message": "หากคุณลืมรหัสผ่าน ระบบสามารถส่งคำใบ้รหัสผ่านไปยังอีเมลของคุณได้ จำกัด $CURRENT$/$MAXIMUM$ ตัวอักษร",
     "placeholders": {
       "current": {
         "content": "$1",
@@ -84,7 +84,7 @@
     "message": "Master Password Hint (optional)"
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "คะแนนความรัดกุมของรหัสผ่าน $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -264,7 +264,7 @@
     "message": "Request password hint"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Enter your account email address and your password hint will be sent to you"
+    "message": "กรอกที่อยู่อีเมลบัญชีของคุณ แล้วระบบจะส่งคำใบ้รหัสผ่านไปให้คุณ"
   },
   "getMasterPasswordHint": {
     "message": "รับคำใบ้เกี่ยวกับรหัสผ่านหลักของคุณ"
@@ -668,7 +668,7 @@
     "message": "ตู้เซฟของคุณถูกล็อก ยืนยันตัวตนของคุณเพื่อดำเนินการต่อ"
   },
   "yourVaultIsLockedV2": {
-    "message": "Your vault is locked"
+    "message": "ห้องนิรภัยของคุณถูกล็อก"
   },
   "yourAccountIsLocked": {
     "message": "Your account is locked"
@@ -1022,7 +1022,7 @@
     "message": "The \"Add Login Notification\" automatically prompts you to save new logins to your vault whenever you log into them for the first time."
   },
   "addLoginNotificationDescAlt": {
-    "message": "Ask to add an item if one isn't found in your vault. Applies to all logged in accounts."
+    "message": "หากไม่พบรายการในห้องนิรภัยของคุณ ระบบจะถามเพื่อเพิ่มรายการ มีผลกับทุกบัญชีที่ลงชื่อเข้าใช้"
   },
   "showCardsInVaultViewV2": {
     "message": "Always show cards as Autofill suggestions on Vault view"
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "ขอให้ปรับปรุงการเข้าสู่ระบบที่มีอยู่"
   },
@@ -1342,7 +1348,7 @@
     "message": "ลบไฟล์แนบแล้ว"
   },
   "newAttachment": {
-    "message": "Add New Attachment"
+    "message": "เพิ่มไฟล์แนบใหม่"
   },
   "noAttachments": {
     "message": "ไม่มีไฟล์แนบ"
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Feature Unavailable"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "Premium Membership"
@@ -1544,7 +1550,7 @@
     "message": "FIDO2 WebAuthn"
   },
   "webAuthnDesc": {
-    "message": "Use any WebAuthn compatible security key to access your account."
+    "message": "ใช้กุญแจความปลอดภัยที่รองรับ WebAuthn ใดก็ได้เพื่อเข้าถึงบัญชีของคุณ"
   },
   "emailTitle": {
     "message": "อีเมล"
@@ -1597,7 +1603,7 @@
     "description": "Represents the message for allowing the user to enable the autofill overlay"
   },
   "autofillSuggestionsSectionTitle": {
-    "message": "Autofill suggestions"
+    "message": "คำแนะนำการกรอกข้อมูลอัตโนมัติ"
   },
   "autofillSpotlightTitle": {
     "message": "Easily find autofill suggestions"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH key"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "New $TYPE$",
     "placeholders": {
@@ -2145,16 +2154,16 @@
     "message": "ปลดล็อกด้วย PIN"
   },
   "setYourPinTitle": {
-    "message": "Set PIN"
+    "message": "ตั้ง PIN"
   },
   "setYourPinButton": {
-    "message": "Set PIN"
+    "message": "ตั้ง PIN"
   },
   "setYourPinCode": {
     "message": "ตั้ง PIN เพื่อใช้ปลดล็อก Bitwarden ทั้งนี้ หากคุณล็อกเอาต์ออกจากแอปโดยสมบูรณ์จะเป็นการลบการตั้งค่า PIN ของคุณด้วย"
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "ตั้ง PIN เพื่อใช้ปลดล็อก Bitwarden และหากคุณล็อกเอาต์ออกจากแอปโดยสมบูรณ์จะเป็นการลบการตั้งค่า PIN ของคุณ"
   },
   "pinRequired": {
     "message": "ต้องระบุ PIN"
@@ -2169,7 +2178,7 @@
     "message": "ปลดล็อกด้วยไบโอเมตริก"
   },
   "unlockWithMasterPassword": {
-    "message": "Unlock with master password"
+    "message": "เข้าสู่ระบบด้วยรหัสผ่านหลัก"
   },
   "awaitDesktop": {
     "message": "Awaiting confirmation from desktop"
@@ -2181,7 +2190,7 @@
     "message": "ล็อคด้วยรหัสผ่านหลักเมื่อรีสตาร์ทเบราว์เซอร์"
   },
   "lockWithMasterPassOnRestart1": {
-    "message": "Require master password on browser restart"
+    "message": "กำหนดให้ป้อนรหัสผ่านหลักเมื่อรีสตาร์ทเบราว์เซอร์"
   },
   "selectOneCollection": {
     "message": "คุณต้องเลือกอย่างน้อยหนึ่งคอลเลกชัน"
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has blocked importing items into your individual vault."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "Send ทั้งหมด",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Hide text by default"
   },
@@ -2859,7 +2908,7 @@
     "message": "Hide your email address from viewers."
   },
   "passwordPrompt": {
-    "message": "Master password re-prompt"
+    "message": "การยืนยันให้ป้อนรหัสผ่านหลักอีกครั้ง"
   },
   "passwordConfirmation": {
     "message": "Master password confirmation"
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature. You can verify your email in the web vault."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -3373,7 +3425,7 @@
     "message": "Fingerprint phrase"
   },
   "fingerprintMatchInfo": {
-    "message": "Please make sure your vault is unlocked and the Fingerprint phrase matches on the other device."
+    "message": "โปรดตรวจสอบให้แน่ใจว่าห้องนิรภัยของคุณปลดล็อกอยู่ และลายนิ้วมือตรงกันบนอุปกรณ์อื่น"
   },
   "resendNotification": {
     "message": "Resend notification"
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Request sent"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "Organization SSO identifier is required."
   },
@@ -3596,10 +3657,10 @@
     "message": "Organization is not trusted"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "เพื่อความปลอดภัยของบัญชีของคุณ โปรดยืนยันว่าคุณได้ให้สิทธิ์การเข้าถึงในกรณีฉุกเฉินแก่ผู้ใช้นี้ และลายนิ้วมือของผู้ใช้ตรงกับที่แสดงในบัญชีของพวกเขาเท่านั้น"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "เพื่อความปลอดภัยของบัญชีของคุณ ให้ดำเนินการต่อเมื่อคุณเป็นสมาชิกขององค์กรนี้, ได้เปิดใช้งานการกู้คืนบัญชี, และลายนิ้วมือที่แสดงด้านล่างตรงกับลายนิ้วมือขององค์กรเท่านั้น"
   },
   "orgTrustWarning1": {
     "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -3885,7 +3938,7 @@
     "message": "Verification required for this action. Set a PIN to continue."
   },
   "setPin": {
-    "message": "Set PIN"
+    "message": "ตั้ง PIN"
   },
   "verifyWithBiometrics": {
     "message": "Verify with biometrics"
@@ -3982,10 +4035,10 @@
     "message": "Select the import file"
   },
   "chooseFile": {
-    "message": "Choose File"
+    "message": "เลือกไฟล์"
   },
   "noFileChosen": {
-    "message": "No file chosen"
+    "message": "ไม่มีไฟล์ที่เลือก"
   },
   "orCopyPasteFileContents": {
     "message": "or copy/paste the import file contents"
@@ -4016,7 +4069,7 @@
     "message": "Passkey"
   },
   "accessing": {
-    "message": "Accessing"
+    "message": "กำลังเข้าถึง"
   },
   "loggedInExclamation": {
     "message": "Logged in!"
@@ -4170,7 +4223,7 @@
     "message": "Available accounts"
   },
   "accountLimitReached": {
-    "message": "Account limit reached. Log out of an account to add another."
+    "message": "ถึงขีดจำกัดของบัญชีแล้ว กรุณาออกจากระบบบัญชีอื่นเพื่อเพิ่มบัญชีใหม่"
   },
   "active": {
     "message": "active"
@@ -4209,6 +4262,26 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Continue to browser settings?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -4425,7 +4498,7 @@
     "message": "Admin Console"
   },
   "accountSecurity": {
-    "message": "Account security"
+    "message": "ความปลอดภัยของบัญชี"
   },
   "notifications": {
     "message": "Notifications"
@@ -4498,10 +4571,10 @@
     "message": "Additional information"
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "ประวัติการแก้ไขรายการ"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "แก้ไขล่าสุดเมื่อ"
   },
   "ownerYou": {
     "message": "Owner: You"
@@ -4513,13 +4586,13 @@
     "message": "Copy Successful"
   },
   "upload": {
-    "message": "Upload"
+    "message": "อัปโหลด"
   },
   "addAttachment": {
-    "message": "Add attachment"
+    "message": "เพิ่มไฟล์แนบ"
   },
   "maxFileSizeSansPunctuation": {
-    "message": "Maximum file size is 500 MB"
+    "message": "ขนาดไฟล์สูงสุด คือ 500 MB"
   },
   "deleteAttachmentName": {
     "message": "Delete attachment $NAME$",
@@ -4622,7 +4695,7 @@
     "message": "Authenticator key"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "ตัวเลือกในการป้อนอัตโนมัติ"
   },
   "websiteUri": {
     "message": "Website (URI)"
@@ -4702,7 +4775,7 @@
     "message": "Show animations"
   },
   "addAccount": {
-    "message": "Add account"
+    "message": "เพิ่มบัญชี"
   },
   "loading": {
     "message": "Loading"
@@ -4744,7 +4817,7 @@
     }
   },
   "addField": {
-    "message": "Add field"
+    "message": "เพิ่มฟิลด์"
   },
   "add": {
     "message": "Add"
@@ -4756,7 +4829,7 @@
     "message": "Field label"
   },
   "textHelpText": {
-    "message": "Use text fields for data like security questions"
+    "message": "ใช้ช่องข้อความสำหรับเก็บข้อมูล เช่น คำถามเพื่อความปลอดภัย"
   },
   "hiddenHelpText": {
     "message": "Use hidden fields for sensitive data like a password"
@@ -4792,7 +4865,7 @@
     }
   },
   "fieldAdded": {
-    "message": "$LABEL$ added",
+    "message": "เพิ่ม $LABEL$ แล้ว",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4923,7 +4996,7 @@
     "message": "Text Sends"
   },
   "accountActions": {
-    "message": "Account actions"
+    "message": "การจัดการบัญชี"
   },
   "showNumberOfAutofillSuggestions": {
     "message": "Show number of login autofill suggestions on extension icon"
@@ -5034,7 +5107,10 @@
     "message": "You can customize your unlock and timeout settings to more quickly access your vault."
   },
   "unlockPinSet": {
-    "message": "Unlock PIN set"
+    "message": "ตั้งค่า PIN สำหรับปลดล็อกแล้ว"
+  },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
   },
   "authenticating": {
     "message": "Authenticating"
@@ -5271,7 +5347,7 @@
     "message": "Quick and easy login"
   },
   "quickLoginBody": {
-    "message": "Set up biometric unlock and autofill to log into your accounts without typing a single letter."
+    "message": "ตั้งค่าการปลดล็อกด้วยไบโอเมตริกซ์และการกรอกข้อมูลอัตโนมัติ เพื่อลงชื่อเข้าใช้บัญชีของคุณโดยไม่ต้องพิมพ์แม้แต่ตัวอักษรเดียว"
   },
   "secureUser": {
     "message": "Level up your logins"
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/tr/messages.json b/apps/browser/src/_locales/tr/messages.json
index 02d7d15b8a2..5dae8dfcdc4 100644
--- a/apps/browser/src/_locales/tr/messages.json
+++ b/apps/browser/src/_locales/tr/messages.json
@@ -84,7 +84,7 @@
     "message": "Ana parola ipucu (isteğe bağlı)"
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "Parola Güvenlik Puanı $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -350,19 +350,19 @@
     "message": "Bitwarden Secrets Manager"
   },
   "continueToSecretsManagerPageDesc": {
-    "message": "Securely store, manage, and share developer secrets with Bitwarden Secrets Manager. Learn more on the bitwarden.com website."
+    "message": "Geliştirici gizli anahtarlarınızı Bitwarden Secrets Manager ile güvenli bir şekilde saklayın, yönetin ve paylaşın. Daha fazla bilgi için bitwarden.com web sitesini ziyaret edin."
   },
   "passwordlessDotDev": {
     "message": "Passwordless.dev"
   },
   "continueToPasswordlessDotDevPageDesc": {
-    "message": "Create smooth and secure login experiences free from traditional passwords with Passwordless.dev. Learn more on the bitwarden.com website."
+    "message": "Passwordless.dev ile geleneksel parolalara ihtiyaç duymadan sorunsuz ve güvenli oturum açma deneyimleri oluşturun. Daha fazla bilgi için bitwarden.com web sitesini ziyaret edin."
   },
   "freeBitwardenFamilies": {
     "message": "Ücretsiz Bitwarden Aile"
   },
   "freeBitwardenFamiliesPageDesc": {
-    "message": "You are eligible for Free Bitwarden Families. Redeem this offer today in the web app."
+    "message": "Ücretsiz Bitwarden Aile Paketi’nden faydalanmaya hak kazandınız. Bu teklifi bugün web uygulaması üzerinden kullanın."
   },
   "version": {
     "message": "Sürüm"
@@ -398,7 +398,7 @@
     "message": "Klasör adı"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Bir klasörü iç içe yerleştirmek için, üst klasörün adını yazdıktan sonra “/” ekleyin. Örnek: Sosyal/Forumlar"
   },
   "noFoldersAdded": {
     "message": "Hiç klasör eklenmedi"
@@ -468,7 +468,7 @@
     "message": "Parola üretildi"
   },
   "passphraseGenerated": {
-    "message": "Passphrase generated"
+    "message": "Parola ifadesi oluşturuldu"
   },
   "usernameGenerated": {
     "message": "Kullanıcı adı üretildi"
@@ -842,13 +842,13 @@
     "message": "Mevcut web sayfasındaki kimlik doğrulayıcı QR kodunu tarayın"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "2 adımlı doğrulamayı sorunsuz hale getirin"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden, 2 adımlı doğrulama kodlarını saklayabilir ve otomatik olarak doldurabilir. Anahtarı kopyalayıp bu alana yapıştırın."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden, iki adımlı doğrulama kodlarını saklayabilir ve otomatik olarak doldurabilir. Bu web sitesinin doğrulayıcı QR kodunun ekran görüntüsünü almak için kamera simgesini seçin veya anahtarı bu alana kopyalayıp yapıştırın."
   },
   "learnMoreAboutAuthenticators": {
     "message": "Kimlik doğrulayıcılar hakkında bilgi alın"
@@ -878,10 +878,10 @@
     "message": "Kimlik doğrulama uygulamanızdaki kodu girin"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Press your YubiKey to authenticate"
+    "message": "Kimlik doğrulamak için YubiKey’inize dokunun"
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "Hesabınız için Duo iki adımlı giriş gereklidir. Giriş işlemini tamamlamak için aşağıdaki adımları izleyin."
   },
   "followTheStepsBelowToFinishLoggingIn": {
     "message": "Girişi tamamlamak için aşağıdaki adımları izleyin."
@@ -1141,7 +1141,7 @@
     "description": "Message displayed when login details are successfully updated."
   },
   "loginUpdateTaskSuccess": {
-    "message": "Great job! You took the steps to make you and $ORGANIZATION$ more secure.",
+    "message": "Harika iş çıkardınız! Kendinizi ve $ORGANIZATION$’ı daha güvenli hale getirmek için gereken adımları attınız.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1150,7 +1150,7 @@
     "description": "Shown to user after login is updated."
   },
   "loginUpdateTaskSuccessAdditional": {
-    "message": "Thank you for making $ORGANIZATION$ more secure. You have $TASK_COUNT$ more passwords to update.",
+    "message": "$ORGANIZATION$’ı daha güvenli hale getirdiğiniz için teşekkürler. Güncellemeniz gereken $TASK_COUNT$ adet parola daha var.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1162,7 +1162,7 @@
     "description": "Shown to user after login is updated."
   },
   "nextSecurityTaskAction": {
-    "message": "Change next password",
+    "message": "Sonraki parolayı değiştir",
     "description": "Message prompting user to undertake completion of another security task."
   },
   "saveFailure": {
@@ -1173,6 +1173,12 @@
     "message": "Bu hesabı kaydedemedik. Bilgileri elle girmeyi deneyin.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "Parolanızı değiştirdikten sonra yeni parolanızyla tekrar giriş yapmanız gerekecektir. Diğer cihazlarınızdaki aktif oturumlar bir saat içinde kapatılacaktır."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Hesap kurtarmayı tamamlamak için ana parolanızı değiştirin."
+  },
   "enableChangedPasswordNotification": {
     "message": "Mevcut hesapları güncellemeyi öner"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "Özellik kullanılamıyor"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Şifreleme anahtarınızın güncellenmesi gerekiyor. Şifreleme anahtarınızı güncellemek için lütfen web kasasına giriş yapın."
+  "legacyEncryptionUnsupported": {
+    "message": "Eski şifreleme artık desteklenmemektedir. Hesabınızı kurtarmak için lütfen destek ekibiyle iletişime geçin."
   },
   "premiumMembership": {
     "message": "Premium üyelik"
@@ -1496,7 +1502,7 @@
     "message": "Güvenlik anahtarını oku"
   },
   "awaitingSecurityKeyInteraction": {
-    "message": "Awaiting security key interaction..."
+    "message": "Güvenlik anahtarı etkileşimi bekleniyor…"
   },
   "loginUnavailable": {
     "message": "Giriş yapılamıyor"
@@ -1556,13 +1562,13 @@
     "message": "Şirket içinde barındırılan ortam"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com"
+    "message": "Yerel sunucunuzda barındırılan Bitwarden kurulumunuzun temel URL’sini belirtin. Örnek: https://bitwarden.sirketiniz.com"
   },
   "selfHostedCustomEnvHeader": {
     "message": "İleri düzey yapılandırma için her hizmetin taban URL'sini bağımsız olarak belirleyebilirsiniz."
   },
   "selfHostedEnvFormInvalid": {
-    "message": "You must add either the base Server URL or at least one custom environment."
+    "message": "Temel Sunucu URL’sini veya en az bir özel ortam eklemelisiniz."
   },
   "customEnvironment": {
     "message": "Özel ortam"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH anahtarı"
   },
+  "typeNote": {
+    "message": "Not"
+  },
   "newItemHeader": {
     "message": "Yeni $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Bitwarden'ı açarken kullanacağınız PIN kodunu belirleyin. Uygulamadan tamamen çıkış yaparsanız PIN ayarlarınız sıfırlanacaktır."
   },
-  "setYourPinCode1": {
-    "message": "Bitwarden'ın kilidini açmak için ana parolanız yerine PIN'iniz kullanılacaktır. Bitwarden'dan tamamen çıkış yaparsanız PIN'iniz sıfırlanır."
+  "setPinCode": {
+    "message": "Bitwarden'ın kilidini açmak için bu PIN'i kullanabilirsiniz. Uygulamadan tamamen çıkış yaparsanız PIN'iniz sıfırlanacaktır."
   },
   "pinRequired": {
     "message": "PIN kodu gerekli."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Bu parolayı kullan"
   },
+  "useThisPassphrase": {
+    "message": "Bu parola ifadesini kullanın"
+  },
   "useThisUsername": {
     "message": "Bu kullanıcı adını kullan"
   },
@@ -2374,7 +2386,7 @@
     "message": "Gizlilik Politikası"
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Yeni parolanız mevcut parolanızla aynı olamaz."
   },
   "hintEqualsPassword": {
     "message": "Parola ipucunuz parolanızla aynı olamaz."
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Bir kuruluş ilkesi, kayıtları kişisel kasanıza içe aktarmayı engelledi."
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "Alan adları",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Değiştir"
   },
+  "changePassword": {
+    "message": "Parolayı değiştir",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Parolayı değiştir - $ITEMNAME$",
     "placeholders": {
@@ -2521,11 +2543,14 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Riskli parolalar"
+  },
   "atRiskPasswords": {
     "message": "Riskli parolalar"
   },
   "atRiskPasswordDescSingleOrg": {
-    "message": "$ORGANIZATION$ is requesting you change one password because it is at-risk.",
+    "message": "$ORGANIZATION$, risk altında olduğu için bir parolanızı değiştirmenizi istiyor.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2534,7 +2559,7 @@
     }
   },
   "atRiskPasswordsDescSingleOrgPlural": {
-    "message": "$ORGANIZATION$ is requesting you change the $COUNT$ passwords because they are at-risk.",
+    "message": "$ORGANIZATION$, risk altında oldukları için $COUNT$ adet parolanızı değiştirmenizi istiyor.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2547,7 +2572,7 @@
     }
   },
   "atRiskPasswordsDescMultiOrgPlural": {
-    "message": "Your organizations are requesting you change the $COUNT$ passwords because they are at-risk.",
+    "message": "Organizasyonlarınız, risk altında oldukları için $COUNT$ adet parolanızı değiştirmenizi istiyor.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2555,11 +2580,31 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
-    "message": "Review and change one at-risk password"
+    "message": "Risk altında olan bir parolayı inceleyin ve değiştirin"
   },
   "reviewAndChangeAtRiskPasswordsPlural": {
-    "message": "Review and change $COUNT$ at-risk passwords",
+    "message": "Risk altında olan $COUNT$ adet parolayı inceleyin ve değiştirin",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2568,40 +2613,40 @@
     }
   },
   "changeAtRiskPasswordsFaster": {
-    "message": "Change at-risk passwords faster"
+    "message": "Risk altındaki parolaları daha hızlı değiştirin"
   },
   "changeAtRiskPasswordsFasterDesc": {
-    "message": "Update your settings so you can quickly autofill your passwords and generate new ones"
+    "message": "Ayarlarınızı güncelleyin, böylece parolalarınızı hızlıca otomatik doldurabilir ve yeni parolalar oluşturabilirsiniz"
   },
   "reviewAtRiskLogins": {
-    "message": "Review at-risk logins"
+    "message": "Risk altındaki girişleri inceleyin"
   },
   "reviewAtRiskPasswords": {
-    "message": "Review at-risk passwords"
+    "message": "Risk altındaki parolaları inceleyin"
   },
   "reviewAtRiskLoginsSlideDesc": {
-    "message": "Your organization passwords are at-risk because they are weak, reused, and/or exposed.",
+    "message": "Organizasyonunuzun parolaları zayıf, tekrar kullanılmış ve/veya açığa çıkmış olduğu için risk altındadır.",
     "description": "Description of the review at-risk login slide on the at-risk password page carousel"
   },
   "reviewAtRiskLoginSlideImgAltPeriod": {
-    "message": "Illustration of a list of logins that are at-risk."
+    "message": "Risk altında olan girişlerin bir listesinin görseli."
   },
   "generatePasswordSlideDesc": {
-    "message": "Quickly generate a strong, unique password with the Bitwarden autofill menu on the at-risk site.",
+    "message": "Risk altındaki sitede Bitwarden otomatik doldurma menüsü ile hızlıca güçlü ve benzersiz bir parola oluşturun.",
     "description": "Description of the generate password slide on the at-risk password page carousel"
   },
   "generatePasswordSlideImgAltPeriod": {
-    "message": "Illustration of the Bitwarden autofill menu displaying a generated password."
+    "message": "Oluşturulan parolayı gösteren Bitwarden otomatik doldurma menüsünün görseli."
   },
   "updateInBitwarden": {
-    "message": "Update in Bitwarden"
+    "message": "Bitwarden’da güncelleyin"
   },
   "updateInBitwardenSlideDesc": {
-    "message": "Bitwarden will then prompt you to update the password in the password manager.",
+    "message": "Bitwarden, ardından parola yöneticisinde parolayı güncellemeniz için sizi yönlendirecektir.",
     "description": "Description of the update in Bitwarden slide on the at-risk password page carousel"
   },
   "updateInBitwardenSlideImgAltPeriod": {
-    "message": "Illustration of a Bitwarden’s notification prompting the user to update the login."
+    "message": "Kullanıcıya giriş bilgilerini güncellemesi için bildirim gönderen Bitwarden’in görseli."
   },
   "turnOnAutofill": {
     "message": "Otomatik doldurmayı etkinleştir"
@@ -2674,6 +2719,10 @@
     "message": "Tüm Send'ler",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Maksimum erişim sayısına ulaşıldı",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Metni varsayılan olarak gizle"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Bu özelliği kullanmak için e-postanızı doğrulamanız gerekir. E-postanızı web kasasında doğrulayabilirsiniz."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Ana parola başarıyla ayarlandı"
+  },
   "updatedMasterPassword": {
     "message": "Ana parola güncellendi"
   },
@@ -2889,7 +2941,7 @@
     "message": "Ana parolanız kuruluş ilkelerinizi karşılamıyor. Kasanıza erişmek için ana parolanızı güncellemelisiniz. Devam ettiğinizde oturumunuz kapanacak ve yeniden oturum açmanız gerekecektir. Diğer cihazlardaki aktif oturumlar bir saate kadar aktif kalabilir."
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
+    "message": "Organizasyonunuz, güvenilir cihaz şifrelemesini devre dışı bıraktı. Kasanıza erişmek için lütfen bir ana parola belirleyin."
   },
   "resetPasswordPolicyAutoEnroll": {
     "message": "Otomatik eklenme"
@@ -3015,7 +3067,7 @@
     "message": "Benzersiz tanımlayıcı bulunamadı."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Aşağıdaki organizasyonun üyeleri için artık ana parola gerekmemektedir. Lütfen alan adını organizasyon yöneticinizle doğrulayın."
   },
   "organizationName": {
     "message": "Kuruluş adı"
@@ -3084,14 +3136,14 @@
     "message": "Şifre çözme sorunu"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "Bitwarden, aşağıda listelenen kasa öğelerinin şifresini çözemedi."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "Müşteri ekibi ile başarıyla iletişime geçtin",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "Ek veri kaybını önlemek için.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "generateUsername": {
@@ -3115,7 +3167,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " Use $RECOMMENDED$ characters or more to generate a strong password.",
+    "message": "Güçlü bir parola oluşturmak için $RECOMMENDED$ veya daha fazla karakter kullanın.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3125,7 +3177,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Use $RECOMMENDED$ words or more to generate a strong passphrase.",
+    "message": "Güçlü bir parola ifadesi oluşturmak için $RECOMMENDED$ veya daha fazla kelime kullanın.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3202,7 +3254,7 @@
     }
   },
   "forwaderInvalidToken": {
-    "message": "Invalid $SERVICENAME$ API token",
+    "message": "Geçersiz $SERVICENAME$ API anahtarı",
     "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -3212,7 +3264,7 @@
     }
   },
   "forwaderInvalidTokenWithMessage": {
-    "message": "Invalid $SERVICENAME$ API token: $ERRORMESSAGE$",
+    "message": "Geçersiz $SERVICENAME$ API anahtarı: $ERRORMESSAGE$",
     "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -3226,7 +3278,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "message": "$SERVICENAME$, isteğinizi reddetti. Yardım için lütfen hizmet sağlayıcınızla iletişime geçin.",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -3236,7 +3288,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$, isteğinizi reddetti: $ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -3250,7 +3302,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Unable to obtain $SERVICENAME$ masked email account ID.",
+    "message": "$SERVICENAME$ maskeli e-posta hesap kimliği alınamıyor.",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "İstek gönderildi"
   },
+  "masterPasswordChanged": {
+    "message": "Ana parola kaydedildi"
+  },
   "exposedMasterPassword": {
     "message": "Açığa Çıkmış Ana Parola"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Yönetici onayı iste"
   },
+  "unableToCompleteLogin": {
+    "message": "Oturum açma tamamlanamadı"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Güvenilen bir cihazdan oturum açmalı veya yöneticinizden size parola atamasını istemelisiniz."
+  },
   "ssoIdentifierRequired": {
     "message": "Kuruluş SSO tanımlayıcısı gereklidir."
   },
@@ -3584,10 +3645,10 @@
     "message": "Cihaza güvenildi"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Organizasyona güven"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Güven"
   },
   "doNotTrust": {
     "message": "Güvenme"
@@ -3596,24 +3657,16 @@
     "message": "Kuruluş güvenilir değil"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Hesabınızın güvenliği için, yalnızca bu kullanıcıya acil erişim yetkisi verdiyseniz ve parmak izi hesaplarındakiyle uyuşuyorsa onaylayın."
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Hesabınızın güvenliği için, yalnızca bu kuruluşun bir üyesiyseniz, hesap kurtarma etkinse ve aşağıda görüntülenen parmak izi kuruluşun parmak iziyle eşleşiyorsa devam edin."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Bu kuruluşun, sizi hesap kurtarma sistemine kaydedecek bir kurumsal politikası vardır. Bu kaydolma işlemi, kuruluş yöneticilerinin parolanızı değiştirmesine izin verir. Yalnızca bu kuruluşu tanıyorsanız ve aşağıda görüntülenen parmak izi ifadesi kuruluşun parmak iziyle eşleşiyorsa devam edin."
   },
   "trustUser": {
-    "message": "Trust user"
-  },
-  "sendsNoItemsTitle": {
-    "message": "Aktif Send yok",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Şifrelenmiş bilgileri güvenle paylaşmak için Send'i kullanabilirsiniz.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+    "message": "Kullanıcıya güven"
   },
   "sendsTitleNoItems": {
     "message": "Hassas bilgileri güvenle paylaşın",
@@ -4209,6 +4262,26 @@
     "message": "Sık kullanılan biçimler",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Gelişmiş seçenekler",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Tarayıcı ayarlarına gidilsin mi?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "Kimlik doğrulanıyor"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "Bu sayfayı görüntüleme izniniz yok. Farklı bir hesapla giriş yapmayı deneyin."
+  },
+  "wasmNotSupported": {
+    "message": "Tarayıcınızda WebAssembly desteklenmiyor veya etkinleştirilmemişt. Bitwarden uygulamasını kullanmak için WebAssembly gereklidir.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/uk/messages.json b/apps/browser/src/_locales/uk/messages.json
index 9406aabe088..3d25e982642 100644
--- a/apps/browser/src/_locales/uk/messages.json
+++ b/apps/browser/src/_locales/uk/messages.json
@@ -1072,7 +1072,7 @@
     "description": "Aria label for the view button in notification bar confirmation message"
   },
   "notificationNewItemAria": {
-    "message": "New Item, opens in new window",
+    "message": "Новий запис, відкривається у новому вікні",
     "description": "Aria label for the new item button in notification bar confirmation message when error is prompted"
   },
   "notificationEditTooltip": {
@@ -1093,15 +1093,15 @@
     }
   },
   "notificationLoginSaveConfirmation": {
-    "message": "saved to Bitwarden.",
+    "message": "збережено до Bitwarden.",
     "description": "Shown to user after item is saved."
   },
   "notificationLoginUpdatedConfirmation": {
-    "message": "updated in Bitwarden.",
+    "message": "оновлено в Bitwarden.",
     "description": "Shown to user after item is updated."
   },
   "selectItemAriaLabel": {
-    "message": "Select $ITEMTYPE$, $ITEMNAME$",
+    "message": "Вибрати $ITEMTYPE$, $ITEMNAME$",
     "description": "Used by screen readers. $1 is the item type (like vault or folder), $2 is the selected item name.",
     "placeholders": {
       "itemType": {
@@ -1121,7 +1121,7 @@
     "description": "Button text for updating an existing login entry."
   },
   "unlockToSave": {
-    "message": "Unlock to save this login",
+    "message": "Розблокуйте, щоб зберегти цей запис",
     "description": "User prompt to take action in order to save the login they just entered."
   },
   "saveLogin": {
@@ -1173,6 +1173,12 @@
     "message": "На жаль, не вдається зберегти. Введіть дані вручну.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "Після зміни пароля потрібно буде ввійти в систему з новим паролем. Активні сеанси на інших пристроях буде завершено протягом години."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Змініть свій головний пароль, щоб завершити відновлення облікового запису."
+  },
   "enableChangedPasswordNotification": {
     "message": "Запитувати про оновлення запису"
   },
@@ -1360,13 +1366,13 @@
     "message": "Оберіть файл"
   },
   "maxFileSize": {
-    "message": "Максимальний розмір файлу 500 Мб."
+    "message": "Максимальний розмір файлу 500 МБ."
   },
   "featureUnavailable": {
     "message": "Функція недоступна"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Потрібно перенести ключ шифрування. Увійдіть у вебсховище та оновіть свій ключ шифрування."
+  "legacyEncryptionUnsupported": {
+    "message": "Застаріле шифрування більше не підтримується. Зверніться до служби підтримки, щоб відновити обліковий запис."
   },
   "premiumMembership": {
     "message": "Преміум статус"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "Ключ SSH"
   },
+  "typeNote": {
+    "message": "Нотатка"
+  },
   "newItemHeader": {
     "message": "Новий $TYPE$",
     "placeholders": {
@@ -2042,7 +2051,7 @@
     "message": "Починається з"
   },
   "regEx": {
-    "message": "Звичайний вираз",
+    "message": "Регулярний вираз",
     "description": "A programming term, also known as 'RegEx'."
   },
   "matchDetection": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "Встановіть PIN-код для розблокування Bitwarden. Налаштування PIN-коду будуть скинуті, якщо ви коли-небудь повністю вийдете з програми."
   },
-  "setYourPinCode1": {
-    "message": "PIN-код буде використовуватися для розблокування Bitwarden замість головного пароля. У разі повного виходу з Bitwarden, ваш PIN-код буде скинуто."
+  "setPinCode": {
+    "message": "Ви можете використовувати цей PIN-код для розблокування Bitwarden. PIN-код буде скинуто, якщо ви вийдете з програми."
   },
   "pinRequired": {
     "message": "Необхідний PIN-код."
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "Використати цей пароль"
   },
+  "useThisPassphrase": {
+    "message": "Використати цю парольну фразу"
+  },
   "useThisUsername": {
     "message": "Використати це ім'я користувача"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Політика організації заблокувала імпортування записів до вашого особистого сховища."
   },
+  "restrictCardTypeImport": {
+    "message": "Не вдається імпортувати записи карток"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Політика принаймні однієї організації не дозволяє вам імпортувати записи карток до сховища."
+  },
   "domainsTitle": {
     "message": "Домени",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Змінити"
   },
+  "changePassword": {
+    "message": "Змінити пароль",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Змінити пароль – $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Ризикований пароль"
+  },
   "atRiskPasswords": {
     "message": "Ризиковані паролі"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Пароль для цього сайту ризикований. Організація $ORGANIZATION$ попросила вас змінити його.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ хоче, щоб ви змінили цей пароль, тому що він ризикований. Перейдіть до налаштувань облікового запису, щоб змінити пароль.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Перегляньте і змініть один ризикований пароль"
   },
@@ -2674,6 +2719,10 @@
     "message": "Усі відправлення",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Досягнуто максимальної кількості доступів",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "Типово приховувати текст"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "Для використання цієї функції необхідно підтвердити електронну пошту. Ви можете виконати підтвердження у вебсховищі."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Головний пароль успішно встановлено"
+  },
   "updatedMasterPassword": {
     "message": "Головний пароль оновлено"
   },
@@ -3015,13 +3067,13 @@
     "message": "Не знайдено унікальний ідентифікатор."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Головний пароль більше не є обов'язковим для учасників зазначеної організації. Підтвердьте вказаний нижче домен з адміністратором вашої організації."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Назва організації"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Домен Key Connector"
   },
   "leaveOrganization": {
     "message": "Покинути організацію"
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "Запит надіслано"
   },
+  "masterPasswordChanged": {
+    "message": "Головний пароль збережено"
+  },
   "exposedMasterPassword": {
     "message": "Головний пароль викрито"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Запит підтвердження адміністратора"
   },
+  "unableToCompleteLogin": {
+    "message": "Не вдалося завершити вхід"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Ви повинні ввійти до системи на довіреному пристрої або попросити адміністратора призначити вам пароль."
+  },
   "ssoIdentifierRequired": {
     "message": "Потрібен SSO-ідентифікатор організації."
   },
@@ -3607,20 +3668,12 @@
   "trustUser": {
     "message": "Довіряти користувачу"
   },
-  "sendsNoItemsTitle": {
-    "message": "Немає активних відправлень",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Використовуйте відправлення, щоб безпечно надавати доступ іншим до зашифрованої інформації.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "Безпечно надсилайте конфіденційну інформацію",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "Безпечно діліться файлами й даними з ким завгодно, на будь-якій платформі. Ваша інформація наскрізно зашифрована та має обмежений доступ.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -4209,6 +4262,26 @@
     "message": "Поширені формати",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Виявлення збігів URI – це спосіб ідентифікації пропозицій автозаповнення Bitwarden.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "Регулярний вираз – це функція, що має підвищений ризик розкриття облікових даних, призначена для досвідчених користувачів.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Починається з\" – це функція, що має підвищений ризик розкриття облікових даних, призначена для досвідчених користувачів.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Докладніше про виявлення збігів",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Додаткові налаштування",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Відкрити налаштування браузера?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5028,13 +5101,16 @@
     "message": "Біометричне розблокування зараз недоступне з невідомої причини."
   },
   "unlockVault": {
-    "message": "Unlock your vault in seconds"
+    "message": "Розблоковуйте сховище за секунди"
   },
   "unlockVaultDesc": {
-    "message": "You can customize your unlock and timeout settings to more quickly access your vault."
+    "message": "Ви можете налаштувати розблокування і час очікування для швидшого доступу до сховища."
   },
   "unlockPinSet": {
-    "message": "Unlock PIN set"
+    "message": "Розблокування PIN-кодом встановлено"
+  },
+  "unlockWithBiometricSet": {
+    "message": "Біометричне розблокування налаштовано"
   },
   "authenticating": {
     "message": "Аутентифікація"
@@ -5286,7 +5362,7 @@
     "message": "Зберігайте скільки завгодно паролів на необмеженій кількості пристроїв, використовуючи Bitwarden для мобільних пристроїв, браузерів та комп'ютерів."
   },
   "nudgeBadgeAria": {
-    "message": "1 notification"
+    "message": "1 сповіщення"
   },
   "emptyVaultNudgeTitle": {
     "message": "Імпортуйте наявні паролі"
@@ -5301,13 +5377,13 @@
     "message": "Вітаємо у вашому сховищі!"
   },
   "hasItemsVaultNudgeBodyOne": {
-    "message": "Autofill items for the current page"
+    "message": "Автозаповнення записів для поточної сторінки"
   },
   "hasItemsVaultNudgeBodyTwo": {
-    "message": "Favorite items for easy access"
+    "message": "Обрані записи для швидкого доступу"
   },
   "hasItemsVaultNudgeBodyThree": {
-    "message": "Search your vault for something else"
+    "message": "Пошук інших елементів у сховищі"
   },
   "newLoginNudgeTitle": {
     "message": "Заощаджуйте час з автозаповненням"
@@ -5359,23 +5435,27 @@
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "Швидко створюйте паролі"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "Легко створюйте надійні та унікальні паролі, натиснувши на",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "щоб зберегти свої записи в безпеці.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "Легко створюйте надійні та унікальні паролі, натиснувши кнопку Генерувати пароль, щоб зберегти свої записи в безпеці.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
-    "message": "You do not have permissions to view this page. Try logging in with a different account."
+    "message": "У вас немає дозволу переглядати цю сторінку. Спробуйте ввійти з іншим обліковим записом."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly не підтримується або не ввімкнено у вашому браузері. WebAssembly є обов'язковою вимогою для програми Bitwarden.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/vi/messages.json b/apps/browser/src/_locales/vi/messages.json
index 29a7b7109e7..e2752827221 100644
--- a/apps/browser/src/_locales/vi/messages.json
+++ b/apps/browser/src/_locales/vi/messages.json
@@ -10,35 +10,35 @@
     "description": "Extension name, MUST be less than 40 characters (Safari restriction)"
   },
   "extDesc": {
-    "message": "Ở nhà, ở cơ quan, hay trên đường đi, Bitwarden sẽ bảo mật tất cả mật khẩu, mã khoá, và thông tin cá nhân của bạn",
+    "message": "Ở nhà, ở cơ quan hay khi di chuyển, Bitwarden sẽ bảo vệ tất cả mật khẩu, mã khóa và thông tin cá nhân của bạn",
     "description": "Extension description, MUST be less than 112 characters (Safari restriction)"
   },
   "loginOrCreateNewAccount": {
     "message": "Đăng nhập hoặc tạo tài khoản mới để truy cập kho lưu trữ của bạn."
   },
   "inviteAccepted": {
-    "message": "Lời mời được chấp nhận"
+    "message": "Đã chấp nhận lời mời"
   },
   "createAccount": {
     "message": "Tạo tài khoản"
   },
   "newToBitwarden": {
-    "message": "New to Bitwarden?"
+    "message": "Bạn mới sử dụng Bitwarden?"
   },
   "logInWithPasskey": {
-    "message": "Log in with passkey"
+    "message": "Đăng nhập bằng khóa truy cập"
   },
   "useSingleSignOn": {
-    "message": "Use single sign-on"
+    "message": "Dùng đăng nhập một lần"
   },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "Chào mừng bạn trở lại"
   },
   "setAStrongPassword": {
-    "message": "Đặt mật khẩu mạnh"
+    "message": "Đặt một mật khẩu mạnh"
   },
   "finishCreatingYourAccountBySettingAPassword": {
-    "message": "Hoàn thành việc tạo tài khoản của bạn bằng cách đặt mật khẩu"
+    "message": "Hoàn tất việc tạo tài khoản bằng cách đặt mật khẩu"
   },
   "enterpriseSingleSignOn": {
     "message": "Đăng nhập bằng tài khoản tổ chức"
@@ -84,7 +84,7 @@
     "message": "Gợi ý mật khẩu chính (tùy chọn)"
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "Độ mạnh của mật khẩu $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -96,7 +96,7 @@
     "message": "Tham gia tổ chức"
   },
   "joinOrganizationName": {
-    "message": "Join $ORGANIZATIONNAME$",
+    "message": "Tham gia $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -132,16 +132,16 @@
     "message": "Sao chép mật khẩu"
   },
   "copyPassphrase": {
-    "message": "Copy passphrase"
+    "message": "Sao chép cụm mật khẩu"
   },
   "copyNote": {
     "message": "Sao chép ghi chú"
   },
   "copyUri": {
-    "message": "Sao chép URI"
+    "message": "Sao chép đường dẫn"
   },
   "copyUsername": {
-    "message": "Sao chép tên người dùng"
+    "message": "Sao chép tên đăng nhập"
   },
   "copyNumber": {
     "message": "Sao chép số"
@@ -153,10 +153,10 @@
     "message": "Sao chép tên"
   },
   "copyCompany": {
-    "message": "Copy company"
+    "message": "Sao chép công ty"
   },
   "copySSN": {
-    "message": "Số bảo hiểm xã hội"
+    "message": "Sao chép số bảo hiểm xã hội"
   },
   "copyPassportNumber": {
     "message": "Sao chép số hộ chiếu"
@@ -165,16 +165,16 @@
     "message": "Sao chép số giấy phép"
   },
   "copyPrivateKey": {
-    "message": "Copy private key"
+    "message": "Sao chép khóa riêng tư"
   },
   "copyPublicKey": {
-    "message": "Copy public key"
+    "message": "Sao chép khóa công khai"
   },
   "copyFingerprint": {
-    "message": "Copy fingerprint"
+    "message": "Sao chép vân tay"
   },
   "copyCustomField": {
-    "message": "Copy $FIELD$",
+    "message": "Sao chép $FIELD$",
     "placeholders": {
       "field": {
         "content": "$1",
@@ -183,17 +183,17 @@
     }
   },
   "copyWebsite": {
-    "message": "Copy website"
+    "message": "Sao chép trang web"
   },
   "copyNotes": {
-    "message": "Copy notes"
+    "message": "Sao chép ghi chú"
   },
   "copy": {
-    "message": "Copy",
+    "message": "Sao chép",
     "description": "Copy to clipboard"
   },
   "fill": {
-    "message": "Fill",
+    "message": "Điền",
     "description": "This string is used on the vault page to indicate autofilling. Horizontal space is limited in the interface here so try and keep translations as concise as possible."
   },
   "autoFill": {
@@ -209,10 +209,10 @@
     "message": "Tự động điền danh tính"
   },
   "fillVerificationCode": {
-    "message": "Fill verification code"
+    "message": "Điền mã xác minh"
   },
   "fillVerificationCodeAria": {
-    "message": "Fill Verification Code",
+    "message": "Điền mã xác minh",
     "description": "Aria label for the heading displayed the inline menu for totp code autofill"
   },
   "generatePasswordCopied": {
@@ -222,7 +222,7 @@
     "message": "Sao chép tên trường tùy chỉnh"
   },
   "noMatchingLogins": {
-    "message": "Không có thông tin đăng nhập phù hợp."
+    "message": "Không có thông tin đăng nhập phù hợp"
   },
   "noCards": {
     "message": "Không có thẻ"
@@ -246,7 +246,7 @@
     "message": "Đăng nhập vào kho lưu trữ của bạn"
   },
   "autoFillInfo": {
-    "message": "Không có thông tin đăng nhập nào sẵn có để tự động điền vào tab hiện tại."
+    "message": "Hiện không có thông tin đăng nhập nào để tự động điền vào tab hiện tại."
   },
   "addLogin": {
     "message": "Thêm một đăng nhập"
@@ -255,16 +255,16 @@
     "message": "Thêm mục"
   },
   "accountEmail": {
-    "message": "Account email"
+    "message": "Email tài khoản"
   },
   "requestHint": {
-    "message": "Request hint"
+    "message": "Yêu cầu gợi ý"
   },
   "requestPasswordHint": {
-    "message": "Request password hint"
+    "message": "Yêu cầu gợi ý mật khẩu"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Enter your account email address and your password hint will be sent to you"
+    "message": "Nhập địa chỉ email tài khoản của bạn và gợi ý mật khẩu sẽ được gửi đến bạn"
   },
   "getMasterPasswordHint": {
     "message": "Nhận gợi ý mật khẩu chính"
@@ -294,7 +294,7 @@
     "message": "Tiếp tục tới ứng dụng web?"
   },
   "continueToWebAppDesc": {
-    "message": "Khám phá thêm các tính năng của tài khoản Bitwarden của bạn trên bản web."
+    "message": "Khám phá thêm các tính năng tài khoản Bitwarden của bạn trên bản web."
   },
   "continueToHelpCenter": {
     "message": "Tiếp tục tới Trung tâm trợ giúp?"
@@ -306,17 +306,17 @@
     "message": "Tiếp tục tới cửa hàng tiện ích mở rộng của trình duyệt?"
   },
   "continueToBrowserExtensionStoreDesc": {
-    "message": "Giúp người khác tìm hiểu xem Bitwarden có phù hợp với họ không. Hãy truy cập cửa hàng tiện ích mở rộng trên trình duyệt của bạn và đánh giá ngay bây giờ."
+    "message": "Giúp người khác tìm hiểu xem Bitwarden có phù hợp với họ không. Truy cập cửa hàng tiện ích mở rộng của trình duyệt và đánh giá ngay bây giờ."
   },
   "changeMasterPasswordOnWebConfirmation": {
     "message": "Bạn có thể thay đổi mật khẩu chính của mình trên Bitwarden bản web."
   },
   "fingerprintPhrase": {
-    "message": "Cụm vân tay",
+    "message": "Cụm từ xác thực",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "yourAccountsFingerprint": {
-    "message": "Cụm vân tay của tài khoản của bạn",
+    "message": "Cụm từ xác thực tài khoản của bạn",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "twoStepLogin": {
@@ -341,16 +341,16 @@
     "message": "Bitwarden dành cho Doanh Nghiệp"
   },
   "bitwardenAuthenticator": {
-    "message": "Bitwarden Authenticator"
+    "message": "Trình xác thực Bitwarden"
   },
   "continueToAuthenticatorPageDesc": {
-    "message": "Ứng dụng Bitwarden Authenticator cho phép bạn lưu trữ khóa xác thực và tạo mã TOTP cho quy trình xác minh hai bước. Tìm hiểu thêm trên trang web bitwarden.com"
+    "message": "Trình xác thực Bitwarden cho phép bạn lưu trữ các khóa xác thực và tạo mã TOTP cho quy trình xác thực hai bước. Tìm hiểu thêm trên trang web bitwarden.com"
   },
   "bitwardenSecretsManager": {
-    "message": "Bitwarden Secrets Manager"
+    "message": "Trình quản lý Bí mật Bitwarden"
   },
   "continueToSecretsManagerPageDesc": {
-    "message": "Lưu trữ bảo mật, quản lý và chia sẻ bí mật của nhà phát triển với Bitwarden Secrets Manager. Truy cập bitwarden.com để biết thêm chi tiết."
+    "message": "Lưu trữ, quản lý và chia sẻ các thông tin bí mật của nhà phát triển một cách an toàn với Trình quản lý Bí mật Bitwarden. Tìm hiểu thêm trên trang web bitwarden.com."
   },
   "passwordlessDotDev": {
     "message": "Passwordless.dev"
@@ -359,10 +359,10 @@
     "message": "Tạo trải nghiệm đăng nhập mượt mà và an toàn không cần mật khẩu truyền thống với Passwordless.dev. Tìm hiểu thêm trên trang web bitwarden.com."
   },
   "freeBitwardenFamilies": {
-    "message": "Gói Gia đình Miễn phí của Bitwarden"
+    "message": "Gói Bitwarden cho Gia đình miễn phí"
   },
   "freeBitwardenFamiliesPageDesc": {
-    "message": "Bạn đủ điều kiện cho Gói Gia đình Miễn phí của Bitwarden. Hãy nhận ưu đãi này ngay hôm nay trên ứng dụng web."
+    "message": "Bạn đủ điều kiện miễn phí Gói Bitwarden cho Gia đình. Hãy nhận ưu đãi này ngay hôm nay trên web."
   },
   "version": {
     "message": "Phiên bản"
@@ -383,7 +383,7 @@
     "message": "Chỉnh sửa thư mục"
   },
   "editFolderWithName": {
-    "message": "Edit folder: $FOLDERNAME$",
+    "message": "Sửa thư mục: $FOLDERNAME$",
     "placeholders": {
       "foldername": {
         "content": "$1",
@@ -398,16 +398,16 @@
     "message": "Tên thư mục"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Tạo một thư mục con bằng cách thêm tên thư mục cha theo sau là dấu “/”. Ví dụ: Social/Forums"
   },
   "noFoldersAdded": {
-    "message": "No folders added"
+    "message": "Không thêm thư mục nào"
   },
   "createFoldersToOrganize": {
-    "message": "Create folders to organize your vault items"
+    "message": "Tạo thư mục để tổ chức các mục trong kho của bạn"
   },
   "deleteFolderPermanently": {
-    "message": "Are you sure you want to permanently delete this folder?"
+    "message": "Bạn có chắc muốn xóa vĩnh viễn thư mục này?"
   },
   "deleteFolder": {
     "message": "Xóa thư mục"
@@ -450,7 +450,7 @@
     "message": "Tự động tạo mật khẩu mạnh mẽ, độc nhất cho đăng nhập của bạn."
   },
   "bitWebVaultApp": {
-    "message": "Ứng dụng Bitwarden bản web"
+    "message": "Ứng dụng web Bitwarden"
   },
   "importItems": {
     "message": "Nhập mục"
@@ -462,19 +462,19 @@
     "message": "Tạo mật khẩu"
   },
   "generatePassphrase": {
-    "message": "Generate passphrase"
+    "message": "Tạo cụm mật khẩu"
   },
   "passwordGenerated": {
-    "message": "Password generated"
+    "message": "Đã tạo mật khẩu"
   },
   "passphraseGenerated": {
-    "message": "Passphrase generated"
+    "message": "Đã tạo cụm mật khẩu"
   },
   "usernameGenerated": {
-    "message": "Username generated"
+    "message": "Tên đăng nhập được tạo tự động"
   },
   "emailGenerated": {
-    "message": "Email generated"
+    "message": "Email được tạo ra"
   },
   "regeneratePassword": {
     "message": "Tạo lại mật khẩu"
@@ -490,7 +490,7 @@
     "description": "Card header for password generator include block"
   },
   "uppercaseDescription": {
-    "message": "Include uppercase characters",
+    "message": "Bao gồm các ký tự viết hoa",
     "description": "Tooltip for the password generator uppercase character checkbox"
   },
   "uppercaseLabel": {
@@ -498,7 +498,7 @@
     "description": "Label for the password generator uppercase character checkbox"
   },
   "lowercaseDescription": {
-    "message": "Include lowercase characters",
+    "message": "Bao gồm các ký tự viết thường",
     "description": "Full description for the password generator lowercase character checkbox"
   },
   "lowercaseLabel": {
@@ -521,7 +521,7 @@
     "message": "Số từ"
   },
   "wordSeparator": {
-    "message": "Word Separator"
+    "message": "Dấu phân cách từ"
   },
   "capitalize": {
     "message": "Viết hoa",
@@ -534,14 +534,14 @@
     "message": "Số kí tự tối thiểu"
   },
   "minSpecial": {
-    "message": "Số kí tự đặc biệt tối thiểu"
+    "message": "Kí tự đặc biệt tối thiểu"
   },
   "avoidAmbiguous": {
-    "message": "Avoid ambiguous characters",
+    "message": "Tránh các ký tự dễ nhầm lẫn",
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "generatorPolicyInEffect": {
-    "message": "Enterprise policy requirements have been applied to your generator options.",
+    "message": "Các yêu cầu chính sách của doanh nghiệp đã được áp dụng cho các tùy chọn trình tạo của bạn.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "searchVault": {
@@ -557,19 +557,19 @@
     "message": "Không có mục nào để liệt kê."
   },
   "itemInformation": {
-    "message": "Mục thông tin"
+    "message": "Thông tin mục"
   },
   "username": {
-    "message": "Tên người dùng"
+    "message": "Tên đăng nhập"
   },
   "password": {
     "message": "Mật khẩu"
   },
   "totp": {
-    "message": "Khóa xác thực"
+    "message": "Mã xác thực bí mật"
   },
   "passphrase": {
-    "message": "Cụm từ mật khẩu"
+    "message": "Cụm mật khẩu"
   },
   "favorite": {
     "message": "Yêu thích"
@@ -578,16 +578,16 @@
     "message": "Bỏ thích"
   },
   "itemAddedToFavorites": {
-    "message": "Đã thêm vào yêu thích"
+    "message": "Đã thêm mục vào yêu thích"
   },
   "itemRemovedFromFavorites": {
-    "message": "Đã xóa khỏi yêu thích"
+    "message": "Đã xóa mục khỏi yêu thích"
   },
   "notes": {
     "message": "Ghi chú"
   },
   "privateNote": {
-    "message": "Private note"
+    "message": "Ghi chú riêng tư"
   },
   "note": {
     "message": "Ghi chú"
@@ -611,7 +611,7 @@
     "message": "Mở trang web"
   },
   "launchWebsiteName": {
-    "message": "Launch website $ITEMNAME$",
+    "message": "Khởi chạy trang web $ITEMNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -635,16 +635,16 @@
     "message": "Tùy chọn mở khóa"
   },
   "unlockMethodNeededToChangeTimeoutActionDesc": {
-    "message": "Thiết lập phương thức mở khóa để thay đổi hành động hết thời gian chờ của vault."
+    "message": "Thiết lập phương thức mở khóa để thay đổi hành động sau khi đóng kho."
   },
   "unlockMethodNeeded": {
     "message": "Thiết lập phương pháp mở khóa trong Cài đặt"
   },
   "sessionTimeoutHeader": {
-    "message": "Thời gian chờ của phiên"
+    "message": "Thời gian hết phiên"
   },
   "vaultTimeoutHeader": {
-    "message": "Vault timeout"
+    "message": "Thời gian mở kho"
   },
   "otherOptions": {
     "message": "Tùy chọn khác"
@@ -653,28 +653,28 @@
     "message": "Đánh giá tiện ích mở rộng"
   },
   "browserNotSupportClipboard": {
-    "message": "Trình duyệt web của bạn không hỗ trợ dễ dàng sao chép bộ nhớ tạm. Bạn có thể sao chép nó theo cách thủ công để thay thế."
+    "message": "Trình duyệt web của bạn không hỗ trợ sao chép vào bảng nhớ tạm một cách dễ dàng. Vui lòng sao chép thủ công."
   },
   "verifyYourIdentity": {
-    "message": "Verify your identity"
+    "message": "Xác minh danh tính của bạn"
   },
   "weDontRecognizeThisDevice": {
-    "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
+    "message": "Chúng tôi không nhận diện được thiết bị này. Nhập mã được gửi đến email để xác minh danh tính của bạn."
   },
   "continueLoggingIn": {
-    "message": "Continue logging in"
+    "message": "Tiếp tục đăng nhập"
   },
   "yourVaultIsLocked": {
     "message": "Kho của bạn đã bị khóa. Xác minh danh tính của bạn để mở khoá."
   },
   "yourVaultIsLockedV2": {
-    "message": "Your vault is locked"
+    "message": "Kho của bạn đã khóa"
   },
   "yourAccountIsLocked": {
-    "message": "Your account is locked"
+    "message": "Tài khoản của bạn đã bị khóa"
   },
   "or": {
-    "message": "or"
+    "message": "hoặc"
   },
   "unlock": {
     "message": "Mở khóa"
@@ -696,10 +696,10 @@
     "message": "Mật khẩu chính không hợp lệ"
   },
   "vaultTimeout": {
-    "message": "Thời gian chờ của kho"
+    "message": "Đóng kho sau"
   },
   "vaultTimeout1": {
-    "message": "Timeout"
+    "message": "Quá hạn"
   },
   "lockNow": {
     "message": "Khóa ngay"
@@ -741,7 +741,7 @@
     "message": "4 giờ"
   },
   "onLocked": {
-    "message": "Mỗi khi khóa"
+    "message": "Mỗi khi khóa máy"
   },
   "onRestart": {
     "message": "Mỗi khi khởi động lại trình duyệt"
@@ -759,7 +759,7 @@
     "message": "Mật khẩu chính"
   },
   "masterPassImportant": {
-    "message": "Mật khẩu chính của bạn không thể phục hồi nếu bạn quên nó!"
+    "message": "Mật khẩu chính của bạn không thể khôi phục nếu bạn quên nó!"
   },
   "masterPassHintLabel": {
     "message": "Gợi ý mật khẩu chính"
@@ -768,7 +768,7 @@
     "message": "Đã xảy ra lỗi"
   },
   "emailRequired": {
-    "message": "Yêu cầu địa chỉ email."
+    "message": "Cần điền địa chỉ email."
   },
   "invalidEmail": {
     "message": "Địa chỉ email không hợp lệ."
@@ -777,7 +777,7 @@
     "message": "Yêu cầu mật khẩu chính."
   },
   "confirmMasterPasswordRequired": {
-    "message": "Yêu cầu nhập lại mật khẩu chính."
+    "message": "Cần nhập lại mật khẩu chính."
   },
   "masterPasswordMinlength": {
     "message": "Mật khẩu chính phải có ít nhất $VALUE$ kí tự.",
@@ -830,7 +830,7 @@
     }
   },
   "autofillError": {
-    "message": "Không thể tự động điền mục đã chọn trên trang này. Hãy thực hiện sao chép và dán thông tin một cách thủ công."
+    "message": "Không thể tự động điền mục đã chọn trên trang này. Vui lòng sao chép và dán thông tin thủ công."
   },
   "totpCaptureError": {
     "message": "Không thể quét mã QR từ trang web hiện tại"
@@ -842,19 +842,19 @@
     "message": "Quét mã QR xác thực từ trang web hiện tại"
   },
   "totpHelperTitle": {
-    "message": "Thực hiện xác minh hai bước liền mạch"
+    "message": "Giúp quá trình xác minh 2 bước diễn ra liền mạch"
   },
   "totpHelper": {
-    "message": "Bitwarden có thể lưu trữ và điền mã xác minh 2 bước. Sao chép và dán khóa vào trường này."
+    "message": "Bitwarden có thể lưu trữ và điền mã xác thực 2 bước. Sao chép và dán khóa vào ô này."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden có thể lưu trữ và điền mã xác minh 2 bước. Hãy chọn biểu tượng máy ảnh để chụp mã QR xác thực của trang web, hoặc sao chép và dán khoá vào ô này."
+    "message": "Bitwarden có thể lưu trữ và điền mã xác minh 2 bước. Hãy chọn biểu tượng máy ảnh để quét mã QR xác thực của trang web, hoặc sao chép và dán khoá vào ô này."
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "Tìm hiểu thêm về các công cụ xác thực"
   },
   "copyTOTP": {
-    "message": "Sao chép khóa Authenticator (TOTP)"
+    "message": "Sao chép khóa xác thực (TOTP)"
   },
   "loggedOut": {
     "message": "Đã đăng xuất"
@@ -869,25 +869,25 @@
     "message": "Đăng nhập"
   },
   "logInToBitwarden": {
-    "message": "Log in to Bitwarden"
+    "message": "Đăng nhập Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Enter the code sent to your email"
+    "message": "Nhập mã được gửi về email của bạn"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "Nhập mã từ ứng dụng xác thực của bạn"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Press your YubiKey to authenticate"
+    "message": "Nhấn YubiKey của bạn để xác thực"
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "Đăng nhập hai bước là bắt buộc cho tài khoản của bạn. Hãy làm theo các bước dưới đây để hoàn tất quá trình đăng nhập."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "Thực hiện các bước sau để hoàn tất đăng nhập."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Thực hiện các bước sau để hoàn tất đăng nhập bằng khóa bảo mật của bạn."
   },
   "restartRegistration": {
     "message": "Tiến hành đăng ký lại"
@@ -911,7 +911,7 @@
     "message": "Không"
   },
   "location": {
-    "message": "Location"
+    "message": "Vị trí"
   },
   "unexpectedError": {
     "message": "Một lỗi bất ngờ đã xảy ra."
@@ -923,13 +923,13 @@
     "message": "Đã thêm thư mục"
   },
   "twoStepLoginConfirmation": {
-    "message": "Xác thực hai lớp giúp cho tài khoản của bạn an toàn hơn bằng cách yêu cầu bạn xác minh thông tin đăng nhập của bạn bằng một thiết bị khác như khóa bảo mật, ứng dụng xác thực, SMS, cuộc gọi điện thoại hoặc email. Bạn có thể bật xác thực hai lớp trong kho bitwarden nền web. Bạn có muốn ghé thăm trang web bây giờ?"
+    "message": "Đăng nhập hai bước giúp tài khoản của bạn an toàn hơn bằng cách yêu cầu bạn xác minh việc đăng nhập bằng một thiết bị khác như khóa bảo mật, ứng dụng xác thực, SMS, cuộc gọi điện thoại hoặc email. Đăng nhập hai bước có thể được thiết lập trên bitwarden.com. Bạn có muốn truy cập trang web bây giờ không?"
   },
   "twoStepLoginConfirmationContent": {
-    "message": "Make your account more secure by setting up two-step login in the Bitwarden web app."
+    "message": "Tăng cường bảo mật tài khoản của bạn bằng cách thiết lập đăng nhập hai bước trên trang web Bitwarden."
   },
   "twoStepLoginConfirmationTitle": {
-    "message": "Continue to web app?"
+    "message": "Tiếp tục tới ứng dụng web?"
   },
   "editedFolder": {
     "message": "Đã lưu thư mục"
@@ -941,7 +941,7 @@
     "message": "Đã xóa thư mục"
   },
   "gettingStartedTutorial": {
-    "message": "Hướng dẫn Bắt đầu"
+    "message": "Hướng dẫn bắt đầu"
   },
   "gettingStartedTutorialVideo": {
     "message": "Xem hướng dẫn bắt đầu của chúng tôi để tìm hiểu cách tận dụng tối đa tiện ích mở rộng của trình duyệt."
@@ -969,7 +969,7 @@
     }
   },
   "newUri": {
-    "message": "URI mới"
+    "message": "Đường dẫn mới"
   },
   "addDomain": {
     "message": "Thêm tên miền",
@@ -979,13 +979,13 @@
     "message": "Đã thêm mục"
   },
   "editedItem": {
-    "message": "Mục được chỉnh sửa"
+    "message": "Đã lưu mục"
   },
   "deleteItemConfirmation": {
-    "message": "Bạn có chắc bạn muốn xóa mục này?"
+    "message": "Bạn có chắc muốn cho nó vào thùng rác?"
   },
   "deletedItem": {
-    "message": "Đã xóa mục"
+    "message": "Mục đã được cho vào thùng rác"
   },
   "overwritePassword": {
     "message": "Ghi đè mật khẩu"
@@ -994,10 +994,10 @@
     "message": "Bạn có chắc chắn muốn ghi đè mật khẩu hiện tại không?"
   },
   "overwriteUsername": {
-    "message": "Ghi đè tên người dùng"
+    "message": "Ghi đè tên đăng nhập"
   },
   "overwriteUsernameConfirmation": {
-    "message": "Bạn có chắc chắn muốn ghi đè tên người dùng hiện tại không?"
+    "message": "Bạn có chắc chắn muốn ghi đè tên đăng nhập hiện tại không?"
   },
   "searchFolder": {
     "message": "Tìm kiếm thư mục"
@@ -1006,7 +1006,7 @@
     "message": "Tìm kiếm bộ sưu tập"
   },
   "searchType": {
-    "message": "Tìm loại"
+    "message": "Tìm theo thể loại"
   },
   "noneFolder": {
     "message": "Không có thư mục",
@@ -1016,16 +1016,16 @@
     "message": "Hỏi để thêm đăng nhập"
   },
   "vaultSaveOptionsTitle": {
-    "message": "Lưu vào các tùy chọn kho"
+    "message": "Tùy chọn lưu vào kho"
   },
   "addLoginNotificationDesc": {
-    "message": "'Thông báo Thêm đăng nhập' sẽ tự động nhắc bạn lưu các đăng nhập mới vào hầm an toàn của bạn bất cứ khi nào bạn đăng nhập trang web lần đầu tiên."
+    "message": "Nếu không tìm thấy mục nào trong kho của bạn, hãy yêu cầu thêm mục đó."
   },
   "addLoginNotificationDescAlt": {
-    "message": "Đưa ra lựa chọn để thêm một mục nếu không tìm thấy mục đó trong hòm của bạn. Áp dụng với mọi tài khoản đăng nhập trên thiết bị."
+    "message": "Nếu không tìm thấy mục nào trong kho của bạn, hãy yêu cầu thêm mục đó. Áp dụng cho tất cả tài khoản đã đăng nhập."
   },
   "showCardsInVaultViewV2": {
-    "message": "Always show cards as Autofill suggestions on Vault view"
+    "message": "Luôn hiển thị thẻ như đề xuất tự động điền trên giao diện kho"
   },
   "showCardsCurrentTab": {
     "message": "Hiển thị thẻ trên trang Tab"
@@ -1034,26 +1034,26 @@
     "message": "Liệt kê các mục thẻ trên trang Tab để dễ dàng tự động điền."
   },
   "showIdentitiesInVaultViewV2": {
-    "message": "Always show identities as Autofill suggestions on Vault view"
+    "message": "Luôn hiển thị danh tính như đề xuất tự động điền trên giao diện kho"
   },
   "showIdentitiesCurrentTab": {
     "message": "Hiển thị danh tính trên trang Tab"
   },
   "showIdentitiesCurrentTabDesc": {
-    "message": "Liệt kê các mục danh tính trên trang Tab để dễ dàng tự động điền."
+    "message": "Liệt kê các danh tính trên trang Tab để dễ dàng tự động điền."
   },
   "clickToAutofillOnVault": {
-    "message": "Click items to autofill on Vault view"
+    "message": "Nhấp vào mục để tự động điền trong giao diện kho"
   },
   "clickToAutofill": {
-    "message": "Click items in autofill suggestion to fill"
+    "message": "Nhấp vào mục trong đề xuất tự động điền để điền thông tin"
   },
   "clearClipboard": {
-    "message": "Dọn dẹp khay nhớ tạm",
+    "message": "Dọn dẹp bảng nhớ tạm",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "clearClipboardDesc": {
-    "message": "Tự động dọn dẹp giá trị được sao chép khỏi khay nhớ tạm của bạn.",
+    "message": "Tự động xóa mọi thứ đã sao chép khỏi bảng nhớ tạm.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "notificationAddDesc": {
@@ -1063,7 +1063,7 @@
     "message": "Lưu"
   },
   "notificationViewAria": {
-    "message": "View $ITEMNAME$, opens in new window",
+    "message": "Xem $ITEMNAME$, mở trong cửa sổ mới",
     "placeholders": {
       "itemName": {
         "content": "$1"
@@ -1072,18 +1072,18 @@
     "description": "Aria label for the view button in notification bar confirmation message"
   },
   "notificationNewItemAria": {
-    "message": "New Item, opens in new window",
+    "message": "Mục mới, mở trong cửa sổ mới",
     "description": "Aria label for the new item button in notification bar confirmation message when error is prompted"
   },
   "notificationEditTooltip": {
-    "message": "Edit before saving",
+    "message": "Chỉnh sửa trước khi lưu",
     "description": "Tooltip and Aria label for edit button on cipher item"
   },
   "newNotification": {
-    "message": "New notification"
+    "message": "Thông báo mới"
   },
   "labelWithNotification": {
-    "message": "$LABEL$: New notification",
+    "message": "$LABEL$: Thông báo mới",
     "description": "Label for the notification with a new login suggestion.",
     "placeholders": {
       "label": {
@@ -1093,15 +1093,15 @@
     }
   },
   "notificationLoginSaveConfirmation": {
-    "message": "saved to Bitwarden.",
+    "message": "đã lưu vào Bitwarden.",
     "description": "Shown to user after item is saved."
   },
   "notificationLoginUpdatedConfirmation": {
-    "message": "updated in Bitwarden.",
+    "message": "đã cập nhật trong Bitwarden.",
     "description": "Shown to user after item is updated."
   },
   "selectItemAriaLabel": {
-    "message": "Select $ITEMTYPE$, $ITEMNAME$",
+    "message": "Chọn $ITEMTYPE$, $ITEMNAME$",
     "description": "Used by screen readers. $1 is the item type (like vault or folder), $2 is the selected item name.",
     "placeholders": {
       "itemType": {
@@ -1113,35 +1113,35 @@
     }
   },
   "saveAsNewLoginAction": {
-    "message": "Save as new login",
+    "message": "Lưu như đăng nhập mới",
     "description": "Button text for saving login details as a new entry."
   },
   "updateLoginAction": {
-    "message": "Update login",
+    "message": "Cập nhật đăng nhập",
     "description": "Button text for updating an existing login entry."
   },
   "unlockToSave": {
-    "message": "Unlock to save this login",
+    "message": "Mở khóa để lưu thông tin đăng nhập này",
     "description": "User prompt to take action in order to save the login they just entered."
   },
   "saveLogin": {
-    "message": "Save login",
+    "message": "Lưu đăng nhập",
     "description": "Prompt asking the user if they want to save their login details."
   },
   "updateLogin": {
-    "message": "Update existing login",
+    "message": "Cập nhật thông tin đăng nhập hiện có",
     "description": "Prompt asking the user if they want to update an existing login entry."
   },
   "loginSaveSuccess": {
-    "message": "Login saved",
+    "message": "Đã lưu đăng nhập",
     "description": "Message displayed when login details are successfully saved."
   },
   "loginUpdateSuccess": {
-    "message": "Login updated",
+    "message": "Đã cập nhật đăng nhập",
     "description": "Message displayed when login details are successfully updated."
   },
   "loginUpdateTaskSuccess": {
-    "message": "Great job! You took the steps to make you and $ORGANIZATION$ more secure.",
+    "message": "Làm tốt lắm! Bạn đã thực hiện các bước để tăng cường bảo mật cho bản thân và $ORGANIZATION$.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1150,7 +1150,7 @@
     "description": "Shown to user after login is updated."
   },
   "loginUpdateTaskSuccessAdditional": {
-    "message": "Thank you for making $ORGANIZATION$ more secure. You have $TASK_COUNT$ more passwords to update.",
+    "message": "Cảm ơn bạn đã giúp $ORGANIZATION$ an toàn hơn. Bạn còn $TASK_COUNT$ mật khẩu cần cập nhật nữa.",
     "placeholders": {
       "organization": {
         "content": "$1"
@@ -1162,17 +1162,23 @@
     "description": "Shown to user after login is updated."
   },
   "nextSecurityTaskAction": {
-    "message": "Change next password",
+    "message": "Thay đổi mật khẩu tiếp theo",
     "description": "Message prompting user to undertake completion of another security task."
   },
   "saveFailure": {
-    "message": "Error saving",
+    "message": "Lỗi khi lưu",
     "description": "Error message shown when the system fails to save login details."
   },
   "saveFailureDetails": {
-    "message": "Oh no! We couldn't save this. Try entering the details manually.",
+    "message": "Ôi không! Chúng tôi không thể lưu lại được. Hãy thử nhập thông tin thủ công.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "Sau khi thay đổi mật khẩu, bạn cần đăng nhập lại bằng mật khẩu mới. Các phiên đăng nhập đang hoạt động trên các thiết bị khác sẽ bị đăng xuất trong vòng một giờ."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Thay đổi mật khẩu chính của bạn để hoàn tất quá trình khôi phục tài khoản."
+  },
   "enableChangedPasswordNotification": {
     "message": "Hỏi để cập nhật đăng nhập hiện có"
   },
@@ -1180,22 +1186,22 @@
     "message": "Yêu cầu cập nhật mật khẩu đăng nhập khi phát hiện thay đổi trên trang web."
   },
   "changedPasswordNotificationDescAlt": {
-    "message": "Đưa ra lựa chọn để cập nhật mật khẩu khi phát hiện có sự thay đổi trên trang web. Áp dụng với mọi tài khoản đăng nhập trên thiết bị."
+    "message": "Yêu cầu cập nhật mật khẩu đăng nhập khi phát hiện thay đổi trên trang web. Áp dụng cho tất cả tài khoản đã đăng nhập."
   },
   "enableUsePasskeys": {
-    "message": "Đưa ra lựa chọn để lưu và sử dụng mã khoá"
+    "message": "Yêu cầu lưu và sử dụng mã khóa"
   },
   "usePasskeysDesc": {
-    "message": "Đưa ra lựa chọn để lưu mã khoá mới hoặc đăng nhập bằng mã khoá đã lưu trong kho. Áp dụng với mọi tài khoản đăng nhập trên thiết bị."
+    "message": "Yêu cầu lưu các mã khóa mới hoặc đăng nhập bằng các mã khóa đã lưu trong kho của bạn. Áp dụng cho tất cả các tài khoản đã đăng nhập."
   },
   "notificationChangeDesc": {
-    "message": "Bạn có muốn cập nhật mật khẩu này trên Bitwarden không?"
+    "message": "Bạn có muốn cập nhật mật khẩu này trong Bitwarden không?"
   },
   "notificationChangeSave": {
     "message": "Cập nhật"
   },
   "notificationUnlockDesc": {
-    "message": "Vui lòng mở khóa Kho Bitwarden của bạn để hoàn thành quá trình tự động điền."
+    "message": "Mở khóa kho Bitwarden của bạn để hoàn tất quá trình tự động điền."
   },
   "notificationUnlock": {
     "message": "Mở khóa"
@@ -1207,17 +1213,17 @@
     "message": "Hiển thị tuỳ chọn menu ngữ cảnh"
   },
   "contextMenuItemDesc": {
-    "message": "Sử dụng một đúp chuột để truy cập vào việc tạo mật khẩu và thông tin đăng nhập phù hợp cho trang web. "
+    "message": "Dùng cú nhấp chuột phụ để truy cập trình tạo mật khẩu và đăng nhập tương ứng cho trang web."
   },
   "contextMenuItemDescAlt": {
-    "message": "Truy cập trình khởi tạo mật khẩu và các mục đăng nhập đã lưu của trang web bằng cách nhấn đúp chuột. Áp dụng với mọi tài khoản đăng nhập trên thiết bị."
+    "message": "Nhấp chuột phải để truy cập tính năng tạo mật khẩu và xem các thông tin đăng nhập phù hợp cho trang web này. Áp dụng với mọi tài khoản đã đăng nhập."
   },
   "defaultUriMatchDetection": {
-    "message": "Phương thức kiểm tra URI mặc định",
+    "message": "Phát hiện khớp URI mặc định",
     "description": "Default URI match detection for autofill."
   },
   "defaultUriMatchDetectionDesc": {
-    "message": "Chọn phương thức mặc định để kiểm tra so sánh URI cho các đăng nhập khi xử lí các hành động như là tự động điền."
+    "message": "Chọn cách thức mặc định hệ thống so khớp đường dẫn (URI) để xử lý đăng nhập khi thực hiện các thao tác như tự động điền."
   },
   "theme": {
     "message": "Chủ đề"
@@ -1226,7 +1232,7 @@
     "message": "Thay đổi màu sắc ứng dụng."
   },
   "themeDescAlt": {
-    "message": "Thay đổi tông màu giao diện của ứng dụng. Áp dụng với mọi tài khoản đăng nhập trên thiết bị."
+    "message": "Thay đổi chủ đề màu sắc của ứng dụng. Áp dụng cho tất cả các tài khoản đã đăng nhập."
   },
   "dark": {
     "message": "Tối",
@@ -1246,7 +1252,7 @@
     "message": "Định dạng tập tin"
   },
   "fileEncryptedExportWarningDesc": {
-    "message": "Tập tin xuất này sẽ được bảo vệ bằng mật khẩu và yêu cầu mật khẩu để giải mã."
+    "message": "Tệp tin này sẽ được bảo vệ bằng mật khẩu và yêu cầu mật khẩu tệp tin để giải mã."
   },
   "filePassword": {
     "message": "Mật khẩu tập tin"
@@ -1255,13 +1261,13 @@
     "message": "Mật khẩu này sẽ được sử dụng để xuất và nhập tập tin này"
   },
   "accountRestrictedOptionDescription": {
-    "message": "Sử dụng khóa mã hóa tài khoản của bạn, được tạo từ tên người dùng và mật khẩu chính của bạn để mã hóa tệp xuất và giới hạn việc nhập chỉ cho tài khoản Bitwarden hiện tại."
+    "message": "Sử dụng khóa mã hóa tài khoản của bạn, được tạo từ tên đăng nhập và mật khẩu chính của bạn để mã hóa tệp xuất và giới hạn việc nhập chỉ cho tài khoản Bitwarden hiện tại."
   },
   "passwordProtectedOptionDescription": {
     "message": "Thiết lập mật khẩu cho tệp để mã hóa dữ liệu xuất và nhập nó vào bất kỳ tài khoản Bitwarden nào bằng cách sử dụng mật khẩu đó để giải mã."
   },
   "exportTypeHeading": {
-    "message": "Loại xuất"
+    "message": "Xuất kiểu"
   },
   "accountRestricted": {
     "message": "Tài khoản bị hạn chế"
@@ -1274,7 +1280,7 @@
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
   "warningCapitalized": {
-    "message": "Warning",
+    "message": "Cảnh báo",
     "description": "Warning (should maintain locale-relevant capitalization)"
   },
   "confirmVaultExport": {
@@ -1284,7 +1290,7 @@
     "message": "Bản xuất này chứa dữ liệu kho bạn và không được mã hóa. Bạn không nên lưu trữ hay gửi tập tin đã xuất thông qua phương thức rủi ro (như email). Vui lòng xóa nó ngay lập tức khi bạn đã sử dụng xong."
   },
   "encExportKeyWarningDesc": {
-    "message": "Quá trình xuất này sẽ mã hóa dữ liệu của bạn bằng khóa mã hóa của tài khoản. Nếu bạn từng xoay khóa mã hóa tài khoản của mình, bạn nên xuất lại vì bạn sẽ không thể giải mã tập tin xuất này."
+    "message": "Quá trình xuất này sẽ mã hóa dữ liệu của bạn bằng khóa mã hóa của tài khoản. Nếu bạn từng thay đổi mã hóa tài khoản của mình, bạn nên xuất lại vì bạn sẽ không thể giải mã tập tin xuất này."
   },
   "encExportAccountWarningDesc": {
     "message": "Khóa mã hóa tài khoản là duy nhất cho mỗi tài khoản Bitwarden, vì vậy bạn không thể nhập tệp xuất được mã hóa vào một tài khoản khác."
@@ -1327,7 +1333,7 @@
     "message": "Mã xác thực (TOTP)"
   },
   "copyVerificationCode": {
-    "message": "Sao chép Mã xác thực"
+    "message": "Sao chép mã xác thực"
   },
   "attachments": {
     "message": "Tệp đính kèm"
@@ -1348,13 +1354,13 @@
     "message": "Không có tệp đính kèm."
   },
   "attachmentSaved": {
-    "message": "Tệp đính kèm đã được lưu."
+    "message": "Đã lưu tệp đính kèm"
   },
   "file": {
     "message": "Tập tin"
   },
   "fileToShare": {
-    "message": "File to share"
+    "message": "Tệp để chia sẻ"
   },
   "selectFile": {
     "message": "Chọn tập tin"
@@ -1365,14 +1371,14 @@
   "featureUnavailable": {
     "message": "Tính năng không có sẵn"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Cần di chuyển khóa mã hóa. Vui lòng đăng nhập trang web Bitwaden để cập nhật khóa mã hóa của bạn."
+  "legacyEncryptionUnsupported": {
+    "message": "Mã hóa cổ điển không còn được hỗ trợ. Vui lòng liên hệ bộ phận hỗ trợ để khôi phục tài khoản của bạn."
   },
   "premiumMembership": {
     "message": "Thành viên Cao Cấp"
   },
   "premiumManage": {
-    "message": "Quản lý Thành viên"
+    "message": "Quản lý thành viên"
   },
   "premiumManageAlert": {
     "message": "Bạn có thể quản lí tư cách thành viên của mình trên trang web kho lưu trữ bitwarden.com. Bạn có muốn truy cập trang web ngay bây giờ không?"
@@ -1381,22 +1387,22 @@
     "message": "Làm mới thành viên"
   },
   "premiumNotCurrentMember": {
-    "message": "Bạn hiện không phải là một thành viên cao cấp."
+    "message": "Bạn hiện không phải là thành viên Cao cấp."
   },
   "premiumSignUpAndGet": {
-    "message": "Đăng ký làm thành viên cao cấp và nhận được:"
+    "message": "Đăng ký làm thành viên Cao cấp và nhận được:"
   },
   "ppremiumSignUpStorage": {
     "message": "1GB bộ nhớ lưu trữ được mã hóa cho các tệp đính kèm."
   },
   "premiumSignUpEmergency": {
-    "message": "Emergency access."
+    "message": "Truy cập khẩn cấp."
   },
   "premiumSignUpTwoStepOptions": {
     "message": "Các tùy chọn xác minh hai bước như YubiKey và Duo."
   },
   "ppremiumSignUpReports": {
-    "message": "Thanh lọc mật khẩu, kiểm tra an toàn tài khoản và các báo cáo rò rĩ dữ liệu là để giữ cho kho của bạn an toàn."
+    "message": "Thanh lọc mật khẩu, kiểm tra an toàn tài khoản và các báo cáo rò rỉ dữ liệu để bảo vệ kho dữ liệu của bạn."
   },
   "ppremiumSignUpTotp": {
     "message": "Trình tạo mã xác nhận TOTP (2FA) để đăng nhập vào kho lưu trữ của bạn."
@@ -1405,22 +1411,22 @@
     "message": "Ưu tiên hỗ trợ khách hàng."
   },
   "ppremiumSignUpFuture": {
-    "message": "Tất cả các tính năng cao cấp trong tương lai. Nó sẽ sớm xuất hiện!"
+    "message": "Tất cả các tính năng Cao cấp trong tương lai. Nó sẽ sớm xuất hiện!"
   },
   "premiumPurchase": {
     "message": "Mua bản Cao Cấp"
   },
   "premiumPurchaseAlertV2": {
-    "message": "Bạn có thể mua gói Premium từ cài đặt tài khoản trên trang Bitwarden."
+    "message": "Bạn có thể mua gói Cao cấp từ cài đặt tài khoản trên kho web Bitwarden."
   },
   "premiumCurrentMember": {
-    "message": "Bạn là một thành viên cao cấp!"
+    "message": "Bạn là một thành viên Cao cấp!"
   },
   "premiumCurrentMemberThanks": {
     "message": "Cảm ơn bạn vì đã hỗ trợ Bitwarden."
   },
   "premiumFeatures": {
-    "message": "Upgrade to Premium and receive:"
+    "message": "Nâng cấp lên Premium và nhận được:"
   },
   "premiumPrice": {
     "message": "Tất cả chỉ với $PRICE$/năm!",
@@ -1432,7 +1438,7 @@
     }
   },
   "premiumPriceV2": {
-    "message": "Tất cả chỉ với $PRICE$ /năm!",
+    "message": "Tất cả chỉ với $PRICE$/năm!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -1447,22 +1453,22 @@
     "message": "Tự động sao chép TOTP"
   },
   "disableAutoTotpCopyDesc": {
-    "message": "Nếu đăng nhập của bạn có một khóa xác thực gắn liền với nó, mã xác nhận TOTP sẽ được tự động sao chép vào bộ nhớ tạm của bạn bất cứ khi nào bạn tự động điền thông tin đăng nhập."
+    "message": "Nếu tài khoản đăng nhập có khóa xác thực, mã xác minh TOTP sẽ được sao chép vào bộ nhớ tạm khi bạn tự động điền thông tin đăng nhập."
   },
   "enableAutoBiometricsPrompt": {
     "message": "Yêu cầu sinh trắc học khi khởi chạy"
   },
   "premiumRequired": {
-    "message": "Cần có tài khoản cao cấp"
+    "message": "Cần có tài khoản Cao cấp"
   },
   "premiumRequiredDesc": {
-    "message": "Cần là thành viên cao cấp để sử dụng tính năng này."
+    "message": "Cần là thành viên Cao cấp để sử dụng tính năng này."
   },
   "authenticationTimeout": {
-    "message": "Authentication timeout"
+    "message": "Thời gian chờ xác thực"
   },
   "authenticationSessionTimedOut": {
-    "message": "The authentication session timed out. Please restart the login process."
+    "message": "Phiên xác thực đã hết thời gian chờ. Vui lòng đăng nhập lại từ đầu."
   },
   "verificationCodeEmailSent": {
     "message": "Email xác minh đã được gửi tới $EMAIL$.",
@@ -1474,53 +1480,53 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "Không yêu cầu lại trên thiết bị này trong vòng 30 ngày"
   },
   "selectAnotherMethod": {
-    "message": "Select another method",
+    "message": "Chọn phương pháp khác",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use your recovery code"
+    "message": "Sử dụng mã khôi phục của bạn"
   },
   "insertU2f": {
     "message": "Lắp khóa bảo mật vào cổng USB máy tính của bạn. Nếu nó có một nút, hãy nhấn vào nó."
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "Mở trong tab mới"
   },
   "webAuthnAuthenticate": {
     "message": "Xác thực WebAuthn"
   },
   "readSecurityKey": {
-    "message": "Read security key"
+    "message": "Đọc khóa bảo mật"
   },
   "awaitingSecurityKeyInteraction": {
-    "message": "Awaiting security key interaction..."
+    "message": "Đang chờ tương tác với khóa bảo mật..."
   },
   "loginUnavailable": {
     "message": "Đăng nhập không có sẵn"
   },
   "noTwoStepProviders": {
-    "message": "Tài khoản này đã kích hoạt xác thực hai lớp, tuy nhiên, trình duyệt này không hỗ trợ cấu hình dịch vụ xác thực hai lớp đang sử dụng."
+    "message": "Tài khoản này đã kích hoạt đăng nhập 2 bước, tuy nhiên, trình duyệt này không hỗ trợ dịch vụ xác thực hai lớp đang sử dụng."
   },
   "noTwoStepProviders2": {
     "message": "Hãy sử dụng trình duyệt web được hỗ trợ (chẳng hạn như Chrome) và/hoặc thêm dịch vụ bổ sung được hỗ trợ tốt hơn trên các trình duyệt web (chẳng hạn như một ứng dụng xác thực)."
   },
   "twoStepOptions": {
-    "message": "Tùy chọn xác thực hai lớp"
+    "message": "Tùy chọn đăng nhập 2 bước"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "Chọn phương pháp đăng nhập hai bước"
   },
   "recoveryCodeDesc": {
-    "message": "Bạn mất quyền truy cập vào tất cả các dịch vụ xác thực 2 lớp? Sử dụng mã phục hồi của bạn để vô hiệu hóa tất cả các dịch vụ xác thực hai lớp trong tài khoản của bạn."
+    "message": "Bạn đã mất quyền truy cập vào tất cả các dịch vụ xác thực 2 lớp? Sử dụng mã khôi phục để tắt tất cả các phương pháp xác thực hai lớp trong tài khoản của bạn."
   },
   "recoveryCodeTitle": {
-    "message": "Mã phục hồi"
+    "message": "Mã khôi phục"
   },
   "authenticatorAppTitle": {
-    "message": "Ứng dụng Authenticator"
+    "message": "Ứng dụng xác thực"
   },
   "authenticatorAppDescV2": {
     "message": "Nhập mã được tạo bởi ứng dụng xác thực như Bitwarden Authenticator.",
@@ -1537,7 +1543,7 @@
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
-    "message": "Xác minh với Duo Security cho tổ chức của bạn sử dụng ứng dụng Duo Mobile, SMS, cuộc gọi điện thoại, hoặc khoá bảo mật U2F.",
+    "message": "Xác minh với Duo Security cho tổ chức của bạn bằng ứng dụng Duo Mobile, tin nhắn SMS, cuộc gọi điện thoại hoặc khóa bảo mật U2F.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "webAuthnTitle": {
@@ -1556,13 +1562,13 @@
     "message": "Môi trường tự lưu trữ"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Nhập địa chỉ cơ sở của bản cài đặt Bitwarden được lưu trữ tại máy chủ của bạn. Ví dụ: https://bitwarden.company.com"
+    "message": "Nhập URL cơ sở của cài đặt Bitwarden được lưu trữ trên máy chủ nội bộ của bạn. Ví dụ: https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
     "message": "Đối với cấu hình nâng cao. Bạn có thể chỉ định địa chỉ cơ sở của mỗi dịch vụ một cách độc lập."
   },
   "selfHostedEnvFormInvalid": {
-    "message": "Bạn phải thêm địa chỉ máy chủ cơ sở hoặc ít nhất một môi trường tùy chỉnh."
+    "message": "Bạn phải thêm URL máy chủ cơ sở hoặc ít nhất một môi trường tùy chỉnh."
   },
   "customEnvironment": {
     "message": "Môi trường tùy chỉnh"
@@ -1571,11 +1577,11 @@
     "message": "URL máy chủ"
   },
   "selfHostBaseUrl": {
-    "message": "Self-host server URL",
+    "message": "URL máy chủ tự lưu trữ",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "apiUrl": {
-    "message": "Địa chỉ API máy chủ"
+    "message": "Địa chỉ máy chủ API"
   },
   "webVaultUrl": {
     "message": "URL máy chủ của trang web kho lưu trữ"
@@ -1584,29 +1590,29 @@
     "message": "URL máy chủ nhận dạng"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "URL máy chủ thông báo"
   },
   "iconsUrl": {
-    "message": "Biểu tượng địa chỉ máy chủ"
+    "message": "URL máy chủ biểu tượng"
   },
   "environmentSaved": {
-    "message": "Địa chỉ môi trường đã được lưu."
+    "message": "Các URL môi trường đã được lưu"
   },
   "showAutoFillMenuOnFormFields": {
     "message": "Hiển thị menu tự động điền trên các trường biểu mẫu",
     "description": "Represents the message for allowing the user to enable the autofill overlay"
   },
   "autofillSuggestionsSectionTitle": {
-    "message": "Các gợi ý điền tự động"
+    "message": "Các gợi ý tự động điền"
   },
   "autofillSpotlightTitle": {
-    "message": "Easily find autofill suggestions"
+    "message": "Dễ dàng tìm các gợi ý tự động điền"
   },
   "autofillSpotlightDesc": {
-    "message": "Turn off your browser's autofill settings, so they don't conflict with Bitwarden."
+    "message": "Tắt cài đặt tự động điền của trình duyệt để tránh xung đột với Bitwarden."
   },
   "turnOffBrowserAutofill": {
-    "message": "Turn off $BROWSER$ autofill",
+    "message": "Tắt tính năng tự động điền của $BROWSER$",
     "placeholders": {
       "browser": {
         "content": "$1",
@@ -1615,16 +1621,16 @@
     }
   },
   "turnOffAutofill": {
-    "message": "Turn off autofill"
+    "message": "Tắt tự động điền"
   },
   "showInlineMenuLabel": {
     "message": "Hiển thị các gợi ý tự động điền trên các trường biểu mẫu"
   },
   "showInlineMenuIdentitiesLabel": {
-    "message": "Display identities as suggestions"
+    "message": "Hiển thị danh tính dưới dạng gợi ý"
   },
   "showInlineMenuCardsLabel": {
-    "message": "Display cards as suggestions"
+    "message": "Hiển thị thẻ dưới dạng gợi ý"
   },
   "showInlineMenuOnIconSelectionLabel": {
     "message": "Hiện gợi ý khi nhấp vào biểu tượng"
@@ -1687,22 +1693,22 @@
     "message": "Không tự động điền khi tải trang"
   },
   "commandOpenPopup": {
-    "message": "Mở popup kho"
+    "message": "Mở cửa sổ popup kho"
   },
   "commandOpenSidebar": {
-    "message": "Mở kho ở thanh bên"
+    "message": "Mở kho trong thanh bên"
   },
   "commandAutofillLoginDesc": {
-    "message": "Autofill the last used login for the current website"
+    "message": "Tự động điền thông tin đăng nhập gần đây nhất cho trang web hiện tại"
   },
   "commandAutofillCardDesc": {
-    "message": "Autofill the last used card for the current website"
+    "message": "Tự động điền thẻ đã sử dụng gần đây cho trang web hiện tại"
   },
   "commandAutofillIdentityDesc": {
-    "message": "Autofill the last used identity for the current website"
+    "message": "Điền tự động danh tính đã sử dụng lần cuối cho trang web hiện tại"
   },
   "commandGeneratePasswordDesc": {
-    "message": "Tạo và sao chép một mật khẩu ngẫu nhiên mới vào khay nhớ tạm"
+    "message": "Tạo và sao chép một mật khẩu ngẫu nhiên mới vào bảng nhớ tạm"
   },
   "commandLockVaultDesc": {
     "message": "Khoá kho"
@@ -1723,7 +1729,7 @@
     "message": "Kéo để sắp xếp"
   },
   "dragToReorder": {
-    "message": "Drag to reorder"
+    "message": "Kéo để sắp xếp lại"
   },
   "cfTypeText": {
     "message": "Văn bản"
@@ -1735,7 +1741,7 @@
     "message": "Đúng/Sai"
   },
   "cfTypeCheckbox": {
-    "message": "Ô tích chọn"
+    "message": "Hộp chọn"
   },
   "cfTypeLinked": {
     "message": "Đã liên kết",
@@ -1869,7 +1875,7 @@
     "message": "Số hộ chiếu"
   },
   "licenseNumber": {
-    "message": "Số giấy phép"
+    "message": "Số giấy phép lái xe"
   },
   "email": {
     "message": "Email"
@@ -1890,7 +1896,7 @@
     "message": "Địa chỉ 3"
   },
   "cityTown": {
-    "message": "Quận/Huyện/Thị trấn"
+    "message": "Xã / Phường"
   },
   "stateProvince": {
     "message": "Tỉnh/Thành Phố"
@@ -1920,7 +1926,10 @@
     "message": "Danh tính"
   },
   "typeSshKey": {
-    "message": "SSH key"
+    "message": "Khóa SSH"
+  },
+  "typeNote": {
+    "message": "Ghi chú"
   },
   "newItemHeader": {
     "message": "$TYPE$ mới",
@@ -1953,13 +1962,13 @@
     "message": "Lịch sử mật khẩu"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "Lịch sử trình tạo"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "Dọn dẹp lịch sử trình tạo"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "Nếu bạn tiếp tục, tất cả các mục sẽ bị xóa vĩnh viễn khỏi lịch sử của trình tạo. Bạn có chắc chắn muốn tiếp tục không?"
   },
   "back": {
     "message": "Quay lại"
@@ -1998,7 +2007,7 @@
     "message": "Ghi chú bảo mật"
   },
   "sshKeys": {
-    "message": "SSH Keys"
+    "message": "Khóa SSH"
   },
   "clear": {
     "message": "Xoá",
@@ -2017,14 +2026,14 @@
     }
   },
   "passwordSafe": {
-    "message": "Mật khẩu này không được tìm thấy trong bất kỳ báo cáo lộ lọt dữ liệu nào được biết đến. Bạn có thể tiếp tục sử dụng nó."
+    "message": "Không tìm thấy mật khẩu này trong các vụ rò rỉ dữ liệu trước đây. Nó an toàn để sử dụng."
   },
   "baseDomain": {
     "message": "Tên miền cơ sở",
     "description": "Domain name. Ex. website.com"
   },
   "baseDomainOptionRecommended": {
-    "message": "Base domain (recommended)",
+    "message": "Tên miền gốc (được khuyến nghị)",
     "description": "Domain name. Ex. website.com"
   },
   "domainName": {
@@ -2057,11 +2066,11 @@
     "message": "Bật/tắt tùy chọn"
   },
   "toggleCurrentUris": {
-    "message": "Bật/tắt URI hiện tại",
+    "message": "Bật/tắt đường dẫn hiện tại",
     "description": "Toggle the display of the URIs of the currently open tabs in the browser."
   },
   "currentUri": {
-    "message": "URI hiện tại",
+    "message": "Đường dẫn hiện tại",
     "description": "The URI of one of the current open tabs in the browser."
   },
   "organization": {
@@ -2081,10 +2090,10 @@
     "message": "Xóa lịch sử"
   },
   "nothingToShow": {
-    "message": "Nothing to show"
+    "message": "Không có gì để hiển thị"
   },
   "nothingGeneratedRecently": {
-    "message": "You haven't generated anything recently"
+    "message": "Bạn chưa tạo gì gần đây"
   },
   "remove": {
     "message": "Xoá"
@@ -2101,17 +2110,17 @@
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
-    "message": "Đã cập nhật mật khẩu",
+    "message": "Mật khẩu được cập nhật lần cuối",
     "description": "ex. Date this password was updated"
   },
   "neverLockWarning": {
     "message": "Bạn có chắc chắn muốn chọn \"Không bao giờ\" không? Lựa chọn này sẽ lưu khóa mã hóa kho của bạn trực tiếp trên thiết bị. Hãy nhớ bảo vệ thiết bị của bạn thật cẩn thận nếu bạn chọn tùy chọn này."
   },
   "noOrganizationsList": {
-    "message": "You do not belong to any organizations. Organizations allow you to securely share items with other users."
+    "message": "Bạn chưa thuộc tổ chức nào. Tổ chức sẽ cho phép bạn chia sẻ các mục với người dùng khác một cách bảo mật."
   },
   "noCollectionsInList": {
-    "message": "Không có bộ sưu tập nào để liệt kê."
+    "message": "Không có bộ sưu tập nào."
   },
   "ownership": {
     "message": "Quyền sở hữu"
@@ -2135,7 +2144,7 @@
     "message": "Mật khẩu chính yếu"
   },
   "weakMasterPasswordDesc": {
-    "message": "Mật khẩu chính bạn vừa chọn có vẻ yếu. Bạn nên chọn mật khẩu chính (hoặc cụm từ mật khẩu) mạnh để bảo vệ đúng cách tài khoản Bitwarden của bạn. Bạn có thực sự muốn dùng mật khẩu chính này?"
+    "message": "Mật khẩu chính bạn vừa chọn hơi yếu. Bạn nên chọn mật khẩu chính mạnh(hoặc một cụm mật khẩu) để bảo vệ tài khoản Bitwarden của mình một cách an toàn. Bạn có thực sự muốn dùng mật khẩu chính này không?"
   },
   "pin": {
     "message": "Mã PIN",
@@ -2145,34 +2154,34 @@
     "message": "Mở khóa bằng mã PIN"
   },
   "setYourPinTitle": {
-    "message": "Set PIN"
+    "message": "Thiết lập mã PIN"
   },
   "setYourPinButton": {
-    "message": "Set PIN"
+    "message": "Thiết lập mã PIN"
   },
   "setYourPinCode": {
-    "message": "Đặt mã PIN của bạn để mở khóa Bitwarden. Cài đặt mã PIN của bạn sẽ bị xóa nếu bạn hoàn toàn đăng xuất khỏi ứng dụng."
+    "message": "Đặt mã PIN của bạn để mở khóa Bitwarden. Cài đặt mã PIN của bạn sẽ bị xóa nếu bạn đăng xuất hoàn toàn khỏi ứng dụng."
   },
-  "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+  "setPinCode": {
+    "message": "Bạn có thể sử dụng mã PIN này để mở khóa Bitwarden. Mã PIN của bạn sẽ được đặt lại nếu bạn đăng xuất hoàn toàn khỏi ứng dụng."
   },
   "pinRequired": {
     "message": "Mã PIN là bắt buộc."
   },
   "invalidPin": {
-    "message": "Mã PIN không hợp lệ."
+    "message": "Mã PIN không chính xác."
   },
   "tooManyInvalidPinEntryAttemptsLoggingOut": {
-    "message": "Mã PIN bị gõ sai quá nhiều lần. Đang đăng xuất."
+    "message": "Gõ sai mã PIN quá nhiều lần. Đang đăng xuất."
   },
   "unlockWithBiometrics": {
     "message": "Mở khóa bằng sinh trắc học"
   },
   "unlockWithMasterPassword": {
-    "message": "Unlock with master password"
+    "message": "Mở khóa bằng mật khẩu chính"
   },
   "awaitDesktop": {
-    "message": "Đợi xác nhận từ máy tính"
+    "message": "Đang chờ xác nhận từ máy tính"
   },
   "awaitDesktopDesc": {
     "message": "Vui lòng xác nhận sử dụng sinh trắc học với ứng dụng Bitwarden trên máy tính."
@@ -2181,7 +2190,7 @@
     "message": "Khóa với mật khẩu chính khi trình duyệt khởi động lại"
   },
   "lockWithMasterPassOnRestart1": {
-    "message": "Require master password on browser restart"
+    "message": "Yêu cầu nhập mật khẩu chính khi khởi động lại trình duyệt"
   },
   "selectOneCollection": {
     "message": "Bạn phải chọn ít nhất một bộ sưu tập."
@@ -2196,36 +2205,39 @@
     "message": "Trình tạo mật khẩu"
   },
   "usernameGenerator": {
-    "message": "Bộ tạo tên người dùng"
+    "message": "Trình tạo tên đăng nhập"
   },
   "useThisEmail": {
-    "message": "Use this email"
+    "message": "Dùng email này"
   },
   "useThisPassword": {
-    "message": "Use this password"
+    "message": "Dùng mật khẩu này"
+  },
+  "useThisPassphrase": {
+    "message": "Dùng cụm mật khẩu này"
   },
   "useThisUsername": {
-    "message": "Use this username"
+    "message": "Dùng tên đăng nhập này"
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "Mật khẩu an toàn đã được tạo! Đừng quên cập nhật mật khẩu của bạn trên trang web."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Sử dụng trình tạo",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "để tạo một mật khẩu mạnh và duy nhất",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "vaultCustomization": {
-    "message": "Vault customization"
+    "message": "Tùy chỉnh kho"
   },
   "vaultTimeoutAction": {
-    "message": "Hành động khi hết thời gian chờ của kho lưu trữ"
+    "message": "Hành động sau khi đóng kho"
   },
   "vaultTimeoutAction1": {
-    "message": "Timeout action"
+    "message": "Hành động sau khi đóng kho"
   },
   "lock": {
     "message": "Khóa",
@@ -2236,7 +2248,7 @@
     "description": "Noun: a special folder to hold deleted items"
   },
   "searchTrash": {
-    "message": "Tìm kiếm thùng rác"
+    "message": "Tìm kiếm trong thùng rác"
   },
   "permanentlyDeleteItem": {
     "message": "Xoá vĩnh viễn mục"
@@ -2257,34 +2269,34 @@
     "message": "Bạn đã có tài khoản?"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "Đăng xuất sẽ xóa tất cả quyền truy cập vào kho của bạn và yêu cầu xác minh trực tuyến sau khi hết thời gian chờ. Bạn có chắc chắn muốn sử dụng cài đặt này không?"
+    "message": "Đăng xuất sẽ xóa toàn bộ quyền truy cập vào kho của bạn và yêu cầu xác minh lại sau khi đóng kho. Bạn có chắc chắn muốn sử dụng cài đặt này không?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
-    "message": "Xác nhận hành động khi hết thời gian chờ"
+    "message": "Xác nhận hành động sau khi đóng kho"
   },
   "autoFillAndSave": {
-    "message": "Tự động điền và Lưu"
+    "message": "Tự động điền và lưu"
   },
   "fillAndSave": {
     "message": "Điền và lưu"
   },
   "autoFillSuccessAndSavedUri": {
-    "message": "Đã tự động điền mục và lưu URI"
+    "message": "Đã tự động điền mục và lưu đường dẫn"
   },
   "autoFillSuccess": {
     "message": "Đã tự động điền mục "
   },
   "insecurePageWarning": {
-    "message": "Cảnh báo: Đây là một trang HTTP không an toàn, và mọi thông tin bạn nhập ở đây có khả năng được xem & thay đổi bởi người khác. Thông tin Đăng nhập này ban đầu được lưu ở một trang an toàn (HTTPS)."
+    "message": "Cảnh báo: Đây là một trang HTTP không an toàn, và mọi thông tin bạn nhập ở đây có thể bị người khác xem và thay đổi. Thông tin Đăng nhập này ban đầu được lưu ở một trang an toàn (HTTPS)."
   },
   "insecurePageWarningFillPrompt": {
     "message": "Bạn vẫn muốn điền thông tin đăng nhập?"
   },
   "autofillIframeWarning": {
-    "message": "Mẫu điền thông tin này được lưu tại một tên miền khác với URI lưu tại thông tin đăng nhập của bạn. Hãy chọn OK để tiếp tục tự động điền, hoặc Hủy bỏ để dừng lại."
+    "message": "Biểu mẫu này được lưu trữ trên một tên miền khác với đường dẫn của thông tin đăng nhập đã lưu của bạn. Chọn OK để tự động điền thông tin, hoặc Hủy bỏ để hủy."
   },
   "autofillIframeWarningTip": {
-    "message": "Để chặn cảnh báo này trong tương lai, hãy lưu URI này, $HOSTNAME$, vào thông tin đăng nhập của bạn cho trang này ở Kho Bitwarden.",
+    "message": "Để tránh cảnh báo này trong tương lai, hãy lưu đường dẫn này, $HOSTNAME$, vào mục đăng nhập Bitwarden cho trang web này.",
     "placeholders": {
       "hostname": {
         "content": "$1",
@@ -2326,16 +2338,16 @@
     }
   },
   "policyInEffectUppercase": {
-    "message": "Chứa chữ cái in hoa"
+    "message": "Có chứa một hay nhiều ký tự viết hoa"
   },
   "policyInEffectLowercase": {
-    "message": "Chứa một hoặc nhiều kí tự viết thường"
+    "message": "Có chứa một hay nhiều ký tự thường"
   },
   "policyInEffectNumbers": {
-    "message": "Chứa một hoặc nhiều chữ số"
+    "message": "Có chứa một hay nhiều chữ số"
   },
   "policyInEffectSpecial": {
-    "message": "Chứa ký tự đặc biệt $CHARS$",
+    "message": "Có chứa một hay nhiều ký tự đặc biệt sau $CHARS$",
     "placeholders": {
       "chars": {
         "content": "$1",
@@ -2356,7 +2368,7 @@
     "message": "bất cứ lúc nào."
   },
   "byContinuingYouAgreeToThe": {
-    "message": "Nếu tiếp tục, bạn đồng ý"
+    "message": "Bằng cách tiếp tục, bạn đồng ý với"
   },
   "and": {
     "message": "và"
@@ -2365,25 +2377,25 @@
     "message": "Bạn đồng ý với những điều sau khi nhấn chọn ô này:"
   },
   "acceptPoliciesRequired": {
-    "message": "Điều khoản sử dụng và Chính sách quyền riêng tư chưa được đồng ý."
+    "message": "Bạn chưa đồng ý với Điều khoản Dịch vụ và Chính sách Bảo mật."
   },
   "termsOfService": {
-    "message": "Điều khoản sử dụng"
+    "message": "Điều khoản dịch vụ"
   },
   "privacyPolicy": {
-    "message": "Chính sách quyền riêng tư"
+    "message": "Chính sách bảo mật"
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Mật khẩu mới của bạn không thể giống với mật khẩu cũ."
   },
   "hintEqualsPassword": {
-    "message": "Lời nhắc mật khẩu không được giống mật khẩu của bạn"
+    "message": "Gợi ý mật khẩu không được trùng với mật khẩu của bạn."
   },
   "ok": {
     "message": "Ok"
   },
   "errorRefreshingAccessToken": {
-    "message": "Lỗi làm mới khoá truy cập"
+    "message": "Lỗi cập nhật token truy cập"
   },
   "errorRefreshingAccessTokenDesc": {
     "message": "Bạn có thể đã bị đăng xuất. Vui lòng đăng xuất và đăng nhập lại."
@@ -2392,43 +2404,43 @@
     "message": "Xác minh đồng bộ máy tính"
   },
   "desktopIntegrationVerificationText": {
-    "message": "Vui lòng xác minh ứng dụng trên máy tính hiển thị cụm vân tay này: "
+    "message": "Vui lòng xác minh ứng dụng trên máy tính hiển thị cụm từ xác thực này: "
   },
   "desktopIntegrationDisabledTitle": {
-    "message": "Tích hợp trình duyệt chưa được kích hoạt"
+    "message": "Tích hợp trình duyệt chưa được thiết lập"
   },
   "desktopIntegrationDisabledDesc": {
-    "message": "Tích hợp trình duyệt không được thiết lập trong ứng dụng máy tính để bàn Bitwarden. Vui lòng thiết lập nó trong cài đặt trong ứng dụng máy tính để bàn."
+    "message": "Tính năng tích hợp trình duyệt chưa được thiết lập trong ứng dụng Bitwarden trên máy tính. Vui lòng thiết lập tính năng này trong phần cài đặt của ứng dụng trên máy tính."
   },
   "startDesktopTitle": {
     "message": "Mở ứng dụng Bitwarden trên máy tính"
   },
   "startDesktopDesc": {
-    "message": "Ứng dụng máy tính để bàn Bitwarden cần được khởi động trước khi có thể sử dụng tính năng mở khóa bằng sinh trắc học."
+    "message": "Ứng dụng Bitwarden trên máy tính cần được khởi động trước khi có thể sử dụng tính năng mở khóa bằng sinh trắc học."
   },
   "errorEnableBiometricTitle": {
-    "message": "Không thể bật nhận dạng sinh trắc học"
+    "message": "Không thể thiết lập nhận dạng sinh trắc học"
   },
   "errorEnableBiometricDesc": {
-    "message": "Hành động đã bị hủy bởi ứng dụng máy tính để bàn"
+    "message": "Hành động đã bị hủy bởi ứng dụng trên máy tính"
   },
   "nativeMessagingInvalidEncryptionDesc": {
-    "message": "Ứng dụng máy tính để bàn đã vô hiệu hóa kênh liên lạc an toàn. Vui lòng thử lại thao tác này"
+    "message": "Ứng dụng trên máy tính đã vô hiệu hóa kênh liên lạc an toàn. Vui lòng thử lại thao tác này"
   },
   "nativeMessagingInvalidEncryptionTitle": {
-    "message": "Giao tiếp máy tính để bàn bị gián đoạn"
+    "message": "Giao tiếp với ứng dụng trên máy tính bị gián đoạn"
   },
   "nativeMessagingWrongUserDesc": {
-    "message": "Ứng dụng máy tính để bàn được đăng nhập vào một tài khoản khác. Hãy đảm bảo cả hai ứng dụng được đăng nhập vào cùng một tài khoản."
+    "message": "Ứng dụng trên máy tính đang đăng nhập vào một tài khoản khác. Hãy đảm bảo cả hai ứng dụng được đăng nhập vào cùng một tài khoản."
   },
   "nativeMessagingWrongUserTitle": {
-    "message": "Tài khoản không đúng"
+    "message": "Không khớp tài khoản"
   },
   "nativeMessagingWrongUserKeyTitle": {
-    "message": "Biometric key missmatch"
+    "message": "Khóa sinh trắc học không khớp"
   },
   "nativeMessagingWrongUserKeyDesc": {
-    "message": "Biometric unlock failed. The biometric secret key failed to unlock the vault. Please try to set up biometrics again."
+    "message": "Mở khóa bằng sinh trắc học thất bại. Khóa sinh trắc học không thể mở khóa kho. Vui lòng thử thiết lập lại sinh trắc học."
   },
   "biometricsNotEnabledTitle": {
     "message": "Sinh trắc học chưa được cài đặt"
@@ -2449,31 +2461,31 @@
     "message": "Vui lòng mở khóa người dùng này trong ứng dụng máy tính và thử lại."
   },
   "biometricsNotAvailableTitle": {
-    "message": "Biometric unlock unavailable"
+    "message": "Mở khóa bằng sinh trắc học không khả dụng"
   },
   "biometricsNotAvailableDesc": {
-    "message": "Biometric unlock is currently unavailable. Please try again later."
+    "message": "Mở khóa bằng sinh trắc học hiện không khả dụng. Vui lòng thử lại sau."
   },
   "biometricsFailedTitle": {
-    "message": "Sinh trắc học không thành công"
+    "message": "Xác thực sinh trắc học thất bại"
   },
   "biometricsFailedDesc": {
-    "message": "Không thể hoàn thành sinh trắc học, hãy cân nhắc sử dụng mật khẩu chính hoặc đăng xuất. Nếu sự cố vẫn tiếp diễn, vui lòng liên hệ bộ phận hỗ trợ của Bitwarden."
+    "message": "Không thể xác thực sinh trắc học, hãy cân nhắc sử dụng mật khẩu chính hoặc đăng xuất. Nếu sự cố vẫn tiếp diễn, vui lòng liên hệ bộ phận hỗ trợ của Bitwarden."
   },
   "nativeMessaginPermissionErrorTitle": {
-    "message": "Quyền chưa được cấp"
+    "message": "Chưa được cấp quyền"
   },
   "nativeMessaginPermissionErrorDesc": {
-    "message": "Nếu không được phép giao tiếp với Ứng dụng máy tính để bàn Bitwarden, chúng tôi không thể cung cấp sinh trắc học trong tiện ích mở rộng trình duyệt. Vui lòng thử lại."
+    "message": "Nếu không được phép giao tiếp với Ứng dụng Bitwarden trên máy tính, chúng tôi không thể cung cấp tính năng sinh trắc học trong tiện ích mở rộng trình duyệt. Vui lòng thử lại."
   },
   "nativeMessaginPermissionSidebarTitle": {
-    "message": "Lỗi yêu cầu quyền"
+    "message": "Lỗi yêu cầu quyền truy cập"
   },
   "nativeMessaginPermissionSidebarDesc": {
     "message": "Không thể thực hiện hành động này trong thanh bên, vui lòng thử lại hành động trong cửa sổ bật lên hoặc cửa sổ bật ra."
   },
   "personalOwnershipSubmitError": {
-    "message": "Do Chính sách doanh nghiệp, bạn bị hạn chế lưu các mục vào kho tiền cá nhân của mình. Thay đổi tùy chọn Quyền sở hữu thành một tổ chức và chọn từ các bộ sưu tập có sẵn."
+    "message": "Do chính sách của doanh nghiệp, bạn không thể lưu trữ các mục vào kho cá nhân của mình. Hãy thay đổi tùy chọn Quyền sở hữu thành tổ chức và chọn từ các bộ sưu tập có sẵn."
   },
   "personalOwnershipPolicyInEffect": {
     "message": "Chính sách của tổ chức đang ảnh hưởng đến các tùy chọn quyền sở hữu của bạn."
@@ -2481,15 +2493,21 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "Chính sách của tổ chức đã chặn việc nhập các mục vào kho cá nhân của bạn."
   },
+  "restrictCardTypeImport": {
+    "message": "Không thể nhập mục thẻ"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Một chính sách được thiết lập bởi 1 hoặc nhiều tổ chức ngăn bạn nhập thẻ vào kho của mình."
+  },
   "domainsTitle": {
     "message": "Các tên miền",
     "description": "A category title describing the concept of web domains"
   },
   "blockedDomains": {
-    "message": "Blocked domains"
+    "message": "Tên miền đã chặn"
   },
   "learnMoreAboutBlockedDomains": {
-    "message": "Learn more about blocked domains"
+    "message": "Tìm hiểu thêm về các tên miền bị chặn"
   },
   "excludedDomains": {
     "message": "Tên miền đã loại trừ"
@@ -2498,22 +2516,26 @@
     "message": "Bitwarden sẽ không yêu cầu lưu thông tin đăng nhập cho các miền này. Bạn phải làm mới trang để các thay đổi có hiệu lực."
   },
   "excludedDomainsDescAlt": {
-    "message": "Bitwarden sẽ không yêu cầu lưu thông tin đăng nhập cho các miền này. Bạn phải làm mới trang để các thay đổi có hiệu lực."
+    "message": "Bitwarden sẽ không yêu cầu lưu thông tin đăng nhập cho các tên miền này đối với tất cả tài khoản đã đăng nhập. Bạn phải làm mới trang để các thay đổi có hiệu lực."
   },
   "blockedDomainsDesc": {
-    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+    "message": "Tự động điền và các tính năng liên quan khác sẽ không được cung cấp cho các trang web này. Bạn phải làm mới trang để các thay đổi có hiệu lực."
   },
   "autofillBlockedNoticeV2": {
-    "message": "Autofill is blocked for this website."
+    "message": "Tự động điền bị chặn cho trang web này."
   },
   "autofillBlockedNoticeGuidance": {
-    "message": "Change this in settings"
+    "message": "Thay đổi điều này trong cài đặt"
   },
   "change": {
-    "message": "Change"
+    "message": "Thay đổi"
+  },
+  "changePassword": {
+    "message": "Thay đổi mật khẩu",
+    "description": "Change password button for browser at risk notification on login."
   },
   "changeButtonTitle": {
-    "message": "Change password - $ITEMNAME$",
+    "message": "Thay đổi mật khẩu - $ITEMNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -2521,11 +2543,14 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "Mật khẩu có rủi ro cao"
+  },
   "atRiskPasswords": {
-    "message": "At-risk passwords"
+    "message": "Mật khẩu có rủi ro cao"
   },
   "atRiskPasswordDescSingleOrg": {
-    "message": "$ORGANIZATION$ is requesting you change one password because it is at-risk.",
+    "message": "$ORGANIZATION$ yêu cầu bạn thay đổi mật khẩu vì mật khẩu hiện tại đang gặp rủi ro.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2534,7 +2559,7 @@
     }
   },
   "atRiskPasswordsDescSingleOrgPlural": {
-    "message": "$ORGANIZATION$ is requesting you change the $COUNT$ passwords because they are at-risk.",
+    "message": "$ORGANIZATION$ yêu cầu bạn thay đổi $COUNT$ mật khẩu vì chúng đang có rủi ro.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2547,7 +2572,7 @@
     }
   },
   "atRiskPasswordsDescMultiOrgPlural": {
-    "message": "Your organizations are requesting you change the $COUNT$ passwords because they are at-risk.",
+    "message": "Các tổ chức của bạn đang yêu cầu bạn thay đổi $COUNT$ mật khẩu vì chúng đang có rủi ro.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2555,11 +2580,31 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Mật khẩu của bạn cho trang web này đang gặp rủi ro. $ORGANIZATION$ đã yêu cầu bạn thay đổi mật khẩu.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ yêu cầu bạn thay đổi mật khẩu này vì nó đang gặp rủi ro. Vui lòng truy cập vào cài đặt tài khoản của bạn để thay đổi mật khẩu.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
-    "message": "Review and change one at-risk password"
+    "message": "Kiểm tra và thay đổi một mật khẩu có rủi ro cao"
   },
   "reviewAndChangeAtRiskPasswordsPlural": {
-    "message": "Review and change $COUNT$ at-risk passwords",
+    "message": "Kiểm tra và thay đổi $COUNT$ mật khẩu có rủi ro cao",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2568,52 +2613,52 @@
     }
   },
   "changeAtRiskPasswordsFaster": {
-    "message": "Change at-risk passwords faster"
+    "message": "Thay đổi mật khẩu có rủi ro bị lộ nhanh hơn"
   },
   "changeAtRiskPasswordsFasterDesc": {
-    "message": "Update your settings so you can quickly autofill your passwords and generate new ones"
+    "message": "Cập nhật cài đặt của bạn để bạn có thể tự động điền và tạo mật khẩu mới nhanh chóng"
   },
   "reviewAtRiskLogins": {
-    "message": "Review at-risk logins"
+    "message": "Xem lại các lần đăng nhập có nguy cơ cao"
   },
   "reviewAtRiskPasswords": {
-    "message": "Review at-risk passwords"
+    "message": "Xem lại các mật khẩu có rủi ro cao"
   },
   "reviewAtRiskLoginsSlideDesc": {
-    "message": "Your organization passwords are at-risk because they are weak, reused, and/or exposed.",
+    "message": "Mật khẩu của tổ chức bạn đang gặp rủi ro vì độ mạnh yếu, được sử dụng lại và/hoặc bị lộ.",
     "description": "Description of the review at-risk login slide on the at-risk password page carousel"
   },
   "reviewAtRiskLoginSlideImgAltPeriod": {
-    "message": "Illustration of a list of logins that are at-risk."
+    "message": "Minh họa danh sách các tài khoản đăng nhập có rủi ro."
   },
   "generatePasswordSlideDesc": {
-    "message": "Quickly generate a strong, unique password with the Bitwarden autofill menu on the at-risk site.",
+    "message": "Tạo nhanh một mật khẩu mạnh, duy nhất bằng menu tự động điền của Bitwarden trên trang web có nguy cơ.",
     "description": "Description of the generate password slide on the at-risk password page carousel"
   },
   "generatePasswordSlideImgAltPeriod": {
-    "message": "Illustration of the Bitwarden autofill menu displaying a generated password."
+    "message": "Minh họa menu tự điền mật khẩu của Bitwarden hiển thị một mật khẩu được tạo ra."
   },
   "updateInBitwarden": {
-    "message": "Update in Bitwarden"
+    "message": "Cập nhật trong Bitwarden"
   },
   "updateInBitwardenSlideDesc": {
-    "message": "Bitwarden will then prompt you to update the password in the password manager.",
+    "message": "Bitwarden sau đó sẽ yêu cầu bạn cập nhật mật khẩu trong trình quản lý mật khẩu.",
     "description": "Description of the update in Bitwarden slide on the at-risk password page carousel"
   },
   "updateInBitwardenSlideImgAltPeriod": {
-    "message": "Illustration of a Bitwarden’s notification prompting the user to update the login."
+    "message": "Minh họa thông báo của Bitwarden yêu cầu người dùng cập nhật thông tin đăng nhập."
   },
   "turnOnAutofill": {
-    "message": "Turn on autofill"
+    "message": "Bật tự động điền"
   },
   "turnedOnAutofill": {
-    "message": "Turned on autofill"
+    "message": "Đã bật tự động điền"
   },
   "dismiss": {
-    "message": "Dismiss"
+    "message": "Bỏ qua"
   },
   "websiteItemLabel": {
-    "message": "Trang Web $number$ (URI)",
+    "message": "Trang web $number$ (URI)",
     "placeholders": {
       "number": {
         "content": "$1",
@@ -2631,20 +2676,20 @@
     }
   },
   "blockedDomainsSavedSuccess": {
-    "message": "Blocked domain changes saved"
+    "message": "Đã lưu thay đổi tên miền bị chặn"
   },
   "excludedDomainsSavedSuccess": {
-    "message": "Các thay đổi tên miền loại trừ đã được lưu"
+    "message": "Thay đổi tên miền bị loại trừ đã được lưu"
   },
   "limitSendViews": {
-    "message": "Limit views"
+    "message": "Giới hạn số lượt xem"
   },
   "limitSendViewsHint": {
-    "message": "No one can view this Send after the limit is reached.",
+    "message": "Không ai có thể xem mục Gửi này sau khi đạt đến giới hạn.",
     "description": "Displayed under the limit views field on Send"
   },
   "limitSendViewsCount": {
-    "message": "$ACCESSCOUNT$ views left",
+    "message": "$ACCESSCOUNT$ lượt xem còn lại",
     "description": "Displayed under the limit views field on Send",
     "placeholders": {
       "accessCount": {
@@ -2654,28 +2699,32 @@
     }
   },
   "send": {
-    "message": "Gửi",
+    "message": "Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDetails": {
-    "message": "Send details",
+    "message": "Chi tiết Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeText": {
     "message": "Văn bản"
   },
   "sendTypeTextToShare": {
-    "message": "Text to share"
+    "message": "Nội dung chia sẻ"
   },
   "sendTypeFile": {
     "message": "Tập tin"
   },
   "allSends": {
-    "message": "Tất cả mục Gửi",
+    "message": "Toàn bộ Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Đã vượt số lần truy cập tối đa",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
-    "message": "Hide text by default"
+    "message": "Mặc định ẩn văn bản"
   },
   "expired": {
     "message": "Đã hết hạn"
@@ -2687,7 +2736,7 @@
     "message": "Sao chép liên kết"
   },
   "copySendLink": {
-    "message": "Sao chép liên kết mục Gửi",
+    "message": "Sao chép liên kết Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "removePassword": {
@@ -2700,11 +2749,11 @@
     "message": "Đã xóa mật khẩu"
   },
   "deletedSend": {
-    "message": "Đã xóa mục Gửi",
+    "message": "Đã xóa Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLink": {
-    "message": "Liên kết Gửi",
+    "message": "Liên kết Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "disabled": {
@@ -2714,26 +2763,26 @@
     "message": "Bạn có chắc chắn muốn xóa mật khẩu này không?"
   },
   "deleteSend": {
-    "message": "Xóa mục Gửi",
+    "message": "Xóa Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendConfirmation": {
-    "message": "Bạn có chắc muốn mục Gửi này?",
+    "message": "Bạn có chắc chắn muốn xóa Send này?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
-    "message": "Are you sure you want to permanently delete this Send?",
+    "message": "Bạn có chắc chắn muốn xóa vĩnh viễn Send này không?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
-    "message": "Sửa mục Gửi",
+    "message": "Chỉnh sửa Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletionDate": {
     "message": "Ngày xóa"
   },
   "deletionDateDescV2": {
-    "message": "The Send will be permanently deleted on this date.",
+    "message": "Send sẽ được xóa vĩnh viễn vào ngày này.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
@@ -2755,11 +2804,11 @@
     "message": "Tùy chỉnh"
   },
   "sendPasswordDescV3": {
-    "message": "Add an optional password for recipients to access this Send.",
+    "message": "Thêm mật khẩu tùy chọn cho người nhận để có thể truy cập vào Send này.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
-    "message": "Send mới",
+    "message": "Tạo Send mới",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "newPassword": {
@@ -2770,23 +2819,23 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDisabledWarning": {
-    "message": "Do chính sách doanh nghiệp, bạn chỉ có thể xóa những mục Gửi hiện có.",
+    "message": "Do chính sách doanh nghiệp, bạn chỉ có thể xóa những Send hiện có.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
-    "message": "Đã tạo mục Gửi",
+    "message": "Đã tạo Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSendSuccessfully": {
-    "message": "Send created successfully!",
+    "message": "Đã tạo Send thành công!",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInHoursSingle": {
-    "message": "The Send will be available to anyone with the link for the next 1 hour.",
+    "message": "Send này sẽ được cung cấp cho bất kỳ ai có liên kết trong 1 giờ tới.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInHours": {
-    "message": "The Send will be available to anyone with the link for the next $HOURS$ hours.",
+    "message": "Send này sẽ được cung cấp cho bất kỳ ai có liên kết trong $HOURS$ giờ tới.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
     "placeholders": {
       "hours": {
@@ -2796,11 +2845,11 @@
     }
   },
   "sendExpiresInDaysSingle": {
-    "message": "The Send will be available to anyone with the link for the next 1 day.",
+    "message": "Send này sẽ được cung cấp cho bất kỳ ai có liên kết trong 1 ngày tới.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendExpiresInDays": {
-    "message": "The Send will be available to anyone with the link for the next $DAYS$ days.",
+    "message": "Send này sẽ được cung cấp cho bất kỳ ai có liên kết trong $DAYS$ ngày tới.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
     "placeholders": {
       "days": {
@@ -2810,32 +2859,32 @@
     }
   },
   "sendLinkCopied": {
-    "message": "Send link copied",
+    "message": "Đã sao chép liên kết Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
-    "message": "Đã lưu mục Gửi",
+    "message": "Đã lưu Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendFilePopoutDialogText": {
-    "message": "Pop out extension?",
+    "message": "Mở rộng tiện ích ra cửa sổ mới?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendFilePopoutDialogDesc": {
-    "message": "To create a file Send, you need to pop out the extension to a new window.",
+    "message": "Để tạo Send tập tin, bạn cần mở phần mở rộng trong cửa sổ mới.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLinuxChromiumFileWarning": {
-    "message": "Để chọn tập tin, mở tiện ích mở rộng trong thanh bên (nếu có thể) hoặc mở ra cửa sổ mới bằng cách nhấp vào biểu ngữ này."
+    "message": "Để chọn tập tin, mở tiện ích mở rộng trong thanh bên (nếu có thể) hoặc mở cửa sổ mới bằng cách nhấp vào biểu ngữ này."
   },
   "sendFirefoxFileWarning": {
-    "message": "Để chọn tập tin bằng Firefox, mở tiện ích mở rộng trong thanh bên hoặc mở ra cửa sổ mới bằng cách nhấp vào biểu ngữ này."
+    "message": "Để chọn tập tin bằng Firefox, mở tiện ích mở rộng trong thanh bên hoặc mở cửa sổ mới bằng cách nhấp vào biểu ngữ này."
   },
   "sendSafariFileWarning": {
-    "message": "Để chọn tập tin bằng Safari, mở ra cửa sổ mới bằng cách nhấp vào biểu ngữ này."
+    "message": "Để chọn tập tin bằng Safari, mở cửa sổ mới bằng cách nhấp vào biểu ngữ này."
   },
   "popOut": {
-    "message": "Pop out"
+    "message": "Mở rộng"
   },
   "sendFileCalloutHeader": {
     "message": "Trước khi bạn bắt đầu"
@@ -2856,10 +2905,10 @@
     "message": "Đã xảy ra lỗi khi lưu ngày xoá và ngày hết hạn của bạn."
   },
   "hideYourEmail": {
-    "message": "Hide your email address from viewers."
+    "message": "Ẩn địa chỉ email của bạn với người xem."
   },
   "passwordPrompt": {
-    "message": "Nhắc lại mật khẩu chính"
+    "message": "Nhập lại mật khẩu chính"
   },
   "passwordConfirmation": {
     "message": "Xác nhận mật khẩu chính"
@@ -2868,13 +2917,16 @@
     "message": "Hành động này được bảo vệ. Để tiếp tục, hãy nhập lại mật khẩu chính của bạn để xác minh danh tính."
   },
   "emailVerificationRequired": {
-    "message": "Yêu cầu xác nhận danh tính qua email"
+    "message": "Yêu cầu xác minh danh tính qua email"
   },
   "emailVerifiedV2": {
     "message": "Email đã xác minh"
   },
   "emailVerificationRequiredDesc": {
-    "message": "Bạn phải xác nhận email để sử dụng tính năng này. Bạn có thể xác minh email trên web."
+    "message": "Bạn phải xác minh email để sử dụng tính năng này. Bạn có thể xác minh email trên web."
+  },
+  "masterPasswordSuccessfullySet": {
+    "message": "Mật khẩu chính được thiết lập thành công"
   },
   "updatedMasterPassword": {
     "message": "Đã cập nhật mật khẩu chính"
@@ -2883,13 +2935,13 @@
     "message": "Cập nhật mật khẩu chính"
   },
   "updateMasterPasswordWarning": {
-    "message": "Mật khẩu chính của bạn gần đây đã được thay đổi bởi người quản trị trong tổ chức của bạn. Để truy cập kho, bạn phải cập nhật nó ngay bây giờ. Việc tiếp tục sẽ đăng xuất khỏi kho và bạn sẽ cần đăng nhập lại. Ứng dụng Bitwaden trên các thiết bị khác có thể tiếp tục hoạt động trong tối đa một giờ sau đó sẽ bị đăng xuất."
+    "message": "Mật khẩu chính của bạn gần đây đã được thay đổi bởi người quản trị trong tổ chức của bạn. Để truy cập kho, bạn phải cập nhật mật khẩu chính của mình ngay bây giờ. Việc tiếp tục sẽ đăng xuất khỏi kho và bạn sẽ cần đăng nhập lại. Ứng dụng Bitwaden trên các thiết bị khác có thể tiếp tục hoạt động trong tối đa một giờ sau đó sẽ bị đăng xuất."
   },
   "updateWeakMasterPasswordWarning": {
     "message": "Mật khẩu chính của bạn không đáp ứng chính sách tổ chức của bạn. Để truy cập kho, bạn phải cập nhật mật khẩu chính của mình ngay bây giờ. Việc tiếp tục sẽ đăng xuất bạn khỏi phiên hiện tại và bắt buộc đăng nhập lại. Các phiên hoạt động trên các thiết bị khác có thể tiếp tục duy trì hoạt động trong tối đa một giờ."
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Tổ chức của bạn đã vô hiệu hóa mã hóa bằng thiết bị đáng tin cậy. Vui lòng đặt mật khẩu chính để truy cập Kho của bạn."
+    "message": "Tổ chức của bạn đã vô hiệu hóa tính năng mã hóa thiết bị tin cậy. Vui lòng đặt mật khẩu chính để truy cập kho của bạn."
   },
   "resetPasswordPolicyAutoEnroll": {
     "message": "Đăng ký tự động"
@@ -2905,15 +2957,15 @@
     "description": "Used as a message within the notification bar when no folders are found"
   },
   "orgPermissionsUpdatedMustSetPassword": {
-    "message": "Quyền tổ chức của bạn đã được cập nhật, yêu cầu bạn đặt mật khẩu chính.",
+    "message": "Quyền truy cập của tổ chức bạn đã được cập nhật, yêu cầu bạn phải thiết lập mật khẩu chính.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "orgRequiresYouToSetPassword": {
-    "message": "Tổ chức của bạn yêu cầu bạn đặt mật khẩu chính.",
+    "message": "Tổ chức của bạn yêu cầu bạn thiết lập mật khẩu chính.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
-    "message": "out of $TOTAL$",
+    "message": "trong tổng số $TOTAL$",
     "placeholders": {
       "total": {
         "content": "$1",
@@ -2932,7 +2984,7 @@
     "message": "Phút"
   },
   "vaultTimeoutPolicyAffectingOptions": {
-    "message": "Enterprise policy requirements have been applied to your timeout options"
+    "message": "Các yêu cầu chính sách của doanh nghiệp đã được áp dụng cho các tùy chọn thời gian mở kho của bạn"
   },
   "vaultTimeoutPolicyInEffect": {
     "message": "Tổ chức của bạn đã đặt thời gian mở kho tối đa là $HOURS$ giờ và $MINUTES$ phút.",
@@ -2948,7 +3000,7 @@
     }
   },
   "vaultTimeoutPolicyInEffect1": {
-    "message": "$HOURS$ hour(s) and $MINUTES$ minute(s) maximum.",
+    "message": "Tối đa $HOURS$ giờ và $MINUTES$ phút.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2961,7 +3013,7 @@
     }
   },
   "vaultTimeoutPolicyMaximumError": {
-    "message": "Timeout exceeds the restriction set by your organization: $HOURS$ hour(s) and $MINUTES$ minute(s) maximum",
+    "message": "Thời gian mở kho đã vượt quá giới hạn do tổ chức của bạn đặt ra: Tối đa $HOURS$ giờ và $MINUTES$ phút",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2974,7 +3026,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "Tổ chức của bạn đang ảnh hưởng đến thời gian mở kho. Thời gian mở kho tối đa là $HOURS$ giờ và $MINUTES$ phút. Kho sẽ $ACTION$ sau khi hết thời gian mở kho.",
+    "message": "Các chính sách của tổ chức bạn đang ảnh hưởng đến thời gian mở kho. Thời gian mở kho tối đa được phép là $HOURS$ giờ và $MINUTES$ phút. Kho sẽ $ACTION$ sau khi đóng kho.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2991,7 +3043,7 @@
     }
   },
   "vaultTimeoutActionPolicyInEffect": {
-    "message": "Tổ chức của bạn sẽ $ACTION$ sau khi hết thời gian mở kho.",
+    "message": "Tổ chức bạn đã thiết lập hành động sau khi đóng kho là $ACTION$.",
     "placeholders": {
       "action": {
         "content": "$1",
@@ -3003,25 +3055,25 @@
     "message": "Thời gian mở kho vượt quá giới hạn do tổ chức của bạn đặt ra."
   },
   "vaultExportDisabled": {
-    "message": "Xuất kho không có sẵn"
+    "message": "Chức năng xuất kho không khả dụng"
   },
   "personalVaultExportPolicyInEffect": {
     "message": "Các chính sách của tổ chức ngăn cản bạn xuất kho lưu trữ cá nhân của mình."
   },
   "copyCustomFieldNameInvalidElement": {
-    "message": "Không thể xác định được phần tử biểu mẫu hợp lệ. Thay vào đó hãy thử kiểm tra trong HTML."
+    "message": "Không thể xác định được phần tử biểu mẫu hợp lệ. Thay vào đó hãy thử kiểm tra mã HTML."
   },
   "copyCustomFieldNameNotUnique": {
     "message": "Không tìm thấy danh tính duy nhất."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Mật khẩu chính không còn được yêu cầu đối với các thành viên của tổ chức sau đây. Vui lòng xác nhận tên miền bên dưới với quản trị viên của tổ chức."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Tên tổ chức"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Tên miền Key Connector"
   },
   "leaveOrganization": {
     "message": "Rời tổ chức"
@@ -3048,7 +3100,7 @@
     "message": "Đang xuất dữ liệu kho cá nhân"
   },
   "exportingIndividualVaultDescription": {
-    "message": "Chỉ dữ liệu trong kho cá nhân liên kết với $EMAIL$ mới được xuất. Không bao gồm \ncác dữ liệu trong kho tổ chức. Chỉ thông tin mục kho mới được xuất, sẽ không có các tệp đính kèm.",
+    "message": "Chỉ dữ liệu trong kho cá nhân liên kết với $EMAIL$ mới được xuất. Không bao gồm các dữ liệu trong kho tổ chức. Chỉ thông tin về các mục trong kho mới được xuất, sẽ không có các tệp đính kèm.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3057,7 +3109,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "Chỉ các mục kho lưu trữ cá nhân bao gồm các tệp đính kèm liên quan đến $EMAIL$ sẽ được xuất. Các mục trong kho lưu trữ của tổ chức sẽ không được bao gồm",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3081,27 +3133,27 @@
     "message": "Lỗi"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Lỗi giải mã"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "Bitwarden không thể giải mã các mục trong kho lưu trữ được liệt kê bên dưới."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "Liên hệ hỗ trợ khách hàng thành công",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "để tránh mất mát thêm dữ liệu.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "generateUsername": {
-    "message": "Tạo tên người dùng"
+    "message": "Tạo tên đăng nhập"
   },
   "generateEmail": {
-    "message": "Generate email"
+    "message": "Tạo email"
   },
   "spinboxBoundariesHint": {
-    "message": "Value must be between $MIN$ and $MAX$.",
+    "message": "Giá trị phải nằm trong khoảng từ $MIN$ đến $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
     "placeholders": {
       "min": {
@@ -3115,7 +3167,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " Use $RECOMMENDED$ characters or more to generate a strong password.",
+    "message": " Sử dụng ít nhất $RECOMMENDED$ ký tự để tạo một mật khẩu mạnh.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3125,7 +3177,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Use $RECOMMENDED$ words or more to generate a strong passphrase.",
+    "message": " Sử dụng ít nhất $RECOMMENDED$ từ để tạo cụm mật khẩu mạnh.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3139,10 +3191,10 @@
     "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
   },
   "plusAddressedEmailDesc": {
-    "message": "Sử dụng khả năng địa chỉ phụ của nhà cung cấp dịch vụ mail của bạn."
+    "message": "Sử dụng tính năng địa chỉ phụ của nhà cung cấp dịch vụ email của bạn."
   },
   "catchallEmail": {
-    "message": "Email Catch-all"
+    "message": "Catch-all email"
   },
   "catchallEmailDesc": {
     "message": "Sử dụng hộp thư bạn đã thiết lập để nhận tất cả email gửi đến tên miền của bạn."
@@ -3160,17 +3212,17 @@
     "message": "Dịch vụ"
   },
   "forwardedEmail": {
-    "message": "Đã chuyển tiếp bí danh email"
+    "message": "Địa chỉ email thay thế"
   },
   "forwardedEmailDesc": {
-    "message": "Tạo bí danh email với dịch vụ chuyển tiếp bên ngoài."
+    "message": "Tạo một địa chỉ email ảo bằng dịch vụ chuyển tiếp email bên ngoài."
   },
   "forwarderDomainName": {
-    "message": "Email domain",
+    "message": "Tên miền email",
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Choose a domain that is supported by the selected service",
+    "message": "Chọn một tên miền được hỗ trợ bởi dịch vụ đã chọn",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
@@ -3212,7 +3264,7 @@
     }
   },
   "forwaderInvalidTokenWithMessage": {
-    "message": "Khoá API $SERVICENAME$ không hợp lệ: $ERRORMESSAGE$",
+    "message": "Token API $SERVICENAME$ không hợp lệ: $ERRORMESSAGE$",
     "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -3226,7 +3278,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "message": "$SERVICENAME$ đã từ chối yêu cầu của bạn. Vui lòng liên hệ với nhà cung cấp dịch vụ của bạn để được hỗ trợ.",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -3236,7 +3288,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ đã từ chối yêu cầu của bạn: $ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -3250,7 +3302,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Không thể lấy ID tài khoản email ẩn từ $SERVICENAME$.",
+    "message": "Không thể lấy ID tài khoản email ẩn danh của $SERVICENAME$.",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -3310,10 +3362,10 @@
     "message": "Khóa API"
   },
   "ssoKeyConnectorError": {
-    "message": "Lỗi kết nối khóa: hãy đảm bảo kết nối khóa khả dụng và hoạt động chính xác."
+    "message": "Lỗi kết nối khóa: hãy đảm bảo kết nối khóa khả dụng và hoạt động bình thường."
   },
   "premiumSubcriptionRequired": {
-    "message": "Yêu cầu đăng ký gói Premium"
+    "message": "Yêu cầu đăng ký gói Cao cấp"
   },
   "organizationIsDisabled": {
     "message": "Tổ chức đã ngưng hoạt động."
@@ -3340,7 +3392,7 @@
     "message": "Bên thứ ba"
   },
   "thirdPartyServerMessage": {
-    "message": "Bạn đang kết nối đến máy chủ $SERVERNAME$ của bên thứ ba. Vui lòng kiểm tra lỗi bằng cách sử dụng máy chủ chính thức hoặc báo lỗi cho bên thứ ba.",
+    "message": "Kết nối với máy chủ của bên thứ ba, $SERVERNAME$. Vui lòng kiểm tra lỗi trên máy chủ chính thức hoặc báo cáo lỗi cho máy chủ của bên thứ ba.",
     "placeholders": {
       "servername": {
         "content": "$1",
@@ -3370,43 +3422,46 @@
     "message": "Đăng nhập bằng thiết bị"
   },
   "fingerprintPhraseHeader": {
-    "message": "Cụm vân tay"
+    "message": "Cụm từ xác thực"
   },
   "fingerprintMatchInfo": {
-    "message": "Vui lòng đảm bảo rằng bạn đã mở khoá kho và cụm vân tay khớp trên thiết bị khác."
+    "message": "Vui lòng đảm bảo rằng bạn đã mở khoá kho và cụm từ xác thực khớp với thiết bị khác."
   },
   "resendNotification": {
     "message": "Gửi lại thông báo"
   },
   "viewAllLogInOptions": {
-    "message": "View all log in options"
+    "message": "Xem tất cả tùy chọn đăng nhập"
   },
   "notificationSentDevice": {
     "message": "Một thông báo đã được gửi đến thiết bị của bạn."
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the"
+    "message": "Mở khóa Bitwarden trên thiết bị của bạn hoặc trên"
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "ứng dụng web"
   },
   "notificationSentDevicePart2": {
-    "message": "Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Hãy đảm bảo rằng cụm từ xác thực khớp với cụm từ bên dưới trước khi phê duyệt."
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "A notification was sent to your device"
+    "message": "Một thông báo đã được gửi đến thiết bị của bạn"
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "You will be notified once the request is approved"
+    "message": "Bạn sẽ nhận được thông báo ngay sau khi yêu cầu được phê duyệt"
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "Cần một tùy chọn khác?"
   },
   "loginInitiated": {
     "message": "Bắt đầu đăng nhập"
   },
   "logInRequestSent": {
-    "message": "Request sent"
+    "message": "Đã gửi yêu cầu"
+  },
+  "masterPasswordChanged": {
+    "message": "Đã lưu mật khẩu chính"
   },
   "exposedMasterPassword": {
     "message": "Mật khẩu chính bị lộ"
@@ -3415,19 +3470,19 @@
     "message": "Mật khẩu này đã bị rò rỉ trong một vụ tấn công dữ liệu. Dùng mật khẩu mới và an toàn để bảo vệ tài khoản bạn. Bạn có chắc muốn sử dụng mật khẩu đã bị rò rỉ?"
   },
   "weakAndExposedMasterPassword": {
-    "message": "Mật khẩu chính yếu và bị lộ"
+    "message": "Mật khẩu chính yếu và đã bị lộ"
   },
   "weakAndBreachedMasterPasswordDesc": {
-    "message": "Mật khẩu yếu này đã bị rò rỉ trong một vụ tấn công dữ liệu. Dùng mật khẩu mới và an toàn để bảo vệ tài khoản bạn. Bạn có chắc muốn sử dụng mật khẩu đã bị rò rỉ?"
+    "message": "Mật khẩu yếu này đã bị rò rỉ trong một vụ tấn công dữ liệu. Hãy dùng mật khẩu mạnh và duy nhất để bảo vệ tài khoản của bạn. Bạn có chắc muốn sử dụng mật khẩu đã bị rò rỉ?"
   },
   "checkForBreaches": {
-    "message": "Kiểm tra mật khẩu có lộ trong các vụ rò rỉ dữ liệu hay không"
+    "message": "Kiểm tra mật khẩu có bị lộ trong các vụ rò rỉ dữ liệu hay không"
   },
   "important": {
     "message": "Quan trọng:"
   },
   "masterPasswordHint": {
-    "message": "Mật khẩu chính của bạn không thể phục hồi nếu bạn quên nó!"
+    "message": "Mật khẩu chính của bạn không thể khôi phục nếu bạn quên nó!"
   },
   "characterMinimum": {
     "message": "$LENGTH$ ký tự tối thiểu",
@@ -3439,7 +3494,7 @@
     }
   },
   "autofillPageLoadPolicyActivated": {
-    "message": "Chính sách quản lí của bạn đã bật chức năng tự động điền khi tải trang."
+    "message": "Chính sách của tổ chức bạn đã kích hoạt tính năng tự động điền khi tải trang."
   },
   "howToAutofill": {
     "message": "Cách tự đồng điền"
@@ -3469,16 +3524,16 @@
     "message": "Thay đổi phím tắt"
   },
   "autofillKeyboardManagerShortcutsLabel": {
-    "message": "Quản lý các lối tắt"
+    "message": "Quản lý các phím tắt"
   },
   "autofillShortcut": {
     "message": "Phím tắt tự động điền"
   },
   "autofillLoginShortcutNotSet": {
-    "message": "The autofill login shortcut is not set. Change this in the browser's settings."
+    "message": "Chưa cài đặt phím tắt cho chức năng tự động điền. Vui lòng thay đổi trong cài đặt của trình duyệt."
   },
   "autofillLoginShortcutText": {
-    "message": "The autofill login shortcut is $COMMAND$. Manage all shortcuts in the browser's settings.",
+    "message": "Phím tắt đăng nhập tự động là $COMMAND$. Quản lý các phím tắt trong cài đặt của trình duyệt.",
     "placeholders": {
       "command": {
         "content": "$1",
@@ -3499,16 +3554,16 @@
     "message": "Mở trong cửa sổ mới"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Remember this device to make future logins seamless"
+    "message": "Nhớ thiết bị này để đăng nhập dễ dàng trong tương lai"
   },
   "deviceApprovalRequired": {
     "message": "Yêu cầu phê duyệt thiết bị. Chọn một tuỳ chọn phê duyệt bên dưới:"
   },
   "deviceApprovalRequiredV2": {
-    "message": "Device approval required"
+    "message": "Yêu cầu phê duyệt trên thiết bị"
   },
   "selectAnApprovalOptionBelow": {
-    "message": "Select an approval option below"
+    "message": "Chọn một tùy chọn phê duyệt dưới đây"
   },
   "rememberThisDevice": {
     "message": "Lưu thiết bị này"
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "Yêu cầu quản trị viên phê duyệt"
   },
+  "unableToCompleteLogin": {
+    "message": "Không thể hoàn tất quá trình đăng nhập"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Bạn cần đăng nhập trên một thiết bị đáng tin cậy hoặc yêu cầu quản trị viên cấp cho bạn mật khẩu."
+  },
   "ssoIdentifierRequired": {
     "message": "Cần có mã định danh SSO của tổ chức."
   },
@@ -3532,13 +3593,13 @@
     "message": "Kiểm tra email của bạn"
   },
   "followTheLinkInTheEmailSentTo": {
-    "message": "Nhấp vào liên kết trong email được gửi đến"
+    "message": "Nhấp vào liên kết được gửi đến trong email"
   },
   "andContinueCreatingYourAccount": {
     "message": "và tiếp tục tạo tài khoản của bạn."
   },
   "noEmail": {
-    "message": "Không có email?"
+    "message": "Không nhận được email?"
   },
   "goBack": {
     "message": "Quay lại"
@@ -3572,55 +3633,47 @@
     "message": "Không thể đăng nhập?"
   },
   "loginApproved": {
-    "message": "Lượt đăng nhập đã duyệt"
+    "message": "Lượt đăng nhập đã phê duyệt"
   },
   "userEmailMissing": {
     "message": "Thiếu email người dùng"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "Email người dùng đang hoạt động không được tìm thấy. Bạn đang bị đăng xuất."
   },
   "deviceTrusted": {
     "message": "Thiết bị tin cậy"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Tin tưởng tổ chức"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Tin tưởng"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Không tin tưởng"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Tổ chức không được tin cậy"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Để đảm bảo an toàn tài khoản của bạn, chỉ xác nhận nếu bạn đã cấp quyền truy cập khẩn cấp cho người dùng này và cụm từ nhận dạng của họ khớp với những gì hiển thị trong tài khoản của họ"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Để đảm bảo an toàn cho tài khoản của bạn, vui lòng chỉ tiếp tục nếu bạn là thành viên của tổ chức này, đã kích hoạt tính năng khôi phục tài khoản và cụm từ nhận dạng hiển thị bên dưới trùng khớp với cụm từ nhận dạng của tổ chức."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Tổ chức này có chính sách doanh nghiệp sẽ đăng ký bạn vào quy trình khôi phục tài khoản. Việc đăng ký sẽ cho phép các quản trị viên của tổ chức thay đổi mật khẩu của bạn. Chỉ tiếp tục nếu bạn nhận ra tổ chức này và cụm từ xác thực hiển thị bên dưới khớp với cụm từ xác thực của tổ chức."
   },
   "trustUser": {
-    "message": "Trust user"
-  },
-  "sendsNoItemsTitle": {
-    "message": "Không có mục Gửi nào đang hoạt động",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Sử dụng Gửi để chia sẻ thông tin mã hóa một cách an toàn với bất kỳ ai.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+    "message": "Người dùng tin cậy"
   },
   "sendsTitleNoItems": {
-    "message": "Send sensitive information safely",
+    "message": "Gửi thông tin nhạy cảm một cách an toàn",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsBodyNoItems": {
-    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "message": "Chia sẻ tệp tin và dữ liệu một cách an toàn với bất kỳ ai, trên bất kỳ nền tảng nào. Thông tin của bạn sẽ được mã hóa đầu cuối để hạn chế rủi ro bị lộ.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -3633,7 +3686,7 @@
     "message": "Tìm kiếm"
   },
   "inputMinLength": {
-    "message": "Giá trị nhập vào phải ít nhất $COUNT$ ký tự.",
+    "message": "Dữ liệu nhập vào phải có độ dài ít nhất $COUNT$ ký tự.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3642,7 +3695,7 @@
     }
   },
   "inputMaxLength": {
-    "message": "Giá trị nhập vào không được vượt quá $COUNT$ ký tự.",
+    "message": "Độ dài của dữ liệu nhập vào không được vượt quá $COUNT$ ký tự.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3660,7 +3713,7 @@
     }
   },
   "inputMinValue": {
-    "message": "Giá trị nhập vào phải ít nhất $MIN$.",
+    "message": "Dữ liệu nhập vào phải ít nhất là $MIN$.",
     "placeholders": {
       "min": {
         "content": "$1",
@@ -3669,7 +3722,7 @@
     }
   },
   "inputMaxValue": {
-    "message": "Giá trị nhập vào không được vượt quá $MAX$.",
+    "message": "Dữ liệu nhập vào không được vượt quá $MAX$.",
     "placeholders": {
       "max": {
         "content": "$1",
@@ -3681,14 +3734,14 @@
     "message": "Có ít nhất 1 địa chỉ email không hợp lệ"
   },
   "inputTrimValidator": {
-    "message": "Giá trị nhập vào không được chỉ có khoảng trắng.",
+    "message": "Dữ liệu nhập vào không được chỉ chứa khoảng trắng.",
     "description": "Notification to inform the user that a form's input can't contain only whitespace."
   },
   "inputEmail": {
-    "message": "Giá trị nhập vào không phải là địa chỉ email."
+    "message": "Dữ liệu nhập vào không phải là địa chỉ email."
   },
   "fieldsNeedAttention": {
-    "message": "Có $COUNT$ trường cần bạn xem xét ở trên.",
+    "message": "$COUNT$ trường ở trên cần bạn chú ý.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3697,10 +3750,10 @@
     }
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "1 trường cần bạn chú ý."
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "$COUNT$ trường bạn cần chú ý.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3712,7 +3765,7 @@
     "message": "-- Chọn --"
   },
   "multiSelectPlaceholder": {
-    "message": "-- Nhập để lọc --"
+    "message": "-- Nhập từ khóa để lọc --"
   },
   "multiSelectLoading": {
     "message": "Đang tải các tuỳ chọn..."
@@ -3743,7 +3796,7 @@
     "message": "Tên miền thay thế"
   },
   "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Các mục yêu cầu nhập lại mật khẩu chính không thể tự động điền khi tải trang. Tự động điền khi tải trang đã tắt.",
+    "message": "Các mục yêu cầu nhập lại mật khẩu chính không thể được tự động điền khi tải trang. Tự động điền khi tải trang đã bị tắt.",
     "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
   },
   "autofillOnPageLoadSetToDefault": {
@@ -3758,7 +3811,7 @@
     "message": "Ẩn/hiện thanh điều hướng bên"
   },
   "skipToContent": {
-    "message": "Chuyển đến nội dung"
+    "message": "Bỏ qua nội dung"
   },
   "bitwardenOverlayButton": {
     "message": "Nút menu tự động điền Bitwarden",
@@ -3777,7 +3830,7 @@
     "description": "Text to display in overlay when the account is locked."
   },
   "unlockYourAccountToViewAutofillSuggestions": {
-    "message": "Unlock your account to view autofill suggestions",
+    "message": "Mở khóa tài khoản của bạn để xem các đề xuất tự động điền",
     "description": "Text to display in overlay when the account is locked."
   },
   "unlockAccount": {
@@ -3785,15 +3838,15 @@
     "description": "Button text to display in overlay when the account is locked."
   },
   "unlockAccountAria": {
-    "message": "Unlock your account, opens in a new window",
+    "message": "Mở khóa tài khoản của bạn, mở trong cửa sổ mới",
     "description": "Screen reader text (aria-label) for unlock account button in overlay"
   },
   "totpCodeAria": {
-    "message": "Time-based One-Time Password Verification Code",
+    "message": "Mã xác minh mật khẩu một lần dựa trên thời gian",
     "description": "Aria label for the totp code displayed in the inline menu for autofill"
   },
   "totpSecondsSpanAria": {
-    "message": "Time remaining before current TOTP expires",
+    "message": "Thời gian còn lại trước khi TOTP hiện tại hết hạn",
     "description": "Aria label for the totp seconds displayed in the inline menu for autofill"
   },
   "fillCredentialsFor": {
@@ -3801,7 +3854,7 @@
     "description": "Screen reader text for when overlay item is in focused"
   },
   "partialUsername": {
-    "message": "Tên người dùng từng phần",
+    "message": "Tên đăng nhập một phần",
     "description": "Screen reader text for when a login item is focused where a partial username is displayed. SR will announce this phrase before reading the text of the partial username"
   },
   "noItemsToShow": {
@@ -3817,31 +3870,31 @@
     "description": "Screen reader text (aria-label) for new item button in overlay"
   },
   "newLogin": {
-    "message": "New login",
+    "message": "Đăng nhập mới",
     "description": "Button text to display within inline menu when there are no matching items on a login field"
   },
   "addNewLoginItemAria": {
-    "message": "Add new vault login item, opens in a new window",
+    "message": "Thêm mục đăng nhập mới, mở trong cửa sổ mới",
     "description": "Screen reader text (aria-label) for new login button within inline menu"
   },
   "newCard": {
-    "message": "New card",
+    "message": "Thêm thẻ",
     "description": "Button text to display within inline menu when there are no matching items on a credit card field"
   },
   "addNewCardItemAria": {
-    "message": "Add new vault card item, opens in a new window",
+    "message": "Thêm một thẻ mới, mở trong cửa sổ mới",
     "description": "Screen reader text (aria-label) for new card button within inline menu"
   },
   "newIdentity": {
-    "message": "New identity",
+    "message": "Danh tính mới",
     "description": "Button text to display within inline menu when there are no matching items on an identity field"
   },
   "addNewIdentityItemAria": {
-    "message": "Add new vault identity item, opens in a new window",
+    "message": "Thêm danh tính mới, mở trong cửa sổ mới",
     "description": "Screen reader text (aria-label) for new identity button within inline menu"
   },
   "bitwardenOverlayMenuAvailable": {
-    "message": "Danh sách tự động điền của Bitwarden sẵn sàng. Sử dụng phím mũi tên xuống để chọn.",
+    "message": "Menu tự động điền của Bitwarden có sẵn. Nhấn phím mũi tên xuống để chọn.",
     "description": "Screen reader text for announcing when the overlay opens on the page"
   },
   "turnOn": {
@@ -3855,10 +3908,10 @@
     "description": "Used for the header of the import dialog, the import button and within the file-password-prompt"
   },
   "importError": {
-    "message": "Lỗi nhập"
+    "message": "Lỗi khi nhập"
   },
   "importErrorDesc": {
-    "message": "Có vấn đề với dữ liệu bạn cố gắng nhập. Vui lòng khắc phục các lỗi được liệt kê bên dưới trong tập tin nguồn của bạn và thử lại."
+    "message": "Có vấn đề với dữ liệu bạn đang cố gắng nhập. Vui lòng khắc phục các lỗi được liệt kê bên dưới trong tệp nguồn của bạn và thử lại."
   },
   "resolveTheErrorsBelowAndTryAgain": {
     "message": "Giải quyết các lỗi bên dưới và thử lại."
@@ -3894,7 +3947,7 @@
     "message": "Đang chờ xác nhận"
   },
   "couldNotCompleteBiometrics": {
-    "message": "Không thể hoàn tất sinh trắc học."
+    "message": "Không thể hoàn tất quá trình xác thực sinh trắc học."
   },
   "needADifferentMethod": {
     "message": "Cần một phương pháp khác?"
@@ -3933,7 +3986,7 @@
     "message": "Tài khoản của bạn yêu cầu xác minh hai bước với Duo."
   },
   "popoutExtension": {
-    "message": "Tiện ích mở rộng dạng cửa sổ bật lên"
+    "message": "Mở tiện ích ra cửa sổ mới"
   },
   "launchDuo": {
     "message": "Khởi chạy Dou"
@@ -3963,7 +4016,7 @@
     "message": "Chọn bộ sưu tập"
   },
   "importTargetHint": {
-    "message": "Chọn tùy chọn này để di chuyển nội dung tập tin đã được nhập đến $DESTINATION$",
+    "message": "Chọn tùy chọn này nếu bạn muốn nội dung của tệp đã nhập được di chuyển đến $DESTINATION$",
     "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.",
     "placeholders": {
       "destination": {
@@ -3991,7 +4044,7 @@
     "message": "hoặc sao chép/dán nội dung của tập tin nhập"
   },
   "instructionsFor": {
-    "message": "Hướng dẫn dùng $NAME$",
+    "message": "Hướng dẫn cho $NAME$",
     "description": "The title for the import tool instructions.",
     "placeholders": {
       "name": {
@@ -4016,22 +4069,22 @@
     "message": "Mã khoá"
   },
   "accessing": {
-    "message": "Accessing"
+    "message": "Đang truy cập"
   },
   "loggedInExclamation": {
-    "message": "Logged in!"
+    "message": "Đã đăng nhập!"
   },
   "passkeyNotCopied": {
     "message": "Không thể sao chép mã khoá"
   },
   "passkeyNotCopiedAlert": {
-    "message": "Bản sao sẽ không bao gồm mã khoá. Bạn có muốn tiếp tục tạo bản sao mục này?"
+    "message": "Bản sao sẽ không bao gồm mã khoá. Bạn có muốn tiếp tục tạo bản sao cho mục này?"
   },
   "passkeyFeatureIsNotImplementedForAccountsWithoutMasterPassword": {
     "message": "Trang web yêu cầu xác minh. Tính năng này hiện chưa được hỗ trợ cho tài khoản không có mật khẩu chính."
   },
   "logInWithPasskeyQuestion": {
-    "message": "Log in with passkey?"
+    "message": "Đăng nhập bằng mã khóa?"
   },
   "passkeyAlreadyExists": {
     "message": "Ứng dụng này đã có mã khoá."
@@ -4043,10 +4096,10 @@
     "message": "Bạn không có thông tin đăng nhập phù hợp cho trang web này."
   },
   "noMatchingLoginsForSite": {
-    "message": "No matching logins for this site"
+    "message": "Không có đăng nhập khớp với trang web này"
   },
   "searchSavePasskeyNewLogin": {
-    "message": "Search or save passkey as new login"
+    "message": "Tìm kiếm hoặc lưu mã khóa làm đăng nhập mới"
   },
   "confirm": {
     "message": "Xác nhận"
@@ -4058,10 +4111,10 @@
     "message": "Lưu mã khoá như đăng nhập mới"
   },
   "chooseCipherForPasskeySave": {
-    "message": "Choose a login to save this passkey to"
+    "message": "Chọn một đăng nhập để lưu mã khóa này"
   },
   "chooseCipherForPasskeyAuth": {
-    "message": "Choose a passkey to log in with"
+    "message": "Chọn một mã khóa để đăng nhập"
   },
   "passkeyItem": {
     "message": "Mục mã khoá"
@@ -4073,7 +4126,7 @@
     "message": "Mục này đã chứa mã khoá. Bạn có chắc muốn ghi đè mã khoá hiện tại không?"
   },
   "featureNotSupported": {
-    "message": "Chưa hỗ trợ tính năng này"
+    "message": "Tính năng này hiện chưa được hỗ trợ"
   },
   "yourPasskeyIsLocked": {
     "message": "Yêu cầu xác thực để sử dụng mã khoá. Xác minh danh tính của bạn để tiếp tục."
@@ -4085,7 +4138,7 @@
     "message": "Không tìm thấy dữ liệu LastPass"
   },
   "incorrectUsernameOrPassword": {
-    "message": "Tên người dùng hoặc mật khẩu không đúng"
+    "message": "Tên đăng nhập hoặc mật khẩu không đúng"
   },
   "incorrectPassword": {
     "message": "Mật khẩu không đúng"
@@ -4127,7 +4180,7 @@
     "message": "Yêu cầu xác thực LastPass"
   },
   "awaitingSSO": {
-    "message": "Đang chờ xác thực SSO"
+    "message": "Đang chờ xác thực Đăng nhập một lần"
   },
   "awaitingSSODesc": {
     "message": "Vui lòng tiếp tục đăng nhập bằng thông tin đăng nhập của công ty bạn."
@@ -4143,10 +4196,10 @@
     "message": "Nhập từ CSV"
   },
   "lastPassTryAgainCheckEmail": {
-    "message": "Thử lại hoặc tìm email từ LastPass để xác minh đó là bạn."
+    "message": "Hãy thử lại hoặc kiểm tra email từ LastPass để xác minh rằng đó là bạn."
   },
   "collection": {
-    "message": "Bộ Sưu Tập"
+    "message": "Bộ sưu tập"
   },
   "lastPassYubikeyDesc": {
     "message": "Cắm khóa YubiKey được liên kết với tài khoản LastPass của bạn vào cổng USB của máy tính, sau đó nhấn nút trên YubiKey."
@@ -4164,7 +4217,7 @@
     "message": "Tài khoản đang hoạt động"
   },
   "bitwardenAccount": {
-    "message": "Bitwarden account"
+    "message": "Tài khoản Bitwarden"
   },
   "availableAccounts": {
     "message": "Các tài khoản khả dụng"
@@ -4194,10 +4247,10 @@
     "message": "Chỉ một lần"
   },
   "alwaysForThisSite": {
-    "message": "Luôn cho trang này"
+    "message": "Luôn luôn cho trang này"
   },
   "domainAddedToExcludedDomains": {
-    "message": "$DOMAIN$ đã được thêm vào danh sách các tên miền loại trừ.",
+    "message": "$DOMAIN$ đã được thêm vào danh sách các tên miền bị loại trừ.",
     "placeholders": {
       "domain": {
         "content": "$1",
@@ -4209,6 +4262,26 @@
     "message": "Định dạng chung",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Bitwarden phát hiện khớp đường dẫn (URI) để xác định các đề xuất tự động điền.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Biểu thức chính quy\" là tùy chọn nâng cao với nguy cơ cao hơn trong việc lộ thông tin đăng nhập.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Bắt đầu với\" là tùy chọn nâng cao với nguy cơ cao hơn trong việc lộ thông tin đăng nhập.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Thông tin thêm về độ phù hợp",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Tùy chọn nâng cao",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "Tiếp tục tới Cài đặt trình duyệt?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -4218,7 +4291,7 @@
     "description": "Title for dialog which asks if the user wants to proceed to a relevant Help Center page"
   },
   "confirmContinueToHelpCenterPasswordManagementContent": {
-    "message": "Thay đổi cài đặt tự động điền và quản lý mật khẩu của trình duyệt của bạn.",
+    "message": "Thay đổi cài đặt tự động điền và quản lý mật khẩu của trình duyệt.",
     "description": "Body content for dialog which asks if the user wants to proceed to the Help Center's page about browser password management settings"
   },
   "confirmContinueToHelpCenterKeyboardShortcutsContent": {
@@ -4226,7 +4299,7 @@
     "description": "Body content for dialog which asks if the user wants to proceed to the Help Center's page about browser keyboard shortcut settings"
   },
   "confirmContinueToBrowserPasswordManagementSettingsContent": {
-    "message": "Thay đổi cài đặt tự động điền và quản lý mật khẩu của trình duyệt của bạn.",
+    "message": "Thay đổi cài đặt tự động điền và quản lý mật khẩu của trình duyệt.",
     "description": "Body content for dialog which asks if the user wants to proceed to the browser's password management settings page"
   },
   "confirmContinueToBrowserKeyboardShortcutSettingsContent": {
@@ -4242,7 +4315,7 @@
     "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior"
   },
   "overrideDefaultBrowserAutoFillSettings": {
-    "message": "Bitwarden làm trình quản lý mật khẩu mặc định",
+    "message": "Đặt Bitwarden làm trình quản lý mật khẩu mặc định của bạn",
     "description": "Label for the setting that allows overriding the default browser autofill settings"
   },
   "privacyPermissionAdditionNotGrantedTitle": {
@@ -4250,7 +4323,7 @@
     "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings"
   },
   "privacyPermissionAdditionNotGrantedDescription": {
-    "message": "Bạn phải cấp quyền riêng tư của trình duyệt cho Bitwarden để đặt nó làm trình quản lý mật khẩu mặc định.",
+    "message": "Bạn phải cấp quyền riêng tư của trình duyệt cho Bitwarden để đặt làm trình quản lý mật khẩu mặc định.",
     "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings"
   },
   "makeDefault": {
@@ -4262,7 +4335,7 @@
     "description": "Notification message for when saving credentials has succeeded."
   },
   "passwordSaved": {
-    "message": "Password saved!",
+    "message": "Đã lưu mật khẩu!",
     "description": "Notification message for when saving credentials has succeeded."
   },
   "updateCipherAttemptSuccess": {
@@ -4270,7 +4343,7 @@
     "description": "Notification message for when updating credentials has succeeded."
   },
   "passwordUpdated": {
-    "message": "Password updated!",
+    "message": "Đã cập nhật mật khẩu!",
     "description": "Notification message for when updating credentials has succeeded."
   },
   "saveCipherAttemptFailed": {
@@ -4287,10 +4360,10 @@
     "message": "Đã xóa mã khoá"
   },
   "autofillSuggestions": {
-    "message": "Autofill suggestions"
+    "message": "Các gợi ý tự động điền"
   },
   "itemSuggestions": {
-    "message": "Suggested items"
+    "message": "Các mục đề xuất"
   },
   "autofillSuggestionsTip": {
     "message": "Lưu thông tin đăng nhập cho trang này để tự động điền"
@@ -4355,7 +4428,7 @@
     }
   },
   "viewItemTitleWithField": {
-    "message": "View item - $ITEMNAME$ - $FIELD$",
+    "message": "Xem mục - $ITEMNAME$ - $FIELD$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4379,7 +4452,7 @@
     }
   },
   "autofillTitleWithField": {
-    "message": "Autofill - $ITEMNAME$ - $FIELD$",
+    "message": "Tự động điền - $ITEMNAME$ - $FIELD$",
     "description": "Title for a button that autofills a login item.",
     "placeholders": {
       "itemname": {
@@ -4393,7 +4466,7 @@
     }
   },
   "copyFieldValue": {
-    "message": "Copy $FIELD$, $VALUE$",
+    "message": "Sao chép $FIELD$, $VALUE$",
     "description": "Title for a button that copies a field value to the clipboard.",
     "placeholders": {
       "field": {
@@ -4434,10 +4507,10 @@
     "message": "Giao diện"
   },
   "errorAssigningTargetCollection": {
-    "message": "Lỗi khi gán vào bộ sưu tập chỉ định."
+    "message": "Lỗi khi gán vào bộ sưu tập đã chọn."
   },
   "errorAssigningTargetFolder": {
-    "message": "Lỗi khi gán vào thư mục chỉ định."
+    "message": "Lỗi khi gán vào thư mục đã chọn."
   },
   "viewItemsIn": {
     "message": "Xem các mục trong $NAME$",
@@ -4540,31 +4613,31 @@
     }
   },
   "downloadBitwarden": {
-    "message": "Download Bitwarden"
+    "message": "Tải xuống Bitwarden"
   },
   "downloadBitwardenOnAllDevices": {
-    "message": "Download Bitwarden on all devices"
+    "message": "Tải xuống Bitwarden trên tất cả các thiết bị"
   },
   "getTheMobileApp": {
-    "message": "Get the mobile app"
+    "message": "Tải ứng dụng di động"
   },
   "getTheMobileAppDesc": {
-    "message": "Access your passwords on the go with the Bitwarden mobile app."
+    "message": "Truy cập mật khẩu của bạn mọi lúc mọi nơi với ứng dụng di động Bitwarden."
   },
   "getTheDesktopApp": {
-    "message": "Get the desktop app"
+    "message": "Tải ứng dụng cho máy tính"
   },
   "getTheDesktopAppDesc": {
-    "message": "Access your vault without a browser, then set up unlock with biometrics to expedite unlocking in both the desktop app and browser extension."
+    "message": "Truy cập kho lưu trữ của bạn mà không cần trình duyệt, sau đó thiết lập mở khóa bằng sinh trắc học để mở khóa dễ dàng trong cả ứng dụng trên máy tính và tiện ích mở rộng trình duyệt."
   },
   "downloadFromBitwardenNow": {
-    "message": "Download from bitwarden.com now"
+    "message": "Tải xuống từ bitwarden.com ngay bây giờ"
   },
   "getItOnGooglePlay": {
-    "message": "Get it on Google Play"
+    "message": "Tải về từ Google Play"
   },
   "downloadOnTheAppStore": {
-    "message": "Download on the App Store"
+    "message": "Tải về từ App Store"
   },
   "permanentlyDeleteAttachmentConfirmation": {
     "message": "Bạn có chắc chắn muốn xóa vĩnh viễn tệp đính kèm này không?"
@@ -4579,13 +4652,13 @@
     "message": "Bộ lọc"
   },
   "filterVault": {
-    "message": "Filter vault"
+    "message": "Lọc kho"
   },
   "filterApplied": {
-    "message": "One filter applied"
+    "message": "Một bộ lọc đã được áp dụng"
   },
   "filterAppliedPlural": {
-    "message": "$COUNT$ filters applied",
+    "message": "$COUNT$ bộ lọc đã được áp dụng",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4597,7 +4670,7 @@
     "message": "Thông tin cá nhân"
   },
   "identification": {
-    "message": "ID"
+    "message": "Định danh"
   },
   "contactInfo": {
     "message": "Thông tin liên hệ"
@@ -4612,7 +4685,7 @@
     }
   },
   "cardNumberEndsWith": {
-    "message": "card number ends with",
+    "message": "số thẻ kết thúc bằng",
     "description": "Used within the inline menu to provide an aria description when users are attempting to fill a card cipher."
   },
   "loginCredentials": {
@@ -4622,13 +4695,13 @@
     "message": "Khóa xác thực"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "Tùy chọn tự động điền"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "Trang web (URI)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "Trang web (URI) $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -4638,16 +4711,16 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Đã thêm trang web"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "Thêm trang web"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "Xóa trang web"
   },
   "defaultLabel": {
-    "message": "Default ($VALUE$)",
+    "message": "Mặc định ($VALUE$)",
     "description": "A label that indicates the default value for a field with the current default value in parentheses.",
     "placeholders": {
       "value": {
@@ -4657,7 +4730,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "Show match detection $WEBSITE$",
+    "message": "Hiện phát hiện trùng khớp $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4666,7 +4739,7 @@
     }
   },
   "hideMatchDetection": {
-    "message": "Hide match detection $WEBSITE$",
+    "message": "Ẩn phát hiện trùng khớp $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4675,13 +4748,13 @@
     }
   },
   "autoFillOnPageLoad": {
-    "message": "Autofill on page load?"
+    "message": "Tự động điền khi tải trang?"
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Thẻ hết hạn"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "Nếu bạn đã gia hạn, hãy cập nhật thông tin thẻ"
   },
   "cardDetails": {
     "message": "Thông tin thẻ"
@@ -4696,10 +4769,10 @@
     }
   },
   "enableAnimations": {
-    "message": "Enable animations"
+    "message": "Bật hiệu ứng động"
   },
   "showAnimations": {
-    "message": "Show animations"
+    "message": "Hiện hiệu ứng động"
   },
   "addAccount": {
     "message": "Thêm tài khoản"
@@ -4711,15 +4784,15 @@
     "message": "Dữ liệu"
   },
   "passkeys": {
-    "message": "Passkeys",
+    "message": "Các mã khoá",
     "description": "A section header for a list of passkeys."
   },
   "passwords": {
-    "message": "Passwords",
+    "message": "Mật khẩu",
     "description": "A section header for a list of passwords."
   },
   "logInWithPasskeyAriaLabel": {
-    "message": "Log in with passkey",
+    "message": "Đăng nhập bằng mã khoá",
     "description": "ARIA label for the inline menu button that logs in with a passkey."
   },
   "assign": {
@@ -4756,19 +4829,19 @@
     "message": "Tiêu đề trường"
   },
   "textHelpText": {
-    "message": "Sử dụng các trường nhập liệu văn bản cho dữ liệu như câu hỏi bảo mật"
+    "message": "Sử dụng các trường văn bản cho dữ liệu như câu hỏi bảo mật"
   },
   "hiddenHelpText": {
-    "message": "Sử dụng các trường nhập liệu ẩn cho thông tin nhạy cảm như mật khẩu"
+    "message": "Sử dụng các trường ẩn để lưu dữ liệu nhạy cảm như mật khẩu"
   },
   "checkBoxHelpText": {
     "message": "Dùng các ô tích chọn nếu bạn muốn tự động điền vào ô tích chọn của biểu mẫu, chẳng hạn như ghi nhớ email"
   },
   "linkedHelpText": {
-    "message": "Sử dụng trường nhập liệu đã liên kết khi bạn gặp vấn đề với việc tự động điền trên một trang web cụ thể."
+    "message": "Sử dụng trường liên kết khi bạn gặp vấn đề với tính năng tự động điền trên một trang web cụ thể."
   },
   "linkedLabelHelpText": {
-    "message": "Nhập thông tin định danh của trường như id, name, aria-label hoặc placeholder."
+    "message": "Nhập html id, name, aria-label hoặc placeholder của các trường."
   },
   "editField": {
     "message": "Chỉnh sửa trường"
@@ -4810,10 +4883,10 @@
     }
   },
   "reorderWebsiteUriButton": {
-    "message": "Reorder website URI. Use arrow key to move item up or down."
+    "message": "Sắp xếp lại đường dẫn trang web. Sử dụng phím mũi tên để di chuyển mục lên hoặc xuống."
   },
   "reorderFieldUp": {
-    "message": "$LABEL$ đã di chuyển lên vị trí $INDEX$ / $LENGTH$",
+    "message": "$LABEL$ đã được di chuyển lên, vị trí $INDEX$ trong $LENGTH$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4891,7 +4964,7 @@
     }
   },
   "reorderFieldDown": {
-    "message": "$LABEL$ đã di chuyển xuống vị trí $INDEX$ / $LENGTH$",
+    "message": "$LABEL$ đã được di chuyển xuống, vị trí $INDEX$ trong $LENGTH$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4911,43 +4984,43 @@
     "message": "Vị trí mục"
   },
   "fileSend": {
-    "message": "File Send"
+    "message": "Gửi tệp"
   },
   "fileSends": {
-    "message": "File Sends"
+    "message": "Gửi tệp"
   },
   "textSend": {
-    "message": "Text Send"
+    "message": "Gửi văn bản"
   },
   "textSends": {
-    "message": "Text Sends"
+    "message": "Gửi văn bản"
   },
   "accountActions": {
-    "message": "Account actions"
+    "message": "Thao tác trên tài khoản"
   },
   "showNumberOfAutofillSuggestions": {
-    "message": "Show number of login autofill suggestions on extension icon"
+    "message": "Hiển thị số lượng đề xuất tự động điền đăng nhập trên biểu tượng tiện ích mở rộng"
   },
   "showQuickCopyActions": {
-    "message": "Show quick copy actions on Vault"
+    "message": "Hiển thị các hành động sao chép nhanh trên Kho"
   },
   "systemDefault": {
-    "message": "System default"
+    "message": "Mặc định hệ thống"
   },
   "enterprisePolicyRequirementsApplied": {
-    "message": "Enterprise policy requirements have been applied to this setting"
+    "message": "Các yêu cầu chính sách của doanh nghiệp đã được áp dụng cho cài đặt này"
   },
   "sshPrivateKey": {
-    "message": "Private key"
+    "message": "Khóa riêng tư"
   },
   "sshPublicKey": {
-    "message": "Public key"
+    "message": "Khóa công khai"
   },
   "sshFingerprint": {
-    "message": "Fingerprint"
+    "message": "Vân tay"
   },
   "sshKeyAlgorithm": {
-    "message": "Key type"
+    "message": "Kiểu khoá"
   },
   "sshKeyAlgorithmED25519": {
     "message": "ED25519"
@@ -4962,61 +5035,61 @@
     "message": "RSA 4096-Bit"
   },
   "retry": {
-    "message": "Retry"
+    "message": "Thử lại"
   },
   "vaultCustomTimeoutMinimum": {
-    "message": "Minimum custom timeout is 1 minute."
+    "message": "Thời gian đóng kho tùy chỉnh tối thiểu là 1 phút."
   },
   "additionalContentAvailable": {
-    "message": "Additional content is available"
+    "message": "Nội dung bổ sung có sẵn"
   },
   "fileSavedToDevice": {
-    "message": "File saved to device. Manage from your device downloads."
+    "message": "Tệp đã được lưu vào thiết bị. Quản lý từ phần Tải về trên thiết bị của bạn."
   },
   "showCharacterCount": {
-    "message": "Show character count"
+    "message": "Hiển thị số lượng ký tự"
   },
   "hideCharacterCount": {
-    "message": "Hide character count"
+    "message": "Ẩn số lượng ký tự"
   },
   "itemsInTrash": {
-    "message": "Items in trash"
+    "message": "Các mục trong thùng rác"
   },
   "noItemsInTrash": {
-    "message": "No items in trash"
+    "message": "Không có mục nào trong thùng rác"
   },
   "noItemsInTrashDesc": {
-    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+    "message": "Các mục bạn xóa sẽ xuất hiện ở đây và sẽ bị xóa vĩnh vĩnh sau 30 ngày"
   },
   "trashWarning": {
-    "message": "Items that have been in trash more than 30 days will automatically be deleted"
+    "message": "Các mục đã ở trong thùng rác hơn 30 ngày sẽ tự động bị xóa"
   },
   "restore": {
-    "message": "Restore"
+    "message": "Khôi phục"
   },
   "deleteForever": {
-    "message": "Delete forever"
+    "message": "Xóa vĩnh viễn"
   },
   "noEditPermissions": {
-    "message": "You don't have permission to edit this item"
+    "message": "Bạn không có quyền chỉnh sửa mục này"
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+    "message": "Mở khóa bằng sinh trắc học không khả dụng vì cần phải mở khóa bằng mã PIN hoặc mật khẩu trước."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Biometric unlock is currently unavailable."
+    "message": "Mở khóa bằng sinh trắc học hiện không khả dụng."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Mở khóa bằng sinh trắc học không khả dụng do các tệp hệ thống bị cấu hình sai."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Mở khóa bằng sinh trắc học không khả dụng do các tệp hệ thống bị cấu hình sai."
   },
   "biometricsStatusHelptextDesktopDisconnected": {
-    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+    "message": "Mở khóa bằng sinh trắc học không khả dụng vì ứng dụng Bitwarden trên máy tính đang bị đóng."
   },
   "biometricsStatusHelptextNotEnabledInDesktop": {
-    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "message": "Mở khóa bằng sinh trắc học không khả dụng vì nó chưa được kích hoạt cho $EMAIL$ trong ứng dụng Bitwarden trên máy tính.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -5025,214 +5098,217 @@
     }
   },
   "biometricsStatusHelptextUnavailableReasonUnknown": {
-    "message": "Biometric unlock is currently unavailable for an unknown reason."
+    "message": "Mở khóa bằng sinh trắc học hiện không khả dụng vì lý do chưa rõ."
   },
   "unlockVault": {
-    "message": "Unlock your vault in seconds"
+    "message": "Mở kho của bạn trong vài giây"
   },
   "unlockVaultDesc": {
-    "message": "You can customize your unlock and timeout settings to more quickly access your vault."
+    "message": "Bạn có thể tùy chỉnh cài đặt mở khóa và thời gian mở kho để truy cập kho lưu trữ của mình nhanh hơn."
   },
   "unlockPinSet": {
-    "message": "Unlock PIN set"
+    "message": "Đã thiết lập mở khóa bằng mã PIN"
+  },
+  "unlockWithBiometricSet": {
+    "message": "Đã thiết lập mở khóa bằng sinh trắc học"
   },
   "authenticating": {
-    "message": "Authenticating"
+    "message": "Đang xác thực"
   },
   "fillGeneratedPassword": {
-    "message": "Fill generated password",
+    "message": "Điền mật khẩu được tạo tự động",
     "description": "Heading for the password generator within the inline menu"
   },
   "passwordRegenerated": {
-    "message": "Password regenerated",
+    "message": "Mật khẩu đã được tạo lại",
     "description": "Notification message for when a password has been regenerated"
   },
   "saveToBitwarden": {
-    "message": "Save to Bitwarden",
+    "message": "Lưu vào Bitwarden",
     "description": "Confirmation message for saving a login to Bitwarden"
   },
   "spaceCharacterDescriptor": {
-    "message": "Space",
+    "message": "Phím cách",
     "description": "Represents the space key in screen reader content as a readable word"
   },
   "tildeCharacterDescriptor": {
-    "message": "Tilde",
+    "message": "Dấu ngã",
     "description": "Represents the ~ key in screen reader content as a readable word"
   },
   "backtickCharacterDescriptor": {
-    "message": "Backtick",
+    "message": "Dấu nháy ngược",
     "description": "Represents the ` key in screen reader content as a readable word"
   },
   "exclamationCharacterDescriptor": {
-    "message": "Exclamation mark",
+    "message": "Dấu chấm than",
     "description": "Represents the ! key in screen reader content as a readable word"
   },
   "atSignCharacterDescriptor": {
-    "message": "At sign",
+    "message": "Dấu @",
     "description": "Represents the @ key in screen reader content as a readable word"
   },
   "hashSignCharacterDescriptor": {
-    "message": "Hash sign",
+    "message": "Dấu thăng",
     "description": "Represents the # key in screen reader content as a readable word"
   },
   "dollarSignCharacterDescriptor": {
-    "message": "Dollar sign",
+    "message": "Dấu đô la",
     "description": "Represents the $ key in screen reader content as a readable word"
   },
   "percentSignCharacterDescriptor": {
-    "message": "Percent sign",
+    "message": "Dấu phần trăm",
     "description": "Represents the % key in screen reader content as a readable word"
   },
   "caretCharacterDescriptor": {
-    "message": "Caret",
+    "message": "Dấu mũ",
     "description": "Represents the ^ key in screen reader content as a readable word"
   },
   "ampersandCharacterDescriptor": {
-    "message": "Ampersand",
+    "message": "Dấu và",
     "description": "Represents the & key in screen reader content as a readable word"
   },
   "asteriskCharacterDescriptor": {
-    "message": "Asterisk",
+    "message": "Dấu sao",
     "description": "Represents the * key in screen reader content as a readable word"
   },
   "parenLeftCharacterDescriptor": {
-    "message": "Left parenthesis",
+    "message": "Dấu ngoặc trái",
     "description": "Represents the ( key in screen reader content as a readable word"
   },
   "parenRightCharacterDescriptor": {
-    "message": "Right parenthesis",
+    "message": "Dấu ngoặc phải",
     "description": "Represents the ) key in screen reader content as a readable word"
   },
   "hyphenCharacterDescriptor": {
-    "message": "Underscore",
+    "message": "Gạch dưới",
     "description": "Represents the _ key in screen reader content as a readable word"
   },
   "underscoreCharacterDescriptor": {
-    "message": "Hyphen",
+    "message": "Dấu gạch nối",
     "description": "Represents the - key in screen reader content as a readable word"
   },
   "plusCharacterDescriptor": {
-    "message": "Plus",
+    "message": "Dấu cộng",
     "description": "Represents the + key in screen reader content as a readable word"
   },
   "equalsCharacterDescriptor": {
-    "message": "Equals",
+    "message": "Dấu bằng",
     "description": "Represents the = key in screen reader content as a readable word"
   },
   "braceLeftCharacterDescriptor": {
-    "message": "Left brace",
+    "message": "Dấu ngoặc nhọn trái",
     "description": "Represents the { key in screen reader content as a readable word"
   },
   "braceRightCharacterDescriptor": {
-    "message": "Right brace",
+    "message": "Dấu ngoặc nhọn phải",
     "description": "Represents the } key in screen reader content as a readable word"
   },
   "bracketLeftCharacterDescriptor": {
-    "message": "Left bracket",
+    "message": "Dấu ngoặc vuông trái",
     "description": "Represents the [ key in screen reader content as a readable word"
   },
   "bracketRightCharacterDescriptor": {
-    "message": "Right bracket",
+    "message": "Dấu ngoặc vuông phải",
     "description": "Represents the ] key in screen reader content as a readable word"
   },
   "pipeCharacterDescriptor": {
-    "message": "Pipe",
+    "message": "Dấu gạch",
     "description": "Represents the | key in screen reader content as a readable word"
   },
   "backSlashCharacterDescriptor": {
-    "message": "Back slash",
+    "message": "Dấu gạch chéo ngược",
     "description": "Represents the back slash key in screen reader content as a readable word"
   },
   "colonCharacterDescriptor": {
-    "message": "Colon",
+    "message": "Dấu hai chấm",
     "description": "Represents the : key in screen reader content as a readable word"
   },
   "semicolonCharacterDescriptor": {
-    "message": "Semicolon",
+    "message": "Dấu chấm phẩy",
     "description": "Represents the ; key in screen reader content as a readable word"
   },
   "doubleQuoteCharacterDescriptor": {
-    "message": "Double quote",
+    "message": "Nháy kép",
     "description": "Represents the double quote key in screen reader content as a readable word"
   },
   "singleQuoteCharacterDescriptor": {
-    "message": "Single quote",
+    "message": "Dấu nháy đơn",
     "description": "Represents the ' key in screen reader content as a readable word"
   },
   "lessThanCharacterDescriptor": {
-    "message": "Less than",
+    "message": "Dấu nhỏ hơn",
     "description": "Represents the < key in screen reader content as a readable word"
   },
   "greaterThanCharacterDescriptor": {
-    "message": "Greater than",
+    "message": "Dấu lớn hơn",
     "description": "Represents the > key in screen reader content as a readable word"
   },
   "commaCharacterDescriptor": {
-    "message": "Comma",
+    "message": "Dấu phẩy",
     "description": "Represents the , key in screen reader content as a readable word"
   },
   "periodCharacterDescriptor": {
-    "message": "Period",
+    "message": "Dấu chấm",
     "description": "Represents the . key in screen reader content as a readable word"
   },
   "questionCharacterDescriptor": {
-    "message": "Question mark",
+    "message": "Dấu hỏi chấm",
     "description": "Represents the ? key in screen reader content as a readable word"
   },
   "forwardSlashCharacterDescriptor": {
-    "message": "Forward slash",
+    "message": "Dấu gạch chéo",
     "description": "Represents the / key in screen reader content as a readable word"
   },
   "lowercaseAriaLabel": {
-    "message": "Lowercase"
+    "message": "Chữ thường"
   },
   "uppercaseAriaLabel": {
-    "message": "Uppercase"
+    "message": "Chữ in hoa"
   },
   "generatedPassword": {
-    "message": "Generated password"
+    "message": "Mật khẩu được tạo"
   },
   "compactMode": {
-    "message": "Compact mode"
+    "message": "Chế độ nhỏ gọn"
   },
   "beta": {
     "message": "Beta"
   },
   "extensionWidth": {
-    "message": "Extension width"
+    "message": "Chiều rộng phần mở rộng"
   },
   "wide": {
-    "message": "Wide"
+    "message": "Rộng"
   },
   "extraWide": {
-    "message": "Extra wide"
+    "message": "Rộng hơn"
   },
   "sshKeyWrongPassword": {
-    "message": "The password you entered is incorrect."
+    "message": "Mật khẩu bạn đã nhập không đúng."
   },
   "importSshKey": {
-    "message": "Import"
+    "message": "Nhập"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirm password"
+    "message": "Xác nhận mật khẩu"
   },
   "enterSshKeyPasswordDesc": {
-    "message": "Enter the password for the SSH key."
+    "message": "Nhập mật khẩu cho khóa SSH."
   },
   "enterSshKeyPassword": {
-    "message": "Enter password"
+    "message": "Nhập mật khẩu"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "Khóa SSH không hợp lệ"
   },
   "sshKeyTypeUnsupported": {
-    "message": "The SSH key type is not supported"
+    "message": "Loại khóa SSH không được hỗ trợ"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "Nhập khóa từ bảng nhớ tạm"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "Khóa SSH được nhập thành công"
   },
   "cannotRemoveViewOnlyCollections": {
     "message": "Bạn không thể xóa các bộ sưu tập với quyền chỉ xem: $COLLECTIONS$",
@@ -5244,138 +5320,142 @@
     }
   },
   "updateDesktopAppOrDisableFingerprintDialogTitle": {
-    "message": "Please update your desktop application"
+    "message": "Vui lòng cập nhật ứng dụng trên máy tính của bạn"
   },
   "updateDesktopAppOrDisableFingerprintDialogMessage": {
-    "message": "To use biometric unlock, please update your desktop application, or disable fingerprint unlock in the desktop settings."
+    "message": "Để sử dụng mở khóa bằng sinh trắc học, vui lòng cập nhật ứng dụng trên máy tính của bạn, hoặc tắt mở khóa vân tay trong cài đặt máy tính."
   },
   "changeAtRiskPassword": {
-    "message": "Change at-risk password"
+    "message": "Thay đổi mật khẩu có rủi ro"
   },
   "settingsVaultOptions": {
-    "message": "Vault options"
+    "message": "Tùy chọn kho"
   },
   "emptyVaultDescription": {
-    "message": "The vault protects more than just your passwords. Store secure logins, IDs, cards and notes securely here."
+    "message": "Kho lưu trữ không chỉ bảo vệ mật khẩu của bạn. Bạn có thể lưu trữ an toàn các thông tin đăng nhập, ID, thẻ và ghi chú tại đây."
   },
   "introCarouselLabel": {
-    "message": "Welcome to Bitwarden"
+    "message": "Chào mừng bạn đến với Bitwarden"
   },
   "securityPrioritized": {
-    "message": "Security, prioritized"
+    "message": "Bảo mật, ưu tiên hàng đầu"
   },
   "securityPrioritizedBody": {
-    "message": "Save logins, cards, and identities to your secure vault. Bitwarden uses zero-knowledge, end-to-end encryption to protect what’s important to you."
+    "message": "Lưu trữ thông tin đăng nhập, thẻ tín dụng và thông tin cá nhân vào kho lưu trữ an toàn của bạn. Bitwarden sử dụng mã hóa đầu cuối không tiết lộ thông tin (zero-knowledge) để bảo vệ những gì quan trọng đối với bạn."
   },
   "quickLogin": {
-    "message": "Quick and easy login"
+    "message": "Đăng nhập nhanh chóng và dễ dàng"
   },
   "quickLoginBody": {
-    "message": "Set up biometric unlock and autofill to log into your accounts without typing a single letter."
+    "message": "Cài đặt tính năng mở khóa bằng sinh trắc học và tự động điền thông tin để đăng nhập vào các tài khoản của bạn mà không cần nhập bất kỳ ký tự nào."
   },
   "secureUser": {
-    "message": "Level up your logins"
+    "message": "Nâng cấp đăng nhập của bạn"
   },
   "secureUserBody": {
-    "message": "Use the generator to create and save strong, unique passwords for all your accounts."
+    "message": "Sử dụng trình tạo mật khẩu để tạo và lưu trữ các mật khẩu mạnh, duy nhất cho tất cả các tài khoản của bạn."
   },
   "secureDevices": {
-    "message": "Your data, when and where you need it"
+    "message": "Dữ liệu của bạn, mọi lúc, mọi nơi bạn cần"
   },
   "secureDevicesBody": {
-    "message": "Save unlimited passwords across unlimited devices with Bitwarden mobile, browser, and desktop apps."
+    "message": "Lưu trữ mật khẩu không giới hạn trên tất cả các thiết bị với ứng dụng di động, trình duyệt và máy tính của Bitwarden."
   },
   "nudgeBadgeAria": {
-    "message": "1 notification"
+    "message": "1 thông báo"
   },
   "emptyVaultNudgeTitle": {
-    "message": "Import existing passwords"
+    "message": "Nhập mật khẩu hiện có"
   },
   "emptyVaultNudgeBody": {
-    "message": "Use the importer to quickly transfer logins to Bitwarden without manually adding them."
+    "message": "Sử dụng công cụ nhập để nhanh chóng chuyển các tài khoản đăng nhập sang Bitwarden mà không cần thêm thủ công."
   },
   "emptyVaultNudgeButton": {
-    "message": "Import now"
+    "message": "Nhập ngay"
   },
   "hasItemsVaultNudgeTitle": {
-    "message": "Welcome to your vault!"
+    "message": "Chào mừng đến với kho lưu trữ của bạn!"
   },
   "hasItemsVaultNudgeBodyOne": {
-    "message": "Autofill items for the current page"
+    "message": "Tự động điền các mục cho trang hiện tại"
   },
   "hasItemsVaultNudgeBodyTwo": {
-    "message": "Favorite items for easy access"
+    "message": "Các mục yêu thích để truy cập nhanh chóng"
   },
   "hasItemsVaultNudgeBodyThree": {
-    "message": "Search your vault for something else"
+    "message": "Tìm kiếm thông tin khác trong kho của bạn"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Tiết kiệm thời gian với tính năng tự động điền"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Bao gồm một",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Trang web",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "vì vậy, thông tin đăng nhập này sẽ xuất hiện như đề xuất tự động điền.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Thanh toán trực tuyến không gián đoạn"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Với thẻ, dễ dàng tự động điền các biểu mẫu thanh toán an toàn và chính xác."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Đơn giản hóa việc tạo tài khoản"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Với danh tính, nhanh chóng tự động điền các biểu mẫu đăng ký hoặc liên hệ dài."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Giữ dữ liệu nhạy cảm của bạn an toàn"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Với ghi chú, lưu trữ an toàn dữ liệu nhạy cảm như thông tin ngân hàng hoặc bảo hiểm."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Truy cập SSH thân thiện với nhà phát triển"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Lưu trữ khóa của bạn và kết nối với trình quản lý khóa SSH để xác thực nhanh chóng và được mã hóa.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Tìm hiểu thêm về SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "generatorNudgeTitle": {
-    "message": "Quickly create passwords"
+    "message": "Tạo mật khẩu nhanh chóng"
   },
   "generatorNudgeBodyOne": {
-    "message": "Easily create strong and unique passwords by clicking on",
+    "message": "Dễ dàng tạo mật khẩu mạnh và duy nhất chỉ trong một cú nhấp chuột",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyTwo": {
-    "message": "to help you keep your logins secure.",
+    "message": "để giúp bạn bảo vệ thông tin đăng nhập của mình.",
     "description": "Two part message",
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "message": "Dễ dàng tạo mật khẩu mạnh và duy nhất bằng cách nhấp vào Trình tạo mật khẩu để giúp bạn bảo vệ tài khoản đăng nhập của mình.",
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
-    "message": "You do not have permissions to view this page. Try logging in with a different account."
+    "message": "Bạn không có quyền truy cập vào trang này. Hãy thử đăng nhập bằng tài khoản khác."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly không được hỗ trợ trên trình duyệt của bạn hoặc chưa được kích hoạt. WebAssembly là yêu cầu bắt buộc để sử dụng ứng dụng Bitwarden.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/zh_CN/messages.json b/apps/browser/src/_locales/zh_CN/messages.json
index 8a537be08f2..9ee8fd5a48f 100644
--- a/apps/browser/src/_locales/zh_CN/messages.json
+++ b/apps/browser/src/_locales/zh_CN/messages.json
@@ -300,7 +300,7 @@
     "message": "前往帮助中心吗？"
   },
   "continueToHelpCenterDesc": {
-    "message": "在帮助中心进一步了解如何使用 Bitwarden。"
+    "message": "访问帮助中心进一步了解如何使用 Bitwarden。"
   },
   "continueToBrowserExtensionStore": {
     "message": "前往浏览器扩展商店吗？"
@@ -1173,6 +1173,12 @@
     "message": "哦不！我们无法保存它。请尝试手动输入详细信息。",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "更改密码后，您需要使用新密码登录。 在其他设备上的活动会话将在一小时内注销。"
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "更改您的主密码以完成账户恢复。"
+  },
   "enableChangedPasswordNotification": {
     "message": "询问更新现有的登录"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "功能不可用"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "需要迁移加密密钥。请登录网页版密码库来更新您的加密密钥。"
+  "legacyEncryptionUnsupported": {
+    "message": "旧版加密方式已不再受支持。请联系客服恢复您的账户。"
   },
   "premiumMembership": {
     "message": "高级会员"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH 密钥"
   },
+  "typeNote": {
+    "message": "笔记"
+  },
   "newItemHeader": {
     "message": "新增 $TYPE$",
     "placeholders": {
@@ -2153,11 +2162,11 @@
   "setYourPinCode": {
     "message": "设定您用来解锁 Bitwarden 的 PIN 码。您的 PIN 设置将在您完全注销此应用程序时被重置。"
   },
-  "setYourPinCode1": {
-    "message": "您的 PIN 码将代替主密码用于解锁 Bitwarden。如果您完全注销 Bitwarden，PIN 码将被重置。"
+  "setPinCode": {
+    "message": "您可以使用此 PIN 码解锁 Bitwarden。您的 PIN 码将在您完全注销此应用程序时被重置。"
   },
   "pinRequired": {
-    "message": "需要 PIN 码。"
+    "message": "必须填写 PIN 码。"
   },
   "invalidPin": {
     "message": "无效 PIN 码。"
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "使用此密码"
   },
+  "useThisPassphrase": {
+    "message": "使用此密码短语"
+  },
   "useThisUsername": {
     "message": "使用此用户名"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "某个组织策略已阻止将项目导入您的个人密码库。"
   },
+  "restrictCardTypeImport": {
+    "message": "无法导入支付卡项目类型"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "由 1 个或多个组织设置的策略阻止您将支付卡导入密码库。"
+  },
   "domainsTitle": {
     "message": "域名",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "更改"
   },
+  "changePassword": {
+    "message": "更改密码",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "更改密码 - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "存在风险的密码"
+  },
   "atRiskPasswords": {
     "message": "存在风险的密码"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "该网站密码存在风险，$ORGANIZATION$ 要求您更改此密码。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ 希望您更改此密码，因为它存在风险。请前往账户设置更改此密码。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "审查并更改 1 个存在风险的密码"
   },
@@ -2674,6 +2719,10 @@
     "message": "所有 Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "已达最大访问次数",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "默认隐藏文本"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "您必须验证电子邮箱才能使用此功能。您可以在网页密码库中验证您的电子邮箱。"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "主密码设置成功"
+  },
   "updatedMasterPassword": {
     "message": "已更新主密码"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "请求已发送"
   },
+  "masterPasswordChanged": {
+    "message": "主密码已保存"
+  },
   "exposedMasterPassword": {
     "message": "已暴露的主密码"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "请求管理员批准"
   },
+  "unableToCompleteLogin": {
+    "message": "无法完成登录"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "必须填写组织 SSO 标识符。"
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "信任用户"
   },
-  "sendsNoItemsTitle": {
-    "message": "没有活跃的 Send",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "使用 Send 与任何人安全地分享加密信息。",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "安全地发送敏感信息",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "常规格式",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "高级选项",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "前往浏览器设置吗？",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -4519,7 +4592,7 @@
     "message": "添加附件"
   },
   "maxFileSizeSansPunctuation": {
-    "message": "最大文件大小为 500 MB"
+    "message": "文件最大为 500 MB"
   },
   "deleteAttachmentName": {
     "message": "删除附件 $NAME$",
@@ -4555,7 +4628,7 @@
     "message": "获取桌面 App"
   },
   "getTheDesktopAppDesc": {
-    "message": "无需浏览器也可访问您的密码库。在桌面 App 和浏览器扩展中设置生物识别解锁，以实现快速解锁。"
+    "message": "无需使用浏览器访问您的密码库，然后在桌面 App 和浏览器扩展中同时设置生物识别解锁，即可实现快速解锁。"
   },
   "downloadFromBitwardenNow": {
     "message": "立即从 bitwarden.com 下载"
@@ -4870,7 +4943,7 @@
     "message": "成功分配了集合"
   },
   "nothingSelected": {
-    "message": "您尚未选择任何内容。"
+    "message": "您没有选择任何内容。"
   },
   "itemsMovedToOrg": {
     "message": "项目已移动到 $ORGNAME$",
@@ -4968,7 +5041,7 @@
     "message": "自定义超时时间最小为 1 分钟。"
   },
   "additionalContentAvailable": {
-    "message": "有更多内容可用"
+    "message": "更多内容可用"
   },
   "fileSavedToDevice": {
     "message": "文件已保存到设备。可以在设备下载中进行管理。"
@@ -5031,11 +5104,14 @@
     "message": "数秒内解锁您的密码库"
   },
   "unlockVaultDesc": {
-    "message": "您可以自定义解锁和超时设置，以便更快地访问您的密码库。"
+    "message": "您可以自定义解锁和超时设置，以便更快速地访问您的密码库。"
   },
   "unlockPinSet": {
     "message": "解锁 PIN 设置"
   },
+  "unlockWithBiometricSet": {
+    "message": "生物识别解锁设置"
+  },
   "authenticating": {
     "message": "正在验证"
   },
@@ -5235,7 +5311,7 @@
     "message": "SSH 密钥导入成功"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "您无法删除仅具有「查看」权限的集合：$COLLECTIONS$",
+    "message": "您无法移除仅具有「查看」权限的集合：$COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -5304,7 +5380,7 @@
     "message": "为当前页面自动填充项目"
   },
   "hasItemsVaultNudgeBodyTwo": {
-    "message": "收藏项目以便快速访问"
+    "message": "收藏项目以便轻松访问"
   },
   "hasItemsVaultNudgeBodyThree": {
     "message": "在密码库中搜索其他内容"
@@ -5323,7 +5399,7 @@
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "以便将此登录显示为自动填充建议。",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
@@ -5372,10 +5448,14 @@
     "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
   },
   "generatorNudgeBodyAria": {
-    "message": "一键创建强大且唯一的密码，帮助您保持登录安全。",
+    "message": "点击「生成密码」按钮，轻松创建强大且唯一的密码，帮助您保持登录安全。",
     "description": "Aria label for the body content of the generator nudge"
   },
   "noPermissionsViewPage": {
     "message": "您没有查看此页面的权限。请尝试使用其他账户登录。"
+  },
+  "wasmNotSupported": {
+    "message": "您的浏览器不支持 WebAssembly 或 WebAssembly 未启用。使用 Bitwarden App 需要 WebAssembly。",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/_locales/zh_TW/messages.json b/apps/browser/src/_locales/zh_TW/messages.json
index 9d4eabb1b49..7403ad53705 100644
--- a/apps/browser/src/_locales/zh_TW/messages.json
+++ b/apps/browser/src/_locales/zh_TW/messages.json
@@ -1173,6 +1173,12 @@
     "message": "Oh no! We couldn't save this. Try entering the details manually.",
     "description": "Detailed error message shown when saving login details fails."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
   "enableChangedPasswordNotification": {
     "message": "詢問更新現有的登入資料"
   },
@@ -1365,8 +1371,8 @@
   "featureUnavailable": {
     "message": "功能不可用"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "需要遷移加密金鑰。請透過網頁版密碼庫登入以更新您的加密金鑰。"
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "premiumMembership": {
     "message": "進階會員"
@@ -1922,6 +1928,9 @@
   "typeSshKey": {
     "message": "SSH 金鑰"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "newItemHeader": {
     "message": "新增 $TYPE$",
     "placeholders": {
@@ -2153,8 +2162,8 @@
   "setYourPinCode": {
     "message": "設定您用來解鎖 Bitwarden 的 PIN 碼。您的 PIN 設定將在您完全登出本應用程式時被重設。"
   },
-  "setYourPinCode1": {
-    "message": "您的 PIN 碼會取代主密碼用來解鎖 Bitwarden。您的 PIN 碼會重置，若您完全登出 Bitwarden。"
+  "setPinCode": {
+    "message": "You can use this PIN to unlock Bitwarden. Your PIN will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
     "message": "必須填入 PIN 碼。"
@@ -2204,6 +2213,9 @@
   "useThisPassword": {
     "message": "使用此密碼"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "使用此使用者名稱"
   },
@@ -2481,6 +2493,12 @@
   "personalOwnershipPolicyInEffectImports": {
     "message": "某個組織原則已禁止您將項目匯入至您的個人密碼庫。"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "domainsTitle": {
     "message": "網域",
     "description": "A category title describing the concept of web domains"
@@ -2512,6 +2530,10 @@
   "change": {
     "message": "Change"
   },
+  "changePassword": {
+    "message": "Change password",
+    "description": "Change password button for browser at risk notification on login."
+  },
   "changeButtonTitle": {
     "message": "Change password - $ITEMNAME$",
     "placeholders": {
@@ -2521,6 +2543,9 @@
       }
     }
   },
+  "atRiskPassword": {
+    "message": "At-risk password"
+  },
   "atRiskPasswords": {
     "message": "At-risk passwords"
   },
@@ -2555,6 +2580,26 @@
       }
     }
   },
+  "atRiskChangePrompt": {
+    "message": "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and the change password domain is known."
+  },
+  "atRiskNavigatePrompt": {
+    "message": "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      }
+    },
+    "description": "Notification body when a login triggers an at-risk password change request and no change password domain is provided."
+  },
   "reviewAndChangeAtRiskPassword": {
     "message": "Review and change one at-risk password"
   },
@@ -2674,6 +2719,10 @@
     "message": "所有 Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "maxAccessCountReached": {
+    "message": "Max access count reached",
+    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
+  },
   "hideTextByDefault": {
     "message": "默認隱藏文字"
   },
@@ -2876,6 +2925,9 @@
   "emailVerificationRequiredDesc": {
     "message": "您必須驗證您的電子郵件才能使用此功能。您可以在網頁密碼庫裡驗證您的電子郵件。"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "已更新主密碼"
   },
@@ -3408,6 +3460,9 @@
   "logInRequestSent": {
     "message": "已傳送請求"
   },
+  "masterPasswordChanged": {
+    "message": "Master password saved"
+  },
   "exposedMasterPassword": {
     "message": "已洩露的主密碼"
   },
@@ -3522,6 +3577,12 @@
   "requestAdminApproval": {
     "message": "要求管理員核准"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "ssoIdentifierRequired": {
     "message": "需要組織 SSO 識別碼。"
   },
@@ -3607,14 +3668,6 @@
   "trustUser": {
     "message": "Trust user"
   },
-  "sendsNoItemsTitle": {
-    "message": "沒有可用的 Send",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "使用 Send 可以與任何人安全地共用加密資訊。",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "sendsTitleNoItems": {
     "message": "Send sensitive information safely",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4209,6 +4262,26 @@
     "message": "常見格式",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
   "confirmContinueToBrowserSettingsTitle": {
     "message": "繼續前往瀏覽器設定？",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
@@ -5036,6 +5109,9 @@
   "unlockPinSet": {
     "message": "Unlock PIN set"
   },
+  "unlockWithBiometricSet": {
+    "message": "Unlock with biometrics set"
+  },
   "authenticating": {
     "message": "驗證中"
   },
@@ -5377,5 +5453,9 @@
   },
   "noPermissionsViewPage": {
     "message": "You do not have permissions to view this page. Try logging in with a different account."
+  },
+  "wasmNotSupported": {
+    "message": "WebAssembly is not supported on your browser or is not enabled. WebAssembly is required to use the Bitwarden app.",
+    "description": "'WebAssembly' is a technical term and should not be translated."
   }
 }
diff --git a/apps/browser/src/auth/popup/account-switching/account-switcher.component.ts b/apps/browser/src/auth/popup/account-switching/account-switcher.component.ts
index 78bee121afb..48fd57431a2 100644
--- a/apps/browser/src/auth/popup/account-switching/account-switcher.component.ts
+++ b/apps/browser/src/auth/popup/account-switching/account-switcher.component.ts
@@ -4,7 +4,7 @@ import { Router } from "@angular/router";
 import { Subject, firstValueFrom, map, of, startWith, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { LockService } from "@bitwarden/auth/common";
+import { LockService, LogoutService } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
@@ -34,7 +34,6 @@ import { CurrentAccountComponent } from "./current-account.component";
 import { AccountSwitcherService } from "./services/account-switcher.service";
 
 @Component({
-  standalone: true,
   templateUrl: "account-switcher.component.html",
   imports: [
     CommonModule,
@@ -70,6 +69,7 @@ export class AccountSwitcherComponent implements OnInit, OnDestroy {
     private vaultTimeoutSettingsService: VaultTimeoutSettingsService,
     private authService: AuthService,
     private lockService: LockService,
+    private logoutService: LogoutService,
   ) {}
 
   get accountLimit() {
@@ -141,12 +141,9 @@ export class AccountSwitcherComponent implements OnInit, OnDestroy {
     });
 
     if (confirmed) {
-      const result = await this.accountSwitcherService.logoutAccount(userId);
-      // unlocked logout responses need to be navigated out of the account switcher.
-      // other responses will be handled by background and app.component
-      if (result?.status === AuthenticationStatus.Unlocked) {
-        this.location.back();
-      }
+      await this.logoutService.logout(userId);
+      // navigate to root so redirect guard can properly route next active user or null user to correct page
+      await this.router.navigate(["/"]);
     }
     this.loading = false;
   }
diff --git a/apps/browser/src/auth/popup/account-switching/account.component.ts b/apps/browser/src/auth/popup/account-switching/account.component.ts
index dad74977d34..c060d9161ef 100644
--- a/apps/browser/src/auth/popup/account-switching/account.component.ts
+++ b/apps/browser/src/auth/popup/account-switching/account.component.ts
@@ -1,7 +1,8 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { CommonModule, Location } from "@angular/common";
+import { CommonModule } from "@angular/common";
 import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { Router } from "@angular/router";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
@@ -13,7 +14,6 @@ import { BiometricsService } from "@bitwarden/key-management";
 import { AccountSwitcherService, AvailableAccount } from "./services/account-switcher.service";
 
 @Component({
-  standalone: true,
   selector: "auth-account",
   templateUrl: "account.component.html",
   imports: [CommonModule, JslibModule, AvatarModule, ItemModule],
@@ -24,7 +24,7 @@ export class AccountComponent {
 
   constructor(
     private accountSwitcherService: AccountSwitcherService,
-    private location: Location,
+    private router: Router,
     private i18nService: I18nService,
     private logService: LogService,
     private biometricsService: BiometricsService,
@@ -45,8 +45,8 @@ export class AccountComponent {
 
     // Navigate out of account switching for unlocked accounts
     // locked or logged out account statuses are handled by background and app.component
-    if (result?.status === AuthenticationStatus.Unlocked) {
-      this.location.back();
+    if (result?.authenticationStatus === AuthenticationStatus.Unlocked) {
+      await this.router.navigate(["vault"]);
       await this.biometricsService.setShouldAutopromptNow(false);
     } else {
       await this.biometricsService.setShouldAutopromptNow(true);
diff --git a/apps/browser/src/auth/popup/account-switching/current-account.component.ts b/apps/browser/src/auth/popup/account-switching/current-account.component.ts
index ea41a627848..63e8481621a 100644
--- a/apps/browser/src/auth/popup/account-switching/current-account.component.ts
+++ b/apps/browser/src/auth/popup/account-switching/current-account.component.ts
@@ -24,7 +24,6 @@ export type CurrentAccount = {
 @Component({
   selector: "app-current-account",
   templateUrl: "current-account.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, AvatarModule, RouterModule],
 })
 export class CurrentAccountComponent {
diff --git a/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.spec.ts b/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.spec.ts
index 1fdd0b1ecf2..4bacd453803 100644
--- a/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.spec.ts
+++ b/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.spec.ts
@@ -207,35 +207,4 @@ describe("AccountSwitcherService", () => {
       expect(removeListenerSpy).toBeCalledTimes(1);
     });
   });
-
-  describe("logout", () => {
-    const userId1 = "1" as UserId;
-    const userId2 = "2" as UserId;
-    it("initiates logout", async () => {
-      let listener: (
-        message: { command: string; userId: UserId; status: AuthenticationStatus },
-        sender: unknown,
-        sendResponse: unknown,
-      ) => void;
-      jest.spyOn(chrome.runtime.onMessage, "addListener").mockImplementation((addedListener) => {
-        listener = addedListener;
-      });
-
-      const removeListenerSpy = jest.spyOn(chrome.runtime.onMessage, "removeListener");
-
-      const logoutPromise = accountSwitcherService.logoutAccount(userId1);
-
-      listener(
-        { command: "switchAccountFinish", userId: userId2, status: AuthenticationStatus.Unlocked },
-        undefined,
-        undefined,
-      );
-
-      const result = await logoutPromise;
-
-      expect(messagingService.send).toHaveBeenCalledWith("logout", { userId: userId1 });
-      expect(result).toEqual({ newUserId: userId2, status: AuthenticationStatus.Unlocked });
-      expect(removeListenerSpy).toBeCalledTimes(1);
-    });
-  });
 });
diff --git a/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.ts b/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.ts
index bfed7dc1408..7bb12fc260d 100644
--- a/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.ts
+++ b/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.ts
@@ -12,6 +12,7 @@ import {
   timeout,
 } from "rxjs";
 
+import { NewActiveUser } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AvatarService } from "@bitwarden/common/auth/abstractions/avatar.service";
@@ -43,7 +44,7 @@ export class AccountSwitcherService {
   SPECIAL_ADD_ACCOUNT_ID = "addAccount";
   availableAccounts$: Observable<AvailableAccount[]>;
 
-  switchAccountFinished$: Observable<{ userId: UserId; status: AuthenticationStatus }>;
+  switchAccountFinished$: Observable<NewActiveUser | null>;
 
   constructor(
     private accountService: AccountService,
@@ -118,7 +119,7 @@ export class AccountSwitcherService {
       [message: { command: string; userId: UserId; status: AuthenticationStatus }]
     >(chrome.runtime.onMessage).pipe(
       filter(([message]) => message.command === "switchAccountFinish"),
-      map(([message]) => ({ userId: message.userId, status: message.status })),
+      map(([message]) => ({ userId: message.userId, authenticationStatus: message.status })),
     );
   }
 
@@ -143,29 +144,9 @@ export class AccountSwitcherService {
     return await switchAccountFinishedPromise;
   }
 
-  /**
-   *
-   * @param userId the user id to logout
-   * @returns the userId and status of the that has been switch to due to the logout. null on errors.
-   */
-  async logoutAccount(
-    userId: UserId,
-  ): Promise<{ newUserId: UserId; status: AuthenticationStatus } | null> {
-    // logout creates an account switch to the next up user, which may be null
-    const switchPromise = this.listenForSwitchAccountFinish(null);
-
-    await this.messagingService.send("logout", { userId });
-
-    // wait for account switch to happen, the result will be the new user id and status
-    const result = await switchPromise;
-    return { newUserId: result.userId, status: result.status };
-  }
-
   // Listens for the switchAccountFinish message and returns the userId from the message
   // Optionally filters switchAccountFinish to an expected userId
-  private listenForSwitchAccountFinish(
-    expectedUserId: UserId | null,
-  ): Promise<{ userId: UserId; status: AuthenticationStatus } | null> {
+  listenForSwitchAccountFinish(expectedUserId: UserId | null): Promise<NewActiveUser | null> {
     return firstValueFrom(
       this.switchAccountFinished$.pipe(
         filter(({ userId }) => (expectedUserId ? userId === expectedUserId : true)),
diff --git a/apps/browser/src/auth/popup/components/set-pin.component.html b/apps/browser/src/auth/popup/components/set-pin.component.html
index 58cb42456ee..d525f9378f1 100644
--- a/apps/browser/src/auth/popup/components/set-pin.component.html
+++ b/apps/browser/src/auth/popup/components/set-pin.component.html
@@ -5,7 +5,7 @@
     </div>
     <div bitDialogContent>
       <p>
-        {{ "setYourPinCode1" | i18n }}
+        {{ "setPinCode" | i18n }}
       </p>
       <bit-form-field>
         <bit-label>{{ "pin" | i18n }}</bit-label>
diff --git a/apps/browser/src/auth/popup/components/set-pin.component.ts b/apps/browser/src/auth/popup/components/set-pin.component.ts
index d79f9eeca89..a9e8e1b122f 100644
--- a/apps/browser/src/auth/popup/components/set-pin.component.ts
+++ b/apps/browser/src/auth/popup/components/set-pin.component.ts
@@ -14,7 +14,6 @@ import {
 } from "@bitwarden/components";
 
 @Component({
-  standalone: true,
   templateUrl: "set-pin.component.html",
   imports: [
     DialogModule,
diff --git a/apps/browser/src/auth/guards/fido2-auth.guard.ts b/apps/browser/src/auth/popup/guards/fido2-auth.guard.ts
similarity index 93%
rename from apps/browser/src/auth/guards/fido2-auth.guard.ts
rename to apps/browser/src/auth/popup/guards/fido2-auth.guard.ts
index 7d7f1f5c4e9..87d490b3d92 100644
--- a/apps/browser/src/auth/guards/fido2-auth.guard.ts
+++ b/apps/browser/src/auth/popup/guards/fido2-auth.guard.ts
@@ -9,7 +9,7 @@ import {
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 
-import { BrowserRouterService } from "../../platform/popup/services/browser-router.service";
+import { BrowserRouterService } from "../../../platform/popup/services/browser-router.service";
 
 /**
  * This guard verifies the user's authentication status.
diff --git a/apps/browser/src/auth/popup/login-decryption-options/extension-login-decryption-options.service.spec.ts b/apps/browser/src/auth/popup/login-decryption-options/extension-login-decryption-options.service.spec.ts
deleted file mode 100644
index 8f3199cdfce..00000000000
--- a/apps/browser/src/auth/popup/login-decryption-options/extension-login-decryption-options.service.spec.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Router } from "@angular/router";
-import { MockProxy, mock } from "jest-mock-extended";
-import { BehaviorSubject } from "rxjs";
-
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-
-import { postLogoutMessageListener$ } from "../utils/post-logout-message-listener";
-
-import { ExtensionLoginDecryptionOptionsService } from "./extension-login-decryption-options.service";
-
-// Mock the module providing postLogoutMessageListener$
-jest.mock("../utils/post-logout-message-listener", () => {
-  return {
-    postLogoutMessageListener$: new BehaviorSubject<string>(""), // Replace with mock subject
-  };
-});
-
-describe("ExtensionLoginDecryptionOptionsService", () => {
-  let service: ExtensionLoginDecryptionOptionsService;
-
-  let messagingService: MockProxy<MessagingService>;
-  let router: MockProxy<Router>;
-  let postLogoutMessageSubject: BehaviorSubject<string>;
-
-  beforeEach(() => {
-    messagingService = mock<MessagingService>();
-    router = mock<Router>();
-
-    // Cast postLogoutMessageListener$ to BehaviorSubject for dynamic control
-    postLogoutMessageSubject = postLogoutMessageListener$ as BehaviorSubject<string>;
-
-    service = new ExtensionLoginDecryptionOptionsService(messagingService, router);
-  });
-
-  it("should instantiate the service", () => {
-    expect(service).not.toBeFalsy();
-  });
-
-  describe("logOut()", () => {
-    it("should send a logout message", async () => {
-      postLogoutMessageSubject.next("switchAccountFinish");
-
-      await service.logOut();
-
-      expect(messagingService.send).toHaveBeenCalledWith("logout");
-    });
-
-    it("should navigate to root on 'switchAccountFinish'", async () => {
-      postLogoutMessageSubject.next("switchAccountFinish");
-
-      await service.logOut();
-
-      expect(router.navigate).toHaveBeenCalledWith(["/"]);
-    });
-
-    it("should not navigate for 'doneLoggingOut'", async () => {
-      postLogoutMessageSubject.next("doneLoggingOut");
-
-      await service.logOut();
-
-      expect(router.navigate).not.toHaveBeenCalled();
-    });
-  });
-});
diff --git a/apps/browser/src/auth/popup/login-decryption-options/extension-login-decryption-options.service.ts b/apps/browser/src/auth/popup/login-decryption-options/extension-login-decryption-options.service.ts
deleted file mode 100644
index ea529e277e6..00000000000
--- a/apps/browser/src/auth/popup/login-decryption-options/extension-login-decryption-options.service.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Router } from "@angular/router";
-import { firstValueFrom } from "rxjs";
-
-import {
-  DefaultLoginDecryptionOptionsService,
-  LoginDecryptionOptionsService,
-} from "@bitwarden/auth/angular";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-
-import { postLogoutMessageListener$ } from "../utils/post-logout-message-listener";
-
-export class ExtensionLoginDecryptionOptionsService
-  extends DefaultLoginDecryptionOptionsService
-  implements LoginDecryptionOptionsService
-{
-  constructor(
-    protected messagingService: MessagingService,
-    private router: Router,
-  ) {
-    super(messagingService);
-  }
-
-  override async logOut(): Promise<void> {
-    // start listening for "switchAccountFinish" or "doneLoggingOut"
-    const messagePromise = firstValueFrom(postLogoutMessageListener$);
-
-    super.logOut();
-
-    // wait for messages
-    const command = await messagePromise;
-
-    // doneLoggingOut already has a message handler that will navigate us
-    if (command === "switchAccountFinish") {
-      await this.router.navigate(["/"]);
-    }
-  }
-}
diff --git a/apps/browser/src/auth/popup/login/extension-login-component.service.spec.ts b/apps/browser/src/auth/popup/login/extension-login-component.service.spec.ts
index 6d1f0571ae7..bd85ff9293e 100644
--- a/apps/browser/src/auth/popup/login/extension-login-component.service.spec.ts
+++ b/apps/browser/src/auth/popup/login/extension-login-component.service.spec.ts
@@ -16,7 +16,7 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
 import { BrowserPlatformUtilsService } from "../../../platform/services/platform-utils/browser-platform-utils.service";
-import { ExtensionAnonLayoutWrapperDataService } from "../extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service";
+import { ExtensionAnonLayoutWrapperDataService } from "../../../popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service";
 
 import { ExtensionLoginComponentService } from "./extension-login-component.service";
 
diff --git a/apps/browser/src/auth/popup/login/extension-login-component.service.ts b/apps/browser/src/auth/popup/login/extension-login-component.service.ts
index 49ed0635b7a..37d74616391 100644
--- a/apps/browser/src/auth/popup/login/extension-login-component.service.ts
+++ b/apps/browser/src/auth/popup/login/extension-login-component.service.ts
@@ -11,7 +11,7 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
-import { ExtensionAnonLayoutWrapperDataService } from "../extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service";
+import { ExtensionAnonLayoutWrapperDataService } from "../../../popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service";
 
 @Injectable()
 export class ExtensionLoginComponentService
diff --git a/apps/browser/src/auth/popup/logout/extension-logout.service.spec.ts b/apps/browser/src/auth/popup/logout/extension-logout.service.spec.ts
new file mode 100644
index 00000000000..7ab7742c1c3
--- /dev/null
+++ b/apps/browser/src/auth/popup/logout/extension-logout.service.spec.ts
@@ -0,0 +1,101 @@
+import { MockProxy, mock } from "jest-mock-extended";
+
+import { LogoutReason, LogoutService } from "@bitwarden/auth/common";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { UserId } from "@bitwarden/common/types/guid";
+
+import { AccountSwitcherService } from "../account-switching/services/account-switcher.service";
+
+import { ExtensionLogoutService } from "./extension-logout.service";
+
+describe("ExtensionLogoutService", () => {
+  let logoutService: LogoutService;
+  let messagingService: MockProxy<MessagingService>;
+  let accountSwitcherService: MockProxy<AccountSwitcherService>;
+
+  let primaryUserId: UserId;
+  let secondaryUserId: UserId;
+  let logoutReason: LogoutReason;
+
+  beforeEach(() => {
+    primaryUserId = "1" as UserId;
+    secondaryUserId = "2" as UserId;
+    logoutReason = "vaultTimeout";
+
+    messagingService = mock<MessagingService>();
+    accountSwitcherService = mock<AccountSwitcherService>();
+    logoutService = new ExtensionLogoutService(messagingService, accountSwitcherService);
+  });
+
+  it("instantiates", () => {
+    expect(logoutService).not.toBeFalsy();
+  });
+
+  describe("logout", () => {
+    describe("No new active user", () => {
+      beforeEach(() => {
+        accountSwitcherService.listenForSwitchAccountFinish.mockResolvedValue(null);
+      });
+
+      it("sends logout message without a logout reason when not provided", async () => {
+        const result = await logoutService.logout(primaryUserId);
+
+        expect(accountSwitcherService.listenForSwitchAccountFinish).toHaveBeenCalledTimes(1);
+        expect(messagingService.send).toHaveBeenCalledWith("logout", { userId: primaryUserId });
+
+        expect(result).toBeUndefined();
+      });
+
+      it("sends logout message with a logout reason when provided", async () => {
+        const result = await logoutService.logout(primaryUserId, logoutReason);
+
+        expect(accountSwitcherService.listenForSwitchAccountFinish).toHaveBeenCalledTimes(1);
+        expect(messagingService.send).toHaveBeenCalledWith("logout", {
+          userId: primaryUserId,
+          logoutReason,
+        });
+        expect(result).toBeUndefined();
+      });
+    });
+
+    describe("New active user", () => {
+      const newActiveUserAuthenticationStatus = AuthenticationStatus.Unlocked;
+
+      beforeEach(() => {
+        accountSwitcherService.listenForSwitchAccountFinish.mockResolvedValue({
+          userId: secondaryUserId,
+          authenticationStatus: newActiveUserAuthenticationStatus,
+        });
+      });
+
+      it("sends logout message without a logout reason when not provided and returns the new active  user", async () => {
+        const result = await logoutService.logout(primaryUserId);
+
+        expect(accountSwitcherService.listenForSwitchAccountFinish).toHaveBeenCalledTimes(1);
+
+        expect(messagingService.send).toHaveBeenCalledWith("logout", { userId: primaryUserId });
+
+        expect(result).toEqual({
+          userId: secondaryUserId,
+          authenticationStatus: newActiveUserAuthenticationStatus,
+        });
+      });
+
+      it("sends logout message with a logout reason when provided and returns the new active  user", async () => {
+        const result = await logoutService.logout(primaryUserId, logoutReason);
+
+        expect(accountSwitcherService.listenForSwitchAccountFinish).toHaveBeenCalledTimes(1);
+
+        expect(messagingService.send).toHaveBeenCalledWith("logout", {
+          userId: primaryUserId,
+          logoutReason,
+        });
+        expect(result).toEqual({
+          userId: secondaryUserId,
+          authenticationStatus: newActiveUserAuthenticationStatus,
+        });
+      });
+    });
+  });
+});
diff --git a/apps/browser/src/auth/popup/logout/extension-logout.service.ts b/apps/browser/src/auth/popup/logout/extension-logout.service.ts
new file mode 100644
index 00000000000..c43c18f157a
--- /dev/null
+++ b/apps/browser/src/auth/popup/logout/extension-logout.service.ts
@@ -0,0 +1,39 @@
+import {
+  DefaultLogoutService,
+  LogoutReason,
+  LogoutService,
+  NewActiveUser,
+} from "@bitwarden/auth/common";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { UserId } from "@bitwarden/common/types/guid";
+
+import { AccountSwitcherService } from "../account-switching/services/account-switcher.service";
+
+export class ExtensionLogoutService extends DefaultLogoutService implements LogoutService {
+  constructor(
+    protected messagingService: MessagingService,
+    private accountSwitcherService: AccountSwitcherService,
+  ) {
+    super(messagingService);
+  }
+
+  override async logout(
+    userId: UserId,
+    logoutReason?: LogoutReason,
+  ): Promise<NewActiveUser | undefined> {
+    // logout can result in an account switch to the next up user
+    const accountSwitchFinishPromise =
+      this.accountSwitcherService.listenForSwitchAccountFinish(null);
+
+    // send the logout message
+    this.messagingService.send("logout", { userId, logoutReason });
+
+    // wait for the account switch to finish
+    const result = await accountSwitchFinishPromise;
+    if (result) {
+      return { userId: result.userId, authenticationStatus: result.authenticationStatus };
+    }
+    // if there is no account switch, return undefined
+    return undefined;
+  }
+}
diff --git a/apps/browser/src/auth/popup/settings/account-security.component.spec.ts b/apps/browser/src/auth/popup/settings/account-security.component.spec.ts
index 56b18068778..b50e1f55032 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.spec.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.spec.ts
@@ -25,6 +25,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { MessageSender } from "@bitwarden/common/platform/messaging";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { StateProvider } from "@bitwarden/common/platform/state";
@@ -34,13 +35,14 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { DialogService, ToastService } from "@bitwarden/components";
 import { BiometricStateService, BiometricsService, KeyService } from "@bitwarden/key-management";
 
+import { BrowserApi } from "../../../platform/browser/browser-api";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupRouterCacheService } from "../../../platform/popup/view-cache/popup-router-cache.service";
 
 import { AccountSecurityComponent } from "./account-security.component";
 
 @Component({
-  standalone: true,
   selector: "app-pop-out",
   template: ` <ng-content></ng-content>`,
 })
@@ -56,6 +58,10 @@ describe("AccountSecurityComponent", () => {
   const biometricStateService = mock<BiometricStateService>();
   const policyService = mock<PolicyService>();
   const pinServiceAbstraction = mock<PinServiceAbstraction>();
+  const keyService = mock<KeyService>();
+  const validationService = mock<ValidationService>();
+  const dialogService = mock<DialogService>();
+  const platformUtilsService = mock<PlatformUtilsService>();
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
@@ -64,13 +70,13 @@ describe("AccountSecurityComponent", () => {
         { provide: AccountSecurityComponent, useValue: mock<AccountSecurityComponent>() },
         { provide: BiometricsService, useValue: mock<BiometricsService>() },
         { provide: BiometricStateService, useValue: biometricStateService },
-        { provide: DialogService, useValue: mock<DialogService>() },
+        { provide: DialogService, useValue: dialogService },
         { provide: EnvironmentService, useValue: mock<EnvironmentService>() },
         { provide: I18nService, useValue: mock<I18nService>() },
         { provide: MessageSender, useValue: mock<MessageSender>() },
-        { provide: KeyService, useValue: mock<KeyService>() },
+        { provide: KeyService, useValue: keyService },
         { provide: PinServiceAbstraction, useValue: pinServiceAbstraction },
-        { provide: PlatformUtilsService, useValue: mock<PlatformUtilsService>() },
+        { provide: PlatformUtilsService, useValue: platformUtilsService },
         { provide: PolicyService, useValue: policyService },
         { provide: PopupRouterCacheService, useValue: mock<PopupRouterCacheService>() },
         { provide: StateService, useValue: mock<StateService>() },
@@ -85,14 +91,17 @@ describe("AccountSecurityComponent", () => {
         { provide: OrganizationService, useValue: mock<OrganizationService>() },
         { provide: CollectionService, useValue: mock<CollectionService>() },
         { provide: ConfigService, useValue: mock<ConfigService>() },
+        { provide: ValidationService, useValue: validationService },
       ],
     })
       .overrideComponent(AccountSecurityComponent, {
         remove: {
           imports: [PopOutComponent],
+          providers: [DialogService],
         },
         add: {
           imports: [MockPopOutComponent],
+          providers: [{ provide: DialogService, useValue: dialogService }],
         },
       })
       .compileComponents();
@@ -107,10 +116,17 @@ describe("AccountSecurityComponent", () => {
     vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$.mockReturnValue(
       of(VaultTimeoutAction.Lock),
     );
+    vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$.mockReturnValue(
+      of(VaultTimeoutAction.Lock),
+    );
     biometricStateService.promptAutomatically$ = of(false);
     pinServiceAbstraction.isPinSet.mockResolvedValue(false);
   });
 
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
   it("pin enabled when RemoveUnlockWithPin policy is not set", async () => {
     // @ts-strict-ignore
     policyService.policiesByType$.mockReturnValue(of([null]));
@@ -212,4 +228,136 @@ describe("AccountSecurityComponent", () => {
     const pinInputElement = fixture.debugElement.query(By.css("#pin"));
     expect(pinInputElement).toBeNull();
   });
+
+  describe("updateBiometric", () => {
+    let browserApiSpy: jest.SpyInstance;
+
+    beforeEach(() => {
+      policyService.policiesByType$.mockReturnValue(of([null]));
+      browserApiSpy = jest.spyOn(BrowserApi, "requestPermission");
+      browserApiSpy.mockResolvedValue(true);
+    });
+
+    describe("updating to false", () => {
+      it("calls biometricStateService methods with false when false", async () => {
+        await component.ngOnInit();
+        await component.updateBiometric(false);
+
+        expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(false);
+        expect(biometricStateService.setFingerprintValidated).toHaveBeenCalledWith(false);
+      });
+    });
+
+    describe("updating to true", () => {
+      let trySetupBiometricsSpy: jest.SpyInstance;
+
+      beforeEach(() => {
+        trySetupBiometricsSpy = jest.spyOn(component, "trySetupBiometrics");
+      });
+
+      it("displays permission error dialog when nativeMessaging permission is not granted", async () => {
+        browserApiSpy.mockResolvedValue(false);
+
+        await component.ngOnInit();
+        await component.updateBiometric(true);
+
+        expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
+          title: { key: "nativeMessaginPermissionErrorTitle" },
+          content: { key: "nativeMessaginPermissionErrorDesc" },
+          acceptButtonText: { key: "ok" },
+          cancelButtonText: null,
+          type: "danger",
+        });
+        expect(component.form.controls.biometric.value).toBe(false);
+        expect(trySetupBiometricsSpy).not.toHaveBeenCalled();
+      });
+
+      it("displays a specific sidebar dialog when nativeMessaging permissions throws an error on firefox + sidebar", async () => {
+        browserApiSpy.mockRejectedValue(new Error("Permission denied"));
+        platformUtilsService.isFirefox.mockReturnValue(true);
+        jest.spyOn(BrowserPopupUtils, "inSidebar").mockReturnValue(true);
+
+        await component.ngOnInit();
+        await component.updateBiometric(true);
+
+        expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
+          title: { key: "nativeMessaginPermissionSidebarTitle" },
+          content: { key: "nativeMessaginPermissionSidebarDesc" },
+          acceptButtonText: { key: "ok" },
+          cancelButtonText: null,
+          type: "info",
+        });
+        expect(component.form.controls.biometric.value).toBe(false);
+        expect(trySetupBiometricsSpy).not.toHaveBeenCalled();
+      });
+
+      test.each([
+        [false, false],
+        [false, true],
+        [true, false],
+      ])(
+        "displays a generic dialog when nativeMessaging permissions throws an error and isFirefox is %s and onSidebar is %s",
+        async (isFirefox, inSidebar) => {
+          browserApiSpy.mockRejectedValue(new Error("Permission denied"));
+          platformUtilsService.isFirefox.mockReturnValue(isFirefox);
+          jest.spyOn(BrowserPopupUtils, "inSidebar").mockReturnValue(inSidebar);
+
+          await component.ngOnInit();
+          await component.updateBiometric(true);
+
+          expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
+            title: { key: "nativeMessaginPermissionErrorTitle" },
+            content: { key: "nativeMessaginPermissionErrorDesc" },
+            acceptButtonText: { key: "ok" },
+            cancelButtonText: null,
+            type: "danger",
+          });
+          expect(component.form.controls.biometric.value).toBe(false);
+          expect(trySetupBiometricsSpy).not.toHaveBeenCalled();
+        },
+      );
+
+      it("refreshes additional keys and attempts to setup biometrics when enabled with nativeMessaging permission", async () => {
+        const setupBiometricsResult = true;
+        trySetupBiometricsSpy.mockResolvedValue(setupBiometricsResult);
+
+        await component.ngOnInit();
+        await component.updateBiometric(true);
+
+        expect(keyService.refreshAdditionalKeys).toHaveBeenCalledWith(mockUserId);
+        expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(
+          setupBiometricsResult,
+        );
+        expect(component.form.controls.biometric.value).toBe(setupBiometricsResult);
+      });
+
+      it("handles failed biometrics setup", async () => {
+        const setupBiometricsResult = false;
+        trySetupBiometricsSpy.mockResolvedValue(setupBiometricsResult);
+
+        await component.ngOnInit();
+        await component.updateBiometric(true);
+
+        expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(
+          setupBiometricsResult,
+        );
+        expect(biometricStateService.setFingerprintValidated).toHaveBeenCalledWith(
+          setupBiometricsResult,
+        );
+        expect(component.form.controls.biometric.value).toBe(setupBiometricsResult);
+      });
+
+      it("handles error during biometrics setup", async () => {
+        // Simulate an error during biometrics setup
+        keyService.refreshAdditionalKeys.mockRejectedValue(new Error("UserId is required"));
+
+        await component.ngOnInit();
+        await component.updateBiometric(true);
+
+        expect(validationService.showError).toHaveBeenCalledWith(new Error("UserId is required"));
+        expect(component.form.controls.biometric.value).toBe(false);
+        expect(trySetupBiometricsSpy).not.toHaveBeenCalled();
+      });
+    });
+  });
 });
diff --git a/apps/browser/src/auth/popup/settings/account-security.component.ts b/apps/browser/src/auth/popup/settings/account-security.component.ts
index 26a805b3624..4f9e1f7414a 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.ts
@@ -45,6 +45,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import {
   DialogRef,
   CardComponent,
@@ -69,7 +70,7 @@ import {
 
 import { BiometricErrors, BiometricErrorTypes } from "../../../models/biometricErrors";
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
@@ -79,7 +80,6 @@ import { AwaitDesktopDialogComponent } from "./await-desktop-dialog.component";
 
 @Component({
   templateUrl: "account-security.component.html",
-  standalone: true,
   imports: [
     CardComponent,
     CheckboxModule,
@@ -154,6 +154,7 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
     private toastService: ToastService,
     private biometricsService: BiometricsService,
     private vaultNudgesService: NudgesService,
+    private validationService: ValidationService,
   ) {}
 
   async ngOnInit() {
@@ -473,12 +474,14 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
       this.form.controls.pin.setValue(userHasPinSet, { emitEvent: false });
       const requireReprompt = (await this.pinService.getPinLockType(userId)) == "EPHEMERAL";
       this.form.controls.pinLockWithMasterPassword.setValue(requireReprompt, { emitEvent: false });
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("unlockPinSet"),
-      });
-      await this.vaultNudgesService.dismissNudge(NudgeType.AccountSecurity, userId);
+      if (userHasPinSet) {
+        this.toastService.showToast({
+          variant: "success",
+          title: null,
+          message: this.i18nService.t("unlockPinSet"),
+        });
+        await this.vaultNudgesService.dismissNudge(NudgeType.AccountSecurity, userId);
+      }
     } else {
       const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
       await this.vaultTimeoutSettingsService.clear(userId);
@@ -521,13 +524,25 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
         return;
       }
 
-      await this.keyService.refreshAdditionalKeys();
+      try {
+        const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+        await this.keyService.refreshAdditionalKeys(userId);
 
-      const successful = await this.trySetupBiometrics();
-      this.form.controls.biometric.setValue(successful);
-      await this.biometricStateService.setBiometricUnlockEnabled(successful);
-      if (!successful) {
-        await this.biometricStateService.setFingerprintValidated(false);
+        const successful = await this.trySetupBiometrics();
+        this.form.controls.biometric.setValue(successful);
+        await this.biometricStateService.setBiometricUnlockEnabled(successful);
+        if (!successful) {
+          await this.biometricStateService.setFingerprintValidated(false);
+          return;
+        }
+        this.toastService.showToast({
+          variant: "success",
+          title: null,
+          message: this.i18nService.t("unlockWithBiometricSet"),
+        });
+      } catch (error) {
+        this.form.controls.biometric.setValue(false);
+        this.validationService.showError(error);
       }
     } else {
       await this.biometricStateService.setBiometricUnlockEnabled(false);
@@ -583,6 +598,8 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
             this.i18nService.t("errorEnableBiometricTitle"),
             this.i18nService.t("errorEnableBiometricDesc"),
           );
+          setupResult = false;
+          return;
         }
         setupResult = true;
       } catch (e) {
diff --git a/apps/browser/src/auth/popup/settings/await-desktop-dialog.component.ts b/apps/browser/src/auth/popup/settings/await-desktop-dialog.component.ts
index f7c4351dec3..11bb9683bb9 100644
--- a/apps/browser/src/auth/popup/settings/await-desktop-dialog.component.ts
+++ b/apps/browser/src/auth/popup/settings/await-desktop-dialog.component.ts
@@ -5,7 +5,6 @@ import { ButtonModule, DialogModule, DialogService } from "@bitwarden/components
 
 @Component({
   templateUrl: "await-desktop-dialog.component.html",
-  standalone: true,
   imports: [JslibModule, ButtonModule, DialogModule],
 })
 export class AwaitDesktopDialogComponent {
diff --git a/apps/browser/src/auth/popup/utils/auth-popout-window.spec.ts b/apps/browser/src/auth/popup/utils/auth-popout-window.spec.ts
index b2c20ba2849..af850c9a7bc 100644
--- a/apps/browser/src/auth/popup/utils/auth-popout-window.spec.ts
+++ b/apps/browser/src/auth/popup/utils/auth-popout-window.spec.ts
@@ -1,6 +1,6 @@
 import { createChromeTabMock } from "../../../autofill/spec/autofill-mocks";
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 
 import {
   AuthPopoutType,
diff --git a/apps/browser/src/auth/popup/utils/auth-popout-window.ts b/apps/browser/src/auth/popup/utils/auth-popout-window.ts
index 0646b684b22..0611891b61e 100644
--- a/apps/browser/src/auth/popup/utils/auth-popout-window.ts
+++ b/apps/browser/src/auth/popup/utils/auth-popout-window.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 
 const AuthPopoutType = {
   unlockExtension: "auth_unlockExtension",
diff --git a/apps/browser/src/auth/services/auth-status-badge-updater.service.ts b/apps/browser/src/auth/services/auth-status-badge-updater.service.ts
new file mode 100644
index 00000000000..4205ebc665d
--- /dev/null
+++ b/apps/browser/src/auth/services/auth-status-badge-updater.service.ts
@@ -0,0 +1,56 @@
+import { mergeMap, of, switchMap } from "rxjs";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+
+import { BadgeService } from "../../platform/badge/badge.service";
+import { BadgeIcon } from "../../platform/badge/icon";
+import { BadgeStatePriority } from "../../platform/badge/priority";
+import { Unset } from "../../platform/badge/state";
+
+const StateName = "auth-status";
+
+export class AuthStatusBadgeUpdaterService {
+  constructor(
+    private badgeService: BadgeService,
+    private accountService: AccountService,
+    private authService: AuthService,
+  ) {
+    this.accountService.activeAccount$
+      .pipe(
+        switchMap((account) =>
+          account
+            ? this.authService.authStatusFor$(account.id)
+            : of(AuthenticationStatus.LoggedOut),
+        ),
+        mergeMap(async (authStatus) => {
+          switch (authStatus) {
+            case AuthenticationStatus.LoggedOut: {
+              await this.badgeService.setState(StateName, BadgeStatePriority.High, {
+                icon: BadgeIcon.LoggedOut,
+                backgroundColor: Unset,
+                text: Unset,
+              });
+              break;
+            }
+            case AuthenticationStatus.Locked: {
+              await this.badgeService.setState(StateName, BadgeStatePriority.High, {
+                icon: BadgeIcon.Locked,
+                backgroundColor: Unset,
+                text: Unset,
+              });
+              break;
+            }
+            case AuthenticationStatus.Unlocked: {
+              await this.badgeService.setState(StateName, BadgeStatePriority.Low, {
+                icon: BadgeIcon.Unlocked,
+              });
+              break;
+            }
+          }
+        }),
+      )
+      .subscribe();
+  }
+}
diff --git a/apps/browser/src/auth/services/extension-two-factor-auth-component.service.spec.ts b/apps/browser/src/auth/services/extension-two-factor-auth-component.service.spec.ts
index 2247328acab..52b2e1bf4c5 100644
--- a/apps/browser/src/auth/services/extension-two-factor-auth-component.service.spec.ts
+++ b/apps/browser/src/auth/services/extension-two-factor-auth-component.service.spec.ts
@@ -13,7 +13,7 @@ jest.mock("../popup/utils/auth-popout-window", () => {
   };
 });
 
-jest.mock("../../platform/popup/browser-popup-utils", () => ({
+jest.mock("../../platform/browser/browser-popup-utils", () => ({
   inSingleActionPopout: jest.fn(),
   inPopout: jest.fn(),
 }));
@@ -22,7 +22,9 @@ import { DuoLaunchAction } from "@bitwarden/auth/angular";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 
 import { BrowserApi } from "../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../platform/browser/browser-popup-utils";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import {
   AuthPopoutType,
   closeSsoAuthResultPopout,
diff --git a/apps/browser/src/auth/services/extension-two-factor-auth-component.service.ts b/apps/browser/src/auth/services/extension-two-factor-auth-component.service.ts
index f768b223984..154abe13448 100644
--- a/apps/browser/src/auth/services/extension-two-factor-auth-component.service.ts
+++ b/apps/browser/src/auth/services/extension-two-factor-auth-component.service.ts
@@ -6,7 +6,9 @@ import {
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 
 import { BrowserApi } from "../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../platform/browser/browser-popup-utils";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import {
   AuthPopoutType,
   closeSsoAuthResultPopout,
diff --git a/apps/browser/src/auth/services/extension-two-factor-auth-duo-component.service.ts b/apps/browser/src/auth/services/extension-two-factor-auth-duo-component.service.ts
index 594e09fc50c..8fa72cdfc6c 100644
--- a/apps/browser/src/auth/services/extension-two-factor-auth-duo-component.service.ts
+++ b/apps/browser/src/auth/services/extension-two-factor-auth-duo-component.service.ts
@@ -5,6 +5,8 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openTwoFactorAuthDuoPopout } from "../../auth/popup/utils/auth-popout-window";
 import { ZonedMessageListenerService } from "../../platform/browser/zoned-message-listener.service";
 
diff --git a/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.spec.ts b/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.spec.ts
deleted file mode 100644
index 01a0129d0e5..00000000000
--- a/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.spec.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { MockProxy, mock } from "jest-mock-extended";
-
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { DialogService } from "@bitwarden/components";
-
-// Must mock modules before importing
-jest.mock("../popup/utils/auth-popout-window", () => {
-  const originalModule = jest.requireActual("../popup/utils/auth-popout-window");
-
-  return {
-    ...originalModule, // avoid losing the original module's exports
-    openTwoFactorAuthEmailPopout: jest.fn(),
-  };
-});
-
-jest.mock("../../platform/popup/browser-popup-utils", () => ({
-  inPopup: jest.fn(),
-}));
-
-import { openTwoFactorAuthEmailPopout } from "../../auth/popup/utils/auth-popout-window";
-import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
-
-import { ExtensionTwoFactorAuthEmailComponentService } from "./extension-two-factor-auth-email-component.service";
-
-describe("ExtensionTwoFactorAuthEmailComponentService", () => {
-  let extensionTwoFactorAuthEmailComponentService: ExtensionTwoFactorAuthEmailComponentService;
-
-  let dialogService: MockProxy<DialogService>;
-  let window: MockProxy<Window>;
-  let configService: MockProxy<ConfigService>;
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    dialogService = mock<DialogService>();
-    window = mock<Window>();
-    configService = mock<ConfigService>();
-
-    extensionTwoFactorAuthEmailComponentService = new ExtensionTwoFactorAuthEmailComponentService(
-      dialogService,
-      window,
-      configService,
-    );
-  });
-
-  describe("openPopoutIfApprovedForEmail2fa", () => {
-    it("should open a popout if the user confirms the warning to popout the extension when in the popup", async () => {
-      // Arrange
-      configService.getFeatureFlag.mockResolvedValue(false);
-      dialogService.openSimpleDialog.mockResolvedValue(true);
-
-      jest.spyOn(BrowserPopupUtils, "inPopup").mockReturnValue(true);
-
-      // Act
-      await extensionTwoFactorAuthEmailComponentService.openPopoutIfApprovedForEmail2fa();
-
-      // Assert
-      expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
-        title: { key: "warning" },
-        content: { key: "popup2faCloseMessage" },
-        type: "warning",
-      });
-
-      expect(openTwoFactorAuthEmailPopout).toHaveBeenCalled();
-    });
-
-    it("should not open a popout if the user cancels the warning to popout the extension when in the popup", async () => {
-      // Arrange
-      configService.getFeatureFlag.mockResolvedValue(false);
-      dialogService.openSimpleDialog.mockResolvedValue(false);
-
-      jest.spyOn(BrowserPopupUtils, "inPopup").mockReturnValue(true);
-
-      // Act
-      await extensionTwoFactorAuthEmailComponentService.openPopoutIfApprovedForEmail2fa();
-
-      // Assert
-      expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
-        title: { key: "warning" },
-        content: { key: "popup2faCloseMessage" },
-        type: "warning",
-      });
-
-      expect(openTwoFactorAuthEmailPopout).not.toHaveBeenCalled();
-    });
-
-    it("should not open a popout if not in the popup", async () => {
-      // Arrange
-      configService.getFeatureFlag.mockResolvedValue(false);
-      jest.spyOn(BrowserPopupUtils, "inPopup").mockReturnValue(false);
-
-      // Act
-      await extensionTwoFactorAuthEmailComponentService.openPopoutIfApprovedForEmail2fa();
-
-      // Assert
-      expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
-      expect(openTwoFactorAuthEmailPopout).not.toHaveBeenCalled();
-    });
-
-    it("does not prompt or open a popout if the feature flag is enabled", async () => {
-      configService.getFeatureFlag.mockResolvedValue(true);
-      jest.spyOn(BrowserPopupUtils, "inPopup").mockReturnValue(true);
-
-      await extensionTwoFactorAuthEmailComponentService.openPopoutIfApprovedForEmail2fa();
-
-      expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
-      expect(openTwoFactorAuthEmailPopout).not.toHaveBeenCalled();
-    });
-  });
-});
diff --git a/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.ts b/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.ts
deleted file mode 100644
index 293d88c4e64..00000000000
--- a/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {
-  DefaultTwoFactorAuthEmailComponentService,
-  TwoFactorAuthEmailComponentService,
-} from "@bitwarden/auth/angular";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { DialogService } from "@bitwarden/components";
-
-import { openTwoFactorAuthEmailPopout } from "../../auth/popup/utils/auth-popout-window";
-import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
-
-// TODO: popup state persistence should eventually remove the need for this service
-export class ExtensionTwoFactorAuthEmailComponentService
-  extends DefaultTwoFactorAuthEmailComponentService
-  implements TwoFactorAuthEmailComponentService
-{
-  constructor(
-    private dialogService: DialogService,
-    private window: Window,
-    private configService: ConfigService,
-  ) {
-    super();
-  }
-
-  async openPopoutIfApprovedForEmail2fa(): Promise<void> {
-    const isTwoFactorFormPersistenceEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.PM9115_TwoFactorExtensionDataPersistence,
-    );
-
-    if (isTwoFactorFormPersistenceEnabled) {
-      // If the feature flag is enabled, we don't need to prompt the user to open the popout
-      return;
-    }
-
-    if (BrowserPopupUtils.inPopup(this.window)) {
-      const confirmed = await this.dialogService.openSimpleDialog({
-        title: { key: "warning" },
-        content: { key: "popup2faCloseMessage" },
-        type: "warning",
-      });
-      if (confirmed) {
-        await openTwoFactorAuthEmailPopout();
-        this.window.close();
-      }
-    }
-  }
-}
diff --git a/apps/browser/src/autofill/background/abstractions/notification.background.ts b/apps/browser/src/autofill/background/abstractions/notification.background.ts
index db110319d20..9c9c5c0e243 100644
--- a/apps/browser/src/autofill/background/abstractions/notification.background.ts
+++ b/apps/browser/src/autofill/background/abstractions/notification.background.ts
@@ -1,6 +1,9 @@
 import { NeverDomains } from "@bitwarden/common/models/domain/domain-service";
 import { ServerConfig } from "@bitwarden/common/platform/abstractions/config/server-config";
+import { UserId } from "@bitwarden/common/types/guid";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import { SecurityTask } from "@bitwarden/common/vault/tasks";
 
 import { CollectionView } from "../../content/components/common-types";
 import { NotificationQueueMessageTypes } from "../../enums/notification-queue-message-type.enum";
@@ -32,10 +35,17 @@ interface AddUnlockVaultQueueMessage extends NotificationQueueMessage {
   type: "unlock";
 }
 
+interface AtRiskPasswordQueueMessage extends NotificationQueueMessage {
+  type: "at-risk-password";
+  organizationName: string;
+  passwordChangeUri?: string;
+}
+
 type NotificationQueueMessageItem =
   | AddLoginQueueMessage
   | AddChangePasswordQueueMessage
-  | AddUnlockVaultQueueMessage;
+  | AddUnlockVaultQueueMessage
+  | AtRiskPasswordQueueMessage;
 
 type LockedVaultPendingNotificationsData = {
   commandToRetry: {
@@ -50,6 +60,13 @@ type LockedVaultPendingNotificationsData = {
   target: string;
 };
 
+type AtRiskPasswordNotificationsData = {
+  activeUserId: UserId;
+  cipher: CipherView;
+  securityTask: SecurityTask;
+  uri: string;
+};
+
 type AdjustNotificationBarMessageData = {
   height: number;
 };
@@ -76,7 +93,8 @@ type NotificationBackgroundExtensionMessage = {
   data?: Partial<LockedVaultPendingNotificationsData> &
     Partial<AdjustNotificationBarMessageData> &
     Partial<ChangePasswordMessageData> &
-    Partial<UnlockVaultMessageData>;
+    Partial<UnlockVaultMessageData> &
+    Partial<AtRiskPasswordNotificationsData>;
   login?: AddLoginMessageData;
   folder?: string;
   edit?: boolean;
@@ -101,10 +119,20 @@ type NotificationBackgroundExtensionMessageHandlers = {
     sender,
   }: BackgroundOnMessageHandlerParams) => Promise<CollectionView[]>;
   bgCloseNotificationBar: ({ message, sender }: BackgroundOnMessageHandlerParams) => Promise<void>;
-  bgOpenAtRisksPasswords: ({ message, sender }: BackgroundOnMessageHandlerParams) => Promise<void>;
+  bgOpenAtRiskPasswords: ({ message, sender }: BackgroundOnMessageHandlerParams) => Promise<void>;
   bgAdjustNotificationBar: ({ message, sender }: BackgroundOnMessageHandlerParams) => Promise<void>;
-  bgAddLogin: ({ message, sender }: BackgroundOnMessageHandlerParams) => Promise<void>;
-  bgChangedPassword: ({ message, sender }: BackgroundOnMessageHandlerParams) => Promise<void>;
+  bgTriggerAddLoginNotification: ({
+    message,
+    sender,
+  }: BackgroundOnMessageHandlerParams) => Promise<boolean>;
+  bgTriggerChangedPasswordNotification: ({
+    message,
+    sender,
+  }: BackgroundOnMessageHandlerParams) => Promise<boolean>;
+  bgTriggerAtRiskPasswordNotification: ({
+    message,
+    sender,
+  }: BackgroundOnMessageHandlerParams) => Promise<boolean>;
   bgRemoveTabFromNotificationQueue: ({ sender }: BackgroundSenderParam) => void;
   bgSaveCipher: ({ message, sender }: BackgroundOnMessageHandlerParams) => void;
   bgOpenAddEditVaultItemPopout: ({
diff --git a/apps/browser/src/autofill/background/abstractions/overlay.background.ts b/apps/browser/src/autofill/background/abstractions/overlay.background.ts
index 6ad9b8e06fd..5e2b755ad4a 100644
--- a/apps/browser/src/autofill/background/abstractions/overlay.background.ts
+++ b/apps/browser/src/autofill/background/abstractions/overlay.background.ts
@@ -4,7 +4,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
-import { InlineMenuFillTypes } from "../../enums/autofill-overlay.enum";
+import { InlineMenuFillType } from "../../enums/autofill-overlay.enum";
 import AutofillPageDetails from "../../models/autofill-page-details";
 import { PageDetail } from "../../services/abstractions/autofill.service";
 
@@ -43,7 +43,7 @@ export type UpdateOverlayCiphersParams = {
 export type FocusedFieldData = {
   focusedFieldStyles: Partial<CSSStyleDeclaration>;
   focusedFieldRects: Partial<DOMRect>;
-  inlineMenuFillType?: InlineMenuFillTypes;
+  inlineMenuFillType?: InlineMenuFillType;
   tabId?: number;
   frameId?: number;
   accountCreationFieldType?: string;
diff --git a/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts b/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts
index 9f197b02193..373354b4c54 100644
--- a/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts
+++ b/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts
@@ -5,7 +5,6 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -35,7 +34,6 @@ describe("AutoSubmitLoginBackground", () => {
   let scriptInjectorService: MockProxy<ScriptInjectorService>;
   let authStatus$: BehaviorSubject<AuthenticationStatus>;
   let authService: MockProxy<AuthService>;
-  let configService: MockProxy<ConfigService>;
   let platformUtilsService: MockProxy<PlatformUtilsService>;
   let policyDetails: MockProxy<Policy>;
   let automaticAppLogInPolicy$: BehaviorSubject<Policy[]>;
@@ -56,9 +54,6 @@ describe("AutoSubmitLoginBackground", () => {
     authStatus$ = new BehaviorSubject(AuthenticationStatus.Unlocked);
     authService = mock<AuthService>();
     authService.activeAccountStatus$ = authStatus$;
-    configService = mock<ConfigService>({
-      getFeatureFlag: jest.fn().mockResolvedValue(true),
-    });
     platformUtilsService = mock<PlatformUtilsService>();
     policyDetails = mock<Policy>({
       enabled: true,
@@ -78,7 +73,6 @@ describe("AutoSubmitLoginBackground", () => {
       autofillService,
       scriptInjectorService,
       authService,
-      configService,
       platformUtilsService,
       policyService,
       accountService,
@@ -89,7 +83,7 @@ describe("AutoSubmitLoginBackground", () => {
     jest.clearAllMocks();
   });
 
-  describe("when the AutoSubmitLoginBackground feature is disabled", () => {
+  describe("when conditions prevent auto-submit policy activation", () => {
     it("destroys all event listeners when the AutomaticAppLogIn policy is not enabled", async () => {
       automaticAppLogInPolicy$.next([mock<Policy>({ ...policyDetails, enabled: false })]);
 
@@ -115,7 +109,7 @@ describe("AutoSubmitLoginBackground", () => {
     });
   });
 
-  describe("when the AutoSubmitLoginBackground feature is enabled", () => {
+  describe("when the AutomaticAppLogIn policy is valid and active", () => {
     let webRequestDetails: chrome.webRequest.WebRequestBodyDetails;
 
     describe("starting the auto-submit login workflow", () => {
@@ -268,7 +262,6 @@ describe("AutoSubmitLoginBackground", () => {
           autofillService,
           scriptInjectorService,
           authService,
-          configService,
           platformUtilsService,
           policyService,
           accountService,
diff --git a/apps/browser/src/autofill/background/auto-submit-login.background.ts b/apps/browser/src/autofill/background/auto-submit-login.background.ts
index bce876e8f82..dcafe21b63c 100644
--- a/apps/browser/src/autofill/background/auto-submit-login.background.ts
+++ b/apps/browser/src/autofill/background/auto-submit-login.background.ts
@@ -10,8 +10,6 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
@@ -42,7 +40,6 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
     private autofillService: AutofillService,
     private scriptInjectorService: ScriptInjectorService,
     private authService: AuthService,
-    private configService: ConfigService,
     private platformUtilsService: PlatformUtilsService,
     private policyService: PolicyService,
     private accountService: AccountService,
@@ -51,25 +48,19 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
   }
 
   /**
-   * Initializes the auto-submit login policy. Will return early if
-   * the feature flag is not set. If the policy is not enabled, it
+   * Initializes the auto-submit login policy. If the policy is not enabled, it
    * will trigger a removal of any established listeners.
    */
   async init() {
-    const featureFlagEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.IdpAutoSubmitLogin,
-    );
-    if (featureFlagEnabled) {
-      this.accountService.activeAccount$
-        .pipe(
-          getUserId,
-          switchMap((userId) =>
-            this.policyService.policiesByType$(PolicyType.AutomaticAppLogIn, userId),
-          ),
-          getFirstPolicy,
-        )
-        .subscribe(this.handleAutoSubmitLoginPolicySubscription.bind(this));
-    }
+    this.accountService.activeAccount$
+      .pipe(
+        getUserId,
+        switchMap((userId) =>
+          this.policyService.policiesByType$(PolicyType.AutomaticAppLogIn, userId),
+        ),
+        getFirstPolicy,
+      )
+      .subscribe(this.handleAutoSubmitLoginPolicySubscription.bind(this));
   }
 
   /**
diff --git a/apps/browser/src/autofill/background/notification.background.spec.ts b/apps/browser/src/autofill/background/notification.background.spec.ts
index 009efd7ff36..5e7e3ed30f5 100644
--- a/apps/browser/src/autofill/background/notification.background.spec.ts
+++ b/apps/browser/src/autofill/background/notification.background.spec.ts
@@ -69,8 +69,9 @@ describe("NotificationBackground", () => {
   const accountService = mock<AccountService>();
   const organizationService = mock<OrganizationService>();
 
+  const userId = "testId" as UserId;
   const activeAccountSubject = new BehaviorSubject<{ id: UserId } & AccountInfo>({
-    id: "testId" as UserId,
+    id: userId,
     email: "test@example.com",
     emailVerified: true,
     name: "Test User",
@@ -274,7 +275,7 @@ describe("NotificationBackground", () => {
       });
     });
 
-    describe("bgAddLogin message handler", () => {
+    describe("bgTriggerAddLoginNotification message handler", () => {
       let tab: chrome.tabs.Tab;
       let sender: chrome.runtime.MessageSender;
       let getEnableAddedLoginPromptSpy: jest.SpyInstance;
@@ -304,7 +305,7 @@ describe("NotificationBackground", () => {
 
       it("skips attempting to add the login if the user is logged out", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgAddLogin",
+          command: "bgTriggerAddLoginNotification",
           login: { username: "test", password: "password", url: "https://example.com" },
         };
         activeAccountStatusMock$.next(AuthenticationStatus.LoggedOut);
@@ -318,7 +319,7 @@ describe("NotificationBackground", () => {
 
       it("skips attempting to add the login if the login data does not contain a valid url", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgAddLogin",
+          command: "bgTriggerAddLoginNotification",
           login: { username: "test", password: "password", url: "" },
         };
         activeAccountStatusMock$.next(AuthenticationStatus.Locked);
@@ -332,7 +333,7 @@ describe("NotificationBackground", () => {
 
       it("skips attempting to add the login if the user with a locked vault has disabled the login notification", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgAddLogin",
+          command: "bgTriggerAddLoginNotification",
           login: { username: "test", password: "password", url: "https://example.com" },
         };
         activeAccountStatusMock$.next(AuthenticationStatus.Locked);
@@ -349,7 +350,7 @@ describe("NotificationBackground", () => {
 
       it("skips attempting to add the login if the user with an unlocked vault has disabled the login notification", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgAddLogin",
+          command: "bgTriggerAddLoginNotification",
           login: { username: "test", password: "password", url: "https://example.com" },
         };
         activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
@@ -367,7 +368,7 @@ describe("NotificationBackground", () => {
 
       it("skips attempting to change the password for an existing login if the user has disabled changing the password notification", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgAddLogin",
+          command: "bgTriggerAddLoginNotification",
           login: { username: "test", password: "password", url: "https://example.com" },
         };
         activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
@@ -389,7 +390,7 @@ describe("NotificationBackground", () => {
 
       it("skips attempting to change the password for an existing login if the password has not changed", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgAddLogin",
+          command: "bgTriggerAddLoginNotification",
           login: { username: "test", password: "password", url: "https://example.com" },
         };
         activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
@@ -409,7 +410,10 @@ describe("NotificationBackground", () => {
 
       it("adds the login to the queue if the user has a locked account", async () => {
         const login = { username: "test", password: "password", url: "https://example.com" };
-        const message: NotificationBackgroundExtensionMessage = { command: "bgAddLogin", login };
+        const message: NotificationBackgroundExtensionMessage = {
+          command: "bgTriggerAddLoginNotification",
+          login,
+        };
         activeAccountStatusMock$.next(AuthenticationStatus.Locked);
         getEnableAddedLoginPromptSpy.mockReturnValueOnce(true);
 
@@ -425,7 +429,10 @@ describe("NotificationBackground", () => {
           password: "password",
           url: "https://example.com",
         } as any;
-        const message: NotificationBackgroundExtensionMessage = { command: "bgAddLogin", login };
+        const message: NotificationBackgroundExtensionMessage = {
+          command: "bgTriggerAddLoginNotification",
+          login,
+        };
         activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
         getEnableAddedLoginPromptSpy.mockReturnValueOnce(true);
         getAllDecryptedForUrlSpy.mockResolvedValueOnce([
@@ -440,7 +447,10 @@ describe("NotificationBackground", () => {
 
       it("adds a change password message to the queue if the user has changed an existing cipher's password", async () => {
         const login = { username: "tEsT", password: "password", url: "https://example.com" };
-        const message: NotificationBackgroundExtensionMessage = { command: "bgAddLogin", login };
+        const message: NotificationBackgroundExtensionMessage = {
+          command: "bgTriggerAddLoginNotification",
+          login,
+        };
         activeAccountStatusMock$.next(AuthenticationStatus.Unlocked);
         getEnableAddedLoginPromptSpy.mockResolvedValueOnce(true);
         getEnableChangedPasswordPromptSpy.mockResolvedValueOnce(true);
@@ -463,7 +473,7 @@ describe("NotificationBackground", () => {
       });
     });
 
-    describe("bgChangedPassword message handler", () => {
+    describe("bgTriggerChangedPasswordNotification message handler", () => {
       let tab: chrome.tabs.Tab;
       let sender: chrome.runtime.MessageSender;
       let pushChangePasswordToQueueSpy: jest.SpyInstance;
@@ -481,7 +491,7 @@ describe("NotificationBackground", () => {
 
       it("skips attempting to add the change password message to the queue if the passed url is not valid", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgChangedPassword",
+          command: "bgTriggerChangedPasswordNotification",
           data: { newPassword: "newPassword", currentPassword: "currentPassword", url: "" },
         };
 
@@ -493,7 +503,7 @@ describe("NotificationBackground", () => {
 
       it("adds a change password message to the queue if the user does not have an unlocked account", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgChangedPassword",
+          command: "bgTriggerChangedPasswordNotification",
           data: {
             newPassword: "newPassword",
             currentPassword: "currentPassword",
@@ -516,7 +526,7 @@ describe("NotificationBackground", () => {
 
       it("skips adding a change password message to the queue if the multiple ciphers exist for the passed URL and the current password is not found within the list of ciphers", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgChangedPassword",
+          command: "bgTriggerChangedPasswordNotification",
           data: {
             newPassword: "newPassword",
             currentPassword: "currentPassword",
@@ -537,7 +547,7 @@ describe("NotificationBackground", () => {
 
       it("skips adding a change password message if more than one existing cipher is found with a matching password ", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgChangedPassword",
+          command: "bgTriggerChangedPasswordNotification",
           data: {
             newPassword: "newPassword",
             currentPassword: "currentPassword",
@@ -559,7 +569,7 @@ describe("NotificationBackground", () => {
 
       it("adds a change password message to the queue if a single cipher matches the passed current password", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgChangedPassword",
+          command: "bgTriggerChangedPasswordNotification",
           data: {
             newPassword: "newPassword",
             currentPassword: "currentPassword",
@@ -587,7 +597,7 @@ describe("NotificationBackground", () => {
 
       it("skips adding a change password message if no current password is passed in the message and more than one cipher is found for a url", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgChangedPassword",
+          command: "bgTriggerChangedPasswordNotification",
           data: {
             newPassword: "newPassword",
             url: "https://example.com",
@@ -608,7 +618,7 @@ describe("NotificationBackground", () => {
 
       it("adds a change password message to the queue if no current password is passed with the message, but a single cipher is matched for the uri", async () => {
         const message: NotificationBackgroundExtensionMessage = {
-          command: "bgChangedPassword",
+          command: "bgTriggerChangedPasswordNotification",
           data: {
             newPassword: "newPassword",
             url: "https://example.com",
@@ -1141,8 +1151,11 @@ describe("NotificationBackground", () => {
           convertAddLoginQueueMessageToCipherViewSpy.mockReturnValueOnce(cipherView);
           editItemSpy.mockResolvedValueOnce(undefined);
           cipherEncryptSpy.mockResolvedValueOnce({
-            ...cipherView,
-            id: "testId",
+            cipher: {
+              ...cipherView,
+              id: "testId",
+            },
+            encryptedFor: userId,
           });
 
           sendMockExtensionMessage(message, sender);
@@ -1188,6 +1201,13 @@ describe("NotificationBackground", () => {
           folderExistsSpy.mockResolvedValueOnce(true);
           convertAddLoginQueueMessageToCipherViewSpy.mockReturnValueOnce(cipherView);
           editItemSpy.mockResolvedValueOnce(undefined);
+          cipherEncryptSpy.mockResolvedValueOnce({
+            cipher: {
+              ...cipherView,
+              id: "testId",
+            },
+            encryptedFor: userId,
+          });
           const errorMessage = "fetch error";
           createWithServerSpy.mockImplementation(() => {
             throw new Error(errorMessage);
diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts
index a73141b7e4d..65c1ca0277f 100644
--- a/apps/browser/src/autofill/background/notification.background.ts
+++ b/apps/browser/src/autofill/background/notification.background.ts
@@ -3,7 +3,10 @@
 import { firstValueFrom, switchMap, map, of } from "rxjs";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import {
+  getOrganizationById,
+  OrganizationService,
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -41,8 +44,12 @@ import { TaskService } from "@bitwarden/common/vault/tasks";
 import { SecurityTaskType } from "@bitwarden/common/vault/tasks/enums";
 import { SecurityTask } from "@bitwarden/common/vault/tasks/models/security-task";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window";
 import { BrowserApi } from "../../platform/browser/browser-api";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import {
   openAddEditVaultItemPopout,
   openViewVaultItemPopout,
@@ -55,6 +62,7 @@ import {
 import { CollectionView } from "../content/components/common-types";
 import { NotificationQueueMessageType } from "../enums/notification-queue-message-type.enum";
 import { AutofillService } from "../services/abstractions/autofill.service";
+import { TemporaryNotificationChangeLoginService } from "../services/notification-change-login-password.service";
 
 import {
   AddChangePasswordQueueMessage,
@@ -81,14 +89,18 @@ export default class NotificationBackground {
     ExtensionCommand.AutofillIdentity,
   ]);
   private readonly extensionMessageHandlers: NotificationBackgroundExtensionMessageHandlers = {
-    bgAddLogin: ({ message, sender }) => this.addLogin(message, sender),
     bgAdjustNotificationBar: ({ message, sender }) =>
       this.handleAdjustNotificationBarMessage(message, sender),
-    bgChangedPassword: ({ message, sender }) => this.changedPassword(message, sender),
+    bgTriggerAddLoginNotification: ({ message, sender }) =>
+      this.triggerAddLoginNotification(message, sender),
+    bgTriggerChangedPasswordNotification: ({ message, sender }) =>
+      this.triggerChangedPasswordNotification(message, sender),
+    bgTriggerAtRiskPasswordNotification: ({ message, sender }) =>
+      this.triggerAtRiskPasswordNotification(message, sender),
     bgCloseNotificationBar: ({ message, sender }) =>
       this.handleCloseNotificationBarMessage(message, sender),
-    bgOpenAtRisksPasswords: ({ message, sender }) =>
-      this.handleOpenAtRisksPasswordsMessage(message, sender),
+    bgOpenAtRiskPasswords: ({ message, sender }) =>
+      this.handleOpenAtRiskPasswordsMessage(message, sender),
     bgGetActiveUserServerConfig: () => this.getActiveUserServerConfig(),
     bgGetDecryptedCiphers: () => this.getNotificationCipherData(),
     bgGetEnableChangedPasswordPrompt: () => this.getEnableChangedPasswordPrompt(),
@@ -341,12 +353,17 @@ export default class NotificationBackground {
     tab: chrome.tabs.Tab,
     notificationQueueMessage: NotificationQueueMessageItem,
   ) {
-    const notificationType = notificationQueueMessage.type;
+    const {
+      type: notificationType,
+      wasVaultLocked: isVaultLocked,
+      launchTimestamp,
+      ...params
+    } = notificationQueueMessage;
 
     const typeData: NotificationTypeData = {
-      isVaultLocked: notificationQueueMessage.wasVaultLocked,
+      isVaultLocked,
       theme: await firstValueFrom(this.themeStateService.selectedTheme$),
-      launchTimestamp: notificationQueueMessage.launchTimestamp,
+      launchTimestamp,
     };
 
     switch (notificationType) {
@@ -358,6 +375,7 @@ export default class NotificationBackground {
     await BrowserApi.tabSendMessageData(tab, "openNotificationBar", {
       type: notificationType,
       typeData,
+      params,
     });
   }
 
@@ -375,6 +393,48 @@ export default class NotificationBackground {
     }
   }
 
+  /**
+   * Sends a message to trigger the at risk password notification
+   *
+   * @param message - The extension message
+   * @param sender - The contextual sender of the message
+   */
+  async triggerAtRiskPasswordNotification(
+    message: NotificationBackgroundExtensionMessage,
+    sender: chrome.runtime.MessageSender,
+  ): Promise<boolean> {
+    const { activeUserId, securityTask, cipher } = message.data;
+    const domain = Utils.getDomain(sender.tab.url);
+    const passwordChangeUri =
+      await new TemporaryNotificationChangeLoginService().getChangePasswordUrl(cipher);
+
+    const authStatus = await this.getAuthStatus();
+
+    const wasVaultLocked = authStatus === AuthenticationStatus.Locked;
+
+    const organization = await firstValueFrom(
+      this.organizationService
+        .organizations$(activeUserId)
+        .pipe(getOrganizationById(securityTask.organizationId)),
+    );
+
+    this.removeTabFromNotificationQueue(sender.tab);
+    const launchTimestamp = new Date().getTime();
+    const queueMessage: NotificationQueueMessageItem = {
+      domain,
+      wasVaultLocked,
+      type: NotificationQueueMessageType.AtRiskPassword,
+      passwordChangeUri,
+      organizationName: organization.name,
+      tab: sender.tab,
+      launchTimestamp,
+      expires: new Date(launchTimestamp + NOTIFICATION_BAR_LIFESPAN_MS),
+    };
+    this.notificationQueue.push(queueMessage);
+    await this.checkNotificationQueue(sender.tab);
+    return true;
+  }
+
   /**
    * Adds a login message to the notification queue, prompting the user to save
    * the login if it does not already exist in the vault. If the cipher exists
@@ -383,20 +443,20 @@ export default class NotificationBackground {
    * @param message - The message to add to the queue
    * @param sender - The contextual sender of the message
    */
-  async addLogin(
+  async triggerAddLoginNotification(
     message: NotificationBackgroundExtensionMessage,
     sender: chrome.runtime.MessageSender,
-  ) {
+  ): Promise<boolean> {
     const authStatus = await this.getAuthStatus();
     if (authStatus === AuthenticationStatus.LoggedOut) {
-      return;
+      return false;
     }
 
     const loginInfo = message.login;
     const normalizedUsername = loginInfo.username ? loginInfo.username.toLowerCase() : "";
     const loginDomain = Utils.getDomain(loginInfo.url);
     if (loginDomain == null) {
-      return;
+      return false;
     }
 
     const addLoginIsEnabled = await this.getEnableAddedLoginPrompt();
@@ -406,14 +466,14 @@ export default class NotificationBackground {
         await this.pushAddLoginToQueue(loginDomain, loginInfo, sender.tab, true);
       }
 
-      return;
+      return false;
     }
 
     const activeUserId = await firstValueFrom(
       this.accountService.activeAccount$.pipe(getOptionalUserId),
     );
     if (activeUserId == null) {
-      return;
+      return false;
     }
 
     const ciphers = await this.cipherService.getAllDecryptedForUrl(loginInfo.url, activeUserId);
@@ -422,7 +482,7 @@ export default class NotificationBackground {
     );
     if (addLoginIsEnabled && usernameMatches.length === 0) {
       await this.pushAddLoginToQueue(loginDomain, loginInfo, sender.tab);
-      return;
+      return true;
     }
 
     const changePasswordIsEnabled = await this.getEnableChangedPasswordPrompt();
@@ -438,7 +498,9 @@ export default class NotificationBackground {
         loginInfo.password,
         sender.tab,
       );
+      return true;
     }
+    return false;
   }
 
   private async pushAddLoginToQueue(
@@ -472,14 +534,14 @@ export default class NotificationBackground {
    * @param message - The message to add to the queue
    * @param sender - The contextual sender of the message
    */
-  async changedPassword(
+  async triggerChangedPasswordNotification(
     message: NotificationBackgroundExtensionMessage,
     sender: chrome.runtime.MessageSender,
   ) {
     const changeData = message.data as ChangePasswordMessageData;
     const loginDomain = Utils.getDomain(changeData.url);
     if (loginDomain == null) {
-      return;
+      return false;
     }
 
     if ((await this.getAuthStatus()) < AuthenticationStatus.Unlocked) {
@@ -490,7 +552,7 @@ export default class NotificationBackground {
         sender.tab,
         true,
       );
-      return;
+      return true;
     }
 
     let id: string = null;
@@ -498,7 +560,7 @@ export default class NotificationBackground {
       this.accountService.activeAccount$.pipe(getOptionalUserId),
     );
     if (activeUserId == null) {
-      return;
+      return false;
     }
 
     const ciphers = await this.cipherService.getAllDecryptedForUrl(changeData.url, activeUserId);
@@ -514,7 +576,9 @@ export default class NotificationBackground {
     }
     if (id != null) {
       await this.pushChangePasswordToQueue(id, loginDomain, changeData.newPassword, sender.tab);
+      return true;
     }
+    return false;
   }
 
   /**
@@ -719,9 +783,10 @@ export default class NotificationBackground {
         return;
       }
 
-      const cipher = await this.cipherService.encrypt(newCipher, activeUserId);
+      const encrypted = await this.cipherService.encrypt(newCipher, activeUserId);
+      const { cipher } = encrypted;
       try {
-        await this.cipherService.createWithServer(cipher);
+        await this.cipherService.createWithServer(encrypted);
         await BrowserApi.tabSendMessageData(tab, "saveCipherAttemptCompleted", {
           itemName: newCipher?.name && String(newCipher?.name),
           cipherId: cipher?.id && String(cipher?.id),
@@ -899,7 +964,7 @@ export default class NotificationBackground {
     return null;
   }
 
-  private async getSecurityTasks(userId: UserId) {
+  async getSecurityTasks(userId: UserId) {
     let tasks: SecurityTask[] = [];
 
     if (userId) {
@@ -991,7 +1056,7 @@ export default class NotificationBackground {
       this.accountService.activeAccount$.pipe(
         getUserId,
         switchMap((userId) =>
-          this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
+          this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
         ),
       ),
     );
@@ -1073,7 +1138,7 @@ export default class NotificationBackground {
    * @param message - The extension message
    * @param sender - The contextual sender of the message
    */
-  private async handleOpenAtRisksPasswordsMessage(
+  private async handleOpenAtRiskPasswordsMessage(
     message: NotificationBackgroundExtensionMessage,
     sender: chrome.runtime.MessageSender,
   ) {
diff --git a/apps/browser/src/autofill/background/overlay-notifications.background.spec.ts b/apps/browser/src/autofill/background/overlay-notifications.background.spec.ts
index a51757dabea..00114330bc4 100644
--- a/apps/browser/src/autofill/background/overlay-notifications.background.spec.ts
+++ b/apps/browser/src/autofill/background/overlay-notifications.background.spec.ts
@@ -1,9 +1,12 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { CLEAR_NOTIFICATION_LOGIN_DATA_DURATION } from "@bitwarden/common/autofill/constants";
 import { ServerConfig } from "@bitwarden/common/platform/abstractions/config/server-config";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { EnvironmentServerConfigData } from "@bitwarden/common/platform/models/data/server-config.data";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { TaskService } from "@bitwarden/common/vault/tasks";
 
 import { BrowserApi } from "../../platform/browser/browser-api";
 import AutofillField from "../models/autofill-field";
@@ -24,6 +27,9 @@ import { OverlayNotificationsBackground } from "./overlay-notifications.backgrou
 describe("OverlayNotificationsBackground", () => {
   let logService: MockProxy<LogService>;
   let notificationBackground: NotificationBackground;
+  let taskService: TaskService;
+  let accountService: AccountService;
+  let cipherService: CipherService;
   let getEnableChangedPasswordPromptSpy: jest.SpyInstance;
   let getEnableAddedLoginPromptSpy: jest.SpyInstance;
   let overlayNotificationsBackground: OverlayNotificationsBackground;
@@ -32,6 +38,9 @@ describe("OverlayNotificationsBackground", () => {
     jest.useFakeTimers();
     logService = mock<LogService>();
     notificationBackground = mock<NotificationBackground>();
+    taskService = mock<TaskService>();
+    accountService = mock<AccountService>();
+    cipherService = mock<CipherService>();
     getEnableChangedPasswordPromptSpy = jest
       .spyOn(notificationBackground, "getEnableChangedPasswordPrompt")
       .mockResolvedValue(true);
@@ -41,6 +50,9 @@ describe("OverlayNotificationsBackground", () => {
     overlayNotificationsBackground = new OverlayNotificationsBackground(
       logService,
       notificationBackground,
+      taskService,
+      accountService,
+      cipherService,
     );
     await overlayNotificationsBackground.init();
   });
@@ -329,8 +341,11 @@ describe("OverlayNotificationsBackground", () => {
         tab: { id: 1 },
         url: "https://example.com",
       });
-      notificationChangedPasswordSpy = jest.spyOn(notificationBackground, "changedPassword");
-      notificationAddLoginSpy = jest.spyOn(notificationBackground, "addLogin");
+      notificationChangedPasswordSpy = jest.spyOn(
+        notificationBackground,
+        "triggerChangedPasswordNotification",
+      );
+      notificationAddLoginSpy = jest.spyOn(notificationBackground, "triggerAddLoginNotification");
 
       sendMockExtensionMessage(
         { command: "collectPageDetailsResponse", details: pageDetails },
diff --git a/apps/browser/src/autofill/background/overlay-notifications.background.ts b/apps/browser/src/autofill/background/overlay-notifications.background.ts
index 5c85ce132d7..93357113fc4 100644
--- a/apps/browser/src/autofill/background/overlay-notifications.background.ts
+++ b/apps/browser/src/autofill/background/overlay-notifications.background.ts
@@ -1,9 +1,15 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { Subject, switchMap, timer } from "rxjs";
+import { firstValueFrom, Subject, switchMap, timer } from "rxjs";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getOptionalUserId } from "@bitwarden/common/auth/services/account.service";
 import { CLEAR_NOTIFICATION_LOGIN_DATA_DURATION } from "@bitwarden/common/autofill/constants";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { UserId } from "@bitwarden/common/types/guid";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { SecurityTask, SecurityTaskStatus, TaskService } from "@bitwarden/common/vault/tasks";
 
 import { BrowserApi } from "../../platform/browser/browser-api";
 import { generateDomainMatchPatterns, isInvalidResponseStatusCode } from "../utils";
@@ -19,6 +25,12 @@ import {
 } from "./abstractions/overlay-notifications.background";
 import NotificationBackground from "./notification.background";
 
+type LoginSecurityTaskInfo = {
+  securityTask: SecurityTask;
+  cipher: CipherView;
+  uri: ModifyLoginCipherFormData["uri"];
+};
+
 export class OverlayNotificationsBackground implements OverlayNotificationsBackgroundInterface {
   private websiteOriginsWithFields: WebsiteOriginsWithFields = new Map();
   private activeFormSubmissionRequests: ActiveFormSubmissionRequests = new Set();
@@ -35,6 +47,9 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
   constructor(
     private logService: LogService,
     private notificationBackground: NotificationBackground,
+    private taskService: TaskService,
+    private accountService: AccountService,
+    private cipherService: CipherService,
   ) {}
 
   /**
@@ -259,8 +274,8 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
     const modifyLoginData = this.modifyLoginCipherFormData.get(tabId);
     return (
       !modifyLoginData ||
-      !this.shouldTriggerAddLoginNotification(modifyLoginData) ||
-      !this.shouldTriggerChangePasswordNotification(modifyLoginData)
+      !this.shouldAttemptAddLoginNotification(modifyLoginData) ||
+      !this.shouldAttemptChangedPasswordNotification(modifyLoginData)
     );
   };
 
@@ -404,10 +419,11 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
     modifyLoginData: ModifyLoginCipherFormData,
     tab: chrome.tabs.Tab,
   ) => {
-    if (this.shouldTriggerChangePasswordNotification(modifyLoginData)) {
+    let result: string;
+    if (this.shouldAttemptChangedPasswordNotification(modifyLoginData)) {
       // These notifications are temporarily setup as "messages" to the notification background.
       // This will be structured differently in a future refactor.
-      await this.notificationBackground.changedPassword(
+      const success = await this.notificationBackground.triggerChangedPasswordNotification(
         {
           command: "bgChangedPassword",
           data: {
@@ -418,14 +434,15 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
         },
         { tab },
       );
-      this.clearCompletedWebRequest(requestId, tab);
-      return;
+      if (!success) {
+        result = "Unqualified changedPassword notification attempt.";
+      }
     }
 
-    if (this.shouldTriggerAddLoginNotification(modifyLoginData)) {
-      await this.notificationBackground.addLogin(
+    if (this.shouldAttemptAddLoginNotification(modifyLoginData)) {
+      const success = await this.notificationBackground.triggerAddLoginNotification(
         {
-          command: "bgAddLogin",
+          command: "bgTriggerAddLoginNotification",
           login: {
             url: modifyLoginData.uri,
             username: modifyLoginData.username,
@@ -434,8 +451,44 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
         },
         { tab },
       );
-      this.clearCompletedWebRequest(requestId, tab);
+      if (!success) {
+        result = "Unqualified addLogin notification attempt.";
+      }
     }
+
+    const shouldGetTasks =
+      (await this.notificationBackground.getNotificationFlag()) && !modifyLoginData.newPassword;
+
+    if (shouldGetTasks) {
+      const activeUserId = await firstValueFrom(
+        this.accountService.activeAccount$.pipe(getOptionalUserId),
+      );
+
+      if (activeUserId) {
+        const loginSecurityTaskInfo = await this.getSecurityTaskAndCipherForLoginData(
+          modifyLoginData,
+          activeUserId,
+        );
+
+        if (loginSecurityTaskInfo) {
+          await this.notificationBackground.triggerAtRiskPasswordNotification(
+            {
+              command: "bgTriggerAtRiskPasswordNotification",
+              data: {
+                activeUserId,
+                cipher: loginSecurityTaskInfo.cipher,
+                securityTask: loginSecurityTaskInfo.securityTask,
+              },
+            },
+            { tab },
+          );
+        } else {
+          result = "Unqualified atRiskPassword notification attempt.";
+        }
+      }
+    }
+    this.clearCompletedWebRequest(requestId, tab);
+    return result;
   };
 
   /**
@@ -443,7 +496,7 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
    *
    * @param modifyLoginData - The modified login form data
    */
-  private shouldTriggerChangePasswordNotification = (
+  private shouldAttemptChangedPasswordNotification = (
     modifyLoginData: ModifyLoginCipherFormData,
   ) => {
     return modifyLoginData?.newPassword && !modifyLoginData.username;
@@ -454,10 +507,66 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
    *
    * @param modifyLoginData - The modified login form data
    */
-  private shouldTriggerAddLoginNotification = (modifyLoginData: ModifyLoginCipherFormData) => {
+  private shouldAttemptAddLoginNotification = (modifyLoginData: ModifyLoginCipherFormData) => {
     return modifyLoginData?.username && (modifyLoginData.password || modifyLoginData.newPassword);
   };
 
+  /**
+   * If there is a security task for this cipher at login, return the task, cipher view, and uri.
+   *
+   * @param modifyLoginData - The modified login form data
+   * @param activeUserId - The currently logged in user ID
+   */
+  private async getSecurityTaskAndCipherForLoginData(
+    modifyLoginData: ModifyLoginCipherFormData,
+    activeUserId: UserId,
+  ): Promise<LoginSecurityTaskInfo | null> {
+    const tasks: SecurityTask[] = await this.notificationBackground.getSecurityTasks(activeUserId);
+    if (!tasks?.length) {
+      return null;
+    }
+
+    const urlCiphers: CipherView[] = await this.cipherService.getAllDecryptedForUrl(
+      modifyLoginData.uri,
+      activeUserId,
+    );
+    if (!urlCiphers?.length) {
+      return null;
+    }
+
+    const securityTaskForLogin = urlCiphers.reduce(
+      (taskInfo: LoginSecurityTaskInfo | null, cipher: CipherView) => {
+        if (
+          // exit early if info was found already
+          taskInfo ||
+          // exit early if the cipher was deleted
+          cipher.deletedDate ||
+          // exit early if the entered login info doesn't match an existing cipher
+          modifyLoginData.username !== cipher.login.username ||
+          modifyLoginData.password !== cipher.login.password
+        ) {
+          return taskInfo;
+        }
+
+        // Find the first security task for the cipherId belonging to the entered login
+        const cipherSecurityTask = tasks.find(
+          ({ cipherId, status }) =>
+            cipher.id === cipherId && // match security task cipher id to url cipher id
+            status === SecurityTaskStatus.Pending, // security task has not been completed
+        );
+
+        if (cipherSecurityTask) {
+          return { securityTask: cipherSecurityTask, cipher, uri: modifyLoginData.uri };
+        }
+
+        return taskInfo;
+      },
+      null,
+    );
+
+    return securityTaskForLogin;
+  }
+
   /**
    * Clears the completed web request and removes the modified login form data for the tab.
    *
diff --git a/apps/browser/src/autofill/background/overlay.background.spec.ts b/apps/browser/src/autofill/background/overlay.background.spec.ts
index 0fe4a459048..92b2135c973 100644
--- a/apps/browser/src/autofill/background/overlay.background.spec.ts
+++ b/apps/browser/src/autofill/background/overlay.background.spec.ts
@@ -45,7 +45,7 @@ import {
   AutofillOverlayElement,
   AutofillOverlayPort,
   InlineMenuAccountCreationFieldType,
-  InlineMenuFillType,
+  InlineMenuFillTypes,
   MAX_SUB_FRAME_DEPTH,
   RedirectFocusDirection,
 } from "../enums/autofill-overlay.enum";
@@ -1025,7 +1025,7 @@ describe("OverlayBackground", () => {
         overlayBackground["focusedFieldData"] = createFocusedFieldDataMock({
           tabId: tab.id,
           accountCreationFieldType: "text",
-          inlineMenuFillType: InlineMenuFillType.AccountCreationUsername,
+          inlineMenuFillType: InlineMenuFillTypes.AccountCreationUsername,
         });
         cipherService.getAllDecryptedForUrl.mockResolvedValue([loginCipher1, identityCipher]);
         cipherService.sortCiphersByLastUsedThenName.mockReturnValue(-1);
@@ -1383,7 +1383,7 @@ describe("OverlayBackground", () => {
         {
           command: "updateFocusedFieldData",
           focusedFieldData: createFocusedFieldDataMock({
-            inlineMenuFillType: InlineMenuFillType.CurrentPasswordUpdate,
+            inlineMenuFillType: InlineMenuFillTypes.CurrentPasswordUpdate,
           }),
         },
         mock<chrome.runtime.MessageSender>({ tab }),
@@ -2045,7 +2045,7 @@ describe("OverlayBackground", () => {
         });
 
         it("displays the password generator when the focused field is for password generation", async () => {
-          focusedFieldData.inlineMenuFillType = InlineMenuFillType.PasswordGeneration;
+          focusedFieldData.inlineMenuFillType = InlineMenuFillTypes.PasswordGeneration;
 
           sendMockExtensionMessage({ command: "updateFocusedFieldData", focusedFieldData }, sender);
           await flushPromises();
@@ -2103,7 +2103,7 @@ describe("OverlayBackground", () => {
         });
 
         it("shows the save login menu when the focused field type is for password generation and the field is filled", async () => {
-          focusedFieldData.inlineMenuFillType = InlineMenuFillType.PasswordGeneration;
+          focusedFieldData.inlineMenuFillType = InlineMenuFillTypes.PasswordGeneration;
 
           sendMockExtensionMessage(
             { command: "updateFocusedFieldData", focusedFieldData, focusedFieldHasValue: true },
@@ -3409,7 +3409,7 @@ describe("OverlayBackground", () => {
           {
             command: "updateFocusedFieldData",
             focusedFieldData: createFocusedFieldDataMock({
-              inlineMenuFillType: InlineMenuFillType.CurrentPasswordUpdate,
+              inlineMenuFillType: InlineMenuFillTypes.CurrentPasswordUpdate,
             }),
           },
           sender,
@@ -3607,7 +3607,7 @@ describe("OverlayBackground", () => {
 
     describe("fillGeneratedPassword", () => {
       const focusedFieldData = createFocusedFieldDataMock({
-        inlineMenuFillType: InlineMenuFillType.PasswordGeneration,
+        inlineMenuFillType: InlineMenuFillTypes.PasswordGeneration,
       });
 
       beforeEach(() => {
diff --git a/apps/browser/src/autofill/background/overlay.background.ts b/apps/browser/src/autofill/background/overlay.background.ts
index ab5dd4abb8f..1f249454393 100644
--- a/apps/browser/src/autofill/background/overlay.background.ts
+++ b/apps/browser/src/autofill/background/overlay.background.ts
@@ -49,8 +49,12 @@ import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window";
 import { BrowserApi } from "../../platform/browser/browser-api";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import {
   openAddEditVaultItemPopout,
   openViewVaultItemPopout,
@@ -459,7 +463,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
       const cipherView = cipherViews[cipherIndex];
       if (
         !this.cardAndIdentityCiphers.has(cipherView) &&
-        [CipherType.Card, CipherType.Identity].includes(cipherView.type)
+        ([CipherType.Card, CipherType.Identity] as CipherType[]).includes(cipherView.type)
       ) {
         this.cardAndIdentityCiphers.add(cipherView);
       }
@@ -797,7 +801,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
    * @param focusedFieldData - Optional focused field data to validate against
    */
   private focusedFieldMatchesFillType(
-    fillType: InlineMenuFillTypes,
+    fillType: InlineMenuFillType,
     focusedFieldData?: FocusedFieldData,
   ) {
     const focusedFieldFillType = focusedFieldData
@@ -806,7 +810,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
 
     // When updating the current password for a field, it should fill with a login cipher
     if (
-      focusedFieldFillType === InlineMenuFillType.CurrentPasswordUpdate &&
+      focusedFieldFillType === InlineMenuFillTypes.CurrentPasswordUpdate &&
       fillType === CipherType.Login
     ) {
       return true;
@@ -819,7 +823,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
    * Identifies whether the inline menu is being shown on an account creation field.
    */
   private shouldShowInlineMenuAccountCreation(): boolean {
-    if (this.focusedFieldMatchesFillType(InlineMenuFillType.AccountCreationUsername)) {
+    if (this.focusedFieldMatchesFillType(InlineMenuFillTypes.AccountCreationUsername)) {
       return true;
     }
 
@@ -1152,7 +1156,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
     }
 
     let pageDetails = Array.from(pageDetailsForTab.values());
-    if (this.focusedFieldMatchesFillType(InlineMenuFillType.CurrentPasswordUpdate)) {
+    if (this.focusedFieldMatchesFillType(InlineMenuFillTypes.CurrentPasswordUpdate)) {
       pageDetails = this.getFilteredPageDetails(
         pageDetails,
         this.inlineMenuFieldQualificationService.isUpdateCurrentPasswordField,
@@ -1705,7 +1709,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
   private shouldUpdatePasswordGeneratorMenuOnFieldFocus() {
     return (
       this.isInlineMenuButtonVisible &&
-      this.focusedFieldMatchesFillType(InlineMenuFillType.PasswordGeneration)
+      this.focusedFieldMatchesFillType(InlineMenuFillTypes.PasswordGeneration)
     );
   }
 
@@ -1767,9 +1771,9 @@ export class OverlayBackground implements OverlayBackgroundInterface {
   private shouldUpdateAccountCreationMenuOnFieldFocus(previousFocusedFieldData: FocusedFieldData) {
     const accountCreationFieldBlurred =
       this.focusedFieldMatchesFillType(
-        InlineMenuFillType.AccountCreationUsername,
+        InlineMenuFillTypes.AccountCreationUsername,
         previousFocusedFieldData,
-      ) && !this.focusedFieldMatchesFillType(InlineMenuFillType.AccountCreationUsername);
+      ) && !this.focusedFieldMatchesFillType(InlineMenuFillTypes.AccountCreationUsername);
     return accountCreationFieldBlurred || this.shouldShowInlineMenuAccountCreation();
   }
 
@@ -1876,7 +1880,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
 
     return (
       (this.shouldShowInlineMenuAccountCreation() ||
-        this.focusedFieldMatchesFillType(InlineMenuFillType.PasswordGeneration)) &&
+        this.focusedFieldMatchesFillType(InlineMenuFillTypes.PasswordGeneration)) &&
       !!(loginData.password || loginData.newPassword)
     );
   }
@@ -3036,7 +3040,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
     }
 
     const focusFieldShouldShowPasswordGenerator =
-      this.focusedFieldMatchesFillType(InlineMenuFillType.PasswordGeneration) ||
+      this.focusedFieldMatchesFillType(InlineMenuFillTypes.PasswordGeneration) ||
       (showInlineMenuAccountCreation &&
         this.focusedFieldMatchesAccountCreationType(InlineMenuAccountCreationFieldType.Password));
     if (!focusFieldShouldShowPasswordGenerator) {
diff --git a/apps/browser/src/autofill/background/tabs.background.spec.ts b/apps/browser/src/autofill/background/tabs.background.spec.ts
index 4473eb452f3..635ab8504a1 100644
--- a/apps/browser/src/autofill/background/tabs.background.spec.ts
+++ b/apps/browser/src/autofill/background/tabs.background.spec.ts
@@ -73,7 +73,6 @@ describe("TabsBackground", () => {
         triggerWindowOnFocusedChangedEvent(10);
         await flushPromises();
 
-        expect(mainBackground.refreshBadge).toHaveBeenCalled();
         expect(mainBackground.refreshMenu).toHaveBeenCalled();
         expect(overlayBackground.updateOverlayCiphers).toHaveBeenCalled();
       });
@@ -91,7 +90,6 @@ describe("TabsBackground", () => {
         triggerTabOnActivatedEvent({ tabId: 10, windowId: 20 });
         await flushPromises();
 
-        expect(mainBackground.refreshBadge).toHaveBeenCalled();
         expect(mainBackground.refreshMenu).toHaveBeenCalled();
         expect(overlayBackground.updateOverlayCiphers).toHaveBeenCalled();
       });
@@ -127,7 +125,6 @@ describe("TabsBackground", () => {
         triggerTabOnReplacedEvent(10, 20);
         await flushPromises();
 
-        expect(mainBackground.refreshBadge).toHaveBeenCalled();
         expect(mainBackground.refreshMenu).toHaveBeenCalled();
         expect(overlayBackground.updateOverlayCiphers).toHaveBeenCalled();
       });
@@ -160,7 +157,6 @@ describe("TabsBackground", () => {
         triggerTabOnUpdatedEvent(focusedWindowId, { status: "loading" }, tab);
         await flushPromises();
 
-        expect(mainBackground.refreshBadge).not.toHaveBeenCalled();
         expect(mainBackground.refreshMenu).not.toHaveBeenCalled();
         expect(overlayBackground.updateOverlayCiphers).not.toHaveBeenCalled();
       });
@@ -170,7 +166,6 @@ describe("TabsBackground", () => {
         triggerTabOnUpdatedEvent(focusedWindowId, { status: "loading" }, tab);
         await flushPromises();
 
-        expect(mainBackground.refreshBadge).not.toHaveBeenCalled();
         expect(mainBackground.refreshMenu).not.toHaveBeenCalled();
         expect(overlayBackground.updateOverlayCiphers).not.toHaveBeenCalled();
       });
@@ -180,7 +175,6 @@ describe("TabsBackground", () => {
         triggerTabOnUpdatedEvent(focusedWindowId, { status: "loading" }, tab);
         await flushPromises();
 
-        expect(mainBackground.refreshBadge).not.toHaveBeenCalled();
         expect(mainBackground.refreshMenu).not.toHaveBeenCalled();
         expect(overlayBackground.updateOverlayCiphers).not.toHaveBeenCalled();
       });
@@ -190,7 +184,6 @@ describe("TabsBackground", () => {
         triggerTabOnUpdatedEvent(focusedWindowId, { status: "loading" }, tab);
         await flushPromises();
 
-        expect(mainBackground.refreshBadge).not.toHaveBeenCalled();
         expect(mainBackground.refreshMenu).not.toHaveBeenCalled();
       });
 
@@ -205,7 +198,6 @@ describe("TabsBackground", () => {
         triggerTabOnUpdatedEvent(focusedWindowId, { status: "loading" }, tab);
         await flushPromises();
 
-        expect(mainBackground.refreshBadge).toHaveBeenCalled();
         expect(mainBackground.refreshMenu).toHaveBeenCalled();
         expect(overlayBackground.updateOverlayCiphers).toHaveBeenCalled();
       });
diff --git a/apps/browser/src/autofill/background/tabs.background.ts b/apps/browser/src/autofill/background/tabs.background.ts
index c093f1a3b00..4d520680980 100644
--- a/apps/browser/src/autofill/background/tabs.background.ts
+++ b/apps/browser/src/autofill/background/tabs.background.ts
@@ -102,7 +102,6 @@ export default class TabsBackground {
     this.main.onUpdatedRan = true;
 
     await this.notificationBackground.checkNotificationQueue(tab);
-    await this.main.refreshBadge();
     await this.main.refreshMenu();
     this.main.messagingService.send("tabChanged");
   };
@@ -122,7 +121,6 @@ export default class TabsBackground {
    */
   private updateCurrentTabData = async () => {
     await Promise.all([
-      this.main.refreshBadge(),
       this.main.refreshMenu(),
       this.overlayBackground.updateOverlayCiphers(false),
     ]);
diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
index e2bf75350a2..b1d65fdea92 100644
--- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
@@ -97,7 +97,9 @@ export class CipherContextMenuHandler {
   private async updateForCipher(cipher: CipherView) {
     if (
       cipher == null ||
-      !new Set([CipherType.Login, CipherType.Card, CipherType.Identity]).has(cipher.type)
+      !new Set([CipherType.Login, CipherType.Card, CipherType.Identity] as CipherType[]).has(
+        cipher.type,
+      )
     ) {
       return;
     }
diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
index 2fb435a4c67..c33cb6a4371 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
@@ -30,8 +30,12 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window";
 import { BrowserApi } from "../../platform/browser/browser-api";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import {
   openAddEditVaultItemPopout,
   openVaultItemPasswordRepromptPopout,
diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
index 267a832a671..901d6595fc8 100644
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
@@ -1,5 +1,5 @@
 import { mock, MockProxy } from "jest-mock-extended";
-import { of } from "rxjs";
+import { BehaviorSubject, of } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import {
@@ -22,6 +22,10 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import {
+  RestrictedCipherType,
+  RestrictedItemTypesService,
+} from "@bitwarden/common/vault/services/restricted-item-types.service";
 
 import { MainContextMenuHandler } from "./main-context-menu-handler";
 
@@ -69,6 +73,8 @@ describe("context-menu", () => {
   let logService: MockProxy<LogService>;
   let billingAccountProfileStateService: MockProxy<BillingAccountProfileStateService>;
   let accountService: MockProxy<AccountService>;
+  let restricted$: BehaviorSubject<RestrictedCipherType[]>;
+  let restrictedItemTypesService: RestrictedItemTypesService;
 
   let removeAllSpy: jest.SpyInstance<void, [callback?: () => void]>;
   let createSpy: jest.SpyInstance<
@@ -85,6 +91,10 @@ describe("context-menu", () => {
     logService = mock();
     billingAccountProfileStateService = mock();
     accountService = mock();
+    restricted$ = new BehaviorSubject<RestrictedCipherType[]>([]);
+    restrictedItemTypesService = {
+      restricted$,
+    } as Partial<RestrictedItemTypesService> as RestrictedItemTypesService;
 
     removeAllSpy = jest
       .spyOn(chrome.contextMenus, "removeAll")
@@ -105,6 +115,7 @@ describe("context-menu", () => {
       logService,
       billingAccountProfileStateService,
       accountService,
+      restrictedItemTypesService,
     );
 
     jest.spyOn(MainContextMenuHandler, "remove");
@@ -147,6 +158,24 @@ describe("context-menu", () => {
       expect(createdMenu).toBeTruthy();
       expect(createSpy).toHaveBeenCalledTimes(11);
     });
+
+    it("has menu enabled and has premium, but card type is restricted", async () => {
+      billingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(true));
+
+      restricted$.next([{ cipherType: CipherType.Card, allowViewOrgIds: [] }]);
+
+      const createdMenu = await sut.init();
+      expect(createdMenu).toBeTruthy();
+      expect(createSpy).toHaveBeenCalledTimes(10);
+    });
+    it("has menu enabled, does not have premium, and card type is restricted", async () => {
+      billingAccountProfileStateService.hasPremiumFromAnySource$.mockReturnValue(of(false));
+      restricted$.next([{ cipherType: CipherType.Card, allowViewOrgIds: [] }]);
+
+      const createdMenu = await sut.init();
+      expect(createdMenu).toBeTruthy();
+      expect(createSpy).toHaveBeenCalledTimes(9);
+    });
   });
 
   describe("loadOptions", () => {
diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
index ad9dc34e501..abfa2465c51 100644
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
@@ -25,8 +25,9 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 
 import { InitContextMenuItems } from "./abstractions/main-context-menu-handler";
 
@@ -157,6 +158,7 @@ export class MainContextMenuHandler {
     private logService: LogService,
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private accountService: AccountService,
+    private restrictedItemTypesService: RestrictedItemTypesService,
   ) {}
 
   /**
@@ -181,6 +183,10 @@ export class MainContextMenuHandler {
         this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
       );
 
+      const isCardRestricted = (
+        await firstValueFrom(this.restrictedItemTypesService.restricted$)
+      ).some((rt) => rt.cipherType === CipherType.Card);
+
       for (const menuItem of this.initContextMenuItems) {
         const {
           requiresPremiumAccess,
@@ -192,6 +198,9 @@ export class MainContextMenuHandler {
         if (requiresPremiumAccess && !hasPremium) {
           continue;
         }
+        if (menuItem.id.startsWith(AUTOFILL_CARD_ID) && isCardRestricted) {
+          continue;
+        }
 
         await MainContextMenuHandler.create({ ...otherOptions, contexts: ["all"] });
       }
diff --git a/apps/browser/src/autofill/content/abstractions/content-message-handler.ts b/apps/browser/src/autofill/content/abstractions/content-message-handler.ts
index 8231bd688c9..f413ace9432 100644
--- a/apps/browser/src/autofill/content/abstractions/content-message-handler.ts
+++ b/apps/browser/src/autofill/content/abstractions/content-message-handler.ts
@@ -1,3 +1,5 @@
+import { ExtensionPageUrls } from "@bitwarden/common/vault/enums";
+
 type ContentMessageWindowData = {
   command: string;
   lastpass?: boolean;
@@ -5,6 +7,7 @@ type ContentMessageWindowData = {
   state?: string;
   data?: string;
   remember?: boolean;
+  url?: ExtensionPageUrls;
 };
 type ContentMessageWindowEventParams = {
   data: ContentMessageWindowData;
diff --git a/apps/browser/src/autofill/content/components/buttons/action-button.ts b/apps/browser/src/autofill/content/components/buttons/action-button.ts
index 8d8bfacec77..339b628875c 100644
--- a/apps/browser/src/autofill/content/components/buttons/action-button.ts
+++ b/apps/browser/src/autofill/content/components/buttons/action-button.ts
@@ -4,52 +4,70 @@ import { html, TemplateResult } from "lit";
 import { Theme } from "@bitwarden/common/platform/enums";
 
 import { border, themes, typography, spacing } from "../constants/styles";
+import { Spinner } from "../icons";
 
 export type ActionButtonProps = {
   buttonText: string | TemplateResult;
   disabled?: boolean;
+  isLoading?: boolean;
   theme: Theme;
   handleClick: (e: Event) => void;
+  fullWidth?: boolean;
 };
 
 export function ActionButton({
   buttonText,
   disabled = false,
+  isLoading = false,
   theme,
   handleClick,
+  fullWidth = true,
 }: ActionButtonProps) {
   const handleButtonClick = (event: Event) => {
-    if (!disabled) {
+    if (!disabled && !isLoading) {
       handleClick(event);
     }
   };
 
   return html`
     <button
-      class=${actionButtonStyles({ disabled, theme })}
+      class=${actionButtonStyles({ disabled, fullWidth, isLoading, theme })}
       title=${buttonText}
       type="button"
       @click=${handleButtonClick}
     >
-      ${buttonText}
+      ${isLoading ? Spinner({ theme, color: themes[theme].text.muted }) : buttonText}
     </button>
   `;
 }
 
-const actionButtonStyles = ({ disabled, theme }: { disabled: boolean; theme: Theme }) => css`
+const actionButtonStyles = ({
+  disabled,
+  fullWidth,
+  isLoading,
+  theme,
+}: {
+  disabled: boolean;
+  fullWidth: boolean;
+  isLoading: boolean;
+  theme: Theme;
+}) => css`
   ${typography.body2}
 
   user-select: none;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   border: 1px solid transparent;
   border-radius: ${border.radius.full};
   padding: ${spacing["1"]} ${spacing["3"]};
-  width: 100%;
+  width: ${fullWidth ? "100%" : "auto"};
   overflow: hidden;
   text-align: center;
   text-overflow: ellipsis;
   font-weight: 700;
 
-  ${disabled
+  ${disabled || isLoading
     ? `
     background-color: ${themes[theme].secondary["300"]};
     color: ${themes[theme].text.muted};
@@ -71,7 +89,8 @@ const actionButtonStyles = ({ disabled, theme }: { disabled: boolean; theme: The
   `}
 
   svg {
-    width: fit-content;
+    padding: 2px 0; /* Match line-height of button body2 typography */
+    width: auto;
     height: 16px;
   }
 `;
diff --git a/apps/browser/src/autofill/content/components/buttons/additional-tasks/button-content.ts b/apps/browser/src/autofill/content/components/buttons/additional-tasks/button-content.ts
new file mode 100644
index 00000000000..2357da4e785
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/buttons/additional-tasks/button-content.ts
@@ -0,0 +1,29 @@
+import { css } from "@emotion/css";
+import { html } from "lit";
+
+import { Theme } from "@bitwarden/common/platform/enums";
+
+import { spacing, themes } from "../../constants/styles";
+import { ExternalLink } from "../../icons";
+
+export function AdditionalTasksButtonContent({
+  buttonText,
+  theme,
+}: {
+  buttonText: string;
+  theme: Theme;
+}) {
+  return html`
+    <div class=${additionalTasksButtonContentStyles({ theme })}>
+      <span>${buttonText}</span>
+      ${ExternalLink({ theme, color: themes[theme].text.contrast })}
+    </div>
+  `;
+}
+
+export const additionalTasksButtonContentStyles = ({ theme }: { theme: Theme }) => css`
+  gap: ${spacing[2]};
+  display: flex;
+  align-items: center;
+  white-space: nowrap;
+`;
diff --git a/apps/browser/src/autofill/content/components/constants/styles.ts b/apps/browser/src/autofill/content/components/constants/styles.ts
index 08c8671ce14..55130781808 100644
--- a/apps/browser/src/autofill/content/components/constants/styles.ts
+++ b/apps/browser/src/autofill/content/components/constants/styles.ts
@@ -174,6 +174,17 @@ export const buildIconColorRule = (color: string, rule: RuleName = ruleNames.fil
   ${rule}: ${color};
 `;
 
+export const animations = {
+  spin: `
+    0% {
+      transform: rotate(0deg);
+    }
+    100% {
+      transform: rotate(359deg);
+    }
+  `,
+};
+
 export function scrollbarStyles(theme: Theme, color?: { thumb?: string; track?: string }) {
   const thumbColor = color?.thumb || themes[theme].secondary["500"];
   const trackColor = color?.track || themes[theme].background.alt;
diff --git a/apps/browser/src/autofill/content/components/icons/index.ts b/apps/browser/src/autofill/content/components/icons/index.ts
index 65ec6301ac4..d1538e1543f 100644
--- a/apps/browser/src/autofill/content/components/icons/index.ts
+++ b/apps/browser/src/autofill/content/components/icons/index.ts
@@ -11,4 +11,5 @@ export { Folder } from "./folder";
 export { Globe } from "./globe";
 export { PencilSquare } from "./pencil-square";
 export { Shield } from "./shield";
+export { Spinner } from "./spinner";
 export { User } from "./user";
diff --git a/apps/browser/src/autofill/content/components/icons/spinner.ts b/apps/browser/src/autofill/content/components/icons/spinner.ts
new file mode 100644
index 00000000000..20f53a43d44
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/icons/spinner.ts
@@ -0,0 +1,34 @@
+import { css, keyframes } from "@emotion/css";
+import { html } from "lit";
+
+import { IconProps } from "../common-types";
+import { buildIconColorRule, ruleNames, themes, animations } from "../constants/styles";
+
+export function Spinner({
+  ariaHidden = true,
+  color,
+  disabled,
+  theme,
+  disableSpin = false,
+}: IconProps & { disableSpin?: boolean }) {
+  const shapeColor = disabled ? themes[theme].secondary["300"] : color || themes[theme].text.main;
+
+  return html`
+    <svg
+      class=${disableSpin ? "" : animation}
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 16 16"
+      fill="none"
+      aria-hidden="${ariaHidden}"
+    >
+      <path
+        class=${css(buildIconColorRule(shapeColor, ruleNames.fill))}
+        d="M9.5 1.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0ZM14.5 9.5a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3ZM11.536 11.536a1.5 1.5 0 1 1 2.12 2.12 1.5 1.5 0 0 1-2.12-2.12ZM9.5 14.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0ZM0 8a1.5 1.5 0 1 0 3 0 1.5 1.5 0 0 0-3 0ZM4.464 13.657a1.5 1.5 0 1 1-2.12-2.121 1.5 1.5 0 0 1 2.12 2.12ZM2.343 2.343a1.5 1.5 0 1 1 2.121 2.121 1.5 1.5 0 0 1-2.12-2.12Z"
+      />
+    </svg>
+  `;
+}
+
+const animation = css`
+  animation: ${keyframes(animations.spin)} 2s infinite linear;
+`;
diff --git a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/action-button.mdx b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/action-button.mdx
index d3c1968b32f..73cd6fb93a9 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/action-button.mdx
+++ b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/action-button.mdx
@@ -20,7 +20,7 @@ It is designed with accessibility and responsive design in mind.
 | `buttonAction` | `(e: Event) => void`       | Yes          | The function to execute when the button is clicked.         |
 | `buttonText`   | `string`                   | Yes          | The text to display on the button.                          |
 | `disabled`     | `boolean` (default: false) | No           | Disables the button when set to `true`.                     |
-| `theme`        | `Theme`                    | Yes          | The theme to style the button. Must match the `Theme` enum. |
+| `theme`        | `Theme`                    | Yes          | The theme to style the button. Must match the `Theme` type. |
 
 ## Installation and Setup
 
diff --git a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/badge-button.mdx b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/badge-button.mdx
index e0740ced760..47d82ad68da 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/badge-button.mdx
+++ b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/badge-button.mdx
@@ -20,7 +20,7 @@ handling, and a disabled state. The component is optimized for accessibility and
 | `buttonAction` | `(e: Event) => void`       | Yes          | The function to execute when the button is clicked.         |
 | `buttonText`   | `string`                   | Yes          | The text to display on the badge button.                    |
 | `disabled`     | `boolean` (default: false) | No           | Disables the button when set to `true`.                     |
-| `theme`        | `Theme`                    | Yes          | The theme to style the button. Must match the `Theme` enum. |
+| `theme`        | `Theme`                    | Yes          | The theme to style the button. Must match the `Theme` type. |
 
 ## Installation and Setup
 
diff --git a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/body.mdx b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/body.mdx
index 3a6a955e286..a298594e17f 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/body.mdx
+++ b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/body.mdx
@@ -19,7 +19,7 @@ presenting actionable information.
 | ------------------ | ------------------ | ------------ | --------------------------------------------------------------------------------------------------------- |
 | `ciphers`          | `CipherData[]`     | Yes          | An array of cipher data objects. Each cipher includes metadata such as ID, name, type, and login details. |
 | `notificationType` | `NotificationType` | Yes          | Specifies the type of notification, such as `add`, `change`, `unlock`, or `fileless-import`.              |
-| `theme`            | `Theme`            | Yes          | Defines the theme used for styling the notification. Must match the `Theme` enum.                         |
+| `theme`            | `Theme`            | Yes          | Defines the theme used for styling the notification. Must match the `Theme` type.                         |
 
 ---
 
diff --git a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/close-button.mdx b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/close-button.mdx
index dcdd38710ba..da9c15246fd 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/close-button.mdx
+++ b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/close-button.mdx
@@ -17,7 +17,7 @@ a close icon for visual clarity. The component is designed to be intuitive and a
 | **Prop**                  | **Type**             | **Required** | **Description**                                             |
 | ------------------------- | -------------------- | ------------ | ----------------------------------------------------------- |
 | `handleCloseNotification` | `(e: Event) => void` | Yes          | The function to execute when the button is clicked.         |
-| `theme`                   | `Theme`              | Yes          | The theme to style the button. Must match the `Theme` enum. |
+| `theme`                   | `Theme`              | Yes          | The theme to style the button. Must match the `Theme` type. |
 
 ## Installation and Setup
 
diff --git a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/edit-button.mdx b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/edit-button.mdx
index 0f38df18912..c6c4262806b 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/edit-button.mdx
+++ b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/edit-button.mdx
@@ -20,7 +20,7 @@ or settings where inline editing is required.
 | `buttonAction` | `(e: Event) => void`       | Yes          | The function to execute when the button is clicked.         |
 | `buttonText`   | `string`                   | Yes          | The text displayed as the button's tooltip.                 |
 | `disabled`     | `boolean` (default: false) | No           | Disables the button when set to `true`.                     |
-| `theme`        | `Theme`                    | Yes          | The theme to style the button. Must match the `Theme` enum. |
+| `theme`        | `Theme`                    | Yes          | The theme to style the button. Must match the `Theme` type. |
 
 ## Installation and Setup
 
diff --git a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/footer.mdx b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/footer.mdx
index baaad4d8151..6a816f811e0 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/footer.mdx
+++ b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/footer.mdx
@@ -17,7 +17,7 @@ customization based on the `theme` and `notificationType`.
 | **Prop**           | **Type**           | **Required** | **Description**                                                                                    |
 | ------------------ | ------------------ | ------------ | -------------------------------------------------------------------------------------------------- |
 | `notificationType` | `NotificationType` | Yes          | The type of notification footer to display. Options: `add`, `change`, `unlock`, `fileless-import`. |
-| `theme`            | `Theme`            | Yes          | Defines the theme of the notification footer. Must match the `Theme` enum.                         |
+| `theme`            | `Theme`            | Yes          | Defines the theme of the notification footer. Must match the `Theme` type.                         |
 
 ---
 
diff --git a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/header.mdx b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/header.mdx
index fd03fd2f950..ebe35a3dd9b 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/header.mdx
+++ b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/header.mdx
@@ -19,7 +19,7 @@ and an optional close button. This component is versatile and can be styled dyna
 | ------------------------- | -------------------- | ------------ | ------------------------------------------------------------------- |
 | `message`                 | `string`             | Yes          | The text message to be displayed in the notification.               |
 | `standalone`              | `boolean`            | No           | Determines if the notification is displayed independently.          |
-| `theme`                   | `Theme`              | Yes          | Defines the theme of the notification. Must match the `Theme` enum. |
+| `theme`                   | `Theme`              | Yes          | Defines the theme of the notification. Must match the `Theme` type. |
 | `handleCloseNotification` | `(e: Event) => void` | No           | A callback function triggered when the close button is clicked.     |
 
 ---
diff --git a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/icons.mdx b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/icons.mdx
index 571ed10285a..7ec18d0f7bb 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/icons.mdx
+++ b/apps/browser/src/autofill/content/components/lit-stories/.lit-docs/icons.mdx
@@ -28,7 +28,7 @@ like size, color, and theme. Each story is an example of how a specific icon can
 | `iconLink` | `URL`     | No           | Defines an external URL associated with the icon, prop exclusive to `Brand Icon`. |
 | `color`    | `string`  | No           | Sets the color of the icon.                                                       |
 | `disabled` | `boolean` | No           | Disables the icon visually and functionally.                                      |
-| `theme`    | `Theme`   | Yes          | Defines the theme used to style the icons. Must match the `Theme` enum.           |
+| `theme`    | `Theme`   | Yes          | Defines the theme used to style the icons. Must match the `Theme` type.           |
 | `size`     | `number`  | Yes          | Sets the width and height of the icon in pixels.                                  |
 
 ---
diff --git a/apps/browser/src/autofill/content/components/lit-stories/buttons/action-button.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/buttons/action-button.lit-stories.ts
index 77769bc67dc..dc630e537b0 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/buttons/action-button.lit-stories.ts
+++ b/apps/browser/src/autofill/content/components/lit-stories/buttons/action-button.lit-stories.ts
@@ -1,9 +1,12 @@
 import { Meta, StoryObj } from "@storybook/web-components";
+import { html } from "lit";
 
 import { ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
 import { ActionButton, ActionButtonProps } from "../../buttons/action-button";
 
+type ComponentAndControls = ActionButtonProps & { width: number };
+
 export default {
   title: "Components/Buttons/Action Button",
   argTypes: {
@@ -11,12 +14,15 @@ export default {
     disabled: { control: "boolean" },
     theme: { control: "select", options: [...Object.values(ThemeTypes)] },
     handleClick: { control: false },
+    width: { control: "number", min: 10, max: 100, step: 1 },
   },
   args: {
     buttonText: "Click Me",
     disabled: false,
+    isLoading: false,
     theme: ThemeTypes.Light,
     handleClick: () => alert("Clicked"),
+    width: 150,
   },
   parameters: {
     design: {
@@ -24,10 +30,18 @@ export default {
       url: "https://www.figma.com/design/LEhqLAcBPY8uDKRfU99n9W/Autofill-notification-redesign?node-id=487-14755&t=2O7uCAkwRZCcjumm-4",
     },
   },
-} as Meta<ActionButtonProps>;
+} as Meta<ComponentAndControls>;
 
-const Template = (args: ActionButtonProps) => ActionButton({ ...args });
+const Template = (args: ComponentAndControls) => {
+  const { width, ...componentProps } = args;
+  return html`<div style="width: ${width}px;">${ActionButton({ ...componentProps })}</div>`;
+};
+
+export const Default: StoryObj<ComponentAndControls> = {
+  args: {
+    isLoading: true,
+    theme: "dark",
+  },
 
-export const Default: StoryObj<ActionButtonProps> = {
   render: Template,
 };
diff --git a/apps/browser/src/autofill/content/components/lit-stories/icons/icons.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/icons/icons.lit-stories.ts
index 3741ccbcb69..4e18008b94a 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/icons/icons.lit-stories.ts
+++ b/apps/browser/src/autofill/content/components/lit-stories/icons/icons.lit-stories.ts
@@ -6,9 +6,10 @@ import { ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 import { IconProps } from "../../common-types";
 import * as Icons from "../../icons";
 
+const { Spinner, ...StaticIcons } = Icons;
+
 type Args = IconProps & {
   size: number;
-  iconLink: URL;
 };
 
 export default {
@@ -26,7 +27,10 @@ export default {
   },
 } as Meta<Args>;
 
-const Template = (args: Args, IconComponent: (props: IconProps) => ReturnType<typeof html>) => html`
+const Template = (
+  args: Args,
+  IconComponent: (props: IconProps & { disableSpin?: boolean }) => ReturnType<typeof html>,
+) => html`
   <div
     style="width: ${args.size}px; height: ${args.size}px; display: flex; align-items: center; justify-content: center;"
   >
@@ -34,18 +38,26 @@ const Template = (args: Args, IconComponent: (props: IconProps) => ReturnType<ty
   </div>
 `;
 
-const createIconStory = (iconName: keyof typeof Icons): StoryObj<Args> => {
+const createIconStory = (
+  iconName: keyof typeof StaticIcons,
+): StoryObj<Args & { disableSpin?: boolean }> => {
   const story = {
-    render: (args) => Template(args, Icons[iconName]),
+    render: (args) => Template(args, StaticIcons[iconName]),
   } as StoryObj<Args>;
 
-  story.argTypes = {
-    iconLink: { table: { disable: true } },
-  };
-
   return story;
 };
 
+const SpinnerIconStory: StoryObj<Args & { disableSpin: boolean }> = {
+  render: (args) => Template(args, Spinner),
+  argTypes: {
+    disableSpin: { control: "boolean" },
+  },
+  args: {
+    disableSpin: false,
+  },
+};
+
 export const AngleDownIcon = createIconStory("AngleDown");
 export const AngleUpIcon = createIconStory("AngleUp");
 export const BusinessIcon = createIconStory("Business");
@@ -58,4 +70,5 @@ export const FolderIcon = createIconStory("Folder");
 export const GlobeIcon = createIconStory("Globe");
 export const PencilSquareIcon = createIconStory("PencilSquare");
 export const ShieldIcon = createIconStory("Shield");
+export const SpinnerIcon = SpinnerIconStory;
 export const UserIcon = createIconStory("User");
diff --git a/apps/browser/src/autofill/content/components/lit-stories/mock-data.ts b/apps/browser/src/autofill/content/components/lit-stories/mock-data.ts
index 81cdf5a50f3..3451029a01a 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/mock-data.ts
+++ b/apps/browser/src/autofill/content/components/lit-stories/mock-data.ts
@@ -103,6 +103,12 @@ export const mockTasks = [
 
 export const mockI18n = {
   appName: "Bitwarden",
+  atRiskPassword: "At-risk password",
+  atRiskNavigatePrompt:
+    "$ORGANIZATION$ wants you to change this password because it is at-risk. Navigate to your account settings to change the password.",
+  atRiskChangePrompt:
+    "Your password for this site is at-risk. $ORGANIZATION$ has requested that you change it.",
+  changePassword: "Change password",
   close: "Close",
   collection: "Collection",
   folder: "Folder",
diff --git a/apps/browser/src/autofill/content/components/lit-stories/notification/at-risk-notification/container.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/notification/at-risk-notification/container.lit-stories.ts
new file mode 100644
index 00000000000..3d1fcf339e8
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/notification/at-risk-notification/container.lit-stories.ts
@@ -0,0 +1,44 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+
+import { ThemeTypes } from "@bitwarden/common/platform/enums";
+
+import {
+  AtRiskNotification,
+  AtRiskNotificationProps,
+} from "../../../notification/at-risk-password/container";
+import { mockI18n, mockBrowserI18nGetMessage } from "../../mock-data";
+
+export default {
+  title: "Components/Notifications/At-Risk Notification",
+  argTypes: {
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+  },
+  args: {
+    theme: ThemeTypes.Light,
+    handleCloseNotification: () => alert("Close notification action triggered"),
+    params: {
+      passwordChangeUri: "https://webtests.dev/.well-known/change-password", // Remove to see "navigate" version of notification
+      organizationName: "Acme Co.",
+    },
+    i18n: mockI18n,
+  },
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/LEhqLAcBPY8uDKRfU99n9W/Autofill-notification-redesign?node-id=485-20160&m=dev",
+    },
+  },
+} as Meta<AtRiskNotificationProps>;
+
+const Template = (args: AtRiskNotificationProps) => AtRiskNotification({ ...args });
+
+export const Default: StoryObj<AtRiskNotificationProps> = {
+  render: Template,
+};
+
+window.chrome = {
+  ...window.chrome,
+  i18n: {
+    getMessage: mockBrowserI18nGetMessage,
+  },
+} as typeof chrome;
diff --git a/apps/browser/src/autofill/content/components/notification/at-risk-password/body.ts b/apps/browser/src/autofill/content/components/notification/at-risk-password/body.ts
new file mode 100644
index 00000000000..3cc08a26210
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/notification/at-risk-password/body.ts
@@ -0,0 +1,49 @@
+import createEmotion from "@emotion/css/create-instance";
+import { html, nothing } from "lit";
+
+import { Theme } from "@bitwarden/common/platform/enums";
+
+import { spacing, themes } from "../../constants/styles";
+import { Warning } from "../../illustrations";
+
+import { AtRiskNotificationMessage } from "./message";
+
+export const componentClassPrefix = "at-risk-notification-body";
+
+const { css } = createEmotion({
+  key: componentClassPrefix,
+});
+
+export type AtRiskNotificationBodyProps = {
+  riskMessage: string;
+  theme: Theme;
+};
+
+export function AtRiskNotificationBody({ riskMessage, theme }: AtRiskNotificationBodyProps) {
+  return html`
+    <div class=${atRiskNotificationBodyStyles({ theme })}>
+      <div class=${iconContainerStyles}>${Warning()}</div>
+      ${riskMessage
+        ? AtRiskNotificationMessage({
+            message: riskMessage,
+            theme,
+          })
+        : nothing}
+    </div>
+  `;
+}
+
+const iconContainerStyles = css`
+  > svg {
+    width: 50px;
+    height: auto;
+  }
+`;
+const atRiskNotificationBodyStyles = ({ theme }: { theme: Theme }) => css`
+  gap: ${spacing[4]};
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  background-color: ${themes[theme].background.alt};
+  padding: 12px;
+`;
diff --git a/apps/browser/src/autofill/content/components/notification/at-risk-password/container.ts b/apps/browser/src/autofill/content/components/notification/at-risk-password/container.ts
new file mode 100644
index 00000000000..90da0833fd9
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/notification/at-risk-password/container.ts
@@ -0,0 +1,72 @@
+import { css } from "@emotion/css";
+import { html, nothing } from "lit";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums";
+
+import { NotificationBarIframeInitData } from "../../../../notification/abstractions/notification-bar";
+import { I18n } from "../../common-types";
+import { themes, spacing } from "../../constants/styles";
+import {
+  NotificationHeader,
+  componentClassPrefix as notificationHeaderClassPrefix,
+} from "../header";
+
+import { AtRiskNotificationBody } from "./body";
+import { AtRiskNotificationFooter } from "./footer";
+
+export type AtRiskNotificationProps = NotificationBarIframeInitData & {
+  handleCloseNotification: (e: Event) => void;
+} & {
+  i18n: I18n;
+};
+
+export function AtRiskNotification({
+  handleCloseNotification,
+  i18n,
+  theme = ThemeTypes.Light,
+  params,
+}: AtRiskNotificationProps) {
+  const { passwordChangeUri, organizationName } = params;
+  const riskMessage = chrome.i18n.getMessage(
+    passwordChangeUri ? "atRiskChangePrompt" : "atRiskNavigatePrompt",
+    organizationName,
+  );
+
+  return html`
+    <div class=${atRiskNotificationContainerStyles(theme)}>
+      ${NotificationHeader({
+        handleCloseNotification,
+        i18n,
+        message: i18n.atRiskPassword,
+        theme,
+      })}
+      ${AtRiskNotificationBody({
+        theme,
+        riskMessage,
+      })}
+      ${passwordChangeUri
+        ? AtRiskNotificationFooter({
+            i18n,
+            theme,
+            passwordChangeUri: params?.passwordChangeUri,
+          })
+        : nothing}
+    </div>
+  `;
+}
+
+const atRiskNotificationContainerStyles = (theme: Theme) => css`
+  position: absolute;
+  right: 20px;
+  border: 1px solid ${themes[theme].secondary["300"]};
+  border-radius: ${spacing["4"]};
+  box-shadow: -2px 4px 6px 0px #0000001a;
+  background-color: ${themes[theme].background.alt};
+  width: 400px;
+  overflow: hidden;
+
+  [class*="${notificationHeaderClassPrefix}-"] {
+    border-radius: ${spacing["4"]} ${spacing["4"]} 0 0;
+    border-bottom: 0.5px solid ${themes[theme].secondary["300"]};
+  }
+`;
diff --git a/apps/browser/src/autofill/content/components/notification/at-risk-password/footer.ts b/apps/browser/src/autofill/content/components/notification/at-risk-password/footer.ts
new file mode 100644
index 00000000000..d7805492fa6
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/notification/at-risk-password/footer.ts
@@ -0,0 +1,42 @@
+import { css } from "@emotion/css";
+import { html } from "lit";
+
+import { Theme } from "@bitwarden/common/platform/enums";
+
+import { ActionButton } from "../../buttons/action-button";
+import { AdditionalTasksButtonContent } from "../../buttons/additional-tasks/button-content";
+import { I18n } from "../../common-types";
+import { spacing } from "../../constants/styles";
+
+export type AtRiskNotificationFooterProps = {
+  i18n: I18n;
+  theme: Theme;
+  passwordChangeUri: string;
+};
+
+export function AtRiskNotificationFooter({
+  i18n,
+  theme,
+  passwordChangeUri,
+}: AtRiskNotificationFooterProps) {
+  return html`<div class=${atRiskNotificationFooterStyles}>
+    ${passwordChangeUri &&
+    ActionButton({
+      handleClick: () => {
+        open(passwordChangeUri, "_blank");
+      },
+      buttonText: AdditionalTasksButtonContent({ buttonText: i18n.changePassword, theme }),
+      theme,
+      fullWidth: false,
+    })}
+  </div>`;
+}
+
+const atRiskNotificationFooterStyles = css`
+  display: flex;
+  padding: ${spacing[2]} ${spacing[4]} ${spacing[4]} ${spacing[4]};
+
+  :last-child {
+    border-radius: 0 0 ${spacing["4"]} ${spacing["4"]};
+  }
+`;
diff --git a/apps/browser/src/autofill/content/components/notification/at-risk-password/message.ts b/apps/browser/src/autofill/content/components/notification/at-risk-password/message.ts
new file mode 100644
index 00000000000..42d4907711d
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/notification/at-risk-password/message.ts
@@ -0,0 +1,44 @@
+import { css } from "@emotion/css";
+import { html, nothing } from "lit";
+
+import { Theme } from "@bitwarden/common/platform/enums";
+
+import { themes } from "../../constants/styles";
+
+export type AtRiskNotificationMessageProps = {
+  message?: string;
+  theme: Theme;
+};
+
+export function AtRiskNotificationMessage({ message, theme }: AtRiskNotificationMessageProps) {
+  return html`
+    <div>
+      ${message
+        ? html`
+            <span title=${message} class=${atRiskNotificationMessageStyles(theme)}>
+              ${message}
+            </span>
+          `
+        : nothing}
+    </div>
+  `;
+}
+
+const baseTextStyles = css`
+  overflow-x: hidden;
+  text-align: left;
+  text-overflow: ellipsis;
+  line-height: 24px;
+  font-family: Roboto, sans-serif;
+  font-size: 16px;
+`;
+
+const atRiskNotificationMessageStyles = (theme: Theme) => css`
+  ${baseTextStyles}
+
+  color: ${themes[theme].text.main};
+  font-weight: 400;
+  white-space: normal;
+  word-break: break-word;
+  display: inline;
+`;
diff --git a/apps/browser/src/autofill/content/components/notification/button-row.ts b/apps/browser/src/autofill/content/components/notification/button-row.ts
index 470147cb469..04b79c1951a 100644
--- a/apps/browser/src/autofill/content/components/notification/button-row.ts
+++ b/apps/browser/src/autofill/content/components/notification/button-row.ts
@@ -34,6 +34,7 @@ export type NotificationButtonRowProps = {
   organizations?: OrgView[];
   primaryButton: {
     text: string;
+    isLoading?: boolean;
     handlePrimaryButtonClick: (args: any) => void;
   };
   personalVaultIsAllowed: boolean;
diff --git a/apps/browser/src/autofill/content/components/notification/container.ts b/apps/browser/src/autofill/content/components/notification/container.ts
index cc7f0fc72c0..0c70e0da63c 100644
--- a/apps/browser/src/autofill/content/components/notification/container.ts
+++ b/apps/browser/src/autofill/content/components/notification/container.ts
@@ -29,6 +29,7 @@ export type NotificationContainerProps = NotificationBarIframeInitData & {
   folders?: FolderView[];
   headerMessage?: string;
   i18n: I18n;
+  isLoading?: boolean;
   organizations?: OrgView[];
   personalVaultIsAllowed?: boolean;
   notificationTestId: string;
@@ -44,6 +45,7 @@ export function NotificationContainer({
   folders,
   headerMessage,
   i18n,
+  isLoading,
   organizations,
   personalVaultIsAllowed = true,
   notificationTestId,
@@ -74,6 +76,7 @@ export function NotificationContainer({
         collections,
         folders,
         i18n,
+        isLoading,
         notificationType: type,
         organizations,
         personalVaultIsAllowed,
diff --git a/apps/browser/src/autofill/content/components/notification/footer.ts b/apps/browser/src/autofill/content/components/notification/footer.ts
index b47dd5cc094..d37547a6fae 100644
--- a/apps/browser/src/autofill/content/components/notification/footer.ts
+++ b/apps/browser/src/autofill/content/components/notification/footer.ts
@@ -16,6 +16,7 @@ export type NotificationFooterProps = {
   collections?: CollectionView[];
   folders?: FolderView[];
   i18n: I18n;
+  isLoading?: boolean;
   notificationType?: NotificationType;
   organizations?: OrgView[];
   personalVaultIsAllowed: boolean;
@@ -27,6 +28,7 @@ export function NotificationFooter({
   collections,
   folders,
   i18n,
+  isLoading,
   notificationType,
   organizations,
   personalVaultIsAllowed,
@@ -52,6 +54,7 @@ export function NotificationFooter({
             i18n,
             primaryButton: {
               handlePrimaryButtonClick: handleSaveAction,
+              isLoading,
               text: primaryButtonText,
             },
             personalVaultIsAllowed,
diff --git a/apps/browser/src/autofill/content/components/rows/button-row.ts b/apps/browser/src/autofill/content/components/rows/button-row.ts
index 041d0a6b696..8b4eabfec50 100644
--- a/apps/browser/src/autofill/content/components/rows/button-row.ts
+++ b/apps/browser/src/autofill/content/components/rows/button-row.ts
@@ -12,6 +12,7 @@ export type ButtonRowProps = {
   theme: Theme;
   primaryButton: {
     text: string;
+    isLoading?: boolean;
     handlePrimaryButtonClick: (args: any) => void;
   };
   selectButtons?: {
@@ -29,6 +30,7 @@ export function ButtonRow({ theme, primaryButton, selectButtons }: ButtonRowProp
       ${ActionButton({
         handleClick: primaryButton.handlePrimaryButtonClick,
         buttonText: primaryButton.text,
+        isLoading: primaryButton.isLoading,
         theme,
       })}
       <div class=${optionSelectionsStyles}>
diff --git a/apps/browser/src/autofill/content/content-message-handler.ts b/apps/browser/src/autofill/content/content-message-handler.ts
index 60f093f8c10..c57b2d959f3 100644
--- a/apps/browser/src/autofill/content/content-message-handler.ts
+++ b/apps/browser/src/autofill/content/content-message-handler.ts
@@ -1,3 +1,4 @@
+import { ExtensionPageUrls } from "@bitwarden/common/vault/enums";
 import { VaultMessages } from "@bitwarden/common/vault/enums/vault-messages.enum";
 
 import {
@@ -18,6 +19,8 @@ const windowMessageHandlers: ContentMessageWindowEventHandlers = {
   duoResult: ({ data, referrer }: { data: any; referrer: string }) =>
     handleDuoResultMessage(data, referrer),
   [VaultMessages.OpenAtRiskPasswords]: () => handleOpenAtRiskPasswordsMessage(),
+  [VaultMessages.OpenBrowserExtensionToUrl]: ({ data }) =>
+    handleOpenBrowserExtensionToUrlMessage(data),
 };
 
 /**
@@ -73,10 +76,15 @@ function handleWebAuthnResultMessage(data: ContentMessageWindowData, referrer: s
   sendExtensionRuntimeMessage({ command, data: data.data, remember, referrer });
 }
 
+/** @deprecated use {@link handleOpenBrowserExtensionToUrlMessage} */
 function handleOpenAtRiskPasswordsMessage() {
   sendExtensionRuntimeMessage({ command: VaultMessages.OpenAtRiskPasswords });
 }
 
+function handleOpenBrowserExtensionToUrlMessage({ url }: { url?: ExtensionPageUrls }) {
+  sendExtensionRuntimeMessage({ command: VaultMessages.OpenBrowserExtensionToUrl, url });
+}
+
 /**
  * Handles the window message event.
  *
diff --git a/apps/browser/src/autofill/enums/autofill-overlay.enum.ts b/apps/browser/src/autofill/enums/autofill-overlay.enum.ts
index d0b970671a8..4e4b32b9038 100644
--- a/apps/browser/src/autofill/enums/autofill-overlay.enum.ts
+++ b/apps/browser/src/autofill/enums/autofill-overlay.enum.ts
@@ -21,14 +21,16 @@ export const RedirectFocusDirection = {
   Next: "next",
 } as const;
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum InlineMenuFillType {
-  AccountCreationUsername = 5,
-  PasswordGeneration = 6,
-  CurrentPasswordUpdate = 7,
-}
-export type InlineMenuFillTypes = InlineMenuFillType | CipherType;
+export const InlineMenuFillTypes = {
+  AccountCreationUsername: 5,
+  PasswordGeneration: 6,
+  CurrentPasswordUpdate: 7,
+} as const;
+
+export type InlineMenuFillTypeValue =
+  (typeof InlineMenuFillTypes)[keyof typeof InlineMenuFillTypes];
+
+export type InlineMenuFillType = InlineMenuFillTypeValue | CipherType;
 
 export const InlineMenuAccountCreationFieldType = {
   Text: "text",
diff --git a/apps/browser/src/autofill/enums/notification-queue-message-type.enum.ts b/apps/browser/src/autofill/enums/notification-queue-message-type.enum.ts
index 5a7b8fa990b..1fe6246f8b8 100644
--- a/apps/browser/src/autofill/enums/notification-queue-message-type.enum.ts
+++ b/apps/browser/src/autofill/enums/notification-queue-message-type.enum.ts
@@ -2,6 +2,7 @@ const NotificationQueueMessageType = {
   AddLogin: "add",
   ChangePassword: "change",
   UnlockVault: "unlock",
+  AtRiskPassword: "at-risk-password",
 } as const;
 
 type NotificationQueueMessageTypes =
diff --git a/apps/browser/src/autofill/fido2/background/fido2.background.spec.ts b/apps/browser/src/autofill/fido2/background/fido2.background.spec.ts
index 144af0c0a35..752851b3d37 100644
--- a/apps/browser/src/autofill/fido2/background/fido2.background.spec.ts
+++ b/apps/browser/src/autofill/fido2/background/fido2.background.spec.ts
@@ -3,7 +3,6 @@ import { BehaviorSubject } from "rxjs";
 
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { Fido2ActiveRequestManager } from "@bitwarden/common/platform/abstractions/fido2/fido2-active-request-manager.abstraction";
 import {
   AssertCredentialParams,
@@ -60,7 +59,6 @@ describe("Fido2Background", () => {
   let fido2ClientService!: MockProxy<Fido2ClientService<BrowserFido2ParentWindowReference>>;
   let vaultSettingsService!: MockProxy<VaultSettingsService>;
   let scriptInjectorServiceMock!: MockProxy<BrowserScriptInjectorService>;
-  let configServiceMock!: MockProxy<ConfigService>;
   let enablePasskeysMock$!: BehaviorSubject<boolean>;
   let activeAccountStatusMock$: BehaviorSubject<AuthenticationStatus>;
   let authServiceMock!: MockProxy<AuthService>;
@@ -80,7 +78,6 @@ describe("Fido2Background", () => {
     abortController = mock<AbortController>();
     registeredContentScripsMock = mock<browser.contentScripts.RegisteredContentScript>();
     scriptInjectorServiceMock = mock<BrowserScriptInjectorService>();
-    configServiceMock = mock<ConfigService>();
 
     enablePasskeysMock$ = new BehaviorSubject(true);
     vaultSettingsService.enablePasskeys$ = enablePasskeysMock$;
@@ -95,7 +92,6 @@ describe("Fido2Background", () => {
       fido2ClientService,
       vaultSettingsService,
       scriptInjectorServiceMock,
-      configServiceMock,
       authServiceMock,
     );
     fido2Background["abortManager"] = abortManagerMock;
@@ -186,7 +182,7 @@ describe("Fido2Background", () => {
       expect(scriptInjectorServiceMock.inject).toHaveBeenCalledWith({
         tabId: tabMock.id,
         injectDetails: sharedScriptInjectionDetails,
-        mv2Details: { file: Fido2ContentScript.PageScriptAppend },
+        mv2Details: { file: Fido2ContentScript.PageScriptDelayAppend },
         mv3Details: { file: Fido2ContentScript.PageScript, world: "MAIN" },
       });
       expect(scriptInjectorServiceMock.inject).toHaveBeenCalledWith({
@@ -202,22 +198,6 @@ describe("Fido2Background", () => {
         enablePasskeysMock$.next(true);
         await flushPromises();
 
-        expect(BrowserApi.registerContentScriptsMv2).toHaveBeenCalledWith({
-          js: [
-            { file: Fido2ContentScript.PageScriptAppend },
-            { file: Fido2ContentScript.ContentScript },
-          ],
-          ...sharedRegistrationOptions,
-        });
-      });
-
-      it("registers the page-script-delay-append-mv2.js content script when the DelayFido2PageScriptInitWithinMv2 feature flag is enabled", async () => {
-        configServiceMock.getFeatureFlag.mockResolvedValue(true);
-        isManifestVersionSpy.mockImplementation((manifestVersion) => manifestVersion === 2);
-
-        enablePasskeysMock$.next(true);
-        await flushPromises();
-
         expect(BrowserApi.registerContentScriptsMv2).toHaveBeenCalledWith({
           js: [
             { file: Fido2ContentScript.PageScriptDelayAppend },
diff --git a/apps/browser/src/autofill/fido2/background/fido2.background.ts b/apps/browser/src/autofill/fido2/background/fido2.background.ts
index e20a0584d20..788c98ca85b 100644
--- a/apps/browser/src/autofill/fido2/background/fido2.background.ts
+++ b/apps/browser/src/autofill/fido2/background/fido2.background.ts
@@ -5,8 +5,6 @@ import { pairwise } from "rxjs/operators";
 
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { Fido2ActiveRequestManager } from "@bitwarden/common/platform/abstractions/fido2/fido2-active-request-manager.abstraction";
 import {
   AssertCredentialParams,
@@ -60,7 +58,6 @@ export class Fido2Background implements Fido2BackgroundInterface {
     private fido2ClientService: Fido2ClientService<BrowserFido2ParentWindowReference>,
     private vaultSettingsService: VaultSettingsService,
     private scriptInjectorService: ScriptInjectorService,
-    private configService: ConfigService,
     private authService: AuthService,
   ) {}
 
@@ -403,14 +400,6 @@ export class Fido2Background implements Fido2BackgroundInterface {
    * delayed append script if the associated feature flag is enabled.
    */
   private async getFido2PageScriptAppendFileName() {
-    const shouldDelayInit = await this.configService.getFeatureFlag(
-      FeatureFlag.DelayFido2PageScriptInitWithinMv2,
-    );
-
-    if (shouldDelayInit) {
-      return Fido2ContentScript.PageScriptDelayAppend;
-    }
-
-    return Fido2ContentScript.PageScriptAppend;
+    return Fido2ContentScript.PageScriptDelayAppend;
   }
 }
diff --git a/apps/browser/src/autofill/fido2/content/fido2-content-script.spec.ts b/apps/browser/src/autofill/fido2/content/fido2-content-script.spec.ts
index 8885ed6299c..af7344beb66 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-content-script.spec.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-content-script.spec.ts
@@ -6,7 +6,7 @@ import { createPortSpyMock } from "../../../autofill/spec/autofill-mocks";
 import { triggerPortOnDisconnectEvent } from "../../../autofill/spec/testing-utils";
 import { Fido2PortName } from "../enums/fido2-port-name.enum";
 
-import { InsecureCreateCredentialParams, MessageType } from "./messaging/message";
+import { InsecureCreateCredentialParams, MessageTypes } from "./messaging/message";
 import { MessageWithMetadata, Messenger } from "./messaging/messenger";
 
 jest.mock("../../../autofill/utils", () => ({
@@ -71,7 +71,7 @@ describe("Fido2 Content Script", () => {
 
   it("handles a FIDO2 credential creation request message from the window message listener, formats the message and sends the formatted message to the extension background", async () => {
     const message = mock<MessageWithMetadata>({
-      type: MessageType.CredentialCreationRequest,
+      type: MessageTypes.CredentialCreationRequest,
       data: mock<InsecureCreateCredentialParams>(),
     });
     const mockResult = { credentialId: "mock" } as CreateCredentialResult;
@@ -92,14 +92,14 @@ describe("Fido2 Content Script", () => {
       requestId: expect.any(String),
     });
     expect(response).toEqual({
-      type: MessageType.CredentialCreationResponse,
+      type: MessageTypes.CredentialCreationResponse,
       result: mockResult,
     });
   });
 
   it("handles a FIDO2 credential get request message from the window message listener, formats the message and sends the formatted message to the extension background", async () => {
     const message = mock<MessageWithMetadata>({
-      type: MessageType.CredentialGetRequest,
+      type: MessageTypes.CredentialGetRequest,
       data: mock<InsecureCreateCredentialParams>(),
     });
 
@@ -121,7 +121,7 @@ describe("Fido2 Content Script", () => {
 
   it("removes the abort handler when the FIDO2 request is complete", async () => {
     const message = mock<MessageWithMetadata>({
-      type: MessageType.CredentialCreationRequest,
+      type: MessageTypes.CredentialCreationRequest,
       data: mock<InsecureCreateCredentialParams>(),
     });
     const abortController = new AbortController();
@@ -138,16 +138,14 @@ describe("Fido2 Content Script", () => {
 
   it("sends an extension message to abort the FIDO2 request when the abort controller is signaled", async () => {
     const message = mock<MessageWithMetadata>({
-      type: MessageType.CredentialCreationRequest,
+      type: MessageTypes.CredentialCreationRequest,
       data: mock<InsecureCreateCredentialParams>(),
     });
     const abortController = new AbortController();
     const abortSpy = jest.spyOn(abortController.signal, "addEventListener");
-    jest
-      .spyOn(chrome.runtime, "sendMessage")
-      .mockImplementationOnce(async (extensionId: string, message: unknown, options: any) => {
-        abortController.abort();
-      });
+    jest.spyOn(chrome.runtime, "sendMessage").mockImplementationOnce(async () => {
+      abortController.abort();
+    });
 
     // FIXME: Remove when updating file. Eslint update
     // eslint-disable-next-line @typescript-eslint/no-require-imports
@@ -165,7 +163,7 @@ describe("Fido2 Content Script", () => {
   it("rejects credential requests and returns an error result", async () => {
     const errorMessage = "Test error";
     const message = mock<MessageWithMetadata>({
-      type: MessageType.CredentialCreationRequest,
+      type: MessageTypes.CredentialCreationRequest,
       data: mock<InsecureCreateCredentialParams>(),
     });
     const abortController = new AbortController();
diff --git a/apps/browser/src/autofill/fido2/content/fido2-content-script.ts b/apps/browser/src/autofill/fido2/content/fido2-content-script.ts
index f8352fc27a6..03816f2b382 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-content-script.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-content-script.ts
@@ -12,7 +12,7 @@ import {
   InsecureAssertCredentialParams,
   InsecureCreateCredentialParams,
   Message,
-  MessageType,
+  MessageTypes,
 } from "./messaging/message";
 import { MessageWithMetadata, Messenger } from "./messaging/messenger";
 
@@ -49,21 +49,21 @@ import { MessageWithMetadata, Messenger } from "./messaging/messenger";
     abortController.signal.addEventListener("abort", abortHandler);
 
     try {
-      if (message.type === MessageType.CredentialCreationRequest) {
+      if (message.type === MessageTypes.CredentialCreationRequest) {
         return handleCredentialCreationRequestMessage(
           requestId,
           message.data as InsecureCreateCredentialParams,
         );
       }
 
-      if (message.type === MessageType.CredentialGetRequest) {
+      if (message.type === MessageTypes.CredentialGetRequest) {
         return handleCredentialGetRequestMessage(
           requestId,
           message.data as InsecureAssertCredentialParams,
         );
       }
 
-      if (message.type === MessageType.AbortRequest) {
+      if (message.type === MessageTypes.AbortRequest) {
         return sendExtensionMessage("fido2AbortRequest", { abortedRequestId: requestId });
       }
     } finally {
@@ -83,7 +83,7 @@ import { MessageWithMetadata, Messenger } from "./messaging/messenger";
   ): Promise<Message | undefined> {
     return respondToCredentialRequest(
       "fido2RegisterCredentialRequest",
-      MessageType.CredentialCreationResponse,
+      MessageTypes.CredentialCreationResponse,
       requestId,
       data,
     );
@@ -101,7 +101,7 @@ import { MessageWithMetadata, Messenger } from "./messaging/messenger";
   ): Promise<Message | undefined> {
     return respondToCredentialRequest(
       "fido2GetCredentialRequest",
-      MessageType.CredentialGetResponse,
+      MessageTypes.CredentialGetResponse,
       requestId,
       data,
     );
@@ -118,7 +118,9 @@ import { MessageWithMetadata, Messenger } from "./messaging/messenger";
    */
   async function respondToCredentialRequest(
     command: string,
-    type: MessageType.CredentialCreationResponse | MessageType.CredentialGetResponse,
+    type:
+      | typeof MessageTypes.CredentialCreationResponse
+      | typeof MessageTypes.CredentialGetResponse,
     requestId: string,
     messageData: InsecureCreateCredentialParams | InsecureAssertCredentialParams,
   ): Promise<Message | undefined> {
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.spec.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.spec.ts
index 69e17d26fe5..b444c967080 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.spec.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.spec.ts
@@ -24,7 +24,7 @@ describe("FIDO2 page-script for manifest v2", () => {
 
     // FIXME: Remove when updating file. Eslint update
     // eslint-disable-next-line @typescript-eslint/no-require-imports
-    require("./fido2-page-script-append.mv2");
+    require("./fido2-page-script-delay-append.mv2.ts");
 
     expect(window.document.createElement).not.toHaveBeenCalled();
   });
@@ -37,7 +37,7 @@ describe("FIDO2 page-script for manifest v2", () => {
 
     // FIXME: Remove when updating file. Eslint update
     // eslint-disable-next-line @typescript-eslint/no-require-imports
-    require("./fido2-page-script-append.mv2");
+    require("./fido2-page-script-delay-append.mv2.ts");
 
     expect(window.document.createElement).toHaveBeenCalledWith("script");
     expect(chrome.runtime.getURL).toHaveBeenCalledWith(Fido2ContentScript.PageScript);
@@ -54,7 +54,7 @@ describe("FIDO2 page-script for manifest v2", () => {
 
     // FIXME: Remove when updating file. Eslint update
     // eslint-disable-next-line @typescript-eslint/no-require-imports
-    require("./fido2-page-script-append.mv2");
+    require("./fido2-page-script-delay-append.mv2.ts");
 
     expect(window.document.createElement).toHaveBeenCalledWith("script");
     expect(chrome.runtime.getURL).toHaveBeenCalledWith(Fido2ContentScript.PageScript);
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.ts
deleted file mode 100644
index f835d2f175b..00000000000
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * This script handles injection of the FIDO2 override page script into the document.
- * This is required for manifest v2, but will be removed when we migrate fully to manifest v3.
- */
-(function (globalContext) {
-  if (globalContext.document.contentType !== "text/html") {
-    return;
-  }
-
-  const script = globalContext.document.createElement("script");
-  script.src = chrome.runtime.getURL("content/fido2-page-script.js");
-  script.async = false;
-
-  const scriptInsertionPoint =
-    globalContext.document.head || globalContext.document.documentElement;
-  scriptInsertionPoint.prepend(script);
-})(globalThis);
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script.ts
index 4c1761c37ba..5b9ea5e5b27 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script.ts
@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { WebauthnUtils } from "../utils/webauthn-utils";
 
-import { MessageType } from "./messaging/message";
+import { MessageTypes } from "./messaging/message";
 import { Messenger } from "./messaging/messenger";
 
 (function (globalContext) {
@@ -100,13 +100,13 @@ import { Messenger } from "./messaging/messenger";
     try {
       const response = await messenger.request(
         {
-          type: MessageType.CredentialCreationRequest,
+          type: MessageTypes.CredentialCreationRequest,
           data: WebauthnUtils.mapCredentialCreationOptions(options, fallbackSupported),
         },
         options?.signal,
       );
 
-      if (response.type !== MessageType.CredentialCreationResponse) {
+      if (response.type !== MessageTypes.CredentialCreationResponse) {
         throw new Error("Something went wrong.");
       }
 
@@ -141,19 +141,19 @@ import { Messenger } from "./messaging/messenger";
         try {
           const abortListener = () =>
             messenger.request({
-              type: MessageType.AbortRequest,
+              type: MessageTypes.AbortRequest,
               abortedRequestId: abortSignal.toString(),
             });
           internalAbortController.signal.addEventListener("abort", abortListener);
           const response = await messenger.request(
             {
-              type: MessageType.CredentialGetRequest,
+              type: MessageTypes.CredentialGetRequest,
               data: WebauthnUtils.mapCredentialRequestOptions(options, fallbackSupported),
             },
             internalAbortController.signal,
           );
           internalAbortController.signal.removeEventListener("abort", abortListener);
-          if (response.type !== MessageType.CredentialGetResponse) {
+          if (response.type !== MessageTypes.CredentialGetResponse) {
             throw new Error("Something went wrong.");
           }
 
@@ -182,13 +182,13 @@ import { Messenger } from "./messaging/messenger";
     try {
       const response = await messenger.request(
         {
-          type: MessageType.CredentialGetRequest,
+          type: MessageTypes.CredentialGetRequest,
           data: WebauthnUtils.mapCredentialRequestOptions(options, fallbackSupported),
         },
         options?.signal,
       );
 
-      if (response.type !== MessageType.CredentialGetResponse) {
+      if (response.type !== MessageTypes.CredentialGetResponse) {
         throw new Error("Something went wrong.");
       }
 
@@ -282,7 +282,7 @@ import { Messenger } from "./messaging/messenger";
     const type = message.type;
 
     // Handle cleanup for disconnect request
-    if (type === MessageType.DisconnectRequest) {
+    if (type === MessageTypes.DisconnectRequest) {
       destroy();
     }
   };
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-supported.spec.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-supported.spec.ts
index f1aec69193b..5e22027b584 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-supported.spec.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-supported.spec.ts
@@ -7,7 +7,7 @@ import {
 } from "../../../autofill/spec/fido2-testing-utils";
 import { WebauthnUtils } from "../utils/webauthn-utils";
 
-import { MessageType } from "./messaging/message";
+import { MessageTypes } from "./messaging/message";
 import { Messenger } from "./messaging/messenger";
 
 const originalGlobalThis = globalThis;
@@ -71,7 +71,7 @@ describe("Fido2 page script with native WebAuthn support", () => {
   describe("creating WebAuthn credentials", () => {
     beforeEach(() => {
       messenger.request = jest.fn().mockResolvedValue({
-        type: MessageType.CredentialCreationResponse,
+        type: MessageTypes.CredentialCreationResponse,
         result: mockCreateCredentialsResult,
       });
     });
@@ -104,7 +104,7 @@ describe("Fido2 page script with native WebAuthn support", () => {
   describe("get WebAuthn credentials", () => {
     beforeEach(() => {
       messenger.request = jest.fn().mockResolvedValue({
-        type: MessageType.CredentialGetResponse,
+        type: MessageTypes.CredentialGetResponse,
         result: mockCredentialAssertResult,
       });
     });
@@ -147,7 +147,7 @@ describe("Fido2 page script with native WebAuthn support", () => {
     it("should destroy the message listener when receiving a disconnect request", async () => {
       jest.spyOn(globalThis.top, "removeEventListener");
       const SENDER = "bitwarden-webauthn";
-      void messenger.handler({ type: MessageType.DisconnectRequest, SENDER, senderId: "1" });
+      void messenger.handler({ type: MessageTypes.DisconnectRequest, SENDER, senderId: "1" });
 
       expect(globalThis.top.removeEventListener).toHaveBeenCalledWith("focus", undefined);
       expect(messenger.destroy).toHaveBeenCalled();
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-unsupported.spec.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-unsupported.spec.ts
index af1838ec942..d15bc475f57 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-unsupported.spec.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-unsupported.spec.ts
@@ -6,7 +6,7 @@ import {
 } from "../../../autofill/spec/fido2-testing-utils";
 import { WebauthnUtils } from "../utils/webauthn-utils";
 
-import { MessageType } from "./messaging/message";
+import { MessageTypes } from "./messaging/message";
 import { Messenger } from "./messaging/messenger";
 
 const originalGlobalThis = globalThis;
@@ -65,7 +65,7 @@ describe("Fido2 page script without native WebAuthn support", () => {
   describe("creating WebAuthn credentials", () => {
     beforeEach(() => {
       messenger.request = jest.fn().mockResolvedValue({
-        type: MessageType.CredentialCreationResponse,
+        type: MessageTypes.CredentialCreationResponse,
         result: mockCreateCredentialsResult,
       });
     });
@@ -86,7 +86,7 @@ describe("Fido2 page script without native WebAuthn support", () => {
   describe("get WebAuthn credentials", () => {
     beforeEach(() => {
       messenger.request = jest.fn().mockResolvedValue({
-        type: MessageType.CredentialGetResponse,
+        type: MessageTypes.CredentialGetResponse,
         result: mockCredentialAssertResult,
       });
     });
@@ -108,7 +108,7 @@ describe("Fido2 page script without native WebAuthn support", () => {
     it("should destroy the message listener when receiving a disconnect request", async () => {
       jest.spyOn(globalThis.top, "removeEventListener");
       const SENDER = "bitwarden-webauthn";
-      void messenger.handler({ type: MessageType.DisconnectRequest, SENDER, senderId: "1" });
+      void messenger.handler({ type: MessageTypes.DisconnectRequest, SENDER, senderId: "1" });
 
       expect(globalThis.top.removeEventListener).toHaveBeenCalledWith("focus", undefined);
       expect(messenger.destroy).toHaveBeenCalled();
diff --git a/apps/browser/src/autofill/fido2/content/messaging/message.ts b/apps/browser/src/autofill/fido2/content/messaging/message.ts
index 640af22ab9a..55dc522ceab 100644
--- a/apps/browser/src/autofill/fido2/content/messaging/message.ts
+++ b/apps/browser/src/autofill/fido2/content/messaging/message.ts
@@ -5,19 +5,19 @@ import {
   AssertCredentialResult,
 } from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction";
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum MessageType {
-  CredentialCreationRequest,
-  CredentialCreationResponse,
-  CredentialGetRequest,
-  CredentialGetResponse,
-  AbortRequest,
-  DisconnectRequest,
-  ReconnectRequest,
-  AbortResponse,
-  ErrorResponse,
-}
+export const MessageTypes = {
+  CredentialCreationRequest: 0,
+  CredentialCreationResponse: 1,
+  CredentialGetRequest: 2,
+  CredentialGetResponse: 3,
+  AbortRequest: 4,
+  DisconnectRequest: 5,
+  ReconnectRequest: 6,
+  AbortResponse: 7,
+  ErrorResponse: 8,
+} as const;
+
+export type MessageType = (typeof MessageTypes)[keyof typeof MessageTypes];
 
 /**
  * The params provided by the page-script are created in an insecure environment and
@@ -30,12 +30,12 @@ export type InsecureCreateCredentialParams = Omit<
 >;
 
 export type CredentialCreationRequest = {
-  type: MessageType.CredentialCreationRequest;
+  type: typeof MessageTypes.CredentialCreationRequest;
   data: InsecureCreateCredentialParams;
 };
 
 export type CredentialCreationResponse = {
-  type: MessageType.CredentialCreationResponse;
+  type: typeof MessageTypes.CredentialCreationResponse;
   result?: CreateCredentialResult;
 };
 
@@ -50,35 +50,35 @@ export type InsecureAssertCredentialParams = Omit<
 >;
 
 export type CredentialGetRequest = {
-  type: MessageType.CredentialGetRequest;
+  type: typeof MessageTypes.CredentialGetRequest;
   data: InsecureAssertCredentialParams;
 };
 
 export type CredentialGetResponse = {
-  type: MessageType.CredentialGetResponse;
+  type: typeof MessageTypes.CredentialGetResponse;
   result?: AssertCredentialResult;
 };
 
 export type AbortRequest = {
-  type: MessageType.AbortRequest;
+  type: typeof MessageTypes.AbortRequest;
   abortedRequestId: string;
 };
 
 export type DisconnectRequest = {
-  type: MessageType.DisconnectRequest;
+  type: typeof MessageTypes.DisconnectRequest;
 };
 
 export type ReconnectRequest = {
-  type: MessageType.ReconnectRequest;
+  type: typeof MessageTypes.ReconnectRequest;
 };
 
 export type ErrorResponse = {
-  type: MessageType.ErrorResponse;
+  type: typeof MessageTypes.ErrorResponse;
   error: string;
 };
 
 export type AbortResponse = {
-  type: MessageType.AbortResponse;
+  type: typeof MessageTypes.AbortResponse;
   abortedRequestId: string;
 };
 
diff --git a/apps/browser/src/autofill/fido2/content/messaging/messenger.ts b/apps/browser/src/autofill/fido2/content/messaging/messenger.ts
index ec7ff3bb7a4..257f7e9efd5 100644
--- a/apps/browser/src/autofill/fido2/content/messaging/messenger.ts
+++ b/apps/browser/src/autofill/fido2/content/messaging/messenger.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { Message, MessageType } from "./message";
+import { Message, MessageTypes } from "./message";
 
 const SENDER = "bitwarden-webauthn";
 
@@ -80,7 +80,7 @@ export class Messenger {
       const abortListener = () =>
         localPort.postMessage({
           metadata: { SENDER },
-          type: MessageType.AbortRequest,
+          type: MessageTypes.AbortRequest,
         });
       abortSignal?.addEventListener("abort", abortListener);
 
@@ -92,7 +92,7 @@ export class Messenger {
 
       abortSignal?.removeEventListener("abort", abortListener);
 
-      if (response.type === MessageType.ErrorResponse) {
+      if (response.type === MessageTypes.ErrorResponse) {
         const error = new Error();
         Object.assign(error, JSON.parse(response.error));
         throw error;
@@ -119,7 +119,7 @@ export class Messenger {
 
       const abortController = new AbortController();
       port.onmessage = (event: MessageEvent<MessageWithMetadata>) => {
-        if (event.data.type === MessageType.AbortRequest) {
+        if (event.data.type === MessageTypes.AbortRequest) {
           abortController.abort();
         }
       };
@@ -133,7 +133,7 @@ export class Messenger {
       } catch (error) {
         port.postMessage({
           SENDER,
-          type: MessageType.ErrorResponse,
+          type: MessageTypes.ErrorResponse,
           error: JSON.stringify(error, Object.getOwnPropertyNames(error)),
         });
       } finally {
@@ -157,7 +157,7 @@ export class Messenger {
   }
 
   private async sendDisconnectCommand() {
-    await this.request({ type: MessageType.DisconnectRequest });
+    await this.request({ type: MessageTypes.DisconnectRequest });
   }
 
   private generateUniqueId() {
diff --git a/apps/browser/src/autofill/fido2/enums/fido2-content-script.enum.ts b/apps/browser/src/autofill/fido2/enums/fido2-content-script.enum.ts
index 9d9189c1623..eb20ff5f69c 100644
--- a/apps/browser/src/autofill/fido2/enums/fido2-content-script.enum.ts
+++ b/apps/browser/src/autofill/fido2/enums/fido2-content-script.enum.ts
@@ -1,6 +1,5 @@
 export const Fido2ContentScript = {
   PageScript: "content/fido2-page-script.js",
-  PageScriptAppend: "content/fido2-page-script-append-mv2.js",
   PageScriptDelayAppend: "content/fido2-page-script-delay-append-mv2.js",
   ContentScript: "content/fido2-content-script.js",
 } as const;
diff --git a/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts b/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts
index 04b09a7df32..8de48a49a8e 100644
--- a/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts
+++ b/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts
@@ -28,6 +28,8 @@ import {
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { closeFido2Popout, openFido2Popout } from "../../../vault/popup/utils/vault-popout-window";
 
 const BrowserFido2MessageName = "BrowserFido2UserInterfaceServiceMessage";
diff --git a/apps/browser/src/autofill/fido2/utils/webauthn-utils.ts b/apps/browser/src/autofill/fido2/utils/webauthn-utils.ts
index c8bcf5faa4b..0cccd91876d 100644
--- a/apps/browser/src/autofill/fido2/utils/webauthn-utils.ts
+++ b/apps/browser/src/autofill/fido2/utils/webauthn-utils.ts
@@ -88,6 +88,7 @@ export class WebauthnUtils {
       getClientExtensionResults: () => ({
         credProps: result.extensions.credProps,
       }),
+      toJSON: () => Fido2Utils.createResultToJson(result),
     } as PublicKeyCredential;
 
     // Modify prototype chains to fix `instanceof` calls.
@@ -134,6 +135,7 @@ export class WebauthnUtils {
       } as AuthenticatorAssertionResponse,
       getClientExtensionResults: () => ({}),
       authenticatorAttachment: "platform",
+      toJSON: () => Fido2Utils.getResultToJson(result),
     } as PublicKeyCredential;
 
     // Modify prototype chains to fix `instanceof` calls.
diff --git a/apps/browser/src/autofill/models/autofill-field.ts b/apps/browser/src/autofill/models/autofill-field.ts
index c0be60f1cd0..1a8c3bb875b 100644
--- a/apps/browser/src/autofill/models/autofill-field.ts
+++ b/apps/browser/src/autofill/models/autofill-field.ts
@@ -4,7 +4,7 @@ import { FieldRect } from "../background/abstractions/overlay.background";
 import { AutofillFieldQualifierType } from "../enums/autofill-field.enums";
 import {
   InlineMenuAccountCreationFieldTypes,
-  InlineMenuFillTypes,
+  InlineMenuFillType,
 } from "../enums/autofill-overlay.enum";
 
 /**
@@ -118,7 +118,7 @@ export default class AutofillField {
 
   checked?: boolean;
 
-  inlineMenuFillType?: InlineMenuFillTypes;
+  inlineMenuFillType?: InlineMenuFillType;
 
   showPasskeys?: boolean;
 
diff --git a/apps/browser/src/autofill/notification/abstractions/notification-bar.ts b/apps/browser/src/autofill/notification/abstractions/notification-bar.ts
index 8256190ea55..934aa4a2571 100644
--- a/apps/browser/src/autofill/notification/abstractions/notification-bar.ts
+++ b/apps/browser/src/autofill/notification/abstractions/notification-bar.ts
@@ -11,6 +11,7 @@ const NotificationTypes = {
   Add: "add",
   Change: "change",
   Unlock: "unlock",
+  AtRiskPassword: "at-risk-password",
 } as const;
 
 type NotificationType = (typeof NotificationTypes)[keyof typeof NotificationTypes];
@@ -30,7 +31,8 @@ type NotificationBarIframeInitData = {
   organizations?: OrgView[];
   removeIndividualVault?: boolean;
   theme?: Theme;
-  type?: string; // @TODO use `NotificationType`
+  type?: NotificationType;
+  params?: AtRiskPasswordNotificationParams | any;
 };
 
 type NotificationBarWindowMessage = {
@@ -50,7 +52,13 @@ type NotificationBarWindowMessageHandlers = {
   saveCipherAttemptCompleted: ({ message }: { message: NotificationBarWindowMessage }) => void;
 };
 
+type AtRiskPasswordNotificationParams = {
+  passwordChangeUri?: string;
+  organizationName: string;
+};
+
 export {
+  AtRiskPasswordNotificationParams,
   NotificationTaskInfo,
   NotificationTypes,
   NotificationType,
diff --git a/apps/browser/src/autofill/notification/bar.ts b/apps/browser/src/autofill/notification/bar.ts
index e7d37f5e8d7..285ae4aa257 100644
--- a/apps/browser/src/autofill/notification/bar.ts
+++ b/apps/browser/src/autofill/notification/bar.ts
@@ -7,6 +7,7 @@ import type { FolderView } from "@bitwarden/common/vault/models/view/folder.view
 import { AdjustNotificationBarMessageData } from "../background/abstractions/notification.background";
 import { NotificationCipherData } from "../content/components/cipher/types";
 import { CollectionView, I18n, OrgView } from "../content/components/common-types";
+import { AtRiskNotification } from "../content/components/notification/at-risk-password/container";
 import { NotificationConfirmationContainer } from "../content/components/notification/confirmation/container";
 import { NotificationContainer } from "../content/components/notification/container";
 import { selectedFolder as selectedFolderSignal } from "../content/components/signals/selected-folder";
@@ -56,21 +57,24 @@ function applyNotificationBarStyle() {
 function getI18n() {
   return {
     appName: chrome.i18n.getMessage("appName"),
+    atRiskPassword: chrome.i18n.getMessage("atRiskPassword"),
+    changePassword: chrome.i18n.getMessage("changePassword"),
     close: chrome.i18n.getMessage("close"),
     collection: chrome.i18n.getMessage("collection"),
     folder: chrome.i18n.getMessage("folder"),
+    loginSaveConfirmation: chrome.i18n.getMessage("loginSaveConfirmation"),
     loginSaveSuccess: chrome.i18n.getMessage("loginSaveSuccess"),
+    loginUpdatedConfirmation: chrome.i18n.getMessage("loginUpdatedConfirmation"),
     loginUpdateSuccess: chrome.i18n.getMessage("loginUpdateSuccess"),
     loginUpdateTaskSuccess: chrome.i18n.getMessage("loginUpdateTaskSuccess"),
     loginUpdateTaskSuccessAdditional: chrome.i18n.getMessage("loginUpdateTaskSuccessAdditional"),
-    nextSecurityTaskAction: chrome.i18n.getMessage("nextSecurityTaskAction"),
-    newItem: chrome.i18n.getMessage("newItem"),
-    never: chrome.i18n.getMessage("never"),
     myVault: chrome.i18n.getMessage("myVault"),
+    never: chrome.i18n.getMessage("never"),
+    newItem: chrome.i18n.getMessage("newItem"),
+    nextSecurityTaskAction: chrome.i18n.getMessage("nextSecurityTaskAction"),
     notificationAddDesc: chrome.i18n.getMessage("notificationAddDesc"),
     notificationAddSave: chrome.i18n.getMessage("notificationAddSave"),
     notificationChangeDesc: chrome.i18n.getMessage("notificationChangeDesc"),
-    notificationUpdate: chrome.i18n.getMessage("notificationChangeSave"),
     notificationEdit: chrome.i18n.getMessage("edit"),
     notificationEditTooltip: chrome.i18n.getMessage("notificationEditTooltip"),
     notificationLoginSaveConfirmation: chrome.i18n.getMessage("notificationLoginSaveConfirmation"),
@@ -79,6 +83,7 @@ function getI18n() {
     ),
     notificationUnlock: chrome.i18n.getMessage("notificationUnlock"),
     notificationUnlockDesc: chrome.i18n.getMessage("notificationUnlockDesc"),
+    notificationUpdate: chrome.i18n.getMessage("notificationChangeSave"),
     notificationViewAria: chrome.i18n.getMessage("notificationViewAria"),
     saveAction: chrome.i18n.getMessage("notificationAddSave"),
     saveAsNewLoginAction: chrome.i18n.getMessage("saveAsNewLoginAction"),
@@ -87,8 +92,8 @@ function getI18n() {
     saveLogin: chrome.i18n.getMessage("saveLogin"),
     typeLogin: chrome.i18n.getMessage("typeLogin"),
     unlockToSave: chrome.i18n.getMessage("unlockToSave"),
-    updateLoginAction: chrome.i18n.getMessage("updateLoginAction"),
     updateLogin: chrome.i18n.getMessage("updateLogin"),
+    updateLoginAction: chrome.i18n.getMessage("updateLoginAction"),
     vault: chrome.i18n.getMessage("vault"),
     view: chrome.i18n.getMessage("view"),
   };
@@ -124,6 +129,7 @@ export function getNotificationHeaderMessage(i18n: I18n, type?: NotificationType
         [NotificationTypes.Add]: i18n.saveLogin,
         [NotificationTypes.Change]: i18n.updateLogin,
         [NotificationTypes.Unlock]: i18n.unlockToSave,
+        [NotificationTypes.AtRiskPassword]: i18n.atRiskPassword,
       }[type]
     : undefined;
 }
@@ -143,6 +149,7 @@ export function getConfirmationHeaderMessage(i18n: I18n, type?: NotificationType
         [NotificationTypes.Add]: i18n.loginSaveSuccess,
         [NotificationTypes.Change]: i18n.loginUpdateSuccess,
         [NotificationTypes.Unlock]: "",
+        [NotificationTypes.AtRiskPassword]: "",
       }[type]
     : undefined;
 }
@@ -193,6 +200,7 @@ export function getNotificationTestId(
     [NotificationTypes.Unlock]: "unlock-notification-bar",
     [NotificationTypes.Add]: "save-notification-bar",
     [NotificationTypes.Change]: "update-notification-bar",
+    [NotificationTypes.AtRiskPassword]: "at-risk-password-notification-bar",
   }[notificationType];
 }
 
@@ -241,28 +249,54 @@ async function initNotificationBar(message: NotificationBarWindowMessage) {
     document.head.querySelectorAll('link[rel="stylesheet"]').forEach((node) => node.remove());
 
     if (isVaultLocked) {
-      return render(
-        NotificationContainer({
-          ...notificationBarIframeInitData,
-          headerMessage,
-          type: resolvedType,
-          notificationTestId,
-          theme: resolvedTheme,
-          personalVaultIsAllowed: !personalVaultDisallowed,
-          handleCloseNotification,
-          handleSaveAction: (e) => {
-            sendSaveCipherMessage(true);
+      const notificationConfig = {
+        ...notificationBarIframeInitData,
+        headerMessage,
+        type: resolvedType,
+        notificationTestId,
+        theme: resolvedTheme,
+        personalVaultIsAllowed: !personalVaultDisallowed,
+        handleCloseNotification,
+        handleEditOrUpdateAction,
+        i18n,
+      };
 
-            // @TODO can't close before vault has finished decrypting, but can't leave open during long decrypt because it looks like the experience has failed
-          },
-          handleEditOrUpdateAction,
+      const handleSaveAction = () => {
+        sendSaveCipherMessage(true);
+
+        render(
+          NotificationContainer({
+            ...notificationConfig,
+            handleSaveAction: () => {},
+            isLoading: true,
+          }),
+          document.body,
+        );
+      };
+
+      const UnlockNotification = NotificationContainer({ ...notificationConfig, handleSaveAction });
+
+      return render(UnlockNotification, document.body);
+    }
+
+    // Handle AtRiskPasswordNotification render
+    if (notificationBarIframeInitData.type === NotificationTypes.AtRiskPassword) {
+      return render(
+        AtRiskNotification({
+          ...notificationBarIframeInitData,
+          type: notificationBarIframeInitData.type as NotificationType,
+          theme: resolvedTheme,
           i18n,
+          params: initData.params,
+          handleCloseNotification,
         }),
         document.body,
       );
     }
 
+    // Default scenario: add or update password
     const orgId = selectedVaultSignal.get();
+
     await Promise.all([
       new Promise<OrgView[]>((resolve) =>
         sendPlatformMessage({ command: "bgGetOrgData" }, resolve),
@@ -524,6 +558,7 @@ function handleSaveCipherConfirmation(message: NotificationBarWindowMessage) {
   const resolvedType = resolveNotificationType(notificationBarIframeInitData);
   const headerMessage = getConfirmationHeaderMessage(i18n, resolvedType, error);
   const notificationTestId = getNotificationTestId(resolvedType, true);
+  appendHeaderMessageToTitle(headerMessage);
 
   globalThis.setTimeout(() => sendPlatformMessage({ command: "bgCloseNotificationBar" }), 5000);
 
@@ -532,7 +567,7 @@ function handleSaveCipherConfirmation(message: NotificationBarWindowMessage) {
       ...notificationBarIframeInitData,
       error,
       handleCloseNotification,
-      handleOpenTasks: () => sendPlatformMessage({ command: "bgOpenAtRisksPasswords" }),
+      handleOpenTasks: () => sendPlatformMessage({ command: "bgOpenAtRiskPasswords" }),
       handleOpenVault: (e: Event) =>
         cipherId ? openViewVaultItemPopout(cipherId) : openAddEditVaultItemPopout(e, {}),
       headerMessage,
diff --git a/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-list.ts b/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-list.ts
index a20bd3c5312..f5e1fe08850 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-list.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/abstractions/autofill-inline-menu-list.ts
@@ -1,7 +1,7 @@
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 
 import { InlineMenuCipherData } from "../../../background/abstractions/overlay.background";
-import { InlineMenuFillTypes } from "../../../enums/autofill-overlay.enum";
+import { InlineMenuFillType } from "../../../enums/autofill-overlay.enum";
 
 type AutofillInlineMenuListMessage = { command: string };
 
@@ -23,7 +23,7 @@ export type InitAutofillInlineMenuListMessage = AutofillInlineMenuListMessage &
   theme: string;
   translations: Record<string, string>;
   ciphers?: InlineMenuCipherData[];
-  inlineMenuFillType?: InlineMenuFillTypes;
+  inlineMenuFillType?: InlineMenuFillType;
   showInlineMenuAccountCreation?: boolean;
   showPasskeysLabels?: boolean;
   portKey: string;
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/list/autofill-inline-menu-list.ts b/apps/browser/src/autofill/overlay/inline-menu/pages/list/autofill-inline-menu-list.ts
index e0db93b6b4a..c680fe4745c 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/list/autofill-inline-menu-list.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/list/autofill-inline-menu-list.ts
@@ -10,7 +10,7 @@ import { EVENTS, UPDATE_PASSKEYS_HEADINGS_ON_SCROLL } from "@bitwarden/common/au
 import { CipherRepromptType, CipherType } from "@bitwarden/common/vault/enums";
 
 import { InlineMenuCipherData } from "../../../../background/abstractions/overlay.background";
-import { InlineMenuFillTypes } from "../../../../enums/autofill-overlay.enum";
+import { InlineMenuFillType } from "../../../../enums/autofill-overlay.enum";
 import { buildSvgDomElement, specialCharacterToKeyMap, throttle } from "../../../../utils";
 import {
   creditCardIcon,
@@ -42,7 +42,7 @@ export class AutofillInlineMenuList extends AutofillInlineMenuPageElement {
   private cipherListScrollIsDebounced = false;
   private cipherListScrollDebounceTimeout: number | NodeJS.Timeout;
   private currentCipherIndex = 0;
-  private inlineMenuFillType: InlineMenuFillTypes;
+  private inlineMenuFillType: InlineMenuFillType;
   private showInlineMenuAccountCreation: boolean;
   private showPasskeysLabels: boolean;
   private newItemButtonElement: HTMLButtonElement;
@@ -1105,8 +1105,8 @@ export class AutofillInlineMenuList extends AutofillInlineMenuPageElement {
 
       const svgElement = buildSvgDomElement(`
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 29 29">
-          <circle fill="none" cx="14.5" cy="14.5" r="12.5" 
-                  stroke-width="3" stroke-dasharray="78.5" 
+          <circle fill="none" cx="14.5" cy="14.5" r="12.5"
+                  stroke-width="3" stroke-dasharray="78.5"
                   stroke-dashoffset="78.5" transform="rotate(-90 14.5 14.5)"></circle>
           <circle fill="none" cx="14.5" cy="14.5" r="14" stroke-width="1"></circle>
       </svg>
diff --git a/apps/browser/src/autofill/overlay/notifications/abstractions/overlay-notifications-content.service.ts b/apps/browser/src/autofill/overlay/notifications/abstractions/overlay-notifications-content.service.ts
index 42d7666e8a7..338c79cc607 100644
--- a/apps/browser/src/autofill/overlay/notifications/abstractions/overlay-notifications-content.service.ts
+++ b/apps/browser/src/autofill/overlay/notifications/abstractions/overlay-notifications-content.service.ts
@@ -17,6 +17,7 @@ export type NotificationsExtensionMessage = {
     error?: string;
     closedByUser?: boolean;
     fadeOutNotification?: boolean;
+    params: object;
   };
 };
 
diff --git a/apps/browser/src/autofill/overlay/notifications/content/__snapshots__/overlay-notifications-content.service.spec.ts.snap b/apps/browser/src/autofill/overlay/notifications/content/__snapshots__/overlay-notifications-content.service.spec.ts.snap
index c20626212fa..18c3baa876c 100644
--- a/apps/browser/src/autofill/overlay/notifications/content/__snapshots__/overlay-notifications-content.service.spec.ts.snap
+++ b/apps/browser/src/autofill/overlay/notifications/content/__snapshots__/overlay-notifications-content.service.spec.ts.snap
@@ -8,7 +8,7 @@ exports[`OverlayNotificationsContentService opening the notification bar creates
   <iframe
     id="bit-notification-bar-iframe"
     src="chrome-extension://id/notification/bar.html"
-    style="width: 100% !important; height: 100% !important; border: 0px !important; display: block !important; position: relative !important; transition: transform 0.15s ease-out, opacity 0.15s ease !important; border-radius: 4px !important; transform: translateX(0) !important; opacity: 0;"
+    style="width: 100% !important; height: 100% !important; border: 0px !important; display: block !important; position: relative !important; transition: transform 0.15s ease-out, opacity 0.15s ease !important; border-radius: 4px !important; color-scheme: normal !important; transform: translateX(0) !important; opacity: 0;"
   />
 </div>
 `;
diff --git a/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.spec.ts b/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.spec.ts
index 28db10b35fa..7339325bd93 100644
--- a/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.spec.ts
+++ b/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.spec.ts
@@ -4,6 +4,8 @@ import AutofillInit from "../../../content/autofill-init";
 import { DomQueryService } from "../../../services/abstractions/dom-query.service";
 import DomElementVisibilityService from "../../../services/dom-element-visibility.service";
 import { flushPromises, sendMockExtensionMessage } from "../../../spec/testing-utils";
+import * as utils from "../../../utils";
+import { sendExtensionMessage } from "../../../utils";
 import { NotificationTypeData } from "../abstractions/overlay-notifications-content.service";
 
 import { OverlayNotificationsContentService } from "./overlay-notifications-content.service";
@@ -17,6 +19,11 @@ describe("OverlayNotificationsContentService", () => {
 
   beforeEach(() => {
     jest.useFakeTimers();
+    jest
+      .spyOn(utils, "sendExtensionMessage")
+      .mockImplementation((command: string) =>
+        Promise.resolve(command === "notificationRefreshFlagValue" ? false : true),
+      );
     domQueryService = mock<DomQueryService>();
     domElementVisibilityService = new DomElementVisibilityService();
     overlayNotificationsContentService = new OverlayNotificationsContentService();
@@ -44,6 +51,37 @@ describe("OverlayNotificationsContentService", () => {
       expect(bodyAppendChildSpy).not.toHaveBeenCalled();
     });
 
+    it("applies correct styles when notificationRefreshFlag is true", async () => {
+      (sendExtensionMessage as jest.Mock).mockResolvedValue(true);
+      sendMockExtensionMessage({
+        command: "openNotificationBar",
+        data: {
+          type: "change",
+          typeData: mock<NotificationTypeData>(),
+        },
+      });
+      await flushPromises();
+
+      const barElement = overlayNotificationsContentService["notificationBarElement"]!;
+      expect(barElement.style.height).toBe("400px");
+      expect(barElement.style.right).toBe("0px");
+    });
+
+    it("applies correct styles when notificationRefreshFlag is false", async () => {
+      sendMockExtensionMessage({
+        command: "openNotificationBar",
+        data: {
+          type: "change",
+          typeData: mock<NotificationTypeData>(),
+        },
+      });
+      await flushPromises();
+
+      const barElement = overlayNotificationsContentService["notificationBarElement"]!;
+      expect(barElement.style.height).toBe("82px");
+      expect(barElement.style.right).toBe("10px");
+    });
+
     it("closes the notification bar if the notification bar type has changed", async () => {
       overlayNotificationsContentService["currentNotificationBarType"] = "add";
       const closeNotificationBarSpy = jest.spyOn(
@@ -174,10 +212,7 @@ describe("OverlayNotificationsContentService", () => {
 
       jest.advanceTimersByTime(150);
 
-      expect(chrome.runtime.sendMessage).toHaveBeenCalledWith(
-        { command: "bgRemoveTabFromNotificationQueue" },
-        expect.any(Function),
-      );
+      expect(sendExtensionMessage).toHaveBeenCalledWith("bgRemoveTabFromNotificationQueue");
     });
 
     it("closes the notification bar without a fadeout", () => {
diff --git a/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.ts b/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.ts
index a2e1d6e49a0..53cbde9cdfb 100644
--- a/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.ts
+++ b/apps/browser/src/autofill/overlay/notifications/content/overlay-notifications-content.service.ts
@@ -2,7 +2,11 @@
 // @ts-strict-ignore
 import { EVENTS } from "@bitwarden/common/autofill/constants";
 
-import { NotificationBarIframeInitData } from "../../../notification/abstractions/notification-bar";
+import {
+  NotificationBarIframeInitData,
+  NotificationType,
+  NotificationTypes,
+} from "../../../notification/abstractions/notification-bar";
 import { sendExtensionMessage, setElementStyles } from "../../../utils";
 import {
   NotificationsExtensionMessage,
@@ -15,27 +19,34 @@ export class OverlayNotificationsContentService
 {
   private notificationBarElement: HTMLElement | null = null;
   private notificationBarIframeElement: HTMLIFrameElement | null = null;
-  private currentNotificationBarType: string | null = null;
-  private removeTabFromNotificationQueueTypes = new Set(["add", "change"]);
+  private currentNotificationBarType: NotificationType | null = null;
   private notificationRefreshFlag: boolean = false;
-  private notificationBarElementStyles: Partial<CSSStyleDeclaration> = {
-    height: "82px",
-    width: "430px",
-    maxWidth: "calc(100% - 20px)",
-    minHeight: "initial",
-    top: "10px",
-    right: "10px",
-    padding: "0",
-    position: "fixed",
-    zIndex: "2147483647",
-    visibility: "visible",
-    borderRadius: "4px",
-    border: "none",
-    backgroundColor: "transparent",
-    overflow: "hidden",
-    transition: "box-shadow 0.15s ease",
-    transitionDelay: "0.15s",
-  };
+  private getNotificationBarStyles(): Partial<CSSStyleDeclaration> {
+    const styles: Partial<CSSStyleDeclaration> = {
+      height: "400px",
+      width: "430px",
+      maxWidth: "calc(100% - 20px)",
+      minHeight: "initial",
+      top: "10px",
+      right: "0px",
+      padding: "0",
+      position: "fixed",
+      zIndex: "2147483647",
+      visibility: "visible",
+      borderRadius: "4px",
+      border: "none",
+      backgroundColor: "transparent",
+      overflow: "hidden",
+      transition: "box-shadow 0.15s ease",
+      transitionDelay: "0.15s",
+    };
+
+    if (!this.notificationRefreshFlag) {
+      styles.height = "82px";
+      styles.right = "10px";
+    }
+    return styles;
+  }
   private notificationBarIframeElementStyles: Partial<CSSStyleDeclaration> = {
     width: "100%",
     height: "100%",
@@ -44,6 +55,7 @@ export class OverlayNotificationsContentService
     position: "relative",
     transition: "transform 0.15s ease-out, opacity 0.15s ease",
     borderRadius: "4px",
+    colorScheme: "normal",
   };
   private readonly extensionMessageHandlers: OverlayNotificationsExtensionMessageHandlers = {
     openNotificationBar: ({ message }) => this.handleOpenNotificationBarMessage(message),
@@ -55,10 +67,6 @@ export class OverlayNotificationsContentService
 
   constructor() {
     void sendExtensionMessage("checkNotificationQueue");
-    void sendExtensionMessage("notificationRefreshFlagValue").then((notificationRefreshFlag) => {
-      this.notificationRefreshFlag = !!notificationRefreshFlag;
-      this.setNotificationRefreshBarHeight();
-    });
   }
 
   /**
@@ -74,24 +82,29 @@ export class OverlayNotificationsContentService
    *
    * @param message - The message containing the initialization data for the notification bar.
    */
-  private handleOpenNotificationBarMessage(message: NotificationsExtensionMessage) {
+  private async handleOpenNotificationBarMessage(message: NotificationsExtensionMessage) {
     if (!message.data) {
       return;
     }
+    const { type, typeData, params } = message.data;
 
-    const { type, typeData } = message.data;
     if (this.currentNotificationBarType && type !== this.currentNotificationBarType) {
       this.closeNotificationBar();
     }
     const initData = {
-      type,
+      type: type as NotificationType,
       isVaultLocked: typeData.isVaultLocked,
       theme: typeData.theme,
       removeIndividualVault: typeData.removeIndividualVault,
       importType: typeData.importType,
       launchTimestamp: typeData.launchTimestamp,
+      params,
     };
 
+    await sendExtensionMessage("notificationRefreshFlagValue").then((notificationRefreshFlag) => {
+      this.notificationRefreshFlag = !!notificationRefreshFlag;
+    });
+
     if (globalThis.document.readyState === "loading") {
       document.addEventListener("DOMContentLoaded", () => this.openNotificationBar(initData));
       return;
@@ -223,32 +236,12 @@ export class OverlayNotificationsContentService
       this.notificationBarElement = globalThis.document.createElement("div");
       this.notificationBarElement.id = "bit-notification-bar";
 
-      setElementStyles(this.notificationBarElement, this.notificationBarElementStyles, true);
-      this.setNotificationRefreshBarHeight();
+      setElementStyles(this.notificationBarElement, this.getNotificationBarStyles(), true);
 
       this.notificationBarElement.appendChild(this.notificationBarIframeElement);
     }
   }
 
-  /**
-   * Sets the height of the notification bar based on the value of `notificationRefreshFlag`.
-   * If the flag is `true`, the bar is expanded to 400px and aligned right.
-   * If the flag is `false`, `null`, or `undefined`, it defaults to height of 82px.
-   * Skips if the notification bar element has not yet been created.
-   *
-   */
-  private setNotificationRefreshBarHeight() {
-    const isNotificationV3 = !!this.notificationRefreshFlag;
-
-    if (!this.notificationBarElement) {
-      return;
-    }
-
-    if (isNotificationV3) {
-      setElementStyles(this.notificationBarElement, { height: "400px", right: "0" }, true);
-    }
-  }
-
   /**
    * Sets up the message listener for the initialization of the notification bar.
    * This will send the initialization data to the notification bar iframe.
@@ -291,10 +284,13 @@ export class OverlayNotificationsContentService
     this.notificationBarElement.remove();
     this.notificationBarElement = null;
 
-    if (
-      closedByUserAction &&
-      this.removeTabFromNotificationQueueTypes.has(this.currentNotificationBarType)
-    ) {
+    const removableNotificationTypes = new Set([
+      NotificationTypes.Add,
+      NotificationTypes.Change,
+      NotificationTypes.AtRiskPassword,
+    ] as NotificationType[]);
+
+    if (closedByUserAction && removableNotificationTypes.has(this.currentNotificationBarType)) {
       void sendExtensionMessage("bgRemoveTabFromNotificationQueue");
     }
 
diff --git a/apps/browser/src/autofill/popup/fido2/fido2-cipher-row.component.ts b/apps/browser/src/autofill/popup/fido2/fido2-cipher-row.component.ts
index 02df3ffe9b3..074e23d642d 100644
--- a/apps/browser/src/autofill/popup/fido2/fido2-cipher-row.component.ts
+++ b/apps/browser/src/autofill/popup/fido2/fido2-cipher-row.component.ts
@@ -17,7 +17,6 @@ import {
   selector: "app-fido2-cipher-row",
   templateUrl: "fido2-cipher-row.component.html",
   changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
   imports: [
     BadgeModule,
     ButtonModule,
diff --git a/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link.component.ts b/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link.component.ts
index 91d97ac96dc..27fe88130de 100644
--- a/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link.component.ts
+++ b/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link.component.ts
@@ -20,7 +20,6 @@ import { BrowserFido2UserInterfaceSession } from "../../fido2/services/browser-f
 @Component({
   selector: "app-fido2-use-browser-link",
   templateUrl: "fido2-use-browser-link.component.html",
-  standalone: true,
   imports: [A11yModule, CdkConnectedOverlay, CdkOverlayOrigin, CommonModule, JslibModule],
   animations: [
     trigger("transformPanel", [
diff --git a/apps/browser/src/autofill/popup/fido2/fido2.component.ts b/apps/browser/src/autofill/popup/fido2/fido2.component.ts
index 6b7d9120195..ac38fe2f894 100644
--- a/apps/browser/src/autofill/popup/fido2/fido2.component.ts
+++ b/apps/browser/src/autofill/popup/fido2/fido2.component.ts
@@ -18,13 +18,13 @@ import {
 } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
@@ -74,7 +74,6 @@ interface ViewData {
 @Component({
   selector: "app-fido2",
   templateUrl: "fido2.component.html",
-  standalone: true,
   imports: [
     ButtonModule,
     CommonModule,
@@ -442,10 +441,10 @@ export class Fido2Component implements OnInit, OnDestroy {
     );
 
     this.buildCipher(name, username);
-    const cipher = await this.cipherService.encrypt(this.cipher, activeUserId);
+    const encrypted = await this.cipherService.encrypt(this.cipher, activeUserId);
     try {
-      await this.cipherService.createWithServer(cipher);
-      this.cipher.id = cipher.id;
+      await this.cipherService.createWithServer(encrypted);
+      this.cipher.id = encrypted.cipher.id;
     } catch (e) {
       this.logService.error(e);
     }
diff --git a/apps/browser/src/autofill/popup/settings/autofill.component.html b/apps/browser/src/autofill/popup/settings/autofill.component.html
index 264b04b039b..543c7482bf7 100644
--- a/apps/browser/src/autofill/popup/settings/autofill.component.html
+++ b/apps/browser/src/autofill/popup/settings/autofill.component.html
@@ -65,7 +65,10 @@
             {{ "showInlineMenuIdentitiesLabel" | i18n }}
           </bit-label>
         </bit-form-control>
-        <bit-form-control *ngIf="enableInlineMenu" class="tw-ml-5">
+        <bit-form-control
+          *ngIf="enableInlineMenu && !(restrictedCardType$ | async)"
+          class="tw-ml-5"
+        >
           <input
             bitCheckbox
             id="show-inline-menu-cards"
@@ -114,7 +117,7 @@
             </a>
           </bit-hint>
         </bit-form-control>
-        <bit-form-control>
+        <bit-form-control *ngIf="!(restrictedCardType$ | async)">
           <input
             bitCheckbox
             id="showCardsSuggestions"
@@ -259,10 +262,15 @@
                 *ngFor="let option of uriMatchOptions"
                 [label]="option.name"
                 [value]="option.value"
+                [disabled]="option.disabled"
               ></bit-option>
             </bit-select>
-            <bit-hint class="tw-text-sm" id="defaultUriMatchHelp">
-              {{ "defaultUriMatchDetectionDesc" | i18n }}
+            <bit-hint *ngIf="getMatchHints() as hints">
+              {{ hints[0] | i18n }}
+              <ng-container *ngIf="hints.length > 1">
+                <b>{{ "warningCapitalized" | i18n }}:</b>
+                {{ hints[1] | i18n }}
+              </ng-container>
             </bit-hint>
           </bit-form-field>
         </bit-card>
diff --git a/apps/browser/src/autofill/popup/settings/autofill.component.ts b/apps/browser/src/autofill/popup/settings/autofill.component.ts
index e1a5a2fc218..19afb903cb8 100644
--- a/apps/browser/src/autofill/popup/settings/autofill.component.ts
+++ b/apps/browser/src/autofill/popup/settings/autofill.component.ts
@@ -11,7 +11,17 @@ import {
   ReactiveFormsModule,
 } from "@angular/forms";
 import { RouterModule } from "@angular/router";
-import { filter, firstValueFrom, Observable, switchMap } from "rxjs";
+import {
+  concatMap,
+  filter,
+  firstValueFrom,
+  map,
+  Observable,
+  pairwise,
+  shareReplay,
+  startWith,
+  switchMap,
+} from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
@@ -44,6 +54,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import {
   CardComponent,
   CheckboxModule,
@@ -57,6 +69,7 @@ import {
   SelectModule,
   TypographyModule,
 } from "@bitwarden/components";
+import { AdvancedUriOptionDialogComponent } from "@bitwarden/vault";
 
 import { AutofillBrowserSettingsService } from "../../../autofill/services/autofill-browser-settings.service";
 import { BrowserApi } from "../../../platform/browser/browser-api";
@@ -66,7 +79,6 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
 
 @Component({
   templateUrl: "autofill.component.html",
-  standalone: true,
   imports: [
     CardComponent,
     CheckboxModule,
@@ -112,6 +124,11 @@ export class AutofillComponent implements OnInit {
       this.nudgesService.showNudgeSpotlight$(NudgeType.AutofillNudge, account.id),
     ),
   );
+  protected restrictedCardType$: Observable<boolean> =
+    this.restrictedItemTypesService.restricted$.pipe(
+      map((restrictedTypes) => restrictedTypes.some((type) => type.cipherType === CipherType.Card)),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
 
   protected autofillOnPageLoadForm = new FormGroup({
     autofillOnPageLoad: new FormControl(),
@@ -125,6 +142,7 @@ export class AutofillComponent implements OnInit {
     defaultUriMatch: new FormControl(),
   });
 
+  advancedOptionWarningMap: Partial<Record<UriMatchStrategySetting, string>>;
   enableAutofillOnPageLoad: boolean = false;
   enableInlineMenu: boolean = false;
   enableInlineMenuOnIconSelect: boolean = false;
@@ -137,7 +155,7 @@ export class AutofillComponent implements OnInit {
   clearClipboard: ClearClipboardDelaySetting;
   clearClipboardOptions: { name: string; value: ClearClipboardDelaySetting }[];
   defaultUriMatch: UriMatchStrategySetting = UriMatchStrategy.Domain;
-  uriMatchOptions: { name: string; value: UriMatchStrategySetting }[];
+  uriMatchOptions: { name: string; value: UriMatchStrategySetting; disabled?: boolean }[];
   showCardsCurrentTab: boolean = true;
   showIdentitiesCurrentTab: boolean = true;
   autofillKeyboardHelperText: string;
@@ -157,6 +175,7 @@ export class AutofillComponent implements OnInit {
     private nudgesService: NudgesService,
     private accountService: AccountService,
     private autofillBrowserSettingsService: AutofillBrowserSettingsService,
+    private restrictedItemTypesService: RestrictedItemTypesService,
   ) {
     this.autofillOnPageLoadOptions = [
       { name: this.i18nService.t("autoFillOnPageLoadYes"), value: true },
@@ -174,11 +193,16 @@ export class AutofillComponent implements OnInit {
     this.uriMatchOptions = [
       { name: i18nService.t("baseDomainOptionRecommended"), value: UriMatchStrategy.Domain },
       { name: i18nService.t("host"), value: UriMatchStrategy.Host },
-      { name: i18nService.t("startsWith"), value: UriMatchStrategy.StartsWith },
-      { name: i18nService.t("regEx"), value: UriMatchStrategy.RegularExpression },
       { name: i18nService.t("exact"), value: UriMatchStrategy.Exact },
       { name: i18nService.t("never"), value: UriMatchStrategy.Never },
+      { name: this.i18nService.t("uriAdvancedOption"), value: null, disabled: true },
+      { name: i18nService.t("startsWith"), value: UriMatchStrategy.StartsWith },
+      { name: i18nService.t("regEx"), value: UriMatchStrategy.RegularExpression },
     ];
+    this.advancedOptionWarningMap = {
+      [UriMatchStrategy.StartsWith]: "startsWithAdvancedOptionWarning",
+      [UriMatchStrategy.RegularExpression]: "regExAdvancedOptionWarning",
+    };
 
     this.browserClientVendor = BrowserApi.getBrowserClientVendor(window);
     this.disablePasswordManagerURI = DisablePasswordManagerUris[this.browserClientVendor];
@@ -312,10 +336,13 @@ export class AutofillComponent implements OnInit {
       });
 
     this.additionalOptionsForm.controls.defaultUriMatch.valueChanges
-      .pipe(takeUntilDestroyed(this.destroyRef))
-      .subscribe((value) => {
-        void this.domainSettingsService.setDefaultUriMatchStrategy(value);
-      });
+      .pipe(
+        startWith(this.defaultUriMatch),
+        pairwise(),
+        concatMap(([previous, current]) => this.handleAdvancedMatch(previous, current)),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe();
 
     const command = await this.platformUtilsService.getAutofillKeyboardShortcut();
     await this.setAutofillKeyboardHelperText(command);
@@ -334,11 +361,24 @@ export class AutofillComponent implements OnInit {
     return null;
   }
 
+  get browserClientVendorExtended() {
+    if (this.browserClientVendor !== BrowserClientVendors.Unknown) {
+      return this.browserClientVendor;
+    }
+    if (this.platformUtilsService.isFirefox()) {
+      return "Firefox";
+    }
+    if (this.platformUtilsService.isSafari()) {
+      return "Safari";
+    }
+    return BrowserClientVendors.Unknown;
+  }
+
   get spotlightButtonText() {
-    if (this.browserClientVendor === BrowserClientVendors.Unknown) {
+    if (this.browserClientVendorExtended === BrowserClientVendors.Unknown) {
       return this.i18nService.t("turnOffAutofill");
     }
-    return this.i18nService.t("turnOffBrowserAutofill", this.browserClientVendor);
+    return this.i18nService.t("turnOffBrowserAutofill", this.browserClientVendorExtended);
   }
 
   async dismissSpotlight() {
@@ -490,6 +530,29 @@ export class AutofillComponent implements OnInit {
     await this.updateDefaultBrowserAutofillDisabled();
   };
 
+  private async handleAdvancedMatch(
+    previous: UriMatchStrategySetting | null,
+    current: UriMatchStrategySetting | null,
+  ): Promise<void> {
+    const valueChange = previous !== current;
+    const isAdvanced =
+      current === UriMatchStrategy.StartsWith || current === UriMatchStrategy.RegularExpression;
+    if (!valueChange || !isAdvanced) {
+      return await this.domainSettingsService.setDefaultUriMatchStrategy(current);
+    }
+    AdvancedUriOptionDialogComponent.open(this.dialogService, {
+      contentKey: this.advancedOptionWarningMap[current],
+      onContinue: async () => {
+        this.additionalOptionsForm.controls.defaultUriMatch.setValue(current);
+        await this.domainSettingsService.setDefaultUriMatchStrategy(current);
+      },
+      onCancel: async () => {
+        this.additionalOptionsForm.controls.defaultUriMatch.setValue(previous);
+        await this.domainSettingsService.setDefaultUriMatchStrategy(previous);
+      },
+    });
+  }
+
   async privacyPermissionGranted(): Promise<boolean> {
     return await BrowserApi.permissionsGranted(["privacy"]);
   }
@@ -509,4 +572,17 @@ export class AutofillComponent implements OnInit {
   async updateShowInlineMenuIdentities() {
     await this.autofillSettingsService.setShowInlineMenuIdentities(this.showInlineMenuIdentities);
   }
+
+  getMatchHints() {
+    const hints = ["uriMatchDefaultStrategyHint"];
+    const strategy = this.additionalOptionsForm.get("defaultUriMatch")
+      ?.value as UriMatchStrategySetting;
+    if (
+      strategy === UriMatchStrategy.StartsWith ||
+      strategy === UriMatchStrategy.RegularExpression
+    ) {
+      hints.push(this.advancedOptionWarningMap[strategy]);
+    }
+    return hints;
+  }
 }
diff --git a/apps/browser/src/autofill/popup/settings/blocked-domains.component.ts b/apps/browser/src/autofill/popup/settings/blocked-domains.component.ts
index c59ce24c7c4..15379eff436 100644
--- a/apps/browser/src/autofill/popup/settings/blocked-domains.component.ts
+++ b/apps/browser/src/autofill/popup/settings/blocked-domains.component.ts
@@ -44,7 +44,6 @@ import { PopupRouterCacheService } from "../../../platform/popup/view-cache/popu
 @Component({
   selector: "app-blocked-domains",
   templateUrl: "blocked-domains.component.html",
-  standalone: true,
   imports: [
     ButtonModule,
     CardComponent,
diff --git a/apps/browser/src/autofill/popup/settings/excluded-domains.component.ts b/apps/browser/src/autofill/popup/settings/excluded-domains.component.ts
index 504d2dbfc17..a5bfad726f5 100644
--- a/apps/browser/src/autofill/popup/settings/excluded-domains.component.ts
+++ b/apps/browser/src/autofill/popup/settings/excluded-domains.component.ts
@@ -45,7 +45,6 @@ import { PopupRouterCacheService } from "../../../platform/popup/view-cache/popu
 @Component({
   selector: "app-excluded-domains",
   templateUrl: "excluded-domains.component.html",
-  standalone: true,
   imports: [
     ButtonModule,
     CardComponent,
diff --git a/apps/browser/src/autofill/popup/settings/notifications.component.ts b/apps/browser/src/autofill/popup/settings/notifications.component.ts
index 476b601c4e5..cb10dec620b 100644
--- a/apps/browser/src/autofill/popup/settings/notifications.component.ts
+++ b/apps/browser/src/autofill/popup/settings/notifications.component.ts
@@ -23,7 +23,6 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
 
 @Component({
   templateUrl: "notifications.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/apps/browser/src/autofill/services/autofill-badge-updater.service.ts b/apps/browser/src/autofill/services/autofill-badge-updater.service.ts
new file mode 100644
index 00000000000..42cb8886216
--- /dev/null
+++ b/apps/browser/src/autofill/services/autofill-badge-updater.service.ts
@@ -0,0 +1,163 @@
+import { combineLatest, distinctUntilChanged, mergeMap, of, Subject, switchMap } from "rxjs";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { BadgeSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/badge-settings.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { UserId } from "@bitwarden/common/types/guid";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+
+import { BadgeService } from "../../platform/badge/badge.service";
+import { BadgeStatePriority } from "../../platform/badge/priority";
+import { BrowserApi } from "../../platform/browser/browser-api";
+
+const StateName = (tabId: number) => `autofill-badge-${tabId}`;
+
+export class AutofillBadgeUpdaterService {
+  private tabReplaced$ = new Subject<{ addedTab: chrome.tabs.Tab; removedTabId: number }>();
+  private tabUpdated$ = new Subject<chrome.tabs.Tab>();
+  private tabRemoved$ = new Subject<number>();
+
+  constructor(
+    private badgeService: BadgeService,
+    private accountService: AccountService,
+    private cipherService: CipherService,
+    private badgeSettingsService: BadgeSettingsServiceAbstraction,
+    private logService: LogService,
+  ) {
+    const cipherViews$ = this.accountService.activeAccount$.pipe(
+      switchMap((account) => (account?.id ? this.cipherService.cipherViews$(account?.id) : of([]))),
+    );
+
+    combineLatest({
+      account: this.accountService.activeAccount$,
+      enableBadgeCounter:
+        this.badgeSettingsService.enableBadgeCounter$.pipe(distinctUntilChanged()),
+      ciphers: cipherViews$,
+    })
+      .pipe(
+        mergeMap(async ({ account, enableBadgeCounter, ciphers }) => {
+          if (!account) {
+            return;
+          }
+
+          const tabs = await BrowserApi.tabsQuery({});
+          for (const tab of tabs) {
+            if (!tab.id) {
+              continue;
+            }
+
+            if (enableBadgeCounter) {
+              await this.setTabState(tab, account.id);
+            } else {
+              await this.clearTabState(tab.id);
+            }
+          }
+        }),
+      )
+      .subscribe();
+
+    combineLatest({
+      account: this.accountService.activeAccount$,
+      enableBadgeCounter: this.badgeSettingsService.enableBadgeCounter$,
+      replaced: this.tabReplaced$,
+      ciphers: cipherViews$,
+    })
+      .pipe(
+        mergeMap(async ({ account, enableBadgeCounter, replaced }) => {
+          if (!account || !enableBadgeCounter) {
+            return;
+          }
+
+          await this.clearTabState(replaced.removedTabId);
+          await this.setTabState(replaced.addedTab, account.id);
+        }),
+      )
+      .subscribe();
+
+    combineLatest({
+      account: this.accountService.activeAccount$,
+      enableBadgeCounter: this.badgeSettingsService.enableBadgeCounter$,
+      tab: this.tabUpdated$,
+      ciphers: cipherViews$,
+    })
+      .pipe(
+        mergeMap(async ({ account, enableBadgeCounter, tab }) => {
+          if (!account || !enableBadgeCounter) {
+            return;
+          }
+
+          await this.setTabState(tab, account.id);
+        }),
+      )
+      .subscribe();
+
+    combineLatest({
+      account: this.accountService.activeAccount$,
+      enableBadgeCounter: this.badgeSettingsService.enableBadgeCounter$,
+      tabId: this.tabRemoved$,
+      ciphers: cipherViews$,
+    })
+      .pipe(
+        mergeMap(async ({ account, enableBadgeCounter, tabId }) => {
+          if (!account || !enableBadgeCounter) {
+            return;
+          }
+
+          await this.clearTabState(tabId);
+        }),
+      )
+      .subscribe();
+  }
+
+  init() {
+    BrowserApi.addListener(chrome.tabs.onReplaced, async (addedTabId, removedTabId) => {
+      const newTab = await BrowserApi.getTab(addedTabId);
+      if (!newTab) {
+        this.logService.warning(
+          `Tab replaced event received but new tab not found (id: ${addedTabId})`,
+        );
+        return;
+      }
+
+      this.tabReplaced$.next({
+        removedTabId,
+        addedTab: newTab,
+      });
+    });
+    BrowserApi.addListener(chrome.tabs.onUpdated, (_, changeInfo, tab) => {
+      if (changeInfo.url) {
+        this.tabUpdated$.next(tab);
+      }
+    });
+    BrowserApi.addListener(chrome.tabs.onRemoved, (tabId, _) => this.tabRemoved$.next(tabId));
+  }
+
+  private async setTabState(tab: chrome.tabs.Tab, userId: UserId) {
+    if (!tab.id) {
+      this.logService.warning("Tab event received but tab id is undefined");
+      return;
+    }
+
+    const ciphers = tab.url ? await this.cipherService.getAllDecryptedForUrl(tab.url, userId) : [];
+    const cipherCount = ciphers.length;
+
+    if (cipherCount === 0) {
+      await this.clearTabState(tab.id);
+      return;
+    }
+
+    const countText = cipherCount > 9 ? "9+" : cipherCount.toString();
+    await this.badgeService.setState(
+      StateName(tab.id),
+      BadgeStatePriority.Default,
+      {
+        text: countText,
+      },
+      tab.id,
+    );
+  }
+
+  private async clearTabState(tabId: number) {
+    await this.badgeService.clearState(StateName(tabId));
+  }
+}
diff --git a/apps/browser/src/autofill/services/autofill-browser-settings.service.ts b/apps/browser/src/autofill/services/autofill-browser-settings.service.ts
index ba59a655b77..ed95027cf32 100644
--- a/apps/browser/src/autofill/services/autofill-browser-settings.service.ts
+++ b/apps/browser/src/autofill/services/autofill-browser-settings.service.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { Injectable } from "@angular/core";
 import { BehaviorSubject, Observable } from "rxjs";
 
diff --git a/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts b/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts
index 48bc7ceafda..730b002953b 100644
--- a/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts
+++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts
@@ -6,7 +6,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import AutofillInit from "../content/autofill-init";
 import {
   AutofillOverlayElement,
-  InlineMenuFillType,
+  InlineMenuFillTypes,
   MAX_SUB_FRAME_DEPTH,
   RedirectFocusDirection,
 } from "../enums/autofill-overlay.enum";
@@ -1383,7 +1383,7 @@ describe("AutofillOverlayContentService", () => {
           );
           expect(autofillFieldElement.removeEventListener).toHaveBeenCalled();
           expect(inputAccountFieldData.inlineMenuFillType).toEqual(
-            InlineMenuFillType.AccountCreationUsername,
+            InlineMenuFillTypes.AccountCreationUsername,
           );
         });
 
@@ -1420,7 +1420,7 @@ describe("AutofillOverlayContentService", () => {
           await flushPromises();
 
           expect(currentPasswordFieldData.inlineMenuFillType).toEqual(
-            InlineMenuFillType.CurrentPasswordUpdate,
+            InlineMenuFillTypes.CurrentPasswordUpdate,
           );
         });
       });
diff --git a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
index dc8f45d104b..1a972e0eaa0 100644
--- a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
+++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
@@ -24,7 +24,7 @@ import { AutofillFieldQualifier, AutofillFieldQualifierType } from "../enums/aut
 import {
   AutofillOverlayElement,
   InlineMenuAccountCreationFieldType,
-  InlineMenuFillType,
+  InlineMenuFillTypes,
   MAX_SUB_FRAME_DEPTH,
   RedirectFocusDirection,
 } from "../enums/autofill-overlay.enum";
@@ -789,11 +789,11 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
     if (!autofillFieldData.fieldQualifier) {
       switch (autofillFieldData.inlineMenuFillType) {
         case CipherType.Login:
-        case InlineMenuFillType.CurrentPasswordUpdate:
+        case InlineMenuFillTypes.CurrentPasswordUpdate:
           this.qualifyUserFilledField(autofillFieldData, this.loginFieldQualifiers);
           break;
-        case InlineMenuFillType.AccountCreationUsername:
-        case InlineMenuFillType.PasswordGeneration:
+        case InlineMenuFillTypes.AccountCreationUsername:
+        case InlineMenuFillTypes.PasswordGeneration:
           this.qualifyUserFilledField(autofillFieldData, this.accountCreationFieldQualifiers);
           break;
         case CipherType.Card:
@@ -1106,18 +1106,18 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
    */
   private setQualifiedAccountCreationFillType(autofillFieldData: AutofillField) {
     if (this.inlineMenuFieldQualificationService.isNewPasswordField(autofillFieldData)) {
-      autofillFieldData.inlineMenuFillType = InlineMenuFillType.PasswordGeneration;
+      autofillFieldData.inlineMenuFillType = InlineMenuFillTypes.PasswordGeneration;
       this.qualifyAccountCreationFieldType(autofillFieldData);
       return;
     }
 
     if (this.inlineMenuFieldQualificationService.isUpdateCurrentPasswordField(autofillFieldData)) {
-      autofillFieldData.inlineMenuFillType = InlineMenuFillType.CurrentPasswordUpdate;
+      autofillFieldData.inlineMenuFillType = InlineMenuFillTypes.CurrentPasswordUpdate;
       return;
     }
 
     if (this.inlineMenuFieldQualificationService.isUsernameField(autofillFieldData)) {
-      autofillFieldData.inlineMenuFillType = InlineMenuFillType.AccountCreationUsername;
+      autofillFieldData.inlineMenuFillType = InlineMenuFillTypes.AccountCreationUsername;
       this.qualifyAccountCreationFieldType(autofillFieldData);
     }
   }
diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index fdd881c2760..6aa99bbda41 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -49,6 +49,8 @@ import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"
 
 import { BrowserApi } from "../../platform/browser/browser-api";
 import { ScriptInjectorService } from "../../platform/services/abstractions/script-injector.service";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openVaultItemPasswordRepromptPopout } from "../../vault/popup/utils/vault-popout-window";
 import { AutofillMessageCommand, AutofillMessageSender } from "../enums/autofill-message.enums";
 import { AutofillPort } from "../enums/autofill-port.enum";
diff --git a/apps/browser/src/autofill/services/notification-change-login-password.service.ts b/apps/browser/src/autofill/services/notification-change-login-password.service.ts
new file mode 100644
index 00000000000..f7b8c2cfb9c
--- /dev/null
+++ b/apps/browser/src/autofill/services/notification-change-login-password.service.ts
@@ -0,0 +1,99 @@
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+
+// Duplicates Default Change Login Password Service, for now
+// Since the former is an Angular injectable service, and we
+// need to use the function inside of lit components.
+// If primary service can be abstracted, that would be ideal.
+
+export class TemporaryNotificationChangeLoginService {
+  async getChangePasswordUrl(cipher: CipherView, fallback = false): Promise<string | null> {
+    // Ensure we have a cipher with at least one URI
+    if (cipher.type !== CipherType.Login || cipher.login == null || !cipher.login.hasUris) {
+      return null;
+    }
+
+    // Filter for valid URLs that are HTTP(S)
+    const urls = cipher.login.uris
+      .map((m) => Utils.getUrl(m.uri))
+      .filter((m) => m != null && (m.protocol === "http:" || m.protocol === "https:"));
+
+    if (urls.length === 0) {
+      return null;
+    }
+
+    for (const url of urls) {
+      const [reliable, wellKnownChangeUrl] = await Promise.all([
+        this.hasReliableHttpStatusCode(url.origin),
+        this.getWellKnownChangePasswordUrl(url.origin),
+      ]);
+
+      // Some servers return a 200 OK for a resource that should not exist
+      // Which means we cannot trust the well-known URL is valid, so we skip it
+      // to avoid potentially sending users to a 404 page
+      if (reliable && wellKnownChangeUrl != null) {
+        return wellKnownChangeUrl;
+      }
+    }
+
+    // No reliable well-known URL found, fallback to the first URL
+
+    // @TODO reimplement option in original service to indicate if no URL found.
+    // return urls[0].href; (originally)
+    return fallback ? urls[0].href : null;
+  }
+
+  /**
+   * Checks if the server returns a non-200 status code for a resource that should not exist.
+   * See https://w3c.github.io/webappsec-change-password-url/response-code-reliability.html#semantics
+   * @param urlOrigin The origin of the URL to check
+   */
+  private async hasReliableHttpStatusCode(urlOrigin: string): Promise<boolean> {
+    try {
+      const url = new URL(
+        "./.well-known/resource-that-should-not-exist-whose-status-code-should-not-be-200",
+        urlOrigin,
+      );
+
+      const request = new Request(url, {
+        method: "GET",
+        mode: "same-origin",
+        credentials: "omit",
+        cache: "no-store",
+        redirect: "follow",
+      });
+
+      const response = await fetch(request);
+      return !response.ok;
+    } catch {
+      return false;
+    }
+  }
+
+  /**
+   * Builds a well-known change password URL for the given origin. Attempts to fetch the URL to ensure a valid response
+   * is returned. Returns null if the request throws or the response is not 200 OK.
+   * See https://w3c.github.io/webappsec-change-password-url/
+   * @param urlOrigin The origin of the URL to check
+   */
+  private async getWellKnownChangePasswordUrl(urlOrigin: string): Promise<string | null> {
+    try {
+      const url = new URL("./.well-known/change-password", urlOrigin);
+
+      const request = new Request(url, {
+        method: "GET",
+        mode: "same-origin",
+        credentials: "omit",
+        cache: "no-store",
+        redirect: "follow",
+      });
+
+      const response = await fetch(request);
+
+      return response.ok ? url.toString() : null;
+    } catch {
+      return null;
+    }
+  }
+}
diff --git a/apps/browser/src/autofill/types/index.ts b/apps/browser/src/autofill/types/index.ts
index 30ebf38fef5..93bf35d1b3e 100644
--- a/apps/browser/src/autofill/types/index.ts
+++ b/apps/browser/src/autofill/types/index.ts
@@ -54,4 +54,7 @@ export type FormFieldElement = FillableFormFieldElement | HTMLSpanElement;
 
 export type FormElementWithAttribute = FormFieldElement & Record<string, string | null | undefined>;
 
-export type AutofillCipherTypeId = CipherType.Login | CipherType.Card | CipherType.Identity;
+export type AutofillCipherTypeId =
+  | typeof CipherType.Login
+  | typeof CipherType.Card
+  | typeof CipherType.Identity;
diff --git a/apps/browser/src/background/commands.background.ts b/apps/browser/src/background/commands.background.ts
index f09ebb6c8a1..3e6e86cd3d7 100644
--- a/apps/browser/src/background/commands.background.ts
+++ b/apps/browser/src/background/commands.background.ts
@@ -6,6 +6,8 @@ import { ExtensionCommand, ExtensionCommandType } from "@bitwarden/common/autofi
 import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openUnlockPopout } from "../auth/popup/utils/auth-popout-window";
 import { LockedVaultPendingNotificationsData } from "../autofill/background/abstractions/notification.background";
 import { BrowserApi } from "../platform/browser/browser-api";
diff --git a/apps/browser/src/background/main.background.spec.ts b/apps/browser/src/background/main.background.spec.ts
index c2cd38b7a30..83c4a9597ea 100644
--- a/apps/browser/src/background/main.background.spec.ts
+++ b/apps/browser/src/background/main.background.spec.ts
@@ -1,5 +1,5 @@
-// This test skips all the initilization of the background script and just
-// focuses on making sure we don't accidently delete the initilization of
+// This test skips all the initialization of the background script and just
+// focuses on making sure we don't accidentally delete the initialization of
 // background vault syncing. This has happened before!
 describe("MainBackground sync task scheduling", () => {
   it("includes code to schedule the sync interval task", () => {
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index a724f857cd1..0d7fe740069 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -6,8 +6,10 @@ import { filter, firstValueFrom, map, merge, Subject, timeout } from "rxjs";
 
 import { CollectionService, DefaultCollectionService } from "@bitwarden/admin-console/common";
 import {
+  AuthRequestApiServiceAbstraction,
   AuthRequestService,
   AuthRequestServiceAbstraction,
+  DefaultAuthRequestApiService,
   DefaultLockService,
   InternalUserDecryptionOptionsServiceAbstraction,
   LoginEmailServiceAbstraction,
@@ -20,7 +22,6 @@ import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstracti
 import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
-import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service";
 import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { InternalPolicyService as InternalPolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
@@ -172,7 +173,6 @@ import { ApiService } from "@bitwarden/common/services/api.service";
 import { AuditService } from "@bitwarden/common/services/audit.service";
 import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
-import { SearchService } from "@bitwarden/common/services/search.service";
 import {
   PasswordStrengthService,
   PasswordStrengthServiceAbstraction,
@@ -188,8 +188,10 @@ import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vau
 import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
 import { InternalFolderService as InternalFolderServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/vault/abstractions/search.service";
 import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/vault/abstractions/totp.service";
 import { VaultSettingsService as VaultSettingsServiceAbstraction } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
+import { ExtensionPageUrls } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import {
   DefaultEndUserNotificationService,
@@ -204,6 +206,8 @@ import { DefaultCipherEncryptionService } from "@bitwarden/common/vault/services
 import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";
 import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
 import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { SearchService } from "@bitwarden/common/vault/services/search.service";
 import { TotpService } from "@bitwarden/common/vault/services/totp.service";
 import { VaultSettingsService } from "@bitwarden/common/vault/services/vault-settings/vault-settings.service";
 import { DefaultTaskService, TaskService } from "@bitwarden/common/vault/tasks";
@@ -238,6 +242,7 @@ import {
   VaultExportServiceAbstraction,
 } from "@bitwarden/vault-export-core";
 
+import { AuthStatusBadgeUpdaterService } from "../auth/services/auth-status-badge-updater.service";
 import { OverlayNotificationsBackground as OverlayNotificationsBackgroundInterface } from "../autofill/background/abstractions/overlay-notifications.background";
 import { OverlayBackground as OverlayBackgroundInterface } from "../autofill/background/abstractions/overlay.background";
 import { AutoSubmitLoginBackground } from "../autofill/background/auto-submit-login.background";
@@ -257,16 +262,18 @@ import {
   BrowserFido2UserInterfaceService,
 } from "../autofill/fido2/services/browser-fido2-user-interface.service";
 import { AutofillService as AutofillServiceAbstraction } from "../autofill/services/abstractions/autofill.service";
+import { AutofillBadgeUpdaterService } from "../autofill/services/autofill-badge-updater.service";
 import AutofillService from "../autofill/services/autofill.service";
 import { InlineMenuFieldQualificationService } from "../autofill/services/inline-menu-field-qualification.service";
 import { SafariApp } from "../browser/safariApp";
 import { BackgroundBrowserBiometricsService } from "../key-management/biometrics/background-browser-biometrics.service";
 import VaultTimeoutService from "../key-management/vault-timeout/vault-timeout.service";
+import { DefaultBadgeBrowserApi } from "../platform/badge/badge-browser-api";
+import { BadgeService } from "../platform/badge/badge.service";
 import { BrowserApi } from "../platform/browser/browser-api";
 import { flagEnabled } from "../platform/flags";
 import { IpcBackgroundService } from "../platform/ipc/ipc-background.service";
 import { IpcContentScriptManagerService } from "../platform/ipc/ipc-content-script-manager.service";
-import { UpdateBadge } from "../platform/listeners/update-badge";
 /* eslint-disable no-restricted-imports */
 import { ChromeMessageSender } from "../platform/messaging/chrome-message.sender";
 /* eslint-enable no-restricted-imports */
@@ -374,6 +381,7 @@ export default class MainBackground {
   devicesService: DevicesServiceAbstraction;
   deviceTrustService: DeviceTrustServiceAbstraction;
   authRequestService: AuthRequestServiceAbstraction;
+  authRequestApiService: AuthRequestApiServiceAbstraction;
   accountService: AccountServiceAbstraction;
   globalStateProvider: GlobalStateProvider;
   pinService: PinServiceAbstraction;
@@ -411,10 +419,15 @@ export default class MainBackground {
   inlineMenuFieldQualificationService: InlineMenuFieldQualificationService;
   taskService: TaskService;
   cipherEncryptionService: CipherEncryptionService;
+  private restrictedItemTypesService: RestrictedItemTypesService;
 
   ipcContentScriptManagerService: IpcContentScriptManagerService;
   ipcService: IpcService;
 
+  badgeService: BadgeService;
+  authStatusBadgeUpdaterService: AuthStatusBadgeUpdaterService;
+  autofillBadgeUpdaterService: AutofillBadgeUpdaterService;
+
   onUpdatedRan: boolean;
   onReplacedRan: boolean;
   loginToAutoFill: CipherView = null;
@@ -437,8 +450,7 @@ export default class MainBackground {
 
   constructor() {
     // Services
-    const lockedCallback = async (userId?: string) => {
-      await this.refreshBadge();
+    const lockedCallback = async (userId: UserId) => {
       await this.refreshMenu(true);
       if (this.systemService != null) {
         await this.systemService.clearPendingClipboard();
@@ -740,11 +752,6 @@ export default class MainBackground {
       this.stateProvider,
     );
 
-    this.autofillSettingsService = new AutofillSettingsService(
-      this.stateProvider,
-      this.policyService,
-      this.accountService,
-    );
     this.badgeSettingsService = new BadgeSettingsService(this.stateProvider);
     this.policyApiService = new PolicyApiService(
       this.policyService,
@@ -811,14 +818,16 @@ export default class MainBackground {
       this.appIdService,
     );
 
+    this.authRequestApiService = new DefaultAuthRequestApiService(this.apiService, this.logService);
+
     this.authRequestService = new AuthRequestService(
       this.appIdService,
-      this.accountService,
       this.masterPasswordService,
       this.keyService,
       this.encryptService,
       this.apiService,
       this.stateProvider,
+      this.authRequestApiService,
     );
 
     this.authService = new AuthService(
@@ -830,16 +839,6 @@ export default class MainBackground {
       this.tokenService,
     );
 
-    this.billingAccountProfileStateService = new DefaultBillingAccountProfileStateService(
-      this.stateProvider,
-      this.platformUtilsService,
-      this.apiService,
-    );
-
-    this.ssoLoginService = new SsoLoginService(this.stateProvider, this.logService);
-
-    this.userVerificationApiService = new UserVerificationApiService(this.apiService);
-
     this.configApiService = new ConfigApiService(this.apiService, this.tokenService);
 
     this.configService = new DefaultConfigService(
@@ -850,6 +849,30 @@ export default class MainBackground {
       this.authService,
     );
 
+    this.billingAccountProfileStateService = new DefaultBillingAccountProfileStateService(
+      this.stateProvider,
+      this.platformUtilsService,
+      this.apiService,
+    );
+
+    this.restrictedItemTypesService = new RestrictedItemTypesService(
+      this.configService,
+      this.accountService,
+      this.organizationService,
+      this.policyService,
+    );
+
+    this.autofillSettingsService = new AutofillSettingsService(
+      this.stateProvider,
+      this.policyService,
+      this.accountService,
+      this.restrictedItemTypesService,
+    );
+
+    this.ssoLoginService = new SsoLoginService(this.stateProvider, this.logService);
+
+    this.userVerificationApiService = new UserVerificationApiService(this.apiService);
+
     this.domainSettingsService = new DefaultDomainSettingsService(
       this.stateProvider,
       this.configService,
@@ -910,9 +933,14 @@ export default class MainBackground {
       this.policyService,
       this.stateProvider,
       this.accountService,
+      this.configService,
+      this.i18nService,
     );
 
-    this.vaultSettingsService = new VaultSettingsService(this.stateProvider);
+    this.vaultSettingsService = new VaultSettingsService(
+      this.stateProvider,
+      this.restrictedItemTypesService,
+    );
 
     this.vaultTimeoutService = new VaultTimeoutService(
       this.accountService,
@@ -1053,6 +1081,7 @@ export default class MainBackground {
       this.kdfConfigService,
       this.accountService,
       this.apiService,
+      this.restrictedItemTypesService,
     );
 
     this.organizationVaultExportService = new OrganizationVaultExportService(
@@ -1065,6 +1094,7 @@ export default class MainBackground {
       this.collectionService,
       this.kdfConfigService,
       this.accountService,
+      this.restrictedItemTypesService,
     );
 
     this.exportService = new VaultExportService(
@@ -1083,6 +1113,7 @@ export default class MainBackground {
           this.configService,
           new WebPushNotificationsApiService(this.apiService, this.appIdService),
           registration,
+          this.stateProvider,
         );
       } else {
         this.webPushConnectionService = new UnsupportedWebPushConnectionService();
@@ -1156,7 +1187,6 @@ export default class MainBackground {
       this.fido2ClientService,
       this.vaultSettingsService,
       this.scriptInjectorService,
-      this.configService,
       this.authService,
     );
 
@@ -1204,7 +1234,6 @@ export default class MainBackground {
       this.stateProvider,
       this.apiService,
       this.organizationService,
-      this.configService,
       this.authService,
       this.notificationsService,
       messageListener,
@@ -1232,6 +1261,9 @@ export default class MainBackground {
     this.overlayNotificationsBackground = new OverlayNotificationsBackground(
       this.logService,
       this.notificationBackground,
+      this.taskService,
+      this.accountService,
+      this.cipherService,
     );
 
     this.autoSubmitLoginBackground = new AutoSubmitLoginBackground(
@@ -1239,7 +1271,6 @@ export default class MainBackground {
       this.autofillService,
       this.scriptInjectorService,
       this.authService,
-      this.configService,
       this.platformUtilsService,
       this.policyService,
       this.accountService,
@@ -1303,6 +1334,7 @@ export default class MainBackground {
       this.logService,
       this.billingAccountProfileStateService,
       this.accountService,
+      this.restrictedItemTypesService,
     );
 
     this.cipherContextMenuHandler = new CipherContextMenuHandler(
@@ -1328,13 +1360,12 @@ export default class MainBackground {
       this.collectionService,
       this.organizationService,
       this.accountService,
-      this.configService,
     );
 
     this.inlineMenuFieldQualificationService = new InlineMenuFieldQualificationService();
 
     this.ipcContentScriptManagerService = new IpcContentScriptManagerService(this.configService);
-    this.ipcService = new IpcBackgroundService(this.logService);
+    this.ipcService = new IpcBackgroundService(this.platformUtilsService, this.logService);
 
     this.endUserNotificationService = new DefaultEndUserNotificationService(
       this.stateProvider,
@@ -1343,6 +1374,16 @@ export default class MainBackground {
       this.authService,
       this.logService,
     );
+
+    this.badgeService = new BadgeService(
+      this.stateProvider,
+      new DefaultBadgeBrowserApi(this.platformUtilsService),
+    );
+    this.authStatusBadgeUpdaterService = new AuthStatusBadgeUpdaterService(
+      this.badgeService,
+      this.accountService,
+      this.authService,
+    );
   }
 
   async bootstrap() {
@@ -1417,17 +1458,15 @@ export default class MainBackground {
 
     await this.initOverlayAndTabsBackground();
     await this.ipcService.init();
+    this.badgeService.startListening();
 
     return new Promise<void>((resolve) => {
       setTimeout(async () => {
-        await this.refreshBadge();
         await this.fullSync(false);
         this.backgroundSyncService.init();
         this.notificationsService.startListening();
 
-        if (await this.configService.getFeatureFlag(FeatureFlag.SecurityTasks)) {
-          this.taskService.listenForTaskNotifications();
-        }
+        this.taskService.listenForTaskNotifications();
 
         if (await this.configService.getFeatureFlag(FeatureFlag.EndUserNotifications)) {
           this.endUserNotificationService.listenForEndUserNotifications();
@@ -1437,10 +1476,6 @@ export default class MainBackground {
     });
   }
 
-  async refreshBadge() {
-    await new UpdateBadge(self, this).run();
-  }
-
   async refreshMenu(forLocked = false) {
     if (!chrome.windows || !chrome.contextMenus) {
       return;
@@ -1512,7 +1547,6 @@ export default class MainBackground {
       await switchPromise;
 
       if (userId == null) {
-        await this.refreshBadge();
         await this.refreshMenu();
         await this.updateOverlayCiphers();
         this.messagingService.send("goHome");
@@ -1529,7 +1563,6 @@ export default class MainBackground {
         this.messagingService.send("locked", { userId: userId });
       } else {
         this.messagingService.send("unlocked", { userId: userId });
-        await this.refreshBadge();
         await this.refreshMenu();
         await this.updateOverlayCiphers();
         await this.syncService.fullSync(false);
@@ -1542,6 +1575,7 @@ export default class MainBackground {
     }
   }
 
+  // TODO: PM-21212 - consolidate the logic of this method into the new ExtensionLogoutService
   async logout(logoutReason: LogoutReason, userId?: UserId) {
     const activeUserId = await firstValueFrom(
       this.accountService.activeAccount$.pipe(
@@ -1621,7 +1655,6 @@ export default class MainBackground {
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       BrowserApi.sendMessage("updateBadge");
     }
-    await this.refreshBadge();
     await this.mainContextMenuHandler?.noAccess();
     await this.systemService.clearPendingClipboard();
     await this.processReloadService.startProcessReload(this.authService);
@@ -1678,14 +1711,44 @@ export default class MainBackground {
       // Set route of the popup before attempting to open it.
       // If the vault is locked, this won't have an effect as the auth guards will
       // redirect the user to the login page.
-      await browserAction.setPopup({ popup: "popup/index.html#/at-risk-passwords" });
+      await browserAction.setPopup({ popup: ExtensionPageUrls.AtRiskPasswords });
 
       await this.openPopup();
     } finally {
       // Reset the popup route to the default route so any subsequent
       // popup openings will not open to the at-risk-passwords page.
       await browserAction.setPopup({
-        popup: "popup/index.html#/",
+        popup: ExtensionPageUrls.Index,
+      });
+    }
+  }
+
+  /**
+   * Opens the popup to the given page
+   * @default ExtensionPageUrls.Index
+   */
+  async openTheExtensionToPage(url: ExtensionPageUrls = ExtensionPageUrls.Index) {
+    const isValidUrl = Object.values(ExtensionPageUrls).includes(url);
+
+    // If a non-defined URL is provided, return early.
+    if (!isValidUrl) {
+      return;
+    }
+
+    const browserAction = BrowserApi.getBrowserAction();
+
+    try {
+      // Set route of the popup before attempting to open it.
+      // If the vault is locked, this won't have an effect as the auth guards will
+      // redirect the user to the login page.
+      await browserAction.setPopup({ popup: url });
+
+      await this.openPopup();
+    } finally {
+      // Reset the popup route to the default route so any subsequent
+      // popup openings will not open to the at-risk-passwords page.
+      await browserAction.setPopup({
+        popup: ExtensionPageUrls.Index,
       });
     }
   }
@@ -1756,6 +1819,14 @@ export default class MainBackground {
       (password) => this.addPasswordToHistory(password),
     );
 
+    this.autofillBadgeUpdaterService = new AutofillBadgeUpdaterService(
+      this.badgeService,
+      this.accountService,
+      this.cipherService,
+      this.badgeSettingsService,
+      this.logService,
+    );
+
     this.tabsBackground = new TabsBackground(
       this,
       this.notificationBackground,
@@ -1764,6 +1835,7 @@ export default class MainBackground {
 
     await this.overlayBackground.init();
     await this.tabsBackground.init();
+    await this.autofillBadgeUpdaterService.init();
   }
 
   generatePassword = async (): Promise<string> => {
diff --git a/apps/browser/src/background/nativeMessaging.background.ts b/apps/browser/src/background/nativeMessaging.background.ts
index 7172b98d727..66a929c47a1 100644
--- a/apps/browser/src/background/nativeMessaging.background.ts
+++ b/apps/browser/src/background/nativeMessaging.background.ts
@@ -1,4 +1,4 @@
-import { delay, filter, firstValueFrom, from, map, race, timer } from "rxjs";
+import { firstValueFrom } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -11,7 +11,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { KeyService, BiometricStateService, BiometricsCommands } from "@bitwarden/key-management";
+import { KeyService, BiometricStateService } from "@bitwarden/key-management";
 
 import { BrowserApi } from "../platform/browser/browser-api";
 
@@ -81,9 +81,6 @@ export class NativeMessagingBackground {
 
   private messageId = 0;
   private callbacks = new Map<number, Callback>();
-
-  isConnectedToOutdatedDesktopClient = true;
-
   constructor(
     private keyService: KeyService,
     private encryptService: EncryptService,
@@ -108,6 +105,16 @@ export class NativeMessagingBackground {
   }
 
   async connect() {
+    if (!(await BrowserApi.permissionsGranted(["nativeMessaging"]))) {
+      this.logService.warning(
+        "[Native Messaging IPC] Native messaging permission is missing for biometrics",
+      );
+      return;
+    }
+    if (this.connected || this.connecting) {
+      return;
+    }
+
     this.logService.info("[Native Messaging IPC] Connecting to Bitwarden Desktop app...");
     const appId = await this.appIdService.getAppId();
     this.appId = appId;
@@ -137,7 +144,6 @@ export class NativeMessagingBackground {
       // Safari has a bundled native component which is always available, no need to
       // check if the desktop app is running.
       if (this.platformUtilsService.isSafari()) {
-        this.isConnectedToOutdatedDesktopClient = false;
         connectedCallback();
       }
 
@@ -189,14 +195,6 @@ export class NativeMessagingBackground {
             this.secureChannel.sharedSecret = new SymmetricCryptoKey(decrypted);
             this.logService.info("[Native Messaging IPC] Secure channel established");
 
-            if ("messageId" in message) {
-              this.logService.info("[Native Messaging IPC] Non-legacy desktop client");
-              this.isConnectedToOutdatedDesktopClient = false;
-            } else {
-              this.logService.info("[Native Messaging IPC] Legacy desktop client");
-              this.isConnectedToOutdatedDesktopClient = true;
-            }
-
             this.secureChannel.setupResolve();
             break;
           }
@@ -286,29 +284,6 @@ export class NativeMessagingBackground {
   async callCommand(message: Message): Promise<any> {
     const messageId = this.messageId++;
 
-    if (
-      message.command == BiometricsCommands.Unlock ||
-      message.command == BiometricsCommands.IsAvailable
-    ) {
-      // TODO remove after 2025.3
-      // wait until there is no other callbacks, or timeout
-      const call = await firstValueFrom(
-        race(
-          from([false]).pipe(delay(5000)),
-          timer(0, 100).pipe(
-            filter(() => this.callbacks.size === 0),
-            map(() => true),
-          ),
-        ),
-      );
-      if (!call) {
-        this.logService.info(
-          `[Native Messaging IPC] Message of type ${message.command} did not get a response before timing out`,
-        );
-        return;
-      }
-    }
-
     const callback = new Promise((resolver, rejecter) => {
       this.callbacks.set(messageId, { resolver, rejecter });
     });
@@ -417,22 +392,6 @@ export class NativeMessagingBackground {
 
     const messageId = message.messageId;
 
-    if (
-      message.command == BiometricsCommands.Unlock ||
-      message.command == BiometricsCommands.IsAvailable
-    ) {
-      this.logService.info(
-        `[Native Messaging IPC] Received legacy message of type ${message.command}`,
-      );
-      const messageId: number | undefined = this.callbacks.keys().next().value;
-      if (messageId != null) {
-        const resolver = this.callbacks.get(messageId);
-        this.callbacks.delete(messageId);
-        resolver!.resolver(message);
-      }
-      return;
-    }
-
     if (this.callbacks.has(messageId)) {
       const callback = this.callbacks!.get(messageId)!;
       this.callbacks.delete(messageId);
diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts
index ec8ff7376e0..1e7a0140022 100644
--- a/apps/browser/src/background/runtime.background.ts
+++ b/apps/browser/src/background/runtime.background.ts
@@ -20,6 +20,8 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { VaultMessages } from "@bitwarden/common/vault/enums/vault-messages.enum";
 import { BiometricsCommands } from "@bitwarden/key-management";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import {
   closeUnlockPopout,
   openSsoAuthResultPopout,
@@ -254,7 +256,6 @@ export default class RuntimeBackground {
         // @TODO these need to happen last to avoid blocking `tabSendMessageData` above
         // The underlying cause exists within `cipherService.getAllDecrypted` via
         // `getAllDecryptedForUrl` and is anticipated to be refactored
-        await this.main.refreshBadge();
         await this.main.refreshMenu(false);
 
         await this.autofillService.setAutoFillOnPageLoadOrgPolicy();
@@ -278,7 +279,6 @@ export default class RuntimeBackground {
       case "syncCompleted":
         if (msg.successfully) {
           setTimeout(async () => {
-            await this.main.refreshBadge();
             await this.main.refreshMenu();
           }, 2000);
           await this.configService.ensureConfigFetched();
@@ -294,11 +294,14 @@ export default class RuntimeBackground {
         await this.main.openAtRisksPasswordsPage();
         this.announcePopupOpen();
         break;
+      case VaultMessages.OpenBrowserExtensionToUrl:
+        await this.main.openTheExtensionToPage(msg.url);
+        this.announcePopupOpen();
+        break;
       case "bgUpdateContextMenu":
       case "editedCipher":
       case "addedCipher":
       case "deletedCipher":
-        await this.main.refreshBadge();
         await this.main.refreshMenu();
         break;
       case "bgReseedStorage": {
diff --git a/apps/browser/src/billing/popup/settings/premium-v2.component.ts b/apps/browser/src/billing/popup/settings/premium-v2.component.ts
index ff0e8efd646..fde44688349 100644
--- a/apps/browser/src/billing/popup/settings/premium-v2.component.ts
+++ b/apps/browser/src/billing/popup/settings/premium-v2.component.ts
@@ -29,7 +29,6 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
 @Component({
   selector: "app-premium",
   templateUrl: "premium-v2.component.html",
-  standalone: true,
   imports: [
     ButtonModule,
     CardComponent,
diff --git a/apps/browser/src/billing/services/families-policy.service.spec.ts b/apps/browser/src/billing/services/families-policy.service.spec.ts
index e9f75d52cb6..3e15ab14094 100644
--- a/apps/browser/src/billing/services/families-policy.service.spec.ts
+++ b/apps/browser/src/billing/services/families-policy.service.spec.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { TestBed } from "@angular/core/testing";
 import { mock, MockProxy } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
diff --git a/apps/browser/src/billing/services/families-policy.service.ts b/apps/browser/src/billing/services/families-policy.service.ts
index 42fa43cab1d..222c6b31f29 100644
--- a/apps/browser/src/billing/services/families-policy.service.ts
+++ b/apps/browser/src/billing/services/families-policy.service.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { Injectable } from "@angular/core";
 import { map, Observable, of, switchMap } from "rxjs";
 
diff --git a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
index a8a89d45274..8f755cfeda6 100644
--- a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
+++ b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
@@ -1,4 +1,5 @@
-import { Injectable } from "@angular/core";
+import { combineLatest, timer } from "rxjs";
+import { filter, concatMap } from "rxjs/operators";
 
 import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -18,8 +19,9 @@ import {
 import { NativeMessagingBackground } from "../../background/nativeMessaging.background";
 import { BrowserApi } from "../../platform/browser/browser-api";
 
-@Injectable()
 export class BackgroundBrowserBiometricsService extends BiometricsService {
+  BACKGROUND_POLLING_INTERVAL = 30_000;
+
   constructor(
     private nativeMessagingBackground: () => NativeMessagingBackground,
     private logService: LogService,
@@ -29,23 +31,34 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
     private vaultTimeoutSettingsService: VaultTimeoutSettingsService,
   ) {
     super();
+    // Always connect to the native messaging background if biometrics are enabled, not just when it is used
+    // so that there is no wait when used.
+    const biometricsEnabled = this.biometricStateService.biometricUnlockEnabled$;
+
+    combineLatest([timer(0, this.BACKGROUND_POLLING_INTERVAL), biometricsEnabled])
+      .pipe(
+        filter(([_, enabled]) => enabled),
+        filter(([_]) => !this.nativeMessagingBackground().connected),
+        concatMap(async () => {
+          try {
+            await this.nativeMessagingBackground().connect();
+            await this.getBiometricsStatus();
+          } catch {
+            // Ignore
+          }
+        }),
+      )
+      .subscribe();
   }
 
   async authenticateWithBiometrics(): Promise<boolean> {
     try {
       await this.ensureConnected();
 
-      if (this.nativeMessagingBackground().isConnectedToOutdatedDesktopClient) {
-        const response = await this.nativeMessagingBackground().callCommand({
-          command: BiometricsCommands.Unlock,
-        });
-        return response.response == "unlocked";
-      } else {
-        const response = await this.nativeMessagingBackground().callCommand({
-          command: BiometricsCommands.AuthenticateWithBiometrics,
-        });
-        return response.response;
-      }
+      const response = await this.nativeMessagingBackground().callCommand({
+        command: BiometricsCommands.AuthenticateWithBiometrics,
+      });
+      return response.response;
     } catch (e) {
       this.logService.info("Biometric authentication failed", e);
       return false;
@@ -58,25 +71,12 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
     }
 
     try {
-      await this.ensureConnected();
+      const response = await this.nativeMessagingBackground().callCommand({
+        command: BiometricsCommands.GetBiometricsStatus,
+      });
 
-      if (this.nativeMessagingBackground().isConnectedToOutdatedDesktopClient) {
-        const response = await this.nativeMessagingBackground().callCommand({
-          command: BiometricsCommands.IsAvailable,
-        });
-        const resp =
-          response.response == "available"
-            ? BiometricsStatus.Available
-            : BiometricsStatus.HardwareUnavailable;
-        return resp;
-      } else {
-        const response = await this.nativeMessagingBackground().callCommand({
-          command: BiometricsCommands.GetBiometricsStatus,
-        });
-
-        if (response.response) {
-          return response.response;
-        }
+      if (response.response) {
+        return response.response;
       }
       return BiometricsStatus.Available;
       // FIXME: Remove when updating file. Eslint update
@@ -90,43 +90,23 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
     try {
       await this.ensureConnected();
 
-      // todo remove after 2025.3
-      if (this.nativeMessagingBackground().isConnectedToOutdatedDesktopClient) {
-        const response = await this.nativeMessagingBackground().callCommand({
-          command: BiometricsCommands.Unlock,
-        });
-        if (response.response == "unlocked") {
-          const decodedUserkey = Utils.fromB64ToArray(response.userKeyB64);
-          const userKey = new SymmetricCryptoKey(decodedUserkey) as UserKey;
-          if (await this.keyService.validateUserKey(userKey, userId)) {
-            await this.biometricStateService.setBiometricUnlockEnabled(true);
-            await this.keyService.setUserKey(userKey, userId);
-            // to update badge and other things
-            this.messagingService.send("switchAccount", { userId });
-            return userKey;
-          }
-        } else {
-          return null;
+      const response = await this.nativeMessagingBackground().callCommand({
+        command: BiometricsCommands.UnlockWithBiometricsForUser,
+        userId: userId,
+      });
+      if (response.response) {
+        // In case the requesting foreground context dies (popup), the userkey should still be set, so the user is unlocked / the setting should be enabled
+        const decodedUserkey = Utils.fromB64ToArray(response.userKeyB64);
+        const userKey = new SymmetricCryptoKey(decodedUserkey) as UserKey;
+        if (await this.keyService.validateUserKey(userKey, userId)) {
+          await this.biometricStateService.setBiometricUnlockEnabled(true);
+          await this.keyService.setUserKey(userKey, userId);
+          // to update badge and other things
+          this.messagingService.send("switchAccount", { userId });
+          return userKey;
         }
       } else {
-        const response = await this.nativeMessagingBackground().callCommand({
-          command: BiometricsCommands.UnlockWithBiometricsForUser,
-          userId: userId,
-        });
-        if (response.response) {
-          // In case the requesting foreground context dies (popup), the userkey should still be set, so the user is unlocked / the setting should be enabled
-          const decodedUserkey = Utils.fromB64ToArray(response.userKeyB64);
-          const userKey = new SymmetricCryptoKey(decodedUserkey) as UserKey;
-          if (await this.keyService.validateUserKey(userKey, userId)) {
-            await this.biometricStateService.setBiometricUnlockEnabled(true);
-            await this.keyService.setUserKey(userKey, userId);
-            // to update badge and other things
-            this.messagingService.send("switchAccount", { userId });
-            return userKey;
-          }
-        } else {
-          return null;
-        }
+        return null;
       }
     } catch (e) {
       this.logService.info("Biometric unlock for user failed", e);
@@ -140,10 +120,6 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
     try {
       await this.ensureConnected();
 
-      if (this.nativeMessagingBackground().isConnectedToOutdatedDesktopClient) {
-        return await this.getBiometricsStatus();
-      }
-
       return (
         await this.nativeMessagingBackground().callCommand({
           command: BiometricsCommands.GetBiometricsStatusForUser,
@@ -161,7 +137,7 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
   private async ensureConnected() {
     if (!this.nativeMessagingBackground().connected) {
       await this.nativeMessagingBackground().callCommand({
-        command: BiometricsCommands.IsAvailable,
+        command: BiometricsCommands.GetBiometricsStatus,
       });
     }
   }
diff --git a/apps/browser/src/key-management/key-connector/remove-password.component.ts b/apps/browser/src/key-management/key-connector/remove-password.component.ts
index 1b07f04ba8a..915effc8c33 100644
--- a/apps/browser/src/key-management/key-connector/remove-password.component.ts
+++ b/apps/browser/src/key-management/key-connector/remove-password.component.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { Component } from "@angular/core";
 
 import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/key-management-ui";
diff --git a/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts b/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts
index ac5331d3627..0ae0997fe4b 100644
--- a/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts
+++ b/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { TestBed } from "@angular/core/testing";
 import { mock, MockProxy } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
@@ -10,7 +12,6 @@ import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/va
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { UserId } from "@bitwarden/common/types/guid";
 import {
-  KeyService,
   BiometricsService,
   BiometricsStatus,
   BiometricStateService,
@@ -18,7 +19,9 @@ import {
 import { UnlockOptions } from "@bitwarden/key-management-ui";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { BrowserRouterService } from "../../../platform/popup/services/browser-router.service";
 
 import { ExtensionLockComponentService } from "./extension-lock-component.service";
@@ -31,7 +34,6 @@ describe("ExtensionLockComponentService", () => {
   let biometricsService: MockProxy<BiometricsService>;
   let pinService: MockProxy<PinServiceAbstraction>;
   let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
-  let keyService: MockProxy<KeyService>;
   let routerService: MockProxy<BrowserRouterService>;
   let biometricStateService: MockProxy<BiometricStateService>;
 
@@ -41,7 +43,6 @@ describe("ExtensionLockComponentService", () => {
     biometricsService = mock<BiometricsService>();
     pinService = mock<PinServiceAbstraction>();
     vaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
-    keyService = mock<KeyService>();
     routerService = mock<BrowserRouterService>();
     biometricStateService = mock<BiometricStateService>();
 
@@ -68,10 +69,6 @@ describe("ExtensionLockComponentService", () => {
           provide: VaultTimeoutSettingsService,
           useValue: vaultTimeoutSettingsService,
         },
-        {
-          provide: KeyService,
-          useValue: keyService,
-        },
         {
           provide: BrowserRouterService,
           useValue: routerService,
@@ -371,7 +368,6 @@ describe("ExtensionLockComponentService", () => {
       vaultTimeoutSettingsService.isBiometricLockSet.mockResolvedValue(
         mockInputs.hasBiometricEncryptedUserKeyStored,
       );
-      keyService.hasUserKeyStored.mockResolvedValue(mockInputs.hasBiometricEncryptedUserKeyStored);
       platformUtilsService.supportsSecureStorage.mockReturnValue(
         mockInputs.platformSupportsSecureStorage,
       );
diff --git a/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts b/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
index 6ee1fc5175f..52ad5a56c89 100644
--- a/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
+++ b/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { inject } from "@angular/core";
 import { combineLatest, defer, firstValueFrom, map, Observable } from "rxjs";
 
@@ -15,7 +17,9 @@ import { LockComponentService, UnlockOptions } from "@bitwarden/key-management-u
 
 import { BiometricErrors, BiometricErrorTypes } from "../../../models/biometricErrors";
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { BrowserRouterService } from "../../../platform/popup/services/browser-router.service";
 
 export class ExtensionLockComponentService implements LockComponentService {
diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json
index 1c89916c6f7..d6cf535b6d2 100644
--- a/apps/browser/src/manifest.json
+++ b/apps/browser/src/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extName__",
   "short_name": "Bitwarden",
-  "version": "2025.5.1",
+  "version": "2025.7.0",
   "description": "__MSG_extDesc__",
   "default_locale": "en",
   "author": "Bitwarden Inc.",
@@ -56,7 +56,8 @@
     "unlimitedStorage",
     "webNavigation",
     "webRequest",
-    "webRequestBlocking"
+    "webRequestBlocking",
+    "notifications"
   ],
   "__safari__permissions": [
     "<all_urls>",
diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json
index 834ac8d8b7d..615ae9115b4 100644
--- a/apps/browser/src/manifest.v3.json
+++ b/apps/browser/src/manifest.v3.json
@@ -3,7 +3,7 @@
   "minimum_chrome_version": "102.0",
   "name": "__MSG_extName__",
   "short_name": "Bitwarden",
-  "version": "2025.5.1",
+  "version": "2025.7.0",
   "description": "__MSG_extDesc__",
   "default_locale": "en",
   "author": "Bitwarden Inc.",
diff --git a/apps/browser/src/platform/badge/array-utils.spec.ts b/apps/browser/src/platform/badge/array-utils.spec.ts
new file mode 100644
index 00000000000..3f41019f02e
--- /dev/null
+++ b/apps/browser/src/platform/badge/array-utils.spec.ts
@@ -0,0 +1,17 @@
+import { difference } from "./array-utils";
+
+describe("array-utils", () => {
+  describe("difference", () => {
+    it.each([
+      [new Set([1, 2, 3]), new Set([]), new Set([1, 2, 3]), new Set([])],
+      [new Set([]), new Set([1, 2, 3]), new Set([]), new Set([1, 2, 3])],
+      [new Set([1, 2, 3]), new Set([2, 3, 5]), new Set([1]), new Set([5])],
+      [new Set([1, 2, 3]), new Set([1, 2, 3]), new Set([]), new Set([])],
+    ])("returns elements that are unique to each set", (A, B, onlyA, onlyB) => {
+      const [resultA, resultB] = difference(A, B);
+
+      expect(resultA).toEqual(onlyA);
+      expect(resultB).toEqual(onlyB);
+    });
+  });
+});
diff --git a/apps/browser/src/platform/badge/array-utils.ts b/apps/browser/src/platform/badge/array-utils.ts
new file mode 100644
index 00000000000..699006e6153
--- /dev/null
+++ b/apps/browser/src/platform/badge/array-utils.ts
@@ -0,0 +1,16 @@
+/**
+ * Returns the difference between two sets.
+ * @param a First set
+ * @param b Second set
+ * @returns A tuple containing two sets:
+ * - The first set contains elements unique to `a`.
+ * - The second set contains elements unique to `b`.
+ * - If an element is present in both sets, it will not be included in either set.
+ */
+export function difference<T>(a: Set<T>, b: Set<T>): [Set<T>, Set<T>] {
+  const intersection = new Set<T>([...a].filter((x) => b.has(x)));
+  a = new Set<T>([...a].filter((x) => !intersection.has(x)));
+  b = new Set<T>([...b].filter((x) => !intersection.has(x)));
+
+  return [a, b];
+}
diff --git a/apps/browser/src/platform/badge/badge-browser-api.ts b/apps/browser/src/platform/badge/badge-browser-api.ts
new file mode 100644
index 00000000000..9febaf8d39c
--- /dev/null
+++ b/apps/browser/src/platform/badge/badge-browser-api.ts
@@ -0,0 +1,119 @@
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+
+import { BrowserApi } from "../browser/browser-api";
+
+import { BadgeIcon, IconPaths } from "./icon";
+
+export interface RawBadgeState {
+  tabId?: string;
+  text: string;
+  backgroundColor: string;
+  icon: BadgeIcon;
+}
+
+export interface BadgeBrowserApi {
+  setState(state: RawBadgeState, tabId?: number): Promise<void>;
+  getTabs(): Promise<number[]>;
+}
+
+export class DefaultBadgeBrowserApi implements BadgeBrowserApi {
+  private badgeAction = BrowserApi.getBrowserAction();
+  private sidebarAction = BrowserApi.getSidebarAction(self);
+
+  constructor(private platformUtilsService: PlatformUtilsService) {}
+
+  async setState(state: RawBadgeState, tabId?: number): Promise<void> {
+    await Promise.all([
+      state.backgroundColor !== undefined ? this.setIcon(state.icon, tabId) : undefined,
+      this.setText(state.text, tabId),
+      state.backgroundColor !== undefined
+        ? this.setBackgroundColor(state.backgroundColor, tabId)
+        : undefined,
+    ]);
+  }
+
+  async getTabs(): Promise<number[]> {
+    return (await BrowserApi.tabsQuery({})).map((tab) => tab.id).filter((tab) => tab !== undefined);
+  }
+
+  private setIcon(icon: IconPaths, tabId?: number) {
+    return Promise.all([this.setActionIcon(icon, tabId), this.setSidebarActionIcon(icon, tabId)]);
+  }
+
+  private setText(text: string, tabId?: number) {
+    return Promise.all([this.setActionText(text, tabId), this.setSideBarText(text, tabId)]);
+  }
+
+  private async setActionIcon(path: IconPaths, tabId?: number) {
+    if (!this.badgeAction?.setIcon) {
+      return;
+    }
+
+    if (this.useSyncApiCalls) {
+      await this.badgeAction.setIcon({ path, tabId });
+    } else {
+      await new Promise<void>((resolve) => this.badgeAction.setIcon({ path, tabId }, resolve));
+    }
+  }
+
+  private async setSidebarActionIcon(path: IconPaths, tabId?: number) {
+    if (!this.sidebarAction?.setIcon) {
+      return;
+    }
+
+    if ("opr" in self && BrowserApi.isManifestVersion(3)) {
+      // setIcon API is currenly broken for Opera MV3 extensions
+      // https://forums.opera.com/topic/75680/opr-sidebaraction-seticon-api-is-broken-access-to-extension-api-denied?_=1738349261570
+      // The API currently crashes on MacOS
+      return;
+    }
+
+    if (this.isOperaSidebar(this.sidebarAction)) {
+      await new Promise<void>((resolve) =>
+        (this.sidebarAction as OperaSidebarAction).setIcon({ path, tabId }, () => resolve()),
+      );
+    } else {
+      await this.sidebarAction.setIcon({ path, tabId });
+    }
+  }
+
+  private async setActionText(text: string, tabId?: number) {
+    if (this.badgeAction?.setBadgeText) {
+      await this.badgeAction.setBadgeText({ text, tabId });
+    }
+  }
+
+  private async setSideBarText(text: string, tabId?: number) {
+    if (!this.sidebarAction) {
+      return;
+    }
+
+    if (this.isOperaSidebar(this.sidebarAction)) {
+      this.sidebarAction.setBadgeText({ text, tabId });
+    } else if (this.sidebarAction) {
+      // Firefox
+      const title = `Bitwarden${Utils.isNullOrEmpty(text) ? "" : ` [${text}]`}`;
+      await this.sidebarAction.setTitle({ title, tabId });
+    }
+  }
+
+  private async setBackgroundColor(color: string, tabId?: number) {
+    if (this.badgeAction && this.badgeAction?.setBadgeBackgroundColor) {
+      await this.badgeAction.setBadgeBackgroundColor({ color, tabId });
+    }
+    if (this.sidebarAction && this.isOperaSidebar(this.sidebarAction)) {
+      this.sidebarAction.setBadgeBackgroundColor({ color, tabId });
+    }
+  }
+
+  private get useSyncApiCalls() {
+    return this.platformUtilsService.isFirefox() || this.platformUtilsService.isSafari();
+  }
+
+  private isOperaSidebar(
+    action: OperaSidebarAction | FirefoxSidebarAction,
+  ): action is OperaSidebarAction {
+    return action != null && (action as OperaSidebarAction).setBadgeText != null;
+  }
+}
diff --git a/apps/browser/src/platform/badge/badge.service.spec.ts b/apps/browser/src/platform/badge/badge.service.spec.ts
new file mode 100644
index 00000000000..2a7ba2ce392
--- /dev/null
+++ b/apps/browser/src/platform/badge/badge.service.spec.ts
@@ -0,0 +1,562 @@
+import { Subscription } from "rxjs";
+
+import { FakeAccountService, FakeStateProvider } from "@bitwarden/common/spec";
+
+import { RawBadgeState } from "./badge-browser-api";
+import { BadgeService } from "./badge.service";
+import { DefaultBadgeState } from "./consts";
+import { BadgeIcon } from "./icon";
+import { BadgeStatePriority } from "./priority";
+import { BadgeState, Unset } from "./state";
+import { MockBadgeBrowserApi } from "./test/mock-badge-browser-api";
+
+describe("BadgeService", () => {
+  let badgeApi: MockBadgeBrowserApi;
+  let stateProvider: FakeStateProvider;
+  let badgeService!: BadgeService;
+
+  let badgeServiceSubscription: Subscription;
+
+  beforeEach(() => {
+    badgeApi = new MockBadgeBrowserApi();
+    stateProvider = new FakeStateProvider(new FakeAccountService({}));
+
+    badgeService = new BadgeService(stateProvider, badgeApi);
+  });
+
+  afterEach(() => {
+    badgeServiceSubscription?.unsubscribe();
+  });
+
+  describe("calling without tabId", () => {
+    const tabId = 1;
+
+    describe("given a single tab is open", () => {
+      beforeEach(() => {
+        badgeApi.tabs = [1];
+        badgeServiceSubscription = badgeService.startListening();
+      });
+
+      // This relies on the state provider to auto-emit
+      it("sets default values on startup", async () => {
+        expect(badgeApi.generalState).toEqual(DefaultBadgeState);
+      });
+
+      it("sets provided state when no other state has been set", async () => {
+        const state: BadgeState = {
+          text: "text",
+          backgroundColor: "color",
+          icon: BadgeIcon.Locked,
+        };
+
+        await badgeService.setState("state-name", BadgeStatePriority.Default, state);
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual(state);
+        expect(badgeApi.specificStates[tabId]).toEqual(state);
+      });
+
+      it("sets default values when none are provided", async () => {
+        // This is a bit of a weird thing to do, but I don't think it's something we need to prohibit
+        const state: BadgeState = {};
+
+        await badgeService.setState("state-name", BadgeStatePriority.Default, state);
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual(DefaultBadgeState);
+        expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
+      });
+
+      it("merges states when multiple same-priority states have been set", async () => {
+        await badgeService.setState("state-1", BadgeStatePriority.Default, { text: "text" });
+        await badgeService.setState("state-2", BadgeStatePriority.Default, {
+          backgroundColor: "#fff",
+        });
+        await badgeService.setState("state-3", BadgeStatePriority.Default, {
+          icon: BadgeIcon.Locked,
+        });
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        const expectedState: RawBadgeState = {
+          text: "text",
+          backgroundColor: "#fff",
+          icon: BadgeIcon.Locked,
+        };
+        expect(badgeApi.generalState).toEqual(expectedState);
+        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
+      });
+
+      it("overrides previous lower-priority state when higher-priority state is set", async () => {
+        await badgeService.setState("state-1", BadgeStatePriority.Low, {
+          text: "text",
+          backgroundColor: "#fff",
+          icon: BadgeIcon.Locked,
+        });
+        await badgeService.setState("state-2", BadgeStatePriority.Default, {
+          text: "override",
+        });
+        await badgeService.setState("state-3", BadgeStatePriority.High, {
+          backgroundColor: "#aaa",
+        });
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        const expectedState: RawBadgeState = {
+          text: "override",
+          backgroundColor: "#aaa",
+          icon: BadgeIcon.Locked,
+        };
+        expect(badgeApi.generalState).toEqual(expectedState);
+        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
+      });
+
+      it("removes override when a previously high-priority state is cleared", async () => {
+        await badgeService.setState("state-1", BadgeStatePriority.Low, {
+          text: "text",
+          backgroundColor: "#fff",
+          icon: BadgeIcon.Locked,
+        });
+        await badgeService.setState("state-2", BadgeStatePriority.Default, {
+          text: "override",
+        });
+        await badgeService.clearState("state-2");
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        const expectedState: RawBadgeState = {
+          text: "text",
+          backgroundColor: "#fff",
+          icon: BadgeIcon.Locked,
+        };
+        expect(badgeApi.generalState).toEqual(expectedState);
+        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
+      });
+
+      it("sets default values when all states have been cleared", async () => {
+        await badgeService.setState("state-1", BadgeStatePriority.Low, {
+          text: "text",
+          backgroundColor: "#fff",
+          icon: BadgeIcon.Locked,
+        });
+        await badgeService.setState("state-2", BadgeStatePriority.Default, {
+          text: "override",
+        });
+        await badgeService.setState("state-3", BadgeStatePriority.High, {
+          backgroundColor: "#aaa",
+        });
+        await badgeService.clearState("state-1");
+        await badgeService.clearState("state-2");
+        await badgeService.clearState("state-3");
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual(DefaultBadgeState);
+        expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
+      });
+
+      it("sets default value high-priority state contains Unset", async () => {
+        await badgeService.setState("state-1", BadgeStatePriority.Low, {
+          text: "text",
+          backgroundColor: "#fff",
+          icon: BadgeIcon.Locked,
+        });
+        await badgeService.setState("state-3", BadgeStatePriority.High, {
+          icon: Unset,
+        });
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        const expectedState: RawBadgeState = {
+          text: "text",
+          backgroundColor: "#fff",
+          icon: DefaultBadgeState.icon,
+        };
+        expect(badgeApi.generalState).toEqual(expectedState);
+        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
+      });
+
+      it("ignores medium-priority Unset when high-priority contains a value", async () => {
+        await badgeService.setState("state-1", BadgeStatePriority.Low, {
+          text: "text",
+          backgroundColor: "#fff",
+          icon: BadgeIcon.Locked,
+        });
+        await badgeService.setState("state-3", BadgeStatePriority.Default, {
+          icon: Unset,
+        });
+        await badgeService.setState("state-3", BadgeStatePriority.High, {
+          icon: BadgeIcon.Unlocked,
+        });
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        const expectedState: RawBadgeState = {
+          text: "text",
+          backgroundColor: "#fff",
+          icon: BadgeIcon.Unlocked,
+        };
+        expect(badgeApi.generalState).toEqual(expectedState);
+        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
+      });
+    });
+
+    describe("given multiple tabs are open", () => {
+      const tabIds = [1, 2, 3];
+
+      beforeEach(() => {
+        badgeApi.tabs = tabIds;
+        badgeServiceSubscription = badgeService.startListening();
+      });
+
+      it("sets default values for each tab on startup", async () => {
+        expect(badgeApi.generalState).toEqual(DefaultBadgeState);
+        for (const tabId of tabIds) {
+          expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
+        }
+      });
+
+      it("sets state for each tab when no other state has been set", async () => {
+        const state: BadgeState = {
+          text: "text",
+          backgroundColor: "color",
+          icon: BadgeIcon.Locked,
+        };
+
+        await badgeService.setState("state-name", BadgeStatePriority.Default, state);
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual(state);
+        expect(badgeApi.specificStates).toEqual({
+          1: state,
+          2: state,
+          3: state,
+        });
+      });
+    });
+  });
+
+  describe("calling with tabId", () => {
+    describe("given a single tab is open", () => {
+      const tabId = 1;
+
+      beforeEach(() => {
+        badgeApi.tabs = [tabId];
+        badgeServiceSubscription = badgeService.startListening();
+      });
+
+      it("sets provided state when no other state has been set", async () => {
+        const state: BadgeState = {
+          text: "text",
+          backgroundColor: "color",
+          icon: BadgeIcon.Locked,
+        };
+
+        await badgeService.setState("state-name", BadgeStatePriority.Default, state, tabId);
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual(DefaultBadgeState);
+        expect(badgeApi.specificStates[tabId]).toEqual(state);
+      });
+
+      it("sets default values when none are provided", async () => {
+        // This is a bit of a weird thing to do, but I don't think it's something we need to prohibit
+        const state: BadgeState = {};
+
+        await badgeService.setState("state-name", BadgeStatePriority.Default, state, tabId);
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual(DefaultBadgeState);
+        expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
+      });
+
+      it("merges tabId specific state with general states", async () => {
+        await badgeService.setState("general-state", BadgeStatePriority.Default, { text: "text" });
+        await badgeService.setState(
+          "specific-state",
+          BadgeStatePriority.Default,
+          {
+            backgroundColor: "#fff",
+          },
+          tabId,
+        );
+        await badgeService.setState("general-state-2", BadgeStatePriority.Default, {
+          icon: BadgeIcon.Locked,
+        });
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual({
+          ...DefaultBadgeState,
+          text: "text",
+          icon: BadgeIcon.Locked,
+        });
+        expect(badgeApi.specificStates[tabId]).toEqual({
+          text: "text",
+          backgroundColor: "#fff",
+          icon: BadgeIcon.Locked,
+        });
+      });
+
+      it("merges states when multiple same-priority states with the same tabId have been set", async () => {
+        await badgeService.setState("state-1", BadgeStatePriority.Default, { text: "text" }, tabId);
+        await badgeService.setState(
+          "state-2",
+          BadgeStatePriority.Default,
+          {
+            backgroundColor: "#fff",
+          },
+          tabId,
+        );
+        await badgeService.setState(
+          "state-3",
+          BadgeStatePriority.Default,
+          {
+            icon: BadgeIcon.Locked,
+          },
+          tabId,
+        );
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        const expectedState: RawBadgeState = {
+          text: "text",
+          backgroundColor: "#fff",
+          icon: BadgeIcon.Locked,
+        };
+        expect(badgeApi.generalState).toEqual(DefaultBadgeState);
+        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
+      });
+
+      it("overrides previous lower-priority state when higher-priority state with the same tabId is set", async () => {
+        await badgeService.setState(
+          "state-1",
+          BadgeStatePriority.Low,
+          {
+            text: "text",
+            backgroundColor: "#fff",
+            icon: BadgeIcon.Locked,
+          },
+          tabId,
+        );
+        await badgeService.setState(
+          "state-2",
+          BadgeStatePriority.Default,
+          {
+            text: "override",
+          },
+          tabId,
+        );
+        await badgeService.setState(
+          "state-3",
+          BadgeStatePriority.High,
+          {
+            backgroundColor: "#aaa",
+          },
+          tabId,
+        );
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        const expectedState: RawBadgeState = {
+          text: "override",
+          backgroundColor: "#aaa",
+          icon: BadgeIcon.Locked,
+        };
+        expect(badgeApi.generalState).toEqual(DefaultBadgeState);
+        expect(badgeApi.specificStates[tabId]).toEqual(expectedState);
+      });
+
+      it("overrides lower-priority tab-specific state when higher-priority general state is set", async () => {
+        await badgeService.setState(
+          "state-1",
+          BadgeStatePriority.Low,
+          {
+            text: "text",
+            backgroundColor: "#fff",
+            icon: BadgeIcon.Locked,
+          },
+          tabId,
+        );
+        await badgeService.setState("state-2", BadgeStatePriority.Default, {
+          text: "override",
+        });
+        await badgeService.setState("state-3", BadgeStatePriority.High, {
+          backgroundColor: "#aaa",
+        });
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual({
+          text: "override",
+          backgroundColor: "#aaa",
+          icon: DefaultBadgeState.icon,
+        });
+        expect(badgeApi.specificStates[tabId]).toEqual({
+          text: "override",
+          backgroundColor: "#aaa",
+          icon: BadgeIcon.Locked,
+        });
+      });
+
+      it("removes override when a previously high-priority state with the same tabId is cleared", async () => {
+        await badgeService.setState(
+          "state-1",
+          BadgeStatePriority.Low,
+          {
+            text: "text",
+            backgroundColor: "#fff",
+            icon: BadgeIcon.Locked,
+          },
+          tabId,
+        );
+        await badgeService.setState(
+          "state-2",
+          BadgeStatePriority.Default,
+          {
+            text: "override",
+          },
+          tabId,
+        );
+        await badgeService.clearState("state-2");
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual(DefaultBadgeState);
+        expect(badgeApi.specificStates[tabId]).toEqual({
+          text: "text",
+          backgroundColor: "#fff",
+          icon: BadgeIcon.Locked,
+        });
+      });
+
+      it("sets default state when all states with the same tabId have been cleared", async () => {
+        await badgeService.setState(
+          "state-1",
+          BadgeStatePriority.Low,
+          {
+            text: "text",
+            backgroundColor: "#fff",
+            icon: BadgeIcon.Locked,
+          },
+          tabId,
+        );
+        await badgeService.setState(
+          "state-2",
+          BadgeStatePriority.Default,
+          {
+            text: "override",
+          },
+          tabId,
+        );
+        await badgeService.setState(
+          "state-3",
+          BadgeStatePriority.High,
+          {
+            backgroundColor: "#aaa",
+          },
+          tabId,
+        );
+        await badgeService.clearState("state-1");
+        await badgeService.clearState("state-2");
+        await badgeService.clearState("state-3");
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual(DefaultBadgeState);
+        expect(badgeApi.specificStates[tabId]).toEqual(DefaultBadgeState);
+      });
+
+      it("sets default value when high-priority state contains Unset", async () => {
+        await badgeService.setState(
+          "state-1",
+          BadgeStatePriority.Low,
+          {
+            text: "text",
+            backgroundColor: "#fff",
+            icon: BadgeIcon.Locked,
+          },
+          tabId,
+        );
+        await badgeService.setState(
+          "state-3",
+          BadgeStatePriority.High,
+          {
+            icon: Unset,
+          },
+          tabId,
+        );
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual(DefaultBadgeState);
+        expect(badgeApi.specificStates[tabId]).toEqual({
+          text: "text",
+          backgroundColor: "#fff",
+          icon: DefaultBadgeState.icon,
+        });
+      });
+
+      it("ignores medium-priority Unset when high-priority contains a value", async () => {
+        await badgeService.setState(
+          "state-1",
+          BadgeStatePriority.Low,
+          {
+            text: "text",
+            backgroundColor: "#fff",
+            icon: BadgeIcon.Locked,
+          },
+          tabId,
+        );
+        await badgeService.setState(
+          "state-3",
+          BadgeStatePriority.Default,
+          {
+            icon: Unset,
+          },
+          tabId,
+        );
+        await badgeService.setState(
+          "state-3",
+          BadgeStatePriority.High,
+          {
+            icon: BadgeIcon.Unlocked,
+          },
+          tabId,
+        );
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual(DefaultBadgeState);
+        expect(badgeApi.specificStates[tabId]).toEqual({
+          text: "text",
+          backgroundColor: "#fff",
+          icon: BadgeIcon.Unlocked,
+        });
+      });
+    });
+
+    describe("given multiple tabs are open", () => {
+      const tabIds = [1, 2, 3];
+
+      beforeEach(() => {
+        badgeApi.tabs = tabIds;
+        badgeServiceSubscription = badgeService.startListening();
+      });
+
+      it("sets tab-specific state for provided tab and general state for the others", async () => {
+        const generalState: BadgeState = {
+          text: "general-text",
+          backgroundColor: "general-color",
+          icon: BadgeIcon.Unlocked,
+        };
+        const specificState: BadgeState = {
+          text: "tab-text",
+          icon: BadgeIcon.Locked,
+        };
+
+        await badgeService.setState("general-state", BadgeStatePriority.Default, generalState);
+        await badgeService.setState(
+          "tab-state",
+          BadgeStatePriority.Default,
+          specificState,
+          tabIds[0],
+        );
+
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(badgeApi.generalState).toEqual(generalState);
+        expect(badgeApi.specificStates).toEqual({
+          [tabIds[0]]: { ...specificState, backgroundColor: "general-color" },
+          [tabIds[1]]: generalState,
+          [tabIds[2]]: generalState,
+        });
+      });
+    });
+  });
+});
diff --git a/apps/browser/src/platform/badge/badge.service.ts b/apps/browser/src/platform/badge/badge.service.ts
new file mode 100644
index 00000000000..d48150ac516
--- /dev/null
+++ b/apps/browser/src/platform/badge/badge.service.ts
@@ -0,0 +1,182 @@
+import {
+  defer,
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  pairwise,
+  startWith,
+  Subscription,
+  switchMap,
+} from "rxjs";
+
+import {
+  BADGE_MEMORY,
+  GlobalState,
+  KeyDefinition,
+  StateProvider,
+} from "@bitwarden/common/platform/state";
+
+import { difference } from "./array-utils";
+import { BadgeBrowserApi, RawBadgeState } from "./badge-browser-api";
+import { DefaultBadgeState } from "./consts";
+import { BadgeStatePriority } from "./priority";
+import { BadgeState, Unset } from "./state";
+
+interface StateSetting {
+  priority: BadgeStatePriority;
+  state: BadgeState;
+  tabId?: number;
+}
+
+const BADGE_STATES = new KeyDefinition(BADGE_MEMORY, "badgeStates", {
+  deserializer: (value: Record<string, StateSetting>) => value ?? {},
+});
+
+export class BadgeService {
+  private states: GlobalState<Record<string, StateSetting>>;
+
+  constructor(
+    private stateProvider: StateProvider,
+    private badgeApi: BadgeBrowserApi,
+  ) {
+    this.states = this.stateProvider.getGlobal(BADGE_STATES);
+  }
+
+  /**
+   * Start listening for badge state changes.
+   * Without this the service will not be able to update the badge state.
+   */
+  startListening(): Subscription {
+    const initialSetup$ = defer(async () => {
+      const openTabs = await this.badgeApi.getTabs();
+      await this.badgeApi.setState(DefaultBadgeState);
+      for (const tabId of openTabs) {
+        await this.badgeApi.setState(DefaultBadgeState, tabId);
+      }
+    });
+
+    return initialSetup$
+      .pipe(
+        switchMap(() => this.states.state$),
+        startWith({}),
+        distinctUntilChanged(),
+        map((states) => new Set(states ? Object.values(states) : [])),
+        pairwise(),
+        map(([previous, current]) => {
+          const [removed, added] = difference(previous, current);
+          return { states: current, removed, added };
+        }),
+        filter(({ removed, added }) => removed.size > 0 || added.size > 0),
+        mergeMap(async ({ states, removed, added }) => {
+          const changed = [...removed, ...added];
+          const changedTabIds = new Set(
+            changed.map((s) => s.tabId).filter((tabId) => tabId !== undefined),
+          );
+          const onlyTabSpecificStatesChanged = changed.every((s) => s.tabId != undefined);
+          if (onlyTabSpecificStatesChanged) {
+            // If only tab-specific states changed then we only need to update those specific tabs.
+            for (const tabId of changedTabIds) {
+              const newState = this.calculateState(states, tabId);
+              await this.badgeApi.setState(newState, tabId);
+            }
+            return;
+          }
+
+          // If there are any general states that changed then we need to update all tabs.
+          const openTabs = await this.badgeApi.getTabs();
+          const generalState = this.calculateState(states);
+          await this.badgeApi.setState(generalState);
+          for (const tabId of openTabs) {
+            const newState = this.calculateState(states, tabId);
+            await this.badgeApi.setState(newState, tabId);
+          }
+        }),
+      )
+      .subscribe();
+  }
+
+  /**
+   * Inform badge service of a new state that the badge should reflect.
+   *
+   * This will merge the new state with any existing states:
+   * - If the new state has a higher priority, it will override any lower priority states.
+   * - If the new state has a lower priority, it will be ignored.
+   * - If the name of the state is already in use, it will be updated.
+   * - If the state has a `tabId` set, it will only apply to that tab.
+   *   - States with `tabId` can still be overridden by states without `tabId` if they have a higher priority.
+   *
+   * @param name The name of the state. This is used to identify the state and will be used to clear it later.
+   * @param priority The priority of the state (higher numbers are higher priority, but setting arbitrary numbers is not supported).
+   * @param state The state to set.
+   * @param tabId Limit this badge state to a specific tab. If this is not set, the state will be applied to all tabs.
+   */
+  async setState(name: string, priority: BadgeStatePriority, state: BadgeState, tabId?: number) {
+    await this.states.update((s) => ({ ...s, [name]: { priority, state, tabId } }));
+  }
+
+  /**
+   * Clear the state with the given name.
+   *
+   * This will remove the state from the badge service and clear it from the badge.
+   * If the state is not found, nothing will happen.
+   *
+   * @param name The name of the state to clear.
+   */
+  async clearState(name: string) {
+    await this.states.update((s) => {
+      const newStates = { ...s };
+      delete newStates[name];
+      return newStates;
+    });
+  }
+
+  private calculateState(states: Set<StateSetting>, tabId?: number): RawBadgeState {
+    const sortedStates = [...states].sort((a, b) => a.priority - b.priority);
+
+    let filteredStates = sortedStates;
+    if (tabId !== undefined) {
+      // Filter out states that are not applicable to the current tab.
+      // If a state has no tabId, it is considered applicable to all tabs.
+      // If a state has a tabId, it is only applicable to that tab.
+      filteredStates = sortedStates.filter((s) => s.tabId === tabId || s.tabId === undefined);
+    } else {
+      // If no tabId is provided, we only want states that are not tab-specific.
+      filteredStates = sortedStates.filter((s) => s.tabId === undefined);
+    }
+
+    const mergedState = filteredStates
+      .map((s) => s.state)
+      .reduce<Partial<RawBadgeState>>((acc: Partial<RawBadgeState>, state: BadgeState) => {
+        const newState = { ...acc };
+
+        for (const k in state) {
+          const key = k as keyof BadgeState & keyof RawBadgeState;
+          setStateValue(newState, state, key);
+        }
+
+        return newState;
+      }, DefaultBadgeState);
+
+    return {
+      ...DefaultBadgeState,
+      ...mergedState,
+    };
+  }
+}
+
+/**
+ * Helper value to modify the state variable.
+ * TS doesn't like it when this is being doine inline.
+ */
+function setStateValue<Key extends keyof BadgeState & keyof RawBadgeState>(
+  newState: Partial<RawBadgeState>,
+  state: BadgeState,
+  key: Key,
+) {
+  if (state[key] === Unset) {
+    delete newState[key];
+  } else if (state[key] !== undefined) {
+    newState[key] = state[key] as RawBadgeState[Key];
+  }
+}
diff --git a/apps/browser/src/platform/badge/consts.ts b/apps/browser/src/platform/badge/consts.ts
new file mode 100644
index 00000000000..67cb4b1035b
--- /dev/null
+++ b/apps/browser/src/platform/badge/consts.ts
@@ -0,0 +1,9 @@
+import { RawBadgeState } from "./badge-browser-api";
+import { BadgeIcon } from "./icon";
+import { BadgeState } from "./state";
+
+export const DefaultBadgeState: RawBadgeState & BadgeState = {
+  text: "",
+  backgroundColor: "#294e5f",
+  icon: BadgeIcon.LoggedOut,
+};
diff --git a/apps/browser/src/platform/badge/icon.ts b/apps/browser/src/platform/badge/icon.ts
new file mode 100644
index 00000000000..d6dcdcc5f7d
--- /dev/null
+++ b/apps/browser/src/platform/badge/icon.ts
@@ -0,0 +1,21 @@
+export const BadgeIcon = {
+  LoggedOut: {
+    19: "/images/icon19_gray.png",
+    38: "/images/icon38_gray.png",
+  } as IconPaths,
+  Locked: {
+    19: "/images/icon19_locked.png",
+    38: "/images/icon38_locked.png",
+  } as IconPaths,
+  Unlocked: {
+    19: "/images/icon19.png",
+    38: "/images/icon38.png",
+  } as IconPaths,
+} as const satisfies Record<string, IconPaths>;
+
+export type BadgeIcon = (typeof BadgeIcon)[keyof typeof BadgeIcon];
+
+export type IconPaths = {
+  19: string;
+  38: string;
+};
diff --git a/apps/browser/src/platform/badge/priority.ts b/apps/browser/src/platform/badge/priority.ts
new file mode 100644
index 00000000000..6870e571e6a
--- /dev/null
+++ b/apps/browser/src/platform/badge/priority.ts
@@ -0,0 +1,7 @@
+export const BadgeStatePriority = {
+  Low: 0,
+  Default: 100,
+  High: 200,
+} as const;
+
+export type BadgeStatePriority = (typeof BadgeStatePriority)[keyof typeof BadgeStatePriority];
diff --git a/apps/browser/src/platform/badge/state.ts b/apps/browser/src/platform/badge/state.ts
new file mode 100644
index 00000000000..0731ad81f41
--- /dev/null
+++ b/apps/browser/src/platform/badge/state.ts
@@ -0,0 +1,32 @@
+import { BadgeIcon } from "./icon";
+
+export const Unset = Symbol("Unset badge state");
+export type Unset = typeof Unset;
+
+export type BadgeState = {
+  /**
+   * The text to display in the badge.
+   * If this is set to `Unset`, any text set by a lower priority state will be cleared.
+   * If this is set to `undefined`, a lower priority state may be used.
+   * If no lower priority state is set, no text will be displayed.
+   */
+  text?: string | Unset;
+
+  /**
+   * The background color of the badge.
+   * This should be a 3 or 6 character hex color code (e.g. `#f00` or `#ff0000`).
+   * If this is set to `Unset`, any color set by a lower priority state will be cleared/
+   * If this is set to `undefined`, a lower priority state may be used.
+   * If no lower priority state is set, the default color will be used.
+   */
+  backgroundColor?: string | Unset;
+
+  /**
+   * The icon to display in the badge.
+   * This should be a URL to an image file.
+   * If this is set to `Unset`, any icon set by a lower priority state will be cleared.
+   * If this is set to `undefined`, a lower priority state may be used.
+   * If no lower priority state is set, the default icon will be used.
+   */
+  icon?: Unset | BadgeIcon;
+};
diff --git a/apps/browser/src/platform/badge/test/mock-badge-browser-api.ts b/apps/browser/src/platform/badge/test/mock-badge-browser-api.ts
new file mode 100644
index 00000000000..19bde1e1fd8
--- /dev/null
+++ b/apps/browser/src/platform/badge/test/mock-badge-browser-api.ts
@@ -0,0 +1,21 @@
+import { BadgeBrowserApi, RawBadgeState } from "../badge-browser-api";
+
+export class MockBadgeBrowserApi implements BadgeBrowserApi {
+  specificStates: Record<number, RawBadgeState> = {};
+  generalState?: RawBadgeState;
+  tabs: number[] = [];
+
+  setState(state: RawBadgeState, tabId?: number): Promise<void> {
+    if (tabId !== undefined) {
+      this.specificStates[tabId] = state;
+    } else {
+      this.generalState = state;
+    }
+
+    return Promise.resolve();
+  }
+
+  getTabs(): Promise<number[]> {
+    return Promise.resolve(this.tabs);
+  }
+}
diff --git a/apps/browser/src/platform/popup/abstractions/browser-popup-utils.abstractions.ts b/apps/browser/src/platform/browser/abstractions/browser-popup-utils.abstractions.ts
similarity index 100%
rename from apps/browser/src/platform/popup/abstractions/browser-popup-utils.abstractions.ts
rename to apps/browser/src/platform/browser/abstractions/browser-popup-utils.abstractions.ts
diff --git a/apps/browser/src/platform/browser/browser-api.ts b/apps/browser/src/platform/browser/browser-api.ts
index 4ef72fa0077..d0bdaa504b3 100644
--- a/apps/browser/src/platform/browser/browser-api.ts
+++ b/apps/browser/src/platform/browser/browser-api.ts
@@ -437,7 +437,7 @@ export class BrowserApi {
    * @param event - The event in which to add the listener to.
    * @param callback - The callback you want registered onto the event.
    */
-  static addListener<T extends (...args: readonly unknown[]) => unknown>(
+  static addListener<T extends (...args: readonly any[]) => any>(
     event: chrome.events.Event<T>,
     callback: T,
   ) {
diff --git a/apps/browser/src/platform/popup/browser-popup-utils.spec.ts b/apps/browser/src/platform/browser/browser-popup-utils.spec.ts
similarity index 99%
rename from apps/browser/src/platform/popup/browser-popup-utils.spec.ts
rename to apps/browser/src/platform/browser/browser-popup-utils.spec.ts
index 73f0d23f4f2..9f9a6e313c8 100644
--- a/apps/browser/src/platform/popup/browser-popup-utils.spec.ts
+++ b/apps/browser/src/platform/browser/browser-popup-utils.spec.ts
@@ -1,6 +1,6 @@
 import { createChromeTabMock } from "../../autofill/spec/autofill-mocks";
-import { BrowserApi } from "../browser/browser-api";
 
+import { BrowserApi } from "./browser-api";
 import BrowserPopupUtils from "./browser-popup-utils";
 
 describe("BrowserPopupUtils", () => {
diff --git a/apps/browser/src/platform/popup/browser-popup-utils.ts b/apps/browser/src/platform/browser/browser-popup-utils.ts
similarity index 96%
rename from apps/browser/src/platform/popup/browser-popup-utils.ts
rename to apps/browser/src/platform/browser/browser-popup-utils.ts
index 33a1ff4016d..e9fe3dd1ea3 100644
--- a/apps/browser/src/platform/popup/browser-popup-utils.ts
+++ b/apps/browser/src/platform/browser/browser-popup-utils.ts
@@ -1,9 +1,21 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { BrowserApi } from "../browser/browser-api";
 
 import { ScrollOptions } from "./abstractions/browser-popup-utils.abstractions";
-import { PopupWidthOptions } from "./layout/popup-size.service";
+import { BrowserApi } from "./browser-api";
+
+/**
+ *
+ * Value represents width in pixels
+ */
+export const PopupWidthOptions = Object.freeze({
+  default: 380,
+  wide: 480,
+  "extra-wide": 600,
+});
+
+type PopupWidthOptions = typeof PopupWidthOptions;
+export type PopupWidthOption = keyof PopupWidthOptions;
 
 class BrowserPopupUtils {
   /**
diff --git a/apps/browser/src/platform/browser/run-inside-angular.operator.ts b/apps/browser/src/platform/browser/run-inside-angular.operator.ts
index 4e9b52b009c..f811077314e 100644
--- a/apps/browser/src/platform/browser/run-inside-angular.operator.ts
+++ b/apps/browser/src/platform/browser/run-inside-angular.operator.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { NgZone } from "@angular/core";
 import { MonoTypeOperatorFunction, Observable } from "rxjs";
 
diff --git a/apps/browser/src/platform/browser/zoned-message-listener.service.ts b/apps/browser/src/platform/browser/zoned-message-listener.service.ts
index ce9f7e2021e..88d714e07cb 100644
--- a/apps/browser/src/platform/browser/zoned-message-listener.service.ts
+++ b/apps/browser/src/platform/browser/zoned-message-listener.service.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { Injectable, NgZone } from "@angular/core";
 import { Observable } from "rxjs";
 
diff --git a/apps/browser/src/platform/ipc/ipc-background.service.ts b/apps/browser/src/platform/ipc/ipc-background.service.ts
index 155966898f9..911ca931c70 100644
--- a/apps/browser/src/platform/ipc/ipc-background.service.ts
+++ b/apps/browser/src/platform/ipc/ipc-background.service.ts
@@ -1,11 +1,13 @@
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { IpcMessage, isIpcMessage, IpcService } from "@bitwarden/common/platform/ipc";
 import {
-  IpcClient,
   IpcCommunicationBackend,
   IncomingMessage,
   OutgoingMessage,
+  ipcRegisterDiscoverHandler,
+  IpcClient,
 } from "@bitwarden/sdk-internal";
 
 import { BrowserApi } from "../browser/browser-api";
@@ -13,7 +15,10 @@ import { BrowserApi } from "../browser/browser-api";
 export class IpcBackgroundService extends IpcService {
   private communicationBackend?: IpcCommunicationBackend;
 
-  constructor(private logService: LogService) {
+  constructor(
+    private platformUtilsService: PlatformUtilsService,
+    private logService: LogService,
+  ) {
     super();
   }
 
@@ -23,14 +28,14 @@ export class IpcBackgroundService extends IpcService {
       await SdkLoadService.Ready;
       this.communicationBackend = new IpcCommunicationBackend({
         async send(message: OutgoingMessage): Promise<void> {
-          if (typeof message.destination === "object") {
+          if (typeof message.destination === "object" && message.destination.Web != undefined) {
             await BrowserApi.tabSendMessage(
               { id: message.destination.Web.id } as chrome.tabs.Tab,
               {
                 type: "bitwarden-ipc-message",
                 message: {
                   destination: message.destination,
-                  payload: message.payload,
+                  payload: [...message.payload],
                   topic: message.topic,
                 },
               } satisfies IpcMessage,
@@ -44,7 +49,7 @@ export class IpcBackgroundService extends IpcService {
       });
 
       BrowserApi.messageListener("platform.ipc", (message, sender) => {
-        if (!isIpcMessage(message)) {
+        if (!isIpcMessage(message) || message.message.destination !== "BrowserBackground") {
           return;
         }
 
@@ -53,14 +58,25 @@ export class IpcBackgroundService extends IpcService {
           return;
         }
 
-        this.communicationBackend?.deliver_message(
-          new IncomingMessage(message.message.payload, message.message.destination, {
-            Web: { id: sender.tab.id },
-          }),
+        this.communicationBackend?.receive(
+          new IncomingMessage(
+            new Uint8Array(message.message.payload),
+            message.message.destination,
+            {
+              Web: { id: sender.tab.id },
+            },
+            message.message.topic,
+          ),
         );
       });
 
       await super.initWithClient(new IpcClient(this.communicationBackend));
+
+      if (this.platformUtilsService.isDev()) {
+        await ipcRegisterDiscoverHandler(this.client, {
+          version: await this.platformUtilsService.getApplicationVersion(),
+        });
+      }
     } catch (e) {
       this.logService.error("[IPC] Initialization failed", e);
     }
diff --git a/apps/browser/src/platform/listeners/update-badge.ts b/apps/browser/src/platform/listeners/update-badge.ts
deleted file mode 100644
index c168ae44f3c..00000000000
--- a/apps/browser/src/platform/listeners/update-badge.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { firstValueFrom } from "rxjs";
-
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { getOptionalUserId } from "@bitwarden/common/auth/services/account.service";
-import { BadgeSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/badge-settings.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-
-import MainBackground from "../../background/main.background";
-import IconDetails from "../../vault/background/models/icon-details";
-import { BrowserApi } from "../browser/browser-api";
-
-export type BadgeOptions = {
-  tab?: chrome.tabs.Tab;
-  windowId?: number;
-};
-
-export class UpdateBadge {
-  private authService: AuthService;
-  private badgeSettingsService: BadgeSettingsServiceAbstraction;
-  private cipherService: CipherService;
-  private accountService: AccountService;
-  private badgeAction: typeof chrome.action | typeof chrome.browserAction;
-  private sidebarAction: OperaSidebarAction | FirefoxSidebarAction;
-  private win: Window & typeof globalThis;
-  private platformUtilsService: PlatformUtilsService;
-
-  constructor(win: Window & typeof globalThis, services: MainBackground) {
-    this.badgeAction = BrowserApi.getBrowserAction();
-    this.sidebarAction = BrowserApi.getSidebarAction(self);
-    this.win = win;
-
-    this.badgeSettingsService = services.badgeSettingsService;
-    this.authService = services.authService;
-    this.cipherService = services.cipherService;
-    this.accountService = services.accountService;
-    this.platformUtilsService = services.platformUtilsService;
-  }
-
-  async run(opts?: { tabId?: number; windowId?: number }): Promise<void> {
-    const authStatus = await this.authService.getAuthStatus();
-
-    await this.setBadgeBackgroundColor();
-
-    switch (authStatus) {
-      case AuthenticationStatus.LoggedOut: {
-        await this.setLoggedOut();
-        break;
-      }
-      case AuthenticationStatus.Locked: {
-        await this.setLocked();
-        break;
-      }
-      case AuthenticationStatus.Unlocked: {
-        const tab = await this.getTab(opts?.tabId, opts?.windowId);
-        await this.setUnlocked({ tab, windowId: tab?.windowId });
-        break;
-      }
-    }
-  }
-
-  async setLoggedOut(): Promise<void> {
-    await this.setBadgeIcon("_gray");
-    await this.clearBadgeText();
-  }
-
-  async setLocked() {
-    await this.setBadgeIcon("_locked");
-    await this.clearBadgeText();
-  }
-
-  private async clearBadgeText() {
-    const tabs = await BrowserApi.getActiveTabs();
-    if (tabs != null) {
-      tabs.forEach(async (tab) => {
-        if (tab.id != null) {
-          await this.setBadgeText("", tab.id);
-        }
-      });
-    }
-  }
-
-  async setUnlocked(opts: BadgeOptions) {
-    await this.setBadgeIcon("");
-
-    const enableBadgeCounter = await firstValueFrom(this.badgeSettingsService.enableBadgeCounter$);
-    if (!enableBadgeCounter) {
-      return;
-    }
-
-    const activeUserId = await firstValueFrom(
-      this.accountService.activeAccount$.pipe(getOptionalUserId),
-    );
-    if (!activeUserId) {
-      return;
-    }
-
-    const ciphers = await this.cipherService.getAllDecryptedForUrl(opts?.tab?.url, activeUserId);
-    let countText = ciphers.length == 0 ? "" : ciphers.length.toString();
-    if (ciphers.length > 9) {
-      countText = "9+";
-    }
-    await this.setBadgeText(countText, opts?.tab?.id);
-  }
-
-  setBadgeBackgroundColor(color = "#294e5f") {
-    if (this.badgeAction?.setBadgeBackgroundColor) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.badgeAction.setBadgeBackgroundColor({ color });
-    }
-    if (this.isOperaSidebar(this.sidebarAction)) {
-      this.sidebarAction.setBadgeBackgroundColor({ color });
-    }
-  }
-
-  setBadgeText(text: string, tabId?: number) {
-    this.setActionText(text, tabId);
-    this.setSideBarText(text, tabId);
-  }
-
-  async setBadgeIcon(iconSuffix: string, windowId?: number) {
-    const options: IconDetails = {
-      path: {
-        19: "/images/icon19" + iconSuffix + ".png",
-        38: "/images/icon38" + iconSuffix + ".png",
-      },
-    };
-    if (windowId && this.platformUtilsService.isFirefox()) {
-      options.windowId = windowId;
-    }
-
-    await this.setActionIcon(options);
-    await this.setSidebarActionIcon(options);
-  }
-
-  private setActionText(text: string, tabId?: number) {
-    if (this.badgeAction?.setBadgeText) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.badgeAction.setBadgeText({ text, tabId });
-    }
-  }
-
-  private setSideBarText(text: string, tabId?: number) {
-    if (this.isOperaSidebar(this.sidebarAction)) {
-      this.sidebarAction.setBadgeText({ text, tabId });
-    } else if (this.sidebarAction) {
-      // Firefox
-      const title = `Bitwarden${Utils.isNullOrEmpty(text) ? "" : ` [${text}]`}`;
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.sidebarAction.setTitle({ title, tabId });
-    }
-  }
-
-  private async setActionIcon(options: IconDetails) {
-    if (!this.badgeAction?.setIcon) {
-      return;
-    }
-
-    if (this.useSyncApiCalls) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.badgeAction.setIcon(options);
-    } else {
-      await new Promise<void>((resolve) => this.badgeAction.setIcon(options, () => resolve()));
-    }
-  }
-
-  private async setSidebarActionIcon(options: IconDetails) {
-    if (!this.sidebarAction?.setIcon) {
-      return;
-    }
-
-    if ("opr" in this.win && BrowserApi.isManifestVersion(3)) {
-      // setIcon API is currenly broken for Opera MV3 extensions
-      // https://forums.opera.com/topic/75680/opr-sidebaraction-seticon-api-is-broken-access-to-extension-api-denied?_=1738349261570
-      // The API currently crashes on MacOS
-      return;
-    }
-
-    if (this.isOperaSidebar(this.sidebarAction)) {
-      await new Promise<void>((resolve) =>
-        (this.sidebarAction as OperaSidebarAction).setIcon(options, () => resolve()),
-      );
-    } else {
-      await this.sidebarAction.setIcon(options);
-    }
-  }
-
-  private async getTab(tabId?: number, windowId?: number) {
-    return (
-      (await BrowserApi.getTab(tabId)) ??
-      (windowId
-        ? await BrowserApi.tabsQueryFirst({ active: true, windowId })
-        : await BrowserApi.tabsQueryFirst({ active: true, currentWindow: true })) ??
-      (await BrowserApi.tabsQueryFirst({ active: true, lastFocusedWindow: true })) ??
-      (await BrowserApi.tabsQueryFirst({ active: true }))
-    );
-  }
-
-  private get useSyncApiCalls() {
-    return this.platformUtilsService.isFirefox() || this.platformUtilsService.isSafari();
-  }
-
-  private isOperaSidebar(
-    action: OperaSidebarAction | FirefoxSidebarAction,
-  ): action is OperaSidebarAction {
-    return action != null && (action as OperaSidebarAction).setBadgeText != null;
-  }
-}
diff --git a/apps/browser/src/platform/popup/components/pop-out.component.ts b/apps/browser/src/platform/popup/components/pop-out.component.ts
index 255c6f853cd..320fa6f05ab 100644
--- a/apps/browser/src/platform/popup/components/pop-out.component.ts
+++ b/apps/browser/src/platform/popup/components/pop-out.component.ts
@@ -5,12 +5,11 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { IconButtonModule } from "@bitwarden/components";
 
-import BrowserPopupUtils from "../browser-popup-utils";
+import BrowserPopupUtils from "../../browser/browser-popup-utils";
 
 @Component({
   selector: "app-pop-out",
   templateUrl: "pop-out.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, IconButtonModule],
 })
 export class PopOutComponent implements OnInit {
diff --git a/apps/browser/src/platform/popup/header.component.ts b/apps/browser/src/platform/popup/header.component.ts
index cba9f20b629..0e6e39ee051 100644
--- a/apps/browser/src/platform/popup/header.component.ts
+++ b/apps/browser/src/platform/popup/header.component.ts
@@ -11,7 +11,6 @@ import { enableAccountSwitching } from "../flags";
 @Component({
   selector: "app-header",
   templateUrl: "header.component.html",
-  standalone: true,
   imports: [CommonModule, CurrentAccountComponent],
 })
 export class HeaderComponent {
diff --git a/apps/browser/src/platform/popup/layout/popup-back.directive.ts b/apps/browser/src/platform/popup/layout/popup-back.directive.ts
index 95f82588640..919cee71ba2 100644
--- a/apps/browser/src/platform/popup/layout/popup-back.directive.ts
+++ b/apps/browser/src/platform/popup/layout/popup-back.directive.ts
@@ -9,7 +9,6 @@ import { PopupRouterCacheService } from "../view-cache/popup-router-cache.servic
 /** Navigate the browser popup to the previous page when the component is clicked. */
 @Directive({
   selector: "[popupBackAction]",
-  standalone: true,
 })
 export class PopupBackBrowserDirective extends BitActionDirective {
   constructor(
diff --git a/apps/browser/src/platform/popup/layout/popup-footer.component.ts b/apps/browser/src/platform/popup/layout/popup-footer.component.ts
index 826a1d1c601..928394b0ad4 100644
--- a/apps/browser/src/platform/popup/layout/popup-footer.component.ts
+++ b/apps/browser/src/platform/popup/layout/popup-footer.component.ts
@@ -3,7 +3,6 @@ import { Component } from "@angular/core";
 @Component({
   selector: "popup-footer",
   templateUrl: "popup-footer.component.html",
-  standalone: true,
   imports: [],
 })
 export class PopupFooterComponent {}
diff --git a/apps/browser/src/platform/popup/layout/popup-header.component.ts b/apps/browser/src/platform/popup/layout/popup-header.component.ts
index 3a590b284fe..b580b84f39b 100644
--- a/apps/browser/src/platform/popup/layout/popup-header.component.ts
+++ b/apps/browser/src/platform/popup/layout/popup-header.component.ts
@@ -19,7 +19,6 @@ import { PopupPageComponent } from "./popup-page.component";
 @Component({
   selector: "popup-header",
   templateUrl: "popup-header.component.html",
-  standalone: true,
   imports: [TypographyModule, CommonModule, IconButtonModule, JslibModule, AsyncActionsModule],
 })
 export class PopupHeaderComponent {
diff --git a/apps/browser/src/platform/popup/layout/popup-layout.mdx b/apps/browser/src/platform/popup/layout/popup-layout.mdx
index 017ee20b344..a2725350a8f 100644
--- a/apps/browser/src/platform/popup/layout/popup-layout.mdx
+++ b/apps/browser/src/platform/popup/layout/popup-layout.mdx
@@ -54,6 +54,9 @@ page looks nice when the extension is popped out.
     `false`.
 - `loadingText`
   - Custom text to be applied to the loading element for screenreaders only. Defaults to "Loading".
+- `disablePadding`
+  - When `true`, disables the padding of the scrollable region inside of `main`. You will need to
+    add your own padding to the element you place inside of this area.
 
 Basic usage example:
 
@@ -169,6 +172,22 @@ When the browser extension is popped out, the "popout" button should not be pass
 
 <Canvas of={stories.PoppedOut} />
 
+## With Virtual Scroll
+
+If you are using a virtual scrolling container inside of the popup page, you'll want to apply the
+`bitScrollLayout` directive to the `cdk-virtual-scroll-viewport` element. This tells the virtual
+scroll viewport to use the popup page's scroll layout div as the scrolling container.
+
+See the code in the example below.
+
+<Canvas of={stories.WithVirtualScrollChild} />
+
+### Known Virtual Scroll Issues
+
+See [Virtual Scrolling](?path=/docs/documentation-virtual-scrolling--docs#known-footgun) for more
+information about how to structure virtual scrolling containers with layout components and avoid a
+known issue with template construction.
+
 # Other stories
 
 ## Centered Content
diff --git a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
index 48940f5fa10..894ab13dd19 100644
--- a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
+++ b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
@@ -1,5 +1,4 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
+import { ScrollingModule } from "@angular/cdk/scrolling";
 import { CommonModule } from "@angular/common";
 import { Component, importProvidersFrom } from "@angular/core";
 import { RouterModule } from "@angular/router";
@@ -20,6 +19,7 @@ import {
   NoItemsModule,
   SearchModule,
   SectionComponent,
+  ScrollLayoutDirective,
 } from "@bitwarden/components";
 
 import { PopupRouterCacheService } from "../view-cache/popup-router-cache.service";
@@ -36,10 +36,20 @@ import { PopupTabNavigationComponent } from "./popup-tab-navigation.component";
       <ng-content></ng-content>
     </div>
   `,
-  standalone: true,
 })
 class ExtensionContainerComponent {}
 
+@Component({
+  selector: "extension-popped-container",
+  template: `
+    <div class="tw-h-[640px] tw-w-[900px] tw-border tw-border-solid tw-border-secondary-300">
+      <ng-content></ng-content>
+    </div>
+  `,
+  standalone: true,
+})
+class ExtensionPoppedContainerComponent {}
+
 @Component({
   selector: "vault-placeholder",
   template: /*html*/ `
@@ -71,7 +81,6 @@ class ExtensionContainerComponent {}
       </bit-item-group>
     </bit-section>
   `,
-  standalone: true,
   imports: [CommonModule, ItemModule, BadgeModule, IconButtonModule, SectionComponent],
 })
 class VaultComponent {
@@ -86,7 +95,6 @@ class VaultComponent {
       Add
     </button>
   `,
-  standalone: true,
   imports: [ButtonModule],
 })
 class MockAddButtonComponent {}
@@ -102,7 +110,6 @@ class MockAddButtonComponent {}
       aria-label="Pop out"
     ></button>
   `,
-  standalone: true,
   imports: [IconButtonModule],
 })
 class MockPopoutButtonComponent {}
@@ -114,7 +121,6 @@ class MockPopoutButtonComponent {}
       <bit-avatar text="Ash Ketchum" size="small"></bit-avatar>
     </button>
   `,
-  standalone: true,
   imports: [AvatarModule],
 })
 class MockCurrentAccountComponent {}
@@ -122,7 +128,6 @@ class MockCurrentAccountComponent {}
 @Component({
   selector: "mock-search",
   template: ` <bit-search placeholder="Search"> </bit-search> `,
-  standalone: true,
   imports: [SearchModule],
 })
 class MockSearchComponent {}
@@ -134,7 +139,6 @@ class MockSearchComponent {}
       This is an important note about these ciphers
     </bit-banner>
   `,
-  standalone: true,
   imports: [BannerModule],
 })
 class MockBannerComponent {}
@@ -154,7 +158,6 @@ class MockBannerComponent {}
       <vault-placeholder></vault-placeholder>
     </popup-page>
   `,
-  standalone: true,
   imports: [
     PopupPageComponent,
     PopupHeaderComponent,
@@ -180,7 +183,6 @@ class MockVaultPageComponent {}
       <vault-placeholder></vault-placeholder>
     </popup-page>
   `,
-  standalone: true,
   imports: [
     PopupPageComponent,
     PopupHeaderComponent,
@@ -205,7 +207,6 @@ class MockVaultPagePoppedComponent {}
       <div class="tw-text-main">Generator content here</div>
     </popup-page>
   `,
-  standalone: true,
   imports: [
     PopupPageComponent,
     PopupHeaderComponent,
@@ -230,7 +231,6 @@ class MockGeneratorPageComponent {}
       <div class="tw-text-main">Send content here</div>
     </popup-page>
   `,
-  standalone: true,
   imports: [
     PopupPageComponent,
     PopupHeaderComponent,
@@ -255,7 +255,6 @@ class MockSendPageComponent {}
       <div class="tw-text-main">Settings content here</div>
     </popup-page>
   `,
-  standalone: true,
   imports: [
     PopupPageComponent,
     PopupHeaderComponent,
@@ -283,7 +282,6 @@ class MockSettingsPageComponent {}
       </popup-footer>
     </popup-page>
   `,
-  standalone: true,
   imports: [
     PopupPageComponent,
     PopupHeaderComponent,
@@ -308,6 +306,7 @@ export default {
   decorators: [
     moduleMetadata({
       imports: [
+        ScrollLayoutDirective,
         PopupTabNavigationComponent,
         PopupHeaderComponent,
         PopupPageComponent,
@@ -315,6 +314,7 @@ export default {
         CommonModule,
         RouterModule,
         ExtensionContainerComponent,
+        ExtensionPoppedContainerComponent,
         MockBannerComponent,
         MockSearchComponent,
         MockVaultSubpageComponent,
@@ -325,6 +325,11 @@ export default {
         MockVaultPagePoppedComponent,
         NoItemsModule,
         VaultComponent,
+        ScrollingModule,
+        ItemModule,
+        SectionComponent,
+        IconButtonModule,
+        BadgeModule,
       ],
       providers: [
         {
@@ -508,7 +513,21 @@ export const CompactMode: Story = {
       const compact = canvasEl.querySelector(
         `#${containerId} [data-testid=popup-layout-scroll-region]`,
       );
+
+      if (!compact) {
+        // eslint-disable-next-line
+        console.error(`#${containerId} [data-testid=popup-layout-scroll-region] not found`);
+        return;
+      }
+
       const label = canvasEl.querySelector(`#${containerId} .example-label`);
+
+      if (!label) {
+        // eslint-disable-next-line
+        console.error(`#${containerId} .example-label not found`);
+        return;
+      }
+
       const percentVisible =
         100 -
         Math.round((100 * (compact.scrollHeight - compact.clientHeight)) / compact.scrollHeight);
@@ -523,9 +542,9 @@ export const PoppedOut: Story = {
   render: (args) => ({
     props: args,
     template: /* HTML */ `
-      <div class="tw-h-[640px] tw-w-[900px] tw-border tw-border-solid tw-border-secondary-300">
+      <extension-popped-container>
         <mock-vault-page-popped></mock-vault-page-popped>
-      </div>
+      </extension-popped-container>
     `,
   }),
 };
@@ -573,10 +592,9 @@ export const TransparentHeader: Story = {
     template: /* HTML */ `
       <extension-container>
         <popup-page>
-          <popup-header slot="header" background="alt"
-            ><span class="tw-italic tw-text-main">🤠 Custom Content</span></popup-header
-          >
-
+          <popup-header slot="header" background="alt">
+            <span class="tw-italic tw-text-main">🤠 Custom Content</span>
+          </popup-header>
           <vault-placeholder></vault-placeholder>
         </popup-page>
       </extension-container>
@@ -621,3 +639,56 @@ export const WidthOptions: Story = {
     `,
   }),
 };
+
+export const WithVirtualScrollChild: Story = {
+  render: (args) => ({
+    props: { ...args, data: Array.from(Array(20).keys()) },
+    template: /* HTML */ `
+      <extension-popped-container>
+        <popup-page>
+          <popup-header slot="header" pageTitle="Test"> </popup-header>
+          <mock-search slot="above-scroll-area"></mock-search>
+          <bit-section>
+            @defer (on immediate) {
+            <bit-item-group aria-label="Mock Vault Items">
+              <cdk-virtual-scroll-viewport itemSize="61" bitScrollLayout>
+                <bit-item *cdkVirtualFor="let item of data; index as i">
+                  <button type="button" bit-item-content>
+                    <i
+                      slot="start"
+                      class="bwi bwi-globe tw-text-3xl tw-text-muted"
+                      aria-hidden="true"
+                    ></i>
+                    {{ i }} of {{ data.length - 1 }}
+                    <span slot="secondary">Bar</span>
+                  </button>
+
+                  <ng-container slot="end">
+                    <bit-item-action>
+                      <button type="button" bitBadge variant="primary">Fill</button>
+                    </bit-item-action>
+                    <bit-item-action>
+                      <button
+                        type="button"
+                        bitIconButton="bwi-clone"
+                        aria-label="Copy item"
+                      ></button>
+                    </bit-item-action>
+                    <bit-item-action>
+                      <button
+                        type="button"
+                        bitIconButton="bwi-ellipsis-v"
+                        aria-label="More options"
+                      ></button>
+                    </bit-item-action>
+                  </ng-container>
+                </bit-item>
+              </cdk-virtual-scroll-viewport>
+            </bit-item-group>
+            }
+          </bit-section>
+        </popup-page>
+      </extension-popped-container>
+    `,
+  }),
+};
diff --git a/apps/browser/src/platform/popup/layout/popup-page.component.html b/apps/browser/src/platform/popup/layout/popup-page.component.html
index 2313b942a38..b53ef6e97eb 100644
--- a/apps/browser/src/platform/popup/layout/popup-page.component.html
+++ b/apps/browser/src/platform/popup/layout/popup-page.component.html
@@ -1,29 +1,39 @@
 <ng-content select="[slot=header]"></ng-content>
 <main class="tw-flex-1 tw-overflow-hidden tw-flex tw-flex-col tw-relative tw-bg-background-alt">
   <ng-content select="[slot=full-width-notice]"></ng-content>
+  <!-- 
+    x padding on this container is designed to always be a minimum of 0.75rem (equivalent to tailwind's tw-px-3), or 0.5rem (equivalent
+    to tailwind's tw-px-2) in compact mode, but stretch to fill the remainder of the container when the content reaches a maximum of
+    640px in width (equivalent to tailwind's `sm` breakpoint)
+  -->
   <div
     #nonScrollable
-    class="tw-transition-colors tw-duration-200 tw-border-0 tw-border-b tw-border-solid tw-p-3 bit-compact:tw-p-2"
+    class="tw-transition-colors tw-duration-200 tw-border-0 tw-border-b tw-border-solid tw-py-3 bit-compact:tw-py-2 tw-px-[max(0.75rem,calc((100%-(var(--tw-sm-breakpoint)))/2))] bit-compact:tw-px-[max(0.5rem,calc((100%-(var(--tw-sm-breakpoint)))/2))]"
     [ngClass]="{
-      'tw-invisible !tw-p-0': loading || nonScrollable.childElementCount === 0,
+      'tw-invisible !tw-p-0 !tw-border-none': loading || nonScrollable.childElementCount === 0,
       'tw-border-secondary-300': scrolled(),
       'tw-border-transparent': !scrolled(),
     }"
   >
     <ng-content select="[slot=above-scroll-area]"></ng-content>
   </div>
+  <!-- 
+    x padding on this container is designed to always be a minimum of 0.75rem (equivalent to tailwind's tw-px-3), or 0.5rem (equivalent
+    to tailwind's tw-px-2) in compact mode, but stretch to fill the remainder of the container when the content reaches a maximum of
+    640px in width (equivalent to tailwind's `sm` breakpoint)
+  -->
   <div
-    class="tw-max-w-screen-sm tw-mx-auto tw-overflow-y-auto tw-flex tw-flex-col tw-size-full tw-styled-scrollbar"
+    class="tw-overflow-y-auto tw-size-full tw-styled-scrollbar"
     data-testid="popup-layout-scroll-region"
     (scroll)="handleScroll($event)"
-    [ngClass]="{ 'tw-invisible': loading }"
+    [ngClass]="{
+      'tw-invisible': loading,
+      'tw-py-3 bit-compact:tw-py-2 tw-px-[max(0.75rem,calc((100%-(var(--tw-sm-breakpoint)))/2))] bit-compact:tw-px-[max(0.5rem,calc((100%-(var(--tw-sm-breakpoint)))/2))]':
+        !disablePadding,
+    }"
+    bitScrollLayoutHost
   >
-    <div
-      class="tw-max-w-screen-sm tw-mx-auto tw-flex-1 tw-flex tw-flex-col tw-w-full"
-      [ngClass]="{ 'tw-p-3 bit-compact:tw-p-2': !disablePadding }"
-    >
-      <ng-content></ng-content>
-    </div>
+    <ng-content></ng-content>
   </div>
   <span
     class="tw-absolute tw-inset-0 tw-flex tw-items-center tw-justify-center tw-text-main"
diff --git a/apps/browser/src/platform/popup/layout/popup-page.component.ts b/apps/browser/src/platform/popup/layout/popup-page.component.ts
index ca019c16bd7..e7675978622 100644
--- a/apps/browser/src/platform/popup/layout/popup-page.component.ts
+++ b/apps/browser/src/platform/popup/layout/popup-page.component.ts
@@ -2,15 +2,15 @@ import { CommonModule } from "@angular/common";
 import { booleanAttribute, Component, inject, Input, signal } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ScrollLayoutHostDirective } from "@bitwarden/components";
 
 @Component({
   selector: "popup-page",
   templateUrl: "popup-page.component.html",
-  standalone: true,
   host: {
     class: "tw-h-full tw-flex tw-flex-col tw-overflow-y-hidden",
   },
-  imports: [CommonModule],
+  imports: [CommonModule, ScrollLayoutHostDirective],
 })
 export class PopupPageComponent {
   protected i18nService = inject(I18nService);
diff --git a/apps/browser/src/platform/popup/layout/popup-size.service.ts b/apps/browser/src/platform/popup/layout/popup-size.service.ts
index 69d3102d24e..0e4aacb9a97 100644
--- a/apps/browser/src/platform/popup/layout/popup-size.service.ts
+++ b/apps/browser/src/platform/popup/layout/popup-size.service.ts
@@ -7,20 +7,10 @@ import {
   POPUP_STYLE_DISK,
 } from "@bitwarden/common/platform/state";
 
-import BrowserPopupUtils from "../browser-popup-utils";
-
-/**
- *
- * Value represents width in pixels
- */
-export const PopupWidthOptions = Object.freeze({
-  default: 380,
-  wide: 480,
-  "extra-wide": 600,
-});
-
-type PopupWidthOptions = typeof PopupWidthOptions;
-export type PopupWidthOption = keyof PopupWidthOptions;
+import BrowserPopupUtils, {
+  PopupWidthOption,
+  PopupWidthOptions,
+} from "../../browser/browser-popup-utils";
 
 const POPUP_WIDTH_KEY_DEF = new KeyDefinition<PopupWidthOption>(POPUP_STYLE_DISK, "popup-width", {
   deserializer: (s) => s,
diff --git a/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.html b/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.html
index 1170725a4b7..0a52518b250 100644
--- a/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.html
+++ b/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.html
@@ -7,7 +7,7 @@
       <ul class="tw-flex tw-flex-1 tw-mb-0 tw-p-0">
         <li *ngFor="let button of navButtons" class="tw-flex-1 tw-list-none tw-relative">
           <button
-            class="tw-w-full tw-flex tw-flex-col tw-items-center tw-px-0.5 tw-py-2 bit-compact:tw-py-1 tw-bg-transparent tw-no-underline hover:tw-no-underline hover:tw-text-primary-600 tw-group/tab-nav-btn hover:tw-bg-primary-100 tw-border-2 tw-border-solid tw-border-transparent focus-visible:tw-rounded-lg focus-visible:tw-border-primary-600"
+            class="tw-w-full tw-flex tw-flex-col tw-items-center tw-px-0.5 tw-py-2 bit-compact:tw-py-1 tw-bg-transparent tw-no-underline hover:tw-no-underline hover:tw-text-primary-600 tw-group/tab-nav-btn hover:tw-bg-hover-default tw-border-2 tw-border-solid tw-border-transparent focus-visible:tw-rounded-lg focus-visible:tw-border-primary-600"
             [ngClass]="rla.isActive ? 'tw-font-bold tw-text-primary-600' : 'tw-text-muted'"
             title="{{ button.label | i18n }}"
             [routerLink]="button.page"
diff --git a/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.ts b/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.ts
index 4984d3749a1..8a897e2e21b 100644
--- a/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.ts
+++ b/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.ts
@@ -17,7 +17,6 @@ export type NavButton = {
 @Component({
   selector: "popup-tab-navigation",
   templateUrl: "popup-tab-navigation.component.html",
-  standalone: true,
   imports: [CommonModule, LinkModule, RouterModule, JslibModule, IconModule],
   host: {
     class: "tw-block tw-h-full tw-w-full tw-flex tw-flex-col",
diff --git a/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts b/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts
index 5fc508ac2a6..b666e49c964 100644
--- a/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts
+++ b/apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts
@@ -15,7 +15,7 @@ import { filter, first, firstValueFrom, map, Observable, of, switchMap, tap } fr
 import { GlobalStateProvider } from "@bitwarden/common/platform/state";
 
 import { POPUP_ROUTE_HISTORY_KEY } from "../../../platform/services/popup-view-cache-background.service";
-import BrowserPopupUtils from "../browser-popup-utils";
+import BrowserPopupUtils from "../../browser/browser-popup-utils";
 
 /**
  * Preserves route history when opening and closing the popup
@@ -105,9 +105,11 @@ export class PopupRouterCacheService {
    * Navigate back in history
    */
   async back() {
-    await this.state.update((prevState) => (prevState ? prevState.slice(0, -1) : []));
+    const history = await this.state.update((prevState) =>
+      prevState ? prevState.slice(0, -1) : [],
+    );
 
-    if (this.hasNavigated) {
+    if (this.hasNavigated && history.length) {
       this.location.back();
       return;
     }
diff --git a/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts b/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts
index 4ae412fbda6..beac7616d8d 100644
--- a/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts
+++ b/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts
@@ -207,6 +207,14 @@ export abstract class BrowserPlatformUtilsService implements PlatformUtilsServic
     return true;
   }
 
+  supportsAutofill(): boolean {
+    return true;
+  }
+
+  supportsFileDownloads(): boolean {
+    return false;
+  }
+
   abstract showToast(
     type: "error" | "success" | "warning" | "info",
     title: string,
diff --git a/apps/browser/src/platform/services/sdk/browser-sdk-load.service.ts b/apps/browser/src/platform/services/sdk/browser-sdk-load.service.ts
index 409ff0dea06..3ad6dc2583d 100644
--- a/apps/browser/src/platform/services/sdk/browser-sdk-load.service.ts
+++ b/apps/browser/src/platform/services/sdk/browser-sdk-load.service.ts
@@ -35,9 +35,9 @@ if (BrowserApi.isManifestVersion(3)) {
     console.info("WebAssembly is supported in this environment");
     loadingPromise = import("./wasm");
   } else {
-    // eslint-disable-next-line no-console
-    console.info("WebAssembly is not supported in this environment");
-    loadingPromise = import("./fallback");
+    loadingPromise = new Promise((_, reject) => {
+      reject(new Error("WebAssembly is not supported in this environment"));
+    });
   }
 }
 
@@ -51,9 +51,7 @@ async function importModule(): Promise<GlobalWithWasmInit["initSdk"]> {
     console.info("WebAssembly is supported in this environment");
     await import("./wasm");
   } else {
-    // eslint-disable-next-line no-console
-    console.info("WebAssembly is not supported in this environment");
-    await import("./fallback");
+    throw new Error("WebAssembly is not supported in this environment");
   }
 
   // the wasm and fallback imports mutate globalThis to add the initSdk function
diff --git a/apps/browser/src/platform/services/sdk/fallback.ts b/apps/browser/src/platform/services/sdk/fallback.ts
deleted file mode 100644
index cee3598feda..00000000000
--- a/apps/browser/src/platform/services/sdk/fallback.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import * as sdk from "@bitwarden/sdk-internal";
-import * as wasm from "@bitwarden/sdk-internal/bitwarden_wasm_internal_bg.wasm.js";
-
-import { GlobalWithWasmInit } from "./browser-sdk-load.service";
-
-(globalThis as GlobalWithWasmInit).initSdk = () => {
-  (sdk as any).init(wasm);
-};
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 3dde9f15fdb..da5a6c43d36 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -15,11 +15,11 @@ import {
   tdeDecryptionRequiredGuard,
   unauthGuardFn,
 } from "@bitwarden/angular/auth/guards";
+import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-management/change-password";
+import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.component";
+import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import {
-  AnonLayoutWrapperComponent,
-  AnonLayoutWrapperData,
   DevicesIcon,
-  LockIcon,
   LoginComponent,
   LoginDecryptionOptionsComponent,
   LoginSecondaryContentComponent,
@@ -41,14 +41,12 @@ import {
   UserLockIcon,
   VaultIcon,
 } from "@bitwarden/auth/angular";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { AnonLayoutWrapperComponent, AnonLayoutWrapperData, Icons } from "@bitwarden/components";
 import { LockComponent } from "@bitwarden/key-management-ui";
 
-import { fido2AuthGuard } from "../auth/guards/fido2-auth.guard";
 import { AccountSwitcherComponent } from "../auth/popup/account-switching/account-switcher.component";
-import {
-  ExtensionAnonLayoutWrapperComponent,
-  ExtensionAnonLayoutWrapperData,
-} from "../auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component";
+import { fido2AuthGuard } from "../auth/popup/guards/fido2-auth.guard";
 import { SetPasswordComponent } from "../auth/popup/set-password.component";
 import { AccountSecurityComponent } from "../auth/popup/settings/account-security.component";
 import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component";
@@ -59,7 +57,7 @@ import { ExcludedDomainsComponent } from "../autofill/popup/settings/excluded-do
 import { NotificationsSettingsComponent } from "../autofill/popup/settings/notifications.component";
 import { PremiumV2Component } from "../billing/popup/settings/premium-v2.component";
 import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component";
-import BrowserPopupUtils from "../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../platform/browser/browser-popup-utils";
 import { popupRouterCacheGuard } from "../platform/popup/view-cache/popup-router-cache.service";
 import { CredentialGeneratorHistoryComponent } from "../tools/popup/generator/credential-generator-history.component";
 import { CredentialGeneratorComponent } from "../tools/popup/generator/credential-generator.component";
@@ -70,9 +68,6 @@ import { AboutPageV2Component } from "../tools/popup/settings/about-page/about-p
 import { ExportBrowserV2Component } from "../tools/popup/settings/export/export-browser-v2.component";
 import { ImportBrowserV2Component } from "../tools/popup/settings/import/import-browser-v2.component";
 import { SettingsV2Component } from "../tools/popup/settings/settings-v2.component";
-import { canAccessAtRiskPasswords } from "../vault/guards/at-risk-passwords.guard";
-import { clearVaultStateGuard } from "../vault/guards/clear-vault-state.guard";
-import { IntroCarouselGuard } from "../vault/guards/intro-carousel.guard";
 import { AtRiskPasswordsComponent } from "../vault/popup/components/at-risk-passwords/at-risk-passwords.component";
 import { AddEditV2Component } from "../vault/popup/components/vault-v2/add-edit/add-edit-v2.component";
 import { AssignCollections } from "../vault/popup/components/vault-v2/assign-collections/assign-collections.component";
@@ -81,6 +76,9 @@ import { IntroCarouselComponent } from "../vault/popup/components/vault-v2/intro
 import { PasswordHistoryV2Component } from "../vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component";
 import { VaultV2Component } from "../vault/popup/components/vault-v2/vault-v2.component";
 import { ViewV2Component } from "../vault/popup/components/vault-v2/view-v2/view-v2.component";
+import { canAccessAtRiskPasswords } from "../vault/popup/guards/at-risk-passwords.guard";
+import { clearVaultStateGuard } from "../vault/popup/guards/clear-vault-state.guard";
+import { IntroCarouselGuard } from "../vault/popup/guards/intro-carousel.guard";
 import { AppearanceV2Component } from "../vault/popup/settings/appearance-v2.component";
 import { DownloadBitwardenComponent } from "../vault/popup/settings/download-bitwarden.component";
 import { FoldersV2Component } from "../vault/popup/settings/folders-v2.component";
@@ -89,6 +87,10 @@ import { TrashComponent } from "../vault/popup/settings/trash.component";
 import { VaultSettingsV2Component } from "../vault/popup/settings/vault-settings-v2.component";
 
 import { RouteElevation } from "./app-routing.animations";
+import {
+  ExtensionAnonLayoutWrapperComponent,
+  ExtensionAnonLayoutWrapperData,
+} from "./components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component";
 import { debounceNavigationGuard } from "./services/debounce-navigation.service";
 import { TabsV2Component } from "./tabs-v2.component";
 
@@ -330,7 +332,15 @@ const routes: Routes = [
   {
     path: "update-temp-password",
     component: UpdateTempPasswordComponent,
-    canActivate: [authGuard],
+    canActivate: [
+      canAccessFeature(
+        FeatureFlag.PM16117_ChangeExistingPasswordRefactor,
+        false,
+        `/change-password`,
+        false,
+      ),
+      authGuard,
+    ],
     data: { elevation: 1 } satisfies RouteDataProperties,
   },
   {
@@ -378,6 +388,14 @@ const routes: Routes = [
           },
         ],
       },
+      {
+        path: "set-initial-password",
+        canActivate: [canAccessFeature(FeatureFlag.PM16117_SetInitialPasswordRefactor), authGuard],
+        component: SetInitialPasswordComponent,
+        data: {
+          elevation: 1,
+        } satisfies RouteDataProperties,
+      },
       {
         path: "login",
         canActivate: [unauthGuardFn(unauthRouteOverrides), IntroCarouselGuard],
@@ -496,14 +514,15 @@ const routes: Routes = [
         canActivate: [tdeDecryptionRequiredGuard()],
         data: {
           pageIcon: DevicesIcon,
-        },
+          showAcctSwitcher: true,
+        } satisfies ExtensionAnonLayoutWrapperData,
         children: [{ path: "", component: LoginDecryptionOptionsComponent }],
       },
       {
         path: "lock",
         canActivate: [lockGuard()],
         data: {
-          pageIcon: LockIcon,
+          pageIcon: Icons.LockIcon,
           pageTitle: {
             key: "yourVaultIsLockedV2",
           },
@@ -545,6 +564,23 @@ const routes: Routes = [
           showBackButton: true,
         } satisfies RouteDataProperties & ExtensionAnonLayoutWrapperData,
       },
+      {
+        path: "change-password",
+        data: {
+          elevation: 1,
+          hideFooter: true,
+        } satisfies RouteDataProperties & ExtensionAnonLayoutWrapperData,
+        children: [
+          {
+            path: "",
+            component: ChangePasswordComponent,
+          },
+        ],
+        canActivate: [
+          canAccessFeature(FeatureFlag.PM16117_ChangeExistingPasswordRefactor),
+          authGuard,
+        ],
+      },
     ],
   },
   {
diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts
index 5f7fbc1fad7..6a26476de43 100644
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -1,18 +1,39 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit, inject } from "@angular/core";
+import {
+  ChangeDetectorRef,
+  Component,
+  DestroyRef,
+  NgZone,
+  OnDestroy,
+  OnInit,
+  inject,
+} from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { NavigationEnd, Router, RouterOutlet } from "@angular/router";
-import { Subject, takeUntil, firstValueFrom, concatMap, filter, tap } from "rxjs";
+import {
+  Subject,
+  takeUntil,
+  firstValueFrom,
+  concatMap,
+  filter,
+  tap,
+  catchError,
+  of,
+  map,
+} from "rxjs";
 
 import { DeviceTrustToastService } from "@bitwarden/angular/auth/services/device-trust-toast.service.abstraction";
-import { LogoutReason } from "@bitwarden/auth/common";
+import { DocumentLangSetter } from "@bitwarden/angular/platform/i18n";
+import { LogoutReason, UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { AnimationControlService } from "@bitwarden/common/platform/abstractions/animation-control.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { MessageListener } from "@bitwarden/common/platform/messaging";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -23,7 +44,7 @@ import {
   ToastOptions,
   ToastService,
 } from "@bitwarden/components";
-import { BiometricsService, BiometricStateService } from "@bitwarden/key-management";
+import { BiometricsService, BiometricStateService, KeyService } from "@bitwarden/key-management";
 
 import { PopupCompactModeService } from "../platform/popup/layout/popup-compact-mode.service";
 import { PopupSizeService } from "../platform/popup/layout/popup-size.service";
@@ -38,23 +59,45 @@ import { DesktopSyncVerificationDialogComponent } from "./components/desktop-syn
   styles: [],
   animations: [routerTransition],
   template: `
-    <div [@routerTransition]="getRouteElevation(outlet)">
-      <router-outlet #outlet="outlet"></router-outlet>
-    </div>
-    <bit-toast-container></bit-toast-container>
+    @if (showSdkWarning | async) {
+      <div class="tw-h-screen tw-flex tw-justify-center tw-items-center tw-p-4">
+        <bit-callout type="danger">
+          {{ "wasmNotSupported" | i18n }}
+          <a
+            bitLink
+            href="https://bitwarden.com/help/wasm-not-supported/"
+            target="_blank"
+            rel="noreferrer"
+          >
+            {{ "learnMore" | i18n }}
+          </a>
+        </bit-callout>
+      </div>
+    } @else {
+      <div [@routerTransition]="getRouteElevation(outlet)">
+        <router-outlet #outlet="outlet"></router-outlet>
+      </div>
+      <bit-toast-container></bit-toast-container>
+    }
   `,
   standalone: false,
 })
 export class AppComponent implements OnInit, OnDestroy {
   private compactModeService = inject(PopupCompactModeService);
+  private sdkService = inject(SdkService);
 
   private lastActivity: Date;
   private activeUserId: UserId;
-  private recordActivitySubject = new Subject<void>();
   private routerAnimations = false;
 
   private destroy$ = new Subject<void>();
 
+  // Show a warning if the SDK is not available.
+  protected showSdkWarning = this.sdkService.client$.pipe(
+    map(() => false),
+    catchError(() => of(true)),
+  );
+
   constructor(
     private authService: AuthService,
     private i18nService: I18nService,
@@ -73,9 +116,17 @@ export class AppComponent implements OnInit, OnDestroy {
     private biometricStateService: BiometricStateService,
     private biometricsService: BiometricsService,
     private deviceTrustToastService: DeviceTrustToastService,
+    private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
+    private keyService: KeyService,
+    private readonly destoryRef: DestroyRef,
+    private readonly documentLangSetter: DocumentLangSetter,
     private popupSizeService: PopupSizeService,
+    private logService: LogService,
   ) {
     this.deviceTrustToastService.setupListeners$.pipe(takeUntilDestroyed()).subscribe();
+
+    const langSubscription = this.documentLangSetter.start();
+    this.destoryRef.onDestroy(() => langSubscription.unsubscribe());
   }
 
   async ngOnInit() {
@@ -123,14 +174,38 @@ export class AppComponent implements OnInit, OnDestroy {
             this.changeDetectorRef.detectChanges();
           } else if (msg.command === "authBlocked" || msg.command === "goHome") {
             await this.router.navigate(["login"]);
-          } else if (
-            msg.command === "locked" &&
-            (msg.userId == null || msg.userId == this.activeUserId)
-          ) {
+          } else if (msg.command === "locked") {
+            if (msg.userId == null) {
+              this.logService.error("'locked' message received without userId.");
+              return;
+            }
+
+            if (msg.userId !== this.activeUserId) {
+              this.logService.error(
+                `'locked' message received with userId ${msg.userId} but active userId is ${this.activeUserId}.`,
+              );
+              return;
+            }
+
             await this.biometricsService.setShouldAutopromptNow(false);
-            // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            this.router.navigate(["lock"]);
+
+            // When user is locked, normally we can just send them the lock screen.
+            // However, for account switching scenarios, we need to consider the TDE lock state.
+            const tdeEnabled = await firstValueFrom(
+              this.userDecryptionOptionsService
+                .userDecryptionOptionsById$(msg.userId)
+                .pipe(map((decryptionOptions) => decryptionOptions?.trustedDeviceOption != null)),
+            );
+
+            const everHadUserKey = await firstValueFrom(
+              this.keyService.everHadUserKey$(msg.userId),
+            );
+            if (tdeEnabled && !everHadUserKey) {
+              await this.router.navigate(["login-initiated"]);
+              return;
+            }
+
+            await this.router.navigate(["lock"]);
           } else if (msg.command === "showDialog") {
             // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts
index 8bea41da4d6..77c87838ff7 100644
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -20,11 +20,12 @@ import {
   ButtonModule,
   FormFieldModule,
   ToastModule,
+  CalloutModule,
+  LinkModule,
 } from "@bitwarden/components";
 
 import { AccountComponent } from "../auth/popup/account-switching/account.component";
 import { CurrentAccountComponent } from "../auth/popup/account-switching/current-account.component";
-import { ExtensionAnonLayoutWrapperComponent } from "../auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component";
 import { SetPasswordComponent } from "../auth/popup/set-password.component";
 import { AccountSecurityComponent } from "../auth/popup/settings/account-security.component";
 import { VaultTimeoutInputComponent } from "../auth/popup/settings/vault-timeout-input.component";
@@ -42,6 +43,7 @@ import { FilePopoutCalloutComponent } from "../tools/popup/components/file-popou
 
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";
+import { ExtensionAnonLayoutWrapperComponent } from "./components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component";
 import { UserVerificationComponent } from "./components/user-verification.component";
 import { ServicesModule } from "./services/services.module";
 import { TabsV2Component } from "./tabs-v2.component";
@@ -87,6 +89,8 @@ import "../platform/popup/locales";
     CurrentAccountComponent,
     FormFieldModule,
     ExtensionAnonLayoutWrapperComponent,
+    CalloutModule,
+    LinkModule,
   ],
   declarations: [
     AppComponent,
diff --git a/apps/browser/src/popup/components/desktop-sync-verification-dialog.component.ts b/apps/browser/src/popup/components/desktop-sync-verification-dialog.component.ts
index 5003bbdc936..2ca24da6c75 100644
--- a/apps/browser/src/popup/components/desktop-sync-verification-dialog.component.ts
+++ b/apps/browser/src/popup/components/desktop-sync-verification-dialog.component.ts
@@ -17,7 +17,6 @@ export type DesktopSyncVerificationDialogParams = {
 
 @Component({
   templateUrl: "desktop-sync-verification-dialog.component.html",
-  standalone: true,
   imports: [JslibModule, ButtonModule, DialogModule],
 })
 export class DesktopSyncVerificationDialogComponent implements OnDestroy, OnInit {
diff --git a/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service.ts b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service.ts
similarity index 95%
rename from apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service.ts
rename to apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service.ts
index 1b844d4b2c7..952c42b8367 100644
--- a/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service.ts
+++ b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service.ts
@@ -3,7 +3,7 @@ import { Observable, Subject } from "rxjs";
 import {
   AnonLayoutWrapperDataService,
   DefaultAnonLayoutWrapperDataService,
-} from "@bitwarden/auth/angular";
+} from "@bitwarden/components";
 
 import { ExtensionAnonLayoutWrapperData } from "./extension-anon-layout-wrapper.component";
 
diff --git a/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.html b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.html
similarity index 96%
rename from apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.html
rename to apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.html
index bd2886dacf0..4c394317d14 100644
--- a/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.html
+++ b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.html
@@ -27,6 +27,7 @@
     [maxWidth]="maxWidth"
     [hideFooter]="hideFooter"
     [hideIcon]="hideIcon"
+    [hideCardWrapper]="hideCardWrapper"
   >
     <router-outlet></router-outlet>
     <router-outlet slot="secondary" name="secondary"></router-outlet>
diff --git a/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
similarity index 90%
rename from apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
rename to apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
index d6cccf31bb4..7a98f570fda 100644
--- a/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
+++ b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
@@ -5,22 +5,23 @@ import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute, Data, NavigationEnd, Router, RouterModule } from "@angular/router";
 import { Subject, filter, switchMap, takeUntil, tap } from "rxjs";
 
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import {
+  Icon,
+  Icons,
+  IconModule,
+  Translation,
   AnonLayoutComponent,
   AnonLayoutWrapperData,
   AnonLayoutWrapperDataService,
-} from "@bitwarden/auth/angular";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { Icon, IconModule, Translation } from "@bitwarden/components";
+} from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
+import { CurrentAccountComponent } from "../../../auth/popup/account-switching/current-account.component";
+import { AccountSwitcherService } from "../../../auth/popup/account-switching/services/account-switcher.service";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
-import { CurrentAccountComponent } from "../account-switching/current-account.component";
-import { AccountSwitcherService } from "../account-switching/services/account-switcher.service";
-
-import { ExtensionBitwardenLogo } from "./extension-bitwarden-logo.icon";
 
 export interface ExtensionAnonLayoutWrapperData extends AnonLayoutWrapperData {
   showAcctSwitcher?: boolean;
@@ -31,7 +32,6 @@ export interface ExtensionAnonLayoutWrapperData extends AnonLayoutWrapperData {
 }
 
 @Component({
-  standalone: true,
   templateUrl: "extension-anon-layout-wrapper.component.html",
   imports: [
     AnonLayoutComponent,
@@ -60,9 +60,10 @@ export class ExtensionAnonLayoutWrapperComponent implements OnInit, OnDestroy {
   protected maxWidth: "md" | "3xl";
   protected hasLoggedInAccount: boolean = false;
   protected hideFooter: boolean;
+  protected hideCardWrapper: boolean = false;
 
   protected theme: string;
-  protected logo = ExtensionBitwardenLogo;
+  protected logo = Icons.ExtensionBitwardenLogo;
 
   constructor(
     private router: Router,
@@ -137,6 +138,10 @@ export class ExtensionAnonLayoutWrapperComponent implements OnInit, OnDestroy {
     if (firstChildRouteData["hideIcon"] !== undefined) {
       this.hideIcon = Boolean(firstChildRouteData["hideIcon"]);
     }
+
+    if (firstChildRouteData["hideCardWrapper"] !== undefined) {
+      this.hideCardWrapper = Boolean(firstChildRouteData["hideCardWrapper"]);
+    }
   }
 
   private listenForServiceDataChanges() {
@@ -177,6 +182,10 @@ export class ExtensionAnonLayoutWrapperComponent implements OnInit, OnDestroy {
       this.showReadonlyHostname = data.showReadonlyHostname;
     }
 
+    if (data.hideCardWrapper !== undefined) {
+      this.hideCardWrapper = data.hideCardWrapper;
+    }
+
     if (data.showAcctSwitcher !== undefined) {
       this.showAcctSwitcher = data.showAcctSwitcher;
     }
@@ -214,6 +223,8 @@ export class ExtensionAnonLayoutWrapperComponent implements OnInit, OnDestroy {
     this.showLogo = null;
     this.maxWidth = null;
     this.hideFooter = null;
+    this.hideIcon = null;
+    this.hideCardWrapper = null;
   }
 
   ngOnDestroy() {
diff --git a/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
similarity index 94%
rename from apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
rename to apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
index 78ca577a69d..2c3d09b79fb 100644
--- a/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
+++ b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
@@ -9,7 +9,6 @@ import {
 } from "@storybook/angular";
 import { of } from "rxjs";
 
-import { AnonLayoutWrapperDataService, LockIcon } from "@bitwarden/auth/angular";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AvatarService } from "@bitwarden/common/auth/abstractions/avatar.service";
@@ -23,13 +22,15 @@ import {
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { UserId } from "@bitwarden/common/types/guid";
-import { ButtonModule, I18nMockService } from "@bitwarden/components";
+import {
+  AnonLayoutWrapperDataService,
+  ButtonModule,
+  Icons,
+  I18nMockService,
+} from "@bitwarden/components";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { RegistrationCheckEmailIcon } from "../../../../../../libs/auth/src/angular/icons/registration-check-email.icon";
+import { AccountSwitcherService } from "../../../auth/popup/account-switching/services/account-switcher.service";
 import { PopupRouterCacheService } from "../../../platform/popup/view-cache/popup-router-cache.service";
-import { AccountSwitcherService } from "../account-switching/services/account-switcher.service";
 
 import { ExtensionAnonLayoutWrapperDataService } from "./extension-anon-layout-wrapper-data.service";
 import {
@@ -38,7 +39,7 @@ import {
 } from "./extension-anon-layout-wrapper.component";
 
 export default {
-  title: "Auth/Extension Anon Layout Wrapper",
+  title: "Browser/Extension Anon Layout Wrapper",
   component: ExtensionAnonLayoutWrapperComponent,
 } as Meta;
 
@@ -142,6 +143,8 @@ const decorators = (options: {
               switchAccounts: "Switch accounts",
               back: "Back",
               activeAccount: "Active account",
+              appLogoLabel: "app logo label",
+              bitwardenAccount: "Bitwarden Account",
             });
           },
         },
@@ -241,7 +244,7 @@ const initialData: ExtensionAnonLayoutWrapperData = {
   pageSubtitle: {
     key: "finishCreatingYourAccountBySettingAPassword",
   },
-  pageIcon: LockIcon,
+  pageIcon: Icons.LockIcon,
   showAcctSwitcher: true,
   showBackButton: true,
   showLogo: true,
@@ -255,7 +258,7 @@ const changedData: ExtensionAnonLayoutWrapperData = {
   pageSubtitle: {
     key: "checkYourEmail",
   },
-  pageIcon: RegistrationCheckEmailIcon,
+  pageIcon: Icons.RegistrationCheckEmailIcon,
   showAcctSwitcher: false,
   showBackButton: false,
   showLogo: false,
diff --git a/apps/browser/src/popup/scss/base.scss b/apps/browser/src/popup/scss/base.scss
index 80ada61f868..0565de1712c 100644
--- a/apps/browser/src/popup/scss/base.scss
+++ b/apps/browser/src/popup/scss/base.scss
@@ -100,7 +100,7 @@ a:not(popup-page a, popup-tab-navigation a) {
   }
 }
 
-input:not(bit-form-field input, bit-search input),
+input:not(bit-form-field input, bit-search input, input[bitcheckbox]),
 select:not(bit-form-field select),
 textarea:not(bit-form-field textarea) {
   @include themify($themes) {
@@ -109,7 +109,7 @@ textarea:not(bit-form-field textarea) {
   }
 }
 
-input,
+input:not(input[bitcheckbox]),
 select,
 textarea,
 button:not(bit-chip-select button) {
@@ -381,14 +381,6 @@ app-root {
   }
 }
 
-// Adds padding on each side of the content if opened in a tab
-@media only screen and (min-width: 601px) {
-  header,
-  main {
-    padding: 0 calc((100% - 500px) / 2);
-  }
-}
-
 main:not(popup-page main) {
   position: absolute;
   top: 44px;
diff --git a/apps/browser/src/popup/services/init.service.ts b/apps/browser/src/popup/services/init.service.ts
index c9fe7161259..f29745e6f59 100644
--- a/apps/browser/src/popup/services/init.service.ts
+++ b/apps/browser/src/popup/services/init.service.ts
@@ -13,7 +13,7 @@ import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 
 import { BrowserApi } from "../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../platform/browser/browser-popup-utils";
 import { PopupSizeService } from "../../platform/popup/layout/popup-size.service";
 import { PopupViewCacheService } from "../../platform/popup/view-cache/popup-view-cache.service";
 
diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts
index 6ede88dfc13..54d09ab9d8c 100644
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -1,7 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { APP_INITIALIZER, NgModule, NgZone } from "@angular/core";
-import { Router } from "@angular/router";
 import { merge, of, Subject } from "rxjs";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
@@ -23,11 +22,8 @@ import {
 } from "@bitwarden/angular/services/injection-tokens";
 import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module";
 import {
-  AnonLayoutWrapperDataService,
   LoginComponentService,
-  LoginDecryptionOptionsService,
   TwoFactorAuthComponentService,
-  TwoFactorAuthEmailComponentService,
   TwoFactorAuthDuoComponentService,
   TwoFactorAuthWebAuthnComponentService,
   SsoComponentService,
@@ -37,6 +33,7 @@ import {
   LoginEmailService,
   PinServiceAbstraction,
   SsoUrlService,
+  LogoutService,
 } from "@bitwarden/auth/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
@@ -121,8 +118,14 @@ import {
   InternalFolderService,
 } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/vault/abstractions/totp.service";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { TotpService } from "@bitwarden/common/vault/services/totp.service";
-import { CompactModeService, DialogService, ToastService } from "@bitwarden/components";
+import {
+  AnonLayoutWrapperDataService,
+  CompactModeService,
+  DialogService,
+  ToastService,
+} from "@bitwarden/components";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 import {
   BiometricsService,
@@ -137,14 +140,13 @@ import {
   SshImportPromptService,
 } from "@bitwarden/vault";
 
+import { AccountSwitcherService } from "../../auth/popup/account-switching/services/account-switcher.service";
 import { ForegroundLockService } from "../../auth/popup/accounts/foreground-lock.service";
-import { ExtensionAnonLayoutWrapperDataService } from "../../auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service";
 import { ExtensionLoginComponentService } from "../../auth/popup/login/extension-login-component.service";
 import { ExtensionSsoComponentService } from "../../auth/popup/login/extension-sso-component.service";
-import { ExtensionLoginDecryptionOptionsService } from "../../auth/popup/login-decryption-options/extension-login-decryption-options.service";
+import { ExtensionLogoutService } from "../../auth/popup/logout/extension-logout.service";
 import { ExtensionTwoFactorAuthComponentService } from "../../auth/services/extension-two-factor-auth-component.service";
 import { ExtensionTwoFactorAuthDuoComponentService } from "../../auth/services/extension-two-factor-auth-duo-component.service";
-import { ExtensionTwoFactorAuthEmailComponentService } from "../../auth/services/extension-two-factor-auth-email-component.service";
 import { ExtensionTwoFactorAuthWebAuthnComponentService } from "../../auth/services/extension-two-factor-auth-webauthn-component.service";
 import { AutofillService as AutofillServiceAbstraction } from "../../autofill/services/abstractions/autofill.service";
 import AutofillService from "../../autofill/services/autofill.service";
@@ -181,6 +183,7 @@ import { FilePopoutUtilsService } from "../../tools/popup/services/file-popout-u
 import { Fido2UserVerificationService } from "../../vault/services/fido2-user-verification.service";
 import { VaultBrowserStateService } from "../../vault/services/vault-browser-state.service";
 import { VaultFilterService } from "../../vault/services/vault-filter.service";
+import { ExtensionAnonLayoutWrapperDataService } from "../components/extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service";
 
 import { DebounceNavigationService } from "./debounce-navigation.service";
 import { InitService } from "./init.service";
@@ -400,6 +403,8 @@ const safeProviders: SafeProvider[] = [
       PolicyService,
       StateProvider,
       AccountServiceAbstraction,
+      ConfigService,
+      I18nServiceAbstraction,
     ],
   }),
   safeProvider({
@@ -482,7 +487,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: AutofillSettingsServiceAbstraction,
     useClass: AutofillSettingsService,
-    deps: [StateProvider, PolicyService, AccountService],
+    deps: [StateProvider, PolicyService, AccountService, RestrictedItemTypesService],
   }),
   safeProvider({
     provide: UserNotificationSettingsServiceAbstraction,
@@ -554,11 +559,6 @@ const safeProviders: SafeProvider[] = [
     useClass: ExtensionTwoFactorAuthComponentService,
     deps: [WINDOW],
   }),
-  safeProvider({
-    provide: TwoFactorAuthEmailComponentService,
-    useClass: ExtensionTwoFactorAuthEmailComponentService,
-    deps: [DialogService, WINDOW, ConfigService],
-  }),
   safeProvider({
     provide: TwoFactorAuthWebAuthnComponentService,
     useClass: ExtensionTwoFactorAuthWebAuthnComponentService,
@@ -642,6 +642,11 @@ const safeProviders: SafeProvider[] = [
     useClass: ExtensionAnonLayoutWrapperDataService,
     deps: [],
   }),
+  safeProvider({
+    provide: LogoutService,
+    useClass: ExtensionLogoutService,
+    deps: [MessagingServiceAbstraction, AccountSwitcherService],
+  }),
   safeProvider({
     provide: CompactModeService,
     useExisting: PopupCompactModeService,
@@ -652,11 +657,6 @@ const safeProviders: SafeProvider[] = [
     useClass: ExtensionSsoComponentService,
     deps: [SyncService, AuthService, EnvironmentService, I18nServiceAbstraction, LogService],
   }),
-  safeProvider({
-    provide: LoginDecryptionOptionsService,
-    useClass: ExtensionLoginDecryptionOptionsService,
-    deps: [MessagingServiceAbstraction, Router],
-  }),
   safeProvider({
     provide: SshImportPromptService,
     useClass: DefaultSshImportPromptService,
diff --git a/apps/browser/src/tools/popup/components/file-popout-callout.component.ts b/apps/browser/src/tools/popup/components/file-popout-callout.component.ts
index 491e33c5738..25b80c82c57 100644
--- a/apps/browser/src/tools/popup/components/file-popout-callout.component.ts
+++ b/apps/browser/src/tools/popup/components/file-popout-callout.component.ts
@@ -6,13 +6,12 @@ import { Component, OnInit } from "@angular/core";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { CalloutModule } from "@bitwarden/components";
 
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 import { FilePopoutUtilsService } from "../services/file-popout-utils.service";
 
 @Component({
   selector: "tools-file-popout-callout",
   templateUrl: "file-popout-callout.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, CalloutModule],
 })
 export class FilePopoutCalloutComponent implements OnInit {
diff --git a/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts b/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts
index 2bf290b3223..441e5d6e4c6 100644
--- a/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts
+++ b/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts
@@ -28,7 +28,6 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
 @Component({
   selector: "app-credential-generator-history",
   templateUrl: "credential-generator-history.component.html",
-  standalone: true,
   imports: [
     ButtonModule,
     CommonModule,
diff --git a/apps/browser/src/tools/popup/generator/credential-generator.component.ts b/apps/browser/src/tools/popup/generator/credential-generator.component.ts
index a2ef4be6620..b34c829b006 100644
--- a/apps/browser/src/tools/popup/generator/credential-generator.component.ts
+++ b/apps/browser/src/tools/popup/generator/credential-generator.component.ts
@@ -11,7 +11,6 @@ import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-heade
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
 @Component({
-  standalone: true,
   selector: "credential-generator",
   templateUrl: "credential-generator.component.html",
   imports: [
diff --git a/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.ts b/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.ts
index 0962dec3dcf..b6957248d75 100644
--- a/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.ts
@@ -63,7 +63,6 @@ export type AddEditQueryParams = Partial<Record<keyof QueryParams, string>>;
 @Component({
   selector: "tools-send-add-edit",
   templateUrl: "send-add-edit.component.html",
-  standalone: true,
   providers: [{ provide: SendFormConfigService, useClass: DefaultSendFormConfigService }],
   imports: [
     CommonModule,
diff --git a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts
index 7680e05dd5b..dd9e95b64a1 100644
--- a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts
@@ -13,7 +13,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 import { ButtonModule, IconModule, ToastService } from "@bitwarden/components";
-import { SendCreatedIcon } from "@bitwarden/send-ui";
+import { ActiveSendIcon } from "@bitwarden/send-ui";
 
 import { PopOutComponent } from "../../../../platform/popup/components/pop-out.component";
 import { PopupFooterComponent } from "../../../../platform/popup/layout/popup-footer.component";
@@ -23,7 +23,6 @@ import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page
 @Component({
   selector: "app-send-created",
   templateUrl: "./send-created.component.html",
-  standalone: true,
   imports: [
     ButtonModule,
     CommonModule,
@@ -37,7 +36,7 @@ import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page
   ],
 })
 export class SendCreatedComponent {
-  protected sendCreatedIcon = SendCreatedIcon;
+  protected sendCreatedIcon = ActiveSendIcon;
   protected send: SendView;
   protected daysAvailable = 0;
   protected hoursAvailable = 0;
diff --git a/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog-container.component.ts b/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog-container.component.ts
index 4266dd3914e..251f19cf252 100644
--- a/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog-container.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog-container.component.ts
@@ -15,7 +15,6 @@ import { SendFilePopoutDialogComponent } from "./send-file-popout-dialog.compone
 @Component({
   selector: "send-file-popout-dialog-container",
   templateUrl: "./send-file-popout-dialog-container.component.html",
-  standalone: true,
   imports: [JslibModule, CommonModule],
 })
 export class SendFilePopoutDialogContainerComponent implements OnInit {
diff --git a/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog.component.ts b/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog.component.ts
index fb21b5bb026..64c95a2e2f7 100644
--- a/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-file-popout-dialog/send-file-popout-dialog.component.ts
@@ -4,12 +4,11 @@ import { Component } from "@angular/core";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ButtonModule, DialogModule, DialogService, TypographyModule } from "@bitwarden/components";
 
-import BrowserPopupUtils from "../../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../../platform/browser/browser-popup-utils";
 
 @Component({
   selector: "send-file-popout-dialog",
   templateUrl: "./send-file-popout-dialog.component.html",
-  standalone: true,
   imports: [JslibModule, CommonModule, DialogModule, ButtonModule, TypographyModule],
 })
 export class SendFilePopoutDialogComponent {
diff --git a/apps/browser/src/tools/popup/send-v2/send-v2.component.html b/apps/browser/src/tools/popup/send-v2/send-v2.component.html
index d271f67fa3b..082112a86ab 100644
--- a/apps/browser/src/tools/popup/send-v2/send-v2.component.html
+++ b/apps/browser/src/tools/popup/send-v2/send-v2.component.html
@@ -20,29 +20,16 @@
     *ngIf="listState === sendState.Empty"
     class="tw-flex tw-flex-col tw-h-full tw-justify-center"
   >
-    <ng-container *ngIf="!(showSendSpotlight$ | async)">
-      <bit-no-items [icon]="noItemIcon" class="tw-text-main">
-        <ng-container slot="title">{{ "sendsNoItemsTitle" | i18n }}</ng-container>
-        <ng-container slot="description">{{ "sendsNoItemsMessage" | i18n }}</ng-container>
-        <tools-new-send-dropdown
-          [hideIcon]="true"
-          *ngIf="!sendsDisabled"
-          slot="button"
-        ></tools-new-send-dropdown>
-      </bit-no-items>
-    </ng-container>
-    <ng-container *ngIf="showSendSpotlight$ | async">
-      <bit-no-items [icon]="noItemIcon" class="tw-text-main">
-        <ng-container slot="title">{{ "sendsTitleNoItems" | i18n }}</ng-container>
-        <ng-container slot="description">{{ "sendsBodyNoItems" | i18n }}</ng-container>
-        <tools-new-send-dropdown
-          [hideIcon]="true"
-          *ngIf="!sendsDisabled"
-          slot="button"
-          [buttonType]="'secondary'"
-        ></tools-new-send-dropdown>
-      </bit-no-items>
-    </ng-container>
+    <bit-no-items [icon]="noItemIcon" class="tw-text-main">
+      <ng-container slot="title">{{ "sendsTitleNoItems" | i18n }}</ng-container>
+      <ng-container slot="description">{{ "sendsBodyNoItems" | i18n }}</ng-container>
+      <tools-new-send-dropdown
+        [hideIcon]="true"
+        *ngIf="!sendsDisabled"
+        slot="button"
+        [buttonType]="'secondary'"
+      ></tools-new-send-dropdown>
+    </bit-no-items>
   </div>
 
   <ng-container *ngIf="listState !== sendState.Empty">
diff --git a/apps/browser/src/tools/popup/send-v2/send-v2.component.spec.ts b/apps/browser/src/tools/popup/send-v2/send-v2.component.spec.ts
index c1f8e9fb263..63ede7ba357 100644
--- a/apps/browser/src/tools/popup/send-v2/send-v2.component.spec.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-v2.component.spec.ts
@@ -6,8 +6,6 @@ import { MockProxy, mock } from "jest-mock-extended";
 import { of, BehaviorSubject } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { NudgesService } from "@bitwarden/angular/vault";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -22,6 +20,7 @@ import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { ButtonModule, NoItemsModule } from "@bitwarden/components";
 import {
   NewSendDropdownComponent,
@@ -122,7 +121,6 @@ describe("SendV2Component", () => {
         { provide: SendListFiltersService, useValue: sendListFiltersService },
         { provide: PopupRouterCacheService, useValue: mock<PopupRouterCacheService>() },
         { provide: PolicyService, useValue: policyService },
-        { provide: NudgesService, useValue: mock<NudgesService>() },
       ],
     }).compileComponents();
 
diff --git a/apps/browser/src/tools/popup/send-v2/send-v2.component.ts b/apps/browser/src/tools/popup/send-v2/send-v2.component.ts
index 9fc19e98b34..2fca3e41f88 100644
--- a/apps/browser/src/tools/popup/send-v2/send-v2.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-v2.component.ts
@@ -1,10 +1,9 @@
 import { CommonModule } from "@angular/common";
 import { Component, OnDestroy } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { combineLatest, Observable, switchMap } from "rxjs";
+import { combineLatest, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -35,7 +34,6 @@ export enum SendState {
 
 @Component({
   templateUrl: "send-v2.component.html",
-  standalone: true,
   imports: [
     CalloutModule,
     PopupPageComponent,
@@ -62,12 +60,6 @@ export class SendV2Component implements OnDestroy {
   protected title: string = "allSends";
   protected noItemIcon = NoSendsIcon;
   protected noResultsIcon = Icons.NoResults;
-  private activeUserId$ = this.accountService.activeAccount$.pipe(getUserId);
-  protected showSendSpotlight$: Observable<boolean> = this.activeUserId$.pipe(
-    switchMap((userId) =>
-      this.nudgesService.showNudgeSpotlight$(NudgeType.SendNudgeStatus, userId),
-    ),
-  );
 
   protected sendsDisabled = false;
 
@@ -76,7 +68,6 @@ export class SendV2Component implements OnDestroy {
     protected sendListFiltersService: SendListFiltersService,
     private policyService: PolicyService,
     private accountService: AccountService,
-    private nudgesService: NudgesService,
   ) {
     combineLatest([
       this.sendItemsService.emptyList$,
diff --git a/apps/browser/src/tools/popup/services/file-popout-utils.service.ts b/apps/browser/src/tools/popup/services/file-popout-utils.service.ts
index fa72e411316..9a04d4b8f23 100644
--- a/apps/browser/src/tools/popup/services/file-popout-utils.service.ts
+++ b/apps/browser/src/tools/popup/services/file-popout-utils.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from "@angular/core";
 
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 
 /**
  * Service for determining whether to display file popout callout messages.
diff --git a/apps/browser/src/tools/popup/settings/about-dialog/about-dialog.component.ts b/apps/browser/src/tools/popup/settings/about-dialog/about-dialog.component.ts
index 6f1c1162eb4..39bff089668 100644
--- a/apps/browser/src/tools/popup/settings/about-dialog/about-dialog.component.ts
+++ b/apps/browser/src/tools/popup/settings/about-dialog/about-dialog.component.ts
@@ -18,7 +18,6 @@ import {
 
 @Component({
   templateUrl: "about-dialog.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, DialogModule, ButtonModule, TypographyModule],
 })
 export class AboutDialogComponent {
diff --git a/apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.ts b/apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.ts
index 51dbf3685ae..8a76290eff1 100644
--- a/apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.ts
+++ b/apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.ts
@@ -33,7 +33,6 @@ const RateUrls = {
 
 @Component({
   templateUrl: "about-page-v2.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts b/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts
index 27147b75d39..5aebee3b781 100644
--- a/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts
+++ b/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts
@@ -14,7 +14,6 @@ import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page
 
 @Component({
   templateUrl: "export-browser-v2.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts b/apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts
index 1c5558bd90e..506dae2fb18 100644
--- a/apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts
+++ b/apps/browser/src/tools/popup/settings/import/import-browser-v2.component.ts
@@ -13,7 +13,6 @@ import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page
 
 @Component({
   templateUrl: "import-browser-v2.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/apps/browser/src/tools/popup/settings/settings-v2.component.ts b/apps/browser/src/tools/popup/settings/settings-v2.component.ts
index 63a22f81ddd..a0383b99390 100644
--- a/apps/browser/src/tools/popup/settings/settings-v2.component.ts
+++ b/apps/browser/src/tools/popup/settings/settings-v2.component.ts
@@ -28,7 +28,6 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
 
 @Component({
   templateUrl: "settings-v2.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.ts b/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.ts
index ed78d9433f1..3c3270e557c 100644
--- a/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.ts
+++ b/apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.ts
@@ -1,26 +1,42 @@
 import { CommonModule } from "@angular/common";
 import { Component, inject } from "@angular/core";
 import { RouterModule } from "@angular/router";
-import { map, switchMap } from "rxjs";
+import { combineLatest, map, switchMap } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { SecurityTaskType, TaskService } from "@bitwarden/common/vault/tasks";
 import { AnchorLinkDirective, CalloutModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
 @Component({
   selector: "vault-at-risk-password-callout",
-  standalone: true,
   imports: [CommonModule, AnchorLinkDirective, RouterModule, CalloutModule, I18nPipe],
   templateUrl: "./at-risk-password-callout.component.html",
 })
 export class AtRiskPasswordCalloutComponent {
   private taskService = inject(TaskService);
+  private cipherService = inject(CipherService);
   private activeAccount$ = inject(AccountService).activeAccount$.pipe(getUserId);
 
   protected pendingTasks$ = this.activeAccount$.pipe(
-    switchMap((userId) => this.taskService.pendingTasks$(userId)),
-    map((tasks) => tasks.filter((t) => t.type === SecurityTaskType.UpdateAtRiskCredential)),
+    switchMap((userId) =>
+      combineLatest([
+        this.taskService.pendingTasks$(userId),
+        this.cipherService.cipherViews$(userId),
+      ]),
+    ),
+    map(([tasks, ciphers]) =>
+      tasks.filter((t) => {
+        const associatedCipher = ciphers.find((c) => c.id === t.cipherId);
+
+        return (
+          t.type === SecurityTaskType.UpdateAtRiskCredential &&
+          associatedCipher &&
+          !associatedCipher.isDeleted
+        );
+      }),
+    ),
   );
 }
diff --git a/apps/browser/src/vault/popup/components/at-risk-carousel-dialog/at-risk-carousel-dialog.component.ts b/apps/browser/src/vault/popup/components/at-risk-carousel-dialog/at-risk-carousel-dialog.component.ts
index 0133bccd25c..08c466d21a9 100644
--- a/apps/browser/src/vault/popup/components/at-risk-carousel-dialog/at-risk-carousel-dialog.component.ts
+++ b/apps/browser/src/vault/popup/components/at-risk-carousel-dialog/at-risk-carousel-dialog.component.ts
@@ -1,5 +1,6 @@
 import { Component, inject, signal } from "@angular/core";
 
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   DialogRef,
   ButtonModule,
@@ -10,11 +11,11 @@ import {
 import { I18nPipe } from "@bitwarden/ui-common";
 import { DarkImageSourceDirective, VaultCarouselModule } from "@bitwarden/vault";
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum AtRiskCarouselDialogResult {
-  Dismissed = "dismissed",
-}
+export const AtRiskCarouselDialogResult = {
+  Dismissed: "dismissed",
+} as const;
+
+type AtRiskCarouselDialogResult = UnionOfValues<typeof AtRiskCarouselDialogResult>;
 
 @Component({
   selector: "vault-at-risk-carousel-dialog",
@@ -27,7 +28,6 @@ export enum AtRiskCarouselDialogResult {
     DarkImageSourceDirective,
     I18nPipe,
   ],
-  standalone: true,
 })
 export class AtRiskCarouselDialogComponent {
   private dialogRef = inject(DialogRef);
diff --git a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.spec.ts b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.spec.ts
index ff583061684..eaa10aba624 100644
--- a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.spec.ts
@@ -35,7 +35,6 @@ import { AtRiskPasswordPageService } from "./at-risk-password-page.service";
 import { AtRiskPasswordsComponent } from "./at-risk-passwords.component";
 
 @Component({
-  standalone: true,
   selector: "popup-header",
   template: `<ng-content></ng-content>`,
 })
@@ -45,7 +44,6 @@ class MockPopupHeaderComponent {
 }
 
 @Component({
-  standalone: true,
   selector: "popup-page",
   template: `<ng-content></ng-content>`,
 })
@@ -54,7 +52,6 @@ class MockPopupPageComponent {
 }
 
 @Component({
-  standalone: true,
   selector: "app-vault-icon",
   template: `<ng-content></ng-content>`,
 })
@@ -206,6 +203,20 @@ describe("AtRiskPasswordsComponent", () => {
       expect(items).toHaveLength(1);
       expect(items[0].name).toBe("Item 1");
     });
+
+    it("should not show tasks associated with deleted ciphers", async () => {
+      mockCiphers$.next([
+        {
+          id: "cipher",
+          organizationId: "org",
+          name: "Item 1",
+          isDeleted: true,
+        } as CipherView,
+      ]);
+
+      const items = await firstValueFrom(component["atRiskItems$"]);
+      expect(items).toHaveLength(0);
+    });
   });
 
   describe("pageDescription$", () => {
@@ -248,6 +259,19 @@ describe("AtRiskPasswordsComponent", () => {
           type: SecurityTaskType.UpdateAtRiskCredential,
         } as SecurityTask,
       ]);
+      mockCiphers$.next([
+        {
+          id: "cipher",
+          organizationId: "org",
+          name: "Item 1",
+        } as CipherView,
+        {
+          id: "cipher2",
+          organizationId: "org2",
+          name: "Item 2",
+        } as CipherView,
+      ]);
+
       const description = await firstValueFrom(component["pageDescription$"]);
       expect(description).toBe("atRiskPasswordsDescMultiOrgPlural");
     });
diff --git a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts
index 1b43151193a..1bfb65a15cc 100644
--- a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts
+++ b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts
@@ -79,7 +79,6 @@ import { AtRiskPasswordPageService } from "./at-risk-password-page.service";
     { provide: ChangeLoginPasswordService, useClass: DefaultChangeLoginPasswordService },
   ],
   selector: "vault-at-risk-passwords",
-  standalone: true,
   templateUrl: "./at-risk-passwords.component.html",
 })
 export class AtRiskPasswordsComponent implements OnInit {
@@ -156,32 +155,35 @@ export class AtRiskPasswordsComponent implements OnInit {
           (t) =>
             t.type === SecurityTaskType.UpdateAtRiskCredential &&
             t.cipherId != null &&
-            ciphers[t.cipherId] != null,
+            ciphers[t.cipherId] != null &&
+            !ciphers[t.cipherId].isDeleted,
         )
         .map((t) => ciphers[t.cipherId!]),
     ),
   );
 
-  protected pageDescription$ = this.activeUserData$.pipe(
-    switchMap(({ tasks, userId }) => {
-      const orgIds = new Set(tasks.map((t) => t.organizationId));
+  protected pageDescription$ = combineLatest([this.activeUserData$, this.atRiskItems$]).pipe(
+    switchMap(([{ userId }, atRiskCiphers]) => {
+      const orgIds = new Set(
+        atRiskCiphers.filter((c) => c.organizationId).map((c) => c.organizationId),
+      ) as Set<string>;
       if (orgIds.size === 1) {
         const [orgId] = orgIds;
         return this.organizationService.organizations$(userId).pipe(
           getOrganizationById(orgId),
           map((org) =>
             this.i18nService.t(
-              tasks.length === 1
+              atRiskCiphers.length === 1
                 ? "atRiskPasswordDescSingleOrg"
                 : "atRiskPasswordsDescSingleOrgPlural",
               org?.name,
-              tasks.length,
+              atRiskCiphers.length,
             ),
           ),
         );
       }
 
-      return of(this.i18nService.t("atRiskPasswordsDescMultiOrgPlural", tasks.length));
+      return of(this.i18nService.t("atRiskPasswordsDescMultiOrgPlural", atRiskCiphers.length));
     }),
   );
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.spec.ts
index 6974e6f7359..216ec1c3f1b 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.spec.ts
@@ -26,7 +26,7 @@ import {
 } from "@bitwarden/vault";
 
 import { BrowserFido2UserInterfaceSession } from "../../../../../autofill/fido2/services/browser-fido2-user-interface.service";
-import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../../../platform/browser/browser-popup-utils";
 import { PopupRouterCacheService } from "../../../../../platform/popup/view-cache/popup-router-cache.service";
 import { PopupCloseWarningService } from "../../../../../popup/services/popup-close-warning.service";
 
@@ -51,6 +51,7 @@ describe("AddEditV2Component", () => {
   const disable = jest.fn();
   const navigate = jest.fn();
   const back = jest.fn().mockResolvedValue(null);
+  const setHistory = jest.fn();
   const collect = jest.fn().mockResolvedValue(null);
 
   beforeEach(async () => {
@@ -70,7 +71,7 @@ describe("AddEditV2Component", () => {
       providers: [
         { provide: PlatformUtilsService, useValue: mock<PlatformUtilsService>() },
         { provide: ConfigService, useValue: mock<ConfigService>() },
-        { provide: PopupRouterCacheService, useValue: { back } },
+        { provide: PopupRouterCacheService, useValue: { back, setHistory } },
         { provide: PopupCloseWarningService, useValue: { disable } },
         { provide: Router, useValue: { navigate } },
         { provide: ActivatedRoute, useValue: { queryParams: queryParams$ } },
diff --git a/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.ts
index e47f4637199..f019636e690 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.ts
@@ -17,7 +17,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherId, CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherType, toCipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
 import { AddEditCipherInfo } from "@bitwarden/common/vault/types/add-edit-cipher-info";
@@ -42,7 +42,7 @@ import {
 
 import { BrowserFido2UserInterfaceSession } from "../../../../../autofill/fido2/services/browser-fido2-user-interface.service";
 import { BrowserApi } from "../../../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../../../platform/browser/browser-popup-utils";
 import { PopOutComponent } from "../../../../../platform/popup/components/pop-out.component";
 import { PopupFooterComponent } from "../../../../../platform/popup/layout/popup-footer.component";
 import { PopupHeaderComponent } from "../../../../../platform/popup/layout/popup-header.component";
@@ -64,7 +64,7 @@ import { OpenAttachmentsComponent } from "../attachments/open-attachments/open-a
 class QueryParams {
   constructor(params: Params) {
     this.cipherId = params.cipherId;
-    this.type = params.type != undefined ? parseInt(params.type, null) : undefined;
+    this.type = toCipherType(params.type);
     this.clone = params.clone === "true";
     this.folderId = params.folderId;
     this.organizationId = params.organizationId;
@@ -132,7 +132,6 @@ export type AddEditQueryParams = Partial<Record<keyof QueryParams, string>>;
 @Component({
   selector: "app-add-edit-v2",
   templateUrl: "add-edit-v2.component.html",
-  standalone: true,
   providers: [
     { provide: CipherFormConfigService, useClass: DefaultCipherFormConfigService },
     { provide: TotpCaptureService, useClass: BrowserTotpCaptureService },
@@ -266,6 +265,8 @@ export class AddEditV2Component implements OnInit {
         replaceUrl: true,
         queryParams: { cipherId: cipher.id },
       });
+      // Clear popup history so after closing/reopening, Back won’t return to the add-edit form
+      await this.popupRouterCacheService.setHistory([]);
     }
   }
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/assign-collections/assign-collections.component.ts b/apps/browser/src/vault/popup/components/vault-v2/assign-collections/assign-collections.component.ts
index a11a7d806bd..8374cc254a9 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/assign-collections/assign-collections.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/assign-collections/assign-collections.component.ts
@@ -28,7 +28,6 @@ import { PopupHeaderComponent } from "../../../../../platform/popup/layout/popup
 import { PopupPageComponent } from "../../../../../platform/popup/layout/popup-page.component";
 
 @Component({
-  standalone: true,
   selector: "app-assign-collections",
   templateUrl: "./assign-collections.component.html",
   imports: [
diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.spec.ts
index 7c2cc99e300..6e4215c1ec2 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.spec.ts
@@ -26,7 +26,6 @@ import { PopupRouterCacheService } from "../../../../../platform/popup/view-cach
 import { AttachmentsV2Component } from "./attachments-v2.component";
 
 @Component({
-  standalone: true,
   selector: "popup-header",
   template: `<ng-content></ng-content>`,
 })
@@ -36,7 +35,6 @@ class MockPopupHeaderComponent {
 }
 
 @Component({
-  standalone: true,
   selector: "popup-footer",
   template: `<ng-content></ng-content>`,
 })
diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.ts
index 32d446daf75..fc6d882dfd5 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.ts
@@ -18,7 +18,6 @@ import { PopupPageComponent } from "../../../../../platform/popup/layout/popup-p
 import { PopupRouterCacheService } from "../../../../../platform/popup/view-cache/popup-router-cache.service";
 
 @Component({
-  standalone: true,
   selector: "app-attachments-v2",
   templateUrl: "./attachments-v2.component.html",
   imports: [
diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts
index ec5c93feb9e..19779d73a11 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts
@@ -16,7 +16,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { ToastService } from "@bitwarden/components";
 
-import BrowserPopupUtils from "../../../../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../../../../platform/browser/browser-popup-utils";
 import { FilePopoutUtilsService } from "../../../../../../tools/popup/services/file-popout-utils.service";
 
 import { OpenAttachmentsComponent } from "./open-attachments.component";
diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts
index d44b54bcb96..6ca4c82efdc 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts
@@ -20,11 +20,10 @@ import { CipherId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { BadgeModule, ItemModule, ToastService, TypographyModule } from "@bitwarden/components";
 
-import BrowserPopupUtils from "../../../../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../../../../platform/browser/browser-popup-utils";
 import { FilePopoutUtilsService } from "../../../../../../tools/popup/services/file-popout-utils.service";
 
 @Component({
-  standalone: true,
   selector: "app-open-attachments",
   templateUrl: "./open-attachments.component.html",
   imports: [BadgeModule, CommonModule, ItemModule, JslibModule, TypographyModule],
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html
index 19f1668eba4..47ef0284d6a 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html
@@ -4,7 +4,7 @@
   [title]="((currentURIIsBlocked$ | async) ? 'itemSuggestions' : 'autofillSuggestions') | i18n"
   [showRefresh]="showRefresh"
   (onRefresh)="refreshCurrentTab()"
-  [description]="(showEmptyAutofillTip$ | async) ? ('autofillSuggestionsTip' | i18n) : null"
+  [description]="(showEmptyAutofillTip$ | async) ? ('autofillSuggestionsTip' | i18n) : undefined"
   showAutofillButton
   [disableDescriptionMargin]="showEmptyAutofillTip$ | async"
   [primaryActionAutofill]="clickItemsToAutofillVaultView$ | async"
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts
index bdc0d7ae5bc..aa790d24ede 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts
@@ -1,21 +1,20 @@
 import { CommonModule } from "@angular/common";
 import { Component } from "@angular/core";
 import { toSignal } from "@angular/core/rxjs-interop";
-import { combineLatest, map, Observable } from "rxjs";
+import { combineLatest, map, Observable, startWith } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { IconButtonModule, TypographyModule } from "@bitwarden/components";
 
-import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../../../platform/browser/browser-popup-utils";
 import { VaultPopupAutofillService } from "../../../services/vault-popup-autofill.service";
 import { VaultPopupItemsService } from "../../../services/vault-popup-items.service";
 import { PopupCipherView } from "../../../views/popup-cipher.view";
 import { VaultListItemsContainerComponent } from "../vault-list-items-container/vault-list-items-container.component";
 
 @Component({
-  standalone: true,
   imports: [
     CommonModule,
     TypographyModule,
@@ -42,7 +41,9 @@ export class AutofillVaultListItemsComponent {
 
   /** Flag indicating whether the login item should automatically autofill when clicked  */
   protected clickItemsToAutofillVaultView$: Observable<boolean> =
-    this.vaultSettingsService.clickItemsToAutofillVaultView$;
+    this.vaultSettingsService.clickItemsToAutofillVaultView$.pipe(
+      startWith(true), // Start with true to avoid flashing the fill button on first load
+    );
 
   protected groupByType = toSignal(
     this.vaultPopupItemsService.hasFilterApplied$.pipe(map((hasFilter) => !hasFilter)),
@@ -75,9 +76,7 @@ export class AutofillVaultListItemsComponent {
     private vaultPopupItemsService: VaultPopupItemsService,
     private vaultPopupAutofillService: VaultPopupAutofillService,
     private vaultSettingsService: VaultSettingsService,
-  ) {
-    // TODO: Migrate logic to show Autofill policy toast PM-8144
-  }
+  ) {}
 
   /**
    * Refreshes the current tab to re-populate the autofill ciphers.
diff --git a/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.ts b/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.ts
index 3a17825f4fb..5824e8d97ea 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.ts
@@ -16,7 +16,6 @@ import { VaultPopupAutofillService } from "../../../services/vault-popup-autofil
 const blockedURISettingsRoute = "/blocked-domains";
 
 @Component({
-  standalone: true,
   imports: [
     BannerModule,
     CommonModule,
diff --git a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts
index 96e1a70306e..527f0f246af 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts
@@ -20,7 +20,6 @@ import { IntroCarouselService } from "../../../services/intro-carousel.service";
     JslibModule,
     I18nPipe,
   ],
-  standalone: true,
 })
 export class IntroCarouselComponent {
   protected securityHandshake = VaultIcons.SecurityHandshake;
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.ts b/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.ts
index 053d87c6485..de548e7be7a 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.ts
@@ -19,7 +19,6 @@ type CipherItem = {
 };
 
 @Component({
-  standalone: true,
   selector: "app-item-copy-actions",
   templateUrl: "item-copy-actions.component.html",
   imports: [
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
index 6e6e30b359b..f9be1617d21 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
@@ -31,7 +31,11 @@
       <a bitMenuItem (click)="clone()" *ngIf="canClone$ | async">
         {{ "clone" | i18n }}
       </a>
-      <a bitMenuItem *ngIf="hasOrganizations" (click)="conditionallyNavigateToAssignCollections()">
+      <a
+        bitMenuItem
+        *ngIf="canAssignCollections$ | async"
+        (click)="conditionallyNavigateToAssignCollections()"
+      >
         {{ "assignToCollections" | i18n }}
       </a>
     </ng-container>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts
index 94b4c2b855b..75bc984e977 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts
@@ -1,11 +1,12 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { CommonModule } from "@angular/common";
-import { booleanAttribute, Component, Input, OnInit } from "@angular/core";
+import { booleanAttribute, Component, Input } from "@angular/core";
 import { Router, RouterModule } from "@angular/router";
-import { BehaviorSubject, firstValueFrom, map, switchMap } from "rxjs";
+import { BehaviorSubject, combineLatest, firstValueFrom, map, switchMap } from "rxjs";
 import { filter } from "rxjs/operators";
 
+import { CollectionService } from "@bitwarden/admin-console/common";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -28,12 +29,11 @@ import { VaultPopupAutofillService } from "../../../services/vault-popup-autofil
 import { AddEditQueryParams } from "../add-edit/add-edit-v2.component";
 
 @Component({
-  standalone: true,
   selector: "app-item-more-options",
   templateUrl: "./item-more-options.component.html",
   imports: [ItemModule, IconButtonModule, MenuModule, CommonModule, JslibModule, RouterModule],
 })
-export class ItemMoreOptionsComponent implements OnInit {
+export class ItemMoreOptionsComponent {
   private _cipher$ = new BehaviorSubject<CipherView>(undefined);
 
   @Input({
@@ -72,8 +72,21 @@ export class ItemMoreOptionsComponent implements OnInit {
     switchMap((c) => this.cipherAuthorizationService.canCloneCipher$(c)),
   );
 
-  /** Boolean dependent on the current user having access to an organization */
-  protected hasOrganizations = false;
+  /** Observable Boolean dependent on the current user having access to an organization and editable collections */
+  protected canAssignCollections$ = this.accountService.activeAccount$.pipe(
+    getUserId,
+    switchMap((userId) => {
+      return combineLatest([
+        this.organizationService.hasOrganizations(userId),
+        this.collectionService.decryptedCollections$,
+      ]).pipe(
+        map(([hasOrgs, collections]) => {
+          const canEditCollections = collections.some((c) => !c.readOnly);
+          return hasOrgs && canEditCollections;
+        }),
+      );
+    }),
+  );
 
   constructor(
     private cipherService: CipherService,
@@ -86,13 +99,9 @@ export class ItemMoreOptionsComponent implements OnInit {
     private accountService: AccountService,
     private organizationService: OrganizationService,
     private cipherAuthorizationService: CipherAuthorizationService,
+    private collectionService: CollectionService,
   ) {}
 
-  async ngOnInit(): Promise<void> {
-    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-    this.hasOrganizations = await firstValueFrom(this.organizationService.hasOrganizations(userId));
-  }
-
   get canEdit() {
     return this.cipher.edit;
   }
@@ -104,7 +113,9 @@ export class ItemMoreOptionsComponent implements OnInit {
    * Determines if the cipher can be autofilled.
    */
   get canAutofill() {
-    return [CipherType.Login, CipherType.Card, CipherType.Identity].includes(this.cipher.type);
+    return ([CipherType.Login, CipherType.Card, CipherType.Identity] as CipherType[]).includes(
+      this.cipher.type,
+    );
   }
 
   get isLogin() {
diff --git a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.html b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.html
index 6b6e8728f19..7dd0a5a3bc7 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.html
@@ -3,34 +3,12 @@
   {{ "new" | i18n }}
 </button>
 <bit-menu #itemOptions>
-  <a bitMenuItem [routerLink]="['/add-cipher']" [queryParams]="buildQueryParams(cipherType.Login)">
-    <i class="bwi bwi-globe" slot="start" aria-hidden="true"></i>
-    {{ "typeLogin" | i18n }}
-  </a>
-  <a bitMenuItem [routerLink]="['/add-cipher']" [queryParams]="buildQueryParams(cipherType.Card)">
-    <i class="bwi bwi-credit-card" slot="start" aria-hidden="true"></i>
-    {{ "typeCard" | i18n }}
-  </a>
-  <a
-    bitMenuItem
-    [routerLink]="['/add-cipher']"
-    [queryParams]="buildQueryParams(cipherType.Identity)"
-  >
-    <i class="bwi bwi-id-card" slot="start" aria-hidden="true"></i>
-    {{ "typeIdentity" | i18n }}
-  </a>
-  <a
-    bitMenuItem
-    [routerLink]="['/add-cipher']"
-    [queryParams]="buildQueryParams(cipherType.SecureNote)"
-  >
-    <i class="bwi bwi-sticky-note" slot="start" aria-hidden="true"></i>
-    {{ "note" | i18n }}
-  </a>
-  <a bitMenuItem [routerLink]="['/add-cipher']" [queryParams]="buildQueryParams(cipherType.SshKey)">
-    <i class="bwi bwi-key" slot="start" aria-hidden="true"></i>
-    {{ "typeSshKey" | i18n }}
-  </a>
+  @for (menuItem of cipherMenuItems$ | async; track menuItem.type) {
+    <a bitMenuItem [routerLink]="['/add-cipher']" [queryParams]="buildQueryParams(menuItem.type)">
+      <i [class]="`bwi ${menuItem.icon}`" slot="start" aria-hidden="true"></i>
+      {{ menuItem.labelKey | i18n }}
+    </a>
+  }
   <bit-menu-divider></bit-menu-divider>
   <button type="button" bitMenuItem (click)="openFolderDialog()">
     <i class="bwi bwi-folder" slot="start" aria-hidden="true"></i>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.spec.ts
index 54c6ba2f788..48e87e2d192 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.spec.ts
@@ -2,6 +2,7 @@ import { CommonModule } from "@angular/common";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { ActivatedRoute, RouterLink } from "@angular/router";
 import { mock } from "jest-mock-extended";
+import { BehaviorSubject } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -11,10 +12,14 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { CipherType } from "@bitwarden/common/vault/enums";
+import {
+  RestrictedCipherType,
+  RestrictedItemTypesService,
+} from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { ButtonModule, DialogService, MenuModule, NoItemsModule } from "@bitwarden/components";
 
 import { BrowserApi } from "../../../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../../../platform/browser/browser-popup-utils";
 
 import { NewItemDropdownV2Component, NewItemInitialValues } from "./new-item-dropdown-v2.component";
 
@@ -23,6 +28,7 @@ describe("NewItemDropdownV2Component", () => {
   let fixture: ComponentFixture<NewItemDropdownV2Component>;
   let dialogServiceMock: jest.Mocked<DialogService>;
   let browserApiMock: jest.Mocked<typeof BrowserApi>;
+  let restrictedItemTypesServiceMock: jest.Mocked<RestrictedItemTypesService>;
 
   const mockTab = { url: "https://example.com" };
 
@@ -44,6 +50,9 @@ describe("NewItemDropdownV2Component", () => {
     const folderServiceMock = mock<FolderService>();
     const folderApiServiceAbstractionMock = mock<FolderApiServiceAbstraction>();
     const accountServiceMock = mock<AccountService>();
+    restrictedItemTypesServiceMock = {
+      restricted$: new BehaviorSubject<RestrictedCipherType[]>([]),
+    } as any;
 
     await TestBed.configureTestingModule({
       imports: [
@@ -65,6 +74,7 @@ describe("NewItemDropdownV2Component", () => {
         { provide: FolderService, useValue: folderServiceMock },
         { provide: FolderApiServiceAbstraction, useValue: folderApiServiceAbstractionMock },
         { provide: AccountService, useValue: accountServiceMock },
+        { provide: RestrictedItemTypesService, useValue: restrictedItemTypesServiceMock },
       ],
     }).compileComponents();
   });
diff --git a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts
index 1bcc4297b71..d1586bd6ad5 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts
@@ -3,15 +3,18 @@
 import { CommonModule } from "@angular/common";
 import { Component, Input, OnInit } from "@angular/core";
 import { RouterLink } from "@angular/router";
+import { map, Observable } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
 import { CipherType } from "@bitwarden/common/vault/enums";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { CipherMenuItem, CIPHER_MENU_ITEMS } from "@bitwarden/common/vault/types/cipher-menu-items";
 import { ButtonModule, DialogService, MenuModule, NoItemsModule } from "@bitwarden/components";
 import { AddEditFolderDialogComponent } from "@bitwarden/vault";
 
 import { BrowserApi } from "../../../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../../../platform/browser/browser-popup-utils";
 import { AddEditQueryParams } from "../add-edit/add-edit-v2.component";
 
 export interface NewItemInitialValues {
@@ -23,7 +26,6 @@ export interface NewItemInitialValues {
 @Component({
   selector: "app-new-item-dropdown",
   templateUrl: "new-item-dropdown-v2.component.html",
-  standalone: true,
   imports: [NoItemsModule, JslibModule, CommonModule, ButtonModule, RouterLink, MenuModule],
 })
 export class NewItemDropdownV2Component implements OnInit {
@@ -35,7 +37,22 @@ export class NewItemDropdownV2Component implements OnInit {
   @Input()
   initialValues: NewItemInitialValues;
 
-  constructor(private dialogService: DialogService) {}
+  /**
+   * Observable of cipher menu items that are not restricted by policy
+   */
+  readonly cipherMenuItems$: Observable<CipherMenuItem[]> =
+    this.restrictedItemTypeService.restricted$.pipe(
+      map((restrictedTypes) => {
+        const restrictedTypeArr = restrictedTypes.map((item) => item.cipherType);
+
+        return CIPHER_MENU_ITEMS.filter((menuItem) => !restrictedTypeArr.includes(menuItem.type));
+      }),
+    );
+
+  constructor(
+    private dialogService: DialogService,
+    private restrictedItemTypeService: RestrictedItemTypesService,
+  ) {}
 
   async ngOnInit() {
     this.tab = await BrowserApi.getTabFromCurrentWindow();
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.spec.ts
index dd5f55a66ee..b65138dac3a 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.spec.ts
@@ -21,7 +21,6 @@ import {
 @Component({
   selector: "vault-cipher-form-generator",
   template: "",
-  standalone: true,
 })
 class MockCipherFormGenerator {
   @Input() type: "password" | "username" = "password";
@@ -77,10 +76,8 @@ describe("VaultGeneratorDialogComponent", () => {
     component.onValueGenerated("test-password");
     fixture.detectChanges();
 
-    const button = fixture.debugElement.query(
-      By.css("[data-testid='select-button']"),
-    ).nativeElement;
-    expect(button.disabled).toBe(false);
+    const button = fixture.debugElement.query(By.css("[data-testid='select-button']"));
+    expect(button.attributes["aria-disabled"]).toBe(undefined);
   });
 
   it("should disable the button if no value has been generated", () => {
@@ -91,10 +88,8 @@ describe("VaultGeneratorDialogComponent", () => {
     generator.algorithmSelected.emit({ useGeneratedValue: "Use Password" } as any);
     fixture.detectChanges();
 
-    const button = fixture.debugElement.query(
-      By.css("[data-testid='select-button']"),
-    ).nativeElement;
-    expect(button.disabled).toBe(true);
+    const button = fixture.debugElement.query(By.css("[data-testid='select-button']"));
+    expect(button.attributes["aria-disabled"]).toBe("true");
   });
 
   it("should disable the button if no algorithm is selected", () => {
@@ -105,10 +100,8 @@ describe("VaultGeneratorDialogComponent", () => {
     generator.valueGenerated.emit("test-password");
     fixture.detectChanges();
 
-    const button = fixture.debugElement.query(
-      By.css("[data-testid='select-button']"),
-    ).nativeElement;
-    expect(button.disabled).toBe(true);
+    const button = fixture.debugElement.query(By.css("[data-testid='select-button']"));
+    expect(button.attributes["aria-disabled"]).toBe("true");
   });
 
   it("should update button text when algorithm is selected", () => {
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.ts
index 4daffa6a9b8..b0103aaacfb 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.ts
@@ -5,6 +5,7 @@ import { CommonModule } from "@angular/common";
 import { Component, Inject } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   DIALOG_DATA,
   DialogConfig,
@@ -30,17 +31,16 @@ export interface GeneratorDialogResult {
   generatedValue?: string;
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum GeneratorDialogAction {
-  Selected = "selected",
-  Canceled = "canceled",
-}
+export const GeneratorDialogAction = {
+  Selected: "selected",
+  Canceled: "canceled",
+} as const;
+
+type GeneratorDialogAction = UnionOfValues<typeof GeneratorDialogAction>;
 
 @Component({
   selector: "app-vault-generator-dialog",
   templateUrl: "./vault-generator-dialog.component.html",
-  standalone: true,
   imports: [
     PopupPageComponent,
     PopupHeaderComponent,
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts
index cda055176e8..9564aeadc09 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts
@@ -7,7 +7,6 @@ import { mock } from "jest-mock-extended";
 import { BehaviorSubject, Subject } from "rxjs";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -19,6 +18,7 @@ import { StateProvider } from "@bitwarden/common/platform/state";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.ts
index bcea2e76190..f64b5e6b83d 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.ts
@@ -20,7 +20,6 @@ import { VaultV2SearchComponent } from "../vault-search/vault-v2-search.componen
 @Component({
   selector: "app-vault-header-v2",
   templateUrl: "vault-header-v2.component.html",
-  standalone: true,
   imports: [
     VaultV2SearchComponent,
     VaultListFiltersComponent,
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.html
index ba4cbf71251..a765868e0ed 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.html
@@ -42,7 +42,7 @@
       fullWidth
       placeholderIcon="bwi-list"
       [placeholderText]="'type' | i18n"
-      [options]="cipherTypes"
+      [options]="cipherTypes$ | async"
     >
     </bit-chip-select>
   </form>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.ts
index feccf92cec2..81fad896ad2 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-filters/vault-list-filters.component.ts
@@ -9,7 +9,6 @@ import { ChipSelectComponent } from "@bitwarden/components";
 import { VaultPopupListFiltersService } from "../../../services/vault-popup-list-filters.service";
 
 @Component({
-  standalone: true,
   selector: "app-vault-list-filters",
   templateUrl: "./vault-list-filters.component.html",
   imports: [CommonModule, JslibModule, ChipSelectComponent, ReactiveFormsModule],
@@ -19,7 +18,7 @@ export class VaultListFiltersComponent {
   protected organizations$ = this.vaultPopupListFiltersService.organizations$;
   protected collections$ = this.vaultPopupListFiltersService.collections$;
   protected folders$ = this.vaultPopupListFiltersService.folders$;
-  protected cipherTypes = this.vaultPopupListFiltersService.cipherTypes;
+  protected cipherTypes$ = this.vaultPopupListFiltersService.cipherTypes$;
 
   // Combine all filters into a single observable to eliminate the filters from loading separately in the UI.
   protected allFilters$ = combineLatest([
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
index a55bba622e4..8dca1f9e576 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
@@ -1,8 +1,8 @@
 <bit-section
-  *ngIf="cipherGroups$().length > 0 || description"
-  [disableMargin]="disableSectionMargin"
+  *ngIf="cipherGroups().length > 0 || description()"
+  [disableMargin]="disableSectionMargin()"
 >
-  <ng-container *ngIf="collapsibleKey">
+  <ng-container *ngIf="collapsibleKey()">
     <button
       class="tw-group/vault-section-header hover:tw-bg-primary-100 tw-rounded-md tw-pl-1 tw-w-full tw-border-x-0 tw-border-t-0 tw-border-b tw-border-solid focus-visible:tw-outline-none focus-visible:tw-ring-inset focus-visible:tw-ring-2 focus-visible:tw-ring-primary-600"
       [ngClass]="{
@@ -22,7 +22,7 @@
     </bit-disclosure>
   </ng-container>
 
-  <ng-container *ngIf="!collapsibleKey">
+  <ng-container *ngIf="!collapsibleKey()">
     <div class="tw-pl-1">
       <ng-container *ngTemplateOutlet="sectionHeader"></ng-container>
     </div>
@@ -34,10 +34,10 @@
 <ng-template #sectionHeader>
   <bit-section-header class="tw-p-0.5 -tw-mx-0.5">
     <h2 bitTypography="h6">
-      {{ title }}
+      {{ title() }}
     </h2>
     <button
-      *ngIf="showRefresh"
+      *ngIf="showRefresh()"
       bitIconButton="bwi-refresh"
       type="button"
       size="small"
@@ -48,13 +48,13 @@
       <span
         [ngClass]="{
           'group-hover/vault-section-header:tw-hidden group-focus-visible/vault-section-header:tw-hidden':
-            collapsibleKey && sectionOpenState(),
-          'tw-hidden': collapsibleKey && !sectionOpenState(),
+            collapsibleKey() && sectionOpenState(),
+          'tw-hidden': collapsibleKey() && !sectionOpenState(),
         }"
       >
         {{ ciphers().length }}
       </span>
-      <span class="tw-pr-1" *ngIf="collapsibleKey">
+      <span class="tw-pr-1" *ngIf="collapsibleKey()">
         <i
           class="bwi tw-text-main"
           [ngClass]="{
@@ -71,28 +71,25 @@
 
 <ng-template #descriptionText>
   <div
-    *ngIf="description"
+    *ngIf="description()"
     class="tw-text-muted tw-px-1 tw-mb-2"
-    [ngClass]="{ '!tw-mb-0': disableDescriptionMargin }"
+    [ngClass]="{ '!tw-mb-0': disableDescriptionMargin() }"
     bitTypography="body2"
   >
-    {{ description }}
+    {{ description() }}
   </div>
 </ng-template>
 
 <ng-template #itemGroup>
   <bit-item-group>
-    <ng-container *ngFor="let group of cipherGroups$()">
+    <ng-container *ngFor="let group of cipherGroups()">
       <ng-container *ngIf="group.subHeaderKey">
         <h3 class="tw-text-muted tw-text-xs tw-font-semibold tw-pl-1 tw-mb-1 bit-compact:tw-m-0">
           {{ group.subHeaderKey | i18n }}
         </h3>
       </ng-container>
 
-      <cdk-virtual-scroll-viewport
-        [itemSize]="itemHeight$ | async"
-        class="tw-overflow-visible [&>.cdk-virtual-scroll-content-wrapper]:[contain:layout_style]"
-      >
+      <cdk-virtual-scroll-viewport [itemSize]="itemHeight$ | async" bitScrollLayout>
         <bit-item *cdkVirtualFor="let cipher of group.ciphers">
           <button
             bit-item-content
@@ -100,7 +97,7 @@
             (click)="primaryActionOnSelect(cipher)"
             (dblclick)="launchCipher(cipher)"
             [appA11yTitle]="
-              cipherItemTitleKey(cipher) | async | i18n: cipher.name : cipher.login.username
+              cipherItemTitleKey()(cipher) | i18n: cipher.name : cipher.login.username
             "
             class="{{ itemHeightClass }}"
           >
@@ -112,7 +109,7 @@
               *ngIf="cipher.organizationId"
               slot="default-trailing"
               appOrgIcon
-              [tierType]="cipher.organization.productTierType"
+              [tierType]="cipher.organization!.productTierType"
               [size]="'small'"
               [appA11yTitle]="orgIconTooltip(cipher)"
             ></i>
@@ -125,7 +122,7 @@
           </button>
 
           <ng-container slot="end">
-            <bit-item-action *ngIf="!(hideAutofillButton$ | async)">
+            <bit-item-action *ngIf="!hideAutofillButton()">
               <button
                 type="button"
                 bitBadge
@@ -137,7 +134,7 @@
                 {{ "fill" | i18n }}
               </button>
             </bit-item-action>
-            <bit-item-action *ngIf="!showAutofillButton && cipher.canLaunch">
+            <bit-item-action *ngIf="!showAutofillButton() && cipher.canLaunch">
               <button
                 type="button"
                 bitIconButton="bwi-external-link"
@@ -150,8 +147,8 @@
             <app-item-copy-actions [cipher]="cipher"></app-item-copy-actions>
             <app-item-more-options
               [cipher]="cipher"
-              [hideAutofillOptions]="hideAutofillOptions$ | async"
-              [showViewOption]="primaryActionAutofill"
+              [hideAutofillOptions]="hideAutofillMenuOptions()"
+              [showViewOption]="primaryActionAutofill()"
             ></app-item-more-options>
           </ng-container>
         </bit-item>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
index 073d49333b5..1105f929e04 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CdkVirtualScrollViewport, ScrollingModule } from "@angular/cdk/scrolling";
 import { CommonModule } from "@angular/common";
 import {
@@ -8,18 +6,17 @@ import {
   Component,
   EventEmitter,
   inject,
-  Input,
   Output,
   Signal,
   signal,
   ViewChild,
   computed,
-  OnInit,
   ChangeDetectionStrategy,
   input,
 } from "@angular/core";
+import { toSignal } from "@angular/core/rxjs-interop";
 import { Router } from "@angular/router";
-import { firstValueFrom, Observable, map } from "rxjs";
+import { firstValueFrom, map } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -42,6 +39,7 @@ import {
   SectionComponent,
   SectionHeaderComponent,
   TypographyModule,
+  ScrollLayoutDirective,
 } from "@bitwarden/components";
 import {
   DecryptionFailureDialogComponent,
@@ -50,9 +48,12 @@ import {
 } from "@bitwarden/vault";
 
 import { BrowserApi } from "../../../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../../../platform/browser/browser-popup-utils";
 import { VaultPopupAutofillService } from "../../../services/vault-popup-autofill.service";
-import { VaultPopupSectionService } from "../../../services/vault-popup-section.service";
+import {
+  VaultPopupSectionService,
+  PopupSectionOpen,
+} from "../../../services/vault-popup-section.service";
 import { PopupCipherView } from "../../../views/popup-cipher.view";
 import { ItemCopyActionsComponent } from "../item-copy-action/item-copy-actions.component";
 import { ItemMoreOptionsComponent } from "../item-more-options/item-more-options.component";
@@ -74,23 +75,31 @@ import { ItemMoreOptionsComponent } from "../item-more-options/item-more-options
     ScrollingModule,
     DisclosureComponent,
     DisclosureTriggerForDirective,
+    ScrollLayoutDirective,
   ],
   selector: "app-vault-list-items-container",
   templateUrl: "vault-list-items-container.component.html",
-  standalone: true,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
+export class VaultListItemsContainerComponent implements AfterViewInit {
   private compactModeService = inject(CompactModeService);
   private vaultPopupSectionService = inject(VaultPopupSectionService);
 
-  @ViewChild(CdkVirtualScrollViewport, { static: false }) viewPort: CdkVirtualScrollViewport;
-  @ViewChild(DisclosureComponent) disclosure: DisclosureComponent;
+  @ViewChild(CdkVirtualScrollViewport, { static: false }) viewPort!: CdkVirtualScrollViewport;
+  @ViewChild(DisclosureComponent) disclosure!: DisclosureComponent;
 
   /**
    * Indicates whether the section should be open or closed if collapsibleKey is provided
    */
-  protected sectionOpenState: Signal<boolean> | undefined;
+  protected sectionOpenState: Signal<boolean> = computed(() => {
+    if (!this.collapsibleKey()) {
+      return true;
+    }
+
+    return (
+      this.vaultPopupSectionService.getOpenDisplayStateForSection(this.collapsibleKey()!)() ?? true
+    );
+  });
 
   /**
    * The class used to set the height of a bit item's inner content.
@@ -114,7 +123,7 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
    * Timeout used to add a small delay when selecting a cipher to allow for double click to launch
    * @private
    */
-  private viewCipherTimeout: number | null;
+  private viewCipherTimeout?: number;
 
   ciphers = input<PopupCipherView[]>([]);
 
@@ -122,31 +131,33 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
    * If true, we will group ciphers by type (Login, Card, Identity)
    * within subheadings in a single container, converted to a WritableSignal.
    */
-  groupByType = input<boolean>(false);
+  groupByType = input<boolean | undefined>(false);
 
   /**
    * Computed signal for a grouped list of ciphers with an optional header
    */
-  cipherGroups$ = computed<
+  cipherGroups = computed<
     {
-      subHeaderKey?: string | null;
+      subHeaderKey?: string;
       ciphers: PopupCipherView[];
     }[]
   >(() => {
-    const groups: { [key: string]: CipherView[] } = {};
+    // Not grouping by type, return a single group with all ciphers
+    if (!this.groupByType()) {
+      return [{ ciphers: this.ciphers() }];
+    }
+
+    const groups: Record<string, PopupCipherView[]> = {};
 
     this.ciphers().forEach((cipher) => {
-      let groupKey;
-
-      if (this.groupByType()) {
-        switch (cipher.type) {
-          case CipherType.Card:
-            groupKey = "cards";
-            break;
-          case CipherType.Identity:
-            groupKey = "identities";
-            break;
-        }
+      let groupKey = "all";
+      switch (cipher.type) {
+        case CipherType.Card:
+          groupKey = "cards";
+          break;
+        case CipherType.Identity:
+          groupKey = "identities";
+          break;
       }
 
       if (!groups[groupKey]) {
@@ -156,17 +167,16 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
       groups[groupKey].push(cipher);
     });
 
-    return Object.keys(groups).map((key) => ({
-      subHeaderKey: this.groupByType ? key : "",
-      ciphers: groups[key],
+    return Object.entries(groups).map(([key, ciphers]) => ({
+      subHeaderKey: key != "all" ? key : undefined,
+      ciphers: ciphers,
     }));
   });
 
   /**
    * Title for the vault list item section.
    */
-  @Input()
-  title: string;
+  title = input<string | undefined>(undefined);
 
   /**
    * Optionally allow the items to be collapsed.
@@ -174,21 +184,18 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
    * The key must be added to the state definition in `vault-popup-section.service.ts` since the
    * collapsed state is stored locally.
    */
-  @Input()
-  collapsibleKey: "favorites" | "allItems" | undefined;
+  collapsibleKey = input<keyof PopupSectionOpen | undefined>(undefined);
 
   /**
    * Optional description for the vault list item section. Will be shown below the title even when
    * no ciphers are available.
    */
-  @Input()
-  description: string;
+  description = input<string | undefined>(undefined);
 
   /**
    * Option to show a refresh button in the section header.
    */
-  @Input({ transform: booleanAttribute })
-  showRefresh: boolean;
+  showRefresh = input(false, { transform: booleanAttribute });
 
   /**
    * Event emitted when the refresh button is clicked.
@@ -199,66 +206,61 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
   /**
    * Flag indicating that the current tab location is blocked
    */
-  currentURIIsBlocked$: Observable<boolean> =
-    this.vaultPopupAutofillService.currentTabIsOnBlocklist$;
+  currentURIIsBlocked = toSignal(this.vaultPopupAutofillService.currentTabIsOnBlocklist$);
 
   /**
    * Resolved i18n key to use for suggested cipher items
    */
-  cipherItemTitleKey = (cipher: CipherView) =>
-    this.currentURIIsBlocked$.pipe(
-      map((uriIsBlocked) => {
-        const hasUsername = cipher.login?.username != null;
-        const key = this.primaryActionAutofill && !uriIsBlocked ? "autofillTitle" : "viewItemTitle";
-        return hasUsername ? `${key}WithField` : key;
-      }),
-    );
+  cipherItemTitleKey = computed(() => {
+    return (cipher: CipherView) => {
+      const hasUsername = cipher.login?.username != null;
+      const key =
+        this.primaryActionAutofill() && !this.currentURIIsBlocked()
+          ? "autofillTitle"
+          : "viewItemTitle";
+      return hasUsername ? `${key}WithField` : key;
+    };
+  });
 
   /**
    * Option to show the autofill button for each item.
    */
-  @Input({ transform: booleanAttribute })
-  showAutofillButton: boolean;
+  showAutofillButton = input(false, { transform: booleanAttribute });
 
   /**
    * Flag indicating whether the suggested cipher item autofill button should be shown or not
    */
-  hideAutofillButton$ = this.currentURIIsBlocked$.pipe(
-    map((uriIsBlocked) => !this.showAutofillButton || uriIsBlocked || this.primaryActionAutofill),
+  hideAutofillButton = computed(
+    () => !this.showAutofillButton() || this.currentURIIsBlocked() || this.primaryActionAutofill(),
   );
 
   /**
-   * Flag indicating whether the cipher item autofill options should be shown or not
+   * Flag indicating whether the cipher item autofill menu options should be shown or not
    */
-  hideAutofillOptions$: Observable<boolean> = this.currentURIIsBlocked$.pipe(
-    map((uriIsBlocked) => uriIsBlocked || this.showAutofillButton),
-  );
+  hideAutofillMenuOptions = computed(() => this.currentURIIsBlocked() || this.showAutofillButton());
 
   /**
    * Option to perform autofill operation as the primary action for autofill suggestions.
    */
-  @Input({ transform: booleanAttribute })
-  primaryActionAutofill: boolean;
+  primaryActionAutofill = input(false, { transform: booleanAttribute });
 
   /**
    * Remove the bottom margin from the bit-section in this component
    * (used for containers at the end of the page where bottom margin is not needed)
    */
-  @Input({ transform: booleanAttribute })
-  disableSectionMargin: boolean = false;
+  disableSectionMargin = input(false, { transform: booleanAttribute });
 
   /**
    * Remove the description margin
    */
-  @Input({ transform: booleanAttribute })
-  disableDescriptionMargin: boolean = false;
+  disableDescriptionMargin = input(false, { transform: booleanAttribute });
 
   /**
    * The tooltip text for the organization icon for ciphers that belong to an organization.
    * @param cipher
    */
   orgIconTooltip(cipher: PopupCipherView) {
-    if (cipher.collectionIds.length > 1) {
+    if (cipher.collectionIds.length > 1 || !cipher.collections) {
       return this.i18nService.t("nCollections", cipher.collectionIds.length);
     }
 
@@ -278,16 +280,6 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
     private accountService: AccountService,
   ) {}
 
-  ngOnInit(): void {
-    if (!this.collapsibleKey) {
-      return;
-    }
-
-    this.sectionOpenState = this.vaultPopupSectionService.getOpenDisplayStateForSection(
-      this.collapsibleKey,
-    );
-  }
-
   async ngAfterViewInit() {
     const autofillShortcut = await this.platformUtilsService.getAutofillKeyboardShortcut();
 
@@ -300,10 +292,8 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
     }
   }
 
-  async primaryActionOnSelect(cipher: CipherView) {
-    const isBlocked = await firstValueFrom(this.currentURIIsBlocked$);
-
-    return this.primaryActionAutofill && !isBlocked
+  primaryActionOnSelect(cipher: CipherView) {
+    return this.primaryActionAutofill() && !this.currentURIIsBlocked()
       ? this.doAutofill(cipher)
       : this.onViewCipher(cipher);
   }
@@ -319,7 +309,7 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
     // If there is a view action pending, clear it
     if (this.viewCipherTimeout != null) {
       window.clearTimeout(this.viewCipherTimeout);
-      this.viewCipherTimeout = null;
+      this.viewCipherTimeout = undefined;
     }
 
     const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
@@ -362,7 +352,7 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
           });
         } finally {
           // Ensure the timeout is always cleared
-          this.viewCipherTimeout = null;
+          this.viewCipherTimeout = undefined;
         }
       },
       cipher.canLaunch ? 200 : 0,
@@ -373,12 +363,12 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
    * Update section open/close state based on user action
    */
   async toggleSectionOpen() {
-    if (!this.collapsibleKey) {
+    if (!this.collapsibleKey()) {
       return;
     }
 
     await this.vaultPopupSectionService.updateSectionOpenStoredState(
-      this.collapsibleKey,
+      this.collapsibleKey()!,
       this.disclosure.open,
     );
   }
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts
index d0eef20f044..f2764df7ba7 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts
@@ -19,7 +19,6 @@ import { PopupPageComponent } from "../../../../../platform/popup/layout/popup-p
 import { PopupRouterCacheService } from "../../../../../platform/popup/view-cache/popup-router-cache.service";
 
 @Component({
-  standalone: true,
   selector: "vault-password-history-v2",
   templateUrl: "vault-password-history-v2.component.html",
   imports: [
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.ts
index b68818454d1..fe2baf463cf 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.ts
@@ -13,7 +13,6 @@ const SearchTextDebounceInterval = 200;
 
 @Component({
   imports: [CommonModule, SearchModule, JslibModule, FormsModule],
-  standalone: true,
   selector: "app-vault-v2-search",
   templateUrl: "vault-v2-search.component.html",
 })
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
index 42e772be062..a56eef4dfc1 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
@@ -1,4 +1,4 @@
-<popup-page [loading]="loading$ | async" disablePadding>
+<popup-page [loading]="loading$ | async">
   <popup-header slot="header" [pageTitle]="'vault' | i18n">
     <ng-container slot="end">
       <app-new-item-dropdown [initialValues]="newItemItemValues$ | async"></app-new-item-dropdown>
@@ -46,16 +46,14 @@
           [title]="'hasItemsVaultNudgeTitle' | i18n"
           (onDismiss)="dismissVaultNudgeSpotlight(NudgeType.HasVaultItems)"
         >
-          <ul class="tw-pl-4 tw-text-main" bitTypography="body2">
+          <ul class="tw-pl-4 tw-text-main tw-mb-0" bitTypography="body2">
             <li>{{ "hasItemsVaultNudgeBodyOne" | i18n }}</li>
             <li>{{ "hasItemsVaultNudgeBodyTwo" | i18n }}</li>
             <li>{{ "hasItemsVaultNudgeBodyThree" | i18n }}</li>
           </ul>
         </bit-spotlight>
       </div>
-      <vault-at-risk-password-callout
-        *appIfFeature="FeatureFlag.SecurityTasks"
-      ></vault-at-risk-password-callout>
+      <vault-at-risk-password-callout></vault-at-risk-password-callout>
       <app-vault-header-v2></app-vault-header-v2>
     </ng-container>
   </ng-container>
@@ -86,11 +84,7 @@
       </div>
     </div>
 
-    <div
-      *ngIf="vaultState === null"
-      cdkVirtualScrollingElement
-      class="tw-h-full tw-p-3 bit-compact:tw-p-2 tw-styled-scrollbar"
-    >
+    <ng-container *ngIf="vaultState === null">
       <app-autofill-vault-list-items></app-autofill-vault-list-items>
       <app-vault-list-items-container
         [title]="'favorites' | i18n"
@@ -105,6 +99,6 @@
         disableSectionMargin
         collapsibleKey="allItems"
       ></app-vault-list-items-container>
-    </div>
+    </ng-container>
   </ng-container>
 </popup-page>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
index db853d45940..0340c82369d 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
@@ -24,6 +24,7 @@ import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { CipherId, CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   ButtonModule,
   DialogService,
@@ -35,7 +36,7 @@ import { DecryptionFailureDialogComponent, VaultIcons } from "@bitwarden/vault";
 
 import { CurrentAccountComponent } from "../../../../auth/popup/account-switching/current-account.component";
 import { BrowserApi } from "../../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../../platform/browser/browser-popup-utils";
 import { PopOutComponent } from "../../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page.component";
@@ -55,18 +56,17 @@ import { VaultHeaderV2Component } from "./vault-header/vault-header-v2.component
 
 import { AutofillVaultListItemsComponent, VaultListItemsContainerComponent } from ".";
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-enum VaultState {
-  Empty,
-  NoResults,
-  DeactivatedOrg,
-}
+const VaultState = {
+  Empty: 0,
+  NoResults: 1,
+  DeactivatedOrg: 2,
+} as const;
+
+type VaultState = UnionOfValues<typeof VaultState>;
 
 @Component({
   selector: "app-vault",
   templateUrl: "vault-v2.component.html",
-  standalone: true,
   imports: [
     BlockedInjectionBanner,
     PopupPageComponent,
diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.html b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.html
index b7ffeb89cc1..8c76db600ae 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.html
@@ -17,11 +17,7 @@
     </button>
 
     <button
-      *ngIf="
-        (limitItemDeletion$ | async)
-          ? cipher.isDeleted && cipher.permissions.restore
-          : cipher.isDeleted && cipher.edit
-      "
+      *ngIf="cipher.isDeleted && cipher.permissions.restore"
       buttonType="primary"
       type="button"
       bitButton
diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
index 3222f39a162..a9031ea2630 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
@@ -27,7 +27,7 @@ import { DialogService, ToastService } from "@bitwarden/components";
 import { CopyCipherFieldService, PasswordRepromptService } from "@bitwarden/vault";
 
 import { BrowserApi } from "../../../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../../../platform/browser/browser-popup-utils";
 import { PopupRouterCacheService } from "../../../../../platform/popup/view-cache/popup-router-cache.service";
 import { VaultPopupScrollPositionService } from "../../../services/vault-popup-scroll-position.service";
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
index 0a71caf5aee..349ea136ecf 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
@@ -5,7 +5,7 @@ import { Component } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormsModule } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
-import { firstValueFrom, map, Observable, switchMap } from "rxjs";
+import { firstValueFrom, Observable, switchMap, of } from "rxjs";
 
 import { CollectionView } from "@bitwarden/admin-console/common";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
@@ -22,8 +22,6 @@ import {
   UPDATE_PASSWORD,
 } from "@bitwarden/common/autofill/constants";
 import { EventType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -52,7 +50,7 @@ import {
 
 import { sendExtensionMessage } from "../../../../../autofill/utils/index";
 import { BrowserApi } from "../../../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../../../platform/browser/browser-popup-utils";
 import { PopOutComponent } from "../../../../../platform/popup/components/pop-out.component";
 import { PopupRouterCacheService } from "../../../../../platform/popup/view-cache/popup-router-cache.service";
 import { BrowserPremiumUpgradePromptService } from "../../../services/browser-premium-upgrade-prompt.service";
@@ -80,7 +78,6 @@ type LoadAction =
 @Component({
   selector: "app-view-v2",
   templateUrl: "view-v2.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     SearchModule,
@@ -113,7 +110,6 @@ export class ViewV2Component {
   loadAction: LoadAction;
   senderTabId?: number;
 
-  protected limitItemDeletion$ = this.configService.getFeatureFlag$(FeatureFlag.LimitItemDeletion);
   protected showFooter$: Observable<boolean>;
 
   constructor(
@@ -132,7 +128,6 @@ export class ViewV2Component {
     protected cipherAuthorizationService: CipherAuthorizationService,
     private copyCipherFieldService: CopyCipherFieldService,
     private popupScrollPositionService: VaultPopupScrollPositionService,
-    private configService: ConfigService,
   ) {
     this.subscribeToParams();
   }
@@ -161,17 +156,10 @@ export class ViewV2Component {
 
           this.canDeleteCipher$ = this.cipherAuthorizationService.canDeleteCipher$(cipher);
 
-          this.showFooter$ = this.limitItemDeletion$.pipe(
-            map((enabled) => {
-              if (enabled) {
-                return (
-                  cipher &&
-                  (!cipher.isDeleted ||
-                    (cipher.isDeleted && (cipher.permissions.restore || cipher.permissions.delete)))
-                );
-              }
-              return this.showFooterLegacy();
-            }),
+          this.showFooter$ = of(
+            cipher &&
+              (!cipher.isDeleted ||
+                (cipher.isDeleted && (cipher.permissions.restore || cipher.permissions.delete))),
           );
 
           await this.eventCollectionService.collect(
@@ -269,15 +257,6 @@ export class ViewV2Component {
       : this.cipherService.softDeleteWithServer(this.cipher.id, this.activeUserId);
   }
 
-  //@TODO: remove this when the LimitItemDeletion feature flag is removed
-  protected showFooterLegacy(): boolean {
-    return (
-      this.cipher &&
-      (!this.cipher.isDeleted ||
-        (this.cipher.isDeleted && this.cipher.edit && this.cipher.viewPassword))
-    );
-  }
-
   /**
    * Handles the load action for the view vault item popout. These actions are typically triggered
    * via the extension context menu. It is necessary to render the view for items that have password
diff --git a/apps/browser/src/vault/guards/at-risk-passwords.guard.ts b/apps/browser/src/vault/popup/guards/at-risk-passwords.guard.ts
similarity index 100%
rename from apps/browser/src/vault/guards/at-risk-passwords.guard.ts
rename to apps/browser/src/vault/popup/guards/at-risk-passwords.guard.ts
diff --git a/apps/browser/src/vault/guards/clear-vault-state.guard.ts b/apps/browser/src/vault/popup/guards/clear-vault-state.guard.ts
similarity index 76%
rename from apps/browser/src/vault/guards/clear-vault-state.guard.ts
rename to apps/browser/src/vault/popup/guards/clear-vault-state.guard.ts
index b212c55d833..e27090180d6 100644
--- a/apps/browser/src/vault/guards/clear-vault-state.guard.ts
+++ b/apps/browser/src/vault/popup/guards/clear-vault-state.guard.ts
@@ -1,9 +1,9 @@
 import { inject } from "@angular/core";
 import { CanDeactivateFn } from "@angular/router";
 
-import { VaultV2Component } from "../popup/components/vault-v2/vault-v2.component";
-import { VaultPopupItemsService } from "../popup/services/vault-popup-items.service";
-import { VaultPopupListFiltersService } from "../popup/services/vault-popup-list-filters.service";
+import { VaultV2Component } from "../components/vault-v2/vault-v2.component";
+import { VaultPopupItemsService } from "../services/vault-popup-items.service";
+import { VaultPopupListFiltersService } from "../services/vault-popup-list-filters.service";
 
 /**
  * Guard to clear the vault state (search and filter) when navigating away from the vault view.
diff --git a/apps/browser/src/vault/guards/intro-carousel.guard.spec.ts b/apps/browser/src/vault/popup/guards/intro-carousel.guard.spec.ts
similarity index 96%
rename from apps/browser/src/vault/guards/intro-carousel.guard.spec.ts
rename to apps/browser/src/vault/popup/guards/intro-carousel.guard.spec.ts
index c9ed994729a..4e850294b0b 100644
--- a/apps/browser/src/vault/guards/intro-carousel.guard.spec.ts
+++ b/apps/browser/src/vault/popup/guards/intro-carousel.guard.spec.ts
@@ -5,7 +5,7 @@ import { of } from "rxjs";
 
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
-import { IntroCarouselService } from "../popup/services/intro-carousel.service";
+import { IntroCarouselService } from "../services/intro-carousel.service";
 
 import { IntroCarouselGuard } from "./intro-carousel.guard";
 
diff --git a/apps/browser/src/vault/guards/intro-carousel.guard.ts b/apps/browser/src/vault/popup/guards/intro-carousel.guard.ts
similarity index 91%
rename from apps/browser/src/vault/guards/intro-carousel.guard.ts
rename to apps/browser/src/vault/popup/guards/intro-carousel.guard.ts
index f101f65c0e7..4a825a0b2a7 100644
--- a/apps/browser/src/vault/guards/intro-carousel.guard.ts
+++ b/apps/browser/src/vault/popup/guards/intro-carousel.guard.ts
@@ -5,7 +5,7 @@ import { firstValueFrom } from "rxjs";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
-import { IntroCarouselService } from "../popup/services/intro-carousel.service";
+import { IntroCarouselService } from "../services/intro-carousel.service";
 
 export const IntroCarouselGuard = async () => {
   const router = inject(Router);
diff --git a/apps/browser/src/vault/popup/services/browser-totp-capture.service.spec.ts b/apps/browser/src/vault/popup/services/browser-totp-capture.service.spec.ts
index 2b309e8f817..05ff6461d0a 100644
--- a/apps/browser/src/vault/popup/services/browser-totp-capture.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/browser-totp-capture.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing";
 import qrcodeParser from "qrcode-parser";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 
 import { BrowserTotpCaptureService } from "./browser-totp-capture.service";
 
diff --git a/apps/browser/src/vault/popup/services/browser-totp-capture.service.ts b/apps/browser/src/vault/popup/services/browser-totp-capture.service.ts
index ac73b271c84..95b9a0d5167 100644
--- a/apps/browser/src/vault/popup/services/browser-totp-capture.service.ts
+++ b/apps/browser/src/vault/popup/services/browser-totp-capture.service.ts
@@ -4,7 +4,7 @@ import qrcodeParser from "qrcode-parser";
 import { TotpCaptureService } from "@bitwarden/vault";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 
 /**
  * Implementation of TotpCaptureService for the browser which captures the
diff --git a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts
index 415aeb31081..616c75c3fa8 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts
@@ -28,7 +28,7 @@ import {
 } from "../../../autofill/services/abstractions/autofill.service";
 import { InlineMenuFieldQualificationService } from "../../../autofill/services/inline-menu-field-qualification.service";
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 
 import { VaultPopupAutofillService } from "./vault-popup-autofill.service";
 
@@ -353,7 +353,7 @@ describe("VaultPopupAutofillService", () => {
       });
 
       it("should add a URI to the cipher and save with the server", async () => {
-        const mockEncryptedCipher = {} as Cipher;
+        const mockEncryptedCipher = { cipher: {} as Cipher, encryptedFor: mockUserId };
         mockCipherService.encrypt.mockResolvedValue(mockEncryptedCipher);
         const result = await service.doAutofillAndSave(mockCipher);
         expect(result).toBe(true);
diff --git a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
index 41d76078fdb..4e995e093e6 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
@@ -35,7 +35,7 @@ import {
 } from "../../../autofill/services/abstractions/autofill.service";
 import { InlineMenuFieldQualificationService } from "../../../autofill/services/inline-menu-field-qualification.service";
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 import { closeViewVaultItemPopout, VaultPopoutType } from "../utils/vault-popout-window";
 
 @Injectable({
diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
index 52cb393c684..28bf710ec60 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
@@ -1,10 +1,9 @@
 import { WritableSignal, signal } from "@angular/core";
-import { TestBed, discardPeriodicTasks, fakeAsync, tick } from "@angular/core/testing";
+import { TestBed } from "@angular/core/testing";
 import { mock } from "jest-mock-extended";
 import { BehaviorSubject, firstValueFrom, timeout } from "rxjs";
 
 import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -14,11 +13,16 @@ import { SyncService } from "@bitwarden/common/platform/sync";
 import { ObservableTracker, mockAccountServiceWith } from "@bitwarden/common/spec";
 import { CipherId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
 import { LocalData } from "@bitwarden/common/vault/models/data/local.data";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import {
+  RestrictedCipherType,
+  RestrictedItemTypesService,
+} from "@bitwarden/common/vault/services/restricted-item-types.service";
 
 import { InlineMenuFieldQualificationService } from "../../../autofill/services/inline-menu-field-qualification.service";
 import { BrowserApi } from "../../../platform/browser/browser-api";
@@ -58,6 +62,11 @@ describe("VaultPopupItemsService", () => {
   const userId = Utils.newGuid() as UserId;
   const accountServiceMock = mockAccountServiceWith(userId);
 
+  const restrictedItemTypesService = {
+    restricted$: new BehaviorSubject<RestrictedCipherType[]>([]),
+    isCipherRestricted: jest.fn().mockReturnValue(false),
+  };
+
   beforeEach(() => {
     allCiphers = cipherFactory(10);
     const cipherList = Object.values(allCiphers);
@@ -154,6 +163,10 @@ describe("VaultPopupItemsService", () => {
           useValue: inlineMenuFieldQualificationServiceMock,
         },
         { provide: PopupViewCacheService, useValue: viewCacheService },
+        {
+          provide: RestrictedItemTypesService,
+          useValue: restrictedItemTypesService,
+        },
       ],
     });
 
@@ -483,22 +496,15 @@ describe("VaultPopupItemsService", () => {
     });
   });
 
-  it("should update searchText$ when applyFilter is called", fakeAsync(() => {
-    let latestValue: string | null;
+  it("should update searchText$ when applyFilter is called", (done) => {
     service.searchText$.subscribe((val) => {
-      latestValue = val;
+      expect(val).toEqual("test search");
+      expect(viewCacheService.mockSignal()).toEqual("test search");
+      done();
     });
-    tick();
-    expect(latestValue!).toEqual("");
 
     service.applyFilter("test search");
-    tick();
-    expect(latestValue!).toEqual("test search");
-
-    expect(viewCacheService.mockSignal()).toEqual("test search");
-
-    discardPeriodicTasks();
-  }));
+  });
 });
 
 // A function to generate a list of ciphers of different types
diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
index b4cf79e7422..d47abb9e6b3 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
@@ -20,7 +20,6 @@ import {
 } from "rxjs";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
@@ -28,9 +27,11 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 
 import { runInsideAngular } from "../../../platform/browser/run-inside-angular.operator";
 import { PopupViewCacheService } from "../../../platform/popup/view-cache/popup-view-cache.service";
@@ -107,9 +108,16 @@ export class VaultPopupItemsService {
           combineLatest([
             Utils.asyncToObservable(() => this.cipherService.getAllDecrypted(userId)),
             this.cipherService.failedToDecryptCiphers$(userId),
+            this.restrictedItemTypesService.restricted$.pipe(startWith([])),
           ]),
         ),
-        map(([ciphers, failedToDecryptCiphers]) => [...(failedToDecryptCiphers || []), ...ciphers]),
+        map(([ciphers, failedToDecryptCiphers, restrictions]) => {
+          const allCiphers = [...(failedToDecryptCiphers || []), ...ciphers];
+
+          return allCiphers.filter(
+            (cipher) => !this.restrictedItemTypesService.isCipherRestricted(cipher, restrictions),
+          );
+        }),
       ),
     ),
     shareReplay({ refCount: true, bufferSize: 1 }),
@@ -307,6 +315,7 @@ export class VaultPopupItemsService {
     private syncService: SyncService,
     private accountService: AccountService,
     private ngZone: NgZone,
+    private restrictedItemTypesService: RestrictedItemTypesService,
   ) {}
 
   applyFilter(newSearchText: string) {
@@ -319,13 +328,13 @@ export class VaultPopupItemsService {
    * @private
    */
   private sortCiphersForAutofill(a: CipherView, b: CipherView): number {
-    const typeOrder: Record<CipherType, number> = {
+    const typeOrder = {
       [CipherType.Login]: 1,
       [CipherType.Card]: 2,
       [CipherType.Identity]: 3,
       [CipherType.SecureNote]: 4,
       [CipherType.SshKey]: 5,
-    };
+    } as Record<CipherType, number>;
 
     // Compare types first
     if (typeOrder[a.type] < typeOrder[b.type]) {
diff --git a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
index 621ec795157..e530046a971 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
@@ -5,12 +5,14 @@ import { BehaviorSubject, skipWhile } from "rxjs";
 
 import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
 import { ViewCacheService } from "@bitwarden/angular/platform/view-cache";
+import * as vaultFilterSvc from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { ProductTierType } from "@bitwarden/common/billing/enums";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { mockAccountServiceWith } from "@bitwarden/common/spec";
@@ -20,6 +22,10 @@ import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folde
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import {
+  RestrictedCipherType,
+  RestrictedItemTypesService,
+} from "@bitwarden/common/vault/services/restricted-item-types.service";
 
 import {
   CachedFilterState,
@@ -27,6 +33,14 @@ import {
   VaultPopupListFiltersService,
 } from "./vault-popup-list-filters.service";
 
+const configService = {
+  getFeatureFlag$: jest.fn(() => new BehaviorSubject<boolean>(true)),
+} as unknown as ConfigService;
+
+jest.mock("@bitwarden/angular/vault/vault-filter/services/vault-filter.service", () => ({
+  sortDefaultCollections: jest.fn(),
+}));
+
 describe("VaultPopupListFiltersService", () => {
   let service: VaultPopupListFiltersService;
   let _memberOrganizations$ = new BehaviorSubject<Organization[]>([]);
@@ -70,6 +84,11 @@ describe("VaultPopupListFiltersService", () => {
   const state$ = new BehaviorSubject<boolean>(false);
   const update = jest.fn().mockResolvedValue(undefined);
 
+  const restrictedItemTypesService = {
+    restricted$: new BehaviorSubject<RestrictedCipherType[]>([]),
+    isCipherRestricted: jest.fn().mockReturnValue(false),
+  };
+
   beforeEach(() => {
     _memberOrganizations$ = new BehaviorSubject<Organization[]>([]); // Fresh instance per test
     folderViews$ = new BehaviorSubject([]); // Fresh instance per test
@@ -125,21 +144,50 @@ describe("VaultPopupListFiltersService", () => {
           provide: ViewCacheService,
           useValue: viewCacheService,
         },
+        {
+          provide: RestrictedItemTypesService,
+          useValue: restrictedItemTypesService,
+        },
+        {
+          provide: ConfigService,
+          useValue: configService,
+        },
       ],
     });
 
     service = TestBed.inject(VaultPopupListFiltersService);
   });
 
-  describe("cipherTypes", () => {
-    it("returns all cipher types", () => {
-      expect(service.cipherTypes.map((c) => c.value)).toEqual([
-        CipherType.Login,
-        CipherType.Card,
-        CipherType.Identity,
-        CipherType.SecureNote,
-        CipherType.SshKey,
+  describe("cipherTypes$", () => {
+    it("returns all cipher types when no restrictions", (done) => {
+      restrictedItemTypesService.restricted$.next([]);
+
+      service.cipherTypes$.subscribe((cipherTypes) => {
+        expect(cipherTypes.map((c) => c.value)).toEqual([
+          CipherType.Login,
+          CipherType.Card,
+          CipherType.Identity,
+          CipherType.SecureNote,
+          CipherType.SshKey,
+        ]);
+        done();
+      });
+    });
+
+    it("filters out restricted cipher types", (done) => {
+      restrictedItemTypesService.restricted$.next([
+        { cipherType: CipherType.Card, allowViewOrgIds: [] },
       ]);
+
+      service.cipherTypes$.subscribe((cipherTypes) => {
+        expect(cipherTypes.map((c) => c.value)).toEqual([
+          CipherType.Login,
+          CipherType.Identity,
+          CipherType.SecureNote,
+          CipherType.SshKey,
+        ]);
+        done();
+      });
     });
   });
 
@@ -194,10 +242,10 @@ describe("VaultPopupListFiltersService", () => {
       });
     });
 
-    describe("PersonalOwnership policy", () => {
-      it('calls policyAppliesToUser$ with "PersonalOwnership"', () => {
+    describe("OrganizationDataOwnership policy", () => {
+      it('calls policyAppliesToUser$ with "OrganizationDataOwnership"', () => {
         expect(policyService.policyAppliesToUser$).toHaveBeenCalledWith(
-          PolicyType.PersonalOwnership,
+          PolicyType.OrganizationDataOwnership,
           "userId",
         );
       });
@@ -365,6 +413,29 @@ describe("VaultPopupListFiltersService", () => {
         done();
       });
     });
+
+    it("calls vaultFilterService.sortDefaultCollections", (done) => {
+      const collections = [
+        { id: "1234", name: "Default Collection", organizationId: "org1" },
+        { id: "5678", name: "Shared Collection", organizationId: "org2" },
+      ] as CollectionView[];
+
+      const orgs = [
+        { id: "org1", name: "Organization 1" },
+        { id: "org2", name: "Organization 2" },
+      ] as Organization[];
+
+      createSeededVaultPopupListFiltersService(orgs, collections, [], {});
+
+      service.collections$.subscribe(() => {
+        expect(vaultFilterSvc.sortDefaultCollections).toHaveBeenCalledWith(
+          collections,
+          orgs,
+          i18nService.collator,
+        );
+        done();
+      });
+    });
   });
 
   describe("folders$", () => {
@@ -539,6 +610,8 @@ describe("VaultPopupListFiltersService", () => {
 
       const seededOrganizations: Organization[] = [
         { id: MY_VAULT_ID, name: "Test Org" } as Organization,
+        { id: "org1", name: "Default User Collection Org 1" } as Organization,
+        { id: "org2", name: "Default User Collection Org 2" } as Organization,
       ];
       const seededCollections: CollectionView[] = [
         {
@@ -690,6 +763,10 @@ function createSeededVaultPopupListFiltersService(
   } as any;
 
   const accountServiceMock = mockAccountServiceWith("userId" as UserId);
+  const restrictedItemTypesServiceMock = {
+    restricted$: new BehaviorSubject<RestrictedCipherType[]>([]),
+    isCipherRestricted: jest.fn().mockReturnValue(false),
+  } as any;
   const formBuilderInstance = new FormBuilder();
 
   const seededCachedSignal = createMockSignal<CachedFilterState>(cachedState);
@@ -713,6 +790,8 @@ function createSeededVaultPopupListFiltersService(
       stateProviderMock,
       accountServiceMock,
       viewCacheServiceMock,
+      restrictedItemTypesServiceMock,
+      configService,
     );
   });
 
diff --git a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
index db4cfeefe9f..a936aaf86d9 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
@@ -6,6 +6,7 @@ import {
   debounceTime,
   distinctUntilChanged,
   filter,
+  from,
   map,
   Observable,
   shareReplay,
@@ -17,6 +18,7 @@ import {
 import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
 import { ViewCacheService } from "@bitwarden/angular/platform/view-cache";
 import { DynamicTreeNode } from "@bitwarden/angular/vault/vault-filter/models/dynamic-tree-node.model";
+import { sortDefaultCollections } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
@@ -24,6 +26,8 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { ProductTierType } from "@bitwarden/common/billing/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import {
@@ -39,6 +43,8 @@ import { ITreeNodeObject, TreeNode } from "@bitwarden/common/vault/models/domain
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { CIPHER_MENU_ITEMS } from "@bitwarden/common/vault/types/cipher-menu-items";
 import { ChipSelectOption } from "@bitwarden/components";
 
 const FILTER_VISIBILITY_KEY = new KeyDefinition<boolean>(VAULT_SETTINGS_DISK, "filterVisibility", {
@@ -178,6 +184,8 @@ export class VaultPopupListFiltersService {
     private stateProvider: StateProvider,
     private accountService: AccountService,
     private viewCacheService: ViewCacheService,
+    private restrictedItemTypesService: RestrictedItemTypesService,
+    private configService: ConfigService,
   ) {
     this.filterForm.controls.organization.valueChanges
       .pipe(takeUntilDestroyed())
@@ -210,74 +218,64 @@ export class VaultPopupListFiltersService {
   /**
    * Observable whose value is a function that filters an array of `CipherView` objects based on the current filters
    */
-  filterFunction$: Observable<(ciphers: CipherView[]) => CipherView[]> = this.filters$.pipe(
+  filterFunction$: Observable<(ciphers: CipherView[]) => CipherView[]> = combineLatest([
+    this.filters$,
+  ]).pipe(
     map(
-      (filters) => (ciphers: CipherView[]) =>
-        ciphers.filter((cipher) => {
-          // Vault popup lists never shows deleted ciphers
-          if (cipher.isDeleted) {
-            return false;
-          }
-
-          if (filters.cipherType !== null && cipher.type !== filters.cipherType) {
-            return false;
-          }
-
-          if (filters.collection && !cipher.collectionIds?.includes(filters.collection.id)) {
-            return false;
-          }
-
-          if (filters.folder && cipher.folderId !== filters.folder.id) {
-            return false;
-          }
-
-          const isMyVault = filters.organization?.id === MY_VAULT_ID;
-
-          if (isMyVault) {
-            if (cipher.organizationId !== null) {
+      ([filters]) =>
+        (ciphers: CipherView[]) =>
+          ciphers.filter((cipher) => {
+            // Vault popup lists never shows deleted ciphers
+            if (cipher.isDeleted) {
               return false;
             }
-          } else if (filters.organization) {
-            if (cipher.organizationId !== filters.organization.id) {
+
+            if (filters.cipherType !== null && cipher.type !== filters.cipherType) {
               return false;
             }
-          }
 
-          return true;
-        }),
+            if (filters.collection && !cipher.collectionIds?.includes(filters.collection.id)) {
+              return false;
+            }
+
+            if (filters.folder && cipher.folderId !== filters.folder.id) {
+              return false;
+            }
+
+            const isMyVault = filters.organization?.id === MY_VAULT_ID;
+
+            if (isMyVault) {
+              if (cipher.organizationId !== null) {
+                return false;
+              }
+            } else if (filters.organization) {
+              if (cipher.organizationId !== filters.organization.id) {
+                return false;
+              }
+            }
+
+            return true;
+          }),
     ),
   );
 
   /**
-   * All available cipher types
+   * All available cipher types (filtered by policy restrictions)
    */
-  readonly cipherTypes: ChipSelectOption<CipherType>[] = [
-    {
-      value: CipherType.Login,
-      label: this.i18nService.t("typeLogin"),
-      icon: "bwi-globe",
-    },
-    {
-      value: CipherType.Card,
-      label: this.i18nService.t("typeCard"),
-      icon: "bwi-credit-card",
-    },
-    {
-      value: CipherType.Identity,
-      label: this.i18nService.t("typeIdentity"),
-      icon: "bwi-id-card",
-    },
-    {
-      value: CipherType.SecureNote,
-      label: this.i18nService.t("note"),
-      icon: "bwi-sticky-note",
-    },
-    {
-      value: CipherType.SshKey,
-      label: this.i18nService.t("typeSshKey"),
-      icon: "bwi-key",
-    },
-  ];
+  readonly cipherTypes$: Observable<ChipSelectOption<CipherType>[]> =
+    this.restrictedItemTypesService.restricted$.pipe(
+      map((restrictedTypes) => {
+        return CIPHER_MENU_ITEMS.filter((item) => {
+          const restriction = restrictedTypes.find((r) => r.cipherType === item.type);
+          // Show if no restriction or if the restriction allows viewing in at least one org
+          return !restriction || restriction.allowViewOrgIds.length > 0;
+        }).map((item) => ({
+          value: item.type,
+          label: this.i18nService.t(item.labelKey),
+          icon: item.icon,
+        }));
+      }),
+    );
 
   /** Resets `filterForm` to the original state */
   resetFilterForm(): void {
@@ -294,30 +292,30 @@ export class VaultPopupListFiltersService {
       switchMap((userId) =>
         combineLatest([
           this.organizationService.memberOrganizations$(userId),
-          this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
+          this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
         ]),
       ),
-      map(([orgs, personalOwnershipApplies]): [Organization[], boolean] => [
+      map(([orgs, organizationDataOwnership]): [Organization[], boolean] => [
         orgs.sort(Utils.getSortFunction(this.i18nService, "name")),
-        personalOwnershipApplies,
+        organizationDataOwnership,
       ]),
-      map(([orgs, personalOwnershipApplies]) => {
+      map(([orgs, organizationDataOwnership]) => {
         // When there are no organizations return an empty array,
         // resulting in the org filter being hidden
         if (!orgs.length) {
           return [];
         }
 
-        // When there is only one organization and personal ownership policy applies,
+        // When there is only one organization and organization data ownership policy applies,
         // return an empty array, resulting in the org filter being hidden
-        if (orgs.length === 1 && personalOwnershipApplies) {
+        if (orgs.length === 1 && organizationDataOwnership) {
           return [];
         }
 
         const myVaultOrg: ChipSelectOption<Organization>[] = [];
 
-        // Only add "My vault" if personal ownership policy does not apply
-        if (!personalOwnershipApplies) {
+        // Only add "My vault" if organization data ownership policy does not apply
+        if (!organizationDataOwnership) {
           myVaultOrg.push({
             value: { id: MY_VAULT_ID } as Organization,
             label: this.i18nService.t("myVault"),
@@ -431,39 +429,47 @@ export class VaultPopupListFiltersService {
   /**
    * Collection array structured to be directly passed to `ChipSelectComponent`
    */
-  collections$: Observable<ChipSelectOption<CollectionView>[]> = combineLatest([
-    this.filters$.pipe(
-      distinctUntilChanged(
-        (previousFilter, currentFilter) =>
-          // Only update the collections when the organizationId filter changes
-          previousFilter.organization?.id === currentFilter.organization?.id,
+  collections$: Observable<ChipSelectOption<CollectionView>[]> =
+    this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((userId) =>
+        combineLatest([
+          this.filters$.pipe(
+            distinctUntilChanged((prev, curr) => prev.organization?.id === curr.organization?.id),
+          ),
+          this.collectionService.decryptedCollections$,
+          this.organizationService.memberOrganizations$(userId),
+          this.configService.getFeatureFlag$(FeatureFlag.CreateDefaultLocation),
+        ]),
       ),
-    ),
-    this.collectionService.decryptedCollections$,
-  ]).pipe(
-    map(([filters, allCollections]) => {
-      const organizationId = filters.organization?.id ?? null;
-      // When the organization filter is selected, filter out collections that do not belong to the selected organization
-      const collections =
-        organizationId === null
-          ? allCollections
-          : allCollections.filter((c) => c.organizationId === organizationId);
+      map(([filters, allCollections, orgs, defaultVaultEnabled]) => {
+        const orgFilterId = filters.organization?.id ?? null;
+        // When the organization filter is selected, filter out collections that do not belong to the selected organization
+        const filtered = orgFilterId
+          ? allCollections.filter((c) => c.organizationId === orgFilterId)
+          : allCollections;
 
-      return collections;
-    }),
-    switchMap(async (collections) => {
-      const nestedCollections = await this.collectionService.getAllNested(collections);
-
-      return new DynamicTreeNode<CollectionView>({
-        fullList: collections,
-        nestedList: nestedCollections,
-      });
-    }),
-    map((collections) =>
-      collections.nestedList.map((c) => this.convertToChipSelectOption(c, "bwi-collection-shared")),
-    ),
-    shareReplay({ refCount: true, bufferSize: 1 }),
-  );
+        if (!defaultVaultEnabled) {
+          return filtered;
+        }
+        return sortDefaultCollections(filtered, orgs, this.i18nService.collator);
+      }),
+      switchMap((collections) => {
+        return from(this.collectionService.getAllNested(collections)).pipe(
+          map(
+            (nested) =>
+              new DynamicTreeNode<CollectionView>({
+                fullList: collections,
+                nestedList: nested,
+              }),
+          ),
+        );
+      }),
+      map((tree) =>
+        tree.nestedList.map((c) => this.convertToChipSelectOption(c, "bwi-collection-shared")),
+      ),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
 
   /** Organizations, collection, folders filters. */
   allFilters$ = combineLatest([this.organizations$, this.collections$, this.folders$]);
diff --git a/apps/browser/src/vault/popup/settings/appearance-v2.component.spec.ts b/apps/browser/src/vault/popup/settings/appearance-v2.component.spec.ts
index 30715ebaedf..738ec3ae1ff 100644
--- a/apps/browser/src/vault/popup/settings/appearance-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/settings/appearance-v2.component.spec.ts
@@ -23,7 +23,6 @@ import { VaultPopupCopyButtonsService } from "../services/vault-popup-copy-butto
 import { AppearanceV2Component } from "./appearance-v2.component";
 
 @Component({
-  standalone: true,
   selector: "popup-header",
   template: `<ng-content></ng-content>`,
 })
@@ -33,7 +32,6 @@ class MockPopupHeaderComponent {
 }
 
 @Component({
-  standalone: true,
   selector: "popup-page",
   template: `<ng-content></ng-content>`,
 })
diff --git a/apps/browser/src/vault/popup/settings/appearance-v2.component.ts b/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
index 1462a2d7ab4..d998ef846d2 100644
--- a/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
@@ -24,18 +24,15 @@ import {
   SelectModule,
 } from "@bitwarden/components";
 
+import { PopupWidthOption } from "../../../platform/browser/browser-popup-utils";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupCompactModeService } from "../../../platform/popup/layout/popup-compact-mode.service";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
-import {
-  PopupWidthOption,
-  PopupSizeService,
-} from "../../../platform/popup/layout/popup-size.service";
+import { PopupSizeService } from "../../../platform/popup/layout/popup-size.service";
 import { VaultPopupCopyButtonsService } from "../services/vault-popup-copy-buttons.service";
 
 @Component({
-  standalone: true,
   templateUrl: "./appearance-v2.component.html",
   imports: [
     CommonModule,
diff --git a/apps/browser/src/vault/popup/settings/download-bitwarden.component.ts b/apps/browser/src/vault/popup/settings/download-bitwarden.component.ts
index 0287b7d504f..d23d00a1ad7 100644
--- a/apps/browser/src/vault/popup/settings/download-bitwarden.component.ts
+++ b/apps/browser/src/vault/popup/settings/download-bitwarden.component.ts
@@ -15,7 +15,6 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
 
 @Component({
   templateUrl: "download-bitwarden.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/apps/browser/src/vault/popup/settings/folders-v2.component.spec.ts b/apps/browser/src/vault/popup/settings/folders-v2.component.spec.ts
index 6689f5a6c6d..d1450667fa8 100644
--- a/apps/browser/src/vault/popup/settings/folders-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/settings/folders-v2.component.spec.ts
@@ -22,7 +22,6 @@ import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-heade
 import { FoldersV2Component } from "./folders-v2.component";
 
 @Component({
-  standalone: true,
   selector: "popup-header",
   template: `<ng-content></ng-content>`,
 })
@@ -32,7 +31,6 @@ class MockPopupHeaderComponent {
 }
 
 @Component({
-  standalone: true,
   selector: "popup-footer",
   template: `<ng-content></ng-content>`,
 })
diff --git a/apps/browser/src/vault/popup/settings/folders-v2.component.ts b/apps/browser/src/vault/popup/settings/folders-v2.component.ts
index f71374e5305..2264415f4fa 100644
--- a/apps/browser/src/vault/popup/settings/folders-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/folders-v2.component.ts
@@ -22,7 +22,6 @@ import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-heade
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
 @Component({
-  standalone: true,
   templateUrl: "./folders-v2.component.html",
   imports: [
     CommonModule,
diff --git a/apps/browser/src/vault/popup/settings/more-from-bitwarden-page-v2.component.ts b/apps/browser/src/vault/popup/settings/more-from-bitwarden-page-v2.component.ts
index b1269963f70..ec7a73a3bc3 100644
--- a/apps/browser/src/vault/popup/settings/more-from-bitwarden-page-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/more-from-bitwarden-page-v2.component.ts
@@ -19,7 +19,6 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
 
 @Component({
   templateUrl: "more-from-bitwarden-page-v2.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
index 70a2d317230..11ed2674178 100644
--- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
@@ -31,14 +31,7 @@
         ></i>
         <span slot="secondary">{{ cipher.subTitle }}</span>
       </button>
-      <ng-container
-        slot="end"
-        *ngIf="
-          (limitItemDeletion$ | async)
-            ? cipher.permissions.restore
-            : cipher.edit && cipher.viewPassword
-        "
-      >
+      <ng-container slot="end" *ngIf="cipher.permissions.restore">
         <bit-item-action>
           <button
             type="button"
diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
index b4899e12eda..b4f7a87aa08 100644
--- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
+++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
@@ -8,8 +8,6 @@ import { firstValueFrom } from "rxjs";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { CipherId } from "@bitwarden/common/types/guid";
@@ -37,7 +35,6 @@ import { PopupCipherView } from "../../views/popup-cipher.view";
 @Component({
   selector: "app-trash-list-items-container",
   templateUrl: "trash-list-items-container.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     ItemModule,
@@ -71,11 +68,8 @@ export class TrashListItemsContainerComponent {
     private passwordRepromptService: PasswordRepromptService,
     private accountService: AccountService,
     private router: Router,
-    private configService: ConfigService,
   ) {}
 
-  protected limitItemDeletion$ = this.configService.getFeatureFlag$(FeatureFlag.LimitItemDeletion);
-
   /**
    * The tooltip text for the organization icon for ciphers that belong to an organization.
    */
diff --git a/apps/browser/src/vault/popup/settings/trash.component.ts b/apps/browser/src/vault/popup/settings/trash.component.ts
index 61843de31bc..d6e5f899bba 100644
--- a/apps/browser/src/vault/popup/settings/trash.component.ts
+++ b/apps/browser/src/vault/popup/settings/trash.component.ts
@@ -14,7 +14,6 @@ import { TrashListItemsContainerComponent } from "./trash-list-items-container/t
 
 @Component({
   templateUrl: "trash.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html b/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html
index 03dd1182fbb..4e16f58d7f8 100644
--- a/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html
+++ b/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html
@@ -1,5 +1,5 @@
 <popup-page>
-  <popup-header slot="header" [pageTitle]="'vault' | i18n" showBackButton>
+  <popup-header slot="header" [pageTitle]="'settingsVaultOptions' | i18n" showBackButton>
     <ng-container slot="end">
       <app-pop-out></app-pop-out>
     </ng-container>
@@ -14,7 +14,17 @@
     </bit-item>
     <bit-item>
       <button type="button" bit-item-content (click)="import()">
-        {{ "importItems" | i18n }}
+        <div class="tw-flex tw-items-center tw-justify-center tw-gap-2">
+          <p>{{ "importItems" | i18n }}</p>
+          <span
+            *ngIf="emptyVaultImportBadge$ | async"
+            bitBadge
+            variant="notification"
+            [attr.aria-label]="'nudgeBadgeAria' | i18n"
+          >
+            1
+          </span>
+        </div>
         <i slot="end" class="bwi bwi-popout" aria-hidden="true"></i>
       </button>
     </bit-item>
diff --git a/apps/browser/src/vault/popup/settings/vault-settings-v2.component.ts b/apps/browser/src/vault/popup/settings/vault-settings-v2.component.ts
index 049e853d2cd..e7305d57cab 100644
--- a/apps/browser/src/vault/popup/settings/vault-settings-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/vault-settings-v2.component.ts
@@ -1,21 +1,24 @@
 import { CommonModule } from "@angular/common";
-import { Component, OnInit } from "@angular/core";
+import { Component, OnDestroy, OnInit } from "@angular/core";
 import { Router, RouterModule } from "@angular/router";
+import { firstValueFrom, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { ItemModule, ToastOptions, ToastService } from "@bitwarden/components";
+import { BadgeComponent, ItemModule, ToastOptions, ToastService } from "@bitwarden/components";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
 
 @Component({
   templateUrl: "vault-settings-v2.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
@@ -24,22 +27,38 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
     PopupHeaderComponent,
     PopOutComponent,
     ItemModule,
+    BadgeComponent,
   ],
 })
-export class VaultSettingsV2Component implements OnInit {
+export class VaultSettingsV2Component implements OnInit, OnDestroy {
   lastSync = "--";
 
+  protected emptyVaultImportBadge$ = this.accountService.activeAccount$.pipe(
+    getUserId,
+    switchMap((userId) =>
+      this.nudgeService.showNudgeBadge$(NudgeType.VaultSettingsImportNudge, userId),
+    ),
+  );
+
   constructor(
     private router: Router,
     private syncService: SyncService,
     private toastService: ToastService,
     private i18nService: I18nService,
+    private nudgeService: NudgesService,
+    private accountService: AccountService,
   ) {}
 
   async ngOnInit() {
     await this.setLastSync();
   }
 
+  async ngOnDestroy(): Promise<void> {
+    // When a user navigates away from the page, dismiss the empty vault import nudge
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    await this.nudgeService.dismissNudge(NudgeType.VaultSettingsImportNudge, userId);
+  }
+
   async import() {
     await this.router.navigate(["/import"]);
     if (await BrowserApi.isPopupOpen()) {
diff --git a/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts b/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts
index ee0918eab07..4597c004290 100644
--- a/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts
+++ b/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts
@@ -2,7 +2,7 @@ import { mock } from "jest-mock-extended";
 
 import { CipherType } from "@bitwarden/common/vault/enums";
 
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 
 import {
   openViewVaultItemPopout,
diff --git a/apps/browser/src/vault/popup/utils/vault-popout-window.ts b/apps/browser/src/vault/popup/utils/vault-popout-window.ts
index 9e347920eb2..3dae96b6cc7 100644
--- a/apps/browser/src/vault/popup/utils/vault-popout-window.ts
+++ b/apps/browser/src/vault/popup/utils/vault-popout-window.ts
@@ -3,7 +3,7 @@
 import { CipherType } from "@bitwarden/common/vault/enums";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+import BrowserPopupUtils from "../../../platform/browser/browser-popup-utils";
 
 const VaultPopoutType = {
   viewVaultItem: "vault_viewVaultItem",
diff --git a/apps/browser/src/vault/services/fido2-user-verification.service.spec.ts b/apps/browser/src/vault/services/fido2-user-verification.service.spec.ts
index 2e715c15af0..97a22bb2cf3 100644
--- a/apps/browser/src/vault/services/fido2-user-verification.service.spec.ts
+++ b/apps/browser/src/vault/services/fido2-user-verification.service.spec.ts
@@ -8,6 +8,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { SetPinComponent } from "./../../auth/popup/components/set-pin.component";
 import { Fido2UserVerificationService } from "./fido2-user-verification.service";
 
diff --git a/apps/browser/src/vault/services/fido2-user-verification.service.ts b/apps/browser/src/vault/services/fido2-user-verification.service.ts
index 8aaababd065..9bf9be70fc8 100644
--- a/apps/browser/src/vault/services/fido2-user-verification.service.ts
+++ b/apps/browser/src/vault/services/fido2-user-verification.service.ts
@@ -8,6 +8,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { SetPinComponent } from "../../auth/popup/components/set-pin.component";
 
 export class Fido2UserVerificationService {
diff --git a/apps/browser/src/vault/services/vault-filter.service.ts b/apps/browser/src/vault/services/vault-filter.service.ts
index f8b22f2f88f..f33e8e1c130 100644
--- a/apps/browser/src/vault/services/vault-filter.service.ts
+++ b/apps/browser/src/vault/services/vault-filter.service.ts
@@ -6,6 +6,8 @@ import { VaultFilterService as BaseVaultFilterService } from "@bitwarden/angular
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
@@ -25,6 +27,8 @@ export class VaultFilterService extends BaseVaultFilterService {
     policyService: PolicyService,
     stateProvider: StateProvider,
     accountService: AccountService,
+    configService: ConfigService,
+    i18nService: I18nService,
   ) {
     super(
       organizationService,
@@ -34,6 +38,8 @@ export class VaultFilterService extends BaseVaultFilterService {
       policyService,
       stateProvider,
       accountService,
+      configService,
+      i18nService,
     );
     this.vaultFilter.myVaultOnly = false;
     this.vaultFilter.selectedOrganizationId = null;
diff --git a/apps/browser/store/locales/fa/copy.resx b/apps/browser/store/locales/fa/copy.resx
index 2d45e114719..4ea2f5ebc1c 100644
--- a/apps/browser/store/locales/fa/copy.resx
+++ b/apps/browser/store/locales/fa/copy.resx
@@ -172,10 +172,10 @@ Bitwarden فقط کلمات عبور را ایمن نمی‌کند
     <value>در خانه، محل کار، یا در حال حرکت، Bitwarden به سادگی تمامی کلمات عبور، کلیدها، و اطلاعات حساس شما را امن نگاه می‌دارد.</value>
   </data>
   <data name="ScreenshotSync" xml:space="preserve">
-    <value>همگام‌سازی و دسترسی به گاوصندوق خود از دستگاه های مختلف</value>
+    <value>همگام‌سازی و دسترسی به گاوصندوق خود از دستگاه‌های مختلف</value>
   </data>
   <data name="ScreenshotVault" xml:space="preserve">
-    <value>مدیریت تمام اطلاعات ورود و کلمه های عبورتان از یک گاوصندوق امن</value>
+    <value>مدیریت تمام اطلاعات ورود و کلمات عبورتان از یک گاوصندوق امن</value>
   </data>
   <data name="ScreenshotAutofill" xml:space="preserve">
     <value>پرکردن خودکار معتبر ورودی شما به‌صورت سریع برای هر وب‌سایتی که از آن بازدید می‌کنید</value>
@@ -184,7 +184,7 @@ Bitwarden فقط کلمات عبور را ایمن نمی‌کند
     <value>گاوصندوق شما نیز به راحتی از منوی راست کلیک قابل دسترسی است</value>
   </data>
   <data name="ScreenshotPassword" xml:space="preserve">
-    <value>به صورت خودکار کلمه‌های عبور قوی، تصادفی و امن ایجاد کنید</value>
+    <value>به‌صورت خودکار کلمات عبور قوی، تصادفی و امن ایجاد کنید</value>
   </data>
   <data name="ScreenshotEdit" xml:space="preserve">
     <value>اطلاعات شما با استفاده از رمزگذاری AES-256 بیتی ایمن مدیریت می‌شود</value>
diff --git a/apps/browser/store/locales/pl/copy.resx b/apps/browser/store/locales/pl/copy.resx
index 3d5c4f47864..8948e54a298 100644
--- a/apps/browser/store/locales/pl/copy.resx
+++ b/apps/browser/store/locales/pl/copy.resx
@@ -118,58 +118,57 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Name" xml:space="preserve">
-    <value>Menedżer Haseł Bitwarden</value>
+    <value>Menedżer haseł Bitwarden</value>
   </data>
   <data name="Summary" xml:space="preserve">
-    <value>W domu, w pracy lub w ruchu Bitwarden z łatwością zabezpiecza wszystkie twoje hasła, klucze i poufne informacje.</value>
+    <value>W domu, w pracy, lub w ruchu, Bitwarden zabezpiecza wszystkie Twoje hasła, klucze dostępu i poufne informacje.</value>
   </data>
   <data name="Description" xml:space="preserve">
-    <value>Uznany za najlepszego menedżera haseł przez PCMag, WIRED, The Verge, CNET, G2 i wielu innych!
+    <value>Uznany za najlepszy menedżer haseł przez PCMag, WIRED, The Verge, CNET, G2 i nie tylko!
 
-ZABEZPIECZ SWOJE CYFROWE ŻYCIE
-Zabezpiecz swoje cyfrowe życie i chroń przed naruszeniami danych, generując i zapisując unikalne, silne hasła do każdego konta. Przechowuj wszystko w zaszyfrowanym end-to-end magazynie haseł, do którego tylko Ty masz dostęp.
+ZABEZPIECZ CYFROWE ŻYCIE
+Zabezpiecz cyfrowe życie i chroń się przed naruszeniami danych, generując i zapisując unikalne, silne hasła dla każdego konta. Przechowuj wszystko w szyfrowanym sejfie, do którego tylko Ty masz dostęp.
 
-DOSTĘP DO SWOICH DANYCH W KAŻDYM MIEJSCU, W DOWOLNYM CZASIE, NA KAŻDYM URZĄDZENIU
-Z łatwością zarządzaj, przechowuj, zabezpieczaj i udostępniaj nieograniczoną liczbę haseł na nieograniczonej liczbie urządzeń.
+DOSTĘP DO DANYCH W KAŻDYM MIEJSCU I O KAŻDEJ PORZE, NA KAŻDYM URZĄDZENIU
+Łatwe zarządzanie, przechowywanie, zabezpieczanie i udostępnianie nieograniczonej liczby haseł na dowolnej liczbie urządzeń
 
-KAŻDY POWINIEN POSIADAĆ NARZĘDZIA ABY ZACHOWAĆ BEZPIECZEŃSTWO W INTERNECIE
-Korzystaj z Bitwarden za darmo, bez reklam i sprzedawania Twoich danych. Bitwarden wierzy, że każdy powinien mieć możliwość zachowania bezpieczeństwa w Internecie. Plany premium oferują dostęp do zaawansowanych funkcji.
+KAŻDY POWINIEN MIEĆ NARZĘDZIA, KTÓRE ZAPEWNIĄ BEZPIECZEŃSTWO ONLINE
+Korzystaj z Bitwarden za darmo, bez reklam i bez sprzedawania Twoich danych. Bitwarden wierzy, że każdy powinien mieć możliwość zachowania bezpieczeństwa w sieci. Plany premium oferują dostęp do zaawansowanych funkcji.
 
-WZMOCNIJ SWOJE ZESPOŁY DZIĘKI BITWARDEN
-Plany dla Zespołów i Enterprise oferują profesjonalne funkcje biznesowe. Na przykład obejmują integrację z SSO, własny hosting, integrację katalogów i udostępnianie SCIM, zasady globalne, dostęp do API, dzienniki zdarzeń i inne.
+WZMOCNIJ SWOJE ZESPOŁY Z BITWARDEN
+Plany dla zespołów i przedsiębiorstw zawierają profesjonalne funkcje biznesowe, takie jak logowanie jednokrotne, samodzielne hostowanie, integrację katalogów, udostępnianie SCIM, globalne zasady, dostęp do API, logi zdarzeń i wiele innych.
 
-Użyj Bitwarden, aby zabezpieczyć swoich pracowników i udostępniać poufne informacje współpracownikom.
+Skorzystaj z Bitwarden, aby zabezpieczyć swoich pracowników i udostępniać poufne informacje współpracownikom.
 
 
-Więcej powodów, aby wybrać Bitwarden:
+Więcej powodów, dla których warto wybrać Bitwarden:
 
-Szyfrowanie na światowym poziomie
-Hasła są chronione za pomocą zaawansowanego, kompleksowego szyfrowania (AES-256-bitowy, solony hashtag i PBKDF2 SHA-256), dzięki czemu Twoje dane pozostają bezpieczne i prywatne.
+Światowej klasy szyfrowanie
+Hasła są chronione za pomocą zaawansowanego szyfrowania end-to-end (AES-256 bit z solą i PBKDF2 SHA-256), dzięki czemu dane pozostają bezpieczne i prywatne.
 
 Audyty stron trzecich
-Bitwarden regularnie przeprowadza kompleksowe audyty bezpieczeństwa stron trzecich we współpracy ze znanymi firmami security. Te coroczne audyty obejmują ocenę kodu źródłowego i testy penetracyjne adresów IP Bitwarden, serwerów i aplikacji internetowych.
+Bitwarden regularnie przeprowadza kompleksowe audyty bezpieczeństwa ze znanymi firmami. Te coroczne audyty obejmują ocenę kodu źródłowego i testy penetracyjne adresów IP, serwerów i aplikacji internetowych Bitwarden.
 
-Zaawansowane 2FA
-Zabezpiecz swój login za pomocą zewnętrznego narzędzia uwierzytelniającego, kodów przesłanych pocztą elektroniczną lub poświadczeń FIDO2 WebAuthn, takich jak sprzętowy klucz bezpieczeństwa lub hasło.
+Zaawansowane logowanie dwustopniowe
+Zabezpiecz swoje logowanie za pomocą uwierzytelniacza innej firmy, kodów wysyłanych pocztą e-mail lub danych uwierzytelniających FIDO2 WebAuthn, takich jak sprzętowy klucz bezpieczeństwa lub klucz dostępu.
 
-Bitwarden Wyślij
-Przesyłaj dane bezpośrednio do innych, zachowując kompleksowe szyfrowane bezpieczeństwo i ograniczając ryzyko.
+Bitwarden Send
+Przesyłaj dane bezpośrednio do innych, zachowując bezpieczeństwo szyfrowania end-to-end i ograniczając ekspozycję.
 
 Wbudowany generator
-Twórz długie, złożone i różne hasła oraz unikalne nazwy użytkowników dla każdej odwiedzanej witryny. Zintegruj się z dostawcami aliasów e-mail, aby uzyskać dodatkową prywatność.
+Twórz długie, złożone i unikalne hasła oraz nazwy użytkowników dla każdej strony. Integracja z dostawcami aliasów zapewnia dodatkową prywatność.
 
-Tłumaczenia globalne
-Istnieją tłumaczenia Bitwarden na ponad 60 języków, tłumaczone przez globalną społeczność za pośrednictwem Crowdin.
+Globalnie przetłumaczony
+Bitwarden jest dostępny w ponad 60 językach. Jest przetłumaczony przez globalną społeczność za pośrednictwem Crowdin.
 
 Aplikacje wieloplatformowe
-Zabezpiecz i udostępniaj poufne dane w swoim Sejfie Bitwarden z dowolnej przeglądarki, urządzenia mobilnego lub systemu operacyjnego na komputerze stacjonarnym i nie tylko.
+Zabezpieczaj i udostępniaj poufne dane w sejfie Bitwarden z dowolnej przeglądarki, z dowolnego urządzenia mobilnego, stacjonarnego i nie tylko.
 
-Bitwarden zabezpiecza nie tylko hasła
-Rozwiązania do zarządzania danymi zaszyfrownaymi end-to-end od firmy Bitwarden umożliwiają organizacjom zabezpieczanie wszystkiego, w tym tajemnic programistów i kluczy dostępu. Odwiedź Bitwarden.com, aby dowiedzieć się więcej o Mendżerze Sekretów Bitwarden i Bitwarden Passwordless.dev!
-</value>
+Bitwarden zabezpiecza więcej niż tylko hasła
+Kompleksowe szyfrowane rozwiązania do zarządzania poświadczeniami od Bitwarden umożliwiają organizacjom zabezpieczenie wszystkiego, w tym sekretów programistów i kluczy dostępu. Odwiedź Bitwarden.com, aby dowiedzieć się więcej o Bitwarden Secrets Manager i Bitwarden Passwordless.dev!</value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
-    <value>W domu, w pracy, lub w ruchu, Bitwarden z łatwością zabezpiecza wszystkie Twoje hasła, passkeys i poufne informacje.</value>
+    <value>W domu, w pracy, lub w ruchu, Bitwarden zabezpiecza wszystkie Twoje hasła, klucze dostępu i poufne informacje.</value>
   </data>
   <data name="ScreenshotSync" xml:space="preserve">
     <value>Synchronizacja i dostęp do sejfu z różnych urządzeń</value>
@@ -178,15 +177,15 @@ Rozwiązania do zarządzania danymi zaszyfrownaymi end-to-end od firmy Bitwarden
     <value>Przechowuj wszystkie dane logowania i hasła w bezpiecznym sejfie</value>
   </data>
   <data name="ScreenshotAutofill" xml:space="preserve">
-    <value>Szybko, automatycznie uzupełnij dane logowania na każdej odwiedzanej stronie</value>
+    <value>Szybkie uzupełnianie danych logowania na dowolnej stronie internetowej</value>
   </data>
   <data name="ScreenshotMenu" xml:space="preserve">
-    <value>Twój sejf jest także łatwo dostępny z menu kontekstowego</value>
+    <value>Sejf jest również dostępny z menu po kliknięciu prawym przyciskiem myszy</value>
   </data>
   <data name="ScreenshotPassword" xml:space="preserve">
-    <value>Automatycznie wygeneruj silne, losowe i bezpieczne hasło</value>
+    <value>Automatycznie generuj silne, losowe i bezpieczne hasła</value>
   </data>
   <data name="ScreenshotEdit" xml:space="preserve">
-    <value>Twoje dane są zabezpieczone z wykorzystaniem szyfrowania AES-256-bit</value>
+    <value>Twoje dane są zabezpieczone szyfrowaniem AES-256-bit</value>
   </data>
 </root>
diff --git a/apps/browser/store/locales/sv/copy.resx b/apps/browser/store/locales/sv/copy.resx
index af48fec33bf..d03c7fc808d 100644
--- a/apps/browser/store/locales/sv/copy.resx
+++ b/apps/browser/store/locales/sv/copy.resx
@@ -124,48 +124,48 @@
     <value>Hemma, på jobbet eller på resande fot säkrar Bitwarden enkelt alla dina lösenord, passkeys, och känslig information.</value>
   </data>
   <data name="Description" xml:space="preserve">
-    <value>Recognized as the best password manager by PCMag, WIRED, The Verge, CNET, G2, and more!
+    <value>Erkänd som den bästa lösenordshanteraren av PCMag, WIRED, The Verge, CNET, G2 och många fler!
 
-SECURE YOUR DIGITAL LIFE
-Secure your digital life and protect against data breaches by generating and saving unique, strong passwords for every account. Maintain everything in an end-to-end encrypted password vault that only you can access.
+SÄKRA DITT DIGITALA LIV
+Säkra ditt digitala liv och skydda dig mot dataintrång genom att skapa och spara unika, starka lösenord för varje konto. Förvara allt i ett krypterat lösenordsvalv som bara du har åtkomst till.
 
-ACCESS YOUR DATA, ANYWHERE, ANYTIME, ON ANY DEVICE
-Easily manage, store, secure, and share unlimited passwords across unlimited devices without restrictions.
+FÅ ÅTKOMST TILL DINA DATA, VAR SOM HELST, NÄR SOM HELST, PÅ VILKEN ENHET SOM HELST
+Hantera, lagra, säkra och dela obegränsat antal lösenord på obegränsat antal enheter utan begränsningar.
 
-EVERYONE SHOULD HAVE THE TOOLS TO STAY SAFE ONLINE
-Utilize Bitwarden for free with no ads or selling data. Bitwarden believes everyone should have the ability to stay safe online. Premium plans offer access to advanced features.
+ALLA BÖR HA VERKTYGEN FÖR ATT VARA SÄKRA ONLINE
+Använd Bitwarden gratis utan annonser eller försäljning av data. Bitwarden anser att alla bör ha möjlighet att vara säkra online. Premiumplaner ger tillgång till avancerade funktioner.
 
-EMPOWER YOUR TEAMS WITH BITWARDEN
-Plans for Teams and Enterprise come with professional business features. Some examples include SSO integration, self-hosting, directory integration and SCIM provisioning, global policies, API access, event logs, and more.
+STÄRK DINA TEAM MED BITWARDEN
+Planerna för Teams och Enterprise har professionella affärsfunktioner. Några exempel är SSO-integration, självhosting, katalogintegration och SCIM-provisionering, globala policyer, API-åtkomst, händelseloggar och mycket mer.
 
-Use Bitwarden to secure your workforce and share sensitive information with colleagues.
+Använd Bitwarden för att säkra din personalstyrka och dela känslig information med kollegor.
 
 
-More reasons to choose Bitwarden:
+Fler anledningar att välja Bitwarden:
 
-World-Class Encryption
-Passwords are protected with advanced end-to-end encryption (AES-256 bit, salted hashtag, and PBKDF2 SHA-256) so your data stays secure and private.
+Kryptering i världsklass
+Lösenord skyddas med avancerad end-to-end-kryptering (AES-256 bit, salted hashtag och PBKDF2 SHA-256) så att dina data förblir säkra och privata.
 
-3rd-party Audits
-Bitwarden regularly conducts comprehensive third-party security audits with notable security firms. These annual audits include source code assessments and penetration testing across Bitwarden IPs, servers, and web applications.
+revisioner från tredje part
+Bitwarden genomför regelbundet omfattande tredjeparts säkerhetsrevisioner med välkända säkerhetsföretag. Dessa årliga revisioner inkluderar källkodsbedömningar och penetrationstestning över Bitwardens IP-adresser, servrar och webbapplikationer.
 
-Advanced 2FA
-Secure your login with a third-party authenticator, emailed codes, or FIDO2 WebAuthn credentials such as a hardware security key or passkey.
+Avancerad 2FA
+Säkra din inloggning med en tredjepartsautentisering, e-postkoder eller FIDO2 WebAuthn-autentiseringsuppgifter som en säkerhetsnyckel eller passnyckel för hårdvara.
 
-Bitwarden Send
-Transmit data directly to others while maintaining end-to-end encrypted security and limiting exposure.
+Bitwarden Skicka
+Överför data direkt till andra samtidigt som du upprätthåller krypterad säkerhet från början till slut och begränsar exponeringen.
 
-Built-in Generator
-Create long, complex, and distinct passwords and unique usernames for every site you visit. Integrate with email alias providers for additional privacy.
+Inbyggd generator
+Skapa långa, komplexa och distinkta lösenord och unika användarnamn för varje webbplats du besöker. Integrera med leverantörer av e-postalias för ytterligare integritet.
 
-Global Translations
-Bitwarden translations exist for more than 60 languages, translated by the global community though Crowdin.
+Globala översättningar
+Bitwarden finns översatt till mer än 60 språk, översatt av den globala gemenskapen genom Crowdin.
 
-Cross-Platform Applications
-Secure and share sensitive data within your Bitwarden Vault from any browser, mobile device, or desktop OS, and more.
+Applikationer för flera plattformar
+Säkra och dela känslig data i ditt Bitwarden Vault från vilken webbläsare, mobil enhet eller stationärt operativsystem som helst, och mycket mer.
 
-Bitwarden secures more than just passwords
-End-to-end encrypted credential management solutions from Bitwarden empower organizations to secure everything, including developer secrets and passkey experiences. Visit Bitwarden.com to learn more about Bitwarden Secrets Manager and Bitwarden Passwordless.dev!
+Bitwarden säkrar mer än bara lösenord
+End-to-end krypterade lösningar för hantering av referenser från Bitwarden gör det möjligt för organisationer att säkra allt, inklusive utvecklarhemligheter och passkey-upplevelser. Besök Bitwarden.com för att lära dig mer om Bitwarden Secrets Manager och Bitwarden Passwordless.dev!
 </value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
diff --git a/apps/browser/store/locales/th/copy.resx b/apps/browser/store/locales/th/copy.resx
index f784b1884b4..f6b0c4b22ab 100644
--- a/apps/browser/store/locales/th/copy.resx
+++ b/apps/browser/store/locales/th/copy.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Name" xml:space="preserve">
-    <value>Bitwarden Password Manager</value>
+    <value>Bitwarden - จัดการรหัสผ่าน</value>
   </data>
   <data name="Summary" xml:space="preserve">
     <value>At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information.</value>
diff --git a/apps/browser/store/locales/tr/copy.resx b/apps/browser/store/locales/tr/copy.resx
index fa53d09ee17..6afe10ff32a 100644
--- a/apps/browser/store/locales/tr/copy.resx
+++ b/apps/browser/store/locales/tr/copy.resx
@@ -124,49 +124,47 @@
     <value>İster evde ister işte veya yolda olun; Bitwarden tüm parolalarınızı, geçiş anahtarlarınızı ve hassas bilgilerinizi güvenle saklar.</value>
   </data>
   <data name="Description" xml:space="preserve">
-    <value>Recognized as the best password manager by PCMag, WIRED, The Verge, CNET, G2, and more!
+    <value>PCMag, WIRED, The Verge, CNET, G2 ve daha fazlası tarafından en iyi şifre yöneticisi olarak kabul edildi!
 
-SECURE YOUR DIGITAL LIFE
-Secure your digital life and protect against data breaches by generating and saving unique, strong passwords for every account. Maintain everything in an end-to-end encrypted password vault that only you can access.
+DİJİTAL HAYATINIZI GÜVENLİ HALE GETİRİN
+Her hesap için benzersiz, güçlü şifreler oluşturup kaydederek dijital hayatınızı güvence altına alın ve veri ihlallerine karşı koruyun. Her şeyi yalnızca sizin erişebileceğiniz uçtan uca şifrelenmiş bir şifre kasasında saklayın.
 
-ACCESS YOUR DATA, ANYWHERE, ANYTIME, ON ANY DEVICE
-Easily manage, store, secure, and share unlimited passwords across unlimited devices without restrictions.
+VERİLERİNİZE HER YERDEN, HER ZAMAN, HER CİHAZDAN ERİŞİN
+Sınırsız sayıda cihazda sınırsız sayıda şifreyi kolayca yönetin, saklayın, koruyun ve paylaşın.
 
-EVERYONE SHOULD HAVE THE TOOLS TO STAY SAFE ONLINE
-Utilize Bitwarden for free with no ads or selling data. Bitwarden believes everyone should have the ability to stay safe online. Premium plans offer access to advanced features.
+HERKESİN ÇEVRİMİÇİ GÜVENLİĞİ SAĞLAYACAK ARAÇLARA SAHİP OLMASI GEREKİR
+Bitwarden'ı reklamlar veya veri satışı olmadan ücretsiz olarak kullanın. Bitwarden, herkesin çevrimiçi güvenliğini sağlayabilmesi gerektiğine inanır. Premium planlar, gelişmiş özelliklere erişim sunar.
 
-EMPOWER YOUR TEAMS WITH BITWARDEN
-Plans for Teams and Enterprise come with professional business features. Some examples include SSO integration, self-hosting, directory integration and SCIM provisioning, global policies, API access, event logs, and more.
+BITWARDEN İLE EKİPLERİNİZE GÜÇ KATIN
+Takımlar ve Kurumsal planlar, profesyonel iş özellikleri ile birlikte gelir. Bazı örnekler arasında SSO entegrasyonu, kendi kendine barındırma, dizin entegrasyonu ve SCIM provizyonu, global politikalar, API erişimi, olay günlükleri ve daha fazlası bulunur.
 
-Use Bitwarden to secure your workforce and share sensitive information with colleagues.
+Bitwarden'ı kullanarak çalışanlarınızı güvence altına alın ve hassas bilgileri iş arkadaşlarınızla paylaşın.
 
+Bitwarden'ı seçmek için daha fazla neden:
 
-More reasons to choose Bitwarden:
+Dünya Standartlarında Şifreleme
+Şifreler, gelişmiş uçtan uca şifreleme (AES-256 bit, tuzlu hashtag ve PBKDF2 SHA-256) ile korunur, böylece verileriniz güvenli ve gizli kalır.
 
-World-Class Encryption
-Passwords are protected with advanced end-to-end encryption (AES-256 bit, salted hashtag, and PBKDF2 SHA-256) so your data stays secure and private.
+Üçüncü Taraf Denetimleri
+Bitwarden, tanınmış güvenlik firmalarıyla düzenli olarak kapsamlı üçüncü taraf güvenlik denetimleri gerçekleştirir. Bu yıllık denetimler, Bitwarden IP'leri, sunucuları ve web uygulamaları genelinde kaynak kodu değerlendirmeleri ve sızma testlerini içerir.
 
-3rd-party Audits
-Bitwarden regularly conducts comprehensive third-party security audits with notable security firms. These annual audits include source code assessments and penetration testing across Bitwarden IPs, servers, and web applications.
-
-Advanced 2FA
-Secure your login with a third-party authenticator, emailed codes, or FIDO2 WebAuthn credentials such as a hardware security key or passkey.
+Gelişmiş 2FA
+Üçüncü taraf kimlik doğrulayıcı, e-posta ile gönderilen kodlar veya donanım güvenlik anahtarı veya geçiş anahtarı gibi FIDO2 WebAuthn kimlik bilgileri ile girişinizi güvenli hale getirin.
 
 Bitwarden Send
-Transmit data directly to others while maintaining end-to-end encrypted security and limiting exposure.
+Uçtan uca şifreli güvenliği koruyarak ve maruz kalmayı sınırlayarak verileri doğrudan başkalarına aktarın.
 
-Built-in Generator
-Create long, complex, and distinct passwords and unique usernames for every site you visit. Integrate with email alias providers for additional privacy.
+Yerleşik Oluşturucu
+Ziyaret ettiğiniz her site için uzun, karmaşık ve farklı şifreler ve benzersiz kullanıcı adları oluşturun. Ek gizlilik için e-posta takma ad sağlayıcılarıyla entegre edin.
 
-Global Translations
-Bitwarden translations exist for more than 60 languages, translated by the global community though Crowdin.
+Küresel Çeviriler
+Bitwarden çevirileri, Crowdin aracılığıyla küresel topluluk tarafından 60'tan fazla dile çevrilmiştir.
 
-Cross-Platform Applications
-Secure and share sensitive data within your Bitwarden Vault from any browser, mobile device, or desktop OS, and more.
+Çapraz Platform Uygulamaları
+Bitwarden Vault'unuzdaki hassas verileri herhangi bir tarayıcı, mobil cihaz, masaüstü işletim sistemi ve daha fazlasından güvenli bir şekilde paylaşın.
 
-Bitwarden secures more than just passwords
-End-to-end encrypted credential management solutions from Bitwarden empower organizations to secure everything, including developer secrets and passkey experiences. Visit Bitwarden.com to learn more about Bitwarden Secrets Manager and Bitwarden Passwordless.dev!
-</value>
+Bitwarden, şifrelerden daha fazlasını güvence altına alır
+Bitwarden'ın uçtan uca şifrelenmiş kimlik bilgisi yönetimi çözümleri, kuruluşların geliştirici sırları ve anahtar deneyimleri dahil her şeyi güvence altına almasını sağlar. Bitwarden Secrets Manager ve Bitwarden Passwordless.dev hakkında daha fazla bilgi edinmek için Bitwarden.com adresini ziyaret edin!</value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
     <value>İster evde ister işte veya yolda olun; Bitwarden tüm parolalarınızı, geçiş anahtarlarınızı ve hassas bilgilerinizi güvenle saklar.</value>
diff --git a/apps/browser/store/locales/vi/copy.resx b/apps/browser/store/locales/vi/copy.resx
index c262c9bffd7..dd3e258a7c7 100644
--- a/apps/browser/store/locales/vi/copy.resx
+++ b/apps/browser/store/locales/vi/copy.resx
@@ -121,55 +121,55 @@
     <value>Trình quản lý mật khẩu Bitwarden</value>
   </data>
   <data name="Summary" xml:space="preserve">
-    <value>Ở nhà, trên cơ quan, hay trên đường đi, Bitwarden có thể dễ dàng bảo về tất cả những mật khẩu, mã khoá, và thông tin cá nhân của bạn.</value>
+    <value>Ở nhà, ở cơ quan hay khi di chuyển, Bitwarden sẽ bảo vệ tất cả mật khẩu, mã khóa và thông tin cá nhân của bạn.</value>
   </data>
   <data name="Description" xml:space="preserve">
-    <value>Recognized as the best password manager by PCMag, WIRED, The Verge, CNET, G2, and more!
+    <value>Được công nhận là trình quản lý mật khẩu tốt nhất bởi PCMag, WIRED, The Verge, CNET, G2 và nhiều trang web khác! 
 
-SECURE YOUR DIGITAL LIFE
-Secure your digital life and protect against data breaches by generating and saving unique, strong passwords for every account. Maintain everything in an end-to-end encrypted password vault that only you can access.
+BẢO VỆ CUỘC SỐNG SỐ CỦA BẠN 
+Bảo vệ cuộc sống số của bạn và ngăn chặn rò rỉ dữ liệu bằng cách tạo và lưu trữ mật khẩu duy nhất, mạnh mẽ cho mỗi tài khoản. Lưu trữ mọi thứ trong kho mật khẩu được mã hóa end-to-end mà chỉ bạn có thể truy cập.
 
-ACCESS YOUR DATA, ANYWHERE, ANYTIME, ON ANY DEVICE
-Easily manage, store, secure, and share unlimited passwords across unlimited devices without restrictions.
+TRUY CẬP DỮ LIỆU CỦA BẠN BẤT CỨ ĐÂU, BẤT CỨ KHI NÀO, TRÊN BẤT CỨ THIẾT BỊ NÀO
+Quản lý, lưu trữ, bảo vệ và chia sẻ mật khẩu không giới hạn trên mọi thiết bị mà không có bất kỳ hạn chế nào.
 
-EVERYONE SHOULD HAVE THE TOOLS TO STAY SAFE ONLINE
-Utilize Bitwarden for free with no ads or selling data. Bitwarden believes everyone should have the ability to stay safe online. Premium plans offer access to advanced features.
+MỌI NGƯỜI ĐỀU NÊN CÓ CÔNG CỤ ĐỂ BẢO VỆ BẢN THÂN TRỰC TUYẾN
+Sử dụng Bitwarden miễn phí mà không có quảng cáo hoặc bán dữ liệu. Bitwarden tin rằng mọi người đều nên có khả năng bảo vệ an toàn khi trực tuyến. Các gói cao cấp cung cấp quyền truy cập vào các tính năng nâng cao.
 
-EMPOWER YOUR TEAMS WITH BITWARDEN
-Plans for Teams and Enterprise come with professional business features. Some examples include SSO integration, self-hosting, directory integration and SCIM provisioning, global policies, API access, event logs, and more.
+TĂNG CƯỜNG KHẢ NĂNG CHO ĐỘI NGŨ CỦA BẠN VỚI BITWARDEN
+Các gói dành cho Đội ngũ và Doanh nghiệp đi kèm với các tính năng chuyên nghiệp cho doanh nghiệp. Một số ví dụ bao gồm tích hợp Đăng nhập một lần, tự lưu trữ, tích hợp danh bạ và cấp phép SCIM, chính sách toàn cầu, truy cập API, nhật ký sự kiện và nhiều hơn nữa.
 
-Use Bitwarden to secure your workforce and share sensitive information with colleagues.
+Sử dụng Bitwarden để bảo vệ nhân viên của bạn và chia sẻ thông tin nhạy cảm với đồng nghiệp.
 
 
-More reasons to choose Bitwarden:
+Thêm những lý do để chọn Bitwarden:
 
-World-Class Encryption
-Passwords are protected with advanced end-to-end encryption (AES-256 bit, salted hashtag, and PBKDF2 SHA-256) so your data stays secure and private.
+Mã hóa hàng đầu thế giới
+Mật khẩu được bảo vệ bằng mã hóa end-to-end tiên tiến (AES-256 bit, salted hashtag và PBKDF2 SHA-256) để dữ liệu của bạn luôn an toàn và riêng tư.
 
-3rd-party Audits
-Bitwarden regularly conducts comprehensive third-party security audits with notable security firms. These annual audits include source code assessments and penetration testing across Bitwarden IPs, servers, and web applications.
+Kiểm toán bảo mật bởi bên thứ ba
+Bitwarden thường xuyên thực hiện các cuộc kiểm toán bảo mật toàn diện bởi các công ty bảo mật uy tín. Các cuộc kiểm toán hàng năm này bao gồm đánh giá mã nguồn và thử nghiệm xâm nhập trên các tài sản trí tuệ (IP), máy chủ và ứng dụng web của Bitwarden.
 
-Advanced 2FA
-Secure your login with a third-party authenticator, emailed codes, or FIDO2 WebAuthn credentials such as a hardware security key or passkey.
+Xác thực hai yếu tố (2FA) nâng cao
+Bảo vệ đăng nhập của bạn bằng ứng dụng xác thực bên thứ ba, mã xác thực qua email hoặc thông tin xác thực FIDO2 WebAuthn như khóa bảo mật phần cứng hoặc mã khóa.
 
 Bitwarden Send
-Transmit data directly to others while maintaining end-to-end encrypted security and limiting exposure.
+Chuyển dữ liệu trực tiếp cho người khác trong khi duy trì bảo mật mã hóa đầu cuối và hạn chế rủi ro lộ thông tin.
 
-Built-in Generator
-Create long, complex, and distinct passwords and unique usernames for every site you visit. Integrate with email alias providers for additional privacy.
+Trình tạo mật khẩu tích hợp
+Tạo mật khẩu dài, phức tạp và duy nhất cùng tên người dùng riêng biệt cho mỗi trang web bạn truy cập. Tích hợp với các nhà cung cấp địa chỉ email ẩn danh để tăng cường bảo mật.
 
-Global Translations
-Bitwarden translations exist for more than 60 languages, translated by the global community though Crowdin.
+Dịch thuật toàn cầu
+Bitwarden được bản địa hoa tới hơn 60 ngôn ngữ, được thực hiện bởi cộng đồng toàn cầu thông qua Crowdin.
 
-Cross-Platform Applications
-Secure and share sensitive data within your Bitwarden Vault from any browser, mobile device, or desktop OS, and more.
+Ứng dụng đa nền tảng
+Bảo mật và chia sẻ dữ liệu nhạy cảm trong kho Bitwarden của bạn từ bất kỳ trình duyệt, thiết bị di động hoặc hệ điều hành máy tính nào và nhiều hơn nữa.
 
-Bitwarden secures more than just passwords
-End-to-end encrypted credential management solutions from Bitwarden empower organizations to secure everything, including developer secrets and passkey experiences. Visit Bitwarden.com to learn more about Bitwarden Secrets Manager and Bitwarden Passwordless.dev!
+Bitwarden bảo mật hơn cả mật khẩu
+Giải pháp quản lý thông tin đăng nhập được mã hóa đầu cuối của Bitwarden giúp các tổ chức bảo mật mọi thứ, bao gồm bí mật của nhà phát triển và trải nghiệm khóa truy cập. Truy cập Bitwarden.com để tìm hiểu thêm về Trình bảo vệ Bí mật Bitwarden và Bitwarden Passwordless.dev!
 </value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
-    <value>At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information.</value>
+    <value>Ở nhà, ở cơ quan hay khi di chuyển, Bitwarden sẽ bảo vệ tất cả mật khẩu, mã khóa và thông tin cá nhân của bạn.</value>
   </data>
   <data name="ScreenshotSync" xml:space="preserve">
     <value>Đồng bộ hóa và truy cập vào kho lưu trữ của bạn từ nhiều thiết bị</value>
diff --git a/apps/browser/store/locales/zh_TW/copy.resx b/apps/browser/store/locales/zh_TW/copy.resx
index 3005d6bdcba..eaac9ee8691 100644
--- a/apps/browser/store/locales/zh_TW/copy.resx
+++ b/apps/browser/store/locales/zh_TW/copy.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Name" xml:space="preserve">
-    <value>Bitwarden - 免費密碼管理工具</value>
+    <value>Bitwarden 密碼管理工具</value>
   </data>
   <data name="Summary" xml:space="preserve">
     <value>無論在家、在辦公或在途中，Bitwarden 都能輕易的保護你的密碼、登入金鑰和敏感資訊。</value>
diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json
index e24985f58af..a554120bd1e 100644
--- a/apps/browser/tsconfig.json
+++ b/apps/browser/tsconfig.json
@@ -1,55 +1,5 @@
 {
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "allowSyntheticDefaultImports": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "module": "ES2020",
-    "target": "ES2016",
-    "allowJs": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "lib": ["ES2021.String"],
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
-      "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
-      "@bitwarden/billing": ["../../libs/billing/src"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/components": ["../../libs/components/src"],
-      "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer-core": ["../../libs/importer/src"],
-      "@bitwarden/importer-ui": ["../../libs/importer/src/components"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
-      "@bitwarden/platform": ["../../libs/platform/src"],
-      "@bitwarden/platform/*": ["../../libs/platform/src/*"],
-      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
-      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
-      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["../../libs/vault/src"]
-    },
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ],
-    "useDefineForClassFields": false
-  },
-  "angularCompilerOptions": {
-    "strictTemplates": true
-  },
+  "extends": "../../tsconfig.base",
   "include": [
     "src",
     "../../libs/common/src/autofill/constants",
diff --git a/apps/browser/tsconfig.spec.json b/apps/browser/tsconfig.spec.json
index 79b5f5bc4b6..eedff91d23b 100644
--- a/apps/browser/tsconfig.spec.json
+++ b/apps/browser/tsconfig.spec.json
@@ -1,7 +1,9 @@
 {
   "extends": "./tsconfig.json",
-  "files": ["./test.setup.ts"],
   "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false,
     "esModuleInterop": true
-  }
+  },
+  "files": ["./test.setup.ts"]
 }
diff --git a/apps/browser/webpack.config.js b/apps/browser/webpack.config.js
index 6d9113be7ed..4aab0beefbb 100644
--- a/apps/browser/webpack.config.js
+++ b/apps/browser/webpack.config.js
@@ -8,6 +8,7 @@ const TerserPlugin = require("terser-webpack-plugin");
 const { TsconfigPathsPlugin } = require("tsconfig-paths-webpack-plugin");
 const configurator = require("./config/config");
 const manifest = require("./webpack/manifest");
+const AngularCheckPlugin = require("./webpack/angular-check");
 
 if (process.env.NODE_ENV == null) {
   process.env.NODE_ENV = "development";
@@ -30,7 +31,7 @@ const moduleRules = [
     test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
     exclude: /loading.svg/,
     generator: {
-      filename: "popup/fonts/[name][ext]",
+      filename: "popup/fonts/[name].[contenthash][ext]",
     },
     type: "asset/resource",
   },
@@ -324,8 +325,6 @@ if (manifestVersion == 2) {
   // Manifest V2 background pages can be run through the regular build pipeline.
   // Since it's a standard webpage.
   mainConfig.entry.background = "./src/platform/background.ts";
-  mainConfig.entry["content/fido2-page-script-append-mv2"] =
-    "./src/autofill/fido2/content/fido2-page-script-append.mv2.ts";
   mainConfig.entry["content/fido2-page-script-delay-append-mv2"] =
     "./src/autofill/fido2/content/fido2-page-script-delay-append.mv2.ts";
 
@@ -406,7 +405,7 @@ if (manifestVersion == 2) {
       cache: true,
     },
     dependencies: ["main"],
-    plugins: [...requiredPlugins],
+    plugins: [...requiredPlugins /*new AngularCheckPlugin()*/], // TODO (PM-22630): Re-enable this plugin when angular is removed from the background script.
   };
 
   // Safari's desktop build process requires a background.html and vendor.js file to exist
diff --git a/apps/browser/webpack/angular-check.js b/apps/browser/webpack/angular-check.js
new file mode 100644
index 00000000000..c14708617d1
--- /dev/null
+++ b/apps/browser/webpack/angular-check.js
@@ -0,0 +1,21 @@
+/**
+ * Webpack plugin that errors if it detects angular imports.
+ */
+class AngularCheckPlugin {
+  apply(compiler) {
+    compiler.hooks.assetEmitted.tap("AngularCheckPlugin", (file, info) => {
+      // Ensure we only check outputted JavaScript files
+      if (!file.endsWith(".js")) {
+        return;
+      }
+
+      if (info.content.includes("@angular")) {
+        throw new Error(
+          `Angular detected in ${file}. Please ensure angular is not imported to non popup scripts.`,
+        );
+      }
+    });
+  }
+}
+
+module.exports = AngularCheckPlugin;
diff --git a/apps/cli/.nvmrc b/apps/cli/.nvmrc
new file mode 100644
index 00000000000..9a2a0e219c9
--- /dev/null
+++ b/apps/cli/.nvmrc
@@ -0,0 +1 @@
+v20
diff --git a/apps/cli/entitlements.plist b/apps/cli/entitlements.plist
new file mode 100644
index 00000000000..f00fbb59495
--- /dev/null
+++ b/apps/cli/entitlements.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+</dict>
+</plist>
diff --git a/apps/cli/jest.config.js b/apps/cli/jest.config.js
index e0a5b9ec9cc..c96395944b5 100644
--- a/apps/cli/jest.config.js
+++ b/apps/cli/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.ts");
 
@@ -13,8 +13,14 @@ module.exports = {
   moduleNameMapper: {
     "@bitwarden/common/platform/services/sdk/default-sdk-client-factory":
       "<rootDir>/../../libs/common/spec/jest-sdk-client-factory",
-    ...pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-      prefix: "<rootDir>/",
-    }),
+    ...pathsToModuleNameMapper(
+      {
+        "@bitwarden/common/spec": ["libs/common/spec"],
+        ...(compilerOptions?.paths || {}),
+      },
+      {
+        prefix: "<rootDir>/../../",
+      },
+    ),
   },
 };
diff --git a/apps/cli/package.json b/apps/cli/package.json
index eeebf4dad6f..27f3585bff7 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/cli",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.5.0",
+  "version": "2025.7.0",
   "keywords": [
     "bitwarden",
     "password",
@@ -64,7 +64,7 @@
     ]
   },
   "dependencies": {
-    "@koa/multer": "3.1.0",
+    "@koa/multer": "4.0.0",
     "@koa/router": "13.1.0",
     "argon2": "0.41.1",
     "big-integer": "1.6.52",
@@ -72,7 +72,7 @@
     "chalk": "4.1.2",
     "commander": "11.1.0",
     "core-js": "3.42.0",
-    "form-data": "4.0.1",
+    "form-data": "4.0.2",
     "https-proxy-agent": "7.0.6",
     "inquirer": "8.2.6",
     "jsdom": "26.1.0",
@@ -85,11 +85,16 @@
     "multer": "1.4.5-lts.2",
     "node-fetch": "2.6.12",
     "node-forge": "1.3.1",
-    "open": "8.4.2",
+    "open": "10.1.2",
     "papaparse": "5.5.3",
     "proper-lockfile": "4.1.2",
     "rxjs": "7.8.1",
+    "semver": "7.7.2",
     "tldts": "7.0.1",
     "zxcvbn": "4.4.2"
+  },
+  "engines": {
+    "node": "~20",
+    "npm": "~10"
   }
 }
diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts
index cd5c8ef9bcd..03af0085e67 100644
--- a/apps/cli/src/auth/commands/login.command.ts
+++ b/apps/cli/src/auth/commands/login.command.ts
@@ -34,6 +34,7 @@ import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/a
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
@@ -77,6 +78,7 @@ export class LoginCommand {
     protected logoutCallback: () => Promise<void>,
     protected kdfConfigService: KdfConfigService,
     protected ssoUrlService: SsoUrlService,
+    protected i18nService: I18nService,
     protected masterPasswordService: MasterPasswordServiceAbstraction,
   ) {}
 
@@ -227,9 +229,7 @@ export class LoginCommand {
         );
       }
       if (response.requiresEncryptionKeyMigration) {
-        return Response.error(
-          "Encryption key migration required. Please login through the web vault to update your encryption key.",
-        );
+        return Response.error(this.i18nService.t("legacyEncryptionUnsupported"));
       }
       if (response.requiresTwoFactor) {
         const twoFactorProviders = await this.twoFactorService.getSupportedProviders(null);
@@ -273,11 +273,7 @@ export class LoginCommand {
           }
         }
 
-        if (
-          twoFactorToken == null &&
-          Object.keys(response.twoFactorProviders).length > 1 &&
-          selectedProvider.type === TwoFactorProviderType.Email
-        ) {
+        if (twoFactorToken == null && selectedProvider.type === TwoFactorProviderType.Email) {
           const emailReq = new TwoFactorEmailRequest();
           emailReq.email = await this.loginStrategyService.getEmail();
           emailReq.masterPasswordHash = await this.loginStrategyService.getMasterPasswordHash();
diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts
index 677139d5451..ebf877011b7 100644
--- a/apps/cli/src/commands/edit.command.ts
+++ b/apps/cli/src/commands/edit.command.ts
@@ -24,6 +24,7 @@ import { Response } from "../models/response";
 import { CliUtils } from "../utils";
 import { CipherResponse } from "../vault/models/cipher.response";
 import { FolderResponse } from "../vault/models/folder.response";
+import { CliRestrictedItemTypesService } from "../vault/services/cli-restricted-item-types.service";
 
 export class EditCommand {
   constructor(
@@ -34,6 +35,7 @@ export class EditCommand {
     private apiService: ApiService,
     private folderApiService: FolderApiServiceAbstraction,
     private accountService: AccountService,
+    private cliRestrictedItemTypesService: CliRestrictedItemTypesService,
   ) {}
 
   async run(
@@ -95,6 +97,13 @@ export class EditCommand {
       return Response.badRequest("You may not edit a deleted item. Use the restore command first.");
     }
     cipherView = CipherExport.toView(req, cipherView);
+
+    const isCipherRestricted =
+      await this.cliRestrictedItemTypesService.isCipherRestricted(cipherView);
+    if (isCipherRestricted) {
+      return Response.error("Editing this item type is restricted by organizational policy.");
+    }
+
     const encCipher = await this.cipherService.encrypt(cipherView, activeUserId);
     try {
       const updatedCipher = await this.cipherService.updateWithServer(encCipher);
diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts
index 8554f8e2ae1..3b1e0de4f15 100644
--- a/apps/cli/src/commands/get.command.ts
+++ b/apps/cli/src/commands/get.command.ts
@@ -6,7 +6,6 @@ import { CollectionService, CollectionView } from "@bitwarden/admin-console/comm
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -27,9 +26,10 @@ import { ErrorResponse } from "@bitwarden/common/models/response/error.response"
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
-import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
+import { CipherId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -48,6 +48,7 @@ import { SendResponse } from "../tools/send/models/send.response";
 import { CliUtils } from "../utils";
 import { CipherResponse } from "../vault/models/cipher.response";
 import { FolderResponse } from "../vault/models/folder.response";
+import { CliRestrictedItemTypesService } from "../vault/services/cli-restricted-item-types.service";
 
 import { DownloadCommand } from "./download.command";
 
@@ -66,6 +67,7 @@ export class GetCommand extends DownloadCommand {
     private eventCollectionService: EventCollectionService,
     private accountProfileService: BillingAccountProfileStateService,
     private accountService: AccountService,
+    private cliRestrictedItemTypesService: CliRestrictedItemTypesService,
   ) {
     super(encryptService, apiService);
   }
@@ -110,16 +112,16 @@ export class GetCommand extends DownloadCommand {
     }
   }
 
-  private async getCipherView(id: string): Promise<CipherView | CipherView[]> {
+  private async getCipherView(id: string, userId: UserId): Promise<CipherView | CipherView[]> {
     let decCipher: CipherView = null;
-    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
     if (Utils.isGuid(id)) {
-      const cipher = await this.cipherService.get(id, activeUserId);
+      const cipher = await this.cipherService.get(id, userId);
       if (cipher != null) {
-        decCipher = await this.cipherService.decrypt(cipher, activeUserId);
+        decCipher = await this.cipherService.decrypt(cipher, userId);
       }
     } else if (id.trim() !== "") {
-      let ciphers = await this.cipherService.getAllDecrypted(activeUserId);
+      let ciphers = await this.cipherService.getAllDecrypted(userId);
       ciphers = this.searchService.searchCiphersBasic(ciphers, id);
       if (ciphers.length > 1) {
         return ciphers;
@@ -133,20 +135,45 @@ export class GetCommand extends DownloadCommand {
   }
 
   private async getCipher(id: string, filter?: (c: CipherView) => boolean) {
-    let decCipher = await this.getCipherView(id);
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
+    let decCipher = await this.getCipherView(id, activeUserId);
     if (decCipher == null) {
       return Response.notFound();
     }
+
     if (Array.isArray(decCipher)) {
+      // Apply restricted ciphers filter
+      decCipher = await this.cliRestrictedItemTypesService.filterRestrictedCiphers(decCipher);
+
+      if (decCipher.length === 0) {
+        return Response.error("Access to this item type is restricted by organizational policy.");
+      }
+
       if (filter != null) {
         decCipher = decCipher.filter(filter);
-        if (decCipher.length === 1) {
-          decCipher = decCipher[0];
-        }
       }
-      if (Array.isArray(decCipher)) {
+
+      if (decCipher.length === 0) {
+        return Response.notFound();
+      }
+
+      if (decCipher.length === 1) {
+        decCipher = decCipher[0];
+      } else {
         return Response.multipleResults(decCipher.map((c) => c.id));
       }
+    } else {
+      const isCipherRestricted =
+        await this.cliRestrictedItemTypesService.isCipherRestricted(decCipher);
+      if (isCipherRestricted) {
+        return Response.error("Access to this item type is restricted by organizational policy.");
+      }
+
+      // Apply filter if provided to single cipher
+      if (filter != null && !filter(decCipher)) {
+        return Response.notFound();
+      }
     }
 
     await this.eventCollectionService.collect(
@@ -317,7 +344,8 @@ export class GetCommand extends DownloadCommand {
       return cipherResponse;
     }
 
-    const cipher = await this.getCipherView(itemId);
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    const cipher = await this.getCipherView(itemId, activeUserId);
     if (
       cipher == null ||
       Array.isArray(cipher) ||
@@ -345,7 +373,6 @@ export class GetCommand extends DownloadCommand {
       return Response.multipleResults(attachments.map((a) => a.id));
     }
 
-    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
     const canAccessPremium = await firstValueFrom(
       this.accountProfileService.hasPremiumFromAnySource$(activeUserId),
     );
diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts
index 018e742baad..517050728c0 100644
--- a/apps/cli/src/commands/list.command.ts
+++ b/apps/cli/src/commands/list.command.ts
@@ -10,7 +10,6 @@ import {
 } from "@bitwarden/admin-console/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
@@ -19,6 +18,7 @@ import { ListResponse as ApiListResponse } from "@bitwarden/common/models/respon
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
 import { CollectionResponse } from "../admin-console/models/response/collection.response";
@@ -29,6 +29,7 @@ import { ListResponse } from "../models/response/list.response";
 import { CliUtils } from "../utils";
 import { CipherResponse } from "../vault/models/cipher.response";
 import { FolderResponse } from "../vault/models/folder.response";
+import { CliRestrictedItemTypesService } from "../vault/services/cli-restricted-item-types.service";
 
 export class ListCommand {
   constructor(
@@ -41,6 +42,7 @@ export class ListCommand {
     private apiService: ApiService,
     private eventCollectionService: EventCollectionService,
     private accountService: AccountService,
+    private cliRestrictedItemTypesService: CliRestrictedItemTypesService,
   ) {}
 
   async run(object: string, cmdOptions: Record<string, any>): Promise<Response> {
@@ -134,6 +136,8 @@ export class ListCommand {
       ciphers = this.searchService.searchCiphersBasic(ciphers, options.search, options.trash);
     }
 
+    ciphers = await this.cliRestrictedItemTypesService.filterRestrictedCiphers(ciphers);
+
     await this.eventCollectionService.collectMany(EventType.Cipher_ClientViewed, ciphers, true);
 
     const res = new ListResponse(ciphers.map((o) => new CipherResponse(o)));
diff --git a/apps/cli/src/commands/restore.command.ts b/apps/cli/src/commands/restore.command.ts
index 7064feb0136..0b30193ffd4 100644
--- a/apps/cli/src/commands/restore.command.ts
+++ b/apps/cli/src/commands/restore.command.ts
@@ -1,9 +1,7 @@
-import { combineLatest, firstValueFrom, map } from "rxjs";
+import { firstValueFrom } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
 
@@ -13,7 +11,6 @@ export class RestoreCommand {
   constructor(
     private cipherService: CipherService,
     private accountService: AccountService,
-    private configService: ConfigService,
     private cipherAuthorizationService: CipherAuthorizationService,
   ) {}
 
@@ -42,17 +39,7 @@ export class RestoreCommand {
     }
 
     const canRestore = await firstValueFrom(
-      combineLatest([
-        this.configService.getFeatureFlag$(FeatureFlag.LimitItemDeletion),
-        this.cipherAuthorizationService.canRestoreCipher$(cipher),
-      ]).pipe(
-        map(([enabled, canRestore]) => {
-          if (enabled && !canRestore) {
-            return false;
-          }
-          return true;
-        }),
-      ),
+      this.cipherAuthorizationService.canRestoreCipher$(cipher),
     );
 
     if (!canRestore) {
diff --git a/apps/cli/src/locales/en/messages.json b/apps/cli/src/locales/en/messages.json
index 9149e25c5bc..815939c0c95 100644
--- a/apps/cli/src/locales/en/messages.json
+++ b/apps/cli/src/locales/en/messages.json
@@ -185,6 +185,9 @@
       }
     }
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "organizationUsingKeyConnectorOptInLoggedOut": {
     "message": "An organization you are a member of is using Key Connector. In order to access the vault, you must opt-in to Key Connector now via the web vault. You have been logged out."
   },
diff --git a/apps/cli/src/oss-serve-configurator.ts b/apps/cli/src/oss-serve-configurator.ts
index cc590df9620..14e6ace3b34 100644
--- a/apps/cli/src/oss-serve-configurator.ts
+++ b/apps/cli/src/oss-serve-configurator.ts
@@ -3,6 +3,7 @@
 import * as koaMulter from "@koa/multer";
 import * as koaRouter from "@koa/router";
 import * as koa from "koa";
+import { firstValueFrom, map } from "rxjs";
 
 import { ConfirmCommand } from "./admin-console/commands/confirm.command";
 import { ShareCommand } from "./admin-console/commands/share.command";
@@ -66,6 +67,7 @@ export class OssServeConfigurator {
       this.serviceContainer.eventCollectionService,
       this.serviceContainer.billingAccountProfileStateService,
       this.serviceContainer.accountService,
+      this.serviceContainer.cliRestrictedItemTypesService,
     );
     this.listCommand = new ListCommand(
       this.serviceContainer.cipherService,
@@ -77,6 +79,7 @@ export class OssServeConfigurator {
       this.serviceContainer.apiService,
       this.serviceContainer.eventCollectionService,
       this.serviceContainer.accountService,
+      this.serviceContainer.cliRestrictedItemTypesService,
     );
     this.createCommand = new CreateCommand(
       this.serviceContainer.cipherService,
@@ -88,6 +91,7 @@ export class OssServeConfigurator {
       this.serviceContainer.billingAccountProfileStateService,
       this.serviceContainer.organizationService,
       this.serviceContainer.accountService,
+      this.serviceContainer.cliRestrictedItemTypesService,
     );
     this.editCommand = new EditCommand(
       this.serviceContainer.cipherService,
@@ -97,6 +101,7 @@ export class OssServeConfigurator {
       this.serviceContainer.apiService,
       this.serviceContainer.folderApiService,
       this.serviceContainer.accountService,
+      this.serviceContainer.cliRestrictedItemTypesService,
     );
     this.generateCommand = new GenerateCommand(
       this.serviceContainer.passwordGenerationService,
@@ -117,6 +122,7 @@ export class OssServeConfigurator {
       this.serviceContainer.billingAccountProfileStateService,
       this.serviceContainer.cipherAuthorizationService,
       this.serviceContainer.accountService,
+      this.serviceContainer.cliRestrictedItemTypesService,
     );
     this.confirmCommand = new ConfirmCommand(
       this.serviceContainer.apiService,
@@ -127,7 +133,6 @@ export class OssServeConfigurator {
     this.restoreCommand = new RestoreCommand(
       this.serviceContainer.cipherService,
       this.serviceContainer.accountService,
-      this.serviceContainer.configService,
       this.serviceContainer.cipherAuthorizationService,
     );
     this.shareCommand = new ShareCommand(
@@ -166,6 +171,7 @@ export class OssServeConfigurator {
       this.serviceContainer.searchService,
       this.serviceContainer.encryptService,
       this.serviceContainer.apiService,
+      this.serviceContainer.accountService,
     );
     this.sendEditCommand = new SendEditCommand(
       this.serviceContainer.sendService,
@@ -178,6 +184,7 @@ export class OssServeConfigurator {
       this.serviceContainer.sendService,
       this.serviceContainer.environmentService,
       this.serviceContainer.searchService,
+      this.serviceContainer.accountService,
     );
     this.sendRemovePasswordCommand = new SendRemovePasswordCommand(
       this.serviceContainer.sendService,
@@ -410,7 +417,10 @@ export class OssServeConfigurator {
       this.processResponse(res, Response.error("You are not logged in."));
       return true;
     }
-    if (await this.serviceContainer.keyService.hasUserKey()) {
+    const userId = await firstValueFrom(
+      this.serviceContainer.accountService.activeAccount$.pipe(map((account) => account?.id)),
+    );
+    if (await this.serviceContainer.keyService.hasUserKey(userId)) {
       return false;
     }
     this.processResponse(res, Response.error("Vault is locked."));
diff --git a/apps/cli/src/platform/services/cli-platform-utils.service.ts b/apps/cli/src/platform/services/cli-platform-utils.service.ts
index 87b1a79435c..7bed495bbf5 100644
--- a/apps/cli/src/platform/services/cli-platform-utils.service.ts
+++ b/apps/cli/src/platform/services/cli-platform-utils.service.ts
@@ -2,12 +2,11 @@
 // @ts-strict-ignore
 import * as child_process from "child_process";
 
+import open from "open";
+
 import { ClientType, DeviceType } from "@bitwarden/common/enums";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
-// eslint-disable-next-line
-const open = require("open");
-
 export class CliPlatformUtilsService implements PlatformUtilsService {
   clientType: ClientType;
 
@@ -84,7 +83,8 @@ export class CliPlatformUtilsService implements PlatformUtilsService {
     if (process.platform === "linux") {
       child_process.spawnSync("xdg-open", [uri]);
     } else {
-      open(uri);
+      // eslint-disable-next-line no-console
+      open(uri).catch(console.error);
     }
   }
 
@@ -108,6 +108,14 @@ export class CliPlatformUtilsService implements PlatformUtilsService {
     return false;
   }
 
+  supportsAutofill(): boolean {
+    return false;
+  }
+
+  supportsFileDownloads(): boolean {
+    return false;
+  }
+
   showToast(
     type: "error" | "success" | "warning" | "info",
     title: string,
diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts
index e7e25d66343..468901282b4 100644
--- a/apps/cli/src/program.ts
+++ b/apps/cli/src/program.ts
@@ -175,6 +175,7 @@ export class Program extends BaseProgram {
             async () => await this.serviceContainer.logout(),
             this.serviceContainer.kdfConfigService,
             this.serviceContainer.ssoUrlService,
+            this.serviceContainer.i18nService,
             this.serviceContainer.masterPasswordService,
           );
           const response = await command.run(email, password, options);
diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts
index bc5db09da26..aa507aec1d8 100644
--- a/apps/cli/src/service-container/service-container.ts
+++ b/apps/cli/src/service-container/service-container.ts
@@ -20,6 +20,8 @@ import {
   PinServiceAbstraction,
   UserDecryptionOptionsService,
   SsoUrlService,
+  AuthRequestApiServiceAbstraction,
+  DefaultAuthRequestApiService,
 } from "@bitwarden/auth/common";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
@@ -130,7 +132,6 @@ import { DefaultSyncService } from "@bitwarden/common/platform/sync/internal";
 import { AuditService } from "@bitwarden/common/services/audit.service";
 import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
-import { SearchService } from "@bitwarden/common/services/search.service";
 import {
   PasswordStrengthService,
   PasswordStrengthServiceAbstraction,
@@ -150,6 +151,8 @@ import { DefaultCipherEncryptionService } from "@bitwarden/common/vault/services
 import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";
 import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
 import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { SearchService } from "@bitwarden/common/vault/services/search.service";
 import { TotpService } from "@bitwarden/common/vault/services/totp.service";
 import {
   legacyPasswordGenerationServiceFactory,
@@ -187,6 +190,7 @@ import { I18nService } from "../platform/services/i18n.service";
 import { LowdbStorageService } from "../platform/services/lowdb-storage.service";
 import { NodeApiService } from "../platform/services/node-api.service";
 import { NodeEnvSecureStorageService } from "../platform/services/node-env-secure-storage.service";
+import { CliRestrictedItemTypesService } from "../vault/services/cli-restricted-item-types.service";
 
 // Polyfills
 global.DOMParser = new jsdom.JSDOM().window.DOMParser;
@@ -263,6 +267,7 @@ export class ServiceContainer {
   devicesApiService: DevicesApiServiceAbstraction;
   deviceTrustService: DeviceTrustServiceAbstraction;
   authRequestService: AuthRequestService;
+  authRequestApiService: AuthRequestApiServiceAbstraction;
   configApiService: ConfigApiServiceAbstraction;
   configService: ConfigService;
   accountService: AccountService;
@@ -287,6 +292,8 @@ export class ServiceContainer {
   masterPasswordApiService: MasterPasswordApiServiceAbstraction;
   bulkEncryptService: FallbackBulkEncryptService;
   cipherEncryptionService: CipherEncryptionService;
+  restrictedItemTypesService: RestrictedItemTypesService;
+  cliRestrictedItemTypesService: CliRestrictedItemTypesService;
 
   constructor() {
     let p = null;
@@ -612,14 +619,16 @@ export class ServiceContainer {
       this.stateProvider,
     );
 
+    this.authRequestApiService = new DefaultAuthRequestApiService(this.apiService, this.logService);
+
     this.authRequestService = new AuthRequestService(
       this.appIdService,
-      this.accountService,
       this.masterPasswordService,
       this.keyService,
       this.encryptService,
       this.apiService,
       this.stateProvider,
+      this.authRequestApiService,
     );
 
     this.billingAccountProfileStateService = new DefaultBillingAccountProfileStateService(
@@ -673,6 +682,18 @@ export class ServiceContainer {
       this.vaultTimeoutSettingsService,
       this.kdfConfigService,
       this.taskSchedulerService,
+      this.configService,
+    );
+
+    this.restrictedItemTypesService = new RestrictedItemTypesService(
+      this.configService,
+      this.accountService,
+      this.organizationService,
+      this.policyService,
+    );
+
+    this.cliRestrictedItemTypesService = new CliRestrictedItemTypesService(
+      this.restrictedItemTypesService,
     );
 
     // FIXME: CLI does not support autofill
@@ -680,6 +701,7 @@ export class ServiceContainer {
       this.stateProvider,
       this.policyService,
       this.accountService,
+      this.restrictedItemTypesService,
     );
 
     this.cipherEncryptionService = new DefaultCipherEncryptionService(
@@ -715,8 +737,8 @@ export class ServiceContainer {
 
     this.folderApiService = new FolderApiService(this.folderService, this.apiService);
 
-    const lockedCallback = async (userId?: string) =>
-      await this.keyService.clearStoredUserKey(KeySuffixOptions.Auto);
+    const lockedCallback = async (userId: UserId) =>
+      await this.keyService.clearStoredUserKey(KeySuffixOptions.Auto, userId);
 
     this.userVerificationApiService = new UserVerificationApiService(this.apiService);
 
@@ -811,6 +833,7 @@ export class ServiceContainer {
       this.kdfConfigService,
       this.accountService,
       this.apiService,
+      this.restrictedItemTypesService,
     );
 
     this.organizationExportService = new OrganizationVaultExportService(
@@ -823,6 +846,7 @@ export class ServiceContainer {
       this.collectionService,
       this.kdfConfigService,
       this.accountService,
+      this.restrictedItemTypesService,
     );
 
     this.exportService = new VaultExportService(
@@ -861,7 +885,6 @@ export class ServiceContainer {
       this.collectionService,
       this.organizationService,
       this.accountService,
-      this.configService,
     );
 
     this.masterPasswordApiService = new MasterPasswordApiService(this.apiService, this.logService);
diff --git a/apps/cli/src/tools/send/commands/get.command.ts b/apps/cli/src/tools/send/commands/get.command.ts
index 1d651c50bf0..2d6cc93c781 100644
--- a/apps/cli/src/tools/send/commands/get.command.ts
+++ b/apps/cli/src/tools/send/commands/get.command.ts
@@ -4,12 +4,14 @@ import { OptionValues } from "commander";
 import { firstValueFrom } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 
 import { DownloadCommand } from "../../../commands/download.command";
 import { Response } from "../../../models/response";
@@ -22,6 +24,7 @@ export class SendGetCommand extends DownloadCommand {
     private searchService: SearchService,
     encryptService: EncryptService,
     apiService: ApiService,
+    private accountService: AccountService,
   ) {
     super(encryptService, apiService);
   }
@@ -77,7 +80,8 @@ export class SendGetCommand extends DownloadCommand {
         return await send.decrypt();
       }
     } else if (id.trim() !== "") {
-      let sends = await this.sendService.getAllDecryptedFromState();
+      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+      let sends = await this.sendService.getAllDecryptedFromState(activeUserId);
       sends = this.searchService.searchSends(sends, id);
       if (sends.length > 1) {
         return sends;
diff --git a/apps/cli/src/tools/send/commands/list.command.ts b/apps/cli/src/tools/send/commands/list.command.ts
index ab8a4dcb1c5..d3cb73e9b21 100644
--- a/apps/cli/src/tools/send/commands/list.command.ts
+++ b/apps/cli/src/tools/send/commands/list.command.ts
@@ -1,8 +1,10 @@
 import { firstValueFrom } from "rxjs";
 
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 
 import { Response } from "../../../models/response";
 import { ListResponse } from "../../../models/response/list.response";
@@ -13,10 +15,12 @@ export class SendListCommand {
     private sendService: SendService,
     private environmentService: EnvironmentService,
     private searchService: SearchService,
+    private accountService: AccountService,
   ) {}
 
   async run(cmdOptions: Record<string, any>): Promise<Response> {
-    let sends = await this.sendService.getAllDecryptedFromState();
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    let sends = await this.sendService.getAllDecryptedFromState(activeUserId);
 
     const normalizedOptions = new Options(cmdOptions);
     if (normalizedOptions.search != null && normalizedOptions.search.trim() !== "") {
diff --git a/apps/cli/src/tools/send/send.program.ts b/apps/cli/src/tools/send/send.program.ts
index 052faa33867..cbeda188a99 100644
--- a/apps/cli/src/tools/send/send.program.ts
+++ b/apps/cli/src/tools/send/send.program.ts
@@ -128,6 +128,7 @@ export class SendProgram extends BaseProgram {
           this.serviceContainer.sendService,
           this.serviceContainer.environmentService,
           this.serviceContainer.searchService,
+          this.serviceContainer.accountService,
         );
         const response = await cmd.run(options);
         this.processResponse(response);
@@ -153,6 +154,7 @@ export class SendProgram extends BaseProgram {
           this.serviceContainer.eventCollectionService,
           this.serviceContainer.billingAccountProfileStateService,
           this.serviceContainer.accountService,
+          this.serviceContainer.cliRestrictedItemTypesService,
         );
         const response = await cmd.run("template", object, null);
         this.processResponse(response);
@@ -192,6 +194,7 @@ export class SendProgram extends BaseProgram {
           this.serviceContainer.searchService,
           this.serviceContainer.encryptService,
           this.serviceContainer.apiService,
+          this.serviceContainer.accountService,
         );
         const response = await cmd.run(id, options);
         this.processResponse(response);
@@ -252,6 +255,7 @@ export class SendProgram extends BaseProgram {
           this.serviceContainer.searchService,
           this.serviceContainer.encryptService,
           this.serviceContainer.apiService,
+          this.serviceContainer.accountService,
         );
         const cmd = new SendEditCommand(
           this.serviceContainer.sendService,
diff --git a/apps/cli/src/vault.program.ts b/apps/cli/src/vault.program.ts
index ce6ac2af94e..d5615d0bb1c 100644
--- a/apps/cli/src/vault.program.ts
+++ b/apps/cli/src/vault.program.ts
@@ -114,6 +114,7 @@ export class VaultProgram extends BaseProgram {
           this.serviceContainer.apiService,
           this.serviceContainer.eventCollectionService,
           this.serviceContainer.accountService,
+          this.serviceContainer.cliRestrictedItemTypesService,
         );
         const response = await command.run(object, cmd);
 
@@ -188,6 +189,7 @@ export class VaultProgram extends BaseProgram {
           this.serviceContainer.eventCollectionService,
           this.serviceContainer.billingAccountProfileStateService,
           this.serviceContainer.accountService,
+          this.serviceContainer.cliRestrictedItemTypesService,
         );
         const response = await command.run(object, id, cmd);
         this.processResponse(response);
@@ -233,6 +235,7 @@ export class VaultProgram extends BaseProgram {
           this.serviceContainer.billingAccountProfileStateService,
           this.serviceContainer.organizationService,
           this.serviceContainer.accountService,
+          this.serviceContainer.cliRestrictedItemTypesService,
         );
         const response = await command.run(object, encodedJson, cmd);
         this.processResponse(response);
@@ -280,6 +283,7 @@ export class VaultProgram extends BaseProgram {
           this.serviceContainer.apiService,
           this.serviceContainer.folderApiService,
           this.serviceContainer.accountService,
+          this.serviceContainer.cliRestrictedItemTypesService,
         );
         const response = await command.run(object, id, encodedJson, cmd);
         this.processResponse(response);
@@ -323,6 +327,7 @@ export class VaultProgram extends BaseProgram {
           this.serviceContainer.billingAccountProfileStateService,
           this.serviceContainer.cipherAuthorizationService,
           this.serviceContainer.accountService,
+          this.serviceContainer.cliRestrictedItemTypesService,
         );
         const response = await command.run(object, id, cmd);
         this.processResponse(response);
@@ -350,7 +355,6 @@ export class VaultProgram extends BaseProgram {
         const command = new RestoreCommand(
           this.serviceContainer.cipherService,
           this.serviceContainer.accountService,
-          this.serviceContainer.configService,
           this.serviceContainer.cipherAuthorizationService,
         );
         const response = await command.run(object, id);
diff --git a/apps/cli/src/vault/create.command.ts b/apps/cli/src/vault/create.command.ts
index b1536e23748..39a0b8d464d 100644
--- a/apps/cli/src/vault/create.command.ts
+++ b/apps/cli/src/vault/create.command.ts
@@ -29,6 +29,7 @@ import { CliUtils } from "../utils";
 
 import { CipherResponse } from "./models/cipher.response";
 import { FolderResponse } from "./models/folder.response";
+import { CliRestrictedItemTypesService } from "./services/cli-restricted-item-types.service";
 
 export class CreateCommand {
   constructor(
@@ -41,6 +42,7 @@ export class CreateCommand {
     private accountProfileService: BillingAccountProfileStateService,
     private organizationService: OrganizationService,
     private accountService: AccountService,
+    private cliRestrictedItemTypesService: CliRestrictedItemTypesService,
   ) {}
 
   async run(
@@ -90,6 +92,15 @@ export class CreateCommand {
 
   private async createCipher(req: CipherExport) {
     const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
+    const cipherView = CipherExport.toView(req);
+    const isCipherTypeRestricted =
+      await this.cliRestrictedItemTypesService.isCipherRestricted(cipherView);
+
+    if (isCipherTypeRestricted) {
+      return Response.error("Creating this item type is restricted by organizational policy.");
+    }
+
     const cipher = await this.cipherService.encrypt(CipherExport.toView(req), activeUserId);
     try {
       const newCipher = await this.cipherService.createWithServer(cipher);
diff --git a/apps/cli/src/vault/delete.command.ts b/apps/cli/src/vault/delete.command.ts
index d1b0b093cf8..8df1f8f316e 100644
--- a/apps/cli/src/vault/delete.command.ts
+++ b/apps/cli/src/vault/delete.command.ts
@@ -13,6 +13,8 @@ import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cip
 import { Response } from "../models/response";
 import { CliUtils } from "../utils";
 
+import { CliRestrictedItemTypesService } from "./services/cli-restricted-item-types.service";
+
 export class DeleteCommand {
   constructor(
     private cipherService: CipherService,
@@ -22,6 +24,7 @@ export class DeleteCommand {
     private accountProfileService: BillingAccountProfileStateService,
     private cipherAuthorizationService: CipherAuthorizationService,
     private accountService: AccountService,
+    private cliRestrictedItemTypesService: CliRestrictedItemTypesService,
   ) {}
 
   async run(object: string, id: string, cmdOptions: Record<string, any>): Promise<Response> {
@@ -60,6 +63,12 @@ export class DeleteCommand {
       return Response.error("You do not have permission to delete this item.");
     }
 
+    const isCipherTypeRestricted =
+      await this.cliRestrictedItemTypesService.isCipherRestricted(cipher);
+    if (isCipherTypeRestricted) {
+      return Response.error("Deleting this item type is restricted by organizational policy.");
+    }
+
     try {
       if (options.permanent) {
         await this.cipherService.deleteWithServer(id, activeUserId);
diff --git a/apps/cli/src/vault/services/cli-restricted-item-types.service.spec.ts b/apps/cli/src/vault/services/cli-restricted-item-types.service.spec.ts
new file mode 100644
index 00000000000..8e3f40c5d3f
--- /dev/null
+++ b/apps/cli/src/vault/services/cli-restricted-item-types.service.spec.ts
@@ -0,0 +1,111 @@
+import { BehaviorSubject, of } from "rxjs";
+
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import {
+  RestrictedItemTypesService,
+  RestrictedCipherType,
+} from "@bitwarden/common/vault/services/restricted-item-types.service";
+
+import { CliRestrictedItemTypesService } from "./cli-restricted-item-types.service";
+
+describe("CliRestrictedItemTypesService", () => {
+  let service: CliRestrictedItemTypesService;
+  let restrictedSubject: BehaviorSubject<RestrictedCipherType[]>;
+  let restrictedItemTypesService: Partial<RestrictedItemTypesService>;
+
+  const cardCipher: CipherView = {
+    id: "cipher1",
+    type: CipherType.Card,
+    organizationId: "org1",
+  } as CipherView;
+
+  const loginCipher: CipherView = {
+    id: "cipher2",
+    type: CipherType.Login,
+    organizationId: "org1",
+  } as CipherView;
+
+  const identityCipher: CipherView = {
+    id: "cipher3",
+    type: CipherType.Identity,
+    organizationId: "org2",
+  } as CipherView;
+
+  beforeEach(() => {
+    restrictedSubject = new BehaviorSubject<RestrictedCipherType[]>([]);
+
+    restrictedItemTypesService = {
+      restricted$: restrictedSubject,
+      isCipherRestricted: jest.fn(),
+      isCipherRestricted$: jest.fn(),
+    };
+
+    service = new CliRestrictedItemTypesService(
+      restrictedItemTypesService as RestrictedItemTypesService,
+    );
+  });
+
+  describe("filterRestrictedCiphers", () => {
+    it("filters out restricted cipher types from array", async () => {
+      restrictedSubject.next([{ cipherType: CipherType.Card, allowViewOrgIds: [] }]);
+
+      (restrictedItemTypesService.isCipherRestricted as jest.Mock)
+        .mockReturnValueOnce(true)
+        .mockReturnValueOnce(false)
+        .mockReturnValueOnce(false);
+      const ciphers = [cardCipher, loginCipher, identityCipher];
+
+      const result = await service.filterRestrictedCiphers(ciphers);
+
+      expect(result).toEqual([loginCipher, identityCipher]);
+    });
+
+    it("returns all ciphers when no restrictions exist", async () => {
+      restrictedSubject.next([]);
+
+      (restrictedItemTypesService.isCipherRestricted as jest.Mock).mockReturnValue(false);
+
+      const ciphers = [cardCipher, loginCipher, identityCipher];
+      const result = await service.filterRestrictedCiphers(ciphers);
+
+      expect(result).toEqual(ciphers);
+    });
+
+    it("handles empty cipher array", async () => {
+      const result = await service.filterRestrictedCiphers([]);
+
+      expect(result).toEqual([]);
+    });
+  });
+
+  describe("isCipherRestricted", () => {
+    it("returns true for restricted cipher type with no organization exemptions", async () => {
+      (restrictedItemTypesService.isCipherRestricted$ as jest.Mock).mockReturnValue(of(true));
+
+      const result = await service.isCipherRestricted(cardCipher);
+      expect(result).toBe(true);
+    });
+
+    it("returns false for non-restricted cipher type", async () => {
+      (restrictedItemTypesService.isCipherRestricted$ as jest.Mock).mockReturnValue(of(false));
+
+      const result = await service.isCipherRestricted(loginCipher);
+      expect(result).toBe(false);
+    });
+
+    it("returns false when no restrictions exist", async () => {
+      (restrictedItemTypesService.isCipherRestricted$ as jest.Mock).mockReturnValue(of(false));
+
+      const result = await service.isCipherRestricted(cardCipher);
+      expect(result).toBe(false);
+    });
+
+    it("returns false for organization cipher when organization is in allowViewOrgIds", async () => {
+      (restrictedItemTypesService.isCipherRestricted$ as jest.Mock).mockReturnValue(of(false));
+
+      const result = await service.isCipherRestricted(cardCipher);
+      expect(result).toBe(false);
+    });
+  });
+});
diff --git a/apps/cli/src/vault/services/cli-restricted-item-types.service.ts b/apps/cli/src/vault/services/cli-restricted-item-types.service.ts
new file mode 100644
index 00000000000..4219330bc67
--- /dev/null
+++ b/apps/cli/src/vault/services/cli-restricted-item-types.service.ts
@@ -0,0 +1,45 @@
+import { firstValueFrom } from "rxjs";
+
+import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import {
+  RestrictedCipherType,
+  RestrictedItemTypesService,
+} from "@bitwarden/common/vault/services/restricted-item-types.service";
+
+export class CliRestrictedItemTypesService {
+  constructor(private restrictedItemTypesService: RestrictedItemTypesService) {}
+
+  /**
+   * Gets all restricted cipher types for the current user.
+   *
+   * @returns Promise resolving to array of restricted cipher types with allowed organization IDs
+   */
+  async getRestrictedTypes(): Promise<RestrictedCipherType[]> {
+    return firstValueFrom(this.restrictedItemTypesService.restricted$);
+  }
+
+  /**
+   * Filters out restricted cipher types from an array of ciphers.
+   *
+   * @param ciphers - Array of ciphers to filter
+   * @returns Promise resolving to filtered array with restricted ciphers removed
+   */
+  async filterRestrictedCiphers(ciphers: CipherView[]): Promise<CipherView[]> {
+    const restrictions = await this.getRestrictedTypes();
+
+    return ciphers.filter(
+      (cipher) => !this.restrictedItemTypesService.isCipherRestricted(cipher, restrictions),
+    );
+  }
+
+  /**
+   * Checks if a specific cipher type is restricted for the user.
+   *
+   * @param cipherType - The cipher type to check
+   * @returns Promise resolving to true if the cipher type is restricted, false otherwise
+   */
+  async isCipherRestricted(cipher: Cipher | CipherView): Promise<boolean> {
+    return firstValueFrom(this.restrictedItemTypesService.isCipherRestricted$(cipher));
+  }
+}
diff --git a/apps/cli/tsconfig.json b/apps/cli/tsconfig.json
index 9d6e3066b29..3bcd098ca19 100644
--- a/apps/cli/tsconfig.json
+++ b/apps/cli/tsconfig.json
@@ -1,38 +1,4 @@
 {
-  "compilerOptions": {
-    "pretty": true,
-    "moduleResolution": "node",
-    "target": "ES2016",
-    "module": "ES2020",
-    "noImplicitAny": true,
-    "allowSyntheticDefaultImports": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowJs": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "paths": {
-      "@bitwarden/common/spec": ["../../libs/common/spec"],
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
-      "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/importer-core": ["../../libs/importer/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/node/*": ["../../libs/node/src/*"]
-    },
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ]
-  },
+  "extends": "../../tsconfig.base",
   "include": ["src", "src/**/*.spec.ts"]
 }
diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock
index 28d64e4f504..9d0fe633013 100644
--- a/apps/desktop/desktop_native/Cargo.lock
+++ b/apps/desktop/desktop_native/Cargo.lock
@@ -120,9 +120,9 @@ checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
 
 [[package]]
 name = "arboard"
-version = "3.5.0"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1df21f715862ede32a0c525ce2ca4d52626bb0007f8c18b87a384503ac33e70"
+checksum = "55f533f8e0af236ffe5eb979b99381df3258853f00ba2e44b6e1955292c75227"
 dependencies = [
  "clipboard-win",
  "log",
@@ -162,7 +162,7 @@ dependencies = [
  "serde_repr",
  "tokio",
  "url",
- "zbus 5.6.0",
+ "zbus",
 ]
 
 [[package]]
@@ -377,6 +377,12 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -427,11 +433,17 @@ checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 [[package]]
 name = "bitwarden-russh"
 version = "0.1.0"
-source = "git+https://github.com/bitwarden/bitwarden-russh.git?rev=3d48f140fd506412d186203238993163a8c4e536#3d48f140fd506412d186203238993163a8c4e536"
+source = "git+https://github.com/bitwarden/bitwarden-russh.git?rev=a641316227227f8777fdf56ac9fa2d6b5f7fe662#a641316227227f8777fdf56ac9fa2d6b5f7fe662"
 dependencies = [
  "anyhow",
  "byteorder",
+ "ecdsa",
+ "ed25519-dalek",
  "futures",
+ "p256",
+ "p384",
+ "p521",
+ "rsa",
  "russh-cryptovec",
  "ssh-encoding",
  "ssh-key",
@@ -707,6 +719,18 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -750,6 +774,7 @@ dependencies = [
  "fiat-crypto",
  "rustc_version",
  "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -900,7 +925,7 @@ dependencies = [
  "widestring",
  "windows 0.61.1",
  "windows-future",
- "zbus 4.4.0",
+ "zbus",
  "zbus_polkit",
  "zeroizing-alloc",
 ]
@@ -1018,6 +1043,20 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der",
+ "digest",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+ "spki",
+]
+
 [[package]]
 name = "ed25519"
 version = "2.2.3"
@@ -1036,8 +1075,32 @@ checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
+ "serde",
  "sha2",
+ "signature",
  "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest",
+ "ff",
+ "generic-array",
+ "group",
+ "hkdf",
+ "pem-rfc7468",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "sec1",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -1122,6 +1185,16 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
+[[package]]
+name = "ff"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "fiat-crypto"
 version = "0.2.9"
@@ -1274,6 +1347,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
+ "zeroize",
 ]
 
 [[package]]
@@ -1342,6 +1416,17 @@ dependencies = [
  "scroll",
 ]
 
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -1745,9 +1830,9 @@ dependencies = [
 
 [[package]]
 name = "napi"
-version = "2.16.15"
+version = "2.16.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3437deb8b6ba2448b6a94260c5c6b9e5eeb5a5d6277e44b40b2532d457b0f0d"
+checksum = "55740c4ae1d8696773c78fdafd5d0e5fe9bc9f1b071c7ba493ba5c413a9184f3"
 dependencies = [
  "bitflags",
  "ctor",
@@ -1759,9 +1844,9 @@ dependencies = [
 
 [[package]]
 name = "napi-build"
-version = "2.1.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db836caddef23662b94e16bf1f26c40eceb09d6aee5d5b06a7ac199320b69b19"
+checksum = "03acbfa4f156a32188bfa09b86dc11a431b5725253fc1fc6f6df5bed273382c4"
 
 [[package]]
 name = "napi-derive"
@@ -2063,10 +2148,10 @@ dependencies = [
  "sha2",
  "subtle",
  "tokio",
- "zbus 5.6.0",
- "zbus_macros 5.6.0",
+ "zbus",
+ "zbus_macros",
  "zeroize",
- "zvariant 5.5.1",
+ "zvariant",
 ]
 
 [[package]]
@@ -2112,6 +2197,44 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2",
+]
+
+[[package]]
+name = "p384"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2",
+]
+
+[[package]]
+name = "p521"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2"
+dependencies = [
+ "base16ct",
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "rand_core 0.6.4",
+ "sha2",
+]
+
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -2348,6 +2471,15 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "primeorder"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
+dependencies = [
+ "elliptic-curve",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "3.3.0"
@@ -2504,6 +2636,16 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
 [[package]]
 name = "rsa"
 version = "0.9.6"
@@ -2640,6 +2782,20 @@ dependencies = [
  "sha2",
 ]
 
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "security-framework"
 version = "3.1.0"
@@ -2715,17 +2871,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "sha2"
 version = "0.10.8"
@@ -2865,6 +3010,7 @@ dependencies = [
  "num-bigint-dig",
  "rand_core 0.6.4",
  "rsa",
+ "sec1",
  "sha2",
  "signature",
  "ssh-cipher",
@@ -3921,9 +4067,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "4.4.0"
+version = "5.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+checksum = "59c333f648ea1b647bc95dc1d34807c8e25ed7a6feff3394034dc4776054b236"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -3938,90 +4084,37 @@ dependencies = [
  "enumflags2",
  "event-listener",
  "futures-core",
- "futures-sink",
- "futures-util",
- "hex",
- "nix",
- "ordered-stream",
- "rand 0.8.5",
- "serde",
- "serde_repr",
- "sha1",
- "static_assertions",
- "tracing",
- "uds_windows",
- "windows-sys 0.52.0",
- "xdg-home",
- "zbus_macros 4.4.0",
- "zbus_names 3.0.0",
- "zvariant 4.2.0",
-]
-
-[[package]]
-name = "zbus"
-version = "5.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2522b82023923eecb0b366da727ec883ace092e7887b61d3da5139f26b44da58"
-dependencies = [
- "async-broadcast",
- "async-recursion",
- "async-trait",
- "enumflags2",
- "event-listener",
- "futures-core",
  "futures-lite",
  "hex",
  "nix",
  "ordered-stream",
  "serde",
  "serde_repr",
+ "static_assertions",
  "tokio",
  "tracing",
  "uds_windows",
  "windows-sys 0.59.0",
  "winnow",
- "zbus_macros 5.6.0",
- "zbus_names 4.2.0",
- "zvariant 5.5.1",
+ "xdg-home",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
 ]
 
 [[package]]
 name = "zbus_macros"
-version = "4.4.0"
+version = "5.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
+checksum = "f325ad10eb0d0a3eb060203494c3b7ec3162a01a59db75d2deee100339709fc0"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn",
- "zvariant_utils 2.1.0",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "5.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d2e12843c75108c00c618c2e8ef9675b50b6ec095b36dc965f2e5aed463c15"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
- "zbus_names 4.2.0",
- "zvariant 5.5.1",
- "zvariant_utils 3.2.0",
-]
-
-[[package]]
-name = "zbus_names"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
-dependencies = [
- "serde",
- "static_assertions",
- "zvariant 4.2.0",
+ "zbus_names",
+ "zvariant",
+ "zvariant_utils",
 ]
 
 [[package]]
@@ -4033,20 +4126,20 @@ dependencies = [
  "serde",
  "static_assertions",
  "winnow",
- "zvariant 5.5.1",
+ "zvariant",
 ]
 
 [[package]]
 name = "zbus_polkit"
-version = "4.0.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00a29bfa927b29f91b7feb4e1990f2dd1b4604072f493dc2f074cf59e4e0ba90"
+checksum = "ad23d5c4d198c7e2641b33e6e0d1f866f117408ba66fe80bbe52e289eeb77c52"
 dependencies = [
  "enumflags2",
  "serde",
  "serde_repr",
  "static_assertions",
- "zbus 4.4.0",
+ "zbus",
 ]
 
 [[package]]
@@ -4149,19 +4242,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "zvariant"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
-dependencies = [
- "endi",
- "enumflags2",
- "serde",
- "static_assertions",
- "zvariant_derive 4.2.0",
-]
-
 [[package]]
 name = "zvariant"
 version = "5.5.1"
@@ -4173,21 +4253,8 @@ dependencies = [
  "serde",
  "url",
  "winnow",
- "zvariant_derive 5.5.1",
- "zvariant_utils 3.2.0",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
- "zvariant_utils 2.1.0",
+ "zvariant_derive",
+ "zvariant_utils",
 ]
 
 [[package]]
@@ -4200,18 +4267,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn",
- "zvariant_utils 3.2.0",
-]
-
-[[package]]
-name = "zvariant_utils"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "zvariant_utils",
 ]
 
 [[package]]
diff --git a/apps/desktop/desktop_native/Cargo.toml b/apps/desktop/desktop_native/Cargo.toml
index 1fce5a7c597..a778c9ed359 100644
--- a/apps/desktop/desktop_native/Cargo.toml
+++ b/apps/desktop/desktop_native/Cargo.toml
@@ -11,33 +11,33 @@ publish = false
 [workspace.dependencies]
 aes = "=0.8.4"
 anyhow = "=1.0.94"
-arboard = { version = "=3.5.0", default-features = false }
-argon2 = "=0.5.3" 
+arboard = { version = "=3.6.0", default-features = false }
+argon2 = "=0.5.3"
 ashpd = "=0.11.0"
 base64 = "=0.22.1"
-bindgen = "=0.71.1"
-bitwarden-russh = { git = "https://github.com/bitwarden/bitwarden-russh.git", rev = "3d48f140fd506412d186203238993163a8c4e536" }
+bindgen = "=0.72.0"
+bitwarden-russh = { git = "https://github.com/bitwarden/bitwarden-russh.git", rev = "a641316227227f8777fdf56ac9fa2d6b5f7fe662" }
 byteorder = "=1.5.0"
 bytes = "=1.10.1"
-cbc = "=0.1.2" 
+cbc = "=0.1.2"
 core-foundation = "=0.10.0"
 dirs = "=6.0.0"
-ed25519 =  "=2.2.3" 
+ed25519 =  "=2.2.3"
 embed_plist = "=1.2.2"
 futures = "=0.3.31"
 hex = "=0.4.3"
 homedir = "=0.3.4"
-interprocess = "=2.2.1" 
+interprocess = "=2.2.1"
 keytar = "=0.1.6"
 libc = "=0.2.172"
 log = "=0.4.25"
-napi = "=2.16.15"
-napi-build = "=2.1.4"
+napi = "=2.16.17"
+napi-build = "=2.2.0"
 napi-derive = "=2.16.13"
 oo7 = "=0.4.3"
 oslog = "=0.2.0"
 pin-project = "=1.1.10"
-pkcs8 =  "=0.10.2" 
+pkcs8 =  "=0.10.2"
 rand = "=0.9.1"
 rsa = "=0.9.6"
 russh-cryptovec = "=0.7.3"
@@ -50,7 +50,7 @@ sha2 = "=0.10.8"
 simplelog = "=0.12.2"
 ssh-encoding = "=0.2.0"
 ssh-key = {version = "=0.6.7", default-features = false }
-sysinfo = "=0.35.0" 
+sysinfo = "=0.35.0"
 thiserror = "=2.0.12"
 tokio = "=1.45.0"
 tokio-stream = "=0.1.15"
@@ -62,6 +62,6 @@ windows = "=0.61.1"
 windows-core = "=0.61.0"
 windows-future = "=0.2.0"
 windows-registry = "=0.5.1"
-zbus = "=4.4.0"
-zbus_polkit = "=4.0.0"
+zbus = "=5.5.0"
+zbus_polkit = "=5.0.0"
 zeroizing-alloc = "=0.1.0"
diff --git a/apps/desktop/desktop_native/core/src/clipboard.rs b/apps/desktop/desktop_native/core/src/clipboard.rs
index bb3e3a43149..32163ca3d1a 100644
--- a/apps/desktop/desktop_native/core/src/clipboard.rs
+++ b/apps/desktop/desktop_native/core/src/clipboard.rs
@@ -30,10 +30,14 @@ fn clipboard_set(set: Set, password: bool) -> Set {
 
 // Wait for clipboard to be available on linux
 #[cfg(target_os = "linux")]
-fn clipboard_set(set: Set, _password: bool) -> Set {
+fn clipboard_set(set: Set, password: bool) -> Set {
     use arboard::SetExtLinux;
 
-    set.wait()
+    if password {
+        set.exclude_from_history().wait()
+    } else {
+        set.wait()
+    }
 }
 
 #[cfg(target_os = "macos")]
diff --git a/apps/desktop/desktop_native/core/src/password/macos.rs b/apps/desktop/desktop_native/core/src/password/macos.rs
index 1af005acb4d..3075dce3b88 100644
--- a/apps/desktop/desktop_native/core/src/password/macos.rs
+++ b/apps/desktop/desktop_native/core/src/password/macos.rs
@@ -1,10 +1,12 @@
+use crate::password::PASSWORD_NOT_FOUND;
 use anyhow::Result;
 use security_framework::passwords::{
     delete_generic_password, get_generic_password, set_generic_password,
 };
 
 pub async fn get_password(service: &str, account: &str) -> Result<String> {
-    let result = String::from_utf8(get_generic_password(service, account)?)?;
+    let password = get_generic_password(service, account).map_err(convert_error)?;
+    let result = String::from_utf8(password)?;
     Ok(result)
 }
 
@@ -14,7 +16,7 @@ pub async fn set_password(service: &str, account: &str, password: &str) -> Resul
 }
 
 pub async fn delete_password(service: &str, account: &str) -> Result<()> {
-    delete_generic_password(service, account)?;
+    delete_generic_password(service, account).map_err(convert_error)?;
     Ok(())
 }
 
@@ -22,6 +24,15 @@ pub async fn is_available() -> Result<bool> {
     Ok(true)
 }
 
+fn convert_error(e: security_framework::base::Error) -> anyhow::Error {
+    match e.code() {
+        security_framework_sys::base::errSecItemNotFound => {
+            anyhow::anyhow!(PASSWORD_NOT_FOUND)
+        }
+        _ => anyhow::anyhow!(e),
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -44,10 +55,7 @@ mod tests {
         // Ensure password is deleted
         match get_password("BitwardenTest", "BitwardenTest").await {
             Ok(_) => panic!("Got a result"),
-            Err(e) => assert_eq!(
-                "The specified item could not be found in the keychain.",
-                e.to_string()
-            ),
+            Err(e) => assert_eq!(PASSWORD_NOT_FOUND, e.to_string()),
         }
     }
 
@@ -55,10 +63,7 @@ mod tests {
     async fn test_error_no_password() {
         match get_password("Unknown", "Unknown").await {
             Ok(_) => panic!("Got a result"),
-            Err(e) => assert_eq!(
-                "The specified item could not be found in the keychain.",
-                e.to_string()
-            ),
+            Err(e) => assert_eq!(PASSWORD_NOT_FOUND, e.to_string()),
         }
     }
 }
diff --git a/apps/desktop/desktop_native/core/src/password/mod.rs b/apps/desktop/desktop_native/core/src/password/mod.rs
index 351e896c40e..93c91072dd2 100644
--- a/apps/desktop/desktop_native/core/src/password/mod.rs
+++ b/apps/desktop/desktop_native/core/src/password/mod.rs
@@ -1,3 +1,5 @@
+pub const PASSWORD_NOT_FOUND: &str = "Password not found.";
+
 #[allow(clippy::module_inception)]
 #[cfg_attr(target_os = "linux", path = "unix.rs")]
 #[cfg_attr(target_os = "windows", path = "windows.rs")]
diff --git a/apps/desktop/desktop_native/core/src/password/unix.rs b/apps/desktop/desktop_native/core/src/password/unix.rs
index a40f4d8ed43..0b1c59e7724 100644
--- a/apps/desktop/desktop_native/core/src/password/unix.rs
+++ b/apps/desktop/desktop_native/core/src/password/unix.rs
@@ -1,3 +1,4 @@
+use crate::password::PASSWORD_NOT_FOUND;
 use anyhow::{anyhow, Result};
 use oo7::dbus::{self};
 use std::collections::HashMap;
@@ -20,7 +21,7 @@ async fn get_password_new(service: &str, account: &str) -> Result<String> {
             let secret = res.secret().await?;
             Ok(String::from_utf8(secret.to_vec())?)
         }
-        None => Err(anyhow!("no result")),
+        None => Err(anyhow!(PASSWORD_NOT_FOUND)),
     }
 }
 
@@ -46,7 +47,7 @@ async fn get_password_legacy(service: &str, account: &str) -> Result<String> {
             set_password(service, account, &secret_string).await?;
             Ok(secret_string)
         }
-        None => Err(anyhow!("no result")),
+        None => Err(anyhow!(PASSWORD_NOT_FOUND)),
     }
 }
 
@@ -152,7 +153,7 @@ mod tests {
             Ok(_) => {
                 panic!("Got a result")
             }
-            Err(e) => assert_eq!("no result", e.to_string()),
+            Err(e) => assert_eq!(PASSWORD_NOT_FOUND, e.to_string()),
         }
     }
 
@@ -160,7 +161,7 @@ mod tests {
     async fn test_error_no_password() {
         match get_password("Unknown", "Unknown").await {
             Ok(_) => panic!("Got a result"),
-            Err(e) => assert_eq!("no result", e.to_string()),
+            Err(e) => assert_eq!(PASSWORD_NOT_FOUND, e.to_string()),
         }
     }
 }
diff --git a/apps/desktop/desktop_native/core/src/password/windows.rs b/apps/desktop/desktop_native/core/src/password/windows.rs
index f0dcc3fb1eb..ee2361a832f 100644
--- a/apps/desktop/desktop_native/core/src/password/windows.rs
+++ b/apps/desktop/desktop_native/core/src/password/windows.rs
@@ -1,3 +1,4 @@
+use crate::password::PASSWORD_NOT_FOUND;
 use anyhow::{anyhow, Result};
 use widestring::{U16CString, U16String};
 use windows::{
@@ -79,7 +80,9 @@ pub async fn set_password(service: &str, account: &str, password: &str) -> Resul
 pub async fn delete_password(service: &str, account: &str) -> Result<()> {
     let target_name = U16CString::from_str(target_name(service, account))?;
 
-    unsafe { CredDeleteW(PCWSTR(target_name.as_ptr()), CRED_TYPE_GENERIC, None)? };
+    let result = unsafe { CredDeleteW(PCWSTR(target_name.as_ptr()), CRED_TYPE_GENERIC, None) };
+
+    result.map_err(|e| anyhow!(convert_error(e)))?;
 
     Ok(())
 }
@@ -95,7 +98,7 @@ fn target_name(service: &str, account: &str) -> String {
 // Convert the internal WIN32 errors to descriptive messages
 fn convert_error(e: windows::core::Error) -> String {
     if e == ERROR_NOT_FOUND.into() {
-        return "Password not found.".to_string();
+        return PASSWORD_NOT_FOUND.to_string();
     }
     e.to_string()
 }
@@ -122,7 +125,7 @@ mod tests {
         // Ensure password is deleted
         match get_password("BitwardenTest", "BitwardenTest").await {
             Ok(_) => panic!("Got a result"),
-            Err(e) => assert_eq!("Password not found.", e.to_string()),
+            Err(e) => assert_eq!(PASSWORD_NOT_FOUND, e.to_string()),
         }
     }
 
@@ -130,7 +133,7 @@ mod tests {
     async fn test_error_no_password() {
         match get_password("BitwardenTest", "BitwardenTest").await {
             Ok(_) => panic!("Got a result"),
-            Err(e) => assert_eq!("Password not found.", e.to_string()),
+            Err(e) => assert_eq!(PASSWORD_NOT_FOUND, e.to_string()),
         }
     }
 }
diff --git a/apps/desktop/desktop_native/core/src/powermonitor/linux.rs b/apps/desktop/desktop_native/core/src/powermonitor/linux.rs
index 7d0fde15ed4..aa93037e95f 100644
--- a/apps/desktop/desktop_native/core/src/powermonitor/linux.rs
+++ b/apps/desktop/desktop_native/core/src/powermonitor/linux.rs
@@ -1,6 +1,8 @@
 use std::borrow::Cow;
 
-use zbus::{export::futures_util::TryStreamExt, Connection, MatchRule};
+use futures::TryStreamExt;
+use zbus::{Connection, MatchRule};
+
 struct ScreenLock {
     interface: Cow<'static, str>,
     path: Cow<'static, str>,
@@ -23,7 +25,7 @@ pub async fn on_lock(tx: tokio::sync::mpsc::Sender<()>) -> Result<(), Box<dyn st
     let proxy = zbus::fdo::DBusProxy::new(&connection).await?;
     for monitor in SCREEN_LOCK_MONITORS.iter() {
         let match_rule = MatchRule::builder()
-            .msg_type(zbus::MessageType::Signal)
+            .msg_type(zbus::message::Type::Signal)
             .interface(monitor.interface.clone())?
             .member("ActiveChanged")?
             .build();
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs b/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs
index 5f794b49c73..33076071a1b 100644
--- a/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs
@@ -3,10 +3,14 @@ use std::sync::{
     Arc,
 };
 
+use base64::{engine::general_purpose::STANDARD, Engine as _};
 use tokio::sync::Mutex;
 use tokio_util::sync::CancellationToken;
 
-use bitwarden_russh::ssh_agent::{self, Key};
+use bitwarden_russh::{
+    session_bind::SessionBindResult,
+    ssh_agent::{self, SshKey},
+};
 
 #[cfg_attr(target_os = "windows", path = "windows.rs")]
 #[cfg_attr(target_os = "macos", path = "unix.rs")]
@@ -20,8 +24,8 @@ pub mod peerinfo;
 mod request_parser;
 
 #[derive(Clone)]
-pub struct BitwardenDesktopAgent {
-    keystore: ssh_agent::KeyStore,
+pub struct BitwardenDesktopAgent<Key> {
+    keystore: ssh_agent::KeyStore<Key>,
     cancellation_token: CancellationToken,
     show_ui_request_tx: tokio::sync::mpsc::Sender<SshAgentUIRequest>,
     get_ui_response_rx: Arc<Mutex<tokio::sync::broadcast::Receiver<(u32, bool)>>>,
@@ -40,8 +44,47 @@ pub struct SshAgentUIRequest {
     pub is_forwarding: bool,
 }
 
-impl ssh_agent::Agent<peerinfo::models::PeerInfo> for BitwardenDesktopAgent {
-    async fn confirm(&self, ssh_key: Key, data: &[u8], info: &peerinfo::models::PeerInfo) -> bool {
+#[derive(Clone)]
+pub struct BitwardenSshKey {
+    pub private_key: Option<ssh_key::private::PrivateKey>,
+    pub name: String,
+    pub cipher_uuid: String,
+}
+
+impl SshKey for BitwardenSshKey {
+    fn name(&self) -> &str {
+        &self.name
+    }
+
+    fn public_key_bytes(&self) -> Vec<u8> {
+        if let Some(ref private_key) = self.private_key {
+            private_key
+                .public_key()
+                .to_bytes()
+                .expect("Cipher private key is always correctly parsed")
+        } else {
+            Vec::new()
+        }
+    }
+
+    fn private_key(&self) -> Option<Box<dyn ssh_key::SigningKey>> {
+        if let Some(ref private_key) = self.private_key {
+            Some(Box::new(private_key.clone()))
+        } else {
+            None
+        }
+    }
+}
+
+impl ssh_agent::Agent<peerinfo::models::PeerInfo, BitwardenSshKey>
+    for BitwardenDesktopAgent<BitwardenSshKey>
+{
+    async fn confirm(
+        &self,
+        ssh_key: BitwardenSshKey,
+        data: &[u8],
+        info: &peerinfo::models::PeerInfo,
+    ) -> bool {
         if !self.is_running() {
             println!("[BitwardenDesktopAgent] Agent is not running, but tried to call confirm");
             return false;
@@ -51,7 +94,7 @@ impl ssh_agent::Agent<peerinfo::models::PeerInfo> for BitwardenDesktopAgent {
         let request_data = match request_parser::parse_request(data) {
             Ok(data) => data,
             Err(e) => {
-                println!("[SSH Agent] Error while parsing request: {}", e);
+                println!("[SSH Agent] Error while parsing request: {e}");
                 return false;
             }
         };
@@ -63,10 +106,11 @@ impl ssh_agent::Agent<peerinfo::models::PeerInfo> for BitwardenDesktopAgent {
         };
 
         println!(
-            "[SSH Agent] Confirming request from application: {}, is_forwarding: {}, namespace: {}",
+            "[SSH Agent] Confirming request from application: {}, is_forwarding: {}, namespace: {}, host_key: {}",
             info.process_name(),
             info.is_forwarding(),
             namespace.clone().unwrap_or_default(),
+            STANDARD.encode(info.host_key())
         );
 
         let mut rx_channel = self.get_ui_response_rx.lock().await.resubscribe();
@@ -117,19 +161,24 @@ impl ssh_agent::Agent<peerinfo::models::PeerInfo> for BitwardenDesktopAgent {
         false
     }
 
-    async fn set_is_forwarding(
+    async fn set_sessionbind_info(
         &self,
-        is_forwarding: bool,
+        session_bind_info_result: &SessionBindResult,
         connection_info: &peerinfo::models::PeerInfo,
     ) {
-        // is_forwarding can only be added but never removed from a connection
-        if is_forwarding {
-            connection_info.set_forwarding(is_forwarding);
+        match session_bind_info_result {
+            SessionBindResult::Success(session_bind_info) => {
+                connection_info.set_forwarding(session_bind_info.is_forwarding);
+                connection_info.set_host_key(session_bind_info.host_key.clone());
+            }
+            SessionBindResult::SignatureFailure => {
+                println!("[BitwardenDesktopAgent] Session bind failure: Signature failure");
+            }
         }
     }
 }
 
-impl BitwardenDesktopAgent {
+impl BitwardenDesktopAgent<BitwardenSshKey> {
     pub fn stop(&self) {
         if !self.is_running() {
             println!("[BitwardenDesktopAgent] Tried to stop agent while it is not running");
@@ -170,7 +219,7 @@ impl BitwardenDesktopAgent {
                         .expect("Cipher private key is always correctly parsed");
                     keystore.0.write().expect("RwLock is not poisoned").insert(
                         public_key_bytes,
-                        Key {
+                        BitwardenSshKey {
                             private_key: Some(private_key),
                             name: name.clone(),
                             cipher_uuid: cipher_id.clone(),
@@ -178,7 +227,7 @@ impl BitwardenDesktopAgent {
                     );
                 }
                 Err(e) => {
-                    eprintln!("[SSH Agent Native Module] Error while parsing key: {}", e);
+                    eprintln!("[SSH Agent Native Module] Error while parsing key: {e}");
                 }
             }
         }
@@ -234,10 +283,9 @@ fn parse_key_safe(pem: &str) -> Result<ssh_key::private::PrivateKey, anyhow::Err
         Ok(key) => match key.public_key().to_bytes() {
             Ok(_) => Ok(key),
             Err(e) => Err(anyhow::Error::msg(format!(
-                "Failed to parse public key: {}",
-                e
+                "Failed to parse public key: {e}"
             ))),
         },
-        Err(e) => Err(anyhow::Error::msg(format!("Failed to parse key: {}", e))),
+        Err(e) => Err(anyhow::Error::msg(format!("Failed to parse key: {e}"))),
     }
 }
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/peerinfo/models.rs b/apps/desktop/desktop_native/core/src/ssh_agent/peerinfo/models.rs
index 35a5a508263..fad535cb80e 100644
--- a/apps/desktop/desktop_native/core/src/ssh_agent/peerinfo/models.rs
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/peerinfo/models.rs
@@ -1,15 +1,16 @@
-use std::sync::{atomic::AtomicBool, Arc};
+use std::sync::{atomic::AtomicBool, Arc, Mutex};
 
 /**
 * Peerinfo represents the information of a peer process connecting over a socket.
 * This can be later extended to include more information (icon, app name) for the corresponding application.
 */
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct PeerInfo {
     uid: u32,
     pid: u32,
     process_name: String,
     is_forwarding: Arc<AtomicBool>,
+    host_key: Arc<Mutex<Vec<u8>>>,
 }
 
 impl PeerInfo {
@@ -19,6 +20,7 @@ impl PeerInfo {
             pid,
             process_name,
             is_forwarding: Arc::new(AtomicBool::new(false)),
+            host_key: Arc::new(Mutex::new(Vec::new())),
         }
     }
 
@@ -28,6 +30,7 @@ impl PeerInfo {
             pid: 0,
             process_name: "Unknown application".to_string(),
             is_forwarding: Arc::new(AtomicBool::new(false)),
+            host_key: Arc::new(Mutex::new(Vec::new())),
         }
     }
 
@@ -52,4 +55,13 @@ impl PeerInfo {
         self.is_forwarding
             .store(value, std::sync::atomic::Ordering::Relaxed);
     }
+
+    pub fn set_host_key(&self, host_key: Vec<u8>) {
+        let mut host_key_lock = self.host_key.lock().expect("Mutex is not poisoned");
+        *host_key_lock = host_key;
+    }
+
+    pub fn host_key(&self) -> Vec<u8> {
+        self.host_key.lock().expect("Mutex is not poisoned").clone()
+    }
 }
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ecdsa_openssh_unencrypted b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ecdsa_openssh_unencrypted
deleted file mode 100644
index 9cf518f8af7..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ecdsa_openssh_unencrypted
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS
-1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQRQzzQ8nQEouF1FMSHkPx1nejNCzF7g
-Yb8MHXLdBFM0uJkWs0vzgLJkttts2eDv3SHJqIH6qHpkLtEvgMXE5WcaAAAAoOO1BebjtQ
-XmAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFDPNDydASi4XUUx
-IeQ/HWd6M0LMXuBhvwwdct0EUzS4mRazS/OAsmS222zZ4O/dIcmogfqoemQu0S+AxcTlZx
-oAAAAhAKnIXk6H0Hs3HblklaZ6UmEjjdE/0t7EdYixpMmtpJ4eAAAAB3Rlc3RrZXk=
------END OPENSSH PRIVATE KEY-----
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ecdsa_openssh_unencrypted.pub b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ecdsa_openssh_unencrypted.pub
deleted file mode 100644
index 75e08b88b2f..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ecdsa_openssh_unencrypted.pub
+++ /dev/null
@@ -1 +0,0 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFDPNDydASi4XUUxIeQ/HWd6M0LMXuBhvwwdct0EUzS4mRazS/OAsmS222zZ4O/dIcmogfqoemQu0S+AxcTlZxo= testkey
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_openssh_encrypted b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_openssh_encrypted
deleted file mode 100644
index d3244a3d945..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_openssh_encrypted
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABAUTNb0if
-fqsoqtfv70CfukAAAAGAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIHGs3Uw3eyqnFjBI
-2eb7Qto4KVc34ZdnBac59Bab54BLAAAAkPA6aovfxQbP6FoOfaRH6u22CxqiUM0bbMpuFf
-WETn9FLaBE6LjoHH0ZI5rzNjJaQUNfx0cRcqsIrexw8YINrdVjySmEqrl5hw8gpgy0gGP5
-1Y6vKWdHdrxJCA9YMFOfDs0UhPfpLKZCwm2Sg+Bd8arlI8Gy7y4Jj/60v2bZOLhD2IZQnK
-NdJ8xATiIINuTy4g==
------END OPENSSH PRIVATE KEY-----
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_openssh_encrypted.pub b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_openssh_encrypted.pub
deleted file mode 100644
index 1188fa43f1e..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_openssh_encrypted.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHGs3Uw3eyqnFjBI2eb7Qto4KVc34ZdnBac59Bab54BL testkey
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_openssh_unencrypted b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_openssh_unencrypted
deleted file mode 100644
index 08184f3184e..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_openssh_unencrypted
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACAyQo22TXXNqvF+L8jUSSNeu8UqrsDjvf9pwIwDC9ML6gAAAJDSHpL60h6S
-+gAAAAtzc2gtZWQyNTUxOQAAACAyQo22TXXNqvF+L8jUSSNeu8UqrsDjvf9pwIwDC9ML6g
-AAAECLdlFLIJbEiFo/f0ROdXMNZAPHGPNhvbbftaPsUZEjaDJCjbZNdc2q8X4vyNRJI167
-xSquwOO9/2nAjAML0wvqAAAAB3Rlc3RrZXkBAgMEBQY=
------END OPENSSH PRIVATE KEY-----
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_openssh_unencrypted.pub b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_openssh_unencrypted.pub
deleted file mode 100644
index 5c398822022..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_openssh_unencrypted.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDJCjbZNdc2q8X4vyNRJI167xSquwOO9/2nAjAML0wvq testkey
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_pkcs8_unencrypted b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_pkcs8_unencrypted
deleted file mode 100644
index 09eb728601e..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_pkcs8_unencrypted
+++ /dev/null
@@ -1,4 +0,0 @@
------BEGIN PRIVATE KEY-----
-MFECAQEwBQYDK2VwBCIEIDY6/OAdDr3PbDss9NsLXK4CxiKUvz5/R9uvjtIzj4Sz
-gSEAxsxm1xpZ/4lKIRYm0JrJ5gRZUh7H24/YT/0qGVGzPa0=
------END PRIVATE KEY-----
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_pkcs8_unencrypted.pub b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_pkcs8_unencrypted.pub
deleted file mode 100644
index 40997e18c89..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_pkcs8_unencrypted.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMbMZtcaWf+JSiEWJtCayeYEWVIex9uP2E/9KhlRsz2t
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_putty_openssh_unencrypted b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_putty_openssh_unencrypted
deleted file mode 100644
index aa9c01b8dbe..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/ed25519_putty_openssh_unencrypted
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtz
-c2gtZWQyNTUxOQAAACDp0/9zFBCyZs5BFqXCJN5i1DTanzPGHpUeo2LP8FmQ9wAA
-AKCyIXPqsiFz6gAAAAtzc2gtZWQyNTUxOQAAACDp0/9zFBCyZs5BFqXCJN5i1DTa
-nzPGHpUeo2LP8FmQ9wAAAEDQioomhjmD+sh2nsxfQLJ5YYGASNUAlUZHe9Jx0p47
-H+nT/3MUELJmzkEWpcIk3mLUNNqfM8YelR6jYs/wWZD3AAAAEmVkZHNhLWtleS0y
-MDI0MTExOAECAwQFBgcICQoL
------END OPENSSH PRIVATE KEY-----
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_openssh_encrypted b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_openssh_encrypted
deleted file mode 100644
index bb7bbd85cf9..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_openssh_encrypted
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABApatKZWf
-0kXnaSVhty/RaKAAAAGAAAAAEAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQC/v18xGP3q
-zRV9iWqyiuwHZ4GpC4K2NO2/i2Yv5A3/bnal7CmiMh/S78lphgxcWtFkwrwlb321FmdHBv
-6KOW+EzSiPvmsdkkbpfBXB3Qf2SlhZOZZ7lYeu8KAxL3exvvn8O1GGlUjXGUrFgmC60tHW
-DBc1Ncmo8a2dwDLmA/sbLa8su2dvYEFmRg1vaytLDpkn8GS7zAxrUl/g0W2RwkPsByduUz
-iQuX90v9WAy7MqOlwBRq6t5o8wdDBVODe0VIXC7N1OS42YUsKF+N0XOnLiJrIIKkXpahMD
-pKZHeHQAdUQzsJVhKoLJR8DNDTYyhnJoQG7Q6m2gDTca9oAWvsBiNoEwCvwrt7cDNCz/Gs
-lH9HXQgfWcVXn8+fuZgvjO3CxUI16Ev33m0jWoOKJcgK/ZLRnk8SEvsJ8NO32MeR/qUb7I
-N/yUcDmPMI/3ecQsakF2cwNzHkyiGVo//yVTpf+vk8b89L+GXbYU5rtswtc2ZEGsQnUkao
-NqS8mHqhWQBUkAAAWArmugDAR1KlxY8c/esWbgQ4oP/pAQApehDcFYOrS9Zo78Os4ofEd1
-HkgM7VG1IJafCnn+q+2VXD645zCsx5UM5Y7TcjYDp7reM19Z9JCidSVilleRedTj6LTZx1
-SvetIrTfr81SP6ZGZxNiM0AfIZJO5vk+NliDdbUibvAuLp3oYbzMS3syuRkJePWu+KSxym
-nm2+88Wku94p6SIfGRT3nQsMfLS9x6fGQP5Z71DM91V33WCVhrBnvHgNxuAzHDZNfzbPu9
-f2ZD1JGh8azDPe0XRD2jZTyd3Nt+uFMcwnMdigTXaTHExEFkTdQBea1YoprIG56iNZTSoU
-/RwE4A0gdrSgJnh+6p8w05u+ia0N2WSL5ZT9QydPhwB8pGHuGBYoXFcAcFwCnIAExPtIUh
-wLx1NfC/B2MuD3Uwbx96q5a7xMTH51v0eQDdY3mQzdq/8OHHn9vzmEfV6mxmuyoa0Vh+WG
-l2WLB2vD5w0JwRAFx6a3m/rD7iQLDvK3UiYJ7DVz5G3/1w2m4QbXIPCfI3XHU12Pye2a0m
-/+/wkS4/BchqB0T4PJm6xfEynXwkEolndf+EvuLSf53XSJ2tfeFPGmmCyPoy9JxCce7wVk
-FB/SJw6LXSGUO0QA6vzxbzLEMNrqrpcCiUvDGTA6jds0HnSl8hhgMuZOtQDbFoovIHX0kl
-I5pD5pqaUNvQ3+RDFV3qdZyDntaPwCNJumfqUy46GAhYVN2O4p0HxDTs4/c2rkv+fGnG/P
-8wc7ACz3QNdjb7XMrW3/vNuwrh/sIjNYM2aiVWtRNPU8bbSmc1sYtpJZ5CsWK1TNrDrY6R
-OV89NjBoEC5OXb1c75VdN/jSssvn72XIHjkkDEPboDfmPe889VHfsVoBm18uvWPB4lffdm
-4yXAr+Cx16HeiINjcy6iKym2p4ED5IGaSXlmw/6fFgyh2iF7kZTnHawVPTqJNBVMaBRvHn
-ylMBLhhEkrXqW43P4uD6l0gWCAPBczcSjHv3Yo28ExtI0QKNk/Uwd2q2kxFRWCtqUyQkrF
-KG9IK+ixqstMo+xEb+jcCxCswpJitEIrDOXd51sd7PjCGZtAQ6ycpOuFfCIhwxlBUZdf2O
-kM/oKqN/MKMDk+H/OVl8XrLalBOXYDllW+NsL8W6F8DMcdurpQ8lCJHHWBgOdNd62STdvZ
-LBf7v8OIrC6F0bVGushsxb7cwGiUrjqUfWjhZoKx35V0dWBcGx7GvzARkvSUM22q14lc7+
-XTP0qC8tcRQfRbnBPJdmnbPDrJeJcDv2ZdbAPdzf2C7cLuuP3mNwLCrLUc7gcF/xgH+Xtd
-6KOvzt2UuWv5+cqWOsNspG+lCY0P11BPhlMvmZKO8RGVGg7PKAatG4mSH4IgO4DN2t7U9B
-j+v2jq2z5O8O4yJ8T2kWnBlhWzlBoL+R6aaat421f0v+tW/kEAouBQob5I0u1VLB2FkpZE
-6tOCK47iuarhf/86NtlPfCM9PdWJQOKcYQ8DCQhp5Lvgd0Vj3WzY+BISDdB2omGRhLUly/
-i40YPASAVnWvgqpCQ4E3rs4DWI/kEcvQH8zVq2YoRa6fVrVf1w/GLFC7m/wkxw8fDfZgMS
-Mu+ygbFa9H3aOSZMpTXhdssbOhU70fZOe6GWY9kLBNV4trQeb/pRdbEbMtEmN5TLESgwLA
-43dVdHjvpZS677FN/d9+q+pr0Xnuc2VdlXkUyOyv1lFPJIN/XIotiDTnZ3epQQ1zQ3mx32
-8Op2EVgFWpwNmGXJ1zCCA6loUG7e4W/iXkKQxTvOM0fmE4a1Y387GDwJ+pZevYOIOYTkTa
-l5jM/6Wm3pLNyE8Ynw3OX0T/p9TO1i3DlXXE/LzcWJFFXAQMo+kc+GlXqjP7K7c6xjQ6vx
-2MmKBw==
------END OPENSSH PRIVATE KEY-----
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_openssh_encrypted.pub b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_openssh_encrypted.pub
deleted file mode 100644
index d37f573b686..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_openssh_encrypted.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC/v18xGP3qzRV9iWqyiuwHZ4GpC4K2NO2/i2Yv5A3/bnal7CmiMh/S78lphgxcWtFkwrwlb321FmdHBv6KOW+EzSiPvmsdkkbpfBXB3Qf2SlhZOZZ7lYeu8KAxL3exvvn8O1GGlUjXGUrFgmC60tHWDBc1Ncmo8a2dwDLmA/sbLa8su2dvYEFmRg1vaytLDpkn8GS7zAxrUl/g0W2RwkPsByduUziQuX90v9WAy7MqOlwBRq6t5o8wdDBVODe0VIXC7N1OS42YUsKF+N0XOnLiJrIIKkXpahMDpKZHeHQAdUQzsJVhKoLJR8DNDTYyhnJoQG7Q6m2gDTca9oAWvsBiNoEwCvwrt7cDNCz/GslH9HXQgfWcVXn8+fuZgvjO3CxUI16Ev33m0jWoOKJcgK/ZLRnk8SEvsJ8NO32MeR/qUb7IN/yUcDmPMI/3ecQsakF2cwNzHkyiGVo//yVTpf+vk8b89L+GXbYU5rtswtc2ZEGsQnUkaoNqS8mHqhWQBUk= testkey
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_openssh_unencrypted b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_openssh_unencrypted
deleted file mode 100644
index 0d2692e14a2..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_openssh_unencrypted
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn
-NhAAAAAwEAAQAAAYEAtVIe0gnPtD6299/roT7ntZgVe+qIqIMIruJdI2xTanLGhNpBOlzg
-WqokbQK+aXATcaB7iQL1SPxIWV2M4jEBQbZuimIgDQvKbJ4TZPKEe1VdsrfuIo+9pDK7cG
-Kc+JiWhKjqeTRMj91/qR1fW5IWOUyE1rkwhTNkwJqtYKZLVmd4TXtQsYMMC+I0cz4krfk1
-Yqmaae/gj12h8BvE3Y+Koof4JoLsqPufH+H/bVEayv63RyAQ1/tUv9l+rwJ+svWV4X3zf3
-z40hGF43L/NGl90Vutbn7b9G/RgEdiXyLZciP3XbWbLUM+r7mG9KNuSeoixe5jok15UKqC
-XXxVb5IEZ73kaubSfz9JtsqtKG/OjOq6Fbl3Ky7kjvJyGpIvesuSInlpzPXqbLUCLJJfOA
-PUZ1wi8uuuRNePzQBMMhq8UtAbB2Dy16d+HlgghzQ00NxtbQMfDZBdApfxm3shIxkUcHzb
-DSvriHVaGGoOkmHPAmsdMsMiekuUMe9ljdOhmdTxAAAFgF8XjBxfF4wcAAAAB3NzaC1yc2
-EAAAGBALVSHtIJz7Q+tvff66E+57WYFXvqiKiDCK7iXSNsU2pyxoTaQTpc4FqqJG0Cvmlw
-E3Gge4kC9Uj8SFldjOIxAUG2bopiIA0LymyeE2TyhHtVXbK37iKPvaQyu3BinPiYloSo6n
-k0TI/df6kdX1uSFjlMhNa5MIUzZMCarWCmS1ZneE17ULGDDAviNHM+JK35NWKpmmnv4I9d
-ofAbxN2PiqKH+CaC7Kj7nx/h/21RGsr+t0cgENf7VL/Zfq8CfrL1leF98398+NIRheNy/z
-RpfdFbrW5+2/Rv0YBHYl8i2XIj9121my1DPq+5hvSjbknqIsXuY6JNeVCqgl18VW+SBGe9
-5Grm0n8/SbbKrShvzozquhW5dysu5I7ychqSL3rLkiJ5acz16my1AiySXzgD1GdcIvLrrk
-TXj80ATDIavFLQGwdg8tenfh5YIIc0NNDcbW0DHw2QXQKX8Zt7ISMZFHB82w0r64h1Whhq
-DpJhzwJrHTLDInpLlDHvZY3ToZnU8QAAAAMBAAEAAAGAEL3wpRWtVTf+NnR5QgX4KJsOjs
-bI0ABrVpSFo43uxNMss9sgLzagq5ZurxcUBFHKJdF63puEkPTkbEX4SnFaa5of6kylp3a5
-fd55rXY8F9Q5xtT3Wr8ZdFYP2xBr7INQUJb1MXRMBnOeBDw3UBH01d0UHexzB7WHXcZacG
-Ria+u5XrQebwmJ3PYJwENSaTLrxDyjSplQy4QKfgxeWNPWaevylIG9vtue5Xd9WXdl6Szs
-ONfD3mFxQZagPSIWl0kYIjS3P2ZpLe8+sakRcfci8RjEUP7U+QxqY5VaQScjyX1cSYeQLz
-t+/6Tb167aNtQ8CVW3IzM2EEN1BrSbVxFkxWFLxogAHct06Kn87nPn2+PWGWOVCBp9KheO
-FszWAJ0Kzjmaga2BpOJcrwjSpGopAb1YPIoRPVepVZlQ4gGwy5gXCFwykT9WTBoJfg0BMQ
-r3MSNcoc97eBomIWEa34K0FuQ3rVjMv9ylfyLvDBbRqTJ5zebeOuU+yCQHZUKk8klRAAAA
-wAsToNZvYWRsOMTWQom0EW1IHzoL8Cyua+uh72zZi/7enm4yHPJiu2KNgQXfB0GEEjHjbo
-9peCW3gZGTV+Ee+cAqwYLlt0SMl/VJNxN3rEG7BAqPZb42Ii2XGjaxzFq0cliUGAdo6UEd
-swU8d2I7m9vIZm4nDXzsWOBWgonTKBNyL0DQ6KNOGEyj8W0BTCm7Rzwy7EKzFWbIxr4lSc
-vDrJ3t6kOd7jZTF58kRMT0nxR0bf43YzF/3/qSvLYhQm/OOAAAAMEA2F6Yp8SrpQDNDFxh
-gi4GeywArrQO9r3EHjnBZi/bacxllSzCGXAvp7m9OKC1VD2wQP2JL1VEIZRUTuGGT6itrm
-QpX8OgoxlEJrlC5W0kHumZ3MFGd33W11u37gOilmd6+VfVXBziNG2rFohweAgs8X+Sg5AA
-nIfMV6ySXUlvLzMHpGeKRRnnQq9Cwn4rDkVQENLd1i4e2nWFhaPTUwVMR8YuOT766bywr3
-7vG1PQLF7hnf2c/oPHAru+XD9gJWs5AAAAwQDWiB2G23F4Tvq8FiK2mMusSjQzHupl83rm
-o3BSNRCvCjaLx6bWhDPSA1edNEF7VuP6rSp+i+UfSORHwOnlgnrvtcJeoDuA72hUeYuqD/
-1C9gghdhKzGTVf/IGTX1tH3rn2Gq9TEyrJs/ITcoOyZprz7VbaD3bP/NEER+m1EHi2TS/3
-SXQEtRm+IIBwba+QLUcsrWdQyIO+1OCXywDrAw50s7tjgr/goHgXTcrSXaKcIEOlPgBZH3
-YPuVuEtRYgX3kAAAAHdGVzdGtleQECAwQ=
------END OPENSSH PRIVATE KEY-----
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_openssh_unencrypted.pub b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_openssh_unencrypted.pub
deleted file mode 100644
index 9ec8fec5c58..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_openssh_unencrypted.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC1Uh7SCc+0Prb33+uhPue1mBV76oiogwiu4l0jbFNqcsaE2kE6XOBaqiRtAr5pcBNxoHuJAvVI/EhZXYziMQFBtm6KYiANC8psnhNk8oR7VV2yt+4ij72kMrtwYpz4mJaEqOp5NEyP3X+pHV9bkhY5TITWuTCFM2TAmq1gpktWZ3hNe1CxgwwL4jRzPiSt+TViqZpp7+CPXaHwG8Tdj4qih/gmguyo+58f4f9tURrK/rdHIBDX+1S/2X6vAn6y9ZXhffN/fPjSEYXjcv80aX3RW61uftv0b9GAR2JfItlyI/ddtZstQz6vuYb0o25J6iLF7mOiTXlQqoJdfFVvkgRnveRq5tJ/P0m2yq0ob86M6roVuXcrLuSO8nIaki96y5IieWnM9epstQIskl84A9RnXCLy665E14/NAEwyGrxS0BsHYPLXp34eWCCHNDTQ3G1tAx8NkF0Cl/GbeyEjGRRwfNsNK+uIdVoYag6SYc8Cax0ywyJ6S5Qx72WN06GZ1PE= testkey
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_pkcs8_encrypted b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_pkcs8_encrypted
deleted file mode 100644
index e84d1f07a31..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_pkcs8_encrypted
+++ /dev/null
@@ -1,42 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIHdTBfBgkqhkiG9w0BBQ0wUjAxBgkqhkiG9w0BBQwwJAQQXquAya5XFx11QEPm
-KCSnlwICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEAQIEEKVtEIkI2ELppfUQ
-IwfNzowEggcQtWhXVz3LunYTSRVgnexcHEaGkUF6l6a0mGaLSczl+jdCwbbBxibU
-EvN7+WMQ44shOk3LyThg0Irl22/7FuovmYc3TSeoMQH4mTROKF+9793v0UMAIAYd
-ZhTsexTGncCOt//bq6Fl+L+qPNEkY/OjS+wI9MbOn/Agbcr8/IFSOxuSixxoTKgq
-4QR5Ra3USCLyfm+3BoGPMk3tbEjrwjvzx/eTaWzt6hdc0yX4ehtqExF8WAYB43DW
-3Y1slA1T464/f1j4KXhoEXDTBOuvNvnbr7lhap8LERIGYGnQKv2m2Kw57Wultnoe
-joEQ+vTl5n92HI77H8tbgSbTYuEQ2n9pDD7AAzYGBn15c4dYEEGJYdHnqfkEF+6F
-EgPa+Xhj2qqk5nd1bzPSv6iX7XfAX2sRzfZfoaFETmR0ZKbs0aMsndC5wVvd3LpA
-m86VUihQxDvU8F4gizrNYj4NaNRv4lrxBj7Kb6BO/qT3DB8Uqu43oyrvA90iMigi
-EvuCViwwhwCpe+AxCqLGrzvIpiZCksTOtSPEvnMehw2WA3yd/n88Nis5zD4b65+q
-Tx9Q0Qm1LIi1Bq+s60+W1HK3KfaLrJaoX3JARZoWfxurZwtj+cMlo5zK1Ha2HHqQ
-kVn21tOcQU/Yljt3Db+CKZ5Tos/rPywxGnkeMABzJgyajPHkYaSgWZrOEueihfS1
-5eDtEMBehEyHfcUrL7XGnn4lOzwQHZIEFnVdV0YGaQY8Wz212IjeWxV09gM2OEP6
-PEDI3GSsqOnGkPrnson5tsIUcvpk9smy9AA9qVhNowzeWCWmsF8K9fn/O94tIzyN
-2EK0tkf8oDVROlbEh/jDa2aAHqPGCXBEqq1CbZXQpNk4FlRzkjtxdzPNiXLf45xO
-IjOTTzgaVYWiKZD9ymNjNPIaDCPB6c4LtUm86xUQzXdztBm1AOI3PrNI6nIHxWbF
-bPeEkJMRiN7C9j5nQMgQRB67CeLhzvqUdyfrYhzc7HY479sKDt9Qn8R0wpFw0QSA
-G1gpGyxFaBFSdIsil5K4IZYXxh7qTlOKzaqArTI0Dnuk8Y67z8zaxN5BkvOfBd+Q
-SoDz6dzn7KIJrK4XP3IoNfs6EVT/tlMPRY3Y/Ug+5YYjRE497cMxW8jdf3ZwgWHQ
-JubPH+0IpwNNZOOf4JXALULsDj0N7rJ1iZAY67b+7YMin3Pz0AGQhQdEdqnhaxPh
-oMvL9xFewkyujwCmPj1oQi1Uj2tc1i4ZpxY0XmYn/FQiQH9/XLdIlOMSTwGx86bw
-90e9VJHfCmflLOpENvv5xr2isNbn0aXNAOQ4drWJaYLselW2Y4N1iqBCWJKFyDGw
-4DevhhamEvsrdoKgvnuzfvA44kQGmfTjCuMu7IR5zkxevONNrynKcHkoWATzgxSS
-leXCxzc9VA0W7XUSMypHGPNHJCwYZvSWGx0qGI3VREUk2J7OeVjXCFNeHFc2Le3P
-dAm+DqRiyPBVX+yW+i7rjZLyypLzmYo9CyhlohOxTeGa6iTxBUZfYGoc0eJNqfgN
-/5hkoPFYGkcd/p41SKSg7akrJPRc+uftH0oVI0wVorGSVOvwXRn7QM+wFKlv3DQD
-ysMP7cOKqMyhJsqeW74/iWEmhbFIDKexSd/KTQ6PirVlzj7148Fl++yxaZpnZ6MY
-iyzifvLcT701GaewIwi9YR9f1BWUXYHTjK3sB3lLPyMbA4w9bRkylcKrbGf85q0E
-LXPlfh+1C9JctczDCqr2iLRoc/5j23GeN8RWfUNpZuxjFv9sxkV4iG+UapIuOBIc
-Os4//3w24XcTXYqBdX2Y7+238xq6/94+4hIhXAcMFc2Nr3CEAZCuKYChVL9CSA3v
-4sZM4rbOz6kWTC2G3SAtkLSk7hCJ6HLXzrnDb4++g3JYJWLeaQ+4ZaxWuKymnehN
-xumXCwCn0stmCjXYV/yM3TeVnMfBTIB13KAjbn0czGW00nj79rNJJzkOlp9tIPen
-pUPRFPWjgLF+hVQrwqJ3HPmt6Rt6mKzZ4FEpBXMDjvlKabnFvBdl3gbNHSfxhGHi
-FzG3phg1CiXaURQUAf21PV+djfBha7kDwMXnpgZ+PIyGDxRj61StV/NSlhg+8GrL
-ccoDOkfpy2zn++rmAqA21rTEChFN5djdsJw45GqPKUPOAgxKBsvqpoMIqq/C2pHP
-iMiBriZULV9l0tHn5MMcNQbYAmp4BsTo6maHByAVm1/7/VPQn6EieuGroYgSk2H7
-pnwM01IUfGGP3NKlq9EiiF1gz8acZ5v8+jkZM2pIzh8Trw0mtwBpnyiyXmpbR/RG
-m/TTU/gNQ/94ZaNJ/shPoBwikWXvOm+0Z0ZAwu3xefTyENGhjmb5GXshEN/5WwCm
-NNrtUPlkGkYJrnSCVM/lHtjShwbLw2w/1sag1uDuXwirxxYh9r7D6HQ=
------END ENCRYPTED PRIVATE KEY-----
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_pkcs8_encrypted.pub b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_pkcs8_encrypted.pub
deleted file mode 100644
index f3c1b15f0a3..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_pkcs8_encrypted.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCcHkc0xfH4w9aW41S9M/BfancSY4QPc2O4G1cRjFfK8QrLEGDA7NiHtoEML0afcurRXD3NVxuKaAns0w6EoS4CjzXUqVHTLA4SUyuapr8k0Eu2xOpbCwC3jDovhckoKloq7BvE6rC2i5wjSMadtIJKt/dqWI3HLjUMz1BxQJAU/qAbicj1SFZSjA/MubVBzcq93XOvByMtlIFu7wami3FTc37rVkGeUFHtK8ZbvG3n1aaTF79bBgSPuoq5BfcMdGr4WfQyGQzgse4v4hQ8yKYrtE0jo0kf06hEORimwOIU/W5IH1r+/xFs7qGKcPnFSZRIFv5LfMPTo8b+OsBRflosyfUumDEX97GZE7DSQl0EJzNvWeKwl7dQ8RUJTkbph2CjrxY77DFim+165Uj/WRr4uq2qMNhA2xNSD19+TA6AHdpGw4WZd37q2/n+EddlaJEH8MzpgtHNG9MiYh5ScZ+AG0QugflozJcQNc7n8N9Lpu1sRoejV5RhurHg/TYwVK8= testkey
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_pkcs8_unencrypted b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_pkcs8_unencrypted
deleted file mode 100644
index 0bfe2bc5067..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_pkcs8_unencrypted
+++ /dev/null
@@ -1,40 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIG/QIBADANBgkqhkiG9w0BAQEFAASCBucwggbjAgEAAoIBgQCn4+QiJojZ9mgc
-9KYJIvDWGaz4qFhf0CButg6L8zEoHKwuiN+mqcEciCCOa9BNiJmm8NTTehZvrrgl
-GG59zIbqYtDAHjVn+vtb49xPzIv+M651Yqj08lIbR9tEIHKCq7aH8GlDm8NgG9Ez
-JGjlL7okQym4TH1MHl+s4mUyr/qb2unlZBDixAQsphU8iCLftukWCIkmQg4CSj1G
-h3WbBlZ+EX5eW0EXuAw4XsSbBTWV9CHRowVIpYqPvEYSpHsoCjEcd988p19hpiGk
-nA0J4z7JfUlNgyT/1chb8GCTDT+2DCBRApbsIg6TOBVS+PR6emAQ3eZzUW0+3/oR
-M4ip0ujltQy8uU6gvYIAqx5wXGMThVpZcUgahKiSsVo/s4b84iMe4DG3W8jz4qi6
-yyNv0VedEzPUZ1lXd1GJFoy9uKNuSTe+1ksicAcluZN6LuNsPHcPxFCzOcmoNnVX
-EKAXInt+ys//5CDVasroZSAHZnDjUD4oNsLI3VIOnGxgXrkwSH0CAwEAAQKCAYAA
-2SDMf7OBHw1OGM9OQa1ZS4u+ktfQHhn31+FxbrhWGp+lDt8gYABVf6Y4dKN6rMtn
-7D9gVSAlZCAn3Hx8aWAvcXHaspxe9YXiZDTh+Kd8EIXxBQn+TiDA5LH0dryABqmM
-p20vYKtR7OS3lIIXfFBSrBMwdunKzLwmKwZLWq0SWf6vVbwpxRyR9CyByodF6Djm
-ZK3QB2qQ3jqlL1HWXL0VnyArY7HLvUvfLLK4vMPqnsSH+FdHvhcEhwqMlWT44g+f
-hqWtCJNnjDgLK3FPbI8Pz9TF8dWJvOmp5Q6iSBua1e9x2LizVuNSqiFc7ZTLeoG4
-nDj7T2BtqB0E1rNUDEN1aBo+UZmHJK7LrzfW/B+ssi2WwIpfxYa1lO6HFod5/YQi
-XV1GunyH1chCsbvOFtXvAHASO4HTKlJNbWhRF1GXqnKpAaHDPCVuwp3eq6Yf0oLb
-XrL3KFZ3jwWiWbpQXRVvpqzaJwZn3CN1yQgYS9j17a9wrPky+BoJxXjZ/oImWLEC
-gcEA0lkLwiHvmTYFTCC7PN938Agk9/NQs5PQ18MRn9OJmyfSpYqf/gNp+Md7xUgt
-F/MTif7uelp2J7DYf6fj9EYf9g4EuW+SQgFP4pfiJn1+zGFeTQq1ISvwjsA4E8ZS
-t+GIumjZTg6YiL1/A79u4wm24swt7iqnVViOPtPGOM34S1tAamjZzq2eZDmAF6pA
-fmuTMdinCMR1E1kNJYbxeqLiqQCXuwBBnHOOOJofN3AkvzjRUBB9udvniqYxH3PQ
-cxPxAoHBAMxT5KwBhZhnJedYN87Kkcpl7xdMkpU8b+aXeZoNykCeoC+wgIQexnSW
-mFk4HPkCNxvCWlbkOT1MHrTAKFnaOww23Ob+Vi6A9n0rozo9vtoJig114GB0gUqE
-mtfLhO1P5AE8yzogE+ILHyp0BqXt8vGIfzpDnCkN+GKl8gOOMPrR4NAcLO+Rshc5
-nLs7BGB4SEi126Y6mSfp85m0++1QhWMz9HzqJEHCWKVcZYdCdEONP9js04EUnK33
-KtlJIWzZTQKBwAT0pBpGwmZRp35Lpx2gBitZhcVxrg0NBnaO2fNyAGPvZD8SLQLH
-AdAiov/a23Uc/PDbWLL5Pp9gwzj+s5glrssVOXdE8aUscr1b5rARdNNL1/Tos6u8
-ZUZ3sNqGaZx7a8U4gyYboexWyo9EC1C+AdkGBm7+AkM4euFwC9N6xsa/t5zKK5d6
-76hc0m+8SxivYCBkgkrqlfeGuZCQxU+mVsC0it6U+va8ojUjLGkZ80OuCwBf4xZl
-3+acU7vx9o8/gQKBwB7BrhU6MWrsc+cr/1KQaXum9mNyckomi82RFYvb8Yrilcg3
-8FBy9XqNRKeBa9MLw1HZYpHbzsXsVF7u4eQMloDTLVNUC5L6dKAI1owoyTa24uH9
-0WWTg/a8mTZMe1jhgrew+AJq27NV6z4PswR9GenDmyshDDudz7rBsflZCQRoXUfW
-RelV7BHU6UPBsXn4ASF4xnRyM6WvcKy9coKZcUqqgm3fLM/9OizCCMJgfXHBrE+x
-7nBqst746qlEedSRrQKBwQCVYwwKCHNlZxl0/NMkDJ+hp7/InHF6mz/3VO58iCb1
-9TLDVUC2dDGPXNYwWTT9PclefwV5HNBHcAfTzgB4dpQyNiDyV914HL7DFEGduoPn
-wBYjeFre54v0YjjnskjJO7myircdbdX//i+7LMUw5aZZXCC8a5BD/rdV6IKJWJG5
-QBXbe5fVf1XwOjBTzlhIPIqhNFfSu+mFikp5BRwHGBqsKMju6inYmW6YADeY/SvO
-QjDEB37RqGZxqyIx8V2ZYwU=
------END PRIVATE KEY-----
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_pkcs8_unencrypted.pub b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_pkcs8_unencrypted.pub
deleted file mode 100644
index a3e04eed461..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_pkcs8_unencrypted.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCn4+QiJojZ9mgc9KYJIvDWGaz4qFhf0CButg6L8zEoHKwuiN+mqcEciCCOa9BNiJmm8NTTehZvrrglGG59zIbqYtDAHjVn+vtb49xPzIv+M651Yqj08lIbR9tEIHKCq7aH8GlDm8NgG9EzJGjlL7okQym4TH1MHl+s4mUyr/qb2unlZBDixAQsphU8iCLftukWCIkmQg4CSj1Gh3WbBlZ+EX5eW0EXuAw4XsSbBTWV9CHRowVIpYqPvEYSpHsoCjEcd988p19hpiGknA0J4z7JfUlNgyT/1chb8GCTDT+2DCBRApbsIg6TOBVS+PR6emAQ3eZzUW0+3/oRM4ip0ujltQy8uU6gvYIAqx5wXGMThVpZcUgahKiSsVo/s4b84iMe4DG3W8jz4qi6yyNv0VedEzPUZ1lXd1GJFoy9uKNuSTe+1ksicAcluZN6LuNsPHcPxFCzOcmoNnVXEKAXInt+ys//5CDVasroZSAHZnDjUD4oNsLI3VIOnGxgXrkwSH0= testkey
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_putty_openssh_unencrypted b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_putty_openssh_unencrypted
deleted file mode 100644
index bbb8edfe362..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_putty_openssh_unencrypted
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdz
-c2gtcnNhAAAAAwEAAQAAAQEAootgTLcKjSgPLS2+RT3ZElhktL1CwIyM/+3IqEq0
-0fl/rRHBT8otklV3Ld7DOR50HVZSoV0u9qs0WOdxcjEJlJACDClmxZmFr0BQ/E2y
-V5xzuMZj3Mj+fL26jTmM3ueRHZ0tU5ubSFvINIFyDGG70F7VgkpBA8zsviineMSU
-t1iIPi/6feL6h7QAFUk6JdQJpPTs9Nb2+DAQ9lMS2614cxLXkfUIXA4NvHMfZGdU
-dq1mBJIAWZ4PPJ6naUcu0lVYjuVEAOE4UoHxr6YlW4yyAF/I1YXBFpcHG7P0egvg
-neTPli5Wzum0XDsOPivqr6z2E5k7nzyGXUaP5MjRfDDVLwAAA9D6lTpR+pU6UQAA
-AAdzc2gtcnNhAAABAQCii2BMtwqNKA8tLb5FPdkSWGS0vULAjIz/7cioSrTR+X+t
-EcFPyi2SVXct3sM5HnQdVlKhXS72qzRY53FyMQmUkAIMKWbFmYWvQFD8TbJXnHO4
-xmPcyP58vbqNOYze55EdnS1Tm5tIW8g0gXIMYbvQXtWCSkEDzOy+KKd4xJS3WIg+
-L/p94vqHtAAVSTol1Amk9Oz01vb4MBD2UxLbrXhzEteR9QhcDg28cx9kZ1R2rWYE
-kgBZng88nqdpRy7SVViO5UQA4ThSgfGvpiVbjLIAX8jVhcEWlwcbs/R6C+Cd5M+W
-LlbO6bRcOw4+K+qvrPYTmTufPIZdRo/kyNF8MNUvAAAAAwEAAQAAAQB6YVPVDq9s
-DfA3RMyQF3vbOyA/kIu0q13xx1cflnfD7AT8CnUwnPloxt5fc+wqkko8WGUIRz93
-yvkzwrYAkvkymKZh/734IpmrlFIlVF5lZk8enIhNkCtDQho2AFGW9mSlFlUtMOhe
-N3RqS9fRiLg+r1gzq7J9qQnKNpO48tFBpLkIqr8nZOVhEn8IASrQYBUoocClNrv6
-Pdl8ni5jqnZ/0K0nq4+41Ag1VMI4LUcRCucid8ci1HKdOmGXkvClbzuFMWv3UC0k
-qDgzg/gOIgj75I7B34FYVx47UGZ6jmC7iRkHd6RiCHYkmsDSjRQHR6eRbtLPdl9w
-TlG2NrwkbSlhAAAAgQCapfJLqew9aK8PKfe3FwiC9sb0itCAXPXHhD+pQ6Tl9UMZ
-hmnG2g9qbowCprz3/kyix+nWL/Kx7eKAZYH2MBz6cxfqs2A+BSuxvX/hsnvF96BP
-u1I47rGrd0NC78DTY2NDO4Ccirx6uN+AoCl4cC+KC00Kykww6TTEBrQsdQTk5QAA
-AIEA7JwbIIMwDiQUt3EY/VU0SYvg67aOiyOYEWplSWCGdT58jnfS1H95kGVw+qXR
-eSQ0VNv6LBz7XDRpfQlNXDNJRnDZuHBbk+T9ZwnynRLWuzK7VqZBPJoNoyLFSMW2
-DBhLVKIrg0MsBAnRBMDUlVDlzs2LoNLEra3dj8Zb9vMdlbEAAACBAK/db27GfXXg
-OikZkIqWiFgBArtj0T4iFc7BLUJUeFtl0RP9LLjfvaxSdA1cmVYzzkgmuc2iZLF0
-37zuPkDrfYVRiw8rSihT3D+WDt3/Tt013WCuxVQOQSW+Qtw6yZpM92DKncbvYsUy
-5DNklW1+TYxyn2ltM7SaZjmF8UeoTnDfAAAAEHJzYS1rZXktMjAyNDExMTgBAgME
-BQYHCAkK
------END OPENSSH PRIVATE KEY-----
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_putty_pkcs1_unencrypted b/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_putty_pkcs1_unencrypted
deleted file mode 100644
index e5bedfbdd24..00000000000
--- a/apps/desktop/desktop_native/core/src/ssh_agent/test_keys/rsa_putty_pkcs1_unencrypted
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAootgTLcKjSgPLS2+RT3ZElhktL1CwIyM/+3IqEq00fl/rRHB
-T8otklV3Ld7DOR50HVZSoV0u9qs0WOdxcjEJlJACDClmxZmFr0BQ/E2yV5xzuMZj
-3Mj+fL26jTmM3ueRHZ0tU5ubSFvINIFyDGG70F7VgkpBA8zsviineMSUt1iIPi/6
-feL6h7QAFUk6JdQJpPTs9Nb2+DAQ9lMS2614cxLXkfUIXA4NvHMfZGdUdq1mBJIA
-WZ4PPJ6naUcu0lVYjuVEAOE4UoHxr6YlW4yyAF/I1YXBFpcHG7P0egvgneTPli5W
-zum0XDsOPivqr6z2E5k7nzyGXUaP5MjRfDDVLwIDAQABAoIBAHphU9UOr2wN8DdE
-zJAXe9s7ID+Qi7SrXfHHVx+Wd8PsBPwKdTCc+WjG3l9z7CqSSjxYZQhHP3fK+TPC
-tgCS+TKYpmH/vfgimauUUiVUXmVmTx6ciE2QK0NCGjYAUZb2ZKUWVS0w6F43dGpL
-19GIuD6vWDOrsn2pCco2k7jy0UGkuQiqvydk5WESfwgBKtBgFSihwKU2u/o92Xye
-LmOqdn/QrSerj7jUCDVUwjgtRxEK5yJ3xyLUcp06YZeS8KVvO4Uxa/dQLSSoODOD
-+A4iCPvkjsHfgVhXHjtQZnqOYLuJGQd3pGIIdiSawNKNFAdHp5Fu0s92X3BOUbY2
-vCRtKWECgYEA7JwbIIMwDiQUt3EY/VU0SYvg67aOiyOYEWplSWCGdT58jnfS1H95
-kGVw+qXReSQ0VNv6LBz7XDRpfQlNXDNJRnDZuHBbk+T9ZwnynRLWuzK7VqZBPJoN
-oyLFSMW2DBhLVKIrg0MsBAnRBMDUlVDlzs2LoNLEra3dj8Zb9vMdlbECgYEAr91v
-bsZ9deA6KRmQipaIWAECu2PRPiIVzsEtQlR4W2XRE/0suN+9rFJ0DVyZVjPOSCa5
-zaJksXTfvO4+QOt9hVGLDytKKFPcP5YO3f9O3TXdYK7FVA5BJb5C3DrJmkz3YMqd
-xu9ixTLkM2SVbX5NjHKfaW0ztJpmOYXxR6hOcN8CgYASLZAb+Fg5zeXVjhfYZrJk
-sB1wno7m+64UMHNlpsfNvCY/n88Pyldhk5mReCnWv8RRfLEEsJlTJSexloReAAay
-JbtkYyV2AFLDls0P6kGbEjO4XX+Hk2JW1TYI+D+bQEaRUwA6zm9URBjN3661Zgix
-0bLXgTnhCgmKoTexik4MkQKBgEZR14XGzlG81+SpOTeBG4F83ffJ4NfkTy395jf4
-iKubGa/Rcvl1VWU7DvZsyU9Dpb8J5Q+JWJPwdKoZ5UCWKPmO8nidSai4Z3/xY352
-4LTpHdzT5UlH7drGqftfck9FaUEFo3LxM2BAiijWlj1S3HVFO+Ku7JbRigCEQ0bw
-0HSnAoGBAJql8kup7D1orw8p97cXCIL2xvSK0IBc9ceEP6lDpOX1QxmGacbaD2pu
-jAKmvPf+TKLH6dYv8rHt4oBlgfYwHPpzF+qzYD4FK7G9f+Gye8X3oE+7Ujjusat3
-Q0LvwNNjY0M7gJyKvHq434CgKXhwL4oLTQrKTDDpNMQGtCx1BOTl
------END RSA PRIVATE KEY-----
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/unix.rs b/apps/desktop/desktop_native/core/src/ssh_agent/unix.rs
index 6644da508f4..05d07cfee46 100644
--- a/apps/desktop/desktop_native/core/src/ssh_agent/unix.rs
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/unix.rs
@@ -15,9 +15,9 @@ use tokio_util::sync::CancellationToken;
 
 use crate::ssh_agent::peercred_unix_listener_stream::PeercredUnixListenerStream;
 
-use super::{BitwardenDesktopAgent, SshAgentUIRequest};
+use super::{BitwardenDesktopAgent, BitwardenSshKey, SshAgentUIRequest};
 
-impl BitwardenDesktopAgent {
+impl BitwardenDesktopAgent<BitwardenSshKey> {
     pub async fn start_server(
         auth_request_tx: tokio::sync::mpsc::Sender<SshAgentUIRequest>,
         auth_response_rx: Arc<Mutex<tokio::sync::broadcast::Receiver<(u32, bool)>>>,
@@ -65,16 +65,10 @@ impl BitwardenDesktopAgent {
                 }
             };
 
-            println!(
-                "[SSH Agent Native Module] Starting SSH Agent server on {:?}",
-                ssh_path
-            );
+            println!("[SSH Agent Native Module] Starting SSH Agent server on {ssh_path:?}");
             let sockname = std::path::Path::new(&ssh_path);
             if let Err(e) = std::fs::remove_file(sockname) {
-                println!(
-                    "[SSH Agent Native Module] Could not remove existing socket file: {}",
-                    e
-                );
+                println!("[SSH Agent Native Module] Could not remove existing socket file: {e}");
                 if e.kind() != std::io::ErrorKind::NotFound {
                     return;
                 }
@@ -85,10 +79,7 @@ impl BitwardenDesktopAgent {
                     // Only the current user should be able to access the socket
                     if let Err(e) = fs::set_permissions(sockname, fs::Permissions::from_mode(0o600))
                     {
-                        println!(
-                            "[SSH Agent Native Module] Could not set socket permissions: {}",
-                            e
-                        );
+                        println!("[SSH Agent Native Module] Could not set socket permissions: {e}");
                         return;
                     }
 
@@ -112,10 +103,7 @@ impl BitwardenDesktopAgent {
                     println!("[SSH Agent Native Module] SSH Agent server exited");
                 }
                 Err(e) => {
-                    eprintln!(
-                        "[SSH Agent Native Module] Error while starting agent server: {}",
-                        e
-                    );
+                    eprintln!("[SSH Agent Native Module] Error while starting agent server: {e}");
                 }
             }
         });
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/windows.rs b/apps/desktop/desktop_native/core/src/ssh_agent/windows.rs
index bc63ef552b7..aeb20aefd66 100644
--- a/apps/desktop/desktop_native/core/src/ssh_agent/windows.rs
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/windows.rs
@@ -11,9 +11,9 @@ use std::{
 use tokio::sync::Mutex;
 use tokio_util::sync::CancellationToken;
 
-use super::{BitwardenDesktopAgent, SshAgentUIRequest};
+use super::{BitwardenDesktopAgent, BitwardenSshKey, SshAgentUIRequest};
 
-impl BitwardenDesktopAgent {
+impl BitwardenDesktopAgent<BitwardenSshKey> {
     pub async fn start_server(
         auth_request_tx: tokio::sync::mpsc::Sender<SshAgentUIRequest>,
         auth_response_rx: Arc<Mutex<tokio::sync::broadcast::Receiver<(u32, bool)>>>,
diff --git a/apps/desktop/desktop_native/macos_provider/src/lib.rs b/apps/desktop/desktop_native/macos_provider/src/lib.rs
index 8f2499ae68d..32d2514f1dd 100644
--- a/apps/desktop/desktop_native/macos_provider/src/lib.rs
+++ b/apps/desktop/desktop_native/macos_provider/src/lib.rs
@@ -214,8 +214,7 @@ impl MacOSProviderClient {
                 .remove(&sequence_number)
             {
                 cb.error(BitwardenError::Internal(format!(
-                    "Error sending message: {}",
-                    e
+                    "Error sending message: {e}"
                 )));
             }
         }
diff --git a/apps/desktop/desktop_native/napi/index.d.ts b/apps/desktop/desktop_native/napi/index.d.ts
index b3c6f715e98..cb9430290e3 100644
--- a/apps/desktop/desktop_native/napi/index.d.ts
+++ b/apps/desktop/desktop_native/napi/index.d.ts
@@ -4,18 +4,31 @@
 /* auto-generated by NAPI-RS */
 
 export declare namespace passwords {
-  /** Fetch the stored password from the keychain. */
+  /** The error message returned when a password is not found during retrieval or deletion. */
+  export const PASSWORD_NOT_FOUND: string
+  /**
+   * Fetch the stored password from the keychain.
+   * Throws {@link Error} with message {@link PASSWORD_NOT_FOUND} if the password does not exist.
+   */
   export function getPassword(service: string, account: string): Promise<string>
   /** Save the password to the keychain. Adds an entry if none exists otherwise updates the existing entry. */
   export function setPassword(service: string, account: string, password: string): Promise<void>
-  /** Delete the stored password from the keychain. */
+  /**
+   * Delete the stored password from the keychain.
+   * Throws {@link Error} with message {@link PASSWORD_NOT_FOUND} if the password does not exist.
+   */
   export function deletePassword(service: string, account: string): Promise<void>
+  /** Checks if the os secure storage is available */
   export function isAvailable(): Promise<boolean>
 }
 export declare namespace biometrics {
   export function prompt(hwnd: Buffer, message: string): Promise<boolean>
   export function available(): Promise<boolean>
   export function setBiometricSecret(service: string, account: string, secret: string, keyMaterial: KeyMaterial | undefined | null, ivB64: string): Promise<string>
+  /**
+   * Retrieves the biometric secret for the given service and account.
+   * Throws Error with message [`passwords::PASSWORD_NOT_FOUND`] if the secret does not exist.
+   */
   export function getBiometricSecret(service: string, account: string, keyMaterial?: KeyMaterial | undefined | null): Promise<string>
   /**
    * Derives key material from biometric data. Returns a string encoded with a
diff --git a/apps/desktop/desktop_native/napi/src/lib.rs b/apps/desktop/desktop_native/napi/src/lib.rs
index 079872a3b03..49f653d4809 100644
--- a/apps/desktop/desktop_native/napi/src/lib.rs
+++ b/apps/desktop/desktop_native/napi/src/lib.rs
@@ -6,7 +6,12 @@ mod registry;
 
 #[napi]
 pub mod passwords {
+    /// The error message returned when a password is not found during retrieval or deletion.
+    #[napi]
+    pub const PASSWORD_NOT_FOUND: &str = desktop_core::password::PASSWORD_NOT_FOUND;
+
     /// Fetch the stored password from the keychain.
+    /// Throws {@link Error} with message {@link PASSWORD_NOT_FOUND} if the password does not exist.
     #[napi]
     pub async fn get_password(service: String, account: String) -> napi::Result<String> {
         desktop_core::password::get_password(&service, &account)
@@ -27,6 +32,7 @@ pub mod passwords {
     }
 
     /// Delete the stored password from the keychain.
+    /// Throws {@link Error} with message {@link PASSWORD_NOT_FOUND} if the password does not exist.
     #[napi]
     pub async fn delete_password(service: String, account: String) -> napi::Result<()> {
         desktop_core::password::delete_password(&service, &account)
@@ -34,7 +40,7 @@ pub mod passwords {
             .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 
-    // Checks if the os secure storage is available
+    /// Checks if the os secure storage is available
     #[napi]
     pub async fn is_available() -> napi::Result<bool> {
         desktop_core::password::is_available()
@@ -84,6 +90,8 @@ pub mod biometrics {
         .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 
+    /// Retrieves the biometric secret for the given service and account.
+    /// Throws Error with message [`passwords::PASSWORD_NOT_FOUND`] if the secret does not exist.
     #[napi]
     pub async fn get_biometric_secret(
         service: String,
@@ -158,6 +166,7 @@ pub mod clipboards {
 pub mod sshagent {
     use std::sync::Arc;
 
+    use desktop_core::ssh_agent::BitwardenSshKey;
     use napi::{
         bindgen_prelude::Promise,
         threadsafe_function::{ErrorStrategy::CalleeHandled, ThreadsafeFunction},
@@ -166,7 +175,7 @@ pub mod sshagent {
 
     #[napi]
     pub struct SshAgentState {
-        state: desktop_core::ssh_agent::BitwardenDesktopAgent,
+        state: desktop_core::ssh_agent::BitwardenDesktopAgent<BitwardenSshKey>,
     }
 
     #[napi(object)]
@@ -229,7 +238,7 @@ pub mod sshagent {
                                     .expect("should be able to send auth response to agent");
                             }
                             Err(e) => {
-                                println!("[SSH Agent Native Module] calling UI callback promise was rejected: {}", e);
+                                println!("[SSH Agent Native Module] calling UI callback promise was rejected: {e}");
                                 let _ = auth_response_tx_arc
                                     .lock()
                                     .await
@@ -238,7 +247,7 @@ pub mod sshagent {
                             }
                         },
                         Err(e) => {
-                            println!("[SSH Agent Native Module] calling UI callback could not create promise: {}", e);
+                            println!("[SSH Agent Native Module] calling UI callback could not create promise: {e}");
                             let _ = auth_response_tx_arc
                                 .lock()
                                 .await
diff --git a/apps/desktop/desktop_native/objc/src/lib.rs b/apps/desktop/desktop_native/objc/src/lib.rs
index f5a7623cfc3..60e48760da8 100644
--- a/apps/desktop/desktop_native/objc/src/lib.rs
+++ b/apps/desktop/desktop_native/objc/src/lib.rs
@@ -80,8 +80,7 @@ mod objc {
             Ok(value) => value,
             Err(e) => {
                 println!(
-                    "Error: Failed to convert ObjCString to Rust string during commandReturn: {}",
-                    e
+                    "Error: Failed to convert ObjCString to Rust string during commandReturn: {e}"
                 );
 
                 return false;
@@ -91,10 +90,7 @@ mod objc {
         match context.send(value) {
             Ok(_) => 0,
             Err(e) => {
-                println!(
-                    "Error: Failed to return ObjCString from ObjC code to Rust code: {}",
-                    e
-                );
+                println!("Error: Failed to return ObjCString from ObjC code to Rust code: {e}");
 
                 return false;
             }
diff --git a/apps/desktop/desktop_native/proxy/src/main.rs b/apps/desktop/desktop_native/proxy/src/main.rs
index ba29e00cf13..7b3337cce71 100644
--- a/apps/desktop/desktop_native/proxy/src/main.rs
+++ b/apps/desktop/desktop_native/proxy/src/main.rs
@@ -29,12 +29,12 @@ fn init_logging(log_path: &Path, console_level: LevelFilter, file_level: LevelFi
             loggers.push(simplelog::WriteLogger::new(file_level, config, file));
         }
         Err(e) => {
-            eprintln!("Can't create file: {}", e);
+            eprintln!("Can't create file: {e}");
         }
     }
 
     if let Err(e) = CombinedLogger::init(loggers) {
-        eprintln!("Failed to initialize logger: {}", e);
+        eprintln!("Failed to initialize logger: {e}");
     }
 }
 
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index 1e96198d4ad..0c2ec58bc3e 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -20,7 +20,7 @@
     "**/node_modules/@bitwarden/desktop-napi/index.js",
     "**/node_modules/@bitwarden/desktop-napi/desktop_napi.${platform}-${arch}*.node"
   ],
-  "electronVersion": "34.0.0",
+  "electronVersion": "36.4.0",
   "generateUpdatesFilesForAllChannels": true,
   "publish": {
     "provider": "generic",
@@ -89,7 +89,9 @@
   "win": {
     "electronUpdaterCompatibility": ">=0.0.1",
     "target": ["portable", "nsis-web", "appx"],
-    "sign": "./sign.js",
+    "signtoolOptions": {
+      "sign": "./sign.js"
+    },
     "extraFiles": [
       {
         "from": "desktop_native/dist/desktop_proxy.${platform}-${arch}.exe",
@@ -108,9 +110,11 @@
     ],
     "target": ["deb", "freebsd", "rpm", "AppImage", "snap"],
     "desktop": {
-      "Name": "Bitwarden",
-      "Type": "Application",
-      "GenericName": "Password Manager"
+      "entry": {
+        "Name": "Bitwarden",
+        "Type": "Application",
+        "GenericName": "Password Manager"
+      }
     }
   },
   "dmg": {
diff --git a/apps/desktop/jest.config.js b/apps/desktop/jest.config.js
index 73f5ada287a..14cd959810e 100644
--- a/apps/desktop/jest.config.js
+++ b/apps/desktop/jest.config.js
@@ -1,18 +1,17 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
 /** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
-    { "@bitwarden/common/spec": ["../../libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
 };
diff --git a/apps/desktop/native-messaging-test-runner/tsconfig.json b/apps/desktop/native-messaging-test-runner/tsconfig.json
index 59c7040e509..608e5a3bf4c 100644
--- a/apps/desktop/native-messaging-test-runner/tsconfig.json
+++ b/apps/desktop/native-messaging-test-runner/tsconfig.json
@@ -1,6 +1,6 @@
 {
+  "extends": "../tsconfig",
   "compilerOptions": {
-    "baseUrl": "./",
     "outDir": "dist",
     "target": "es6",
     "module": "CommonJS",
@@ -10,12 +10,7 @@
     "sourceMap": false,
     "declaration": false,
     "paths": {
-      "@src/*": ["src/*"],
-      "@bitwarden/admin-console/*": ["../../../libs/admin-console/src/*"],
-      "@bitwarden/auth/*": ["../../../libs/auth/src/*"],
-      "@bitwarden/common/*": ["../../../libs/common/src/*"],
-      "@bitwarden/key-management": ["../../../libs/key-management/src/"],
-      "@bitwarden/node/*": ["../../../libs/node/src/*"]
+      "@src/*": ["src/*"]
     },
     "plugins": [
       {
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 21892cd1df8..005b823253f 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/desktop",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.5.0",
+  "version": "2025.7.1",
   "keywords": [
     "bitwarden",
     "password",
@@ -37,7 +37,7 @@
     "clean:dist": "rimraf ./dist",
     "pack:dir": "npm run clean:dist && electron-builder --dir -p never",
     "pack:lin:flatpak": "npm run clean:dist && electron-builder --dir -p never && flatpak-builder  --repo=build/.repo build/.flatpak  ./resources/com.bitwarden.desktop.devel.yaml --install-deps-from=flathub --force-clean &&  flatpak build-bundle ./build/.repo/ ./dist/com.bitwarden.desktop.flatpak com.bitwarden.desktop",
-    "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never && export SNAP_FILE=$(realpath ./dist/bitwarden_*.snap) && unsquashfs -d ./dist/tmp-snap/ $SNAP_FILE && mkdir -p ./dist/tmp-snap/meta/polkit/ && cp ./resources/com.bitwarden.desktop.policy  ./dist/tmp-snap/meta/polkit/polkit.com.bitwarden.desktop.policy && rm $SNAP_FILE && snapcraft pack ./dist/tmp-snap/ && mv ./*.snap ./dist/ && rm -rf ./dist/tmp-snap/",
+    "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never && export SNAP_FILE=$(realpath ./dist/bitwarden_*.snap) && unsquashfs -d ./dist/tmp-snap/ $SNAP_FILE && mkdir -p ./dist/tmp-snap/meta/polkit/ && cp ./resources/com.bitwarden.desktop.policy  ./dist/tmp-snap/meta/polkit/polkit.com.bitwarden.desktop.policy && rm $SNAP_FILE && snap pack --compression=lzo ./dist/tmp-snap/ && mv ./*.snap ./dist/ && rm -rf ./dist/tmp-snap/",
     "pack:lin:arm64": "npm run clean:dist && electron-builder --dir -p never && tar -czvf ./dist/bitwarden_desktop_arm64.tar.gz -C ./dist/linux-arm64-unpacked/ .",
     "pack:mac": "npm run clean:dist && electron-builder --mac --universal -p never",
     "pack:mac:with-extension": "npm run clean:dist && npm run build:macos-extension:mac && electron-builder --mac --universal -p never",
@@ -46,7 +46,7 @@
     "pack:mac:mas:with-extension": "npm run clean:dist && npm run build:macos-extension:mas && electron-builder --mac mas --universal -p never",
     "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev --universal -p never",
     "pack:mac:masdev:with-extension": "npm run clean:dist && npm run build:macos-extension:masdev && electron-builder --mac mas-dev --universal -p never",
-    "pack:win": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never -c.win.certificateSubjectName=\"8bit Solutions LLC\"",
+    "pack:win": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never -c.win.signtoolOptions.certificateSubjectName=\"8bit Solutions LLC\"",
     "pack:win:ci": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never",
     "dist:dir": "npm run build && npm run pack:dir",
     "dist:lin": "npm run build && npm run pack:lin",
@@ -62,7 +62,7 @@
     "publish:lin": "npm run build && npm run clean:dist && electron-builder --linux --x64 -p always",
     "publish:mac": "npm run build && npm run clean:dist && electron-builder --mac -p always",
     "publish:mac:mas": "npm run dist:mac:mas && npm run upload:mas",
-    "publish:win": "npm run build && npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p always -c.win.certificateSubjectName=\"8bit Solutions LLC\"",
+    "publish:win": "npm run build && npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p always -c.win.signtoolOptions.certificateSubjectName=\"8bit Solutions LLC\"",
     "publish:win:dev": "npm run build && npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p always",
     "upload:mas": "xcrun altool --upload-app --type osx --file \"$(find ./dist/mas-universal/Bitwarden*.pkg)\" --apiKey $APP_STORE_CONNECT_AUTH_KEY --apiIssuer $APP_STORE_CONNECT_TEAM_ISSUER",
     "test": "jest",
diff --git a/apps/desktop/scripts/after-pack.js b/apps/desktop/scripts/after-pack.js
index 99c3d91be52..997edf2ed6a 100644
--- a/apps/desktop/scripts/after-pack.js
+++ b/apps/desktop/scripts/after-pack.js
@@ -89,7 +89,7 @@ async function run(context) {
     } else {
       // For non-Appstore builds, we don't need the inherit binary as they are not sandboxed,
       // but we sign and include it anyway for consistency. It should be removed once DDG supports the proxy directly.
-      const entitlementsName = "entitlements.mac.plist";
+      const entitlementsName = "entitlements.mac.inherit.plist";
       const entitlementsPath = path.join(__dirname, "..", "resources", entitlementsName);
       child_process.execSync(
         `codesign -s '${id}' -i ${packageId} -f --timestamp --options runtime --entitlements ${entitlementsPath} ${proxyPath}`,
@@ -172,10 +172,8 @@ async function addElectronFuses(context) {
 
     // Currently, asar integrity is only implemented for macOS and Windows
     // https://www.electronjs.org/docs/latest/tutorial/asar-integrity
-    // On macOS, it works by default, but on Windows it requires the
-    // asarIntegrity feature of electron-builder v25, currently in alpha
-    // https://github.com/electron-userland/electron-builder/releases/tag/v25.0.0-alpha.10
-    [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: platform === "darwin",
+    [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]:
+      platform == "darwin" || platform == "win32",
 
     [FuseV1Options.OnlyLoadAppFromAsar]: true,
 
diff --git a/apps/desktop/src/app/accounts/settings.component.html b/apps/desktop/src/app/accounts/settings.component.html
index e56615c9122..29480519646 100644
--- a/apps/desktop/src/app/accounts/settings.component.html
+++ b/apps/desktop/src/app/accounts/settings.component.html
@@ -152,7 +152,7 @@
                   supportsBiometric &&
                   this.form.value.biometric &&
                   (userHasMasterPassword || (this.form.value.pin && userHasPinSet)) &&
-                  !this.isLinux
+                  this.isWindows
                 "
               >
                 <div class="checkbox form-group-child">
diff --git a/apps/desktop/src/app/accounts/settings.component.spec.ts b/apps/desktop/src/app/accounts/settings.component.spec.ts
index 6348ec30a97..a8019ce3434 100644
--- a/apps/desktop/src/app/accounts/settings.component.spec.ts
+++ b/apps/desktop/src/app/accounts/settings.component.spec.ts
@@ -18,21 +18,25 @@ import {
   VaultTimeoutSettingsService,
   VaultTimeoutStringType,
   VaultTimeoutAction,
+  VaultTimeout,
 } from "@bitwarden/common/key-management/vault-timeout";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { ThemeType } from "@bitwarden/common/platform/enums";
 import { MessageSender } from "@bitwarden/common/platform/messaging";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
 import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
 import { UserId } from "@bitwarden/common/types/guid";
-import { DialogService } from "@bitwarden/components";
+import { DialogRef, DialogService } from "@bitwarden/components";
 import { BiometricStateService, BiometricsStatus, KeyService } from "@bitwarden/key-management";
 
+import { SetPinComponent } from "../../auth/components/set-pin.component";
 import { SshAgentPromptType } from "../../autofill/models/ssh-agent-setting";
 import { DesktopAutofillSettingsService } from "../../autofill/services/desktop-autofill-settings.service";
 import { DesktopBiometricsService } from "../../key-management/biometrics/desktop.biometrics.service";
@@ -60,8 +64,15 @@ describe("SettingsComponent", () => {
   const pinServiceAbstraction = mock<PinServiceAbstraction>();
   const desktopBiometricsService = mock<DesktopBiometricsService>();
   const platformUtilsService = mock<PlatformUtilsService>();
+  const logService = mock<LogService>();
+  const validationService = mock<ValidationService>();
+  const messagingService = mock<MessagingService>();
+  const keyService = mock<KeyService>();
+  const dialogService = mock<DialogService>();
 
   beforeEach(async () => {
+    jest.clearAllMocks();
+
     originalIpc = (global as any).ipc;
     (global as any).ipc = {
       auth: {
@@ -95,15 +106,15 @@ describe("SettingsComponent", () => {
         { provide: DesktopBiometricsService, useValue: desktopBiometricsService },
         { provide: DesktopSettingsService, useValue: desktopSettingsService },
         { provide: DomainSettingsService, useValue: domainSettingsService },
-        { provide: DialogService, useValue: mock<DialogService>() },
+        { provide: DialogService, useValue: dialogService },
         { provide: I18nService, useValue: i18nService },
-        { provide: LogService, useValue: mock<LogService>() },
+        { provide: LogService, useValue: logService },
         { provide: MessageSender, useValue: mock<MessageSender>() },
         {
           provide: NativeMessagingManifestService,
           useValue: mock<NativeMessagingManifestService>(),
         },
-        { provide: KeyService, useValue: mock<KeyService>() },
+        { provide: KeyService, useValue: keyService },
         { provide: PinServiceAbstraction, useValue: pinServiceAbstraction },
         { provide: PlatformUtilsService, useValue: platformUtilsService },
         { provide: PolicyService, useValue: policyService },
@@ -111,6 +122,8 @@ describe("SettingsComponent", () => {
         { provide: ThemeStateService, useValue: themeStateService },
         { provide: UserVerificationService, useValue: mock<UserVerificationService>() },
         { provide: VaultTimeoutSettingsService, useValue: vaultTimeoutSettingsService },
+        { provide: ValidationService, useValue: validationService },
+        { provide: MessagingService, useValue: messagingService },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
@@ -324,4 +337,350 @@ describe("SettingsComponent", () => {
       expect(textNodes).toContain("Require password on app start");
     });
   });
+
+  describe("updatePinHandler", () => {
+    afterEach(() => {
+      jest.resetAllMocks();
+    });
+
+    test.each([true, false])(`handles thrown errors when updated pin to %s`, async (update) => {
+      const error = new Error("Test error");
+      jest.spyOn(component, "updatePin").mockRejectedValue(error);
+
+      await component.ngOnInit();
+      await component.updatePinHandler(update);
+
+      expect(logService.error).toHaveBeenCalled();
+      expect(component.form.controls.pin.value).toBe(!update);
+      expect(validationService.showError).toHaveBeenCalledWith(error);
+      expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+    });
+
+    describe("when updating to true", () => {
+      it("sets pin form control to false when the PIN dialog is cancelled", async () => {
+        jest.spyOn(SetPinComponent, "open").mockReturnValue(null);
+
+        await component.ngOnInit();
+        await component.updatePinHandler(true);
+
+        expect(component.form.controls.pin.value).toBe(false);
+        expect(vaultTimeoutSettingsService.clear).not.toHaveBeenCalled();
+        expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+      });
+
+      test.each([true, false])(
+        `sets the pin form control to the dialog result`,
+        async (dialogResult) => {
+          const mockDialogRef = {
+            closed: of(dialogResult),
+          } as DialogRef<boolean>;
+          jest.spyOn(SetPinComponent, "open").mockReturnValue(mockDialogRef);
+
+          await component.ngOnInit();
+          await component.updatePinHandler(true);
+
+          expect(component.form.controls.pin.value).toBe(dialogResult);
+          expect(vaultTimeoutSettingsService.clear).not.toHaveBeenCalled();
+          expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+        },
+      );
+    });
+
+    describe("when updating to false", () => {
+      let updateRequirePasswordOnStartSpy: jest.SpyInstance;
+
+      beforeEach(() => {
+        updateRequirePasswordOnStartSpy = jest
+          .spyOn(component, "updateRequirePasswordOnStart")
+          .mockImplementation(() => Promise.resolve());
+      });
+
+      it("updates requires password on start when the user doesn't have a MP and has requirePasswordOnStart on", async () => {
+        await component.ngOnInit();
+        component.form.controls.requirePasswordOnStart.setValue(true, { emitEvent: false });
+        component.userHasMasterPassword = false;
+        await component.updatePinHandler(false);
+
+        expect(component.form.controls.pin.value).toBe(false);
+        expect(component.form.controls.requirePasswordOnStart.value).toBe(false);
+        expect(updateRequirePasswordOnStartSpy).toHaveBeenCalled();
+        expect(vaultTimeoutSettingsService.clear).toHaveBeenCalled();
+        expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+      });
+
+      test.each([
+        [true, true],
+        [false, true],
+        [false, false],
+      ])(
+        `doesn't updates requires password on start when the user's requirePasswordOnStart is %s and userHasMasterPassword is %s`,
+        async (requirePasswordOnStart, userHasMasterPassword) => {
+          await component.ngOnInit();
+          component.form.controls.requirePasswordOnStart.setValue(requirePasswordOnStart, {
+            emitEvent: false,
+          });
+          component.userHasMasterPassword = userHasMasterPassword;
+          await component.updatePinHandler(false);
+
+          expect(component.form.controls.pin.value).toBe(false);
+          expect(component.form.controls.requirePasswordOnStart.value).toBe(requirePasswordOnStart);
+          expect(updateRequirePasswordOnStartSpy).not.toHaveBeenCalled();
+          expect(vaultTimeoutSettingsService.clear).toHaveBeenCalled();
+          expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+        },
+      );
+    });
+  });
+
+  describe("updateBiometricHandler", () => {
+    afterEach(() => {
+      jest.resetAllMocks();
+    });
+
+    test.each([true, false])(
+      `handles thrown errors when updated biometrics to %s`,
+      async (update) => {
+        const error = new Error("Test error");
+        jest.spyOn(component, "updateBiometric").mockRejectedValue(error);
+
+        await component.ngOnInit();
+        await component.updateBiometricHandler(update);
+
+        expect(logService.error).toHaveBeenCalled();
+        expect(component.form.controls.biometric.value).toBe(false);
+        expect(validationService.showError).toHaveBeenCalledWith(error);
+        expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+      },
+    );
+
+    describe("when updating to true", () => {
+      beforeEach(async () => {
+        await component.ngOnInit();
+        component.supportsBiometric = true;
+      });
+
+      it("calls services to clear biometrics when supportsBiometric is false", async () => {
+        component.supportsBiometric = false;
+        await component.updateBiometricHandler(true);
+
+        expect(component.form.controls.biometric.value).toBe(false);
+        expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenLastCalledWith(false);
+        expect(keyService.refreshAdditionalKeys).toHaveBeenCalled();
+        expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+      });
+
+      test.each([true, false])(
+        `launches a dialog and exits when man setup is needed, dialog result is %s`,
+        async (dialogResult) => {
+          dialogService.openSimpleDialog.mockResolvedValue(dialogResult);
+          desktopBiometricsService.getBiometricsStatus.mockResolvedValue(
+            BiometricsStatus.ManualSetupNeeded,
+          );
+
+          await component.updateBiometricHandler(true);
+
+          expect(biometricStateService.setBiometricUnlockEnabled).not.toHaveBeenCalled();
+          expect(keyService.refreshAdditionalKeys).not.toHaveBeenCalled();
+          expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+
+          if (dialogResult) {
+            expect(platformUtilsService.launchUri).toHaveBeenCalledWith(
+              "https://bitwarden.com/help/biometrics/",
+            );
+          } else {
+            expect(platformUtilsService.launchUri).not.toHaveBeenCalled();
+          }
+        },
+      );
+
+      it("sets up biometrics when auto setup is needed", async () => {
+        desktopBiometricsService.getBiometricsStatus.mockResolvedValue(
+          BiometricsStatus.AutoSetupNeeded,
+        );
+        desktopBiometricsService.getBiometricsStatusForUser.mockResolvedValue(
+          BiometricsStatus.Available,
+        );
+
+        await component.updateBiometricHandler(true);
+
+        expect(desktopBiometricsService.setupBiometrics).toHaveBeenCalled();
+        expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(true);
+        expect(component.form.controls.biometric.value).toBe(true);
+        expect(keyService.refreshAdditionalKeys).toHaveBeenCalledWith(mockUserId);
+        expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+      });
+
+      it("handles windows case", async () => {
+        desktopBiometricsService.getBiometricsStatus.mockResolvedValue(BiometricsStatus.Available);
+        desktopBiometricsService.getBiometricsStatusForUser.mockResolvedValue(
+          BiometricsStatus.Available,
+        );
+
+        component.isWindows = true;
+        component.isLinux = false;
+        await component.updateBiometricHandler(true);
+
+        expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(true);
+        expect(component.form.controls.requirePasswordOnStart.value).toBe(true);
+        expect(component.form.controls.autoPromptBiometrics.value).toBe(false);
+        expect(biometricStateService.setPromptAutomatically).toHaveBeenCalledWith(false);
+        expect(biometricStateService.setRequirePasswordOnStart).toHaveBeenCalledWith(true);
+        expect(biometricStateService.setDismissedRequirePasswordOnStartCallout).toHaveBeenCalled();
+        expect(keyService.refreshAdditionalKeys).toHaveBeenCalledWith(mockUserId);
+        expect(component.form.controls.biometric.value).toBe(true);
+        expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+      });
+
+      it("handles linux case", async () => {
+        desktopBiometricsService.getBiometricsStatus.mockResolvedValue(BiometricsStatus.Available);
+        desktopBiometricsService.getBiometricsStatusForUser.mockResolvedValue(
+          BiometricsStatus.Available,
+        );
+
+        component.isWindows = false;
+        component.isLinux = true;
+        await component.updateBiometricHandler(true);
+
+        expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(true);
+        expect(component.form.controls.requirePasswordOnStart.value).toBe(true);
+        expect(component.form.controls.autoPromptBiometrics.value).toBe(false);
+        expect(biometricStateService.setPromptAutomatically).toHaveBeenCalledWith(false);
+        expect(biometricStateService.setRequirePasswordOnStart).toHaveBeenCalledWith(true);
+        expect(biometricStateService.setDismissedRequirePasswordOnStartCallout).toHaveBeenCalled();
+        expect(keyService.refreshAdditionalKeys).toHaveBeenCalledWith(mockUserId);
+        expect(component.form.controls.biometric.value).toBe(true);
+        expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+      });
+
+      test.each([
+        BiometricsStatus.UnlockNeeded,
+        BiometricsStatus.HardwareUnavailable,
+        BiometricsStatus.AutoSetupNeeded,
+        BiometricsStatus.ManualSetupNeeded,
+        BiometricsStatus.PlatformUnsupported,
+        BiometricsStatus.DesktopDisconnected,
+        BiometricsStatus.NotEnabledLocally,
+        BiometricsStatus.NotEnabledInConnectedDesktopApp,
+        BiometricsStatus.NativeMessagingPermissionMissing,
+      ])(
+        `disables biometric when biometrics status check for the user returns %s`,
+        async (status) => {
+          desktopBiometricsService.getBiometricsStatus.mockResolvedValue(
+            BiometricsStatus.Available,
+          );
+          desktopBiometricsService.getBiometricsStatusForUser.mockResolvedValue(status);
+
+          await component.updateBiometricHandler(true);
+
+          expect(keyService.refreshAdditionalKeys).toHaveBeenCalledWith(mockUserId);
+          expect(component.form.controls.biometric.value).toBe(false);
+          expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledWith(true);
+          expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenCalledTimes(2);
+          expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenLastCalledWith(false);
+          expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+        },
+      );
+    });
+
+    describe("when updating to false", () => {
+      it("calls services to clear biometrics", async () => {
+        await component.ngOnInit();
+        await component.updateBiometricHandler(false);
+
+        expect(component.form.controls.biometric.value).toBe(false);
+        expect(biometricStateService.setBiometricUnlockEnabled).toHaveBeenLastCalledWith(false);
+        expect(keyService.refreshAdditionalKeys).toHaveBeenCalled();
+        expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+      });
+    });
+  });
+
+  describe("saveVaultTimeout", () => {
+    const DEFAULT_VAULT_TIMEOUT: VaultTimeout = 123;
+    const DEFAULT_VAULT_TIMEOUT_ACTION = VaultTimeoutAction.Lock;
+
+    beforeEach(() => {
+      component["form"].controls.vaultTimeout.setValue(DEFAULT_VAULT_TIMEOUT, { emitEvent: false });
+      component["form"].controls.vaultTimeoutAction.setValue(DEFAULT_VAULT_TIMEOUT_ACTION, {
+        emitEvent: false,
+      });
+      component["previousVaultTimeout"] = DEFAULT_VAULT_TIMEOUT;
+    });
+
+    it.each([
+      null,
+      [VaultTimeoutStringType.Never],
+      [VaultTimeoutStringType.OnRestart],
+      [VaultTimeoutStringType.OnLocked],
+      [VaultTimeoutStringType.OnSleep],
+      [VaultTimeoutStringType.OnIdle],
+      [42],
+    ])("should save vault timeout", async (vaultTimeout: VaultTimeout) => {
+      dialogService.openSimpleDialog.mockResolvedValue(true);
+
+      await component.saveVaultTimeout(vaultTimeout);
+
+      expect(vaultTimeoutSettingsService.setVaultTimeoutOptions).toHaveBeenCalledWith(
+        mockUserId,
+        vaultTimeout,
+        DEFAULT_VAULT_TIMEOUT_ACTION,
+      );
+      expect(component["previousVaultTimeout"]).toEqual(DEFAULT_VAULT_TIMEOUT);
+    });
+
+    it("should save vault timeout when vault timeout action is disabled", async () => {
+      component["form"].controls.vaultTimeoutAction.setValue(VaultTimeoutAction.LogOut, {
+        emitEvent: false,
+      });
+      component["form"].controls.vaultTimeoutAction.disable({ emitEvent: false });
+
+      await component.saveVaultTimeout(DEFAULT_VAULT_TIMEOUT);
+
+      expect(vaultTimeoutSettingsService.setVaultTimeoutOptions).toHaveBeenCalledWith(
+        mockUserId,
+        DEFAULT_VAULT_TIMEOUT,
+        VaultTimeoutAction.LogOut,
+      );
+      expect(component["previousVaultTimeout"]).toEqual(DEFAULT_VAULT_TIMEOUT);
+    });
+
+    it("should not save vault timeout when vault timeout is 'never' and dialog is cancelled", async () => {
+      dialogService.openSimpleDialog.mockResolvedValue(false);
+
+      await component.saveVaultTimeout(VaultTimeoutStringType.Never);
+
+      expect(vaultTimeoutSettingsService.setVaultTimeoutOptions).not.toHaveBeenCalled();
+      expect(component["form"].getRawValue().vaultTimeout).toEqual(DEFAULT_VAULT_TIMEOUT);
+      expect(component["previousVaultTimeout"]).toEqual(DEFAULT_VAULT_TIMEOUT);
+      expect(dialogService.openSimpleDialog).toHaveBeenCalledWith({
+        title: { key: "warning" },
+        content: { key: "neverLockWarning" },
+        type: "warning",
+      });
+    });
+
+    it("should not save vault timeout when vault timeout is 0", async () => {
+      component["form"].controls.vaultTimeout.setValue(0, { emitEvent: false });
+      await component.saveVaultTimeout(0);
+
+      expect(vaultTimeoutSettingsService.setVaultTimeoutOptions).not.toHaveBeenCalled();
+      expect(component["form"].getRawValue().vaultTimeout).toEqual(0);
+      expect(component["previousVaultTimeout"]).toEqual(DEFAULT_VAULT_TIMEOUT);
+    });
+
+    it("should not save vault timeout when vault timeout is invalid", async () => {
+      i18nService.t.mockReturnValue("Number too large test error");
+      component["form"].controls.vaultTimeout.setErrors({}, { emitEvent: false });
+      await component.saveVaultTimeout(999_999_999);
+
+      expect(vaultTimeoutSettingsService.setVaultTimeoutOptions).not.toHaveBeenCalled();
+      expect(component["form"].getRawValue().vaultTimeout).toEqual(DEFAULT_VAULT_TIMEOUT);
+      expect(component["previousVaultTimeout"]).toEqual(DEFAULT_VAULT_TIMEOUT);
+      expect(platformUtilsService.showToast).toHaveBeenCalledWith(
+        "error",
+        null,
+        "Number too large test error",
+      );
+    });
+  });
 });
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index fd0585e805e..3a12a2a07b0 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -37,6 +37,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
@@ -162,6 +163,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
     private logService: LogService,
     private nativeMessagingManifestService: NativeMessagingManifestService,
     private configService: ConfigService,
+    private validationService: ValidationService,
   ) {
     const isMac = this.platformUtilsService.getDevice() === DeviceType.MacOsDesktop;
 
@@ -379,7 +381,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
     this.form.controls.pin.valueChanges
       .pipe(
         concatMap(async (value) => {
-          await this.updatePin(value);
+          await this.updatePinHandler(value);
           this.refreshTimeoutSettings$.next();
         }),
         takeUntil(this.destroy$),
@@ -389,7 +391,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
     this.form.controls.biometric.valueChanges
       .pipe(
         concatMap(async (enabled) => {
-          await this.updateBiometric(enabled);
+          await this.updateBiometricHandler(enabled);
           this.refreshTimeoutSettings$.next();
         }),
         takeUntil(this.destroy$),
@@ -447,7 +449,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
     await this.vaultTimeoutSettingsService.setVaultTimeoutOptions(
       activeAccount.id,
       newValue,
-      this.form.value.vaultTimeoutAction,
+      this.form.getRawValue().vaultTimeoutAction,
     );
   }
 
@@ -485,6 +487,18 @@ export class SettingsComponent implements OnInit, OnDestroy {
     );
   }
 
+  async updatePinHandler(value: boolean) {
+    try {
+      await this.updatePin(value);
+    } catch (error) {
+      this.logService.error("Error updating unlock with PIN: ", error);
+      this.form.controls.pin.setValue(!value, { emitEvent: false });
+      this.validationService.showError(error);
+    } finally {
+      this.messagingService.send("redrawMenu");
+    }
+  }
+
   async updatePin(value: boolean) {
     if (value) {
       const dialogRef = SetPinComponent.open(this.dialogService);
@@ -509,8 +523,18 @@ export class SettingsComponent implements OnInit, OnDestroy {
       const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
       await this.vaultTimeoutSettingsService.clear(userId);
     }
+  }
 
-    this.messagingService.send("redrawMenu");
+  async updateBiometricHandler(value: boolean) {
+    try {
+      await this.updateBiometric(value);
+    } catch (error) {
+      this.logService.error("Error updating unlock with biometrics: ", error);
+      this.form.controls.biometric.setValue(false, { emitEvent: false });
+      this.validationService.showError(error);
+    } finally {
+      this.messagingService.send("redrawMenu");
+    }
   }
 
   async updateBiometric(enabled: boolean) {
@@ -519,61 +543,55 @@ export class SettingsComponent implements OnInit, OnDestroy {
     // The bug should resolve itself once the angular issue is resolved.
     // See: https://github.com/angular/angular/issues/13063
 
-    try {
-      if (!enabled || !this.supportsBiometric) {
-        this.form.controls.biometric.setValue(false, { emitEvent: false });
-        await this.biometricStateService.setBiometricUnlockEnabled(false);
-        await this.keyService.refreshAdditionalKeys();
-        return;
-      }
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    if (!enabled || !this.supportsBiometric) {
+      this.form.controls.biometric.setValue(false, { emitEvent: false });
+      await this.biometricStateService.setBiometricUnlockEnabled(false);
+      await this.keyService.refreshAdditionalKeys(activeUserId);
+      return;
+    }
 
-      const status = await this.biometricsService.getBiometricsStatus();
+    const status = await this.biometricsService.getBiometricsStatus();
 
-      if (status === BiometricsStatus.AutoSetupNeeded) {
-        await this.biometricsService.setupBiometrics();
-      } else if (status === BiometricsStatus.ManualSetupNeeded) {
-        const confirmed = await this.dialogService.openSimpleDialog({
-          title: { key: "biometricsManualSetupTitle" },
-          content: { key: "biometricsManualSetupDesc" },
-          type: "warning",
-        });
-        if (confirmed) {
-          this.platformUtilsService.launchUri("https://bitwarden.com/help/biometrics/");
-        }
-        return;
+    if (status === BiometricsStatus.AutoSetupNeeded) {
+      await this.biometricsService.setupBiometrics();
+    } else if (status === BiometricsStatus.ManualSetupNeeded) {
+      const confirmed = await this.dialogService.openSimpleDialog({
+        title: { key: "biometricsManualSetupTitle" },
+        content: { key: "biometricsManualSetupDesc" },
+        type: "warning",
+      });
+      if (confirmed) {
+        this.platformUtilsService.launchUri("https://bitwarden.com/help/biometrics/");
       }
+      return;
+    }
 
-      await this.biometricStateService.setBiometricUnlockEnabled(true);
-      if (this.isWindows) {
-        // Recommended settings for Windows Hello
-        this.form.controls.requirePasswordOnStart.setValue(true);
-        this.form.controls.autoPromptBiometrics.setValue(false);
-        await this.biometricStateService.setPromptAutomatically(false);
-        await this.biometricStateService.setRequirePasswordOnStart(true);
-        await this.biometricStateService.setDismissedRequirePasswordOnStartCallout();
-      } else if (this.isLinux) {
-        // Similar to Windows
-        this.form.controls.requirePasswordOnStart.setValue(true);
-        this.form.controls.autoPromptBiometrics.setValue(false);
-        await this.biometricStateService.setPromptAutomatically(false);
-        await this.biometricStateService.setRequirePasswordOnStart(true);
-        await this.biometricStateService.setDismissedRequirePasswordOnStartCallout();
-      }
-      await this.keyService.refreshAdditionalKeys();
+    await this.biometricStateService.setBiometricUnlockEnabled(true);
+    if (this.isWindows) {
+      // Recommended settings for Windows Hello
+      this.form.controls.requirePasswordOnStart.setValue(true);
+      this.form.controls.autoPromptBiometrics.setValue(false);
+      await this.biometricStateService.setPromptAutomatically(false);
+      await this.biometricStateService.setRequirePasswordOnStart(true);
+      await this.biometricStateService.setDismissedRequirePasswordOnStartCallout();
+    } else if (this.isLinux) {
+      // Similar to Windows
+      this.form.controls.requirePasswordOnStart.setValue(true);
+      this.form.controls.autoPromptBiometrics.setValue(false);
+      await this.biometricStateService.setPromptAutomatically(false);
+      await this.biometricStateService.setRequirePasswordOnStart(true);
+      await this.biometricStateService.setDismissedRequirePasswordOnStartCallout();
+    }
+    await this.keyService.refreshAdditionalKeys(activeUserId);
 
-      const activeUserId = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-      );
-      // Validate the key is stored in case biometrics fail.
-      const biometricSet =
-        (await this.biometricsService.getBiometricsStatusForUser(activeUserId)) ===
-        BiometricsStatus.Available;
-      this.form.controls.biometric.setValue(biometricSet, { emitEvent: false });
-      if (!biometricSet) {
-        await this.biometricStateService.setBiometricUnlockEnabled(false);
-      }
-    } finally {
-      this.messagingService.send("redrawMenu");
+    // Validate the key is stored in case biometrics fail.
+    const biometricSet =
+      (await this.biometricsService.getBiometricsStatusForUser(activeUserId)) ===
+      BiometricsStatus.Available;
+    this.form.controls.biometric.setValue(biometricSet, { emitEvent: false });
+    if (!biometricSet) {
+      await this.biometricStateService.setBiometricUnlockEnabled(false);
     }
   }
 
@@ -599,7 +617,8 @@ export class SettingsComponent implements OnInit, OnDestroy {
       await this.biometricStateService.setRequirePasswordOnStart(false);
     }
     await this.biometricStateService.setDismissedRequirePasswordOnStartCallout();
-    await this.keyService.refreshAdditionalKeys();
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    await this.keyService.refreshAdditionalKeys(userId);
   }
 
   async saveFavicons() {
diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts
index 938edafddd4..db3e69f7d6f 100644
--- a/apps/desktop/src/app/app-routing.module.ts
+++ b/apps/desktop/src/app/app-routing.module.ts
@@ -14,13 +14,12 @@ import {
   tdeDecryptionRequiredGuard,
   unauthGuardFn,
 } from "@bitwarden/angular/auth/guards";
-import { featureFlaggedRoute } from "@bitwarden/angular/platform/utils/feature-flagged-route";
+import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-management/change-password";
+import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.component";
+import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import {
-  AnonLayoutWrapperComponent,
-  AnonLayoutWrapperData,
   LoginComponent,
   LoginSecondaryContentComponent,
-  LockIcon,
   LoginViaAuthRequestComponent,
   PasswordHintComponent,
   RegistrationFinishComponent,
@@ -42,6 +41,7 @@ import {
   DeviceVerificationIcon,
 } from "@bitwarden/auth/angular";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { AnonLayoutWrapperComponent, AnonLayoutWrapperData, Icons } from "@bitwarden/components";
 import { LockComponent } from "@bitwarden/key-management-ui";
 
 import { maxAccountsGuardFn } from "../auth/guards/max-accounts.guard";
@@ -49,7 +49,6 @@ import { SetPasswordComponent } from "../auth/set-password.component";
 import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
 import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component";
 import { VaultV2Component } from "../vault/app/vault/vault-v2.component";
-import { VaultComponent } from "../vault/app/vault/vault.component";
 
 import { Fido2PlaceholderComponent } from "./components/fido2placeholder.component";
 import { SendComponent } from "./tools/send/send.component";
@@ -101,15 +100,11 @@ const routes: Routes = [
       },
     } satisfies RouteDataProperties & AnonLayoutWrapperData,
   },
-  ...featureFlaggedRoute({
-    defaultComponent: VaultComponent,
-    flaggedComponent: VaultV2Component,
-    featureFlag: FeatureFlag.PM18520_UpdateDesktopCipherForm,
-    routeOptions: {
-      path: "vault",
-      canActivate: [authGuard],
-    },
-  }),
+  {
+    path: "vault",
+    component: VaultV2Component,
+    canActivate: [authGuard],
+  },
   { path: "set-password", component: SetPasswordComponent },
   {
     path: "send",
@@ -119,7 +114,15 @@ const routes: Routes = [
   {
     path: "update-temp-password",
     component: UpdateTempPasswordComponent,
-    canActivate: [authGuard],
+    canActivate: [
+      canAccessFeature(
+        FeatureFlag.PM16117_ChangeExistingPasswordRefactor,
+        false,
+        `/change-password`,
+        false,
+      ),
+      authGuard,
+    ],
   },
   {
     path: "remove-password",
@@ -222,6 +225,9 @@ const routes: Routes = [
             path: "",
             component: EnvironmentSelectorComponent,
             outlet: "environment-selector",
+            data: {
+              overlayPosition: DesktopDefaultOverlayPosition,
+            },
           },
         ],
       },
@@ -242,6 +248,9 @@ const routes: Routes = [
             path: "",
             component: EnvironmentSelectorComponent,
             outlet: "environment-selector",
+            data: {
+              overlayPosition: DesktopDefaultOverlayPosition,
+            },
           },
         ],
       },
@@ -276,6 +285,9 @@ const routes: Routes = [
             path: "",
             component: EnvironmentSelectorComponent,
             outlet: "environment-selector",
+            data: {
+              overlayPosition: DesktopDefaultOverlayPosition,
+            },
           },
         ],
       },
@@ -283,7 +295,7 @@ const routes: Routes = [
         path: "lock",
         canActivate: [lockGuard()],
         data: {
-          pageIcon: LockIcon,
+          pageIcon: Icons.LockIcon,
           pageTitle: {
             key: "yourVaultIsLockedV2",
           },
@@ -308,6 +320,14 @@ const routes: Routes = [
           },
         } satisfies AnonLayoutWrapperData,
       },
+      {
+        path: "set-initial-password",
+        canActivate: [canAccessFeature(FeatureFlag.PM16117_SetInitialPasswordRefactor), authGuard],
+        component: SetInitialPasswordComponent,
+        data: {
+          maxWidth: "lg",
+        } satisfies AnonLayoutWrapperData,
+      },
       {
         path: "2fa",
         canActivate: [unauthGuardFn(), TwoFactorAuthGuard],
@@ -323,6 +343,14 @@ const routes: Routes = [
           },
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
       },
+      {
+        path: "change-password",
+        component: ChangePasswordComponent,
+        canActivate: [
+          canAccessFeature(FeatureFlag.PM16117_ChangeExistingPasswordRefactor),
+          authGuard,
+        ],
+      },
     ],
   },
 ];
diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index 77ac783ac9f..b5c34cc95a3 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -2,6 +2,7 @@
 // @ts-strict-ignore
 import {
   Component,
+  DestroyRef,
   NgZone,
   OnDestroy,
   OnInit,
@@ -25,11 +26,15 @@ import {
 import { CollectionService } from "@bitwarden/admin-console/common";
 import { DeviceTrustToastService } from "@bitwarden/angular/auth/services/device-trust-toast.service.abstraction";
 import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
+import { DocumentLangSetter } from "@bitwarden/angular/platform/i18n";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { FingerprintDialogComponent, LoginApprovalComponent } from "@bitwarden/auth/angular";
-import { DESKTOP_SSO_CALLBACK, LogoutReason } from "@bitwarden/auth/common";
+import {
+  DESKTOP_SSO_CALLBACK,
+  LogoutReason,
+  UserDecryptionOptionsServiceAbstraction,
+} from "@bitwarden/auth/common";
 import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -61,6 +66,7 @@ import { SyncService } from "@bitwarden/common/platform/sync";
 import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { DialogRef, DialogService, ToastOptions, ToastService } from "@bitwarden/components";
 import { CredentialGeneratorHistoryDialogComponent } from "@bitwarden/generator-components";
@@ -163,8 +169,14 @@ export class AppComponent implements OnInit, OnDestroy {
     private accountService: AccountService,
     private organizationService: OrganizationService,
     private deviceTrustToastService: DeviceTrustToastService,
+    private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
+    private readonly destroyRef: DestroyRef,
+    private readonly documentLangSetter: DocumentLangSetter,
   ) {
     this.deviceTrustToastService.setupListeners$.pipe(takeUntilDestroyed()).subscribe();
+
+    const langSubscription = this.documentLangSetter.start();
+    this.destroyRef.onDestroy(() => langSubscription.unsubscribe());
   }
 
   ngOnInit() {
@@ -409,15 +421,35 @@ export class AppComponent implements OnInit, OnDestroy {
             this.router.navigate(["/remove-password"]);
             break;
           case "switchAccount": {
-            if (message.userId != null) {
-              await this.accountService.switchAccount(message.userId);
+            if (message.userId == null) {
+              this.logService.error("'switchAccount' message received without userId.");
+              return;
             }
+
+            await this.accountService.switchAccount(message.userId);
+
             const locked =
               (await this.authService.getAuthStatus(message.userId)) ===
               AuthenticationStatus.Locked;
             if (locked) {
               this.modalService.closeAll();
-              await this.router.navigate(["lock"]);
+
+              // We only have to handle TDE lock on "switchAccount" message scenarios but not normal
+              // lock scenarios since the user will have always decrypted the vault at least once in those cases.
+              const tdeEnabled = await firstValueFrom(
+                this.userDecryptionOptionsService
+                  .userDecryptionOptionsById$(message.userId)
+                  .pipe(map((decryptionOptions) => decryptionOptions?.trustedDeviceOption != null)),
+              );
+
+              const everHadUserKey = await firstValueFrom(
+                this.keyService.everHadUserKey$(message.userId),
+              );
+              if (tdeEnabled && !everHadUserKey) {
+                await this.router.navigate(["login-initiated"]);
+              } else {
+                await this.router.navigate(["lock"]);
+              }
             } else {
               this.messagingService.send("unlocked");
               this.loading = true;
@@ -593,6 +625,8 @@ export class AppComponent implements OnInit, OnDestroy {
     }
   }
 
+  // TODO: PM-21212 - consolidate the logic of this method into the new LogoutService
+  // (requires creating a desktop specific implementation of the LogoutService)
   // Even though the userId parameter is no longer optional doesn't mean a message couldn't be
   // passing null-ish values to us.
   private async logOut(logoutReason: LogoutReason, userId: UserId) {
diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts
index 9b2472106dd..112732d8f2c 100644
--- a/apps/desktop/src/app/app.module.ts
+++ b/apps/desktop/src/app/app.module.ts
@@ -9,6 +9,7 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { ColorPasswordCountPipe } from "@bitwarden/angular/pipes/color-password-count.pipe";
 import { ColorPasswordPipe } from "@bitwarden/angular/pipes/color-password.pipe";
 import { CalloutModule, DialogModule } from "@bitwarden/components";
+import { AssignCollectionsComponent } from "@bitwarden/vault";
 
 import { DeleteAccountComponent } from "../auth/delete-account.component";
 import { LoginModule } from "../auth/login/login.module";
@@ -17,19 +18,8 @@ import { UpdateTempPasswordComponent } from "../auth/update-temp-password.compon
 import { SshAgentService } from "../autofill/services/ssh-agent.service";
 import { PremiumComponent } from "../billing/app/accounts/premium.component";
 import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component";
-import { AddEditCustomFieldsComponent } from "../vault/app/vault/add-edit-custom-fields.component";
-import { AddEditComponent } from "../vault/app/vault/add-edit.component";
-import { AttachmentsComponent } from "../vault/app/vault/attachments.component";
-import { CollectionsComponent } from "../vault/app/vault/collections.component";
-import { FolderAddEditComponent } from "../vault/app/vault/folder-add-edit.component";
-import { PasswordHistoryComponent } from "../vault/app/vault/password-history.component";
-import { ShareComponent } from "../vault/app/vault/share.component";
 import { VaultFilterModule } from "../vault/app/vault/vault-filter/vault-filter.module";
-import { VaultItemsComponent } from "../vault/app/vault/vault-items.component";
 import { VaultV2Component } from "../vault/app/vault/vault-v2.component";
-import { VaultComponent } from "../vault/app/vault/vault.component";
-import { ViewCustomFieldsComponent } from "../vault/app/vault/view-custom-fields.component";
-import { ViewComponent } from "../vault/app/vault/view.component";
 
 import { SettingsComponent } from "./accounts/settings.component";
 import { VaultTimeoutInputComponent } from "./accounts/vault-timeout-input.component";
@@ -55,32 +45,22 @@ import { SharedModule } from "./shared/shared.module";
     DeleteAccountComponent,
     UserVerificationComponent,
     NavComponent,
+    AssignCollectionsComponent,
     VaultV2Component,
   ],
   declarations: [
     AccountSwitcherComponent,
-    AddEditComponent,
-    AddEditCustomFieldsComponent,
     AppComponent,
-    AttachmentsComponent,
-    CollectionsComponent,
     ColorPasswordPipe,
     ColorPasswordCountPipe,
-    FolderAddEditComponent,
     HeaderComponent,
-    PasswordHistoryComponent,
     PremiumComponent,
     RemovePasswordComponent,
     SearchComponent,
     SetPasswordComponent,
     SettingsComponent,
-    ShareComponent,
     UpdateTempPasswordComponent,
-    VaultComponent,
-    VaultItemsComponent,
     VaultTimeoutInputComponent,
-    ViewCustomFieldsComponent,
-    ViewComponent,
   ],
   providers: [SshAgentService],
   bootstrap: [AppComponent],
diff --git a/apps/desktop/src/app/components/browser-sync-verification-dialog.component.ts b/apps/desktop/src/app/components/browser-sync-verification-dialog.component.ts
index 1f456aee4bb..713dc07e803 100644
--- a/apps/desktop/src/app/components/browser-sync-verification-dialog.component.ts
+++ b/apps/desktop/src/app/components/browser-sync-verification-dialog.component.ts
@@ -9,7 +9,6 @@ export type BrowserSyncVerificationDialogParams = {
 
 @Component({
   templateUrl: "browser-sync-verification-dialog.component.html",
-  standalone: true,
   imports: [JslibModule, ButtonModule, DialogModule],
 })
 export class BrowserSyncVerificationDialogComponent {
diff --git a/apps/desktop/src/app/components/user-verification.component.ts b/apps/desktop/src/app/components/user-verification.component.ts
index 2a005f636f3..31d38b10183 100644
--- a/apps/desktop/src/app/components/user-verification.component.ts
+++ b/apps/desktop/src/app/components/user-verification.component.ts
@@ -13,7 +13,6 @@ import { FormFieldModule } from "@bitwarden/components";
  */
 @Component({
   selector: "app-user-verification",
-  standalone: true,
   imports: [CommonModule, JslibModule, ReactiveFormsModule, FormFieldModule, FormsModule],
   templateUrl: "user-verification.component.html",
   providers: [
diff --git a/apps/desktop/src/app/components/verify-native-messaging-dialog.component.ts b/apps/desktop/src/app/components/verify-native-messaging-dialog.component.ts
index 36c8d9b173a..72284d007b6 100644
--- a/apps/desktop/src/app/components/verify-native-messaging-dialog.component.ts
+++ b/apps/desktop/src/app/components/verify-native-messaging-dialog.component.ts
@@ -9,7 +9,6 @@ export type VerifyNativeMessagingDialogData = {
 
 @Component({
   templateUrl: "verify-native-messaging-dialog.component.html",
-  standalone: true,
   imports: [JslibModule, ButtonModule, DialogModule],
 })
 export class VerifyNativeMessagingDialogComponent {
diff --git a/apps/desktop/src/app/layout/nav.component.ts b/apps/desktop/src/app/layout/nav.component.ts
index dbc399c051d..bcc2b57fb17 100644
--- a/apps/desktop/src/app/layout/nav.component.ts
+++ b/apps/desktop/src/app/layout/nav.component.ts
@@ -7,7 +7,6 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 @Component({
   selector: "app-nav",
   templateUrl: "nav.component.html",
-  standalone: true,
   imports: [CommonModule, RouterLink, RouterLinkActive],
 })
 export class NavComponent {
diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts
index cfab600505e..4111a62d3b2 100644
--- a/apps/desktop/src/app/services/services.module.ts
+++ b/apps/desktop/src/app/services/services.module.ts
@@ -5,6 +5,7 @@ import { Router } from "@angular/router";
 import { Subject, merge } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
+import { SetInitialPasswordService } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.service.abstraction";
 import { SafeProvider, safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
 import {
   SECURE_STORAGE,
@@ -114,10 +115,10 @@ import { DesktopAutofillService } from "../../autofill/services/desktop-autofill
 import { DesktopFido2UserInterfaceService } from "../../autofill/services/desktop-fido2-user-interface.service";
 import { DesktopBiometricsService } from "../../key-management/biometrics/desktop.biometrics.service";
 import { RendererBiometricsService } from "../../key-management/biometrics/renderer-biometrics.service";
+import { ElectronKeyService } from "../../key-management/electron-key.service";
 import { DesktopLockComponentService } from "../../key-management/lock/services/desktop-lock-component.service";
 import { flagEnabled } from "../../platform/flags";
 import { DesktopSettingsService } from "../../platform/services/desktop-settings.service";
-import { ElectronKeyService } from "../../platform/services/electron-key.service";
 import { ElectronLogRendererService } from "../../platform/services/electron-log.renderer.service";
 import {
   ELECTRON_SUPPORTS_SECURE_STORAGE,
@@ -140,6 +141,7 @@ import { DesktopSetPasswordJitService } from "./desktop-set-password-jit.service
 import { InitService } from "./init.service";
 import { NativeMessagingManifestService } from "./native-messaging-manifest.service";
 import { RendererCryptoFunctionService } from "./renderer-crypto-function.service";
+import { DesktopSetInitialPasswordService } from "./set-initial-password/desktop-set-initial-password.service";
 
 const RELOAD_CALLBACK = new SafeInjectionToken<() => any>("RELOAD_CALLBACK");
 
@@ -380,18 +382,34 @@ const safeProviders: SafeProvider[] = [
     provide: SetPasswordJitService,
     useClass: DesktopSetPasswordJitService,
     deps: [
-      ApiService,
-      MasterPasswordApiService,
-      KeyService,
       EncryptService,
       I18nServiceAbstraction,
       KdfConfigService,
+      KeyService,
+      MasterPasswordApiService,
       InternalMasterPasswordServiceAbstraction,
       OrganizationApiServiceAbstraction,
       OrganizationUserApiService,
       InternalUserDecryptionOptionsServiceAbstraction,
     ],
   }),
+  safeProvider({
+    provide: SetInitialPasswordService,
+    useClass: DesktopSetInitialPasswordService,
+    deps: [
+      ApiService,
+      EncryptService,
+      I18nServiceAbstraction,
+      KdfConfigService,
+      KeyService,
+      MasterPasswordApiService,
+      InternalMasterPasswordServiceAbstraction,
+      OrganizationApiServiceAbstraction,
+      OrganizationUserApiService,
+      InternalUserDecryptionOptionsServiceAbstraction,
+      MessagingServiceAbstraction,
+    ],
+  }),
   safeProvider({
     provide: SsoUrlService,
     useClass: SsoUrlService,
diff --git a/apps/desktop/src/app/services/set-initial-password/desktop-set-initial-password.service.spec.ts b/apps/desktop/src/app/services/set-initial-password/desktop-set-initial-password.service.spec.ts
new file mode 100644
index 00000000000..02438300e94
--- /dev/null
+++ b/apps/desktop/src/app/services/set-initial-password/desktop-set-initial-password.service.spec.ts
@@ -0,0 +1,177 @@
+import { MockProxy, mock } from "jest-mock-extended";
+import { BehaviorSubject, of } from "rxjs";
+
+import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
+import {
+  SetInitialPasswordCredentials,
+  SetInitialPasswordService,
+  SetInitialPasswordUserType,
+} from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.service.abstraction";
+import {
+  FakeUserDecryptionOptions as UserDecryptionOptions,
+  InternalUserDecryptionOptionsServiceAbstraction,
+} from "@bitwarden/auth/common";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
+import { SetPasswordRequest } from "@bitwarden/common/auth/models/request/set-password.request";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { KeysRequest } from "@bitwarden/common/models/request/keys.request";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { CsprngArray } from "@bitwarden/common/types/csprng";
+import { UserId } from "@bitwarden/common/types/guid";
+import { MasterKey, UserKey } from "@bitwarden/common/types/key";
+import { DEFAULT_KDF_CONFIG, KdfConfigService, KeyService } from "@bitwarden/key-management";
+
+import { DesktopSetInitialPasswordService } from "./desktop-set-initial-password.service";
+
+describe("DesktopSetInitialPasswordService", () => {
+  let sut: SetInitialPasswordService;
+
+  let apiService: MockProxy<ApiService>;
+  let encryptService: MockProxy<EncryptService>;
+  let i18nService: MockProxy<I18nService>;
+  let kdfConfigService: MockProxy<KdfConfigService>;
+  let keyService: MockProxy<KeyService>;
+  let masterPasswordApiService: MockProxy<MasterPasswordApiService>;
+  let masterPasswordService: MockProxy<InternalMasterPasswordServiceAbstraction>;
+  let organizationApiService: MockProxy<OrganizationApiServiceAbstraction>;
+  let organizationUserApiService: MockProxy<OrganizationUserApiService>;
+  let userDecryptionOptionsService: MockProxy<InternalUserDecryptionOptionsServiceAbstraction>;
+  let messagingService: MockProxy<MessagingService>;
+
+  beforeEach(() => {
+    apiService = mock<ApiService>();
+    encryptService = mock<EncryptService>();
+    i18nService = mock<I18nService>();
+    kdfConfigService = mock<KdfConfigService>();
+    keyService = mock<KeyService>();
+    masterPasswordApiService = mock<MasterPasswordApiService>();
+    masterPasswordService = mock<InternalMasterPasswordServiceAbstraction>();
+    organizationApiService = mock<OrganizationApiServiceAbstraction>();
+    organizationUserApiService = mock<OrganizationUserApiService>();
+    userDecryptionOptionsService = mock<InternalUserDecryptionOptionsServiceAbstraction>();
+    messagingService = mock<MessagingService>();
+
+    sut = new DesktopSetInitialPasswordService(
+      apiService,
+      encryptService,
+      i18nService,
+      kdfConfigService,
+      keyService,
+      masterPasswordApiService,
+      masterPasswordService,
+      organizationApiService,
+      organizationUserApiService,
+      userDecryptionOptionsService,
+      messagingService,
+    );
+  });
+
+  it("should instantiate", () => {
+    expect(sut).not.toBeFalsy();
+  });
+
+  describe("setInitialPassword(...)", () => {
+    // Mock function parameters
+    let credentials: SetInitialPasswordCredentials;
+    let userType: SetInitialPasswordUserType;
+    let userId: UserId;
+
+    // Mock other function data
+    let userKey: UserKey;
+    let userKeyEncString: EncString;
+    let masterKeyEncryptedUserKey: [UserKey, EncString];
+
+    let keyPair: [string, EncString];
+    let keysRequest: KeysRequest;
+
+    let userDecryptionOptions: UserDecryptionOptions;
+    let userDecryptionOptionsSubject: BehaviorSubject<UserDecryptionOptions>;
+    let setPasswordRequest: SetPasswordRequest;
+
+    beforeEach(() => {
+      // Mock function parameters
+      credentials = {
+        newMasterKey: new SymmetricCryptoKey(new Uint8Array(32).buffer as CsprngArray) as MasterKey,
+        newServerMasterKeyHash: "newServerMasterKeyHash",
+        newLocalMasterKeyHash: "newLocalMasterKeyHash",
+        newPasswordHint: "newPasswordHint",
+        kdfConfig: DEFAULT_KDF_CONFIG,
+        orgSsoIdentifier: "orgSsoIdentifier",
+        orgId: "orgId",
+        resetPasswordAutoEnroll: false,
+      };
+      userId = "userId" as UserId;
+      userType = SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER;
+
+      // Mock other function data
+      userKey = new SymmetricCryptoKey(new Uint8Array(64).buffer as CsprngArray) as UserKey;
+      userKeyEncString = new EncString("masterKeyEncryptedUserKey");
+      masterKeyEncryptedUserKey = [userKey, userKeyEncString];
+
+      keyPair = ["publicKey", new EncString("privateKey")];
+      keysRequest = new KeysRequest(keyPair[0], keyPair[1].encryptedString);
+
+      userDecryptionOptions = new UserDecryptionOptions({ hasMasterPassword: true });
+      userDecryptionOptionsSubject = new BehaviorSubject(userDecryptionOptions);
+      userDecryptionOptionsService.userDecryptionOptions$ = userDecryptionOptionsSubject;
+
+      setPasswordRequest = new SetPasswordRequest(
+        credentials.newServerMasterKeyHash,
+        masterKeyEncryptedUserKey[1].encryptedString,
+        credentials.newPasswordHint,
+        credentials.orgSsoIdentifier,
+        keysRequest,
+        credentials.kdfConfig.kdfType,
+        credentials.kdfConfig.iterations,
+      );
+    });
+
+    function setupMocks() {
+      // Mock makeMasterKeyEncryptedUserKey() values
+      keyService.userKey$.mockReturnValue(of(userKey));
+      keyService.encryptUserKeyWithMasterKey.mockResolvedValue(masterKeyEncryptedUserKey);
+
+      // Mock keyPair values
+      keyService.userPrivateKey$.mockReturnValue(of(null));
+      keyService.userPublicKey$.mockReturnValue(of(null));
+      keyService.makeKeyPair.mockResolvedValue(keyPair);
+    }
+
+    describe("given the initial password was successfully set", () => {
+      it("should send a 'redrawMenu' message", async () => {
+        // Arrange
+        setupMocks();
+
+        // Act
+        await sut.setInitialPassword(credentials, userType, userId);
+
+        // Assert
+        expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+        expect(messagingService.send).toHaveBeenCalledTimes(1);
+        expect(messagingService.send).toHaveBeenCalledWith("redrawMenu");
+      });
+    });
+
+    describe("given the initial password was NOT successfully set (due to some error in setInitialPassword())", () => {
+      it("should NOT send a 'redrawMenu' message", async () => {
+        // Arrange
+        credentials.newMasterKey = null; // will trigger an error in setInitialPassword()
+        setupMocks();
+
+        // Act
+        const promise = sut.setInitialPassword(credentials, userType, userId);
+
+        // Assert
+        await expect(promise).rejects.toThrow();
+        expect(masterPasswordApiService.setPassword).not.toHaveBeenCalled();
+        expect(messagingService.send).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/apps/desktop/src/app/services/set-initial-password/desktop-set-initial-password.service.ts b/apps/desktop/src/app/services/set-initial-password/desktop-set-initial-password.service.ts
new file mode 100644
index 00000000000..8de7e73fafe
--- /dev/null
+++ b/apps/desktop/src/app/services/set-initial-password/desktop-set-initial-password.service.ts
@@ -0,0 +1,59 @@
+import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
+import { DefaultSetInitialPasswordService } from "@bitwarden/angular/auth/password-management/set-initial-password/default-set-initial-password.service.implementation";
+import {
+  SetInitialPasswordCredentials,
+  SetInitialPasswordService,
+  SetInitialPasswordUserType,
+} from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.service.abstraction";
+import { InternalUserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { UserId } from "@bitwarden/common/types/guid";
+import { KdfConfigService, KeyService } from "@bitwarden/key-management";
+
+export class DesktopSetInitialPasswordService
+  extends DefaultSetInitialPasswordService
+  implements SetInitialPasswordService
+{
+  constructor(
+    protected apiService: ApiService,
+    protected encryptService: EncryptService,
+    protected i18nService: I18nService,
+    protected kdfConfigService: KdfConfigService,
+    protected keyService: KeyService,
+    protected masterPasswordApiService: MasterPasswordApiService,
+    protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
+    protected organizationApiService: OrganizationApiServiceAbstraction,
+    protected organizationUserApiService: OrganizationUserApiService,
+    protected userDecryptionOptionsService: InternalUserDecryptionOptionsServiceAbstraction,
+    private messagingService: MessagingService,
+  ) {
+    super(
+      apiService,
+      encryptService,
+      i18nService,
+      kdfConfigService,
+      keyService,
+      masterPasswordApiService,
+      masterPasswordService,
+      organizationApiService,
+      organizationUserApiService,
+      userDecryptionOptionsService,
+    );
+  }
+
+  override async setInitialPassword(
+    credentials: SetInitialPasswordCredentials,
+    userType: SetInitialPasswordUserType,
+    userId: UserId,
+  ) {
+    await super.setInitialPassword(credentials, userType, userId);
+
+    this.messagingService.send("redrawMenu");
+  }
+}
diff --git a/apps/desktop/src/app/tools/export/export-desktop.component.ts b/apps/desktop/src/app/tools/export/export-desktop.component.ts
index 11651111492..03afb154200 100644
--- a/apps/desktop/src/app/tools/export/export-desktop.component.ts
+++ b/apps/desktop/src/app/tools/export/export-desktop.component.ts
@@ -7,7 +7,6 @@ import { ExportComponent } from "@bitwarden/vault-export-ui";
 
 @Component({
   templateUrl: "export-desktop.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/apps/desktop/src/app/tools/generator/credential-generator.component.ts b/apps/desktop/src/app/tools/generator/credential-generator.component.ts
index aed8bf18684..4124b2439da 100644
--- a/apps/desktop/src/app/tools/generator/credential-generator.component.ts
+++ b/apps/desktop/src/app/tools/generator/credential-generator.component.ts
@@ -14,7 +14,6 @@ import {
 } from "@bitwarden/generator-components";
 
 @Component({
-  standalone: true,
   selector: "credential-generator",
   templateUrl: "credential-generator.component.html",
   imports: [DialogModule, ButtonModule, JslibModule, GeneratorModule, ItemModule, LinkModule],
diff --git a/apps/desktop/src/app/tools/import/import-desktop.component.ts b/apps/desktop/src/app/tools/import/import-desktop.component.ts
index 7d0780bf0df..c1639c6d3ec 100644
--- a/apps/desktop/src/app/tools/import/import-desktop.component.ts
+++ b/apps/desktop/src/app/tools/import/import-desktop.component.ts
@@ -7,7 +7,6 @@ import { ImportComponent } from "@bitwarden/importer-ui";
 
 @Component({
   templateUrl: "import-desktop.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/apps/desktop/src/app/tools/send/add-edit.component.ts b/apps/desktop/src/app/tools/send/add-edit.component.ts
index c0db3934259..025bab66539 100644
--- a/apps/desktop/src/app/tools/send/add-edit.component.ts
+++ b/apps/desktop/src/app/tools/send/add-edit.component.ts
@@ -22,7 +22,6 @@ import { CalloutModule, DialogService, ToastService } from "@bitwarden/component
 @Component({
   selector: "app-send-add-edit",
   templateUrl: "add-edit.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, ReactiveFormsModule, CalloutModule],
 })
 export class AddEditComponent extends BaseAddEditComponent {
diff --git a/apps/desktop/src/app/tools/send/send.component.ts b/apps/desktop/src/app/tools/send/send.component.ts
index 6c2c3ed53c6..0146a5e62ea 100644
--- a/apps/desktop/src/app/tools/send/send.component.ts
+++ b/apps/desktop/src/app/tools/send/send.component.ts
@@ -6,7 +6,6 @@ import { FormsModule } from "@angular/forms";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { SendComponent as BaseSendComponent } from "@bitwarden/angular/tools/send/send.component";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
@@ -17,6 +16,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
 import { invokeMenu, RendererMenuItem } from "../../../utils";
@@ -38,7 +38,6 @@ const BroadcasterSubscriptionId = "SendComponent";
 @Component({
   selector: "app-send",
   templateUrl: "send.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, FormsModule, NavComponent, AddEditComponent],
 })
 export class SendComponent extends BaseSendComponent implements OnInit, OnDestroy {
diff --git a/apps/desktop/src/auth/components/set-pin.component.ts b/apps/desktop/src/auth/components/set-pin.component.ts
index a5221442a3f..93e1ea0d25c 100644
--- a/apps/desktop/src/auth/components/set-pin.component.ts
+++ b/apps/desktop/src/auth/components/set-pin.component.ts
@@ -13,7 +13,6 @@ import {
   IconButtonModule,
 } from "@bitwarden/components";
 @Component({
-  standalone: true,
   templateUrl: "set-pin.component.html",
   imports: [
     DialogModule,
diff --git a/apps/desktop/src/auth/delete-account.component.ts b/apps/desktop/src/auth/delete-account.component.ts
index cfa47ef33e5..b6c6650375d 100644
--- a/apps/desktop/src/auth/delete-account.component.ts
+++ b/apps/desktop/src/auth/delete-account.component.ts
@@ -22,7 +22,6 @@ import { UserVerificationComponent } from "../app/components/user-verification.c
 
 @Component({
   selector: "app-delete-account",
-  standalone: true,
   templateUrl: "delete-account.component.html",
   imports: [
     JslibModule,
diff --git a/apps/desktop/src/auth/login/desktop-login-component.service.ts b/apps/desktop/src/auth/login/desktop-login-component.service.ts
index 60e7791b384..d7e7ba0178b 100644
--- a/apps/desktop/src/auth/login/desktop-login-component.service.ts
+++ b/apps/desktop/src/auth/login/desktop-login-component.service.ts
@@ -84,7 +84,7 @@ export class DesktopLoginComponentService
     } catch (err) {
       this.toastService.showToast({
         variant: "error",
-        title: this.i18nService.t("errorOccured"),
+        title: this.i18nService.t("errorOccurred"),
         message: this.i18nService.t("ssoError"),
       });
     }
diff --git a/apps/desktop/src/auth/set-password.component.ts b/apps/desktop/src/auth/set-password.component.ts
index 48b18d7294c..55ad1f48a77 100644
--- a/apps/desktop/src/auth/set-password.component.ts
+++ b/apps/desktop/src/auth/set-password.component.ts
@@ -4,7 +4,6 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
 import { SetPasswordComponent as BaseSetPasswordComponent } from "@bitwarden/angular/auth/components/set-password.component";
 import { InternalUserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
@@ -32,52 +31,50 @@ const BroadcasterSubscriptionId = "SetPasswordComponent";
 })
 export class SetPasswordComponent extends BaseSetPasswordComponent implements OnInit, OnDestroy {
   constructor(
-    accountService: AccountService,
-    masterPasswordService: InternalMasterPasswordServiceAbstraction,
-    apiService: ApiService,
-    i18nService: I18nService,
-    keyService: KeyService,
-    messagingService: MessagingService,
-    platformUtilsService: PlatformUtilsService,
-    policyApiService: PolicyApiServiceAbstraction,
-    policyService: PolicyService,
-    router: Router,
-    masterPasswordApiService: MasterPasswordApiService,
-    syncService: SyncService,
-    route: ActivatedRoute,
+    protected accountService: AccountService,
+    protected dialogService: DialogService,
+    protected encryptService: EncryptService,
+    protected i18nService: I18nService,
+    protected kdfConfigService: KdfConfigService,
+    protected keyService: KeyService,
+    protected masterPasswordApiService: MasterPasswordApiService,
+    protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
+    protected messagingService: MessagingService,
+    protected organizationApiService: OrganizationApiServiceAbstraction,
+    protected organizationUserApiService: OrganizationUserApiService,
+    protected platformUtilsService: PlatformUtilsService,
+    protected policyApiService: PolicyApiServiceAbstraction,
+    protected policyService: PolicyService,
+    protected route: ActivatedRoute,
+    protected router: Router,
+    protected ssoLoginService: SsoLoginServiceAbstraction,
+    protected syncService: SyncService,
+    protected toastService: ToastService,
+    protected userDecryptionOptionsService: InternalUserDecryptionOptionsServiceAbstraction,
     private broadcasterService: BroadcasterService,
     private ngZone: NgZone,
-    organizationApiService: OrganizationApiServiceAbstraction,
-    organizationUserApiService: OrganizationUserApiService,
-    userDecryptionOptionsService: InternalUserDecryptionOptionsServiceAbstraction,
-    ssoLoginService: SsoLoginServiceAbstraction,
-    dialogService: DialogService,
-    kdfConfigService: KdfConfigService,
-    encryptService: EncryptService,
-    toastService: ToastService,
   ) {
     super(
       accountService,
-      masterPasswordService,
+      dialogService,
+      encryptService,
       i18nService,
+      kdfConfigService,
       keyService,
+      masterPasswordApiService,
+      masterPasswordService,
       messagingService,
+      organizationApiService,
+      organizationUserApiService,
       platformUtilsService,
       policyApiService,
       policyService,
-      router,
-      masterPasswordApiService,
-      apiService,
-      syncService,
       route,
-      organizationApiService,
-      organizationUserApiService,
-      userDecryptionOptionsService,
+      router,
       ssoLoginService,
-      dialogService,
-      kdfConfigService,
-      encryptService,
+      syncService,
       toastService,
+      userDecryptionOptionsService,
     );
   }
 
diff --git a/apps/desktop/src/autofill/services/desktop-autofill.service.ts b/apps/desktop/src/autofill/services/desktop-autofill.service.ts
index d6dddf3b23f..5500bc58f5a 100644
--- a/apps/desktop/src/autofill/services/desktop-autofill.service.ts
+++ b/apps/desktop/src/autofill/services/desktop-autofill.service.ts
@@ -1,5 +1,4 @@
 import { Injectable, OnDestroy } from "@angular/core";
-import { autofill } from "desktop_native/napi";
 import {
   Subject,
   distinctUntilChanged,
@@ -33,6 +32,7 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { autofill } from "@bitwarden/desktop-napi";
 
 import { NativeAutofillStatusCommand } from "../../platform/main/autofill/status.command";
 import {
@@ -209,7 +209,7 @@ export class DesktopAutofillService implements OnDestroy {
           }
 
           request.credentialId = Array.from(
-            parseCredentialId(decrypted.login.fido2Credentials?.[0].credentialId),
+            new Uint8Array(parseCredentialId(decrypted.login.fido2Credentials?.[0].credentialId)),
           );
         }
 
@@ -336,12 +336,12 @@ export class DesktopAutofillService implements OnDestroy {
     response: Fido2AuthenticatorGetAssertionResult,
   ): autofill.PasskeyAssertionResponse {
     return {
-      userHandle: Array.from(response.selectedCredential.userHandle),
+      userHandle: Array.from(new Uint8Array(response.selectedCredential.userHandle)),
       rpId: request.rpId,
-      signature: Array.from(response.signature),
+      signature: Array.from(new Uint8Array(response.signature)),
       clientDataHash: request.clientDataHash,
-      authenticatorData: Array.from(response.authenticatorData),
-      credentialId: Array.from(response.selectedCredential.id),
+      authenticatorData: Array.from(new Uint8Array(response.authenticatorData)),
+      credentialId: Array.from(new Uint8Array(response.selectedCredential.id)),
     };
   }
 
diff --git a/apps/desktop/src/autofill/services/ssh-agent.service.ts b/apps/desktop/src/autofill/services/ssh-agent.service.ts
index d6ae5b0ffa2..3909e76689a 100644
--- a/apps/desktop/src/autofill/services/ssh-agent.service.ts
+++ b/apps/desktop/src/autofill/services/ssh-agent.service.ts
@@ -63,9 +63,16 @@ export class SshAgentService implements OnDestroy {
   ) {}
 
   async init() {
-    if (!(await ipc.platform.sshAgent.isLoaded())) {
-      await ipc.platform.sshAgent.init();
-    }
+    this.desktopSettingsService.sshAgentEnabled$
+      .pipe(
+        concatMap(async (enabled) => {
+          if (!(await ipc.platform.sshAgent.isLoaded()) && enabled) {
+            await ipc.platform.sshAgent.init();
+          }
+        }),
+        takeUntil(this.destroy$),
+      )
+      .subscribe();
 
     await this.initListeners();
   }
diff --git a/apps/desktop/src/key-management/biometrics/desktop.biometrics.service.ts b/apps/desktop/src/key-management/biometrics/desktop.biometrics.service.ts
index 6415443bfbc..97e1d322a0e 100644
--- a/apps/desktop/src/key-management/biometrics/desktop.biometrics.service.ts
+++ b/apps/desktop/src/key-management/biometrics/desktop.biometrics.service.ts
@@ -1,3 +1,4 @@
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserId } from "@bitwarden/common/types/guid";
 import { BiometricsService } from "@bitwarden/key-management";
 
@@ -6,10 +7,10 @@ import { BiometricsService } from "@bitwarden/key-management";
  * specifically for the main process.
  */
 export abstract class DesktopBiometricsService extends BiometricsService {
-  abstract setBiometricProtectedUnlockKeyForUser(userId: UserId, value: string): Promise<void>;
+  abstract setBiometricProtectedUnlockKeyForUser(
+    userId: UserId,
+    value: SymmetricCryptoKey,
+  ): Promise<void>;
   abstract deleteBiometricUnlockKeyForUser(userId: UserId): Promise<void>;
-
   abstract setupBiometrics(): Promise<void>;
-
-  abstract setClientKeyHalfForUser(userId: UserId, value: string | null): Promise<void>;
 }
diff --git a/apps/desktop/src/key-management/biometrics/main-biometrics-ipc.listener.ts b/apps/desktop/src/key-management/biometrics/main-biometrics-ipc.listener.ts
index fe40aad54d9..d4ce01f53f4 100644
--- a/apps/desktop/src/key-management/biometrics/main-biometrics-ipc.listener.ts
+++ b/apps/desktop/src/key-management/biometrics/main-biometrics-ipc.listener.ts
@@ -1,5 +1,6 @@
 import { ipcMain } from "electron";
 
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 import { UserId } from "@bitwarden/common/types/guid";
 
@@ -37,17 +38,12 @@ export class MainBiometricsIPCListener {
             }
             return await this.biometricService.setBiometricProtectedUnlockKeyForUser(
               message.userId as UserId,
-              message.key,
+              SymmetricCryptoKey.fromString(message.key),
             );
           case BiometricAction.RemoveKeyForUser:
             return await this.biometricService.deleteBiometricUnlockKeyForUser(
               message.userId as UserId,
             );
-          case BiometricAction.SetClientKeyHalf:
-            return await this.biometricService.setClientKeyHalfForUser(
-              message.userId as UserId,
-              message.key,
-            );
           case BiometricAction.Setup:
             return await this.biometricService.setupBiometrics();
 
@@ -59,7 +55,7 @@ export class MainBiometricsIPCListener {
             return;
         }
       } catch (e) {
-        this.logService.info(e);
+        this.logService.error("[Main Biometrics IPC Listener] %s failed", message.action, e);
       }
     });
   }
diff --git a/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts b/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts
index 09a4dcef4b3..213f3d48a98 100644
--- a/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts
+++ b/apps/desktop/src/key-management/biometrics/main-biometrics.service.spec.ts
@@ -1,10 +1,10 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { EncryptionType } from "@bitwarden/common/platform/enums";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserId } from "@bitwarden/common/types/guid";
 import {
   BiometricsService,
@@ -13,6 +13,7 @@ import {
 } from "@bitwarden/key-management";
 
 import { WindowMain } from "../../main/window.main";
+import { MainCryptoFunctionService } from "../../platform/main/main-crypto-function.service";
 
 import { MainBiometricsService } from "./main-biometrics.service";
 import OsBiometricsServiceLinux from "./os-biometrics-linux.service";
@@ -27,21 +28,25 @@ jest.mock("@bitwarden/desktop-napi", () => {
   };
 });
 
+const unlockKey = new SymmetricCryptoKey(new Uint8Array(64));
+
 describe("MainBiometricsService", function () {
   const i18nService = mock<I18nService>();
   const windowMain = mock<WindowMain>();
   const logService = mock<LogService>();
-  const messagingService = mock<MessagingService>();
   const biometricStateService = mock<BiometricStateService>();
+  const cryptoFunctionService = mock<MainCryptoFunctionService>();
+  const encryptService = mock<EncryptService>();
 
   it("Should call the platformspecific methods", async () => {
     const sut = new MainBiometricsService(
       i18nService,
       windowMain,
       logService,
-      messagingService,
       process.platform,
       biometricStateService,
+      encryptService,
+      cryptoFunctionService,
     );
 
     const mockService = mock<OsBiometricService>();
@@ -57,9 +62,10 @@ describe("MainBiometricsService", function () {
         i18nService,
         windowMain,
         logService,
-        messagingService,
         "win32",
         biometricStateService,
+        encryptService,
+        cryptoFunctionService,
       );
 
       const internalService = (sut as any).osBiometricsService;
@@ -72,9 +78,10 @@ describe("MainBiometricsService", function () {
         i18nService,
         windowMain,
         logService,
-        messagingService,
         "darwin",
         biometricStateService,
+        encryptService,
+        cryptoFunctionService,
       );
       const internalService = (sut as any).osBiometricsService;
       expect(internalService).not.toBeNull();
@@ -86,9 +93,10 @@ describe("MainBiometricsService", function () {
         i18nService,
         windowMain,
         logService,
-        messagingService,
         "linux",
         biometricStateService,
+        encryptService,
+        cryptoFunctionService,
       );
 
       const internalService = (sut as any).osBiometricsService;
@@ -106,9 +114,10 @@ describe("MainBiometricsService", function () {
         i18nService,
         windowMain,
         logService,
-        messagingService,
         process.platform,
         biometricStateService,
+        encryptService,
+        cryptoFunctionService,
       );
 
       innerService = mock();
@@ -131,9 +140,9 @@ describe("MainBiometricsService", function () {
       ];
 
       for (const [supportsBiometric, needsSetup, canAutoSetup, expected] of testCases) {
-        innerService.osSupportsBiometric.mockResolvedValue(supportsBiometric as boolean);
-        innerService.osBiometricsNeedsSetup.mockResolvedValue(needsSetup as boolean);
-        innerService.osBiometricsCanAutoSetup.mockResolvedValue(canAutoSetup as boolean);
+        innerService.supportsBiometrics.mockResolvedValue(supportsBiometric as boolean);
+        innerService.needsSetup.mockResolvedValue(needsSetup as boolean);
+        innerService.canAutoSetup.mockResolvedValue(canAutoSetup as boolean);
 
         const actual = await sut.getBiometricsStatus();
         expect(actual).toBe(expected);
@@ -175,12 +184,23 @@ describe("MainBiometricsService", function () {
         biometricStateService.getRequirePasswordOnStart.mockResolvedValue(
           requirePasswordOnStart as boolean,
         );
-        (sut as any).clientKeyHalves = new Map();
-        const userId = "test" as UserId;
-        if (hasKeyHalf) {
-          (sut as any).clientKeyHalves.set(userId, "test");
+        if (!requirePasswordOnStart) {
+          (sut as any).osBiometricsService.getBiometricsFirstUnlockStatusForUser = jest
+            .fn()
+            .mockResolvedValue(BiometricsStatus.Available);
+        } else {
+          if (hasKeyHalf) {
+            (sut as any).osBiometricsService.getBiometricsFirstUnlockStatusForUser = jest
+              .fn()
+              .mockResolvedValue(BiometricsStatus.Available);
+          } else {
+            (sut as any).osBiometricsService.getBiometricsFirstUnlockStatusForUser = jest
+              .fn()
+              .mockResolvedValue(BiometricsStatus.UnlockNeeded);
+          }
         }
 
+        const userId = "test" as UserId;
         const actual = await sut.getBiometricsStatusForUser(userId);
         expect(actual).toBe(expected);
       }
@@ -193,50 +213,17 @@ describe("MainBiometricsService", function () {
         i18nService,
         windowMain,
         logService,
-        messagingService,
         process.platform,
         biometricStateService,
+        encryptService,
+        cryptoFunctionService,
       );
       const osBiometricsService = mock<OsBiometricService>();
       (sut as any).osBiometricsService = osBiometricsService;
 
       await sut.setupBiometrics();
 
-      expect(osBiometricsService.osBiometricsSetup).toHaveBeenCalled();
-    });
-  });
-
-  describe("setClientKeyHalfForUser", () => {
-    let sut: MainBiometricsService;
-
-    beforeEach(() => {
-      sut = new MainBiometricsService(
-        i18nService,
-        windowMain,
-        logService,
-        messagingService,
-        process.platform,
-        biometricStateService,
-      );
-    });
-
-    it("should set the client key half for the user", async () => {
-      const userId = "test" as UserId;
-      const keyHalf = "testKeyHalf";
-
-      await sut.setClientKeyHalfForUser(userId, keyHalf);
-
-      expect((sut as any).clientKeyHalves.has(userId)).toBe(true);
-      expect((sut as any).clientKeyHalves.get(userId)).toBe(keyHalf);
-    });
-
-    it("should reset the client key half for the user", async () => {
-      const userId = "test" as UserId;
-
-      await sut.setClientKeyHalfForUser(userId, null);
-
-      expect((sut as any).clientKeyHalves.has(userId)).toBe(true);
-      expect((sut as any).clientKeyHalves.get(userId)).toBe(null);
+      expect(osBiometricsService.runSetup).toHaveBeenCalled();
     });
   });
 
@@ -246,9 +233,10 @@ describe("MainBiometricsService", function () {
         i18nService,
         windowMain,
         logService,
-        messagingService,
         process.platform,
         biometricStateService,
+        encryptService,
+        cryptoFunctionService,
       );
       const osBiometricsService = mock<OsBiometricService>();
       (sut as any).osBiometricsService = osBiometricsService;
@@ -268,9 +256,10 @@ describe("MainBiometricsService", function () {
         i18nService,
         windowMain,
         logService,
-        messagingService,
         process.platform,
         biometricStateService,
+        encryptService,
+        cryptoFunctionService,
       );
       osBiometricsService = mock<OsBiometricService>();
       (sut as any).osBiometricsService = osBiometricsService;
@@ -278,34 +267,24 @@ describe("MainBiometricsService", function () {
 
     it("should return null if no biometric key is returned ", async () => {
       const userId = "test" as UserId;
-      (sut as any).clientKeyHalves.set(userId, "testKeyHalf");
-
+      osBiometricsService.getBiometricKey.mockResolvedValue(null);
       const userKey = await sut.unlockWithBiometricsForUser(userId);
 
       expect(userKey).toBeNull();
-      expect(osBiometricsService.getBiometricKey).toHaveBeenCalledWith(
-        "Bitwarden_biometric",
-        `${userId}_user_biometric`,
-        "testKeyHalf",
-      );
+      expect(osBiometricsService.getBiometricKey).toHaveBeenCalledWith(userId);
     });
 
     it("should return the biometric key if a valid key is returned", async () => {
       const userId = "test" as UserId;
-      (sut as any).clientKeyHalves.set(userId, "testKeyHalf");
-      const biometricKey = Utils.fromBufferToB64(new Uint8Array(64));
+      const biometricKey = new SymmetricCryptoKey(new Uint8Array(64));
       osBiometricsService.getBiometricKey.mockResolvedValue(biometricKey);
 
       const userKey = await sut.unlockWithBiometricsForUser(userId);
 
       expect(userKey).not.toBeNull();
-      expect(userKey!.keyB64).toBe(biometricKey);
+      expect(userKey!.keyB64).toBe(biometricKey.toBase64());
       expect(userKey!.inner().type).toBe(EncryptionType.AesCbc256_HmacSha256_B64);
-      expect(osBiometricsService.getBiometricKey).toHaveBeenCalledWith(
-        "Bitwarden_biometric",
-        `${userId}_user_biometric`,
-        "testKeyHalf",
-      );
+      expect(osBiometricsService.getBiometricKey).toHaveBeenCalledWith(userId);
     });
   });
 
@@ -318,37 +297,21 @@ describe("MainBiometricsService", function () {
         i18nService,
         windowMain,
         logService,
-        messagingService,
         process.platform,
         biometricStateService,
+        encryptService,
+        cryptoFunctionService,
       );
       osBiometricsService = mock<OsBiometricService>();
       (sut as any).osBiometricsService = osBiometricsService;
     });
 
-    it("should throw an error if no client key half is provided", async () => {
-      const userId = "test" as UserId;
-      const unlockKey = "testUnlockKey";
-
-      await expect(sut.setBiometricProtectedUnlockKeyForUser(userId, unlockKey)).rejects.toThrow(
-        "No client key half provided for user",
-      );
-    });
-
     it("should call the platform specific setBiometricKey method", async () => {
       const userId = "test" as UserId;
-      const unlockKey = "testUnlockKey";
-
-      (sut as any).clientKeyHalves.set(userId, "testKeyHalf");
 
       await sut.setBiometricProtectedUnlockKeyForUser(userId, unlockKey);
 
-      expect(osBiometricsService.setBiometricKey).toHaveBeenCalledWith(
-        "Bitwarden_biometric",
-        `${userId}_user_biometric`,
-        unlockKey,
-        "testKeyHalf",
-      );
+      expect(osBiometricsService.setBiometricKey).toHaveBeenCalledWith(userId, unlockKey);
     });
   });
 
@@ -358,9 +321,10 @@ describe("MainBiometricsService", function () {
         i18nService,
         windowMain,
         logService,
-        messagingService,
         process.platform,
         biometricStateService,
+        encryptService,
+        cryptoFunctionService,
       );
       const osBiometricsService = mock<OsBiometricService>();
       (sut as any).osBiometricsService = osBiometricsService;
@@ -369,10 +333,7 @@ describe("MainBiometricsService", function () {
 
       await sut.deleteBiometricUnlockKeyForUser(userId);
 
-      expect(osBiometricsService.deleteBiometricKey).toHaveBeenCalledWith(
-        "Bitwarden_biometric",
-        `${userId}_user_biometric`,
-      );
+      expect(osBiometricsService.deleteBiometricKey).toHaveBeenCalledWith(userId);
     });
   });
 
@@ -384,9 +345,10 @@ describe("MainBiometricsService", function () {
         i18nService,
         windowMain,
         logService,
-        messagingService,
         process.platform,
         biometricStateService,
+        encryptService,
+        cryptoFunctionService,
       );
     });
 
@@ -413,9 +375,10 @@ describe("MainBiometricsService", function () {
         i18nService,
         windowMain,
         logService,
-        messagingService,
         process.platform,
         biometricStateService,
+        encryptService,
+        cryptoFunctionService,
       );
 
       const shouldAutoPrompt = await sut.getShouldAutopromptNow();
diff --git a/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts b/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts
index cf80fa5f7f3..1de8e3cd12d 100644
--- a/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts
+++ b/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts
@@ -1,6 +1,7 @@
+import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserId } from "@bitwarden/common/types/guid";
 import { UserKey } from "@bitwarden/common/types/key";
@@ -13,16 +14,16 @@ import { OsBiometricService } from "./os-biometrics.service";
 
 export class MainBiometricsService extends DesktopBiometricsService {
   private osBiometricsService: OsBiometricService;
-  private clientKeyHalves = new Map<string, string | null>();
   private shouldAutoPrompt = true;
 
   constructor(
     private i18nService: I18nService,
     private windowMain: WindowMain,
     private logService: LogService,
-    private messagingService: MessagingService,
-    private platform: NodeJS.Platform,
+    platform: NodeJS.Platform,
     private biometricStateService: BiometricStateService,
+    private encryptService: EncryptService,
+    private cryptoFunctionService: CryptoFunctionService,
   ) {
     super();
     if (platform === "win32") {
@@ -32,15 +33,23 @@ export class MainBiometricsService extends DesktopBiometricsService {
         this.i18nService,
         this.windowMain,
         this.logService,
+        this.biometricStateService,
+        this.encryptService,
+        this.cryptoFunctionService,
       );
     } else if (platform === "darwin") {
       // eslint-disable-next-line
       const OsBiometricsServiceMac = require("./os-biometrics-mac.service").default;
-      this.osBiometricsService = new OsBiometricsServiceMac(this.i18nService);
+      this.osBiometricsService = new OsBiometricsServiceMac(this.i18nService, this.logService);
     } else if (platform === "linux") {
       // eslint-disable-next-line
       const OsBiometricsServiceLinux = require("./os-biometrics-linux.service").default;
-      this.osBiometricsService = new OsBiometricsServiceLinux(this.i18nService, this.windowMain);
+      this.osBiometricsService = new OsBiometricsServiceLinux(
+        this.biometricStateService,
+        this.encryptService,
+        this.cryptoFunctionService,
+        this.logService,
+      );
     } else {
       throw new Error("Unsupported platform");
     }
@@ -55,11 +64,11 @@ export class MainBiometricsService extends DesktopBiometricsService {
    * @returns the status of the biometrics of the platform
    */
   async getBiometricsStatus(): Promise<BiometricsStatus> {
-    if (!(await this.osBiometricsService.osSupportsBiometric())) {
+    if (!(await this.osBiometricsService.supportsBiometrics())) {
       return BiometricsStatus.HardwareUnavailable;
     } else {
-      if (await this.osBiometricsService.osBiometricsNeedsSetup()) {
-        if (await this.osBiometricsService.osBiometricsCanAutoSetup()) {
+      if (await this.osBiometricsService.needsSetup()) {
+        if (await this.osBiometricsService.canAutoSetup()) {
           return BiometricsStatus.AutoSetupNeeded;
         } else {
           return BiometricsStatus.ManualSetupNeeded;
@@ -80,20 +89,12 @@ export class MainBiometricsService extends DesktopBiometricsService {
     if (!(await this.biometricStateService.getBiometricUnlockEnabled(userId))) {
       return BiometricsStatus.NotEnabledLocally;
     }
-
     const platformStatus = await this.getBiometricsStatus();
     if (!(platformStatus === BiometricsStatus.Available)) {
       return platformStatus;
     }
 
-    const requireClientKeyHalf = await this.biometricStateService.getRequirePasswordOnStart(userId);
-    const clientKeyHalfB64 = this.clientKeyHalves.get(userId);
-    const clientKeyHalfSatisfied = !requireClientKeyHalf || !!clientKeyHalfB64;
-    if (!clientKeyHalfSatisfied) {
-      return BiometricsStatus.UnlockNeeded;
-    }
-
-    return BiometricsStatus.Available;
+    return await this.osBiometricsService.getBiometricsFirstUnlockStatusForUser(userId);
   }
 
   async authenticateBiometric(): Promise<boolean> {
@@ -101,11 +102,7 @@ export class MainBiometricsService extends DesktopBiometricsService {
   }
 
   async setupBiometrics(): Promise<void> {
-    return await this.osBiometricsService.osBiometricsSetup();
-  }
-
-  async setClientKeyHalfForUser(userId: UserId, value: string | null): Promise<void> {
-    this.clientKeyHalves.set(userId, value);
+    return await this.osBiometricsService.runSetup();
   }
 
   async authenticateWithBiometrics(): Promise<boolean> {
@@ -113,43 +110,23 @@ export class MainBiometricsService extends DesktopBiometricsService {
   }
 
   async unlockWithBiometricsForUser(userId: UserId): Promise<UserKey | null> {
-    const biometricKey = await this.osBiometricsService.getBiometricKey(
-      "Bitwarden_biometric",
-      `${userId}_user_biometric`,
-      this.clientKeyHalves.get(userId) ?? undefined,
-    );
-    if (biometricKey == null) {
-      return null;
-    }
-
-    return SymmetricCryptoKey.fromString(biometricKey) as UserKey;
+    return (await this.osBiometricsService.getBiometricKey(userId)) as UserKey;
   }
 
-  async setBiometricProtectedUnlockKeyForUser(userId: UserId, value: string): Promise<void> {
-    const service = "Bitwarden_biometric";
-    const storageKey = `${userId}_user_biometric`;
-    if (!this.clientKeyHalves.has(userId)) {
-      throw new Error("No client key half provided for user");
-    }
-
-    return await this.osBiometricsService.setBiometricKey(
-      service,
-      storageKey,
-      value,
-      this.clientKeyHalves.get(userId) ?? undefined,
-    );
+  async setBiometricProtectedUnlockKeyForUser(
+    userId: UserId,
+    key: SymmetricCryptoKey,
+  ): Promise<void> {
+    return await this.osBiometricsService.setBiometricKey(userId, key);
   }
 
   async deleteBiometricUnlockKeyForUser(userId: UserId): Promise<void> {
-    return await this.osBiometricsService.deleteBiometricKey(
-      "Bitwarden_biometric",
-      `${userId}_user_biometric`,
-    );
+    return await this.osBiometricsService.deleteBiometricKey(userId);
   }
 
   /**
    * Set whether to auto-prompt the user for biometric unlock; this can be used to prevent auto-prompting being initiated by a process reload.
-   * Reasons for enabling auto prompt include: Starting the app, un-minimizing the app, manually account switching
+   * Reasons for enabling auto-prompt include: Starting the app, un-minimizing the app, manually account switching
    * @param value Whether to auto-prompt the user for biometric unlock
    */
   async setShouldAutopromptNow(value: boolean): Promise<void> {
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.spec.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.spec.ts
new file mode 100644
index 00000000000..64af0cc625e
--- /dev/null
+++ b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.spec.ts
@@ -0,0 +1,86 @@
+import { mock } from "jest-mock-extended";
+
+import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { UserId } from "@bitwarden/common/types/guid";
+import { passwords } from "@bitwarden/desktop-napi";
+import { BiometricStateService } from "@bitwarden/key-management";
+
+import OsBiometricsServiceLinux from "./os-biometrics-linux.service";
+
+jest.mock("@bitwarden/desktop-napi", () => ({
+  biometrics: {
+    setBiometricSecret: jest.fn(),
+    getBiometricSecret: jest.fn(),
+    deleteBiometricSecret: jest.fn(),
+    prompt: jest.fn(),
+    available: jest.fn(),
+    deriveKeyMaterial: jest.fn(),
+  },
+  passwords: {
+    deletePassword: jest.fn(),
+    getPassword: jest.fn(),
+    isAvailable: jest.fn(),
+    PASSWORD_NOT_FOUND: "Password not found",
+  },
+}));
+
+describe("OsBiometricsServiceLinux", () => {
+  let service: OsBiometricsServiceLinux;
+  let logService: LogService;
+
+  const mockUserId = "test-user-id" as UserId;
+
+  beforeEach(() => {
+    const biometricStateService = mock<BiometricStateService>();
+    const encryptService = mock<EncryptService>();
+    const cryptoFunctionService = mock<CryptoFunctionService>();
+    logService = mock<LogService>();
+    service = new OsBiometricsServiceLinux(
+      biometricStateService,
+      encryptService,
+      cryptoFunctionService,
+      logService,
+    );
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe("deleteBiometricKey", () => {
+    const serviceName = "Bitwarden_biometric";
+    const keyName = "test-user-id_user_biometric";
+
+    it("should delete biometric key successfully", async () => {
+      await service.deleteBiometricKey(mockUserId);
+
+      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
+    });
+
+    it("should not throw error if key not found", async () => {
+      passwords.deletePassword = jest
+        .fn()
+        .mockRejectedValueOnce(new Error(passwords.PASSWORD_NOT_FOUND));
+
+      await service.deleteBiometricKey(mockUserId);
+
+      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
+      expect(logService.debug).toHaveBeenCalledWith(
+        "[OsBiometricService] Biometric key %s not found for service %s.",
+        keyName,
+        serviceName,
+      );
+    });
+
+    it("should throw error for unexpected errors", async () => {
+      const error = new Error("Unexpected error");
+      passwords.deletePassword = jest.fn().mockRejectedValueOnce(error);
+
+      await expect(service.deleteBiometricKey(mockUserId)).rejects.toThrow(error);
+
+      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
+    });
+  });
+});
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts
index fb150f2a653..3f13682f1b7 100644
--- a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts
+++ b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts
@@ -1,10 +1,15 @@
 import { spawn } from "child_process";
 
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { UserId } from "@bitwarden/common/types/guid";
 import { biometrics, passwords } from "@bitwarden/desktop-napi";
+import { BiometricsStatus, BiometricStateService } from "@bitwarden/key-management";
 
-import { WindowMain } from "../../main/window.main";
 import { isFlatpak, isLinux, isSnapStore } from "../../utils";
 
 import { OsBiometricService } from "./os-biometrics.service";
@@ -28,59 +33,75 @@ const polkitPolicy = `<?xml version="1.0" encoding="UTF-8"?>
 const policyFileName = "com.bitwarden.Bitwarden.policy";
 const policyPath = "/usr/share/polkit-1/actions/";
 
+const SERVICE = "Bitwarden_biometric";
+function getLookupKeyForUser(userId: UserId): string {
+  return `${userId}_user_biometric`;
+}
+
 export default class OsBiometricsServiceLinux implements OsBiometricService {
   constructor(
-    private i18nservice: I18nService,
-    private windowMain: WindowMain,
+    private biometricStateService: BiometricStateService,
+    private encryptService: EncryptService,
+    private cryptoFunctionService: CryptoFunctionService,
+    private logService: LogService,
   ) {}
   private _iv: string | null = null;
   // Use getKeyMaterial helper instead of direct access
   private _osKeyHalf: string | null = null;
+  private clientKeyHalves = new Map<UserId, Uint8Array | null>();
 
-  async setBiometricKey(
-    service: string,
-    key: string,
-    value: string,
-    clientKeyPartB64: string | undefined,
-  ): Promise<void> {
+  async setBiometricKey(userId: UserId, key: SymmetricCryptoKey): Promise<void> {
+    const clientKeyPartB64 = Utils.fromBufferToB64(
+      await this.getOrCreateBiometricEncryptionClientKeyHalf(userId, key),
+    );
     const storageDetails = await this.getStorageDetails({ clientKeyHalfB64: clientKeyPartB64 });
     await biometrics.setBiometricSecret(
-      service,
-      key,
-      value,
+      SERVICE,
+      getLookupKeyForUser(userId),
+      key.toBase64(),
       storageDetails.key_material,
       storageDetails.ivB64,
     );
   }
-  async deleteBiometricKey(service: string, key: string): Promise<void> {
-    await passwords.deletePassword(service, key);
+  async deleteBiometricKey(userId: UserId): Promise<void> {
+    try {
+      await passwords.deletePassword(SERVICE, getLookupKeyForUser(userId));
+    } catch (e) {
+      if (e instanceof Error && e.message === passwords.PASSWORD_NOT_FOUND) {
+        this.logService.debug(
+          "[OsBiometricService] Biometric key %s not found for service %s.",
+          getLookupKeyForUser(userId),
+          SERVICE,
+        );
+      } else {
+        throw e;
+      }
+    }
   }
 
-  async getBiometricKey(
-    service: string,
-    storageKey: string,
-    clientKeyPartB64: string | undefined,
-  ): Promise<string | null> {
+  async getBiometricKey(userId: UserId): Promise<SymmetricCryptoKey | null> {
     const success = await this.authenticateBiometric();
 
     if (!success) {
       throw new Error("Biometric authentication failed");
     }
 
-    const value = await passwords.getPassword(service, storageKey);
+    const value = await passwords.getPassword(SERVICE, getLookupKeyForUser(userId));
 
     if (value == null || value == "") {
       return null;
     } else {
+      const clientKeyHalf = this.clientKeyHalves.get(userId);
+      const clientKeyPartB64 = Utils.fromBufferToB64(clientKeyHalf);
       const encValue = new EncString(value);
       this.setIv(encValue.iv);
       const storageDetails = await this.getStorageDetails({ clientKeyHalfB64: clientKeyPartB64 });
       const storedValue = await biometrics.getBiometricSecret(
-        service,
-        storageKey,
+        SERVICE,
+        getLookupKeyForUser(userId),
         storageDetails.key_material,
       );
-      return storedValue;
+      return SymmetricCryptoKey.fromString(storedValue);
     }
   }
 
@@ -89,7 +110,7 @@ export default class OsBiometricsServiceLinux implements OsBiometricService {
     return await biometrics.prompt(hwnd, "");
   }
 
-  async osSupportsBiometric(): Promise<boolean> {
+  async supportsBiometrics(): Promise<boolean> {
     // We assume all linux distros have some polkit implementation
     // that either has bitwarden set up or not, which is reflected in osBiomtricsNeedsSetup.
     // Snap does not have access at the moment to polkit
@@ -99,7 +120,7 @@ export default class OsBiometricsServiceLinux implements OsBiometricService {
     return await passwords.isAvailable();
   }
 
-  async osBiometricsNeedsSetup(): Promise<boolean> {
+  async needsSetup(): Promise<boolean> {
     if (isSnapStore()) {
       return false;
     }
@@ -108,7 +129,7 @@ export default class OsBiometricsServiceLinux implements OsBiometricService {
     return !(await biometrics.available());
   }
 
-  async osBiometricsCanAutoSetup(): Promise<boolean> {
+  async canAutoSetup(): Promise<boolean> {
     // We cannot auto setup on snap or flatpak since the filesystem is sandboxed.
     // The user needs to manually set up the polkit policy outside of the sandbox
     // since we allow access to polkit via dbus for the sandboxed clients, the authentication works from
@@ -116,7 +137,7 @@ export default class OsBiometricsServiceLinux implements OsBiometricService {
     return isLinux() && !isSnapStore() && !isFlatpak();
   }
 
-  async osBiometricsSetup(): Promise<void> {
+  async runSetup(): Promise<void> {
     const process = spawn("pkexec", [
       "bash",
       "-c",
@@ -165,4 +186,46 @@ export default class OsBiometricsServiceLinux implements OsBiometricService {
       ivB64: this._iv,
     };
   }
+
+  private async getOrCreateBiometricEncryptionClientKeyHalf(
+    userId: UserId,
+    key: SymmetricCryptoKey,
+  ): Promise<Uint8Array | null> {
+    const requireClientKeyHalf = await this.biometricStateService.getRequirePasswordOnStart(userId);
+    if (!requireClientKeyHalf) {
+      return null;
+    }
+
+    if (this.clientKeyHalves.has(userId)) {
+      return this.clientKeyHalves.get(userId) || null;
+    }
+
+    // Retrieve existing key half if it exists
+    let clientKeyHalf: Uint8Array | null = null;
+    const encryptedClientKeyHalf =
+      await this.biometricStateService.getEncryptedClientKeyHalf(userId);
+    if (encryptedClientKeyHalf != null) {
+      clientKeyHalf = await this.encryptService.decryptBytes(encryptedClientKeyHalf, key);
+    }
+    if (clientKeyHalf == null) {
+      // Set a key half if it doesn't exist
+      const keyBytes = await this.cryptoFunctionService.randomBytes(32);
+      const encKey = await this.encryptService.encryptBytes(keyBytes, key);
+      await this.biometricStateService.setEncryptedClientKeyHalf(encKey, userId);
+    }
+
+    this.clientKeyHalves.set(userId, clientKeyHalf);
+
+    return clientKeyHalf;
+  }
+
+  async getBiometricsFirstUnlockStatusForUser(userId: UserId): Promise<BiometricsStatus> {
+    const requireClientKeyHalf = await this.biometricStateService.getRequirePasswordOnStart(userId);
+    const clientKeyHalfB64 = this.clientKeyHalves.get(userId);
+    const clientKeyHalfSatisfied = !requireClientKeyHalf || !!clientKeyHalfB64;
+    if (!clientKeyHalfSatisfied) {
+      return BiometricsStatus.UnlockNeeded;
+    }
+    return BiometricsStatus.Available;
+  }
 }
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-mac.service.spec.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-mac.service.spec.ts
new file mode 100644
index 00000000000..6d20095d8bb
--- /dev/null
+++ b/apps/desktop/src/key-management/biometrics/os-biometrics-mac.service.spec.ts
@@ -0,0 +1,78 @@
+import { mock } from "jest-mock-extended";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { UserId } from "@bitwarden/common/types/guid";
+import { passwords } from "@bitwarden/desktop-napi";
+
+import OsBiometricsServiceMac from "./os-biometrics-mac.service";
+
+jest.mock("@bitwarden/desktop-napi", () => ({
+  biometrics: {
+    setBiometricSecret: jest.fn(),
+    getBiometricSecret: jest.fn(),
+    deleteBiometricSecret: jest.fn(),
+    prompt: jest.fn(),
+    available: jest.fn(),
+    deriveKeyMaterial: jest.fn(),
+  },
+  passwords: {
+    deletePassword: jest.fn(),
+    getPassword: jest.fn(),
+    isAvailable: jest.fn(),
+    PASSWORD_NOT_FOUND: "Password not found",
+  },
+}));
+
+describe("OsBiometricsServiceMac", () => {
+  let service: OsBiometricsServiceMac;
+  let i18nService: I18nService;
+  let logService: LogService;
+
+  const mockUserId = "test-user-id" as UserId;
+
+  beforeEach(() => {
+    i18nService = mock<I18nService>();
+    logService = mock<LogService>();
+    service = new OsBiometricsServiceMac(i18nService, logService);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe("deleteBiometricKey", () => {
+    const serviceName = "Bitwarden_biometric";
+    const keyName = "test-user-id_user_biometric";
+
+    it("should delete biometric key successfully", async () => {
+      await service.deleteBiometricKey(mockUserId);
+
+      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
+    });
+
+    it("should not throw error if key not found", async () => {
+      passwords.deletePassword = jest
+        .fn()
+        .mockRejectedValueOnce(new Error(passwords.PASSWORD_NOT_FOUND));
+
+      await service.deleteBiometricKey(mockUserId);
+
+      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
+      expect(logService.debug).toHaveBeenCalledWith(
+        "[OsBiometricService] Biometric key %s not found for service %s.",
+        keyName,
+        serviceName,
+      );
+    });
+
+    it("should throw error for unexpected errors", async () => {
+      const error = new Error("Unexpected error");
+      passwords.deletePassword = jest.fn().mockRejectedValueOnce(error);
+
+      await expect(service.deleteBiometricKey(mockUserId)).rejects.toThrow(error);
+
+      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
+    });
+  });
+});
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-mac.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-mac.service.ts
index e361084726a..1dc64f1bcd5 100644
--- a/apps/desktop/src/key-management/biometrics/os-biometrics-mac.service.ts
+++ b/apps/desktop/src/key-management/biometrics/os-biometrics-mac.service.ts
@@ -1,14 +1,26 @@
 import { systemPreferences } from "electron";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { UserId } from "@bitwarden/common/types/guid";
 import { passwords } from "@bitwarden/desktop-napi";
+import { BiometricsStatus } from "@bitwarden/key-management";
 
 import { OsBiometricService } from "./os-biometrics.service";
 
-export default class OsBiometricsServiceMac implements OsBiometricService {
-  constructor(private i18nservice: I18nService) {}
+const SERVICE = "Bitwarden_biometric";
+function getLookupKeyForUser(userId: UserId): string {
+  return `${userId}_user_biometric`;
+}
 
-  async osSupportsBiometric(): Promise<boolean> {
+export default class OsBiometricsServiceMac implements OsBiometricService {
+  constructor(
+    private i18nservice: I18nService,
+    private logService: LogService,
+  ) {}
+
+  async supportsBiometrics(): Promise<boolean> {
     return systemPreferences.canPromptTouchID();
   }
 
@@ -21,44 +33,64 @@ export default class OsBiometricsServiceMac implements OsBiometricService {
     }
   }
 
-  async getBiometricKey(service: string, key: string): Promise<string | null> {
+  async getBiometricKey(userId: UserId): Promise<SymmetricCryptoKey | null> {
     const success = await this.authenticateBiometric();
 
     if (!success) {
       throw new Error("Biometric authentication failed");
     }
+    const keyB64 = await passwords.getPassword(SERVICE, getLookupKeyForUser(userId));
+    if (keyB64 == null) {
+      return null;
+    }
 
-    return await passwords.getPassword(service, key);
+    return SymmetricCryptoKey.fromString(keyB64);
   }
 
-  async setBiometricKey(service: string, key: string, value: string): Promise<void> {
-    if (await this.valueUpToDate(service, key, value)) {
+  async setBiometricKey(userId: UserId, key: SymmetricCryptoKey): Promise<void> {
+    if (await this.valueUpToDate(userId, key)) {
       return;
     }
 
-    return await passwords.setPassword(service, key, value);
+    return await passwords.setPassword(SERVICE, getLookupKeyForUser(userId), key.toBase64());
   }
 
-  async deleteBiometricKey(service: string, key: string): Promise<void> {
-    return await passwords.deletePassword(service, key);
-  }
-
-  private async valueUpToDate(service: string, key: string, value: string): Promise<boolean> {
+  async deleteBiometricKey(user: UserId): Promise<void> {
     try {
-      const existing = await passwords.getPassword(service, key);
-      return existing === value;
+      return await passwords.deletePassword(SERVICE, getLookupKeyForUser(user));
+    } catch (e) {
+      if (e instanceof Error && e.message === passwords.PASSWORD_NOT_FOUND) {
+        this.logService.debug(
+          "[OsBiometricService] Biometric key %s not found for service %s.",
+          getLookupKeyForUser(user),
+          SERVICE,
+        );
+      } else {
+        throw e;
+      }
+    }
+  }
+
+  private async valueUpToDate(user: UserId, key: SymmetricCryptoKey): Promise<boolean> {
+    try {
+      const existing = await passwords.getPassword(SERVICE, getLookupKeyForUser(user));
+      return existing === key.toBase64();
     } catch {
       return false;
     }
   }
 
-  async osBiometricsNeedsSetup() {
+  async needsSetup() {
     return false;
   }
 
-  async osBiometricsCanAutoSetup(): Promise<boolean> {
+  async canAutoSetup(): Promise<boolean> {
     return false;
   }
 
-  async osBiometricsSetup(): Promise<void> {}
+  async runSetup(): Promise<void> {}
+
+  async getBiometricsFirstUnlockStatusForUser(userId: UserId): Promise<BiometricsStatus> {
+    return BiometricsStatus.Available;
+  }
 }
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.spec.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.spec.ts
new file mode 100644
index 00000000000..674d97bf696
--- /dev/null
+++ b/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.spec.ts
@@ -0,0 +1,248 @@
+import { mock } from "jest-mock-extended";
+
+import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { UserId } from "@bitwarden/common/types/guid";
+import { passwords } from "@bitwarden/desktop-napi";
+import { BiometricsStatus, BiometricStateService } from "@bitwarden/key-management";
+
+import { WindowMain } from "../../main/window.main";
+
+import OsBiometricsServiceWindows from "./os-biometrics-windows.service";
+
+jest.mock("@bitwarden/desktop-napi", () => ({
+  biometrics: {
+    available: jest.fn(),
+    setBiometricSecret: jest.fn(),
+    getBiometricSecret: jest.fn(),
+    deleteBiometricSecret: jest.fn(),
+    prompt: jest.fn(),
+    deriveKeyMaterial: jest.fn(),
+  },
+  passwords: {
+    getPassword: jest.fn(),
+    deletePassword: jest.fn(),
+    isAvailable: jest.fn(),
+    PASSWORD_NOT_FOUND: "Password not found",
+  },
+}));
+
+describe("OsBiometricsServiceWindows", () => {
+  let service: OsBiometricsServiceWindows;
+  let i18nService: I18nService;
+  let windowMain: WindowMain;
+  let logService: LogService;
+  let biometricStateService: BiometricStateService;
+
+  const mockUserId = "test-user-id" as UserId;
+
+  beforeEach(() => {
+    i18nService = mock<I18nService>();
+    windowMain = mock<WindowMain>();
+    logService = mock<LogService>();
+    biometricStateService = mock<BiometricStateService>();
+    const encryptionService = mock<EncryptService>();
+    const cryptoFunctionService = mock<CryptoFunctionService>();
+    service = new OsBiometricsServiceWindows(
+      i18nService,
+      windowMain,
+      logService,
+      biometricStateService,
+      encryptionService,
+      cryptoFunctionService,
+    );
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe("getBiometricsFirstUnlockStatusForUser", () => {
+    const userId = "test-user-id" as UserId;
+    it("should return Available when requirePasswordOnRestart is false", async () => {
+      biometricStateService.getRequirePasswordOnStart = jest.fn().mockResolvedValue(false);
+      const result = await service.getBiometricsFirstUnlockStatusForUser(userId);
+      expect(result).toBe(BiometricsStatus.Available);
+    });
+    it("should return Available when requirePasswordOnRestart is true and client key half is set", async () => {
+      biometricStateService.getRequirePasswordOnStart = jest.fn().mockResolvedValue(true);
+      (service as any).clientKeyHalves = new Map<string, Uint8Array>();
+      (service as any).clientKeyHalves.set(userId, new Uint8Array([1, 2, 3, 4]));
+      const result = await service.getBiometricsFirstUnlockStatusForUser(userId);
+      expect(result).toBe(BiometricsStatus.Available);
+    });
+    it("should return UnlockNeeded when requirePasswordOnRestart is true and client key half is not set", async () => {
+      biometricStateService.getRequirePasswordOnStart = jest.fn().mockResolvedValue(true);
+      (service as any).clientKeyHalves = new Map<string, Uint8Array>();
+      const result = await service.getBiometricsFirstUnlockStatusForUser(userId);
+      expect(result).toBe(BiometricsStatus.UnlockNeeded);
+    });
+  });
+
+  describe("getOrCreateBiometricEncryptionClientKeyHalf", () => {
+    const userId = "test-user-id" as UserId;
+    const key = new SymmetricCryptoKey(new Uint8Array(64));
+    let encryptionService: EncryptService;
+    let cryptoFunctionService: CryptoFunctionService;
+
+    beforeEach(() => {
+      encryptionService = mock<EncryptService>();
+      cryptoFunctionService = mock<CryptoFunctionService>();
+      service = new OsBiometricsServiceWindows(
+        mock<I18nService>(),
+        windowMain,
+        mock<LogService>(),
+        biometricStateService,
+        encryptionService,
+        cryptoFunctionService,
+      );
+    });
+
+    it("should return null if getRequirePasswordOnRestart is false", async () => {
+      biometricStateService.getRequirePasswordOnStart = jest.fn().mockResolvedValue(false);
+      const result = await service.getOrCreateBiometricEncryptionClientKeyHalf(userId, key);
+      expect(result).toBeNull();
+    });
+
+    it("should return cached key half if already present", async () => {
+      biometricStateService.getRequirePasswordOnStart = jest.fn().mockResolvedValue(true);
+      const cachedKeyHalf = new Uint8Array([10, 20, 30]);
+      (service as any).clientKeyHalves.set(userId.toString(), cachedKeyHalf);
+      const result = await service.getOrCreateBiometricEncryptionClientKeyHalf(userId, key);
+      expect(result).toBe(cachedKeyHalf);
+    });
+
+    it("should decrypt and return existing encrypted client key half", async () => {
+      biometricStateService.getRequirePasswordOnStart = jest.fn().mockResolvedValue(true);
+      biometricStateService.getEncryptedClientKeyHalf = jest
+        .fn()
+        .mockResolvedValue(new Uint8Array([1, 2, 3]));
+      const decrypted = new Uint8Array([4, 5, 6]);
+      encryptionService.decryptBytes = jest.fn().mockResolvedValue(decrypted);
+
+      const result = await service.getOrCreateBiometricEncryptionClientKeyHalf(userId, key);
+
+      expect(biometricStateService.getEncryptedClientKeyHalf).toHaveBeenCalledWith(userId);
+      expect(encryptionService.decryptBytes).toHaveBeenCalledWith(new Uint8Array([1, 2, 3]), key);
+      expect(result).toEqual(decrypted);
+      expect((service as any).clientKeyHalves.get(userId.toString())).toEqual(decrypted);
+    });
+
+    it("should generate, encrypt, store, and cache a new key half if none exists", async () => {
+      biometricStateService.getRequirePasswordOnStart = jest.fn().mockResolvedValue(true);
+      biometricStateService.getEncryptedClientKeyHalf = jest.fn().mockResolvedValue(null);
+      const randomBytes = new Uint8Array([7, 8, 9]);
+      cryptoFunctionService.randomBytes = jest.fn().mockResolvedValue(randomBytes);
+      const encrypted = new Uint8Array([10, 11, 12]);
+      encryptionService.encryptBytes = jest.fn().mockResolvedValue(encrypted);
+      biometricStateService.setEncryptedClientKeyHalf = jest.fn().mockResolvedValue(undefined);
+
+      const result = await service.getOrCreateBiometricEncryptionClientKeyHalf(userId, key);
+
+      expect(cryptoFunctionService.randomBytes).toHaveBeenCalledWith(32);
+      expect(encryptionService.encryptBytes).toHaveBeenCalledWith(randomBytes, key);
+      expect(biometricStateService.setEncryptedClientKeyHalf).toHaveBeenCalledWith(
+        encrypted,
+        userId,
+      );
+      expect(result).toBeNull();
+      expect((service as any).clientKeyHalves.get(userId.toString())).toBeNull();
+    });
+  });
+
+  describe("deleteBiometricKey", () => {
+    const serviceName = "Bitwarden_biometric";
+    const keyName = "test-user-id_user_biometric";
+    const witnessKeyName = "test-user-id_user_biometric_witness";
+
+    it("should delete biometric key successfully", async () => {
+      await service.deleteBiometricKey(mockUserId);
+
+      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
+      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, witnessKeyName);
+    });
+
+    it.each([
+      [false, false],
+      [false, true],
+      [true, false],
+    ])(
+      "should not throw error if key found: %s and witness key found: %s",
+      async (keyFound, witnessKeyFound) => {
+        passwords.deletePassword = jest.fn().mockImplementation((_, account) => {
+          if (account === keyName) {
+            if (!keyFound) {
+              throw new Error(passwords.PASSWORD_NOT_FOUND);
+            }
+            return Promise.resolve();
+          }
+          if (account === witnessKeyName) {
+            if (!witnessKeyFound) {
+              throw new Error(passwords.PASSWORD_NOT_FOUND);
+            }
+            return Promise.resolve();
+          }
+          throw new Error("Unexpected key");
+        });
+
+        await service.deleteBiometricKey(mockUserId);
+
+        expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
+        expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, witnessKeyName);
+        if (!keyFound) {
+          expect(logService.debug).toHaveBeenCalledWith(
+            "[OsBiometricService] Biometric key %s not found for service %s.",
+            keyName,
+            serviceName,
+          );
+        }
+        if (!witnessKeyFound) {
+          expect(logService.debug).toHaveBeenCalledWith(
+            "[OsBiometricService] Biometric witness key %s not found for service %s.",
+            witnessKeyName,
+            serviceName,
+          );
+        }
+      },
+    );
+
+    it("should throw error when deletePassword for key throws unexpected errors", async () => {
+      const error = new Error("Unexpected error");
+      passwords.deletePassword = jest.fn().mockImplementation((_, account) => {
+        if (account === keyName) {
+          throw error;
+        }
+        if (account === witnessKeyName) {
+          return Promise.resolve();
+        }
+        throw new Error("Unexpected key");
+      });
+
+      await expect(service.deleteBiometricKey(mockUserId)).rejects.toThrow(error);
+
+      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
+      expect(passwords.deletePassword).not.toHaveBeenCalledWith(serviceName, witnessKeyName);
+    });
+
+    it("should throw error when deletePassword for witness key throws unexpected errors", async () => {
+      const error = new Error("Unexpected error");
+      passwords.deletePassword = jest.fn().mockImplementation((_, account) => {
+        if (account === keyName) {
+          return Promise.resolve();
+        }
+        if (account === witnessKeyName) {
+          throw error;
+        }
+        throw new Error("Unexpected key");
+      });
+
+      await expect(service.deleteBiometricKey(mockUserId)).rejects.toThrow(error);
+
+      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, keyName);
+      expect(passwords.deletePassword).toHaveBeenCalledWith(serviceName, witnessKeyName);
+    });
+  });
+});
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.ts
index 53647549295..b1726644b0a 100644
--- a/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.ts
+++ b/apps/desktop/src/key-management/biometrics/os-biometrics-windows.service.ts
@@ -1,10 +1,14 @@
+import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { EncryptionType } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { UserId } from "@bitwarden/common/types/guid";
 import { biometrics, passwords } from "@bitwarden/desktop-napi";
+import { BiometricsStatus, BiometricStateService } from "@bitwarden/key-management";
 
 import { WindowMain } from "../../main/window.main";
 
@@ -13,87 +17,131 @@ import { OsBiometricService } from "./os-biometrics.service";
 const KEY_WITNESS_SUFFIX = "_witness";
 const WITNESS_VALUE = "known key";
 
+const SERVICE = "Bitwarden_biometric";
+function getLookupKeyForUser(userId: UserId): string {
+  return `${userId}_user_biometric`;
+}
+
 export default class OsBiometricsServiceWindows implements OsBiometricService {
   // Use set helper method instead of direct access
   private _iv: string | null = null;
   // Use getKeyMaterial helper instead of direct access
   private _osKeyHalf: string | null = null;
+  private clientKeyHalves = new Map<UserId, Uint8Array>();
 
   constructor(
     private i18nService: I18nService,
     private windowMain: WindowMain,
     private logService: LogService,
+    private biometricStateService: BiometricStateService,
+    private encryptService: EncryptService,
+    private cryptoFunctionService: CryptoFunctionService,
   ) {}
 
-  async osSupportsBiometric(): Promise<boolean> {
+  async supportsBiometrics(): Promise<boolean> {
     return await biometrics.available();
   }
 
-  async getBiometricKey(
-    service: string,
-    storageKey: string,
-    clientKeyHalfB64: string,
-  ): Promise<string | null> {
-    const value = await passwords.getPassword(service, storageKey);
+  async getBiometricKey(userId: UserId): Promise<SymmetricCryptoKey | null> {
+    const value = await passwords.getPassword(SERVICE, getLookupKeyForUser(userId));
+    let clientKeyHalfB64: string | null = null;
+    if (this.clientKeyHalves.has(userId)) {
+      clientKeyHalfB64 = Utils.fromBufferToB64(this.clientKeyHalves.get(userId));
+    }
 
     if (value == null || value == "") {
       return null;
     } else if (!EncString.isSerializedEncString(value)) {
       // Update to format encrypted with client key half
       const storageDetails = await this.getStorageDetails({
-        clientKeyHalfB64,
+        clientKeyHalfB64: clientKeyHalfB64,
       });
 
       await biometrics.setBiometricSecret(
-        service,
-        storageKey,
+        SERVICE,
+        getLookupKeyForUser(userId),
         value,
         storageDetails.key_material,
         storageDetails.ivB64,
       );
-      return value;
+      return SymmetricCryptoKey.fromString(value);
     } else {
       const encValue = new EncString(value);
       this.setIv(encValue.iv);
       const storageDetails = await this.getStorageDetails({
-        clientKeyHalfB64,
+        clientKeyHalfB64: clientKeyHalfB64,
       });
-      return await biometrics.getBiometricSecret(service, storageKey, storageDetails.key_material);
+      return SymmetricCryptoKey.fromString(
+        await biometrics.getBiometricSecret(
+          SERVICE,
+          getLookupKeyForUser(userId),
+          storageDetails.key_material,
+        ),
+      );
     }
   }
 
-  async setBiometricKey(
-    service: string,
-    storageKey: string,
-    value: string,
-    clientKeyPartB64: string | undefined,
-  ): Promise<void> {
-    const parsedValue = SymmetricCryptoKey.fromString(value);
-    if (await this.valueUpToDate({ value: parsedValue, clientKeyPartB64, service, storageKey })) {
+  async setBiometricKey(userId: UserId, key: SymmetricCryptoKey): Promise<void> {
+    const clientKeyHalf = await this.getOrCreateBiometricEncryptionClientKeyHalf(userId, key);
+
+    if (
+      await this.valueUpToDate({
+        value: key,
+        clientKeyPartB64: Utils.fromBufferToB64(clientKeyHalf),
+        service: SERVICE,
+        storageKey: getLookupKeyForUser(userId),
+      })
+    ) {
       return;
     }
 
-    const storageDetails = await this.getStorageDetails({ clientKeyHalfB64: clientKeyPartB64 });
+    const storageDetails = await this.getStorageDetails({
+      clientKeyHalfB64: Utils.fromBufferToB64(clientKeyHalf),
+    });
     const storedValue = await biometrics.setBiometricSecret(
-      service,
-      storageKey,
-      value,
+      SERVICE,
+      getLookupKeyForUser(userId),
+      key.toBase64(),
       storageDetails.key_material,
       storageDetails.ivB64,
     );
     const parsedStoredValue = new EncString(storedValue);
     await this.storeValueWitness(
-      parsedValue,
+      key,
       parsedStoredValue,
-      service,
-      storageKey,
-      clientKeyPartB64,
+      SERVICE,
+      getLookupKeyForUser(userId),
+      Utils.fromBufferToB64(clientKeyHalf),
     );
   }
 
-  async deleteBiometricKey(service: string, key: string): Promise<void> {
-    await passwords.deletePassword(service, key);
-    await passwords.deletePassword(service, key + KEY_WITNESS_SUFFIX);
+  async deleteBiometricKey(userId: UserId): Promise<void> {
+    try {
+      await passwords.deletePassword(SERVICE, getLookupKeyForUser(userId));
+    } catch (e) {
+      if (e instanceof Error && e.message === passwords.PASSWORD_NOT_FOUND) {
+        this.logService.debug(
+          "[OsBiometricService] Biometric key %s not found for service %s.",
+          getLookupKeyForUser(userId),
+          SERVICE,
+        );
+      } else {
+        throw e;
+      }
+    }
+    try {
+      await passwords.deletePassword(SERVICE, getLookupKeyForUser(userId) + KEY_WITNESS_SUFFIX);
+    } catch (e) {
+      if (e instanceof Error && e.message === passwords.PASSWORD_NOT_FOUND) {
+        this.logService.debug(
+          "[OsBiometricService] Biometric witness key %s not found for service %s.",
+          getLookupKeyForUser(userId) + KEY_WITNESS_SUFFIX,
+          SERVICE,
+        );
+      } else {
+        throw e;
+      }
+    }
   }
 
   async authenticateBiometric(): Promise<boolean> {
@@ -203,8 +251,19 @@ export default class OsBiometricsServiceWindows implements OsBiometricService {
         storageKey + KEY_WITNESS_SUFFIX,
         witnessKeyMaterial,
       );
-    } catch {
-      this.logService.debug("Error retrieving witness key, assuming value is not up to date.");
+    } catch (e) {
+      if (e instanceof Error && e.message === passwords.PASSWORD_NOT_FOUND) {
+        this.logService.debug(
+          "[OsBiometricService] Biometric witness key %s not found for service %s, value is not up to date.",
+          storageKey + KEY_WITNESS_SUFFIX,
+          service,
+        );
+      } else {
+        this.logService.error(
+          "[OsBiometricService] Error retrieving witness key, assuming value is not up to date.",
+          e,
+        );
+      }
       return false;
     }
 
@@ -240,13 +299,58 @@ export default class OsBiometricsServiceWindows implements OsBiometricService {
     return result;
   }
 
-  async osBiometricsNeedsSetup() {
+  async needsSetup() {
     return false;
   }
 
-  async osBiometricsCanAutoSetup(): Promise<boolean> {
+  async canAutoSetup(): Promise<boolean> {
     return false;
   }
 
-  async osBiometricsSetup(): Promise<void> {}
+  async runSetup(): Promise<void> {}
+
+  async getOrCreateBiometricEncryptionClientKeyHalf(
+    userId: UserId,
+    key: SymmetricCryptoKey,
+  ): Promise<Uint8Array | null> {
+    const requireClientKeyHalf = await this.biometricStateService.getRequirePasswordOnStart(userId);
+    if (!requireClientKeyHalf) {
+      return null;
+    }
+
+    if (this.clientKeyHalves.has(userId)) {
+      return this.clientKeyHalves.get(userId);
+    }
+
+    // Retrieve existing key half if it exists
+    let clientKeyHalf: Uint8Array | null = null;
+    const encryptedClientKeyHalf =
+      await this.biometricStateService.getEncryptedClientKeyHalf(userId);
+    if (encryptedClientKeyHalf != null) {
+      clientKeyHalf = await this.encryptService.decryptBytes(encryptedClientKeyHalf, key);
+    }
+    if (clientKeyHalf == null) {
+      // Set a key half if it doesn't exist
+      const keyBytes = await this.cryptoFunctionService.randomBytes(32);
+      const encKey = await this.encryptService.encryptBytes(keyBytes, key);
+      await this.biometricStateService.setEncryptedClientKeyHalf(encKey, userId);
+    }
+
+    this.clientKeyHalves.set(userId, clientKeyHalf);
+
+    return clientKeyHalf;
+  }
+
+  async getBiometricsFirstUnlockStatusForUser(userId: UserId): Promise<BiometricsStatus> {
+    const requireClientKeyHalf = await this.biometricStateService.getRequirePasswordOnStart(userId);
+    if (!requireClientKeyHalf) {
+      return BiometricsStatus.Available;
+    }
+
+    if (this.clientKeyHalves.has(userId)) {
+      return BiometricsStatus.Available;
+    } else {
+      return BiometricsStatus.UnlockNeeded;
+    }
+  }
 }
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics.service.ts
index f5132200149..63e0527c034 100644
--- a/apps/desktop/src/key-management/biometrics/os-biometrics.service.ts
+++ b/apps/desktop/src/key-management/biometrics/os-biometrics.service.ts
@@ -1,32 +1,28 @@
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { UserId } from "@bitwarden/common/types/guid";
+import { BiometricsStatus } from "@bitwarden/key-management";
+
 export interface OsBiometricService {
-  osSupportsBiometric(): Promise<boolean>;
+  supportsBiometrics(): Promise<boolean>;
   /**
    * Check whether support for biometric unlock requires setup. This can be automatic or manual.
    *
    * @returns true if biometrics support requires setup, false if it does not (is already setup, or did not require it in the first place)
    */
-  osBiometricsNeedsSetup: () => Promise<boolean>;
+  needsSetup(): Promise<boolean>;
   /**
    * Check whether biometrics can be automatically setup, or requires user interaction.
    *
    * @returns true if biometrics support can be automatically setup, false if it requires user interaction.
    */
-  osBiometricsCanAutoSetup: () => Promise<boolean>;
+  canAutoSetup(): Promise<boolean>;
   /**
    * Starts automatic biometric setup, which places the required configuration files / changes the required settings.
    */
-  osBiometricsSetup: () => Promise<void>;
+  runSetup(): Promise<void>;
   authenticateBiometric(): Promise<boolean>;
-  getBiometricKey(
-    service: string,
-    key: string,
-    clientKeyHalfB64: string | undefined,
-  ): Promise<string | null>;
-  setBiometricKey(
-    service: string,
-    key: string,
-    value: string,
-    clientKeyHalfB64: string | undefined,
-  ): Promise<void>;
-  deleteBiometricKey(service: string, key: string): Promise<void>;
+  getBiometricKey(userId: UserId): Promise<SymmetricCryptoKey | null>;
+  setBiometricKey(userId: UserId, key: SymmetricCryptoKey): Promise<void>;
+  deleteBiometricKey(userId: UserId): Promise<void>;
+  getBiometricsFirstUnlockStatusForUser(userId: UserId): Promise<BiometricsStatus>;
 }
diff --git a/apps/desktop/src/key-management/biometrics/renderer-biometrics.service.spec.ts b/apps/desktop/src/key-management/biometrics/renderer-biometrics.service.spec.ts
index 7a3f00c7c44..2901b02ab6c 100644
--- a/apps/desktop/src/key-management/biometrics/renderer-biometrics.service.spec.ts
+++ b/apps/desktop/src/key-management/biometrics/renderer-biometrics.service.spec.ts
@@ -1,3 +1,7 @@
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { CsprngArray } from "@bitwarden/common/types/csprng";
+import { UserId } from "@bitwarden/common/types/guid";
+import { UserKey } from "@bitwarden/common/types/key";
 import { BiometricsStatus } from "@bitwarden/key-management";
 
 import { RendererBiometricsService } from "./renderer-biometrics.service";
@@ -41,4 +45,34 @@ describe("renderer biometrics service tests", function () {
       expect(result).toBe(expected);
     });
   });
+
+  describe("unlockWithBiometricsForUser", () => {
+    const testUserId = "userId1" as UserId;
+    const service = new RendererBiometricsService();
+
+    it("should return null if no user key is returned", async () => {
+      (global as any).ipc.keyManagement.biometric.unlockWithBiometricsForUser.mockResolvedValue(
+        null,
+      );
+
+      const result = await service.unlockWithBiometricsForUser(testUserId);
+
+      expect(result).toBeNull();
+    });
+
+    it("should return a UserKey object when a user key is returned", async () => {
+      const mockRandomBytes = new Uint8Array(64) as CsprngArray;
+      const mockUserKey = new SymmetricCryptoKey(mockRandomBytes) as UserKey;
+      (global as any).ipc.keyManagement.biometric.unlockWithBiometricsForUser.mockResolvedValue(
+        mockUserKey.toJSON(),
+      );
+
+      const result = await service.unlockWithBiometricsForUser(testUserId);
+
+      expect(result).not.toBeNull();
+      expect(result).toBeInstanceOf(SymmetricCryptoKey);
+      expect(result!.keyB64).toEqual(mockUserKey.keyB64);
+      expect(result!.inner()).toEqual(mockUserKey.inner());
+    });
+  });
 });
diff --git a/apps/desktop/src/key-management/biometrics/renderer-biometrics.service.ts b/apps/desktop/src/key-management/biometrics/renderer-biometrics.service.ts
index db17ee480cb..c7ed88d390f 100644
--- a/apps/desktop/src/key-management/biometrics/renderer-biometrics.service.ts
+++ b/apps/desktop/src/key-management/biometrics/renderer-biometrics.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from "@angular/core";
 
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserId } from "@bitwarden/common/types/guid";
 import { UserKey } from "@bitwarden/common/types/key";
 import { BiometricsStatus } from "@bitwarden/key-management";
@@ -21,15 +22,26 @@ export class RendererBiometricsService extends DesktopBiometricsService {
   }
 
   async unlockWithBiometricsForUser(userId: UserId): Promise<UserKey | null> {
-    return await ipc.keyManagement.biometric.unlockWithBiometricsForUser(userId);
+    const userKey = await ipc.keyManagement.biometric.unlockWithBiometricsForUser(userId);
+    if (userKey == null) {
+      return null;
+    }
+    // Objects received over IPC lose their prototype, so they must be recreated to restore methods and properties.
+    return SymmetricCryptoKey.fromJSON(userKey) as UserKey;
   }
 
   async getBiometricsStatusForUser(id: UserId): Promise<BiometricsStatus> {
     return await ipc.keyManagement.biometric.getBiometricsStatusForUser(id);
   }
 
-  async setBiometricProtectedUnlockKeyForUser(userId: UserId, value: string): Promise<void> {
-    return await ipc.keyManagement.biometric.setBiometricProtectedUnlockKeyForUser(userId, value);
+  async setBiometricProtectedUnlockKeyForUser(
+    userId: UserId,
+    value: SymmetricCryptoKey,
+  ): Promise<void> {
+    return await ipc.keyManagement.biometric.setBiometricProtectedUnlockKeyForUser(
+      userId,
+      value.toBase64(),
+    );
   }
 
   async deleteBiometricUnlockKeyForUser(userId: UserId): Promise<void> {
@@ -40,10 +52,6 @@ export class RendererBiometricsService extends DesktopBiometricsService {
     return await ipc.keyManagement.biometric.setupBiometrics();
   }
 
-  async setClientKeyHalfForUser(userId: UserId, value: string | null): Promise<void> {
-    return await ipc.keyManagement.biometric.setClientKeyHalf(userId, value);
-  }
-
   async getShouldAutopromptNow(): Promise<boolean> {
     return await ipc.keyManagement.biometric.getShouldAutoprompt();
   }
diff --git a/apps/desktop/src/key-management/electron-key.service.spec.ts b/apps/desktop/src/key-management/electron-key.service.spec.ts
new file mode 100644
index 00000000000..730ad7e4652
--- /dev/null
+++ b/apps/desktop/src/key-management/electron-key.service.spec.ts
@@ -0,0 +1,120 @@
+import { mock } from "jest-mock-extended";
+
+import { PinServiceAbstraction } from "@bitwarden/auth/common";
+import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { FakeMasterPasswordService } from "@bitwarden/common/key-management/master-password/services/fake-master-password.service";
+import { KeyGenerationService } from "@bitwarden/common/platform/abstractions/key-generation.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { UserId } from "@bitwarden/common/types/guid";
+import { UserKey } from "@bitwarden/common/types/key";
+import { BiometricStateService, KdfConfigService } from "@bitwarden/key-management";
+
+import {
+  makeSymmetricCryptoKey,
+  FakeAccountService,
+  mockAccountServiceWith,
+  FakeStateProvider,
+} from "../../../../libs/common/spec";
+
+import { DesktopBiometricsService } from "./biometrics/desktop.biometrics.service";
+import { ElectronKeyService } from "./electron-key.service";
+
+describe("ElectronKeyService", () => {
+  let keyService: ElectronKeyService;
+
+  const pinService = mock<PinServiceAbstraction>();
+  const keyGenerationService = mock<KeyGenerationService>();
+  const cryptoFunctionService = mock<CryptoFunctionService>();
+  const encryptService = mock<EncryptService>();
+  const platformUtilService = mock<PlatformUtilsService>();
+  const logService = mock<LogService>();
+  const stateService = mock<StateService>();
+  const kdfConfigService = mock<KdfConfigService>();
+  const biometricStateService = mock<BiometricStateService>();
+  const biometricService = mock<DesktopBiometricsService>();
+  let stateProvider: FakeStateProvider;
+
+  const mockUserId = Utils.newGuid() as UserId;
+  let accountService: FakeAccountService;
+  let masterPasswordService: FakeMasterPasswordService;
+
+  beforeEach(() => {
+    accountService = mockAccountServiceWith(mockUserId);
+    masterPasswordService = new FakeMasterPasswordService();
+    stateProvider = new FakeStateProvider(accountService);
+
+    keyService = new ElectronKeyService(
+      pinService,
+      masterPasswordService,
+      keyGenerationService,
+      cryptoFunctionService,
+      encryptService,
+      platformUtilService,
+      logService,
+      stateService,
+      accountService,
+      stateProvider,
+      biometricStateService,
+      kdfConfigService,
+      biometricService,
+    );
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe("setUserKey", () => {
+    const userKey = makeSymmetricCryptoKey() as UserKey;
+
+    describe("store biometric key", () => {
+      it("does not set any biometric keys when biometric unlock disabled", async () => {
+        biometricStateService.getBiometricUnlockEnabled.mockResolvedValue(false);
+
+        await keyService.setUserKey(userKey, mockUserId);
+
+        expect(biometricService.setBiometricProtectedUnlockKeyForUser).not.toHaveBeenCalled();
+        expect(biometricStateService.setEncryptedClientKeyHalf).not.toHaveBeenCalled();
+        expect(biometricStateService.getBiometricUnlockEnabled).toHaveBeenCalledWith(mockUserId);
+      });
+
+      describe("biometric unlock enabled", () => {
+        beforeEach(() => {
+          biometricStateService.getBiometricUnlockEnabled.mockResolvedValue(true);
+        });
+
+        it("sets null biometric client key half and biometric unlock key when require password on start disabled", async () => {
+          biometricStateService.getRequirePasswordOnStart.mockResolvedValue(false);
+
+          await keyService.setUserKey(userKey, mockUserId);
+
+          expect(biometricService.setBiometricProtectedUnlockKeyForUser).toHaveBeenCalledWith(
+            mockUserId,
+            userKey,
+          );
+          expect(biometricStateService.setEncryptedClientKeyHalf).not.toHaveBeenCalled();
+          expect(biometricStateService.getBiometricUnlockEnabled).toHaveBeenCalledWith(mockUserId);
+        });
+
+        describe("require password on start enabled", () => {
+          beforeEach(() => {
+            biometricStateService.getRequirePasswordOnStart.mockResolvedValue(true);
+          });
+
+          it("sets biometric key", async () => {
+            await keyService.setUserKey(userKey, mockUserId);
+
+            expect(biometricService.setBiometricProtectedUnlockKeyForUser).toHaveBeenCalledWith(
+              mockUserId,
+              userKey,
+            );
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/apps/desktop/src/platform/services/electron-key.service.ts b/apps/desktop/src/key-management/electron-key.service.ts
similarity index 65%
rename from apps/desktop/src/platform/services/electron-key.service.ts
rename to apps/desktop/src/key-management/electron-key.service.ts
index 5ecde57ec5b..0f5555167c0 100644
--- a/apps/desktop/src/platform/services/electron-key.service.ts
+++ b/apps/desktop/src/key-management/electron-key.service.ts
@@ -8,9 +8,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { KeySuffixOptions } from "@bitwarden/common/platform/enums";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { StateProvider } from "@bitwarden/common/platform/state";
-import { CsprngString } from "@bitwarden/common/types/csprng";
 import { UserId } from "@bitwarden/common/types/guid";
 import { UserKey } from "@bitwarden/common/types/key";
 import {
@@ -19,8 +17,9 @@ import {
   BiometricStateService,
 } from "@bitwarden/key-management";
 
-import { DesktopBiometricsService } from "../../key-management/biometrics/desktop.biometrics.service";
+import { DesktopBiometricsService } from "./biometrics/desktop.biometrics.service";
 
+// TODO Remove this class once biometric client key half storage is moved https://bitwarden.atlassian.net/browse/PM-22342
 export class ElectronKeyService extends DefaultKeyService {
   constructor(
     pinService: PinServiceAbstraction,
@@ -52,11 +51,7 @@ export class ElectronKeyService extends DefaultKeyService {
     );
   }
 
-  override async hasUserKeyStored(keySuffix: KeySuffixOptions, userId?: UserId): Promise<boolean> {
-    return super.hasUserKeyStored(keySuffix, userId);
-  }
-
-  override async clearStoredUserKey(keySuffix: KeySuffixOptions, userId?: UserId): Promise<void> {
+  override async clearStoredUserKey(keySuffix: KeySuffixOptions, userId: UserId): Promise<void> {
     await super.clearStoredUserKey(keySuffix, userId);
   }
 
@@ -76,11 +71,7 @@ export class ElectronKeyService extends DefaultKeyService {
   }
 
   private async storeBiometricsProtectedUserKey(userKey: UserKey, userId: UserId): Promise<void> {
-    // May resolve to null, in which case no client key have is required
-    // TODO: Move to windows implementation
-    const clientEncKeyHalf = await this.getBiometricEncryptionClientKeyHalf(userKey, userId);
-    await this.biometricService.setClientKeyHalfForUser(userId, clientEncKeyHalf);
-    await this.biometricService.setBiometricProtectedUnlockKeyForUser(userId, userKey.keyB64);
+    await this.biometricService.setBiometricProtectedUnlockKeyForUser(userId, userKey);
   }
 
   protected async shouldStoreKey(keySuffix: KeySuffixOptions, userId: UserId): Promise<boolean> {
@@ -91,29 +82,4 @@ export class ElectronKeyService extends DefaultKeyService {
     await this.biometricService.deleteBiometricUnlockKeyForUser(userId);
     await super.clearAllStoredUserKeys(userId);
   }
-
-  private async getBiometricEncryptionClientKeyHalf(
-    userKey: UserKey,
-    userId: UserId,
-  ): Promise<CsprngString | null> {
-    const requireClientKeyHalf = await this.biometricStateService.getRequirePasswordOnStart(userId);
-    if (!requireClientKeyHalf) {
-      return null;
-    }
-
-    // Retrieve existing key half if it exists
-    let clientKeyHalf = await this.biometricStateService
-      .getEncryptedClientKeyHalf(userId)
-      .then((result) => result?.decrypt(null /* user encrypted */, userKey))
-      .then((result) => result as CsprngString);
-    if (clientKeyHalf == null && userKey != null) {
-      // Set a key half if it doesn't exist
-      const keyBytes = await this.cryptoFunctionService.randomBytes(32);
-      clientKeyHalf = Utils.fromBufferToUtf8(keyBytes) as CsprngString;
-      const encKey = await this.encryptService.encryptString(clientKeyHalf, userKey);
-      await this.biometricStateService.setEncryptedClientKeyHalf(encKey, userId);
-    }
-
-    return clientKeyHalf;
-  }
 }
diff --git a/apps/desktop/src/key-management/preload.ts b/apps/desktop/src/key-management/preload.ts
index c955571697b..7f8576b8472 100644
--- a/apps/desktop/src/key-management/preload.ts
+++ b/apps/desktop/src/key-management/preload.ts
@@ -1,4 +1,5 @@
 import { ipcRenderer } from "electron";
+import { Jsonify } from "type-fest";
 
 import { UserKey } from "@bitwarden/common/types/key";
 import { BiometricsStatus } from "@bitwarden/key-management";
@@ -14,7 +15,7 @@ const biometric = {
     ipcRenderer.invoke("biometric", {
       action: BiometricAction.GetStatus,
     } satisfies BiometricMessage),
-  unlockWithBiometricsForUser: (userId: string): Promise<UserKey | null> =>
+  unlockWithBiometricsForUser: (userId: string): Promise<Jsonify<UserKey> | null> =>
     ipcRenderer.invoke("biometric", {
       action: BiometricAction.UnlockForUser,
       userId: userId,
@@ -24,12 +25,13 @@ const biometric = {
       action: BiometricAction.GetStatusForUser,
       userId: userId,
     } satisfies BiometricMessage),
-  setBiometricProtectedUnlockKeyForUser: (userId: string, value: string): Promise<void> =>
-    ipcRenderer.invoke("biometric", {
+  setBiometricProtectedUnlockKeyForUser: (userId: string, keyB64: string): Promise<void> => {
+    return ipcRenderer.invoke("biometric", {
       action: BiometricAction.SetKeyForUser,
       userId: userId,
-      key: value,
-    } satisfies BiometricMessage),
+      key: keyB64,
+    } satisfies BiometricMessage);
+  },
   deleteBiometricUnlockKeyForUser: (userId: string): Promise<void> =>
     ipcRenderer.invoke("biometric", {
       action: BiometricAction.RemoveKeyForUser,
@@ -39,12 +41,6 @@ const biometric = {
     ipcRenderer.invoke("biometric", {
       action: BiometricAction.Setup,
     } satisfies BiometricMessage),
-  setClientKeyHalf: (userId: string, value: string | null): Promise<void> =>
-    ipcRenderer.invoke("biometric", {
-      action: BiometricAction.SetClientKeyHalf,
-      userId: userId,
-      key: value,
-    } satisfies BiometricMessage),
   getShouldAutoprompt: (): Promise<boolean> =>
     ipcRenderer.invoke("biometric", {
       action: BiometricAction.GetShouldAutoprompt,
diff --git a/apps/desktop/src/locales/af/messages.json b/apps/desktop/src/locales/af/messages.json
index 28cff8cae13..68f389a40a0 100644
--- a/apps/desktop/src/locales/af/messages.json
+++ b/apps/desktop/src/locales/af/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identiteit"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Beveiligde Nota"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Ander"
   },
-  "generatePassword": {
-    "message": "Wek 'n Wagwoord op"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Tipe"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maksimumlêergrootte is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Gewysigde vouer"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Hierdie aksie is beskerm. Voer u hoofwagwoord in om u identiteit te bevestig om voort te gaan."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Hoofwagwoord bygewerk"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "U hoofwagwoord voldoen nie aan een of meer van die organisasiebeleide nie. Om toegang tot die kluis te kry, moet u nou u hoofwagwoord bywerk. Deur voort te gaan sal u van u huidige sessie afgeteken word, en u sal weer moet aanteken. Aktiewe sessies op ander toestelle kan vir tot een uur aktief bly."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Wek 'n Wagwoord op"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Lukraak"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Swak wagwoord geidentifiseer en gevind in 'n data lekkasie. Gebruik 'n sterk en unieke wagwoord om jou rekening te beskerm. Is jy seker dat jy hierdie wagwoord wil gebruik?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Kontroleer bekende data lekkasies vir hierdie wagwoord"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Streek"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/ar/messages.json b/apps/desktop/src/locales/ar/messages.json
index d9dfb7cdff5..7b2e220fa48 100644
--- a/apps/desktop/src/locales/ar/messages.json
+++ b/apps/desktop/src/locales/ar/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "الهوية"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "ملاحظة آمنة"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "أخرى"
   },
-  "generatePassword": {
-    "message": "توليد كلمة المرور"
-  },
-  "generatePassphrase": {
-    "message": "توليد عبارة المرور"
-  },
   "type": {
     "message": "نوع"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "الحجم الأقصى للملف هو 500 ميجابايت."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "مطلوب ترحيل مفتاح التشفير. الرجاء تسجيل الدخول بواسطة مخزن الويب لتحديث مفتاح التشفير الخاص بك."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "تم حفظ المجلد"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "الحساب مقيد"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"كلمة مرور الملف\" و \"تأكيد كلمة مرور الملف\" غير متطابقين."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "هذا الإجراء محمي. للاستمرار، يرجى إعادة إدخال كلمة المرور الرئيسية للتحقق من هويتك."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "كلمة المرور الرئيسية المحدثة"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "كلمة المرور الرئيسية الخاصة بك لا تفي بواحدة أو أكثر من سياسات مؤسستك. من أجل الوصول إلى الخزانة، يجب عليك تحديث كلمة المرور الرئيسية الآن. سيتم تسجيل خروجك من الجلسة الحالية، مما يتطلب منك تسجيل الدخول مرة أخرى. وقد تظل الجلسات النشطة على أجهزة أخرى نشطة لمدة تصل إلى ساعة واحدة."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "لقد قامت مؤسستك بتعطيل تشفير الجهاز الموثوق به. الرجاء تعيين كلمة مرور رئيسية للوصول إلى خزانك."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "توليد كلمة المرور"
+  },
+  "generatePassphrase": {
+    "message": "توليد عبارة المرور"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "يجب أن تكون القيمة بين $MIN$ و $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "عشوائي"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "كلمة مرور ضعيفة محددة وموجودة في خرق البيانات. استخدم كلمة مرور قوية وفريدة لحماية حسابك. هل أنت متأكد من أنك تريد استخدام كلمة المرور هذه؟"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "تحقق من خروقات البيانات المعروفة لكلمة المرور هذه"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "طلب موافقة المشرف"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "المنطقة"
   },
@@ -3508,6 +3550,30 @@
     "message": "تنسيقات مشتركة",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "نجاح"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/az/messages.json b/apps/desktop/src/locales/az/messages.json
index 5c1f49cbfff..6d6ce16b126 100644
--- a/apps/desktop/src/locales/az/messages.json
+++ b/apps/desktop/src/locales/az/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Kimlik"
   },
+  "typeNote": {
+    "message": "Not"
+  },
   "typeSecureNote": {
     "message": "Güvənli qeyd"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Digər"
   },
-  "generatePassword": {
-    "message": "Parol yarat"
-  },
-  "generatePassphrase": {
-    "message": "Keçid ifadələri yarat"
-  },
   "type": {
     "message": "Növ"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maksimal fayl həcmi 500 MB-dır."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Şifrələmə açarının daşınması tələb olunur. Şifrələmə açarınızı güncəlləmək üçün lütfən veb seyfinizə giriş edin."
+  "legacyEncryptionUnsupported": {
+    "message": "Köhnə şifrələmə artıq dəstəklənmir. Hesabınızı geri qaytarmaq üçün lütfən dəstəklə əlaqə saxlayın."
   },
   "editedFolder": {
     "message": "Qovluğa düzəliş edildi"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Hesab məhdudlaşdırıldı"
   },
+  "restrictCardTypeImport": {
+    "message": "Kart element növləri daxilə köçürülə bilmir"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "1 və ya daha çox təşkilat tərəfindən təyin edilən bir siyasət, kartların seyfinizə köçürülməsini əngəlləyir."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Fayl parolu\" və \"Fayl parolunu təsdiqlə\" uyuşmur."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Bu əməliyyat qorumalıdır, davam etmək üçün lütfən kimliyinizi doğrulamaq məqsədilə ana parolunuzu yenidən daxil edin."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Ana parol uğurla təyin edildi"
+  },
   "updatedMasterPassword": {
     "message": "Güncəllənmiş ana parol"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ana parolunuz təşkilatınızdakı siyasətlərdən birinə və ya bir neçəsinə uyğun gəlmir. Seyfə müraciət üçün ana parolunuzu indi güncəlləməlisiniz. Davam etsəniz, hazırkı seansdan çıxış etmiş və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saata qədər aktiv qalmağa davam edə bilər."
   },
+  "changePasswordWarning": {
+    "message": "Parolunuzu dəyişdirdikdən sonra yeni parolunuzla giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saat ərzində çıxış sonlandırılacaq."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Hesabın geri qaytarılması prosesini tamamlamaq üçün ana parolunuzu dəyişdirin."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Ana parolunuz bu təşkilatın tələblərinə cavab vermir. Davam etmək üçün ana parolunuzu dəyişdirin."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Təşkilatınız, güvənli cihaz şifrələməsini sıradan çıxartdı. Seyfinizə müraciət etmək üçün lütfən ana parol təyin edin."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "İstifadəçi adı yaradıcı"
   },
+  "generatePassword": {
+    "message": "Parol yarat"
+  },
+  "generatePassphrase": {
+    "message": "Keçid ifadələri yarat"
+  },
+  "passwordGenerated": {
+    "message": "Parol yaradıldı"
+  },
+  "passphraseGenerated": {
+    "message": "Keçid ifadəsi yaradıldı"
+  },
+  "usernameGenerated": {
+    "message": "İstifadəçi adı yaradıldı"
+  },
+  "emailGenerated": {
+    "message": "E-poçt yaradıldı"
+  },
   "spinboxBoundariesHint": {
     "message": "Dəyər, $MIN$-$MAX$ arasında olmalıdır.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Bu e-poçtu istifadə et"
   },
+  "useThisPassword": {
+    "message": "Bu parolu istifadə et"
+  },
+  "useThisPassphrase": {
+    "message": "Bu keçid ifadəsini istifadə et"
+  },
+  "useThisUsername": {
+    "message": "Bu istifadəçi adını istifadə et"
+  },
   "random": {
     "message": "Təsadüfi"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Zəif parol məlumat pozuntusunda aşkarlandı və tapıldı. Hesabınızı qorumaq üçün güclü və unikal bir parol istifadə edin. Bu parolu istifadə etmək istədiyinizə əminsiniz?"
   },
-  "useThisPassword": {
-    "message": "Bu parolu istifadə et"
-  },
-  "useThisUsername": {
-    "message": "Bu istifadəçi adını istifadə et"
-  },
   "checkForBreaches": {
     "message": "Bu parol üçün bilinən məlumat pozuntularını yoxlayın"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Admin təsdiqini tələb et"
   },
+  "unableToCompleteLogin": {
+    "message": "Giriş prosesi tamamlana bilmir"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Güvəndiyiniz bir cihazda giriş etməli və ya inzibatçınızdan sizə bir parol təyin etməsini xahiş etməlisiniz."
+  },
   "region": {
     "message": "Bölgə"
   },
@@ -3508,6 +3550,30 @@
     "message": "Ortaq formatlar",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI uyuşma aşkarlaması, Bitwarden-in avto-doldurma təkliflərini necə müəyyən etdiyini göstərir.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Müntəzəm ifadə\", kimlik məlumatlarının ifşa olunma riskini artıran qabaqcıl bir seçimdir.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"İlə başlayır\", kimlik məlumatlarının ifşa olunma riskini artıran qabaqcıl bir seçimdir.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Uyuşma aşkarlaması barədə daha çox",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Uğurlu"
   },
@@ -3704,7 +3770,7 @@
     "message": "Riskli parolları dəyişdir"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "\"Yalnız baxma\" icazələrinə sahib kolleksiyaları silə bilməzsiniz: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Ana qovluğun adından sonra \"/\" əlavə edərək qovluğu ardıcıl yerləşdirin. Nümunə: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send, həssas məlumatlar təhlükəsizdir",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "İstənilən platformada faylları və dataları hər kəslə paylaşın. İfşa olunmağı məhdudlaşdıraraq məlumatlarınız ucdan-uca şifrələnmiş qalacaq.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Cəld parol yaradın"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Klikləyərək güclü və unikal parolları asanlıqla yaradın",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "və girişlərinizi güvənli şəkildə saxlayın.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Girişlərinizi güvənli şəkildə saxlamağınıza kömək etməsi üçün Parol yarat düyməsinə klikləyərək güclü və unikal parolları asanlıqla yaradın.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Avto-doldurma ilə vaxta qənaət edin"
   },
@@ -3772,5 +3863,139 @@
     "message": "SSH agenti barədə daha ətraflı",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Kolleksiyalara təyin et"
+  },
+  "assignToTheseCollections": {
+    "message": "Bu kolleksiyalara təyin et"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Yalnız bu kolleksiyalara müraciəti olan təşkilat üzvləri bu elementi görə biləcək."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Yalnız bu kolleksiyalara müraciəti olan təşkilat üzvləri bu elementləri görə biləcək."
+  },
+  "noCollectionsAssigned": {
+    "message": "Heç bir kolleksiya təyin edilmədi"
+  },
+  "assign": {
+    "message": "Təyin et"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Yalnız bu kolleksiyalara müraciəti olan təşkilat üzvləri bu elementləri görə biləcək."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "$TOTAL_COUNT$ element seçmisiniz. Düzəliş icazəniz olmadığı üçün $READONLY_COUNT$ elementi güncəlləyə bilməzsiniz.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Təyin ediləcək kolleksiyaları seçin"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ seçilmiş təşkilata birdəfəlik transfer ediləcək. Artıq bu elementlərə sahib olmaya bilməyəcəksiniz.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$, $ORG$ təşkilatına birdəfəlik transfer ediləcək. Artıq bu elementlərə sahib olmaya bilməyəcəksiniz.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 element seçilmiş təşkilata birdəfəlik transfer ediləcək. Artıq bu elementlərə sahib olmaya bilməyəcəksiniz."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 element $ORG$ təşkilatına birdəfəlik transfer ediləcək. Artıq bu elementlərə sahib olmaya bilməyəcəksiniz.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Uğurla təyin edilən kolleksiyalar"
+  },
+  "nothingSelected": {
+    "message": "Heç nə seçməmisiniz."
+  },
+  "itemsMovedToOrg": {
+    "message": "Elementlər bura daşındı: $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Element bura daşındı: $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Seçilən elementlər $ORGNAME$ təşkilatına daşınıldı",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/be/messages.json b/apps/desktop/src/locales/be/messages.json
index 9284f683e58..ae3c8a0cc60 100644
--- a/apps/desktop/src/locales/be/messages.json
+++ b/apps/desktop/src/locales/be/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Пасведчанне"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Бяспечныя нататкі"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Iншае"
   },
-  "generatePassword": {
-    "message": "Генерыраваць пароль"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Тып"
   },
@@ -551,7 +548,7 @@
     "message": "Дадаць папку"
   },
   "editFolder": {
-    "message": "Рэдагаваць папку"
+    "message": "Рэдагаваць тэчку"
   },
   "regeneratePassword": {
     "message": "Паўторна генерыраваць пароль"
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Максімальны памер файла 500 МБ."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Папка адрэдагавана"
@@ -707,7 +704,7 @@
     "message": "Папка дададзена"
   },
   "deleteFolderConfirmation": {
-    "message": "Вы сапраўды хочаце выдаліць гэту папку?"
+    "message": "Вы сапраўды хочаце выдаліць гэтую тэчку?"
   },
   "deletedFolder": {
     "message": "Папка выдалена"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Гэта дзеянне абаронена. Для працягу, калі ласка, паўторна ўвядзіце свой асноўны пароль, каб пацвердзіць вашу асобу."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Асноўны пароль абноўлены"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ваш асноўны пароль не адпавядае адной або некалькім палітыкам арганізацыі. Для атрымання доступу да сховішча, вы павінны абнавіць яго. Працягваючы, вы выйдзіце з бягучага сеанса і вам неабходна будзе ўвайсці паўторна. Актыўныя сеансы на іншых прыладах могуць заставацца актыўнымі на працягу адной гадзіны."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Генерыраваць пароль"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Выпадкова"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Вызначаны ненадзейны пароль, які знойдзены ва ўцечках даных. Выкарыстоўвайце надзейныя і ўнікальныя паролі для абароны свайго ўліковага запісу. Вы сапраўды хочаце выкарыстоўваць гэты пароль?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Праверыць у вядомых уцечках даных для гэтага пароля"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Запытаць ухваленне адміністратара"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Рэгіён"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/bg/messages.json b/apps/desktop/src/locales/bg/messages.json
index 18a1d8cf2f0..c67e1dfe829 100644
--- a/apps/desktop/src/locales/bg/messages.json
+++ b/apps/desktop/src/locales/bg/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Самоличност"
   },
+  "typeNote": {
+    "message": "Бележка"
+  },
   "typeSecureNote": {
     "message": "Защитена бележка"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Други"
   },
-  "generatePassword": {
-    "message": "Нова парола"
-  },
-  "generatePassphrase": {
-    "message": "Генериране на парола-фраза"
-  },
   "type": {
     "message": "Вид"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Големината на файла е най-много 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Необходима е промяна на шифриращия ключ. Впишете се в трезора си по уеб, за да обновите своя шифриращ ключ."
+  "legacyEncryptionUnsupported": {
+    "message": "Остарелият метод на шифроване вече не се поддържа. Моля, свържете се с поддръжката, за да възстановите акаунта си."
   },
   "editedFolder": {
     "message": "Редактирана папка"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Регистрацията е ограничена"
   },
+  "restrictCardTypeImport": {
+    "message": "Картовите елементи не могат да бъдат внесени"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Политика, зададена от 1 или повече организации, не позволява да внасяте карти в трезорите си."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "Дънните в полетата „Парола на файла“ и „Потвърждаване на паролата на файла“ не съвпадат."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Това действие е защитено. За да продължите, въведете отново главната си парола, за да потвърдите самоличността си."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Главната парола е зададена успешно"
+  },
   "updatedMasterPassword": {
     "message": "Главната парола е променена"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Вашата главна парола не отговаря на една или повече политики на организацията Ви. За да получите достъп до трезора, трябва да промените главната си парола сега. Това означава, че ще бъдете отписан(а) от текущата си сесия и ще трябва да се впишете отново. Активните сесии на други устройства може да продължат да бъдат активни още един час."
   },
+  "changePasswordWarning": {
+    "message": "След като промените паролата си, ще трябва да се впишете отново с новата си парола. Сесиите на други устройства също ще бъдат прекратени в рамките на един час."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Променете главната си парола, за да завършите възстановяването на акаунта."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Главната парола не отговаря на изискванията на тази организация. Променете главната си парола, за да продължите."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Вашата организация е деактивирала шифроването чрез доверени устройства. Задайте главна парола, за да получите достъп до трезора си."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Генератор на потребителски имена"
   },
+  "generatePassword": {
+    "message": "Нова парола"
+  },
+  "generatePassphrase": {
+    "message": "Генериране на парола-фраза"
+  },
+  "passwordGenerated": {
+    "message": "Паролата е генерирана"
+  },
+  "passphraseGenerated": {
+    "message": "Паролата-фраза е генерирана"
+  },
+  "usernameGenerated": {
+    "message": "Потребителското име е генерирано"
+  },
+  "emailGenerated": {
+    "message": "Е-пощата е генерирана"
+  },
   "spinboxBoundariesHint": {
     "message": "Стойността трябва да бъде между $MIN$ и $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Използване на тази е-поща"
   },
+  "useThisPassword": {
+    "message": "Използване на тази парола"
+  },
+  "useThisPassphrase": {
+    "message": "Използване на тази парола-фраза"
+  },
+  "useThisUsername": {
+    "message": "Използване на това потребителско име"
+  },
   "random": {
     "message": "Произволно"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Разпозната е слаба парола. Използвайте силна парола, за да защитете данните си. Наистина ли искате да използвате слаба парола?"
   },
-  "useThisPassword": {
-    "message": "Използване на тази парола"
-  },
-  "useThisUsername": {
-    "message": "Използване на това потребителско име"
-  },
   "checkForBreaches": {
     "message": "Проверяване в известните случаи на изтекли данни за тази парола"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Подаване на заявка за одобрение от администратор"
   },
+  "unableToCompleteLogin": {
+    "message": "Вписването не може да бъде завършено"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Трябва да се впишете на доверено устройство или да помолите администратора си да Ви зададе парола."
+  },
   "region": {
     "message": "Регион"
   },
@@ -3508,6 +3550,30 @@
     "message": "Често използвани формати",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Разпознаването на съвпадения чрез адреса е начинът, по който Битуорден определя кои елементи да предложи за автоматично попълване.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "„Регулярен израз“ е по-сложен метод, който е и по-рисков, тъй като може да застраши сигурността на данните за вписване.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "„Започва с“ е по-сложен метод, който е и по-рисков, тъй като може да застраши сигурността на данните за вписване.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Повече относно разпознаването на съвпадения",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Разширени настройки",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Внимание",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Успех"
   },
@@ -3704,7 +3770,7 @@
     "message": "Промяна на парола в риск"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Не можете да премахвате колекции с права „Само за преглед“: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Можете да вложите една папка в друга като въведете името на горната папка, а след това „/“. Пример: Социални/Форуми"
   },
+  "sendsTitleNoItems": {
+    "message": "Изпращайте чувствителна информация сигурно",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Споделяйте сигурно файлове и данни с всекиго, през всяка система. Информацията Ви ще бъде защитена с шифроване от край до край, а видимостта ѝ ще бъде ограничена.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Създавайте пароли бързо"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Създавайте лесно сложни и уникални пароли като щракнете върху",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "за да защитите данните си за вписване.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Създавайте лесно сложни и уникални пароли като щракнете върху бутона за генериране на парола, за да защитите данните си за вписване.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Спестете време с автоматично попълване"
   },
@@ -3772,5 +3863,139 @@
     "message": "Научете повече относно SSH-агента",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Свързване с колекции"
+  },
+  "assignToTheseCollections": {
+    "message": "Свързване с тези колекции"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Само членовете на организацията, които имат достъп до тези колекции, ще могат да виждат елемента."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Само членовете на организацията, които имат достъп до тези колекции, ще могат да виждат елементите."
+  },
+  "noCollectionsAssigned": {
+    "message": "Няма свързани колекции"
+  },
+  "assign": {
+    "message": "Свързване"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Само членовете на организацията, които имат достъп до тези колекции, ще могат да виждат елементите."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Избрали сте $TOTAL_COUNT$ елемента Не можете да промените $READONLY_COUNT$ от елементите, тъй като нямате право за редактиране.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Изберете колекции за свързване"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ ще бъдат преместени завинаги в избраната организация. Вече няма да притежавате тези елементи.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ ще бъдат преместени завинаги в $ORG$. Вече няма да притежавате тези елементи.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 елемент ще бъде преместен завинаги в избраната организация. Вече няма да притежавате този елемент."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 елемент ще бъде преместен завинаги в $ORG$. Вече няма да притежавате този елемент.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Успешно свързване на колекциите"
+  },
+  "nothingSelected": {
+    "message": "Не сте избрали нищо."
+  },
+  "itemsMovedToOrg": {
+    "message": "Елементите са преместени в $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Елементът е преместен в $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Избраните записи бяха преместени в $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/bn/messages.json b/apps/desktop/src/locales/bn/messages.json
index b3a2b6e21ee..6f5ac9de909 100644
--- a/apps/desktop/src/locales/bn/messages.json
+++ b/apps/desktop/src/locales/bn/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "পরিচয়"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "সুরক্ষিত নোট"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "অন্যান্য"
   },
-  "generatePassword": {
-    "message": "পাসওয়ার্ড তৈরি করুন"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "ধরন"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "সর্বোচ্চ ফাইলের আকার ১০০ এমবি।"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "ফোল্ডার সম্পাদিত"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "পাসওয়ার্ড তৈরি করুন"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/bs/messages.json b/apps/desktop/src/locales/bs/messages.json
index 89015368c11..4600780eda5 100644
--- a/apps/desktop/src/locales/bs/messages.json
+++ b/apps/desktop/src/locales/bs/messages.json
@@ -9,7 +9,7 @@
     "message": "Sve spremljene lozinke"
   },
   "favorites": {
-    "message": "Omiljene stavke"
+    "message": "Omiljeno"
   },
   "types": {
     "message": "Vrste"
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identitet"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Sigurna bilješka"
   },
@@ -211,7 +214,7 @@
     "message": "The password you entered is incorrect."
   },
   "importSshKey": {
-    "message": "Import"
+    "message": "Uvoz"
   },
   "confirmSshKeyPassword": {
     "message": "Confirm password"
@@ -351,12 +354,6 @@
   "other": {
     "message": "Ostalo"
   },
-  "generatePassword": {
-    "message": "Generiraj lozinku"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Vrsta"
   },
@@ -403,7 +400,7 @@
     "message": "Izbriši"
   },
   "favorite": {
-    "message": "Omiljene stavke"
+    "message": "Omiljeno"
   },
   "edit": {
     "message": "Uredi"
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maksimalna veličina datoteke je 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Uređen folder"
@@ -1122,7 +1119,7 @@
     "message": "Kontaktirajte nas"
   },
   "helpAndFeedback": {
-    "message": "Help and feedback"
+    "message": "Pomoć i povratne informacije"
   },
   "getHelp": {
     "message": "Potraži pomoć"
@@ -1492,7 +1489,7 @@
     "message": "Historija uređivanja lozinke"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "Povijest stvaranja"
   },
   "clearGeneratorHistoryTitle": {
     "message": "Clear generator history"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -1872,7 +1875,7 @@
     "message": "You've upgraded to Premium."
   },
   "restore": {
-    "message": "Restore"
+    "message": "Vrati"
   },
   "premiumManageAlertAppStore": {
     "message": "You can manage your subscription from the App Store. Do you want to visit the App Store now?"
@@ -1920,7 +1923,7 @@
     "description": "Noun: a special folder to hold deleted items"
   },
   "searchTrash": {
-    "message": "Search trash"
+    "message": "Pretraživanje smeća"
   },
   "permanentlyDeleteItem": {
     "message": "Permanently delete item"
@@ -2191,7 +2194,7 @@
     "message": "Personal details"
   },
   "identification": {
-    "message": "Identification"
+    "message": "Identifikacija"
   },
   "contactInfo": {
     "message": "Contact information"
@@ -2366,7 +2369,7 @@
     "message": "Awaiting security key interaction..."
   },
   "hideEmail": {
-    "message": "Hide my email address from recipients."
+    "message": "Sakrij moju adresu e-pošte od primatelja."
   },
   "sendOptionsPolicyInEffect": {
     "message": "One or more organization policies are affecting your Send options."
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2441,7 +2456,7 @@
     "message": "Resend code"
   },
   "hours": {
-    "message": "Hours"
+    "message": "Sati"
   },
   "minutes": {
     "message": "Minutes"
@@ -2606,7 +2621,7 @@
     "message": "Locked"
   },
   "yourVaultIsLockedV2": {
-    "message": "Your vault is locked"
+    "message": "Vaš sef je zaključan"
   },
   "unlocked": {
     "message": "Unlocked"
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generiraj lozinku"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -2702,10 +2744,10 @@
     "message": "All vaults"
   },
   "searchOrganization": {
-    "message": "Search organization"
+    "message": "Pretraživanje organizacija"
   },
   "searchMyVault": {
-    "message": "Search my vault"
+    "message": "Pretraživanje sefa"
   },
   "forwardedEmail": {
     "message": "Forwarded email alias"
@@ -2848,7 +2890,7 @@
     }
   },
   "hostname": {
-    "message": "Hostname",
+    "message": "Naziv domaćina",
     "description": "Part of a URL."
   },
   "apiAccessToken": {
@@ -2936,7 +2978,7 @@
     "message": "View all login options"
   },
   "resendNotification": {
-    "message": "Resend notification"
+    "message": "Ponovo pošalji obavijest"
   },
   "toggleCharacterCount": {
     "message": "Toggle character count",
@@ -3034,7 +3076,7 @@
     "message": "No email?"
   },
   "goBack": {
-    "message": "Go back"
+    "message": "Natrag"
   },
   "toEditYourEmailAddress": {
     "message": "to edit your email address."
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3064,7 +3100,7 @@
     "message": "Logged in!"
   },
   "important": {
-    "message": "Important:"
+    "message": "Važno:"
   },
   "accessing": {
     "message": "Accessing"
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3188,7 +3230,7 @@
     "message": "required"
   },
   "search": {
-    "message": "Search"
+    "message": "Traži"
   },
   "inputMinLength": {
     "message": "Input must be at least $COUNT$ characters long.",
@@ -3255,7 +3297,7 @@
     }
   },
   "selectPlaceholder": {
-    "message": "-- Select --"
+    "message": "Odaberi"
   },
   "multiSelectPlaceholder": {
     "message": "-- Type to filter --"
@@ -3285,7 +3327,7 @@
     "message": "Toggle side navigation"
   },
   "skipToContent": {
-    "message": "Skip to content"
+    "message": "Prijeđi na sadržaj"
   },
   "typePasskey": {
     "message": "Passkey"
@@ -3300,11 +3342,11 @@
     "message": "Alias domain"
   },
   "importData": {
-    "message": "Import data",
+    "message": "Uvoz podataka",
     "description": "Used for the desktop menu item and the header of the import dialog"
   },
   "importError": {
-    "message": "Import error"
+    "message": "Greška pri uvozu"
   },
   "importErrorDesc": {
     "message": "There was a problem with the data you tried to import. Please resolve the errors listed below in your source file and try again."
@@ -3493,7 +3535,7 @@
     "message": "Import directly from LastPass"
   },
   "importFromCSV": {
-    "message": "Import from CSV"
+    "message": "Uvoz iz CSV datoteke"
   },
   "lastPassTryAgainCheckEmail": {
     "message": "Try again or look for an email from LastPass to verify it's you."
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/ca/messages.json b/apps/desktop/src/locales/ca/messages.json
index 5550e2d0c62..a28b3b3c6d4 100644
--- a/apps/desktop/src/locales/ca/messages.json
+++ b/apps/desktop/src/locales/ca/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identitat"
   },
+  "typeNote": {
+    "message": "Nota"
+  },
   "typeSecureNote": {
     "message": "Nota segura"
   },
@@ -247,10 +250,10 @@
     "message": "Remember SSH authorizations"
   },
   "sshAgentPromptBehaviorAlways": {
-    "message": "Always"
+    "message": "Sempre"
   },
   "sshAgentPromptBehaviorNever": {
-    "message": "Never"
+    "message": "Mai"
   },
   "sshAgentPromptBehaviorRememberUntilLock": {
     "message": "Remember until vault is locked"
@@ -351,12 +354,6 @@
   "other": {
     "message": "Altres"
   },
-  "generatePassword": {
-    "message": "Genera contrasenya"
-  },
-  "generatePassphrase": {
-    "message": "Genera frase de pas"
-  },
   "type": {
     "message": "Tipus"
   },
@@ -412,13 +409,13 @@
     "message": "Clau d'autenticació (TOTP)"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "Clau autenticadora"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "Opcions d'emplenament automàtic"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "Lloc web (URI)"
   },
   "websiteUriCount": {
     "message": "Website (URI) $COUNT$",
@@ -431,34 +428,34 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Lloc web afegit"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "Afig un lloc web"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "Suprimeix lloc web"
   },
   "owner": {
-    "message": "Owner"
+    "message": "Propietari"
   },
   "addField": {
-    "message": "Add field"
+    "message": "Afig un camp"
   },
   "editField": {
-    "message": "Edit field"
+    "message": "Edita el camp"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "Esteu segur que voleu suprimir definitivament aquest adjunt?"
   },
   "fieldType": {
-    "message": "Field type"
+    "message": "Tipus de camp"
   },
   "fieldLabel": {
-    "message": "Field label"
+    "message": "Etiqueta del camp"
   },
   "add": {
-    "message": "Add"
+    "message": "Afig"
   },
   "textHelpText": {
     "message": "Use text fields for data like security questions"
@@ -501,7 +498,7 @@
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "cfTypeCheckbox": {
-    "message": "Checkbox"
+    "message": "Casella de selecció"
   },
   "linkedValue": {
     "message": "Valor enllaçat",
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "La mida màxima del fitxer és de 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Cal migrar la clau de xifratge. Inicieu la sessió a la caixa forta web per actualitzar la clau de xifratge."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Carpeta guardada"
@@ -737,7 +734,7 @@
     "message": "Enter the code sent to your email"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "Introduïu el codi de la vostra aplicació d'autenticació"
   },
   "pressYourYubiKeyToAuthenticate": {
     "message": "Press your YubiKey to authenticate"
@@ -910,7 +907,7 @@
     "message": "L'autenticació s'ha cancel·lat o ha tardat massa. Torna-ho a provar."
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "Obrir en una pestanya nova"
   },
   "invalidVerificationCode": {
     "message": "Codi de verificació no vàlid"
@@ -968,7 +965,7 @@
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "verifyYourIdentity": {
-    "message": "Verify your Identity"
+    "message": "Verifiqueu la vostra identitat"
   },
   "weDontRecognizeThisDevice": {
     "message": "No reconeixem aquest dispositiu. Introduïu el codi que us hem enviat al correu electrònic per verificar la identitat."
@@ -1001,7 +998,7 @@
     "message": "Opcions d'inici de sessió en dues passes"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "Seleccioneu un mètode d'inici de sessió en dues passes"
   },
   "selfHostedEnvironment": {
     "message": "Entorn d'allotjament propi"
@@ -1059,7 +1056,7 @@
     "message": "No"
   },
   "location": {
-    "message": "Location"
+    "message": "Ubicació"
   },
   "overwritePassword": {
     "message": "Sobreescriu la contrasenya"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Compte restringit"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Contrasenya del fitxer\" i \"Confirma contrasenya del fitxer\" no coincideixen."
   },
@@ -1967,7 +1970,7 @@
     }
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "Dades de la targeta"
   },
   "cardBrandDetails": {
     "message": "$BRAND$ details",
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Aquesta acció està protegida. Per continuar, torneu a introduir la contrasenya principal per verificar la vostra identitat."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "La contrasenya mestra s'ha configurat correctament"
+  },
   "updatedMasterPassword": {
     "message": "Contrasenya mestra actualitzada"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "La vostra contrasenya mestra no compleix una o més de les polítiques de l'organització. Per accedir a la caixa forta, heu d'actualitzar-la ara. Si continueu, es tancarà la sessió actual i us demanarà que torneu a iniciar-la. Les sessions en altres dispositius poden continuar romanent actives fins a una hora."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2516,7 +2531,7 @@
     "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Nom de l'organització"
   },
   "keyConnectorDomain": {
     "message": "Key Connector domain"
@@ -2631,7 +2646,25 @@
     "message": "Genera correu electrònic"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Generador de nom d'usuari"
+  },
+  "generatePassword": {
+    "message": "Genera contrasenya"
+  },
+  "generatePassphrase": {
+    "message": "Genera frase de pas"
+  },
+  "passwordGenerated": {
+    "message": "Contrasenya generada"
+  },
+  "passphraseGenerated": {
+    "message": "Frase de pas generada"
+  },
+  "usernameGenerated": {
+    "message": "Nom d'usuari generat"
+  },
+  "emailGenerated": {
+    "message": "Correu electrònic generat"
   },
   "spinboxBoundariesHint": {
     "message": "El valor ha d'estar entre $MIN$ i $MAX$.",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Utilitza aquest correu"
   },
+  "useThisPassword": {
+    "message": "Utilitzeu aquesta contrasenya"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Utilitzeu aquest nom d'usuari"
+  },
   "random": {
     "message": "Aleatori"
   },
@@ -2946,7 +2988,7 @@
     "message": "Are you trying to access your account?"
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "Intent d'inici de sessió per $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Contrasenya feble identificada i trobada en una filtració de dades. Utilitzeu una contrasenya única i segura per protegir el vostre compte. Esteu segur que voleu utilitzar aquesta contrasenya?"
   },
-  "useThisPassword": {
-    "message": "Utilitzeu aquesta contrasenya"
-  },
-  "useThisUsername": {
-    "message": "Utilitzeu aquest nom d'usuari"
-  },
   "checkForBreaches": {
     "message": "Comproveu les filtracions de dades conegudes per a aquesta contrasenya"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Sol·liciteu l'aprovació de l'administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Regió"
   },
@@ -3161,7 +3203,7 @@
     "message": "Trust organization"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Confiar"
   },
   "doNotTrust": {
     "message": "Do not trust"
@@ -3508,6 +3550,30 @@
     "message": "Formats comuns",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Èxit"
   },
@@ -3614,25 +3680,25 @@
     "message": "Biometric unlock is currently unavailable for an unknown reason."
   },
   "itemDetails": {
-    "message": "Item details"
+    "message": "Detalls de l'element"
   },
   "itemName": {
-    "message": "Item name"
+    "message": "Nom d'element"
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "Credencials d'inici de sessió"
   },
   "additionalOptions": {
-    "message": "Additional options"
+    "message": "Opcions addicionals"
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "Historial d'elements"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "Última edició"
   },
   "upload": {
-    "message": "Upload"
+    "message": "Puja"
   },
   "authorize": {
     "message": "Autoritza"
@@ -3713,27 +3779,52 @@
     }
   },
   "move": {
-    "message": "Move"
+    "message": "Desplaça"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Carpeta nova"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "Nom de la carpeta"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Imbriqueu una carpeta afegint el nom de la carpeta principal seguit d'una \"/\". Exemple: Social/Fòrums"
+  },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Inclou un",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Lloc web",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assigna a col·leccions"
+  },
+  "assignToTheseCollections": {
+    "message": "Assigna a aquestes col·leccions"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No s'ha assignat cap col·lecció"
+  },
+  "assign": {
+    "message": "Assigna"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Heu seleccionat $TOTAL_COUNT$ elements. No podeu actualitzar-ne $READONLY_COUNT$ dels quals perquè no teniu permisos d'edició.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Seleccioneu les col·leccions per assignar"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "No heu seleccionat res."
+  },
+  "itemsMovedToOrg": {
+    "message": "S'han desplaçat elements a $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/cs/messages.json b/apps/desktop/src/locales/cs/messages.json
index b6c3edd783a..8c725808a98 100644
--- a/apps/desktop/src/locales/cs/messages.json
+++ b/apps/desktop/src/locales/cs/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identita"
   },
+  "typeNote": {
+    "message": "Poznámka"
+  },
   "typeSecureNote": {
     "message": "Zabezpečená poznámka"
   },
@@ -33,7 +36,7 @@
     "message": "Složky"
   },
   "collections": {
-    "message": "Kolekce"
+    "message": "Sbírky"
   },
   "searchVault": {
     "message": "Prohledat trezor"
@@ -351,12 +354,6 @@
   "other": {
     "message": "Ostatní"
   },
-  "generatePassword": {
-    "message": "Vygenerovat heslo"
-  },
-  "generatePassphrase": {
-    "message": "Vygenerovat heslovou frázi"
-  },
   "type": {
     "message": "Typ"
   },
@@ -664,7 +661,7 @@
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "searchCollection": {
-    "message": "Prohledat kolekci"
+    "message": "Prohledat sbírku"
   },
   "searchFolder": {
     "message": "Prohledat složku"
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximální velikost souboru je 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Vyžaduje se migrace šifrovacího klíče. Pro aktualizaci šifrovacího klíče se přihlaste přes webový trezor."
+  "legacyEncryptionUnsupported": {
+    "message": "Staré šifrování již není podporováno. Kontaktujte podporu pro obnovení Vašeho účtu."
   },
   "editedFolder": {
     "message": "Složka byla uložena"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Účet je omezený"
   },
+  "restrictCardTypeImport": {
+    "message": "Nelze importovat typy položek karty"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Zásady nastavené 1 nebo více organizací Vám brání v importu karet do Vašeho trezoru."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Heslo souboru\" a \"Potvrzení hesla souboru\" se neshodují."
   },
@@ -1745,7 +1748,7 @@
     "message": "Nepatříte do žádné organizace. Organizace umožňují bezpečné sdílení položek s ostatními uživateli."
   },
   "noCollectionsInList": {
-    "message": "Žádné kolekce k zobrazení."
+    "message": "Žádné sbírky k zobrazení."
   },
   "ownership": {
     "message": "Vlastnictví"
@@ -1866,7 +1869,7 @@
     "message": "Skrýt do panelu nabídek"
   },
   "selectOneCollection": {
-    "message": "Musíte vybrat alespoň jednu kolekci."
+    "message": "Musíte vybrat alespoň jednu sbírku."
   },
   "premiumUpdated": {
     "message": "Aktualizovali jste na Premium."
@@ -2173,7 +2176,7 @@
     "message": "Kvůli metodě instalace nelze automaticky povolit podporu biometrických prvků. Chcete otevřít dokumentaci o tom, jak to provést ručně?"
   },
   "personalOwnershipSubmitError": {
-    "message": "Z důvodu podnikových zásad nemůžete ukládat položky do svého osobního trezoru. Změňte vlastnictví položky na organizaci a poté si vyberte z dostupných kolekcí."
+    "message": "Z důvodu podnikových zásad nemůžete ukládat položky do svého osobního trezoru. Změňte vlastnictví položky na organizaci a poté si vyberte z dostupných sbírek."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
     "message": "Vaše nové heslo nemůže být stejné jako Vaše současné heslo."
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Tato akce je chráněna. Chcete-li pokračovat, zadejte znovu Vaše hlavní heslo, abychom ověřili Vaši totožnost."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Hlavní heslo bylo úspěšně nastaveno"
+  },
   "updatedMasterPassword": {
     "message": "Hlavní heslo bylo aktualizováno"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Vaše hlavní heslo nesplňuje jednu nebo více zásad Vaší organizace. Pro přístup k trezoru musíte nyní aktualizovat své hlavní heslo. Pokračování Vás odhlásí z Vaší aktuální relace a bude nutné se přihlásit. Aktivní relace na jiných zařízeních mohou zůstat aktivní až po dobu jedné hodiny."
   },
+  "changePasswordWarning": {
+    "message": "Po změně hesla se budete muset přihlásit pomocí svého nového hesla. Aktivní relace na jiných zařízeních budou odhlášeny do jedné hodiny."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Pro dokončení obnovy účtu změňte hlavní heslo."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Hlavní heslo nesplňuje požadavky této organizace. Chcete-li pokračovat, změňte hlavní heslo."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Vaše organizace zakázala šifrování pomocí důvěryhodného zařízení. Nastavte hlavní heslo pro přístup k trezoru."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Generátor uživatelského jména"
   },
+  "generatePassword": {
+    "message": "Vygenerovat heslo"
+  },
+  "generatePassphrase": {
+    "message": "Vygenerovat heslovou frázi"
+  },
+  "passwordGenerated": {
+    "message": "Heslo bylo vygenerováno"
+  },
+  "passphraseGenerated": {
+    "message": "Heslová fráze byla vygenerována"
+  },
+  "usernameGenerated": {
+    "message": "Uživatelské jméno bylo vygenerováno"
+  },
+  "emailGenerated": {
+    "message": "E-mail byl vygenerován"
+  },
   "spinboxBoundariesHint": {
     "message": "Hodnota musí být mezi $MIN$ a $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Použít tento e-mail"
   },
+  "useThisPassword": {
+    "message": "Použít toto heslo"
+  },
+  "useThisPassphrase": {
+    "message": "Použít tuto heslovou frázi"
+  },
+  "useThisUsername": {
+    "message": "Použít toto uživatelské jméno"
+  },
   "random": {
     "message": "Náhodný"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Slabé heslo bylo nalezeno mezi odhalenými hesly. K zabezpečení Vašeho účtu používejte silné a jedinečné heslo. Opravdu chcete používat toto heslo?"
   },
-  "useThisPassword": {
-    "message": "Použít toto heslo"
-  },
-  "useThisUsername": {
-    "message": "Použít toto uživatelské jméno"
-  },
   "checkForBreaches": {
     "message": "Zkontrolovat heslo, zda nebylo odhaleno"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Žádost o schválení správcem"
   },
+  "unableToCompleteLogin": {
+    "message": "Nelze dokončit přihlášení"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Musíte se přihlásit na důvěryhodném zařízení nebo požádat správce, aby Vám přiřadil heslo."
+  },
   "region": {
     "message": "Oblast"
   },
@@ -3379,7 +3421,7 @@
     "message": "Zvolte složku"
   },
   "selectImportCollection": {
-    "message": "Zvolte kolekci"
+    "message": "Zvolte sbírku"
   },
   "importTargetHint": {
     "message": "Pokud chcete obsah importovaného souboru přesunout do složky $DESTINATION$, vyberte tuto volbu",
@@ -3499,7 +3541,7 @@
     "message": "Zkuste to znovu nebo vyhledejte e-mail od LastPass pro ověření, že jste to Vy."
   },
   "collection": {
-    "message": "Kolekce"
+    "message": "Sbírka"
   },
   "lastPassYubikeyDesc": {
     "message": "Vložte YubiKey spojený s Vaším účtem LastPass do USB portu Vašeho počítače a stiskněte jeho tlačítko."
@@ -3508,6 +3550,30 @@
     "message": "Společné formáty",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Detekce shody URI je způsob, jakým Bitwarden identifikuje návrhy automatického vyplňování.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regulární výraz\" je pokročilá volba se zvýšeným rizikem odhalení přihlašovacích údajů.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Začíná na\" je pokročilá volba se zvýšeným rizikem odhalení přihlašovacích údajů.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Další informace o detekci shody",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Rozšířené volby",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Varování",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Úspěch"
   },
@@ -3527,7 +3593,7 @@
     "message": "Přístupový klíč byl odebrán"
   },
   "errorAssigningTargetCollection": {
-    "message": "Chyba při přiřazování cílové kolekce."
+    "message": "Chyba při přiřazování do cílové sbírky."
   },
   "errorAssigningTargetFolder": {
     "message": "Chyba při přiřazování cílové složky."
@@ -3704,7 +3770,7 @@
     "message": "Změnit ohrožené heslo"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "Nemůžete odebrat kolekce s oprávněními jen pro zobrazení: $COLLECTIONS$",
+    "message": "Nemůžete odebrat sbírky s oprávněními jen pro zobrazení: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Vnořte složku přidáním názvu nadřazené složky následovaného znakem \"/\". Příklad: Sociální/Fóra"
   },
+  "sendsTitleNoItems": {
+    "message": "Posílejte citlivé informace bezpečně",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Sdílejte bezpečně soubory a data s kýmkoli na libovolné platformě. Vaše informace zůstanou šifrovány a zároveň omezují expozici.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Rychlé vytvoření hesla"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Jednoduše vytvořte silná a unikátní hesla klepnutím na",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "aby Vám pomohlo udržet Vaše přihlašovací údaje v bezpečí.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Jednoduše vytvořte silná a unikátní hesla klepnutím na tlačítko Generovat heslo, které Vám pomůže udržet Vaše přihlašovací údaje v bezpečí.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Ušetřete čas s automatickým vyplňováním"
   },
@@ -3772,5 +3863,139 @@
     "message": "Další informace o SSH agentovi",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Přiřadit ke sbírkám"
+  },
+  "assignToTheseCollections": {
+    "message": "Přiřadit k těmto sbírkám"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Jen členové organizace s přístupem k těmto sbírkám budou moci vidět položku."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Jen členové organizace s přístupem k těmto sbírkám budou moci vidět položky."
+  },
+  "noCollectionsAssigned": {
+    "message": "Nebyly přiřazeny žádné sbírky"
+  },
+  "assign": {
+    "message": "Přiřadit"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Jen členové organizace s přístupem k těmto sbírkám budou moci vidět položky."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Vybrali jste $TOTAL_COUNT$ položek. Nemůžete aktualizovat $READONLY_COUNT$ položek, protože nemáte oprávnění k úpravám.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Vyberte sbírky pro přiřazení"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ bude trvale převedeno do vybrané organizace. Tyto položky již nebudete vlastnit.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ bude trvale převedeno do $ORG$. Tyto položky již nebudete vlastnit.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 položka bude trvale převedena do vybrané organizace. Tuto položku již nebudete vlastnit."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 položka bude trvale převedena do $ORG$. Tuto položku již nebudete vlastnit.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Sbírky byly úspěšně přiřazeny"
+  },
+  "nothingSelected": {
+    "message": "Nevybrali jste žádné položky."
+  },
+  "itemsMovedToOrg": {
+    "message": "Položky přesunuty do $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Položka přesunuta do $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Vybrané položky přesunuty do $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/cy/messages.json b/apps/desktop/src/locales/cy/messages.json
index 28ed661423d..3b3afba9415 100644
--- a/apps/desktop/src/locales/cy/messages.json
+++ b/apps/desktop/src/locales/cy/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identity"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Secure note"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Other"
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/da/messages.json b/apps/desktop/src/locales/da/messages.json
index f547eea69a0..cf60c7a04cb 100644
--- a/apps/desktop/src/locales/da/messages.json
+++ b/apps/desktop/src/locales/da/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identitet"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Sikret notat"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Andre"
   },
-  "generatePassword": {
-    "message": "Generér adgangskode"
-  },
-  "generatePassphrase": {
-    "message": "Generér adgangssætning"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maksimum filstørrelse er 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Krypteringsnøglemigrering nødvendig. Log ind gennem web-boksen for at opdatere krypteringsnøglen."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Mappe gemt"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Konto begrænset"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“Filadgangskode” og “Bekræft filadgangskode“ matcher ikke."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Denne handling er beskyttet. For at fortsætte, så bekræft din identitet ved at angive din hovedadgangskode igen."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Hovedadgangskode opdateret"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Din hovedadgangskode overholder ikke en eller flere organisationspolitikker. For at få adgang til boksen skal hovedadgangskode opdateres nu. Fortsættes, logges du ud af den nuværende session og vil skulle logger ind igen. Aktive sessioner på andre enheder kan forblive aktive i op til én time."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Organisationen har deaktiveret betroet enhedskryptering. Opsæt en hovedadgangskode for at tilgå boksen."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generér adgangskode"
+  },
+  "generatePassphrase": {
+    "message": "Generér adgangssætning"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Værdi skal være mellem $MIN$ og $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Anvend denne adgangskode"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Anvend dette brugernavn"
+  },
   "random": {
     "message": "Tilfældig"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Svag adgangskode identificeret og fundet i datalæk. Brug en unik adgangskode til at beskytte din konto. Sikker på, at at denne adgangskode skal bruges?"
   },
-  "useThisPassword": {
-    "message": "Anvend denne adgangskode"
-  },
-  "useThisUsername": {
-    "message": "Anvend dette brugernavn"
-  },
   "checkForBreaches": {
     "message": "Tjek kendte datalæk for denne adgangskode"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Anmod om admin-godkendelse"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Almindelige formater",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Gennemført"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/de/messages.json b/apps/desktop/src/locales/de/messages.json
index de39eba6f99..6e2b172b97c 100644
--- a/apps/desktop/src/locales/de/messages.json
+++ b/apps/desktop/src/locales/de/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identität"
   },
+  "typeNote": {
+    "message": "Notiz"
+  },
   "typeSecureNote": {
     "message": "Sichere Notiz"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Sonstige"
   },
-  "generatePassword": {
-    "message": "Passwort generieren"
-  },
-  "generatePassphrase": {
-    "message": "Passphrase generieren"
-  },
   "type": {
     "message": "Typ"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Die maximale Dateigröße beträgt 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Verschlüsselungscode-Migration erforderlich. Bitte melde dich über den Web-Tresor an, um deinen Verschlüsselungscode zu aktualisieren."
+  "legacyEncryptionUnsupported": {
+    "message": "Die veraltete Verschlüsselung wird nicht mehr unterstützt. Bitte kontaktiere den Support, um dein Konto wiederherzustellen."
   },
   "editedFolder": {
     "message": "Ordner gespeichert"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Konto eingeschränkt"
   },
+  "restrictCardTypeImport": {
+    "message": "Karten-Eintragstypen können nicht importiert werden"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Eine von einer oder mehreren Organisationen festgelegte Richtlinie verhindert, dass du Karten in deinen Tresor importieren kannst."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "„Dateipasswort“ und „Dateipasswort bestätigen“ stimmen nicht überein."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Diese Aktion ist geschützt. Um fortzufahren, gib bitte dein Master-Passwort erneut ein, um deine Identität zu bestätigen."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master-Passwort erfolgreich eingerichtet"
+  },
   "updatedMasterPassword": {
     "message": "Master-Passwort aktualisiert"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Dein Master-Passwort entspricht nicht einer oder mehreren Richtlinien deiner Organisation. Um auf den Tresor zugreifen zu können, musst du dein Master-Passwort jetzt aktualisieren. Wenn du fortfährst, wirst du von deiner aktuellen Sitzung abgemeldet und musst dich erneut anmelden. Aktive Sitzungen auf anderen Geräten können noch bis zu einer Stunde lang aktiv bleiben."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Deine Organisation hat die vertrauenswürdige Geräteverschlüsselung deaktiviert. Bitte lege ein Master-Passwort fest, um auf deinen Tresor zuzugreifen."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Benutzernamen-Generator"
   },
+  "generatePassword": {
+    "message": "Passwort generieren"
+  },
+  "generatePassphrase": {
+    "message": "Passphrase generieren"
+  },
+  "passwordGenerated": {
+    "message": "Passwort generiert"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generiert"
+  },
+  "usernameGenerated": {
+    "message": "Benutzername generiert"
+  },
+  "emailGenerated": {
+    "message": "E-Mail-Adresse generiert"
+  },
   "spinboxBoundariesHint": {
     "message": "Wert muss zwischen $MIN$ und $MAX$ liegen.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Diese E-Mail-Adresse verwenden"
   },
+  "useThisPassword": {
+    "message": "Dieses Passwort verwenden"
+  },
+  "useThisPassphrase": {
+    "message": "Diese Passphrase verwenden"
+  },
+  "useThisUsername": {
+    "message": "Diesen Benutzernamen verwenden"
+  },
   "random": {
     "message": "Zufällig"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Schwaches Passwort erkannt und in einem Datendiebstahl gefunden. Verwende ein starkes und einzigartiges Passwort, um dein Konto zu schützen. Bist du sicher, dass du dieses Passwort verwenden möchtest?"
   },
-  "useThisPassword": {
-    "message": "Dieses Passwort verwenden"
-  },
-  "useThisUsername": {
-    "message": "Diesen Benutzernamen verwenden"
-  },
   "checkForBreaches": {
     "message": "Bekannte Datendiebstähle auf dieses Passwort überprüfen"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Admin-Genehmigung anfragen"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Gängigste Formate",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Erfolg"
   },
@@ -3704,7 +3770,7 @@
     "message": "Gefährdetes Passwort ändern"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Du kannst Sammlungen mit Leseberechtigung nicht entfernen: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Verschachtel einen Ordner, indem du den Namen des übergeordneten Ordners hinzufügst, gefolgt von einem „/“. Beispiel: Sozial/Foren"
   },
+  "sendsTitleNoItems": {
+    "message": "Sensible Informationen sicher versenden",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Teile Dateien und Daten sicher mit jedem auf jeder Plattform. Deine Informationen bleiben Ende-zu-Ende-verschlüsselt, während die Verbreitung begrenzt wird.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Passwörter schnell erstellen"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Generiere ganz einfach starke und einzigartige Passwörter, indem du auf den",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": ", um dir zu helfen, deine Zugangsdaten sicher zu halten.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Generiere ganz einfach starke und einzigartige Passwörter, indem du auf den \"Passwort generieren\"-Button klickst, um dir zu helfen, deine Zugangsdaten sicher zu halten.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Spare Zeit mit Auto-Ausfüllen"
   },
@@ -3772,5 +3863,139 @@
     "message": "Erfahre mehr über den SSH-Agenten",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Sammlungen zuweisen"
+  },
+  "assignToTheseCollections": {
+    "message": "Diesen Sammlungen zuweisen"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Nur Organisationsmitglieder mit Zugriff auf diese Sammlungen können diesen Eintrag sehen."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Nur Organisationsmitglieder mit Zugriff auf diese Sammlungen können die Einträge sehen."
+  },
+  "noCollectionsAssigned": {
+    "message": "Es wurden keine Sammlungen zugewiesen"
+  },
+  "assign": {
+    "message": "Zuweisen"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Nur Organisationsmitglieder mit Zugriff auf diese Sammlungen können die Einträge sehen."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Du hast $TOTAL_COUNT$ Einträge ausgewählt. Du kannst $READONLY_COUNT$ der Einträge nicht aktualisieren, da du keine Bearbeitungsrechte hast.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Zu zuweisende Sammlungen auswählen"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ werden dauerhaft an die ausgewählte Organisation übertragen. Du wirst diese Einträge nicht mehr besitzen.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ werden dauerhaft an $ORG$ übertragen. Du wirst diese Einträge nicht mehr besitzen.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 Eintrag wird dauerhaft an die ausgewählte Organisation übertragen. Du wirst diesen Eintrag nicht mehr besitzen."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 Eintrag wird dauerhaft an $ORG$ übertragen. Du wirst diesen Eintrag nicht mehr besitzen.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Sammlungen erfolgreich zugewiesen"
+  },
+  "nothingSelected": {
+    "message": "Du hast nichts ausgewählt."
+  },
+  "itemsMovedToOrg": {
+    "message": "Einträge verschoben nach $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Eintrag verschoben nach $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Ausgewählte Einträge in $ORGNAME$ verschoben",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/el/messages.json b/apps/desktop/src/locales/el/messages.json
index 3133488f805..239351d406d 100644
--- a/apps/desktop/src/locales/el/messages.json
+++ b/apps/desktop/src/locales/el/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Ταυτότητα"
   },
+  "typeNote": {
+    "message": "Σημείωση"
+  },
   "typeSecureNote": {
     "message": "Ασφαλής σημείωση"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Άλλες"
   },
-  "generatePassword": {
-    "message": "Γέννηση κωδικού πρόσβασης"
-  },
-  "generatePassphrase": {
-    "message": "Δημιουργία φράσης πρόσβασης"
-  },
   "type": {
     "message": "Τύπος"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Το μέγιστο μέγεθος αρχείου είναι 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Απαιτείται μεταφορά κλειδιού κρυπτογράφησης. Παρακαλούμε συνδεθείτε μέσω της διαδικτυακής κρύπτης για να ενημερώσετε το κλειδί κρυπτογράφησης σας."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Ο φάκελος αποθηκεύτηκε"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Ο λογαριασμός περιορίστηκε"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "Το \"Κωδικός πρόσβασης αρχείου\" και το \"Επιβεβαίωση κωδικού πρόσβασης αρχείου\" δεν ταιριάζουν."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Αυτή η ενέργεια προστατεύεται. Για να συνεχίσετε, πληκτρολογήστε ξανά τον κύριο κωδικό πρόσβασης για να επαληθεύσετε την ταυτότητά σας."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Ενημερώθηκε ο κύριος κωδικός πρόσβασης"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ο κύριος κωδικός πρόσβασής σας δεν πληροί μία ή περισσότερες πολιτικές του οργανισμού σας. Για να αποκτήσετε πρόσβαση στο θησαυ/κιο, πρέπει να ενημερώσετε τον κύριο κωδικό πρόσβασής σας τώρα. Η διαδικασία θα σας αποσυνδέσει από την τρέχουσα συνεδρία σας, απαιτώντας από εσάς να συνδεθείτε ξανά. Οι ενεργές συνεδρίες σε άλλες συσκευές ενδέχεται να συνεχίσουν να είναι ενεργές για μία ώρα."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Ο οργανισμός σας έχει απενεργοποιήσει την κρυπτογράφηση αξιόπιστης συσκευής. Παρακαλώ ορίστε έναν κύριο κωδικό πρόσβασης για να αποκτήσετε πρόσβαση στο θησαυροφυλάκιο σας."
   },
@@ -2631,7 +2646,25 @@
     "message": "Δημιουργία διεύθυνσης ηλ. ταχυδρομείου"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Γεννήτρια ονόματος χρήστη"
+  },
+  "generatePassword": {
+    "message": "Γέννηση κωδικού πρόσβασης"
+  },
+  "generatePassphrase": {
+    "message": "Δημιουργία φράσης πρόσβασης"
+  },
+  "passwordGenerated": {
+    "message": "Ο κωδικός πρόσβασης δημιουργήθηκε"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Το όνομα χρήστη δημιουργήθηκε"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
   },
   "spinboxBoundariesHint": {
     "message": "Η τιμή πρέπει να είναι μεταξύ $MIN$ και $MAX$.",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Χρήση αυτού του email"
   },
+  "useThisPassword": {
+    "message": "Χρήση αυτού του κωδικού πρόσβασης"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Χρήση αυτού του ονόματος χρήστη"
+  },
   "random": {
     "message": "Τυχαίο"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Βρέθηκε και ταυτοποιήθηκε αδύναμος κωδικός σε μια διαρροή δεδομένων. Χρησιμοποιήστε ένα ισχυρό και μοναδικό κωδικό πρόσβασης για την προστασία του λογαριασμού σας. Είστε σίγουροι ότι θέλετε να χρησιμοποιήσετε αυτόν τον κωδικό πρόσβασης;"
   },
-  "useThisPassword": {
-    "message": "Χρήση αυτού του κωδικού πρόσβασης"
-  },
-  "useThisUsername": {
-    "message": "Χρήση αυτού του ονόματος χρήστη"
-  },
   "checkForBreaches": {
     "message": "Ελέγξτε γνωστές διαρροές δεδομένων για αυτόν τον κωδικό"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Αίτηση έγκρισης διαχειριστή"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Περιοχή"
   },
@@ -3508,6 +3550,30 @@
     "message": "Κοινοί τύποι",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Επιτυχία"
   },
@@ -3582,7 +3648,7 @@
     "message": "Secure password generated! Don't forget to also update your password on the website."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Χρησιμοποιήστε τη γεννήτρια",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
@@ -3716,14 +3782,39 @@
     "message": "Μετακίνηση"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Νέος φάκελος"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "Όνομα φακέλου"
   },
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Γρήγορη δημιουργία κωδικών πρόσβασης"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Ανάθεση σε αυτές τις συλλογές"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Το στοιχείο μεταφέρθηκε στο $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 9d668d464ae..881d30bd171 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identity"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Secure note"
   },
@@ -691,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1713,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2383,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2395,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -3132,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3522,6 +3549,30 @@
   "commonImportFormats": {
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
+  },
+     "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."  
+  },
+   "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+   "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+   "uriAdvancedOption":{
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+   "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
   },
   "success": {
     "message": "Success"
@@ -3812,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/en_GB/messages.json b/apps/desktop/src/locales/en_GB/messages.json
index cf4d0986e1f..57ada476677 100644
--- a/apps/desktop/src/locales/en_GB/messages.json
+++ b/apps/desktop/src/locales/en_GB/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identity"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Secure note"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Other"
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organisations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organisation policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organisation’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organisation has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organisation members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organisation members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organisation members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organisation. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organisation. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/en_IN/messages.json b/apps/desktop/src/locales/en_IN/messages.json
index d82cb566a98..6c9d211bf13 100644
--- a/apps/desktop/src/locales/en_IN/messages.json
+++ b/apps/desktop/src/locales/en_IN/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identity"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Secure note"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Other"
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Edited folder"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organisations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organisation policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organisation’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organisation has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organisation members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organisation members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organisation members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organisation. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organisation. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/eo/messages.json b/apps/desktop/src/locales/eo/messages.json
index 8e8cc09341f..26e6aefb83c 100644
--- a/apps/desktop/src/locales/eo/messages.json
+++ b/apps/desktop/src/locales/eo/messages.json
@@ -9,13 +9,13 @@
     "message": "Ĉiuj eroj"
   },
   "favorites": {
-    "message": "Plej ŝatataj"
+    "message": "Favoratoj"
   },
   "types": {
     "message": "Tipoj"
   },
   "typeLogin": {
-    "message": "Ensalutiloj"
+    "message": "Salutiloj"
   },
   "typeCard": {
     "message": "Karto"
@@ -23,11 +23,14 @@
   "typeIdentity": {
     "message": "Identeco"
   },
+  "typeNote": {
+    "message": "Noto"
+  },
   "typeSecureNote": {
     "message": "Sekura noto"
   },
   "typeSshKey": {
-    "message": "SSH key"
+    "message": "SSH-ŝlosilo"
   },
   "folders": {
     "message": "Dosierujoj"
@@ -64,7 +67,7 @@
     }
   },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "Bonrevenon!"
   },
   "moveToOrgDesc": {
     "message": "Elektu organizaĵon, al kiu vi volas movi ĉi tiun eron. Movado al organizaĵo transdonas la posedon de la ero al tiu organizaĵo. Vi ne plu estos la rekta posedanto de la ero post kiam ĝi estos movita."
@@ -181,16 +184,16 @@
     "message": "Adreso"
   },
   "sshPrivateKey": {
-    "message": "Private key"
+    "message": "Privata ŝlosilo"
   },
   "sshPublicKey": {
-    "message": "Public key"
+    "message": "Publika ŝlosilo"
   },
   "sshFingerprint": {
-    "message": "Fingerprint"
+    "message": "Fingropremaĵo"
   },
   "sshKeyAlgorithm": {
-    "message": "Key type"
+    "message": "Ŝlosila tipo"
   },
   "sshKeyAlgorithmED25519": {
     "message": "ED25519"
@@ -211,16 +214,16 @@
     "message": "The password you entered is incorrect."
   },
   "importSshKey": {
-    "message": "Import"
+    "message": "Enporti"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirm password"
+    "message": "Konfirmu la pasvorton"
   },
   "enterSshKeyPasswordDesc": {
     "message": "Enter the password for the SSH key."
   },
   "enterSshKeyPassword": {
-    "message": "Enter password"
+    "message": "Enmetu la pasvorton"
   },
   "sshAgentUnlockRequired": {
     "message": "Please unlock your vault to approve the SSH key request."
@@ -250,13 +253,13 @@
     "message": "Always"
   },
   "sshAgentPromptBehaviorNever": {
-    "message": "Never"
+    "message": "Neniam"
   },
   "sshAgentPromptBehaviorRememberUntilLock": {
     "message": "Remember until vault is locked"
   },
   "premiumRequired": {
-    "message": "Premium required"
+    "message": "Necesas Premium"
   },
   "premiumRequiredDesc": {
     "message": "A Premium membership is required to use this feature."
@@ -268,7 +271,7 @@
     "message": "Eraro"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Eraro en malĉifrado"
   },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
@@ -351,12 +354,6 @@
   "other": {
     "message": "Alia"
   },
-  "generatePassword": {
-    "message": "Generi pasvorton"
-  },
-  "generatePassphrase": {
-    "message": "Generi pasfrazon"
-  },
   "type": {
     "message": "Tipo"
   },
@@ -403,25 +400,25 @@
     "message": "Forigi"
   },
   "favorite": {
-    "message": "Favorite"
+    "message": "Favorato"
   },
   "edit": {
     "message": "Redakti"
   },
   "authenticatorKeyTotp": {
-    "message": "Authenticator key (TOTP)"
+    "message": "Aŭtentiga ŝlosilo"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "Aŭtentiga ŝlosilo"
   },
   "autofillOptions": {
     "message": "Autofill options"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "Retejo (URI)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "Retejo (URI) $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -431,34 +428,34 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Retejo aldoniĝos"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "Aldoni retejon"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "Forigi retejon"
   },
   "owner": {
-    "message": "Owner"
+    "message": "Posedanto"
   },
   "addField": {
-    "message": "Add field"
+    "message": "Aldoni kampon"
   },
   "editField": {
-    "message": "Edit field"
+    "message": "Redakti kampon"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "Ĉu vi certas, ke vi volas poreterne forigi tiun aldonaĵon?"
   },
   "fieldType": {
-    "message": "Field type"
+    "message": "Tipo de kampo"
   },
   "fieldLabel": {
     "message": "Field label"
   },
   "add": {
-    "message": "Add"
+    "message": "Aldoni"
   },
   "textHelpText": {
     "message": "Use text fields for data like security questions"
@@ -538,39 +535,39 @@
     "message": "Ĉu vi certas, ke vi volas superskribi la nunan pasvorton?"
   },
   "overwriteUsername": {
-    "message": "Overwrite username"
+    "message": "Superskribi la uzantnomon"
   },
   "overwriteUsernameConfirmation": {
     "message": "Are you sure you want to overwrite the current username?"
   },
   "noneFolder": {
-    "message": "No folder",
+    "message": "Neniu dosierujo",
     "description": "This is the folder for uncategorized items"
   },
   "addFolder": {
-    "message": "Add folder"
+    "message": "Aldoni dosierujon"
   },
   "editFolder": {
-    "message": "Edit folder"
+    "message": "Redakti la dosierujon"
   },
   "regeneratePassword": {
-    "message": "Regenerate password"
+    "message": "Regeneri la pasvorton"
   },
   "copyPassword": {
-    "message": "Copy password"
+    "message": "Kopii la pasvorton"
   },
   "regenerateSshKey": {
-    "message": "Regenerate SSH key"
+    "message": "Regeneri la SSH-ŝlosilon"
   },
   "copySshPrivateKey": {
     "message": "Copy SSH private key"
   },
   "copyPassphrase": {
-    "message": "Copy passphrase",
+    "message": "Kopii la pasfrazon",
     "description": "Copy passphrase to clipboard"
   },
   "copyUri": {
-    "message": "Copy URI"
+    "message": "Kopii la URI-n"
   },
   "copyVerificationCodeTotp": {
     "message": "Kopii la kontrolan kodon (TOTP)"
@@ -609,7 +606,7 @@
     "description": "Label for the password generator uppercase character checkbox"
   },
   "lowercaseDescription": {
-    "message": "Include lowercase characters",
+    "message": "Inkluzive la minusklajn literojn",
     "description": "Full description for the password generator lowercase character checkbox"
   },
   "lowercaseLabel": {
@@ -625,7 +622,7 @@
     "description": "Label for the password generator numbers checkbox"
   },
   "specialCharactersDescription": {
-    "message": "Include special characters",
+    "message": "Inkluzive la specialajn signojn",
     "description": "Full description for the password generator special characters checkbox"
   },
   "numWords": {
@@ -664,16 +661,16 @@
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "searchCollection": {
-    "message": "Kolekto por serĉi"
+    "message": "Serĉi en la kolekto"
   },
   "searchFolder": {
-    "message": "Dosierujo por serĉi"
+    "message": "Serĉi en la dosierujo"
   },
   "searchFavorites": {
-    "message": "Search favorites"
+    "message": "Serĉi en la favoratoj"
   },
   "searchType": {
-    "message": "Tipo por serĉi",
+    "message": "Serĉi en la tipo",
     "description": "Search item type"
   },
   "newAttachment": {
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "La minimuma dosiergrando estas 500 MB"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "La dosierujo konserviĝis"
@@ -734,7 +731,7 @@
     "message": "Saluti en Bitwarden'on"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Enter the code sent to your email"
+    "message": "Enmetu la kodon senditan al via retpoŝto"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
     "message": "Enter the code from your authenticator app"
@@ -761,7 +758,7 @@
     "message": "The master password is the password you use to access your vault. It is very important that you do not forget your master password. There is no way to recover the password in the event that you forget it."
   },
   "masterPassHintDesc": {
-    "message": "A master password hint can help you remember your password if you forget it."
+    "message": "Aludo de ĉefa pasvorto povas helpi vin rememorigi vian pasvorton, se vi forgesas ĝin."
   },
   "reTypeMasterPass": {
     "message": "Re-entajpu la ĉefan pasvorton"
@@ -792,7 +789,7 @@
     "message": "Konfirmi la ĉefan pasvorton"
   },
   "masterPassHintLabel": {
-    "message": "Master password hint"
+    "message": "Aludo de la ĉefa pasvorto"
   },
   "passwordStrengthScore": {
     "message": "Password strength score $SCORE$",
@@ -825,7 +822,7 @@
     "message": "La konta retpoŝto"
   },
   "requestHint": {
-    "message": "Request hint"
+    "message": "Peti aludon"
   },
   "requestPasswordHint": {
     "message": "Request password hint"
@@ -834,22 +831,22 @@
     "message": "Enter your account email address and your password hint will be sent to you"
   },
   "getMasterPasswordHint": {
-    "message": "Get master password hint"
+    "message": "Akiri aludon pri la ĉefa pasvorto"
   },
   "emailRequired": {
-    "message": "Email address is required."
+    "message": "Retpoŝtadreso estas postulata."
   },
   "invalidEmail": {
     "message": "Invalid email address."
   },
   "masterPasswordRequired": {
-    "message": "Master password is required."
+    "message": "Ĉefa pasvorto estas postulata"
   },
   "confirmMasterPasswordRequired": {
-    "message": "Master password retype is required."
+    "message": "Reentajpi la ĉefan pasvorton estas postulata"
   },
   "masterPasswordMinlength": {
-    "message": "Master password must be at least $VALUE$ characters long.",
+    "message": "La ĉefa pasvorto devas esti apenaŭ $VALUE$ signojn longa.",
     "description": "The Master Password must be at least a specific number of characters long.",
     "placeholders": {
       "value": {
@@ -859,31 +856,31 @@
     }
   },
   "youSuccessfullyLoggedIn": {
-    "message": "You successfully logged in"
+    "message": "Vi sukcese salutis"
   },
   "youMayCloseThisWindow": {
     "message": "You may close this window"
   },
   "masterPassDoesntMatch": {
-    "message": "Master password confirmation does not match."
+    "message": "Ne akordas la konfirmo de la ĉefa pasvorto."
   },
   "newAccountCreated": {
-    "message": "Via nova konto estas kreita! Vi eble ĵus salutis,"
+    "message": "Via nova konto estas kreita! Vi eble nun salutas,"
   },
   "newAccountCreated2": {
     "message": "Via nova konto estas kreita!"
   },
   "youHaveBeenLoggedIn": {
-    "message": "Vi estas en salutaĵo!"
+    "message": "Vi jam salutis!"
   },
   "masterPassSent": {
-    "message": "We've sent you an email with your master password hint."
+    "message": "Ni sendis al vi retleteron kun la aludo de via ĉefa pasvorto."
   },
   "unexpectedError": {
     "message": "An unexpected error has occurred."
   },
   "itemInformation": {
-    "message": "Item information"
+    "message": "Informo de ero"
   },
   "noItemsInList": {
     "message": "There are no items to list."
@@ -910,16 +907,16 @@
     "message": "The authentication was cancelled or took too long. Please try again."
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "Malfermi en la nova langeto"
   },
   "invalidVerificationCode": {
-    "message": "Invalid verification code"
+    "message": "Nevalida kontrola kodo"
   },
   "continue": {
     "message": "Daŭrigi"
   },
   "verificationCodeEmailSent": {
-    "message": "Verification email sent to $EMAIL$.",
+    "message": "Konfirmiga retletero sendiĝis al $EMAIL$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -928,14 +925,14 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "Ne demandu denove ĉe tiu ĉi aparato por 30 tagoj"
   },
   "selectAnotherMethod": {
     "message": "Elekti alian metodon",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Uzi vian restarigan kodon"
+    "message": "Uzi vian rehavigan kodon"
   },
   "insertU2f": {
     "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
@@ -947,10 +944,10 @@
     "message": "Restariga kodo"
   },
   "authenticatorAppTitle": {
-    "message": "Authenticator app"
+    "message": "Aŭtentiga apo"
   },
   "authenticatorAppDescV2": {
-    "message": "Enter a code generated by an authenticator app like Bitwarden Authenticator.",
+    "message": "Enmetu kodon generitan de aŭtentiga apo, kiel Bitwarden-Aŭtentigilo.",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
@@ -960,7 +957,7 @@
     "message": "Use a YubiKey to access your account. Works with YubiKey 4, 4 Nano, 4C, and NEO devices."
   },
   "duoDescV2": {
-    "message": "Enter a code generated by Duo Security.",
+    "message": "Enmetu kodon generitan de Duo Security.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
@@ -983,13 +980,13 @@
     "message": "Use any WebAuthn compatible security key to access your account."
   },
   "emailTitle": {
-    "message": "Email"
+    "message": "Retpoŝto"
   },
   "emailDescV2": {
-    "message": "Enter a code sent to your email."
+    "message": "Enmetu kodon sendiĝis al via retpoŝto."
   },
   "loginUnavailable": {
-    "message": "Login unavailable"
+    "message": "Saluto nedisponeblas"
   },
   "noTwoStepProviders": {
     "message": "This account has two-step login set up, however, none of the configured two-step providers are supported by this device."
@@ -1001,10 +998,10 @@
     "message": "Elektebloj pri la dupaŝa salutado"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Elekti metodon de dupaŝa salutado"
+    "message": "Elekti metodon de duŝtupa salutado"
   },
   "selfHostedEnvironment": {
-    "message": "Singastigata medio"
+    "message": "Singastiganta medio"
   },
   "selfHostedBaseUrlHint": {
     "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com"
@@ -1032,7 +1029,7 @@
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "apiUrl": {
-    "message": "API server URL"
+    "message": "URL de API-servilo"
   },
   "webVaultUrl": {
     "message": "Web vault server URL"
@@ -1062,19 +1059,19 @@
     "message": "Loko"
   },
   "overwritePassword": {
-    "message": "Overwrite password"
+    "message": "Superskribi la pasvorton"
   },
   "learnMore": {
     "message": "Lerni pli"
   },
   "featureUnavailable": {
-    "message": "Feature unavailable"
+    "message": "La funkcio nedisponeblas"
   },
   "loggedOut": {
     "message": "Adiaŭinta"
   },
   "loggedOutDesc": {
-    "message": "Vi estas adiaŭinta el via konto."
+    "message": "Vi adiaŭis el via konto."
   },
   "loginExpired": {
     "message": "Via salutaĵo eksvalidiĝis."
@@ -1104,7 +1101,7 @@
     "message": "Nova ero"
   },
   "view": {
-    "message": "Vido"
+    "message": "Vidi"
   },
   "account": {
     "message": "Konto"
@@ -1134,19 +1131,19 @@
     "message": "Blogo"
   },
   "followUs": {
-    "message": "Sekvi nin"
+    "message": "Sekvu nin"
   },
   "syncVault": {
     "message": "Samhavigi la trezorujon"
   },
   "changeMasterPass": {
-    "message": "Change master password"
+    "message": "Ŝanĝi la ĉefan pasvorton"
   },
   "continueToWebApp": {
     "message": "Daŭrigu en la retumilan apon?"
   },
   "changeMasterPasswordOnWebConfirmation": {
-    "message": "Vi povas ŝanĝi vian ĉefan pasvorton en la retumila apo de Bitwarden"
+    "message": "Vi povas ŝanĝi vian ĉefan pasvorton en la reteja apo de Bitwarden"
   },
   "fingerprintPhrase": {
     "message": "Fingerprint phrase",
@@ -1160,37 +1157,37 @@
     "message": "Iri al la retumila trezorejo"
   },
   "getMobileApp": {
-    "message": "Get mobile app"
+    "message": "Ekhavi la porteblan apon"
   },
   "getBrowserExtension": {
     "message": "Get browser extension"
   },
   "syncingComplete": {
-    "message": "Syncing complete"
+    "message": "Spegulado plenumiĝis"
   },
   "syncingFailed": {
-    "message": "Syncing failed"
+    "message": "Spegulado malsukcesis"
   },
   "yourVaultIsLocked": {
     "message": "Via trezorejo estas ŝlosita. Kontrolu vian identecon por daŭrigi."
   },
   "yourAccountIsLocked": {
-    "message": "Your account is locked"
+    "message": "Via konto estas ŝlosita"
   },
   "or": {
     "message": "aŭ"
   },
   "unlockWithBiometrics": {
-    "message": "Unlock with biometrics"
+    "message": "Malŝlosi per biometriko"
   },
   "unlockWithMasterPassword": {
-    "message": "Unlock with master password"
+    "message": "Malŝlosi per la ĉefa pasvorto"
   },
   "unlock": {
     "message": "Malŝlosi"
   },
   "loggedInAsOn": {
-    "message": "Ensalutinta kiel $EMAIL$ ĉe $HOSTNAME$.",
+    "message": "Salutinta kiel $EMAIL$ ĉe $HOSTNAME$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1209,7 +1206,7 @@
     "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be set up on the bitwarden.com web vault. Do you want to visit the website now?"
   },
   "twoStepLogin": {
-    "message": "Two-step login"
+    "message": "Restarigi la dufaktoran aŭtentigon de la konto"
   },
   "vaultTimeout": {
     "message": "Vault timeout"
@@ -1263,7 +1260,7 @@
     "message": "On system lock"
   },
   "onRestart": {
-    "message": "On restart"
+    "message": "Ĉe relanĉo"
   },
   "never": {
     "message": "Neniam"
@@ -1352,10 +1349,10 @@
     "message": "Ŝanĝi la lingvon uzatan de la aplikaĵo. Postulata estas relanĉo."
   },
   "theme": {
-    "message": "Etoso"
+    "message": "Koloraro"
   },
   "themeDesc": {
-    "message": "Change the application's color theme."
+    "message": "Ŝanĝi la koloraron sur la aplikaĵo."
   },
   "dark": {
     "message": "Malhela",
@@ -1370,7 +1367,7 @@
     "description": "Copy to clipboard"
   },
   "checkForUpdates": {
-    "message": "Check for updates…"
+    "message": "En kontrolado de ĝisdatigoj..."
   },
   "version": {
     "message": "Version $VERSION_NUM$",
@@ -1394,7 +1391,7 @@
     }
   },
   "updateAvailable": {
-    "message": "Update available"
+    "message": "Disponeblas ĝisdatigo"
   },
   "updateAvailableDesc": {
     "message": "An update was found. Do you want to download it now?"
@@ -1514,7 +1511,7 @@
     "message": "Neniu por montri"
   },
   "nothingGeneratedRecently": {
-    "message": "Vi ne generis ion ajn lastatempe"
+    "message": "Vi lastatempe generis nenion ajn"
   },
   "undo": {
     "message": "Malfari"
@@ -1546,7 +1543,7 @@
     "message": "Toggle full screen"
   },
   "reload": {
-    "message": "Reload"
+    "message": "Reŝargi"
   },
   "toggleDevTools": {
     "message": "Toggle developer tools"
@@ -1569,10 +1566,10 @@
     "message": "Servoj"
   },
   "hideBitwarden": {
-    "message": "Hide Bitwarden"
+    "message": "Kaŝi Bitwarden'on"
   },
   "hideOthers": {
-    "message": "Hide others"
+    "message": "Kaŝi la aliajn"
   },
   "showAll": {
     "message": "Montri ĉiujn"
@@ -1594,7 +1591,7 @@
     "message": "Sukcesis la kopiado"
   },
   "errorRefreshingAccessToken": {
-    "message": "Eraro en la Refreŝigo de Alilo"
+    "message": "Eraro en la Alilo-Refreŝigo"
   },
   "errorRefreshingAccessTokenDesc": {
     "message": "No refresh token or API keys found. Please try logging out and logging back in."
@@ -1664,7 +1661,7 @@
     "message": "Forlasi"
   },
   "showHide": {
-    "message": "Show / Hide",
+    "message": "Montri / Kaŝi",
     "description": "Text for a button that toggles the visibility of the window. Shows the window when it is hidden or hides the window if it is currently open."
   },
   "hideToTray": {
@@ -1675,7 +1672,7 @@
     "description": "Application window should always stay on top of other windows"
   },
   "dateUpdated": {
-    "message": "Updated",
+    "message": "Ĝisdatigita",
     "description": "ex. Date this item was updated"
   },
   "dateCreated": {
@@ -1683,44 +1680,50 @@
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
-    "message": "Password updated",
+    "message": "Pasvorto ĝisdatiĝis",
     "description": "ex. Date this password was updated"
   },
   "exportFrom": {
-    "message": "Export from"
+    "message": "Elporti el"
   },
   "exportVault": {
     "message": "Export vault"
   },
   "fileFormat": {
-    "message": "File format"
+    "message": "Dosierformato"
   },
   "fileEncryptedExportWarningDesc": {
-    "message": "This file export will be password protected and require the file password to decrypt."
+    "message": "Tiu ĉi dosieriga elporto estos pasvorte protektata kaj postulas la pasvorton de la dosiero por malĉifri."
   },
   "filePassword": {
-    "message": "File password"
+    "message": "Pasvorto de la dosiero"
   },
   "exportPasswordDescription": {
-    "message": "This password will be used to export and import this file"
+    "message": "Tiu pasvorto estos uzata por elporti kaj enporti tiun dosieron"
   },
   "accountRestrictedOptionDescription": {
     "message": "Use your account encryption key, derived from your account's username and Master Password, to encrypt the export and restrict import to only the current Bitwarden account."
   },
   "passwordProtected": {
-    "message": "Password protected"
+    "message": "Pasvorte protektata"
   },
   "passwordProtectedOptionDescription": {
-    "message": "Set a file password to encrypt the export and import it to any Bitwarden account using the password for decryption."
+    "message": "Ŝargu pasvorton al la dosiero por ĉifri la elporton, kaj ĝin enportu al iu ajn konto ĉe Bitwarden uzante la pasvorton por malĉifri."
   },
   "exportTypeHeading": {
-    "message": "Export type"
+    "message": "Elporta tipo"
   },
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
-    "message": "“File password”  and “Confirm file password“ do not match."
+    "message": "Ne akordas la «Pasvorto de la dosiero» kaj «Konfirmu la pasvorton de la dosiero»."
   },
   "done": {
     "message": "Preta"
@@ -1920,7 +1923,7 @@
     "description": "Noun: a special folder to hold deleted items"
   },
   "searchTrash": {
-    "message": "Serĉi la rubujon"
+    "message": "Serĉi en la rubujo"
   },
   "permanentlyDeleteItem": {
     "message": "Poreterne forviŝi eron"
@@ -1947,7 +1950,7 @@
     "message": "Enterprise single sign-on"
   },
   "setMasterPassword": {
-    "message": "Set master password"
+    "message": "Ŝargi la ĉefan pasvorton"
   },
   "orgPermissionsUpdatedMustSetPassword": {
     "message": "Your organization permissions were updated, requiring you to set a master password.",
@@ -1982,7 +1985,7 @@
     "message": "Learn more about authenticators"
   },
   "copyTOTP": {
-    "message": "Copy Authenticator key (TOTP)"
+    "message": "Kopii la aŭtentigan ŝlosilon (TOTP)"
   },
   "totpHelperTitle": {
     "message": "Make 2-step verification seamless"
@@ -2134,7 +2137,7 @@
     "message": "Use hardware acceleration"
   },
   "enableHardwareAccelerationDesc": {
-    "message": "Implicite tiu ĉi agordo estas ŝaltita. Malŝaltu nur se vi spertas grafikajn problemojn. Postulata estas relanĉo."
+    "message": "Tiu ĉi agordo estas implicite ŝaltita. Malŝaltu nur se vi spertas grafikajn problemojn. Necesas relanĉi."
   },
   "approve": {
     "message": "Aprobi"
@@ -2258,7 +2261,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLink": {
-    "message": "Send link",
+    "message": "Sendi la ligilon",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLinkLabel": {
@@ -2357,7 +2360,7 @@
     "message": "Pending deletion"
   },
   "webAuthnAuthenticate": {
-    "message": "Authenticate WebAuthn"
+    "message": "Aŭtentigi WebAuthn'on"
   },
   "readSecurityKey": {
     "message": "Read security key"
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2396,11 +2402,20 @@
     "message": "Update master password"
   },
   "updateMasterPasswordWarning": {
-    "message": "Via ĉefa pasvorto estis lastatempe ŝanĝita de administranto en via organizo. Por aliri al la trezorejo vi nun devas ĝin ĝisdatigi. La traktado adiaŭigos vin el via nuna salutaĵo, postulante de vi resaluti. La aktivaj salutaĵoj en la aliaj aparatoj eble daŭros esti aktivaj ĝis unu horon."
+    "message": "Via ĉefa pasvorto estis lastatempe ŝanĝita de administranto en via organizo. Por aliri al la trezorejo vi nun devas ĝisdatigi ĝin. La traktado adiaŭigos vin el via nuna salutaĵo, postulante de vi resaluti. La aktivaj salutaĵoj en la aliaj aparatoj eble daŭros aktivaj ĝis unu horon."
   },
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2411,10 +2426,10 @@
     "message": "Verification required for this action. Set a PIN to continue."
   },
   "setPin": {
-    "message": "Set PIN"
+    "message": "Ŝargi PIN-on"
   },
   "verifyWithBiometrics": {
-    "message": "Verify with biometrics"
+    "message": "Aŭtentigi per biometriko"
   },
   "awaitingConfirmation": {
     "message": "Awaiting confirmation"
@@ -2432,13 +2447,13 @@
     "message": "Uzi PIN-n"
   },
   "useBiometrics": {
-    "message": "Use biometrics"
+    "message": "Uzi biometrikon"
   },
   "enterVerificationCodeSentToEmail": {
-    "message": "Enter the verification code that was sent to your email."
+    "message": "Enmetu la aŭtentigan kodon, kiu estis sendita al via retpoŝto."
   },
   "resendCode": {
-    "message": "Resend code"
+    "message": "Resendi kodon"
   },
   "hours": {
     "message": "Horoj"
@@ -2447,7 +2462,7 @@
     "message": "Minutoj"
   },
   "vaultTimeoutPolicyInEffect1": {
-    "message": "$HOURS$ hour(s) and $MINUTES$ minute(s) maximum.",
+    "message": "maksimume $HOURS$ horo(j)n kaj $MINUTES$ minuto(j)n",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2507,10 +2522,10 @@
     "message": "Aldoni konton"
   },
   "removeMasterPassword": {
-    "message": "Remove master password"
+    "message": "Forigi la ĉefan pasvorton"
   },
   "removedMasterPassword": {
-    "message": "Master password removed"
+    "message": "La ĉefa pasvorto foriĝis"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
     "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
@@ -2570,7 +2585,7 @@
     "message": "Via salutaĵo eksvalidiĝis. Bonvole reiru kaj provu saluti denove."
   },
   "exportingPersonalVaultTitle": {
-    "message": "Elportadas la individuan trezorejon"
+    "message": "Elporti la individuan trezorejon"
   },
   "exportingIndividualVaultDescription": {
     "message": "Only the individual vault items associated with $EMAIL$ will be exported. Organization vault items will not be included. Only vault item information will be exported and will not include associated attachments.",
@@ -2591,7 +2606,7 @@
     }
   },
   "exportingOrganizationVaultTitle": {
-    "message": "Exporting organization vault"
+    "message": "Elporti organizan trezorejon"
   },
   "exportingOrganizationVaultDesc": {
     "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. Items in individual vaults or other organizations will not be included.",
@@ -2619,19 +2634,37 @@
     "message": "Kion vi ŝatus generi?"
   },
   "passwordType": {
-    "message": "Password type"
+    "message": "Tipo de pasvorto"
   },
   "regenerateUsername": {
-    "message": "Regenerate username"
+    "message": "Regeneri la uzantnomon"
   },
   "generateUsername": {
-    "message": "Generate username"
+    "message": "Generi uzantnomon"
   },
   "generateEmail": {
-    "message": "Generate email"
+    "message": "Generi retpoŝton"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Uzantnomo-generilo"
+  },
+  "generatePassword": {
+    "message": "Generi pasvorton"
+  },
+  "generatePassphrase": {
+    "message": "Generi pasfrazon"
+  },
+  "passwordGenerated": {
+    "message": "Pasvorto-generilo"
+  },
+  "passphraseGenerated": {
+    "message": "Pasfrazo-generilo"
+  },
+  "usernameGenerated": {
+    "message": "Generiĝis uzantnomo"
+  },
+  "emailGenerated": {
+    "message": "Retpoŝto generiĝis"
   },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
@@ -2668,7 +2701,7 @@
     }
   },
   "usernameType": {
-    "message": "Username type"
+    "message": "Tipo de uzantnomo"
   },
   "plusAddressedEmail": {
     "message": "Plus addressed email",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Uzi ĉi tiun retpoŝton"
   },
+  "useThisPassword": {
+    "message": "Uzi tiun pasvorton"
+  },
+  "useThisPassphrase": {
+    "message": "Uzi tiun pasfrazon"
+  },
+  "useThisUsername": {
+    "message": "Uzi tiun uzantnomon"
+  },
   "random": {
     "message": "Hazarda"
   },
@@ -2693,7 +2735,7 @@
     "message": "Hazarda vorto"
   },
   "websiteName": {
-    "message": "Website name"
+    "message": "Nomo de la retejo"
   },
   "service": {
     "message": "Servo"
@@ -2708,10 +2750,10 @@
     "message": "Traserĉi mian trezorejon"
   },
   "forwardedEmail": {
-    "message": "Forwarded email alias"
+    "message": "Plusendinta alinomo retpoŝta"
   },
   "forwardedEmailDesc": {
-    "message": "Generate an email alias with an external forwarding service."
+    "message": "Generi retpoŝtan alinomon per ekstera plusenda servo."
   },
   "forwarderDomainName": {
     "message": "Email domain",
@@ -2736,11 +2778,11 @@
     }
   },
   "forwarderGeneratedBy": {
-    "message": "Generated by Bitwarden.",
+    "message": "Generita per Bitwarden",
     "description": "Displayed with the address on the forwarding service's configuration screen."
   },
   "forwarderGeneratedByWithWebsite": {
-    "message": "Website: $WEBSITE$. Generated by Bitwarden.",
+    "message": "Retejo: $WEBSITE$. Generita per Bitwarden.",
     "description": "Displayed with the address on the forwarding service's configuration screen.",
     "placeholders": {
       "WEBSITE": {
@@ -2852,7 +2894,7 @@
     "description": "Part of a URL."
   },
   "apiAccessToken": {
-    "message": "API Access Token"
+    "message": "API-alirilo"
   },
   "apiKey": {
     "message": "API-ŝlosilo"
@@ -2873,16 +2915,16 @@
     "message": "Trezorejo"
   },
   "loginWithMasterPassword": {
-    "message": "Log in with master password"
+    "message": "Saluti per la ĉefa pasvorto"
   },
   "rememberEmail": {
-    "message": "Remember email"
+    "message": "Memorigi la retpoŝton"
   },
   "newAroundHere": {
-    "message": "New around here?"
+    "message": "Nova ĉirkaŭ ĉi tie?"
   },
   "loggingInTo": {
-    "message": "Logging in to $DOMAIN$",
+    "message": "Salutado en $DOMAIN$'on",
     "placeholders": {
       "domain": {
         "content": "$1",
@@ -2891,13 +2933,13 @@
     }
   },
   "logInWithAnotherDevice": {
-    "message": "Log in with another device"
+    "message": "Saluti per alia aparato"
   },
   "loginInitiated": {
     "message": "Login initiated"
   },
   "logInRequestSent": {
-    "message": "Request sent"
+    "message": "Peto sendiĝis"
   },
   "notificationSentDevice": {
     "message": "A notification has been sent to your device."
@@ -2909,19 +2951,19 @@
     "message": "Unlock Bitwarden on your device or on the "
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "Reteja apo"
   },
   "notificationSentDevicePart2": {
     "message": "Make sure the Fingerprint phrase matches the one below before approving."
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "Vi bezonas alian elekteblon?"
   },
   "fingerprintMatchInfo": {
     "message": "Please make sure your vault is unlocked and Fingerprint phrase matches the other device."
   },
   "fingerprintPhraseHeader": {
-    "message": "Fingerprint phrase"
+    "message": "Fingropremaĵero"
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
     "message": "You will be notified once the request is approved"
@@ -2986,7 +3028,7 @@
     "message": "You denied a login attempt from another device. If this really was you, try to log in with the device again."
   },
   "justNow": {
-    "message": "Just now"
+    "message": "Ĝuste nun"
   },
   "requestedXMinutesAgo": {
     "message": "Requested $MINUTES$ minutes ago",
@@ -3013,7 +3055,7 @@
     }
   },
   "logInRequested": {
-    "message": "Log in requested"
+    "message": "Saluto petiĝis"
   },
   "accountAccessRequested": {
     "message": "Account access requested"
@@ -3031,13 +3073,13 @@
     "message": "and continue creating your account."
   },
   "noEmail": {
-    "message": "No email?"
+    "message": "Neniu retpoŝto?"
   },
   "goBack": {
     "message": "Reveni"
   },
   "toEditYourEmailAddress": {
-    "message": "to edit your email address."
+    "message": "por redakti vian retpoŝtadreson"
   },
   "exposedMasterPassword": {
     "message": "Exposed Master Password"
@@ -3051,17 +3093,11 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
   "loggedInExclamation": {
-    "message": "Logged in!"
+    "message": "Jam salutis!"
   },
   "important": {
     "message": "Important:"
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Regiono"
   },
@@ -3149,7 +3191,7 @@
     "message": "Login approved"
   },
   "userEmailMissing": {
-    "message": "User email missing"
+    "message": "Mankas la retpoŝto de la uzanto"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
     "message": "Active user email not found. Logging you out."
@@ -3161,10 +3203,10 @@
     "message": "Trust organization"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Fidi"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Ne fidi"
   },
   "organizationNotTrusted": {
     "message": "Organization is not trusted"
@@ -3179,13 +3221,13 @@
     "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Fidi la uzanton"
   },
   "inputRequired": {
     "message": "Input is required."
   },
   "required": {
-    "message": "required"
+    "message": "Postulata"
   },
   "search": {
     "message": "Serĉi"
@@ -3239,11 +3281,11 @@
     "message": "1 or more emails are invalid"
   },
   "inputTrimValidator": {
-    "message": "Input must not contain only whitespace.",
+    "message": "La enmeto devas ne enhavi nur spaceton.",
     "description": "Notification to inform the user that a form's input can't contain only whitespace."
   },
   "inputEmail": {
-    "message": "Input is not an email address."
+    "message": "La enmeto ne estas retpoŝtadreso."
   },
   "fieldsNeedAttention": {
     "message": "$COUNT$ field(s) above need your attention.",
@@ -3264,10 +3306,10 @@
     "message": "Retrieving options..."
   },
   "multiSelectNotFound": {
-    "message": "No items found"
+    "message": "Neniu ero troviĝis"
   },
   "multiSelectClearAll": {
-    "message": "Clear all"
+    "message": "Forviŝi ĉiujn"
   },
   "plusNMore": {
     "message": "+ $QUANTITY$ pli",
@@ -3288,10 +3330,10 @@
     "message": "Skip to content"
   },
   "typePasskey": {
-    "message": "Passkey"
+    "message": "Pasŝlosilo"
   },
   "passkeyNotCopied": {
-    "message": "Passkey will not be copied"
+    "message": "Pasŝlosilo ne estos kopiita"
   },
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
@@ -3300,17 +3342,17 @@
     "message": "Alias domain"
   },
   "importData": {
-    "message": "Import data",
+    "message": "Enporti datumon",
     "description": "Used for the desktop menu item and the header of the import dialog"
   },
   "importError": {
-    "message": "Import error"
+    "message": "Enporti eraron"
   },
   "importErrorDesc": {
-    "message": "There was a problem with the data you tried to import. Please resolve the errors listed below in your source file and try again."
+    "message": "Estis problemo kun la datumo, kiun vi provis enporti. Bonvolu solvi la erarojn sube listigitaj en via fontodosiero kaj provu denove."
   },
   "resolveTheErrorsBelowAndTryAgain": {
-    "message": "Resolve the errors below and try again."
+    "message": "Solvu la subajn erarojn kaj provu donove."
   },
   "description": {
     "message": "Priskribo"
@@ -3319,7 +3361,7 @@
     "message": "Data successfully imported"
   },
   "importSuccessNumberOfItems": {
-    "message": "A total of $AMOUNT$ items were imported.",
+    "message": "Entute $AMOUNT$ eroj estis enportitaj",
     "placeholders": {
       "amount": {
         "content": "$1",
@@ -3328,7 +3370,7 @@
     }
   },
   "total": {
-    "message": "Total"
+    "message": "Entute"
   },
   "importWarning": {
     "message": "You are importing data to $ORGANIZATION$. Your data may be shared with members of this organization. Do you want to proceed?",
@@ -3355,13 +3397,13 @@
     "message": "Follow the steps below to finish logging in with your security key."
   },
   "launchDuo": {
-    "message": "Launch Duo in Browser"
+    "message": "Lanĉi Duo'n en la retumilo"
   },
   "importFormatError": {
-    "message": "Data is not formatted correctly. Please check your import file and try again."
+    "message": "La datumo estas ne ĝuste aranĝita. Bonvole kontrolu vian enportan dosieron kaj provu denove."
   },
   "importNothingError": {
-    "message": "Nothing was imported."
+    "message": "Nenio estis enportita."
   },
   "importEncKeyError": {
     "message": "Error decrypting the exported file. Your encryption key does not match the encryption key used export the data."
@@ -3376,13 +3418,13 @@
     "message": "Learn about your import options"
   },
   "selectImportFolder": {
-    "message": "Select a folder"
+    "message": "Elekti dosierujon"
   },
   "selectImportCollection": {
-    "message": "Select a collection"
+    "message": "Elekti kolekton"
   },
   "importTargetHint": {
-    "message": "Select this option if you want the imported file contents moved to a $DESTINATION$",
+    "message": "Elektu tiun ĉi elekteblon se vi volus la enhavojn de la enporta dosiero movi al $DESTINATION$",
     "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.",
     "placeholders": {
       "destination": {
@@ -3395,19 +3437,19 @@
     "message": "File contains unassigned items."
   },
   "selectFormat": {
-    "message": "Select the format of the import file"
+    "message": "Elekti la formaton de la enporta dosiero"
   },
   "selectImportFile": {
-    "message": "Select the import file"
+    "message": "Elekti la enportan dosieron"
   },
   "chooseFile": {
-    "message": "Choose File"
+    "message": "Elekti dosieron"
   },
   "noFileChosen": {
-    "message": "No file chosen"
+    "message": "Neniu dosiero elektiĝis"
   },
   "orCopyPasteFileContents": {
-    "message": "or copy/paste the import file contents"
+    "message": "aŭ kopii/alglui la enhavojn de la enporta dosiero"
   },
   "instructionsFor": {
     "message": "$NAME$ Instructions",
@@ -3420,10 +3462,10 @@
     }
   },
   "confirmVaultImport": {
-    "message": "Confirm vault import"
+    "message": "Konfirmu enporton de trezorejo"
   },
   "confirmVaultImportDesc": {
-    "message": "This file is password-protected. Please enter the file password to import data."
+    "message": "Tiu dosiero estas pasvorte protektata. Bonvolu enmeti la pasvorton de la dosiero por enporti datumon."
   },
   "confirmFilePassword": {
     "message": "Confirm file password"
@@ -3435,31 +3477,31 @@
     "message": "Multifactor authentication cancelled"
   },
   "noLastPassDataFound": {
-    "message": "No LastPass data found"
+    "message": "Troviĝis neniu datumo de LastPass"
   },
   "incorrectUsernameOrPassword": {
-    "message": "Incorrect username or password"
+    "message": "Neĝusta uzantnomo aŭ pasvorto"
   },
   "incorrectPassword": {
-    "message": "Incorrect password"
+    "message": "Neĝusta pasvorto"
   },
   "incorrectCode": {
-    "message": "Incorrect code"
+    "message": "Neĝusta kodo"
   },
   "incorrectPin": {
-    "message": "Incorrect PIN"
+    "message": "Neĝusta PIN"
   },
   "multifactorAuthenticationFailed": {
-    "message": "Multifactor authentication failed"
+    "message": "Malsukcesis plurfaktora aŭtentigo"
   },
   "includeSharedFolders": {
     "message": "Include shared folders"
   },
   "lastPassEmail": {
-    "message": "LastPass Email"
+    "message": "Retpoŝto ĉe LastPass"
   },
   "importingYourAccount": {
-    "message": "Importing your account..."
+    "message": "En enportado de via konto..."
   },
   "lastPassMFARequired": {
     "message": "LastPass multifactor authentication required"
@@ -3471,13 +3513,13 @@
     "message": "Approve the login request in your authentication app or enter a one-time passcode."
   },
   "passcode": {
-    "message": "Passcode"
+    "message": "Paskodo"
   },
   "lastPassMasterPassword": {
-    "message": "LastPass master password"
+    "message": "La ĉefa pasvorto de LastPass"
   },
   "lastPassAuthRequired": {
-    "message": "LastPass authentication required"
+    "message": "Postulata estas aŭtentigo de LastPass"
   },
   "awaitingSSO": {
     "message": "Awaiting SSO authentication"
@@ -3490,7 +3532,7 @@
     "description": "This is followed a by a hyperlink to the help website."
   },
   "importDirectlyFromLastPass": {
-    "message": "Import directly from LastPass"
+    "message": "Enporti rekte de LastPass"
   },
   "importFromCSV": {
     "message": "Import from CSV"
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Sukcesis"
   },
@@ -3515,16 +3581,16 @@
     "message": "Troubleshooting"
   },
   "disableHardwareAccelerationRestart": {
-    "message": "Neebligi aparatan akcelon kaj relanĉi"
+    "message": "Malaktivigi aparatan akcelon kaj relanĉi"
   },
   "enableHardwareAccelerationRestart": {
-    "message": "Ebligi aparatan akcelon kaj relanĉi"
+    "message": "Aktivigi aparatan akcelon kaj relanĉi"
   },
   "removePasskey": {
-    "message": "Remove passkey"
+    "message": "Forigi la pasŝlosilon"
   },
   "passkeyRemoved": {
-    "message": "Passkey removed"
+    "message": "La pasŝlosilo foriĝis"
   },
   "errorAssigningTargetCollection": {
     "message": "Error assigning target collection."
@@ -3557,7 +3623,7 @@
     "description": "Button text to navigate back"
   },
   "removeItem": {
-    "message": "Remove $NAME$",
+    "message": "Forigi $NAME$'n",
     "description": "Remove a selected option, such as a folder or collection",
     "placeholders": {
       "name": {
@@ -3614,10 +3680,10 @@
     "message": "Biometric unlock is currently unavailable for an unknown reason."
   },
   "itemDetails": {
-    "message": "Item details"
+    "message": "Detaloj de la ero"
   },
   "itemName": {
-    "message": "Item name"
+    "message": "Nomo de la ero"
   },
   "loginCredentials": {
     "message": "Login credentials"
@@ -3632,13 +3698,13 @@
     "message": "Last edited"
   },
   "upload": {
-    "message": "Upload"
+    "message": "Alŝuti"
   },
   "authorize": {
     "message": "Authorize"
   },
   "deny": {
-    "message": "Deny"
+    "message": "Malkonfirmi"
   },
   "sshkeyApprovalTitle": {
     "message": "Confirm SSH key usage"
@@ -3665,7 +3731,7 @@
     "message": "sign a git commit"
   },
   "unknownApplication": {
-    "message": "An application"
+    "message": "Aplikaĵo"
   },
   "invalidSshKey": {
     "message": "The SSH key is invalid"
@@ -3674,13 +3740,13 @@
     "message": "The SSH key type is not supported"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "Enporti ŝlosilon el la eltondujo"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "SSH-ŝlosilo sukcese enportiĝis"
   },
   "fileSavedToDevice": {
-    "message": "File saved to device. Manage from your device downloads."
+    "message": "La dosiero konserviĝis en la aparato. La elŝutojn administru de via aparato."
   },
   "allowScreenshots": {
     "message": "Allow screen capture"
@@ -3695,7 +3761,7 @@
     "message": "Please confirm that the window is still visible."
   },
   "updateBrowserOrDisableFingerprintDialogTitle": {
-    "message": "Extension update required"
+    "message": "Necesas ĝisdatigo de la etendaĵo"
   },
   "updateBrowserOrDisableFingerprintDialogMessage": {
     "message": "The browser extension you are using is out of date. Please update it or disable browser integration fingerprint validation in the desktop app settings."
@@ -3713,27 +3779,52 @@
     }
   },
   "move": {
-    "message": "Move"
+    "message": "Movi"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Nova desierujo"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "Nomo de dosierujo"
   },
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Inkluzive",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Retejo",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/es/messages.json b/apps/desktop/src/locales/es/messages.json
index 154bb327689..eb02eca59ba 100644
--- a/apps/desktop/src/locales/es/messages.json
+++ b/apps/desktop/src/locales/es/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identidad"
   },
+  "typeNote": {
+    "message": "Nota"
+  },
   "typeSecureNote": {
     "message": "Nota segura"
   },
@@ -223,7 +226,7 @@
     "message": "Introducir la contraseña"
   },
   "sshAgentUnlockRequired": {
-    "message": "Please unlock your vault to approve the SSH key request."
+    "message": "Por favor, desbloquea tu caja fuerte para aprobar la solicitud de clave SSH."
   },
   "sshAgentUnlockTimeout": {
     "message": "SSH key request timed out."
@@ -235,16 +238,16 @@
     "message": "Activa el agente SSH para firmar peticiones SSH directamente desde tu caja fuerte de Bitwarden."
   },
   "enableSshAgentHelp": {
-    "message": "The SSH agent is a service targeted at developers that allows you to sign SSH requests directly from your Bitwarden vault."
+    "message": "El agente SSH es un servicio dirigido a desarrolladores que te permite firmar peticiones SSH directamente desde tu caja fuerte de Bitwarden."
   },
   "sshAgentPromptBehavior": {
-    "message": "Ask for authorization when using SSH agent"
+    "message": "Solicitar autorización al usar el agente SSH"
   },
   "sshAgentPromptBehaviorDesc": {
     "message": "Choose how to handle SSH-agent authorization requests."
   },
   "sshAgentPromptBehaviorHelp": {
-    "message": "Remember SSH authorizations"
+    "message": "Recordar autorizaciones SSH"
   },
   "sshAgentPromptBehaviorAlways": {
     "message": "Siempre"
@@ -253,7 +256,7 @@
     "message": "Nunca"
   },
   "sshAgentPromptBehaviorRememberUntilLock": {
-    "message": "Remember until vault is locked"
+    "message": "Recordar hasta que la caja fuerte se bloquee"
   },
   "premiumRequired": {
     "message": "Premium requerido"
@@ -351,12 +354,6 @@
   "other": {
     "message": "Otro"
   },
-  "generatePassword": {
-    "message": "Generar contraseña"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Tipo"
   },
@@ -412,16 +409,16 @@
     "message": "Clave de autenticación (TOTP)"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "Clave de autenticador"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "Opciones de autocompletado"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "Sitio web (URI)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "Sitio web (URI) $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -431,7 +428,7 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Página web añadida"
   },
   "addWebsite": {
     "message": "Añadir página web"
@@ -461,10 +458,10 @@
     "message": "Añadir"
   },
   "textHelpText": {
-    "message": "Use text fields for data like security questions"
+    "message": "Usa campos de texto para datos como preguntas de seguridad"
   },
   "hiddenHelpText": {
-    "message": "Use hidden fields for sensitive data like a password"
+    "message": "Usa campos ocultos para datos sensibles como una contraseña"
   },
   "checkBoxHelpText": {
     "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
@@ -501,7 +498,7 @@
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "cfTypeCheckbox": {
-    "message": "Checkbox"
+    "message": "Casilla de verificación"
   },
   "linkedValue": {
     "message": "Valor vinculado",
@@ -566,7 +563,7 @@
     "message": "Copiar clave privada SSH"
   },
   "copyPassphrase": {
-    "message": "Copy passphrase",
+    "message": "Copiar frase de contraseña",
     "description": "Copy passphrase to clipboard"
   },
   "copyUri": {
@@ -660,7 +657,7 @@
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "generatorPolicyInEffect": {
-    "message": "Enterprise policy requirements have been applied to your generator options.",
+    "message": "Los requisitos de política empresarial se han aplicado a las opciones de tu generador.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "searchCollection": {
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "El tamaño máximo de archivo es de 500MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Se requiere migración de la clave de cifrado. Por favor, inicia sesión a través de la caja fuerte web para actualizar su clave de cifrado."
+  "legacyEncryptionUnsupported": {
+    "message": "La encriptación antigua ya no está soportada. Por favor, contacta con soporte para recuperar tu cuenta."
   },
   "editedFolder": {
     "message": "Carpeta editada"
@@ -743,13 +740,13 @@
     "message": "Pulsa tu YubiKey para autenticarte"
   },
   "logInWithPasskey": {
-    "message": "Log in with passkey"
+    "message": "Iniciar sesión con clave de acceso"
   },
   "loginWithDevice": {
-    "message": "Log in with device"
+    "message": "Iniciar sesión con dispositivo"
   },
   "useSingleSignOn": {
-    "message": "Use single sign-on"
+    "message": "Usar inicio de sesión único"
   },
   "submit": {
     "message": "Enviar"
@@ -795,7 +792,7 @@
     "message": "Pista de la contraseña maestra"
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "Puntuación de seguridad de la contraseña $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -974,7 +971,7 @@
     "message": "No reconocemos este dispositivo. Introduce el código enviado a tu correo electrónico para verificar tu identidad."
   },
   "continueLoggingIn": {
-    "message": "Continue logging in"
+    "message": "Continuar el inicio de sesión"
   },
   "webAuthnTitle": {
     "message": "FIDO2 WebAuthn"
@@ -1001,7 +998,7 @@
     "message": "Opciones de la autenticación en dos pasos"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "Selecciona un método de inicio de sesión en dos pasos"
   },
   "selfHostedEnvironment": {
     "message": "Entorno de alojamiento propio"
@@ -1022,7 +1019,7 @@
     "message": "URL del servidor"
   },
   "authenticationTimeout": {
-    "message": "Authentication timeout"
+    "message": "Tiempo de autenticación agotado"
   },
   "authenticationSessionTimedOut": {
     "message": "The authentication session timed out. Please restart the login process."
@@ -1215,10 +1212,10 @@
     "message": "Tiempo de espera de la caja fuerte excedido"
   },
   "vaultTimeout1": {
-    "message": "Timeout"
+    "message": "Tiempo de espera"
   },
   "vaultTimeoutDesc": {
-    "message": "Elije cuando se agotará el tiempo de espera de tu caja fuerte y se ejecutará la acción seleccionada."
+    "message": "Elige cuando se agotará el tiempo de espera de tu caja fuerte y se ejecutará la acción seleccionada."
   },
   "immediately": {
     "message": "Inmediatamente"
@@ -1468,7 +1465,7 @@
     "message": "Comprar Premium"
   },
   "premiumPurchaseAlertV2": {
-    "message": "You can purchase Premium from your account settings on the Bitwarden web app."
+    "message": "Puedes comprar el Premium desde los ajustes de tu cuenta en la aplicación web de Bitwarden."
   },
   "premiumCurrentMember": {
     "message": "¡Eres un miembro Premium!"
@@ -1492,13 +1489,13 @@
     "message": "Historial de contraseñas"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "Historial del generador"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "Limpiar historial del generador"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "Si continúas, todas las entradas se eliminarán permanentemente del historial del generador. ¿Estás seguro de que quieres continuar?"
   },
   "clear": {
     "message": "Limpiar",
@@ -1591,7 +1588,7 @@
     }
   },
   "copySuccessful": {
-    "message": "Copy Successful"
+    "message": "Copia Exitosa"
   },
   "errorRefreshingAccessToken": {
     "message": "Error de actualización del token de acceso"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Cuenta restringida"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Una política establecida en 1 o más organizaciones te impide importar tarjetas a tus cajas fuertes."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Contraseña del archivo\" y \"Confirmar contraseña del archivo\" no coinciden."
   },
@@ -1797,7 +1800,7 @@
     "message": "Ajustes adicionales de Windows Hello"
   },
   "unlockWithPolkit": {
-    "message": "Unlock with system authentication"
+    "message": "Desbloquear con la autenticación del sistema"
   },
   "windowsHelloConsentMessage": {
     "message": "Verificar para Bitwarden."
@@ -1815,7 +1818,7 @@
     "message": "Solicitar Windows Hello al iniciar"
   },
   "autoPromptPolkit": {
-    "message": "Ask for system authentication on launch"
+    "message": "Solicitar autenticación de sistema al iniciar"
   },
   "autoPromptTouchId": {
     "message": "Solicitar Touch ID al iniciar"
@@ -1830,7 +1833,7 @@
     "message": "Recomendado por seguridad."
   },
   "lockWithMasterPassOnRestart1": {
-    "message": "Lock with master password on restart"
+    "message": "Bloquear con contraseña maestra al reiniciar"
   },
   "deleteAccount": {
     "message": "Eliminar cuenta"
@@ -1845,7 +1848,7 @@
     "message": "No se puede eliminar la cuenta"
   },
   "cannotDeleteAccountDesc": {
-    "message": "This action cannot be completed because your account is owned by an organization. Contact your organization administrator for additional details."
+    "message": "Esta acción no se puede completar porque tu cuenta es de propiedad de una organización. Contacta con el administrador de tu organización para más detalles."
   },
   "accountDeleted": {
     "message": "Cuenta eliminada"
@@ -1967,10 +1970,10 @@
     }
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "Datos de la tarjeta"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "Datos de $BRAND$",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -1979,26 +1982,26 @@
     }
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "Más información sobre los autenticadores"
   },
   "copyTOTP": {
-    "message": "Copy Authenticator key (TOTP)"
+    "message": "Copiar clave de Autenticador (TOTP)"
   },
   "totpHelperTitle": {
     "message": "Make 2-step verification seamless"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden puede almacenar y rellenar códigos de verificación en 2 pasos. Copia y pega la clave en este campo."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden puede almacenar y rellenar códigos de verificación en 2 pasos. Selecciona el icono de la cámara para hacer una captura de pantalla del código QR de este sitio web, o copia y pega la clave en este campo."
   },
   "premium": {
     "message": "Premium",
     "description": "Premium membership"
   },
   "freeOrgsCannotUseAttachments": {
-    "message": "Free organizations cannot use attachments"
+    "message": "Las organizaciones gratuitas no pueden usar adjuntos"
   },
   "singleFieldNeedsAttention": {
     "message": "1 campo necesita tu atención."
@@ -2074,7 +2077,7 @@
     "message": "Su nueva contraseña maestra no cumple con los requisitos de la política."
   },
   "receiveMarketingEmailsV2": {
-    "message": "Get advice, announcements, and research opportunities from Bitwarden in your inbox."
+    "message": "Obtén consejos, anuncios y oportunidades de investigación de Bitwarden en tu bandeja de entrada."
   },
   "unsubscribe": {
     "message": "Darse de baja"
@@ -2098,7 +2101,7 @@
     "message": "Habilitar integración con el navegador"
   },
   "enableBrowserIntegrationDesc1": {
-    "message": "Used to allow biometric unlock in browsers that are not Safari."
+    "message": "Usado para permitir el desbloqueo biométrico en navegadores que no son Safari."
   },
   "enableDuckDuckGoBrowserIntegration": {
     "message": "Permitir integración con el navegador DuckDuckGo"
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Esta acción está protegida. Para continuar, vuelva a introducir su contraseña maestra para verificar su identidad."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Contraseña maestra actualizada"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Tu contraseña maestra no cumple con una o más de las políticas de tu organización. Para acceder a la caja fuerte, debes actualizar tu contraseña maestra ahora. Proceder te desconectará de tu sesión actual, requiriendo que vuelva a iniciar sesión. Las sesiones activas en otros dispositivos pueden seguir estando activas durante hasta una hora."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2447,7 +2462,7 @@
     "message": "Minutos"
   },
   "vaultTimeoutPolicyInEffect1": {
-    "message": "$HOURS$ hour(s) and $MINUTES$ minute(s) maximum.",
+    "message": "$HOURS$ hora(s) y $MINUTES$ minuto(s) como máximo.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2631,10 +2646,28 @@
     "message": "Generar correo electrónico"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Generador de nombre de usuario"
+  },
+  "generatePassword": {
+    "message": "Generar contraseña"
+  },
+  "generatePassphrase": {
+    "message": "Generar frase de contraseña"
+  },
+  "passwordGenerated": {
+    "message": "Contraseña generada"
+  },
+  "passphraseGenerated": {
+    "message": "Frase de contraseña generada"
+  },
+  "usernameGenerated": {
+    "message": "Nombre de usuario generado"
+  },
+  "emailGenerated": {
+    "message": "Correo electrónico generado"
   },
   "spinboxBoundariesHint": {
-    "message": "Value must be between $MIN$ and $MAX$.",
+    "message": "El valor debe estar entre $MIN$ y $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
     "placeholders": {
       "min": {
@@ -2648,7 +2681,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " Use $RECOMMENDED$ characters or more to generate a strong password.",
+    "message": " Usa $RECOMMENDED$ caracteres o más para generar una contraseña segura.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -2658,7 +2691,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Use $RECOMMENDED$ words or more to generate a strong passphrase.",
+    "message": " Usa $RECOMMENDED$ palabras o más para generar una frase de contraseña segura.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Usar este correo electrónico"
   },
+  "useThisPassword": {
+    "message": "Usar esta contraseña"
+  },
+  "useThisPassphrase": {
+    "message": "Usar esta frase de contraseña"
+  },
+  "useThisUsername": {
+    "message": "Usar este nombre de usuario"
+  },
   "random": {
     "message": "Aleatorio"
   },
@@ -2718,7 +2760,7 @@
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Choose a domain that is supported by the selected service",
+    "message": "Elige un dominio que esté soportado por el servicio seleccionado",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
@@ -2774,7 +2816,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "message": "$SERVICENAME$ ha rechazado tu solicitud. Por favor, contacta con tu proveedor del servicio para obtener asistencia.",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2784,7 +2826,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ ha rechazado tu solicitud $ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -2903,13 +2945,13 @@
     "message": "Se ha enviado una notificación a tu dispositivo."
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "A notification was sent to your device"
+    "message": "Se ha enviado una notificación a tu dispositivo"
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the "
+    "message": "Desbloquea Bitwarden en tu dispositivo o en la "
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "aplicación web"
   },
   "notificationSentDevicePart2": {
     "message": "Make sure the Fingerprint phrase matches the one below before approving."
@@ -2930,7 +2972,7 @@
     "message": "Iniciar sesión con el dispositivo debe estar habilitado en los ajustes de la aplicación móvil Bitwarden. ¿Necesitas otra opción?"
   },
   "viewAllLogInOptions": {
-    "message": "View all log in options"
+    "message": "Ver todas las opciones de inicio de sesión"
   },
   "viewAllLoginOptions": {
     "message": "Ver todas las opciones de inicio de sesión"
@@ -2943,7 +2985,7 @@
     "description": "'Character count' describes a feature that displays a number next to each character of the password."
   },
   "areYouTryingToAccessYourAccount": {
-    "message": "Are you trying to access your account?"
+    "message": "¿Estás intentando acceder a tu cuenta?"
   },
   "accessAttemptBy": {
     "message": "Intento de acceso de $EMAIL$",
@@ -3051,17 +3093,11 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Contraseña débil encontrada en una filtración de datos. Utilice una contraseña única para proteger su cuenta. ¿Está seguro de que desea utilizar una contraseña comprometida?"
   },
-  "useThisPassword": {
-    "message": "Usar esta contraseña"
-  },
-  "useThisUsername": {
-    "message": "Usar este nombre de usuario"
-  },
   "checkForBreaches": {
     "message": "Comprobar filtración de datos conocidos para esta contraseña"
   },
   "loggedInExclamation": {
-    "message": "Logged in!"
+    "message": "¡Sesión iniciada!"
   },
   "important": {
     "message": "Importante:"
@@ -3094,7 +3130,7 @@
     "message": "Actualización de ajustes recomendados"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Remember this device to make future logins seamless"
+    "message": "Recuerda este dispositivo para hacer los futuros inicios de sesión fluidos"
   },
   "deviceApprovalRequired": {
     "message": "Se requiere aprobación del dispositivo. Selecciona una opción de aprobación a continuación:"
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Solicitar aprobación del administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Región"
   },
@@ -3152,13 +3194,13 @@
     "message": "Falta el correo electrónico del usuario"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "Correo electrónico del usuario activo no encontrado. Cerrando sesión."
   },
   "deviceTrusted": {
     "message": "Dispositivo de confianza"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Confiar en la organización"
   },
   "trust": {
     "message": "Confiar"
@@ -3167,7 +3209,7 @@
     "message": "No confiar"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "La organización no es de confianza"
   },
   "emergencyAccessTrustWarning": {
     "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
@@ -3179,7 +3221,7 @@
     "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Confiar con el usuario"
   },
   "inputRequired": {
     "message": "La entrada requerida."
@@ -3340,19 +3382,19 @@
     }
   },
   "duoHealthCheckResultsInNullAuthUrlError": {
-    "message": "Error connecting with the Duo service. Use a different two-step login method or contact Duo for assistance."
+    "message": "Error al conectarse con el servicio Duo. Utiliza un método de inicio de sesión en dos pasos diferente o ponte en contacto con Duo para obtener ayuda."
   },
   "duoRequiredByOrgForAccount": {
     "message": "Se requiere el inicio de sesión en dos pasos de Duo para tu cuenta."
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "Se requiere el inicio de sesión en dos pasos de Duo en tu cuenta. Sigue los siguientes pasos para terminar de iniciar sesión."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "Sigue los siguientes pasos para terminar de iniciar sesión."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Sigue los siguientes pasos para terminar de iniciar sesión con tu clave de seguridad."
   },
   "launchDuo": {
     "message": "Inicia Duo en el navegador"
@@ -3508,6 +3550,30 @@
     "message": "Formatos comunes",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "La detección de coincidencias URI es la forma en que Bitwarden identifica las sugerencias de autocompletado.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Expresión regular\" es una opción avanzada con mayor riesgo de exponer credenciales.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Empieza por\" es una opción avanzada con mayor riego de exponer credenciales.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Más sobre la detección de coincidencias",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Éxito"
   },
@@ -3576,33 +3642,33 @@
     "message": "Envío de texto"
   },
   "ssoError": {
-    "message": "No free ports could be found for the sso login."
+    "message": "No se encontraron puertos libres para el inicio de sesión sso."
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "¡Contraseña segura generada! No olvides actualizar tu contraseña en el sitio web."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Usa el generador",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "para crear una contraseña única y segura",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+    "message": "El desbloqueo biométrico no está disponible porque primero es necesario desbloquear con PIN o contraseña."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Biometric unlock is currently unavailable."
+    "message": "El desbloqueo biométrico no está disponible actualmente."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "El desbloqueo biométrico no está disponible por archivos del sistema mal configurados."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "El desbloqueo biométrico no está disponible por archivos del sistema mal configurados."
   },
   "biometricsStatusHelptextNotEnabledLocally": {
-    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "message": "El desbloqueo biométrico no está disponible porque no está habilitado para $EMAIL$ en la aplicación de escritorio Bitwarden.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3611,28 +3677,28 @@
     }
   },
   "biometricsStatusHelptextUnavailableReasonUnknown": {
-    "message": "Biometric unlock is currently unavailable for an unknown reason."
+    "message": "El desbloqueo biométrico no está disponible actualmente por una razón desconocida."
   },
   "itemDetails": {
-    "message": "Item details"
+    "message": "Detalles del elemento"
   },
   "itemName": {
-    "message": "Item name"
+    "message": "Nombre del elemento"
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "Credenciales de inicio de sesión"
   },
   "additionalOptions": {
     "message": "Opciones adicionales"
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "Historial del elemento"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "Última edición"
   },
   "upload": {
-    "message": "Upload"
+    "message": "Subir"
   },
   "authorize": {
     "message": "Autorizar"
@@ -3647,16 +3713,16 @@
     "message": "Warning: Agent Forwarding"
   },
   "agentForwardingWarningText": {
-    "message": "This request comes from a remote device that you are logged into"
+    "message": "Esta solicitud viene de un dispositivo remoto en el que has iniciado sesión"
   },
   "sshkeyApprovalMessageInfix": {
     "message": "está solicitando acceso a"
   },
   "sshkeyApprovalMessageSuffix": {
-    "message": "in order to"
+    "message": "para"
   },
   "sshActionLogin": {
-    "message": "authenticate to a server"
+    "message": "autenticar en un servidor"
   },
   "sshActionSign": {
     "message": "firmar un mensaje"
@@ -3686,10 +3752,10 @@
     "message": "Permitir captura de pantalla"
   },
   "allowScreenshotsDesc": {
-    "message": "Allow the Bitwarden desktop application to be captured in screenshots and viewed in remote desktop sessions. Disabling this will prevent access on some external displays."
+    "message": "Permitir que la aplicación de escritorio de Bitwarden sea capturada en capturas de pantalla y vista en sesiones remotas de escritorio. Desactivar esto evitará el acceso a algunas pantallas externas."
   },
   "confirmWindowStillVisibleTitle": {
-    "message": "Confirm window still visible"
+    "message": "Confirmar ventana todavía visible"
   },
   "confirmWindowStillVisibleContent": {
     "message": "Por favor, confirma que la ventana sigue siendo visible."
@@ -3701,10 +3767,10 @@
     "message": "The browser extension you are using is out of date. Please update it or disable browser integration fingerprint validation in the desktop app settings."
   },
   "changeAtRiskPassword": {
-    "message": "Change at-risk password"
+    "message": "Cambiar contraseña en riesgo"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "No puedes eliminar colecciones con permisos de solo Visualización: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3719,16 +3785,41 @@
     "message": "Nueva carpeta"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "Nombre de la Carpeta"
   },
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Envía información sensible de forma segura",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Comparte archivos y datos de forma segura con cualquiera, en cualquier plataforma. Tu información permanecerá encriptada de extremo a extremo, limitando su exposición.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Crear contraseñas rápidamente"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Crea fácilmente contraseñas seguras y únicas haciendo clic en",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "para ayudarte a mantener tus inicios de sesión seguros.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Crea fácilmente contraseñas seguras y únicas haciendo clic en el botón Generar contraseña para ayudarte a mantener tus inicios de sesión seguros.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Ahorra tiempo con el autocompletado"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Incluír un",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
@@ -3738,27 +3829,27 @@
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "para que este inicio de sesión aparezca como una sugerencia de autocompletado.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Pago en línea fluido"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Con las tarjetas, autocompleta fácilmente formularios de pago de forma segura y precisa."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Simplifica la creación de cuentas"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Con las identidades, autocompleta rápidamente formularios largos de registro o de contacto."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Mantén tus datos sensibles seguros"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Con las notas, almacena de forma segura datos sensibles como datos bancarios o de seguros."
   },
   "newSshNudgeTitle": {
     "message": "Developer-friendly SSH access"
@@ -3769,8 +3860,142 @@
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Más información sobre el agente SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Asignar a colecciones"
+  },
+  "assignToTheseCollections": {
+    "message": "Asignar a estas colecciones"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Solo los miembros de la organización con acceso a estas colecciones podrán ver el elemento."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Solo los miembros de la organización con acceso a estas colecciones podrán ver los elementos."
+  },
+  "noCollectionsAssigned": {
+    "message": "No se han asignado colecciones"
+  },
+  "assign": {
+    "message": "Asignar"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Solo los miembros de la organización con acceso a estas colecciones podrán ver los elementos."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Has seleccionado $TOTAL_COUNT$ elementos. No puedes actualizar $READONLY_COUNT$ de los elementos porque no tienes permisos de edición.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Selecciona colecciones para asignar"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ serán transferidos permanentemente a la organización seleccionada. Ya no serás el propietario de estos elementos.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ serán transferidos permanentemente a $ORG$. Ya no serás el propietario de estos elementos.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 elemento será transferido permanentemente a la organización seleccionada. Ya no serás el propietario de este elemento."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 elemento será transferido permanentemente a $ORG$. Ya no serás el propietario de este elemento.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Colecciones asignadas correctamente"
+  },
+  "nothingSelected": {
+    "message": "No has seleccionado nada."
+  },
+  "itemsMovedToOrg": {
+    "message": "Elementos movidos a $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Elemento movido a $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Elementos seleccionados movidos a $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/et/messages.json b/apps/desktop/src/locales/et/messages.json
index 1cc526ecfba..4b848d9ef5c 100644
--- a/apps/desktop/src/locales/et/messages.json
+++ b/apps/desktop/src/locales/et/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identiteet"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Turvaline märkus"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Muu"
   },
-  "generatePassword": {
-    "message": "Loo parool"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Tüüp"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maksimaalne faili suurus on 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Krüpteerimisvõtme ühendamine nõutud. Palun logi sisse läbi veebibrauseri, et uuendada enda krüpteerimisvõtit."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Kaust on muudetud"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Kontosisene"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Faili parool\" ja \"Faili parooli kinnitus\" ei kattu."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "See tegevus on kaitstud. Jätkamiseks sisesta oma ülemparool."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Uuendas ülemparooli"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Sinu ülemparool ei vasta ühele või rohkemale organisatsiooni poolt seatud poliitikale. Hoidlale ligipääsemiseks pead oma ülemaprooli uuendama. Jätkamisel logitakse sind praegusest sessioonist välja, mistõttu pead uuesti sisse logima. Teistes seadmetes olevad aktiivsed sessioonid aeguvad umbes ühe tunni jooksul."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Sinu organisatsioon on keelanud ära krüpteerimisvõtmete hoiustamise arvutites. Palun määra ülemparool oma hoidlale ligi pääsemiseks."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Loo parool"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Juhuslik"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Tuvastati nõrk ning andmelekkes lekkinud ülemparool. Kasuta konto paremaks turvamiseks tugevamat parooli. Oled kindel, et soovid nõrga parooliga jätkata?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Otsi seda parooli teadaolevatest andmeleketest"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Küsi administraatori nõusolekut"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Piirkond"
   },
@@ -3508,6 +3550,30 @@
     "message": "Tüüpilised meetodid",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Tehtud"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/eu/messages.json b/apps/desktop/src/locales/eu/messages.json
index ff8d91873b7..aae6880294d 100644
--- a/apps/desktop/src/locales/eu/messages.json
+++ b/apps/desktop/src/locales/eu/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identitatea"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Ohar segurua"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Bestelakoak"
   },
-  "generatePassword": {
-    "message": "Sortu pasahitza"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Mota"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Eranskinaren gehienezko tamaina 500MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Karpeta editatuta"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Ekintza hau babestuta dago. Jarraitzeko, mesedez, sartu berriro pasahitz nagusia zure identitatea egiaztatzeko."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Pasahitz nagusia eguneratuta"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Sortu pasahitza"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Ausazkoa"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/fa/messages.json b/apps/desktop/src/locales/fa/messages.json
index e0050ea092a..4b9696887be 100644
--- a/apps/desktop/src/locales/fa/messages.json
+++ b/apps/desktop/src/locales/fa/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "هویت"
   },
+  "typeNote": {
+    "message": "یادداشت"
+  },
   "typeSecureNote": {
     "message": "یادداشت امن"
   },
@@ -122,23 +125,23 @@
     "message": "فیلدهای سفارشی"
   },
   "launch": {
-    "message": "راه اندازی"
+    "message": "راه‌اندازی"
   },
   "copyValue": {
     "message": "کپی مقدار",
     "description": "Copy value to clipboard"
   },
   "minimizeOnCopyToClipboard": {
-    "message": "پایین کشیدن پنجره موقع کپی کردن در کلیپ بورد"
+    "message": "پایین کشیدن پنجره موقع کپی کردن در حافظه موقت"
   },
   "minimizeOnCopyToClipboardDesc": {
-    "message": "پایین کشیدن پنجره موقع کپی کردن اطلاعات یک مورد در کلیپ بورد."
+    "message": "پایین کشیدن پنجره موقع کپی کردن اطلاعات یک مورد در حافظه موقت."
   },
   "toggleVisibility": {
-    "message": "قابلیت مشاهده را تغییر دهید"
+    "message": "تغییر وضعیت نمایش"
   },
   "toggleCollapse": {
-    "message": "باز و بسته کردن",
+    "message": "تغییر وضعیت جمع شدن",
     "description": "Toggling an expand/collapse state."
   },
   "cardholderName": {
@@ -303,7 +306,7 @@
     "message": "جولای"
   },
   "august": {
-    "message": "آگوست‌"
+    "message": "اوت‌"
   },
   "september": {
     "message": "سپتامبر"
@@ -334,7 +337,7 @@
     "message": "بانو"
   },
   "mx": {
-    "message": "عنوان"
+    "message": "بی جنسیت"
   },
   "dr": {
     "message": "دکتر"
@@ -351,12 +354,6 @@
   "other": {
     "message": "ساير"
   },
-  "generatePassword": {
-    "message": "تولید کلمه عبور"
-  },
-  "generatePassphrase": {
-    "message": "تولید عبارت عبور"
-  },
   "type": {
     "message": "نوع"
   },
@@ -382,7 +379,7 @@
     "message": "نشانی ۳"
   },
   "cityTown": {
-    "message": "شهر / شهرک"
+    "message": "شهر / شهرستان"
   },
   "stateProvince": {
     "message": "ایالت / استان"
@@ -437,7 +434,7 @@
     "message": "افزودن وب‌سایت"
   },
   "deleteWebsite": {
-    "message": "حذف وبسایت"
+    "message": "حذف وب‌سایت"
   },
   "owner": {
     "message": "مالک"
@@ -473,7 +470,7 @@
     "message": "وقتی در پر کردن خودکار برای یک وب‌سایت خاص به مشکل برخوردید، از فیلد مرتبط استفاده کنید."
   },
   "linkedLabelHelpText": {
-    "message": "شناسه Html، نام، aria-label یا محل نگهدار فیلد را وارد کنید."
+    "message": "شناسه html، نام، aria-label یا محل نگهدار فیلد را وارد کنید."
   },
   "folder": {
     "message": "پوشه"
@@ -529,10 +526,10 @@
     "message": "حذف پیوست"
   },
   "deleteItemConfirmation": {
-    "message": "واقعاً می‌خواهید این آیتم را به سطل زباله ارسال کنید؟"
+    "message": "واقعاً می‌خواهید این مورد را به سطل زباله ارسال کنید؟"
   },
   "deletedItem": {
-    "message": "مورد به زباله‌ها فرستاده شد"
+    "message": "مورد به سطل زباله فرستاده شد"
   },
   "overwritePasswordConfirmation": {
     "message": "آیا از بازنویسی بر روی کلمه عبور فعلی مطمئن هستید؟"
@@ -652,7 +649,7 @@
     "description": "Minimum Special Characters"
   },
   "ambiguous": {
-    "message": "از کاراکترهای مبهم اجتناب کن",
+    "message": "از کاراکترهای مبهم خودداری کن",
     "description": "deprecated. Use avoidAmbiguous instead."
   },
   "avoidAmbiguous": {
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "بیشترین حجم پرونده ۵۰۰ مگابایت است."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "انتقال کلید رمزگذاری مورد نیاز است. لطفاً از طریق گاوصندوق وب وارد شوید تا کلید رمزگذاری خود را به روز کنید."
+  "legacyEncryptionUnsupported": {
+    "message": "رمزنگاری قدیمی دیگر پشتیبانی نمی‌شود. لطفاً برای بازیابی حساب کاربری خود با پشتیبانی تماس بگیرید."
   },
   "editedFolder": {
     "message": "پوشه ذخیره شد"
@@ -825,13 +822,13 @@
     "message": "حساب ایمیل"
   },
   "requestHint": {
-    "message": "درخواست راهنمایی"
+    "message": "درخواست یادآور"
   },
   "requestPasswordHint": {
     "message": "درخواست یادآور کلمه عبور"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "نشانی ایمیل حساب کاربری خود را وارد کنید تا راهنمای کلمه عبور برای شما ارسال شود"
+    "message": "نشانی ایمیل حساب کاربری خود را وارد کنید تا یادآور کلمه عبور برای شما ارسال شود"
   },
   "getMasterPasswordHint": {
     "message": "دریافت یادآور کلمه عبور اصلی"
@@ -868,16 +865,16 @@
     "message": "کلمه عبور اصلی با تکرار آن مطابقت ندارد."
   },
   "newAccountCreated": {
-    "message": "حساب کاربری جدید شما ساخته شد! حالا می‌توانید وارد شوید."
+    "message": "حساب کاربری جدید شما ایجاد شده است! حالا می‌توانید وارد شوید."
   },
   "newAccountCreated2": {
     "message": "حساب کاربری جدید شما ایجاد شده است!"
   },
   "youHaveBeenLoggedIn": {
-    "message": "شما با موفقیت وارد شدید!"
+    "message": "شما وارد شدید!"
   },
   "masterPassSent": {
-    "message": "ما یک ایمیل همراه با یادآور کلمه عبور اصلی برایتان ارسال کردیم."
+    "message": "ما یک ایمیل همراه با یادآور کلمه عبور اصلی برای شما ارسال کردیم."
   },
   "unexpectedError": {
     "message": "یک خطای غیر منتظره رخ داده است."
@@ -980,7 +977,7 @@
     "message": "FIDO2 WebAuthn"
   },
   "webAuthnDesc": {
-    "message": "برای دسترسی به حساب خود از هر کلید امنیتی فعال شده WebAuthn استفاده کنید."
+    "message": "برای دسترسی به حساب کاربری خود از هر کلید امنیتی فعال شده WebAuthn استفاده کنید."
   },
   "emailTitle": {
     "message": "ایمیل"
@@ -1044,7 +1041,7 @@
     "message": "نشانی سرور اعلان‌ها"
   },
   "iconsUrl": {
-    "message": "آدرس سرور آیکون ها"
+    "message": "نشانی سرور نمادها"
   },
   "environmentSaved": {
     "message": "نشانی‌های اینترنتی محیط ذخیره شد"
@@ -1074,7 +1071,7 @@
     "message": "خارج شد"
   },
   "loggedOutDesc": {
-    "message": "شما از حساب خود خارج شده‌اید."
+    "message": "شما از حساب کاربری خود خارج شده‌اید."
   },
   "loginExpired": {
     "message": "نشست ورود شما منقضی شده است."
@@ -1107,7 +1104,7 @@
     "message": "مشاهده"
   },
   "account": {
-    "message": "حساب"
+    "message": "حساب کاربری"
   },
   "loading": {
     "message": "درحال بارگذاری..."
@@ -1153,7 +1150,7 @@
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "yourAccountsFingerprint": {
-    "message": "عبارت اثر انگشت حساب شما",
+    "message": "عبارت اثر انگشت حساب کاربری شما",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "goToWebVault": {
@@ -1181,7 +1178,7 @@
     "message": "یا"
   },
   "unlockWithBiometrics": {
-    "message": "با استفاده از بیومتریک باز کنید"
+    "message": "باز کردن قفل با بیومتریک"
   },
   "unlockWithMasterPassword": {
     "message": "باز کردن قفل با کلمه عبور اصلی"
@@ -1206,10 +1203,10 @@
     "message": "کلمه عبور اصلی نامعتبر است"
   },
   "twoStepLoginConfirmation": {
-    "message": "ورود دو مرحله ای باعث می‌شود که حساب کاربری شما با استفاده از یک دستگاه دیگر مانند کلید امنیتی، برنامه احراز هویت، پیامک، تماس تلفنی و یا ایمیل، اعتبار خود را با ایمنی بیشتر اثبات کند. ورود دو مرحله ای می تواند در bitwarden.com فعال شود. آیا می‌خواهید از سایت بازدید کنید؟"
+    "message": "ورود دو مرحله‌ای باعث می شود که حساب کاربری شما با استفاده از یک دستگاه دیگر مانند کلید امنیتی، برنامه احراز هویت، پیامک، تماس تلفنی و یا رایانامه، اعتبار خود را با ایمنی بیشتر اثبات کند. ورود دو مرحله‌ای می‌تواند در bitwarden.com راه‌اندازی شود. آیا می‌خواهید از سایت بازدید کنید؟"
   },
   "twoStepLogin": {
-    "message": "ورود دو مرحله ای"
+    "message": "ورود دو مرحله‌ای"
   },
   "vaultTimeout": {
     "message": "متوقف شدن گاو‌صندوق"
@@ -1254,13 +1251,13 @@
     "message": "۴ ساعت"
   },
   "onIdle": {
-    "message": "در سیستم بیکار"
+    "message": "در زمان بیکاری سیستم"
   },
   "onSleep": {
-    "message": "در خواب سیستم"
+    "message": "در زمان خواب سیستم"
   },
   "onLocked": {
-    "message": "در قفل سیستم"
+    "message": "در زمان قفل سیستم"
   },
   "onRestart": {
     "message": "در راه اندازی مجدد"
@@ -1272,11 +1269,11 @@
     "message": "امنیت"
   },
   "clearClipboard": {
-    "message": "پاکسازی کلیپ بورد",
+    "message": "پاکسازی حافظه موقت",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "clearClipboardDesc": {
-    "message": "به صورت خودکار، مقادیر کپی شده را از کلیپ بورد پاک کن.",
+    "message": "به صورت خودکار، مقادیر کپی شده را از حافظه موقت پاک کن.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "enableFavicon": {
@@ -1301,7 +1298,7 @@
     "message": "بستن به نماد سینی"
   },
   "enableCloseToTrayDesc": {
-    "message": "هنگام بستن پنچره، یک آیکون در قسمت tray به‌جای آن نشان بده."
+    "message": "هنگام بستن پنچره، یک نماد در قسمت سینی سیستم به‌جای آن نشان بده."
   },
   "enableCloseToMenuBar": {
     "message": "بستن به نوار منو"
@@ -1343,13 +1340,13 @@
     "message": "غیرفعال کردن سینی را تأیید کنید"
   },
   "confirmTrayDesc": {
-    "message": "غیرفعال کردن این تنظیم تمام تنظیمات مربوط به سینی را غیرفعال می‌کند."
+    "message": "خاموش کردن این تنظیم، باعث غیرفعال شدن تمام تنظیمات مربوط به نوار وظیفه نیز خواهد شد."
   },
   "language": {
     "message": "زبان"
   },
   "languageDesc": {
-    "message": "تغییر زبان مورد استفاده برنامه انجام شد. نیاز به راه اندازی مجدد."
+    "message": "تغییر زبان مورد استفاده برنامه انجام شد. نیاز به راه‌اندازی مجدد."
   },
   "theme": {
     "message": "پوسته"
@@ -1382,10 +1379,10 @@
     }
   },
   "restartToUpdate": {
-    "message": "برای به‌روزرسانی، مجدداً راه اندازی کن"
+    "message": "برای به‌روزرسانی، مجدداً راه‌اندازی کن"
   },
   "restartToUpdateDesc": {
-    "message": "نسخه $VERSION_NUM$ آماده نصب است. برای تکمیل نصب باید Bitwarden را مجددا راه اندازی کنید. آیا تمایل به راه اندازی مجدد و به‌روزرسانی دارید؟",
+    "message": "نسخه $VERSION_NUM$ آماده نصب است. برای تکمیل نصب باید Bitwarden را مجددا راه‌اندازی کنید. آیا تمایل به راه‌اندازی مجدد و به‌روزرسانی دارید؟",
     "placeholders": {
       "version_num": {
         "content": "$1",
@@ -1397,10 +1394,10 @@
     "message": "به‌روزرسانی در دسترس است"
   },
   "updateAvailableDesc": {
-    "message": "یک به‌روزرسانی یافت شد. مایل به دانلود و نصب آن هستید؟"
+    "message": "یک به‌روزرسانی یافت شد. مایل به بارگیری و نصب آن هستید؟"
   },
   "restart": {
-    "message": "راه اندازی مجدد"
+    "message": "راه‌اندازی مجدد"
   },
   "later": {
     "message": "بعداً"
@@ -1409,7 +1406,7 @@
     "message": "در حال حاضر هیچ به‌روزرسانی در دسترس نمی‌باشد. شما در حال استفاده از آخرین نسخه هستید."
   },
   "updateError": {
-    "message": "خطا در به‌روز رسانی"
+    "message": "خطا در به‌روزرسانی"
   },
   "unknown": {
     "message": "ناشناخته"
@@ -1450,7 +1447,7 @@
     "message": "۱ گیگابایت فضای ذخیره‌سازی رمزنگاری شده برای پرونده‌های پیوست."
   },
   "premiumSignUpTwoStepOptions": {
-    "message": "گزینه های ورود اضافی دو مرحله ای مانند YubiKey و Duo."
+    "message": "گزینه‌های ورود اضافی دو مرحله‌ای مانند YubiKey و Duo."
   },
   "premiumSignUpReports": {
     "message": "گزارش‌های بهداشت کلمه عبور، سلامت حساب و نقض داده‌ها برای ایمن نگهداشتن گاوصندوق شما."
@@ -1468,7 +1465,7 @@
     "message": "خرید پرمیوم"
   },
   "premiumPurchaseAlertV2": {
-    "message": "می‌توانید نسخه پرمیوم را از تنظیمات حساب کاربری خود در اپلیکیشن وب Bitwarden خریداری کنید."
+    "message": "می‌توانید نسخه پرمیوم را از تنظیمات حساب کاربری خود در برنامه وب Bitwarden خریداری کنید."
   },
   "premiumCurrentMember": {
     "message": "شما یک عضو پرمیوم هستید!"
@@ -1609,7 +1606,7 @@
     "message": "بررسی کنید که آیا کلمه عبور افشا شده است."
   },
   "passwordExposed": {
-    "message": "این کلمه عبور $VALUE$ بار در رخنه داده‌ها افشا شده است. باید آن را تغییر دهید.",
+    "message": "این کلمه عبور $VALUE$ بار در نقض داده‌ها افشا شده است. باید آن را تغییر دهید.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -1618,7 +1615,7 @@
     }
   },
   "passwordSafe": {
-    "message": "این کلمه عبور در هیچ رخنه داده ای شناخته نشده است. استفاده از آن باید ایمن باشد."
+    "message": "این کلمه عبور در هیچ یک از نقض‌های داده شناخته شده یافت نشد. استفاده از آن باید ایمن باشد."
   },
   "baseDomain": {
     "message": "دامنه پایه",
@@ -1651,7 +1648,7 @@
     "description": "Default URI match detection for auto-fill."
   },
   "toggleOptions": {
-    "message": "گزینه های تبدیل"
+    "message": "سوئیچ گزینه‌ها"
   },
   "organization": {
     "message": "سازمان",
@@ -1705,7 +1702,7 @@
     "message": "این کلمه عبور برای برون ریزی و درون ریزی این پرونده استفاده می‌شود"
   },
   "accountRestrictedOptionDescription": {
-    "message": "برای رمزگذاری برون ریزی و محدود کردن درون ریزی فقط به حساب کاربری فعلی Bitwarden، از کلید رمزگذاری حساب خود که از نام کاربری و کلمه عبور اصلی حساب شما مشتق شده است استفاده کنید."
+    "message": "برای رمزگذاری برون ریزی و محدود کردن درون ریزی فقط به حساب کاربری فعلی Bitwarden، از کلید رمزگذاری حساب کاربری خود که از نام کاربری و کلمه عبور اصلی حساب کاربری شما مشتق شده است استفاده کنید."
   },
   "passwordProtected": {
     "message": "محافظت ‌شده با کلمه عبور"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "حساب کاربری محدود شده است"
   },
+  "restrictCardTypeImport": {
+    "message": "نمی‌توان انواع مورد کارت را درون ریزی کرد"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "یک سیاست تعیین شده توسط یک یا چند سازمان، مانع از درون ریزی کارت‌ها به گاوصندوق‌های شما شده است."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "عدم تطابق \"کلمه عبور پرونده\" و \"تأیید کلمه عبور پرونده\" با یکدیگر."
   },
@@ -1726,7 +1729,7 @@
     "message": "انجام شد"
   },
   "warning": {
-    "message": "اخطار",
+    "message": "هشدار",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
   "confirmVaultExport": {
@@ -1736,16 +1739,16 @@
     "message": "این برون ریزی شامل داده‌های گاوصندوق در یک قالب رمزنگاری نشده است. شما نباید آن را از طریق یک راه ارتباطی نا امن (مثل ایمیل) ذخیره یا ارسال کنید. به محض اینکه کارتان با آن تمام شد، آن را حذف کنید."
   },
   "encExportKeyWarningDesc": {
-    "message": "این برون ریزی با استفاده از کلید رمزگذاری حساب شما، اطلاعاتتان را رمزگذاری می کند. اگر زمانی کلید رمزگذاری حساب خود را بچرخانید، باید دوباره خروجی بگیرید، چون قادر به رمزگشایی این پرونده برون ریزی نخواهید بود."
+    "message": "این برون ریزی با استفاده از کلید رمزگذاری حساب کاربری شما، اطلاعاتتان را رمزگذاری می کند. اگر زمانی کلید رمزگذاری حساب کاربری خود را تغییر دهید، باید دوباره خروجی بگیرید، چون قادر به رمزگشایی این پرونده برون ریزی نخواهید بود."
   },
   "encExportAccountWarningDesc": {
-    "message": "کلیدهای رمزگذاری حساب برای هر حساب کاربری Bitwarden منحصر به فرد است، بنابراین نمی‌توانید برون ریزی رمزگذاری شده را به حساب دیگری درون ریزی کنید."
+    "message": "کلیدهای رمزگذاری حساب کاربری برای هر حساب کاربری Bitwarden منحصر به فرد است، بنابراین نمی‌توانید برون ریزی رمزگذاری شده را به حساب کاربری دیگری درون ریزی کنید."
   },
   "noOrganizationsList": {
     "message": "شما به هیچ سازمانی تعلق ندارید. سازمان‌ها به شما اجازه می‌دهند تا داده‌های خود را با کاربران دیگر به صورت امن به اشتراک بگذارید."
   },
   "noCollectionsInList": {
-    "message": "هیچ مجموعه ای برای لیست کردن وجود ندارد."
+    "message": "هیچ مجموعه‌ای برای لیست کردن وجود ندارد."
   },
   "ownership": {
     "message": "مالکیت"
@@ -1791,7 +1794,7 @@
     "message": "تعداد تلاش‌های ناموفق کد پین زیاد شد. خارج می‌شوید."
   },
   "unlockWithWindowsHello": {
-    "message": "باز کردن با Windows Hello"
+    "message": "قفل گشایی با Windows Hello"
   },
   "additionalWindowsHelloSettings": {
     "message": "تنظیمات اضافی Windows Hello"
@@ -1812,13 +1815,13 @@
     "message": "قفل گاوصندوق خود را باز کنید"
   },
   "autoPromptWindowsHello": {
-    "message": "درخواست Windows Hello در هنگام راه اندازی"
+    "message": "درخواست Windows Hello در هنگام راه‌اندازی"
   },
   "autoPromptPolkit": {
     "message": "در زمان اجرا درخواست احراز هویت سیستم را بده"
   },
   "autoPromptTouchId": {
-    "message": "درخواست Touch ID در هنگام راه اندازی"
+    "message": "درخواست Touch ID در هنگام راه‌اندازی"
   },
   "requirePasswordOnStart": {
     "message": "هنگام شروع برنامه، کلمه عبور یا کد پین مورد نیاز است"
@@ -1833,13 +1836,13 @@
     "message": "در زمان شروع مجدد، با کلمه عبور اصلی قفل کن"
   },
   "deleteAccount": {
-    "message": "حذف حساب"
+    "message": "حذف حساب کاربری"
   },
   "deleteAccountDesc": {
     "message": "برای حذف حساب کاربری خود و تمام داده‌های گاوصندوق، به زیر ادامه دهید."
   },
   "deleteAccountWarning": {
-    "message": "حذف حساب شما دائمی است. نمی‌توان آن را برگرداند."
+    "message": "حذف حساب کاربری شما دائمی است. نمی‌توان آن را برگرداند."
   },
   "cannotDeleteAccount": {
     "message": "قادر به حذف حساب کاربری نیستیم"
@@ -1848,10 +1851,10 @@
     "message": "این اقدام قابل انجام نیست زیرا حساب کاربری شما متعلق به یک سازمان است. برای جزئیات بیشتر با مدیر سازمان خود تماس بگیرید."
   },
   "accountDeleted": {
-    "message": "حساب حذف شد"
+    "message": "حساب کاربری حذف شد"
   },
   "accountDeletedDesc": {
-    "message": "حساب شما بسته شد و تمام داده های مرتبط حذف شده است."
+    "message": "حساب کاربری شما بسته شد و تمام داده‌های مرتبط حذف شده است."
   },
   "preferences": {
     "message": "تنظیمات"
@@ -1894,7 +1897,7 @@
     "message": "تغییرات ذخیره نشده"
   },
   "clone": {
-    "message": "شبیه سازی"
+    "message": "شبیه‌سازی"
   },
   "passwordGeneratorPolicyInEffect": {
     "message": "یک یا چند سیاست سازمان بر تنظیمات تولید کننده شما تأثیر می‌گذارد."
@@ -1920,13 +1923,13 @@
     "description": "Noun: a special folder to hold deleted items"
   },
   "searchTrash": {
-    "message": "جستجوی زباله‌ها"
+    "message": "جستجوی سطل زباله"
   },
   "permanentlyDeleteItem": {
     "message": "حذف دائمی مورد"
   },
   "permanentlyDeleteItemConfirmation": {
-    "message": "مطمئن هستید که می‌خواهید این مورد را برای همیشه پاک کنید؟"
+    "message": "آیا مطمئن هستید که می‌خواهید این مورد را برای همیشه پاک کنید؟"
   },
   "permanentlyDeletedItem": {
     "message": "مورد برای همیشه حذف شد"
@@ -1938,7 +1941,7 @@
     "message": "حذف دائمی"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "خروج از سیستم، تمام دسترسی ها به گاو‌صندوق شما را از بین می‌برد و نیاز به احراز هویت آنلاین پس از مدت زمان توقف دارد. آیا مطمئن هستید که می‌خواهید از این تنظیمات استفاده کنید؟"
+    "message": "خروج از سیستم، تمام دسترسی‌ها به گاو‌صندوق شما را از بین می‌برد و نیاز به احراز هویت آنلاین پس از مدت زمان توقف دارد. آیا مطمئن هستید که می‌خواهید از این تنظیمات استفاده کنید؟"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
     "message": "تأیید عمل توقف"
@@ -1991,7 +1994,7 @@
     "message": "Bitwarden می‌تواند کدهای تأیید دو مرحله‌ای را ذخیره و پر کند. کلید را کپی کرده و در این فیلد قرار دهید."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden می‌تواند کدهای تأیید دو مرحله‌ای را ذخیره و پر کند. برای اسکن کد QR احراز هویت کننده این وب‌سایت، روی آیکون دوربین کلیک کنید یا کلید را کپی کرده و در این فیلد قرار دهید."
+    "message": "Bitwarden می‌تواند کدهای تأیید دو مرحله‌ای را ذخیره و پر کند. برای اسکن کد QR احراز هویت کننده این وب‌سایت، روی نماد دوربین کلیک کنید یا کلید را کپی کرده و در این فیلد قرار دهید."
   },
   "premium": {
     "message": "پرمیوم",
@@ -2098,13 +2101,13 @@
     "message": "فعال کردن ادغام مرورگر"
   },
   "enableBrowserIntegrationDesc1": {
-    "message": "برای فعال‌سازی باز کردن قفل با بیومتریک در مرورگرهایی به‌جز Safari استفاده می‌شود."
+    "message": "برای فعال‌سازی باز کردن قفل با بیومتریک در مرورگرهایی به‌جز سافاری استفاده می‌شود."
   },
   "enableDuckDuckGoBrowserIntegration": {
-    "message": "اجازه ادغام مرورگر DuckDuckGo را بدهید"
+    "message": "اجازه ادغام مرورگر داک‌داک گو را بدهید"
   },
   "enableDuckDuckGoBrowserIntegrationDesc": {
-    "message": "هنگام مرور با DuckDuckGo از گاوصندوق Bitwarden خود استفاده کنید."
+    "message": "هنگام مرور با Bitwarden از گاوصندوق Bitwarden خود استفاده کنید."
   },
   "browserIntegrationUnsupportedTitle": {
     "message": "ادغام مرورگر پشتیبانی نمی‌شود"
@@ -2134,7 +2137,7 @@
     "message": "استفاده از شتاب سخت افزاری"
   },
   "enableHardwareAccelerationDesc": {
-    "message": "به طور پیش‌فرض این تنظیم روشن است. فقط در صورت مواجهه با مشکلات گرافیکی آن را خاموش کنید. نیاز به راه‌اندازی مجدد دارد."
+    "message": "به طور پیش‌فرض این تنظیم روشن است. فقط در صورت مواجه با مشکلات گرافیکی آن را خاموش کنید. نیاز به راه‌اندازی مجدد دارد."
   },
   "approve": {
     "message": "تأیید"
@@ -2173,13 +2176,13 @@
     "message": "به دلیل روش نصب، پشتیبانی از بیومتریک به‌صورت خودکار فعال نشد. آیا می‌خواهید مستندات نحوه انجام این کار به‌صورت دستی را باز کنید؟"
   },
   "personalOwnershipSubmitError": {
-    "message": "به دلیل سیاست پرمیوم، برای ذخیره موارد در گاوصندوق شخصی خود محدود شده اید. گزینه مالکیت را به یک سازمان تغییر دهید و مجموعه های موجود را انتخاب کنید."
+    "message": "به دلیل سیاست پرمیوم، برای ذخیره موارد در گاوصندوق شخصی خود محدود شده‌اید. گزینه مالکیت را به یک سازمان تغییر دهید و مجموعه‌های موجود را انتخاب کنید."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
     "message": "کلمه عبور جدید شما نمی‌تواند با کلمه عبور فعلی‌تان یکسان باشد."
   },
   "hintEqualsPassword": {
-    "message": "اشاره به کلمه عبور شما نمی‌تواند همان کلمه عبور شما باشد."
+    "message": "یادآور کلمه عبور شما نمی‌تواند همان کلمه عبور شما باشد."
   },
   "personalOwnershipPolicyInEffect": {
     "message": "سیاست سازمانی بر تنظیمات مالکیت شما تأثیر می‌گذارد."
@@ -2197,7 +2200,7 @@
     "message": "اطلاعات تماس"
   },
   "allSends": {
-    "message": "همه ارسال ها",
+    "message": "همه ارسال‌ها",
     "description": "'Sends' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeFile": {
@@ -2254,7 +2257,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendNotesDesc": {
-    "message": "یادداشت های خصوصی در مورد این ارسال.",
+    "message": "یادداشت‌های خصوصی در مورد این ارسال.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLink": {
@@ -2266,7 +2269,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "textHiddenByDefault": {
-    "message": "هنگام دسترسی به ارسال، متن را به طور پیش فرض پنهان کن",
+    "message": "هنگام دسترسی به ارسال، متن را به طور پیش‌فرض پنهان کن",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
@@ -2296,7 +2299,7 @@
     "message": "متنی که می‌خواهید ارسال کنید."
   },
   "sendFileDesc": {
-    "message": "پرونده ای که می‌خواهید ارسال کنید."
+    "message": "پرونده‌ای که می‌خواهید ارسال کنید."
   },
   "days": {
     "message": "$DAYS$ روز",
@@ -2318,11 +2321,11 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLinkToClipboard": {
-    "message": "کپی پیوند ارسال به کلیپ بورد",
+    "message": "کپی پیوند ارسال به حافظه موقت",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLinkOnSave": {
-    "message": "این پیوند را برای به اشتراک گذاری ارسال بعد از ارسال کپی کن."
+    "message": "پیوند را برای اشتراک‌گذاری کپی کن. پس از ذخیره، آن را به حافظه موقت من بفرست."
   },
   "sendDisabled": {
     "message": "ارسال حذف شد",
@@ -2345,7 +2348,7 @@
     "message": "کلمه عبور حذف شد"
   },
   "removePasswordConfirmation": {
-    "message": "مطمئنید که می‌خواهید کلمه عبور حذف شود؟"
+    "message": "آیا مطمئنید که می‌خواهید کلمه عبور حذف شود؟"
   },
   "maxAccessCountReached": {
     "message": "به حداکثر تعداد دسترسی رسیده است"
@@ -2369,7 +2372,7 @@
     "message": "نشانی ایمیلم را از گیرندگان مخفی کن."
   },
   "sendOptionsPolicyInEffect": {
-    "message": "یک یا چند سیاست سازمان بر گزینه های ارسال شما تأثیر می‌گذارد."
+    "message": "یک یا چند سیاست سازمان بر گزینه‌های ارسال شما تأثیر می‌گذارد."
   },
   "emailVerificationRequired": {
     "message": "تأیید ایمیل لازم است"
@@ -2389,17 +2392,29 @@
   "passwordConfirmationDesc": {
     "message": "این عمل محافظت می‌شود. برای ادامه، لطفاً کلمه عبور اصلی خود را دوباره وارد کنید تا هویت‌تان را تأیید کنید."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "کلمه عبور اصلی با موفقیت تنظیم شد"
+  },
   "updatedMasterPassword": {
-    "message": "کلمه عبور اصلی به‌روز شد"
+    "message": "کلمه عبور اصلی به‌روزرسانی شد"
   },
   "updateMasterPassword": {
     "message": "به‌روزرسانی کلمه عبور اصلی"
   },
   "updateMasterPasswordWarning": {
-    "message": "کلمه عبور اصلی شما اخیراً توسط سرپرست سازمان‌تان تغییر کرده است. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روز کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
+    "message": "کلمه عبور اصلی شما اخیراً توسط مدیر سازمان‌تان تغییر کرده است. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روزرسانی کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه‌های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
   },
   "updateWeakMasterPasswordWarning": {
-    "message": "کلمه عبور اصلی شما با یک یا چند سیاست سازمان‌تان مطابقت ندارد. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روز کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
+    "message": "کلمه عبور اصلی شما با یک یا چند سیاست سازمان‌تان مطابقت ندارد. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روزرسانی کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه‌های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
+  },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
   },
   "tdeDisabledMasterPasswordRequired": {
     "message": "سازمان شما رمزگذاری دستگاه‌های مورد اعتماد را غیرفعال کرده است. لطفاً برای دسترسی به گاوصندوق خود یک کلمه عبور اصلی تنظیم کنید."
@@ -2460,7 +2475,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "سیاست‌های سازمانتان بر مهلت زمانی گاوصندوق شما تأثیر می‌گذارد. حداکثر زمان مجاز گاوصندوق $HOURS$ ساعت و $MINUTES$ دقیقه است. عملگر مهلت زمانی گاوصندوق شما روی $ACTION$ تنظیم شده است.",
+    "message": "سیاست‌های سازمان‌تان بر مهلت زمانی گاوصندوق شما تأثیر می‌گذارد. حداکثر زمان مجاز گاوصندوق $HOURS$ ساعت و $MINUTES$ دقیقه است. عملگر مهلت زمانی گاوصندوق شما روی $ACTION$ تنظیم شده است.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2486,7 +2501,7 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "مهلت زمانی شما بیش از محدودیت های تعیین شده توسط سازمانتان است."
+    "message": "مهلت زمانی شما بیش از محدودیت‌های تعیین شده توسط سازمان‌تان است."
   },
   "inviteAccepted": {
     "message": "دعوتنامه پذیرفته شد"
@@ -2495,7 +2510,7 @@
     "message": "ثبت نام خودکار"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "این سازمان دارای سیاست سازمانی ای است که به طور خودکار شما را در بازنشانی کلمه عبور ثبت نام می‌کند. این ثبت نام به مدیران سازمان اجازه می‌دهد تا کلمه عبور اصلی شما را تغییر دهند."
+    "message": "این سازمان دارای سیاست سازمانی است که به طور خودکار شما را در بازیابی کلمه عبور ثبت نام می‌کند. این ثبت نام به مدیران سازمان اجازه می‌دهد تا کلمه عبور اصلی شما را تغییر دهند."
   },
   "vaultExportDisabled": {
     "message": "برون ریزی گاوصندوق غیرفعال شده است"
@@ -2528,25 +2543,25 @@
     "message": "آيا مطمئنید که می‌خواهيد سازمان انتخاب شده را ترک کنيد؟"
   },
   "leftOrganization": {
-    "message": "شما از سازمان خارج شده اید."
+    "message": "شما از سازمان خارج شده‌اید."
   },
   "ssoKeyConnectorError": {
     "message": "خطای رابط کلید: مطمئن شوید که رابط کلید در دسترس است و به درستی کار می‌کند."
   },
   "lockAllVaults": {
-    "message": "قفل کردن تمام گاوصندوق ها"
+    "message": "قفل کردن تمام گاوصندوق‌ها"
   },
   "accountLimitReached": {
-    "message": "بیش از 5 حساب را نمی‌توان همزمان وارد کرد."
+    "message": "بیش از ۵ حساب کاربری را نمی‌توان همزمان وارد کرد."
   },
   "accountPreferences": {
     "message": "تنظیمات"
   },
   "appPreferences": {
-    "message": "تنظیمات برنامه (تمام حساب‌ها)"
+    "message": "تنظیمات برنامه (تمام حساب‌های کاربری)"
   },
   "accountSwitcherLimitReached": {
-    "message": "محدودیت حساب تکمیل شد. برای افزودن حساب دیگر، از یک حساب خارج شوید."
+    "message": "محدودیت حساب کاربری تکمیل شد. برای افزودن حساب کاربری دیگر، از یکی خارج شوید."
   },
   "settingsTitle": {
     "message": "تنظیمات برنامه برای $EMAIL$",
@@ -2603,13 +2618,13 @@
     }
   },
   "locked": {
-    "message": "قفل شده"
+    "message": "قفل شد"
   },
   "yourVaultIsLockedV2": {
     "message": "گاوصندوق‌تان قفل شد"
   },
   "unlocked": {
-    "message": "باز شده"
+    "message": "قفل باز شد"
   },
   "generator": {
     "message": "تولید کننده",
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "تولید کننده نام کاربری"
   },
+  "generatePassword": {
+    "message": "تولید کلمه عبور"
+  },
+  "generatePassphrase": {
+    "message": "تولید عبارت عبور"
+  },
+  "passwordGenerated": {
+    "message": "کلمه عبور تولید شد"
+  },
+  "passphraseGenerated": {
+    "message": "عبارت عبور تولید شد"
+  },
+  "usernameGenerated": {
+    "message": "نام کاربری تولید شد"
+  },
+  "emailGenerated": {
+    "message": "ایمیل تولید شد"
+  },
   "spinboxBoundariesHint": {
     "message": "مقدار باید بین $MIN$ و $MAX$ باشد.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2675,7 +2708,7 @@
     "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
   },
   "plusAddressedEmailDesc": {
-    "message": "از قابلیت های آدرس دهی فرعی ارائه دهنده ایمیل خود استفاده کنید."
+    "message": "از قابلیت‌های آدرس دهی فرعی ارائه دهنده ایمیل خود استفاده کنید."
   },
   "catchallEmail": {
     "message": "دریافت همه ایمیل‌ها"
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "از این ایمیل استفاده شود"
   },
+  "useThisPassword": {
+    "message": "از این کلمه عبور استفاده کن"
+  },
+  "useThisPassphrase": {
+    "message": "از این عبارت عبور استفاده کن"
+  },
+  "useThisUsername": {
+    "message": "از این نام کاربری استفاده کن"
+  },
   "random": {
     "message": "تصادفی"
   },
@@ -3019,7 +3061,7 @@
     "message": "درخواست دسترسی به حساب کاربری دریافت شد"
   },
   "creatingAccountOn": {
-    "message": "در حال ساخت حساب روی"
+    "message": "در حال ساخت حساب کاربری روی"
   },
   "checkYourEmail": {
     "message": "ایمیل خود را چک کنید"
@@ -3043,22 +3085,16 @@
     "message": "کلمه عبور اصلی افشا شده"
   },
   "exposedMasterPasswordDesc": {
-    "message": "کلمه عبور در نقض داده پیدا شد. از یک کلمه عبور منحصر به فرد برای محافظت از حساب خود استفاده کنید. آیا مطمئنید که می‌خواهید از یک کلمه عبور افشا شده استفاده کنید؟"
+    "message": "کلمه عبور در افشای داده پیدا شد. از یک کلمه عبور منحصربه‌فرد برای محافظت از حساب کاربری خود استفاده کنید. آیا مطمئنید که می‌خواهید از یک کلمه عبور افشا شده استفاده کنید؟"
   },
   "weakAndExposedMasterPassword": {
     "message": "کلمه عبور اصلی ضعیف و افشا شده"
   },
   "weakAndBreachedMasterPasswordDesc": {
-    "message": "کلمه عبور ضعیف شناسایی و در یک نقض داده پیدا شد. از یک کلمه عبور قوی و منحصر به فرد برای محافظت از حساب خود استفاده کنید. آیا مطمئنید که می‌خواهید از این کلمه عبور استفاده کنید؟"
-  },
-  "useThisPassword": {
-    "message": "از این کلمه عبور استفاده کن"
-  },
-  "useThisUsername": {
-    "message": "از این نام کاربری استفاده کن"
+    "message": "کلمه عبور ضعیف شناسایی و در یک افشای داده پیدا شد. از یک کلمه عبور قوی و منحصربه‌فرد برای محافظت از حساب کاربری خود استفاده کنید. آیا مطمئنید که می‌خواهید از این کلمه عبور استفاده کنید؟"
   },
   "checkForBreaches": {
-    "message": "نقض اطلاعات شناخته شده برای این کلمه عبور را بررسی کنید"
+    "message": "بررسی نقض‌های داده شناخته شده برای این کلمه عبور"
   },
   "loggedInExclamation": {
     "message": "وارد شده!"
@@ -3088,10 +3124,10 @@
     }
   },
   "windowsBiometricUpdateWarning": {
-    "message": "Bitwarden توصیه می‌کند که تنظیمات بیومتریک خود را به‌روزرسانی کنید تا در اولین باز کردن قفل، به کلمه عبور اصلی (یا کد پین) نیاز داشته باشید. آیا می‌خواهید تنظیمات خود را اکنون به‌روز کنید؟"
+    "message": "Bitwarden توصیه می‌کند که تنظیمات بیومتریک خود را به‌روزرسانی کنید تا در اولین باز کردن قفل، به کلمه عبور اصلی (یا کد پین) نیاز داشته باشید. آیا می‌خواهید تنظیمات خود را اکنون به‌روزرسانی کنید؟"
   },
   "windowsBiometricUpdateWarningTitle": {
-    "message": "به‌روز رسانی تنظیمات توصیه شده"
+    "message": "به‌روزرسانی تنظیمات توصیه شده"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
     "message": "این دستگاه را به خاطر بسپار تا ورودهای بعدی بدون مشکل انجام شود"
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "درخواست تأیید مدیر"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "منطقه"
   },
@@ -3161,7 +3203,7 @@
     "message": "اعتماد به سازمان"
   },
   "trust": {
-    "message": "اطمینان"
+    "message": "اعتماد"
   },
   "doNotTrust": {
     "message": "اعتماد نکنید"
@@ -3294,7 +3336,7 @@
     "message": "کلید عبور کپی نمی‌شود"
   },
   "passkeyNotCopiedAlert": {
-    "message": "کلید عبور در مورد شبیه سازی شده کپی نمی‌شود. آیا می‌خواهید به شبیه سازی این مورد ادامه دهید؟"
+    "message": "کلید عبور در مورد شبیه‌سازی شده کپی نمی‌شود. آیا می‌خواهید به شبیه‌سازی این مورد ادامه دهید؟"
   },
   "aliasDomain": {
     "message": "دامنه مستعار"
@@ -3343,7 +3385,7 @@
     "message": "خطا در اتصال به سرویس Duo. از روش ورود دو مرحله‌ای دیگری استفاده کنید یا برای دریافت کمک با Duo تماس بگیرید."
   },
   "duoRequiredByOrgForAccount": {
-    "message": "ورود دو مرحله ای Duo برای حساب کاربری شما لازم است."
+    "message": "ورود دو مرحله‌ای Duo برای حساب کاربری شما لازم است."
   },
   "duoTwoFactorRequiredPageSubtitle": {
     "message": "برای حساب کاربری شما ورود دو مرحله‌ای Duo لازم است. مراحل زیر را دنبال کنید تا ورود خود را کامل کنید."
@@ -3432,7 +3474,7 @@
     "message": "داده‌های گاوصندوق برون ریزی شد"
   },
   "multifactorAuthenticationCancelled": {
-    "message": "تایید هویت چند مرحله‌ای کنسل شد"
+    "message": "تأیید هویت چند مرحله‌ای کنسل شد"
   },
   "noLastPassDataFound": {
     "message": "هیچ داده‌ای از LastPass یافت نشد"
@@ -3447,7 +3489,7 @@
     "message": "کد اشتباه است"
   },
   "incorrectPin": {
-    "message": "کد پین نادرست است"
+    "message": "کد پین اشتباه است"
   },
   "multifactorAuthenticationFailed": {
     "message": "احراز هویت چند مرحله‌ای ناموفق بود"
@@ -3508,6 +3550,30 @@
     "message": "فرمت‌های رایج",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "تشخیص تطابق نشانی اینترنتی روشی است که Bitwarden برای شناسایی پیشنهادهای پر کردن خودکار استفاده می‌کند.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"عبارت منظم\" یک گزینه پیشرفته است که خطر افشای اطلاعات ورود را افزایش می‌دهد.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"شروع با\" یک گزینه پیشرفته است که خطر افشای اطلاعات ورود را افزایش می‌دهد.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "اطلاعات بیشتر درباره‌ی تشخیص تطابق",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "موفقیت آمیز بود"
   },
@@ -3576,7 +3642,7 @@
     "message": "ارسال‌های متن"
   },
   "ssoError": {
-    "message": "هیچ پورت رایگانی برای ورود sso یافت نشد."
+    "message": "هیچ پورت آزادی برای ورود sso یافت نشد."
   },
   "securePasswordGenerated": {
     "message": "کلمه عبور ایمن ساخته شد! فراموش نکنید کلمه عبور خود را در وب‌سایت نیز به‌روزرسانی کنید."
@@ -3704,7 +3770,7 @@
     "message": "تغییر کلمه عبور در معرض خطر"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "نمی‌توانید مجموعه‌هایی را که فقط دسترسی مشاهده دارند حذف کنید: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "برای تو در تو کردن یک پوشه، نام پوشه والد را وارد کرده و سپس یک “/” اضافه کنید. مثال: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "اطلاعات حساس را به‌صورت ایمن ارسال کنید",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "پرونده‌ها و داده‌های خود را به‌صورت امن با هر کسی، در هر پلتفرمی به اشتراک بگذارید. اطلاعات شما در حین اشتراک‌گذاری به‌طور کامل رمزگذاری انتها به انتها باقی خواهد ماند و میزان افشا محدود می‌شود.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "ساخت سریع کلمات عبور"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "به‌راحتی کلمات عبور قوی و منحصر به فرد ایجاد کنید با کلیک روی",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "برای کمک به حفظ امنیت ورودهای شما.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "با کلیک روی دکمه تولید رمز عبور، به‌راحتی کلمات عبور قوی و منحصر به‌ فرد ایجاد کنید تا ورودهای شما ایمن باقی بمانند.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "با پر کردن خودکار در وقت خود صرفه جویی کنید"
   },
@@ -3772,5 +3863,139 @@
     "message": "اطلاعات بیشتر درباره عامل SSH را بیاموزید",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "اختصاص به مجموعه‌ها"
+  },
+  "assignToTheseCollections": {
+    "message": "اختصاص به این مجموعه‌ها"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "فقط اعضای سازمانی که به این مجموعه‌ها دسترسی دارند قادر به مشاهده این مورد خواهند بود."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "فقط اعضای سازمانی که به این مجموعه‌ها دسترسی دارند قادر به مشاهده این موارد خواهند بود."
+  },
+  "noCollectionsAssigned": {
+    "message": "هیچ مجموعه‌ای اختصاص داده نشده است"
+  },
+  "assign": {
+    "message": "اختصاص بدهید"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "فقط اعضای سازمانی که به این مجموعه‌ها دسترسی دارند قادر به مشاهده این موارد خواهند بود."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "شما $TOTAL_COUNT$ مورد را انتخاب کرده‌اید. نمی‌توانید $READONLY_COUNT$ مورد را به‌روزرسانی کنید زیرا دسترسی ویرایش ندارید.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "مجموعه‌ها را برای اختصاص انتخاب کنید"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ به طور دائمی به سازمان انتخاب شده منتقل خواهند شد. شما دیگر مالک این موارد نخواهید بود.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ به طور دائمی به $ORG$ منتقل خواهند شد. شما دیگر مالک این موارد نخواهید بود.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "۱ مورد به طور دائمی به سازمان انتخاب شده منتقل خواهد شد. شما دیگر مالک این مورد نخواهید بود."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "۱ مورد به طور دائمی به $ORG$ منتقل خواهد شد. شما دیگر مالک این مورد نخواهید بود.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "مجموعه‌ها با موفقیت اختصاص داده شدند"
+  },
+  "nothingSelected": {
+    "message": "شما چیزی را انتخاب نکرده‌اید."
+  },
+  "itemsMovedToOrg": {
+    "message": "موارد به $ORGNAME$ منتقل شدند",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "مورد به $ORGNAME$ منتقل شد",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "موارد انتخاب شده به $ORGNAME$ منتقل شدند",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/fi/messages.json b/apps/desktop/src/locales/fi/messages.json
index bffa90c8a17..6c13f322aca 100644
--- a/apps/desktop/src/locales/fi/messages.json
+++ b/apps/desktop/src/locales/fi/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Henkilöllisyys"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Salattu muistio"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Muut"
   },
-  "generatePassword": {
-    "message": "Luo salasana"
-  },
-  "generatePassphrase": {
-    "message": "Luo salalause"
-  },
   "type": {
     "message": "Tyyppi"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Tiedoston enimmäiskoko on 500 Mt."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Salausavaimen siirto vaaditaan. Päivitä salausavaimesi kirjautumalla verkkoholviin."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Kansio tallennettiin"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Tiliä on rajoitettu"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Tiedoston salasana\" ja \"Vahvista tiedoston salasana\" eivät täsmää."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Toiminto on suojattu. Jatka vahvistamalla henkilöllisyytesi syöttämällä pääsalasanasi uudelleen."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Pääsalasanasi on vaihdettu"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Pääsalasanasi ei täytä yhden tai useamman organisaatiokäytännön vaatimuksia ja holvin käyttämiseksi sinun on vaihdettava se nyt. Tämä uloskirjaa kaikki nykyiset istunnot pakottaen uudelleenkirjautumisen. Muiden laitteiden aktiiviset istunnot saattavat toimia vielä tunnin ajan."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Organisaatiosi on estänyt luotettavan laitesalauksen. Käytä holviasi asettamalla pääsalasana."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Käyttäjätunnusgeneraattori"
   },
+  "generatePassword": {
+    "message": "Luo salasana"
+  },
+  "generatePassphrase": {
+    "message": "Luo salalause"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Arvon tulee olla väliltä $MIN$—$MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Käytä tätä sähköpostia"
   },
+  "useThisPassword": {
+    "message": "Käytä tätä salasanaa"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Käytä tätä käyttäjätunnusta"
+  },
   "random": {
     "message": "Satunnainen"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Havaittiin heikko ja tietovuodosta löytynyt salasana. Sinun tulisi suojata tilisi vahvalla ja ainutlaatuisella salasanalla. Haluatko varmasti käyttää tätä salasanaa?"
   },
-  "useThisPassword": {
-    "message": "Käytä tätä salasanaa"
-  },
-  "useThisUsername": {
-    "message": "Käytä tätä käyttäjätunnusta"
-  },
   "checkForBreaches": {
     "message": "Tarkasta esiintyykö salasanaa tunnetuissa tietovuodoissa"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Pyydä hyväksyntää ylläpidolta"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Alue"
   },
@@ -3508,6 +3550,30 @@
     "message": "Yleiset muodot",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Onnistui"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Säästä aikaa automaattitäytöllä"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/fil/messages.json b/apps/desktop/src/locales/fil/messages.json
index 74c886a98b6..cfa39fd71f3 100644
--- a/apps/desktop/src/locales/fil/messages.json
+++ b/apps/desktop/src/locales/fil/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Pagkakakilanla"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Secure na tala"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Iba pa"
   },
-  "generatePassword": {
-    "message": "Magtatag ng Password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Uri"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum na laki ng file ay 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Nai-save na folder"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Ang pagkilos na ito ay protektado. Upang magpatuloy, mangyaring ipasok muli ang iyong master password upang i verify ang iyong pagkakakilanlan."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "I-update ang master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Magtatag ng Password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Mahinang password na nakilala at nakita sa data breach. Gamitin ang malakas at natatanging password upang makaproteksyon sa iyong account. Sigurado ka ba na gusto mong gamitin ang password na ito?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Tingnan ang kilalang breaches ng data para sa password na ito"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/fr/messages.json b/apps/desktop/src/locales/fr/messages.json
index 2c53c0652bd..387c25ec44c 100644
--- a/apps/desktop/src/locales/fr/messages.json
+++ b/apps/desktop/src/locales/fr/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identité"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Note sécurisée"
   },
@@ -229,7 +232,7 @@
     "message": "La demande de clé SSH a expiré."
   },
   "enableSshAgent": {
-    "message": "Activez l'agent SSH"
+    "message": "Activer l'agent SSH"
   },
   "enableSshAgentDesc": {
     "message": "Activez l'agent SSH pour signer les demandes SSH directement depuis votre coffre Bitwarden."
@@ -238,22 +241,22 @@
     "message": "L'agent SSH est un service - destiné aux développeurs - qui vous permet de signer des demandes SSH directement depuis votre coffre Bitwarden."
   },
   "sshAgentPromptBehavior": {
-    "message": "Ask for authorization when using SSH agent"
+    "message": "Demander une autorisation lors de l’utilisation de l’agent SSH"
   },
   "sshAgentPromptBehaviorDesc": {
-    "message": "Choose how to handle SSH-agent authorization requests."
+    "message": "Choisir comment gérer les demandes d'autorisation de l'agent SSH."
   },
   "sshAgentPromptBehaviorHelp": {
-    "message": "Remember SSH authorizations"
+    "message": "Se souvenir des autorisations SSH"
   },
   "sshAgentPromptBehaviorAlways": {
-    "message": "Always"
+    "message": "Toujours"
   },
   "sshAgentPromptBehaviorNever": {
-    "message": "Never"
+    "message": "Jamais"
   },
   "sshAgentPromptBehaviorRememberUntilLock": {
-    "message": "Remember until vault is locked"
+    "message": "Se souvenir jusqu’au verrouillage du coffre"
   },
   "premiumRequired": {
     "message": "Premium requis"
@@ -351,12 +354,6 @@
   "other": {
     "message": "Autre"
   },
-  "generatePassword": {
-    "message": "Générer un mot de passe"
-  },
-  "generatePassphrase": {
-    "message": "Générer une phrase de passe"
-  },
   "type": {
     "message": "Type"
   },
@@ -446,10 +443,10 @@
     "message": "Ajouter un champ"
   },
   "editField": {
-    "message": "Edit field"
+    "message": "Modifier le champ"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "Êtes-vous sûr de vouloir supprimer définitivement cette pièce jointe ?"
   },
   "fieldType": {
     "message": "Type de champ"
@@ -461,19 +458,19 @@
     "message": "Ajouter"
   },
   "textHelpText": {
-    "message": "Utiliser des champs de texte pour les données comme les questions de sécurité"
+    "message": "Utilisez des champs de texte pour les données comme les questions de sécurité"
   },
   "hiddenHelpText": {
-    "message": "Utiliser des champs cachés pour des données sensibles comme un mot de passe"
+    "message": "Utilisez des champs cachés pour des données sensibles comme un mot de passe"
   },
   "checkBoxHelpText": {
-    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+    "message": "Utilisez les cases à cocher si vous souhaitez remplir automatiquement la case à cocher d'un formulaire, comme la case se souvenir du courriel"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "Utilisez un champ lié lorsque vous rencontrez des problèmes de saisie automatique pour un site Web spécifique."
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "Entrer l'identifiant html, le nom, l'étiquette aria ou l'espace réservé du champ."
   },
   "folder": {
     "message": "Dossier"
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "La taille maximale du fichier est de 500 Mo."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Migration de la clé de chiffrement nécessaire. Veuillez vous connecter sur le coffre web pour mettre à jour votre clé de chiffrement."
+  "legacyEncryptionUnsupported": {
+    "message": "L'ancien chiffrement n'est plus pris en charge. Veuillez contacter le support pour récupérer votre compte."
   },
   "editedFolder": {
     "message": "Dossier enregistré"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Compte restreint"
   },
+  "restrictCardTypeImport": {
+    "message": "Impossible d'importer les types de l'élément de la carte"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Une politique de sécurité définie par une organisation ou plus vous empêche d'importer des cartes dans vos coffres."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "Le \"Mot de passe du fichier\" et la \"Confirmation du mot de passe du fichier\" ne correspondent pas."
   },
@@ -1967,10 +1970,10 @@
     }
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "Détails de la carte de paiement"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "Détails de la carte $BRAND$",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -1979,32 +1982,32 @@
     }
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "En savoir plus sur les authentificateurs"
   },
   "copyTOTP": {
-    "message": "Copy Authenticator key (TOTP)"
+    "message": "Copier la clé Authenticator (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "Rendre la vérification en deux étapes transparente"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden peut stocker et remplir des codes de vérification en 2 étapes. Copiez et collez la clé dans ce champ."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden peut stocker et remplir des codes de vérification en 2 étapes. Sélectionnez l'icône caméra pour prendre une capture d'écran du code QR de l'authentificateur de ce site Web, ou copiez et collez la clé dans ce champ."
   },
   "premium": {
     "message": "Premium",
     "description": "Premium membership"
   },
   "freeOrgsCannotUseAttachments": {
-    "message": "Free organizations cannot use attachments"
+    "message": "Les organisations gratuites ne peuvent pas utiliser de pièces jointes"
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "1 champ nécessite votre attention."
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "$COUNT$ champs nécessitent votre attention.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2013,10 +2016,10 @@
     }
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Carte de paiement expirée"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "Si vous l'avez renouvelée, mettez à jour les informations de la carte de paiement"
   },
   "verificationRequired": {
     "message": "Vérification requise",
@@ -2176,7 +2179,7 @@
     "message": "En raison d'une politique d'entreprise, il vous est interdit d'enregistrer des éléments dans votre coffre personnel. Sélectionnez une organisation dans l'option Propriété et choisissez parmi les collections disponibles."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Votre nouveau mot de passe ne peut être le même que votre mot de passe actuel."
   },
   "hintEqualsPassword": {
     "message": "Votre indice de mot de passe ne peut pas être identique à votre nom d'utilisateur."
@@ -2188,13 +2191,13 @@
     "message": "Une politique d'organisation a bloqué l'import d'éléments dans votre coffre personel."
   },
   "personalDetails": {
-    "message": "Personal details"
+    "message": "Détails personnels"
   },
   "identification": {
     "message": "Identification"
   },
   "contactInfo": {
-    "message": "Contact information"
+    "message": "Informations de contact"
   },
   "allSends": {
     "message": "Tous les Sends",
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Cette action est protégée. Pour continuer, veuillez saisir à nouveau votre mot de passe principal pour vérifier votre identité."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Mot de passe principal défini avec succès"
+  },
   "updatedMasterPassword": {
     "message": "Mot de passe principal mis à jour"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Votre mot de passe principal ne répond pas aux exigences de politique de sécurité de cette organisation. Pour pouvoir accéder au coffre, vous devez mettre à jour votre mot de passe principal dès maintenant. En poursuivant, vous serez déconnecté de votre session actuelle et vous devrez vous reconnecter. Les sessions actives sur d'autres appareils peuver rester actives pendant encore une heure."
   },
+  "changePasswordWarning": {
+    "message": "Après avoir changé votre mot de passe, vous devrez vous connecter avec votre nouveau mot de passe. Les sessions actives sur d'autres appareils seront déconnectées dans un délai d'une heure."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Changez votre mot de passe principal pour terminer la récupération du compte."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Votre mot de passe principal ne répond pas aux exigences de cette organisation. Changez votre mot de passe principal pour continuer."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Votre organisation a désactivé le chiffrement des appareils de confiance. Veuillez définir un mot de passe principal pour accéder à votre coffre."
   },
@@ -2513,13 +2528,13 @@
     "message": "Mot de passe principal supprimé"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Un mot de passe maître n'est plus requis pour les membres de l'organisation suivante. Veuillez confirmer le domaine ci-dessous avec l'administrateur de votre organisation."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Nom de l'organisation"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Domaine Key Connector"
   },
   "leaveOrganization": {
     "message": "Quitter l'organisation"
@@ -2582,7 +2597,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "Seuls les éléments individuels du coffre et les pièces jointes associées à $EMAIL$ seront exportés. Les éléments du coffre de l'organisation ne seront pas inclus",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2631,7 +2646,25 @@
     "message": "Générer un courriel"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Générateur de nom d'utilisateur"
+  },
+  "generatePassword": {
+    "message": "Générer un mot de passe"
+  },
+  "generatePassphrase": {
+    "message": "Générer une phrase de passe"
+  },
+  "passwordGenerated": {
+    "message": "Mot de passe généré"
+  },
+  "passphraseGenerated": {
+    "message": "Phrase de passe générée"
+  },
+  "usernameGenerated": {
+    "message": "Nom d'utilisateur généré"
+  },
+  "emailGenerated": {
+    "message": "Courriel généré"
   },
   "spinboxBoundariesHint": {
     "message": "La valeur doit être comprise entre $MIN$ et $MAX$.",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Utiliser ce courriel"
   },
+  "useThisPassword": {
+    "message": "Utiliser ce mot de passe"
+  },
+  "useThisPassphrase": {
+    "message": "Utiliser cette phrase de passe"
+  },
+  "useThisUsername": {
+    "message": "Utiliser ce nom d'utilisateur"
+  },
   "random": {
     "message": "Aléatoire"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Mot de passe faible identifié et trouvé dans une brèche de données. Utilisez un mot de passe robuste et unique pour protéger votre compte. Êtes-vous sûr de vouloir utiliser ce mot de passe ?"
   },
-  "useThisPassword": {
-    "message": "Utiliser ce mot de passe"
-  },
-  "useThisUsername": {
-    "message": "Utiliser ce nom d'utilisateur"
-  },
   "checkForBreaches": {
     "message": "Vérifier les brèches de données connues pour ce mot de passe"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Demander l'approbation de l'administrateur"
   },
+  "unableToCompleteLogin": {
+    "message": "Impossible de compléter la connexion"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Vous devez vous connecter sur un appareil de confiance ou demander à votre administrateur de vous assigner un mot de passe."
+  },
   "region": {
     "message": "Région"
   },
@@ -3158,28 +3200,28 @@
     "message": "Appareil de confiance"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Faire confiance à l'organisation"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Faire confiance"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Ne pas faire confiance"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "L'organisation n'est pas fiable"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Pour la sécurité de votre compte, confirmez seulement si vous avez accordé l'accès d'urgence à cet utilisateur et que sa phrase d'empreinte correspond à ce qui est affiché dans son compte"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Pour la sécurité de votre compte, continuez seulement si vous êtes un membre de cette organisation, avez la récupération de compte activée et que la phrase d'empreinte correspond à celle de l'organisation."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Cette organisation a une politique de sécurité Entreprise qui vous inscrira dans la récupération de votre compte. L'inscription permettra aux administrateurs de l'organisation de changer votre mot de passe. Continuez seulement si vous reconnaissez cette organisation et que la phrase d'empreinte affichée ci-dessous correspond à l'empreinte de l'organisation."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Faire confiance à l'utilisateur"
   },
   "inputRequired": {
     "message": "Saisie requise."
@@ -3352,7 +3394,7 @@
     "message": "Suivez les étapes ci-dessous afin de réussir à vous connecter."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Suivez les étapes ci-dessous pour terminer la connexion avec votre clé de sécurité."
   },
   "launchDuo": {
     "message": "Lancer Duo dans le navigateur"
@@ -3508,6 +3550,30 @@
     "message": "Formats communs",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "La détection de correspondance d'URI est la façon dont Bitwarden identifie les suggestions de remplissage automatique.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "« Expression régulière » est une option avancée avec un risque accru d'exposer les identifiants.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "« Commence par » est une option avancée avec un risque accru d'exposer les identifiants.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "En savoir plus sur la détection de correspondance",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Succès"
   },
@@ -3579,14 +3645,14 @@
     "message": "Aucun port libre n’a pu être trouvé pour la connexion SSO."
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "Mot de passe sécurisé généré ! N'oubliez pas aussi de mettre à jour votre mot de passe sur le site Web."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Utiliser le générateur",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "pour créer un mot de passe fort unique",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "biometricsStatusHelptextUnlockNeeded": {
@@ -3614,25 +3680,25 @@
     "message": "Le déverrouillage par biométrie n'est pas disponible actuellement pour une raison inconnue."
   },
   "itemDetails": {
-    "message": "Item details"
+    "message": "Détails de l’élément"
   },
   "itemName": {
-    "message": "Item name"
+    "message": "Nom de l’élément"
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "Identifiants de connexion"
   },
   "additionalOptions": {
-    "message": "Additional options"
+    "message": "Options supplémentaires"
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "Historique de l’élément"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "Dernière modification"
   },
   "upload": {
-    "message": "Upload"
+    "message": "Téléverser"
   },
   "authorize": {
     "message": "Autoriser"
@@ -3704,7 +3770,7 @@
     "message": "Changer le mot de passe à risque"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Vous ne pouvez pas supprimer des collections avec les autorisations d'affichage uniquement : $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3713,64 +3779,223 @@
     }
   },
   "move": {
-    "message": "Move"
+    "message": "Déplacer"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Nouveau dossier"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "Nom de dossier"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Imbriquer un dossier en ajoutant le nom du dossier parent suivi d'un « / ». Exemple : Sociaux/Forums"
+  },
+  "sendsTitleNoItems": {
+    "message": "Envoyez des informations sensibles, en toute sécurité",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Partagez des fichiers et des données en toute sécurité avec n'importe qui, sur n'importe quelle plateforme. Vos informations resteront chiffrées de bout en bout tout en limitant l'exposition.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Créer rapidement des mots de passe"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Créez facilement des mots de passe forts et uniques en cliquant sur",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "pour vous aider à garder vos identifiants sécuritaires.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Créez facilement des mots de passe forts et uniques en cliquant sur le bouton Générer un mot de passe pour vous aider à garder vos identifiants sécuritaires.",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Gagnez du temps avec le remplissage automatique"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Inclure un",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "site web",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "pour que cet identifiant apparaisse comme une suggestion de remplissage automatique.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Paiement en ligne transparent"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Avec les cartes, remplissez facilement les formulaires de paiement en toute sécurité et avec précision."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Simplifier la création de comptes"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Avec les identités, remplissez rapidement de longs formulaires d'inscription ou de contact."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Gardez vos données sensibles en sécurité"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Avec les notes, conservez en toute sécurité des données sensibles comme les informations bancaires ou d'assurances."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Accès SSH convivial pour les développeurs"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Enregistrez vos clés et connectez-vous avec l’agent SSH pour une authentification rapide et chiffrée.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "En savoir plus sur l’agent SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assigner aux collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assigner à ces collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Seuls les membres de l'organisation ayant accès à ces collections pourront voir l'élément."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Seuls les membres de l'organisation ayant accès à ces collections pourront voir les éléments."
+  },
+  "noCollectionsAssigned": {
+    "message": "Aucune collection n'a été assignée"
+  },
+  "assign": {
+    "message": "Assigner"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Seuls les membres de l'organisation ayant accès à ces collections pourront voir les éléments."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Vous avez sélectionné $TOTAL_COUNT$ éléments. Vous ne pouvez pas mettre à jour $READONLY_COUNT$ de ces éléments parce que vous n'avez pas les autorisations pour les éditer.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Sélectionnez les collections à assigner"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ seront transférés à l'organisation sélectionnée de façon permanente. Vous ne serez plus propriétaire de ces éléments.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ seront transférés à $ORG$ de façon permanente. Vous ne serez plus propriétaire de ces éléments.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "Un élément sera transféré définitivement à l'organisation sélectionnée. Vous ne serez plus le propriétaire de cet élément."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "Un élément sera transféré définitivement à $ORG$. Vous ne serez plus le propriétaire de cet élément.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Collections assignées avec succès"
+  },
+  "nothingSelected": {
+    "message": "Vous n'avez rien sélectionné."
+  },
+  "itemsMovedToOrg": {
+    "message": "Éléments déplacés vers $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Élément déplacé vers $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Les éléments sélectionnés ont été déplacés vers $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/gl/messages.json b/apps/desktop/src/locales/gl/messages.json
index 17495f96785..304d07ee3cd 100644
--- a/apps/desktop/src/locales/gl/messages.json
+++ b/apps/desktop/src/locales/gl/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identity"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Secure note"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Other"
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/he/messages.json b/apps/desktop/src/locales/he/messages.json
index 3999caa1bbd..11a736eeaaa 100644
--- a/apps/desktop/src/locales/he/messages.json
+++ b/apps/desktop/src/locales/he/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "זהות"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "פתק מאובטח"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "אחר"
   },
-  "generatePassword": {
-    "message": "צור סיסמה"
-  },
-  "generatePassphrase": {
-    "message": "צור ביטוי סיסמה"
-  },
   "type": {
     "message": "סוג"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "גודל הקובץ המירבי הוא 500 מגה."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "נדרשת הגירת מפתח הצפנה. נא להיכנס דרך כספת הרשת כדי לעדכן את מפתח ההצפנה שלך."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "תיקייה שנשמרה"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "מוגבל חשבון"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"סיסמת קובץ\"  ו\"אשר סיסמת קובץ\" אינם תואמים."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "פעולה זו מוגנת. כדי להמשיך, הזן מחדש את הסיסמה הראשית שלך כדי לאמת את זהותך."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "סיסמה ראשית עודכנה"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "הסיסמה הראשית שלך אינה עומדת באחת או יותר מפוליסות הארגון שלך. כדי לגשת לכספת, אתה מוכרח לעדכן את הסיסמה הראשית שלך עכשיו. בהמשך תנותק מההפעלה הנוכחית שלך, מה שידרוש ממך להיכנס חזרה. הפעלות פעילות במכשירים אחרים עלולות להישאר פעילות למשך עד שעה אחת."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "הארגון שלך השבית הצפנת מכשיר מהימן. נא להגדיר סיסמה ראשית כדי לגשת לכספת שלך."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "צור סיסמה"
+  },
+  "generatePassphrase": {
+    "message": "צור ביטוי סיסמה"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "הערך חייב להיות בין $MIN$ ל־$MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "השתמש בדוא\"ל זה"
   },
+  "useThisPassword": {
+    "message": "השתמש בסיסמה זו"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "השתמש בשם משתמש זה"
+  },
   "random": {
     "message": "אקראי"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "סיסמה חלשה זוהתה ונמצאה בפרצת נתונים. השתמש בסיסמה חזקה וייחודית כדי להגן על חשבונך. האם אתה בטוח שאתה רוצה להשתמש בסיסמה זו?"
   },
-  "useThisPassword": {
-    "message": "השתמש בסיסמה זו"
-  },
-  "useThisUsername": {
-    "message": "השתמש בשם משתמש זה"
-  },
   "checkForBreaches": {
     "message": "בדוק פרצות נתונים ידועות עבור סיסמה זו"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "בקש אישור מנהל"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "אזור"
   },
@@ -3508,6 +3550,30 @@
     "message": "פורמטים נפוצים",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "הצלחה"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/hi/messages.json b/apps/desktop/src/locales/hi/messages.json
index 292e1c4b7d2..3d3a2c4d701 100644
--- a/apps/desktop/src/locales/hi/messages.json
+++ b/apps/desktop/src/locales/hi/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identity"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Secure note"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Other"
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/hr/messages.json b/apps/desktop/src/locales/hr/messages.json
index cf90703a438..699e4ad347d 100644
--- a/apps/desktop/src/locales/hr/messages.json
+++ b/apps/desktop/src/locales/hr/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identitet"
   },
+  "typeNote": {
+    "message": "Bilješka"
+  },
   "typeSecureNote": {
     "message": "Sigurna bilješka"
   },
@@ -238,22 +241,22 @@
     "message": "SSH agent je servis namijenjen developerima koji omogućuje potpisivanje SSH zahtjeva izravno iz tvojeg Bitwarden trezora."
   },
   "sshAgentPromptBehavior": {
-    "message": "Ask for authorization when using SSH agent"
+    "message": "Zahtjevaj autorizaciju pri korištenju SSH agenta"
   },
   "sshAgentPromptBehaviorDesc": {
-    "message": "Choose how to handle SSH-agent authorization requests."
+    "message": "Odaberi kako će se postupati sa zahtjevima za autorizaciju SSH agenta."
   },
   "sshAgentPromptBehaviorHelp": {
-    "message": "Remember SSH authorizations"
+    "message": "Zapamti SSH autorizaciju"
   },
   "sshAgentPromptBehaviorAlways": {
-    "message": "Always"
+    "message": "Uvijek"
   },
   "sshAgentPromptBehaviorNever": {
-    "message": "Never"
+    "message": "Nikad"
   },
   "sshAgentPromptBehaviorRememberUntilLock": {
-    "message": "Remember until vault is locked"
+    "message": "Zapamti do zaključavanja trezora"
   },
   "premiumRequired": {
     "message": "Potrebno Premium članstvo"
@@ -351,12 +354,6 @@
   "other": {
     "message": "Ostalo"
   },
-  "generatePassword": {
-    "message": "Generiraj lozinku"
-  },
-  "generatePassphrase": {
-    "message": "Generiraj fraznu lozinku"
-  },
   "type": {
     "message": "Vrsta"
   },
@@ -412,16 +409,16 @@
     "message": "Ključ autentifikatora (TOTP)"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "Ključ autentifikatora"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "Postavke auto-ispune"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "Web stranica (URI)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "Broj URI-ja: $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -431,49 +428,49 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Web stranica dodana"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "Dodaj web stranicu"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "Izbriši web stranicu"
   },
   "owner": {
-    "message": "Owner"
+    "message": "Vlasnik"
   },
   "addField": {
-    "message": "Add field"
+    "message": "Dodaj polje"
   },
   "editField": {
-    "message": "Edit field"
+    "message": "Uredi polje"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "Sigurno želiš trajno izbrisati ovaj privitak?"
   },
   "fieldType": {
-    "message": "Field type"
+    "message": "Vrsta polja"
   },
   "fieldLabel": {
-    "message": "Field label"
+    "message": "Oznaka polja"
   },
   "add": {
-    "message": "Add"
+    "message": "Dodaj"
   },
   "textHelpText": {
-    "message": "Use text fields for data like security questions"
+    "message": "Koristi tekstualna polja za podatke poput sigurnosnih pitanja"
   },
   "hiddenHelpText": {
-    "message": "Use hidden fields for sensitive data like a password"
+    "message": "Koristi skrivena polja za osjetljive podatke poput lozinke"
   },
   "checkBoxHelpText": {
-    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+    "message": "Koristi potvrdne okvire ako ih želiš auto-ispuniti u obrascu, npr. zapamti adresu e-pošte"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "Koristi povezano polje kada imaš problema s auto-ispunom za određenu web stranicu."
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "Unesi html id polja, naziv, aria-label ili rezervirano mjesto."
   },
   "folder": {
     "message": "Mapa"
@@ -501,7 +498,7 @@
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "cfTypeCheckbox": {
-    "message": "Checkbox"
+    "message": "Potvrdni okvir"
   },
   "linkedValue": {
     "message": "Povezana vrijednost",
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Najveća veličina datoteke je 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Potrebna je migracija ključa za šifriranje. Prijavi se na web trezoru za ažuriranje ključa za šifriranje."
+  "legacyEncryptionUnsupported": {
+    "message": "Zastarjelo šifriranje više nije podržano. Obrati se podršci za oporavak računa."
   },
   "editedFolder": {
     "message": "Mapa spremljena"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Račun ograničen"
   },
+  "restrictCardTypeImport": {
+    "message": "Ne mogu uvesti stavke vrste Platna kartica"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Pravila jedne ili više organizacija onemogućuju uvoz stavke vrste Platna kartica u tvoj trezor."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "Lozinka se ne podudara."
   },
@@ -1967,10 +1970,10 @@
     }
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "Detalji kartice"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "$BRAND$ detalji",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -1979,32 +1982,32 @@
     }
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "Više o autentifikatorima"
   },
   "copyTOTP": {
-    "message": "Copy Authenticator key (TOTP)"
+    "message": "Kopiraj ključ autentifikatora (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "Učini dvostruku autentifikaciju besprijekornom"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden može pohraniti i ispuniti kodove za dvostruku autentifikaciju. Kopiraj i zalijepi ključ u ovo polje."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden može pohraniti i ispuniti kodove provjeru dvostruke autentifikacije. Odaberi ikonu kamere i označi QR kôd za provjeru autentičnosti ove web stranice ili kopiraj i zalijepi ključ u ovo polje."
   },
   "premium": {
     "message": "Premium",
     "description": "Premium membership"
   },
   "freeOrgsCannotUseAttachments": {
-    "message": "Free organizations cannot use attachments"
+    "message": "Besplatne organizacije ne mogu koristiti privitke"
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "1 polje treba tvoju pažnju."
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "$COUNT$ polja treba(ju) tvoju pažnju.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2013,10 +2016,10 @@
     }
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Istekla kartica"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "Ako je obnovljeno, ažuriraj podatke o kartici"
   },
   "verificationRequired": {
     "message": "Potrebna je potvrda",
@@ -2176,7 +2179,7 @@
     "message": "Pravila tvrtke onemogućuju spremanje stavki u osobni trezor. Promijeni vlasništvo stavke na tvrtku i odaberi dostupnu Zbirku."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Tvoja nova lozinka ne može biti ista kao tvoja trenutna lozinka."
   },
   "hintEqualsPassword": {
     "message": "Podsjetnik za lozinku ne može biti isti kao lozinka."
@@ -2188,13 +2191,13 @@
     "message": "Organizacijsko pravilo onemogućuje uvoz stavki u tvoj osobni trezor."
   },
   "personalDetails": {
-    "message": "Personal details"
+    "message": "Osobni podaci"
   },
   "identification": {
-    "message": "Identification"
+    "message": "Identifikacija"
   },
   "contactInfo": {
-    "message": "Contact information"
+    "message": "Kontaktne informacije"
   },
   "allSends": {
     "message": "Svi Sendovi",
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Ova radnja je zaštićena. Za nastavak i potvrdu identiteta, unesi svoju glavnu lozinku."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Glavna lozinka uspješno postavljena"
+  },
   "updatedMasterPassword": {
     "message": "Glavna lozinka ažurirana"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Tvoja glavna lozinka ne zadovoljava pravila ove organizacije. Za pristup trezoru moraš odmah ažurirati svoju glavnu lozinku. Ako nastaviš, odjaviti ćeš se iz trenutne sesije te ćeš se morati ponovno prijaviti. Aktivne sesije na drugim uređajima mogu ostati aktivne do jedan sat."
   },
+  "changePasswordWarning": {
+    "message": "Nakon promjene lozinke, moraš se prijaviti s novom lozinkom. Aktivne sesije na drugim uređajima bit će odjavljene u roku od jednog sata."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Promijeni svoju glavnu lozinku za dovršetak oporavka računa."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Tvoja glavna lozinka ne ispunjava zahtjeve ove organizacije. Promijeni glavnu lozinku za nastavak."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Tvoja je organizacija onemogućila šifriranje pouzdanog uređaja. Postavi glavnu lozinku za pristup svom trezoru."
   },
@@ -2513,13 +2528,13 @@
     "message": "Glavna lozinka uklonjena."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Glavna lozinka više nije obavezna za članove ove organizacije. Provjeri prikazanu domenu sa svojim administratorom."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Naziv Organizacije"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Domena konektora ključa"
   },
   "leaveOrganization": {
     "message": "Napusti organizaciju"
@@ -2631,7 +2646,25 @@
     "message": "Generiraj e-poštu"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Generator korisničkih imena"
+  },
+  "generatePassword": {
+    "message": "Generiraj lozinku"
+  },
+  "generatePassphrase": {
+    "message": "Generiraj fraznu lozinku"
+  },
+  "passwordGenerated": {
+    "message": "Lozinka generirana"
+  },
+  "passphraseGenerated": {
+    "message": "Frazna lozinka generirana"
+  },
+  "usernameGenerated": {
+    "message": "Korisničko ime generirano"
+  },
+  "emailGenerated": {
+    "message": "e-pošta generirana"
   },
   "spinboxBoundariesHint": {
     "message": "Vrijednost mora biti u rasponu $MIN$ - $MAX$.",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Koristi ovu e-poštu"
   },
+  "useThisPassword": {
+    "message": "Koristi ovu lozinku"
+  },
+  "useThisPassphrase": {
+    "message": "Koristi ovu fraznu lozinku"
+  },
+  "useThisUsername": {
+    "message": "Koristi ovo korisničko ime"
+  },
   "random": {
     "message": "Nasumično"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Slaba lozinka je nađena među ukradenima tijekom krađa podataka. Za zaštitu svog računa koristi jaku i jedinstvenu lozinku. Želiš li svejedno korisiti slabu, ukradenu lozinku?"
   },
-  "useThisPassword": {
-    "message": "Koristi ovu lozinku"
-  },
-  "useThisUsername": {
-    "message": "Koristi ovo korisničko ime"
-  },
   "checkForBreaches": {
     "message": "Provjeri je li lozinka ukradena prilikom krađe podataka"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Zatraži odobrenje administratora"
   },
+  "unableToCompleteLogin": {
+    "message": "Nije moguće dovršiti prijavu"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Moraš se prijaviti na pouzdanom uređaju ili zamoliti administratora da ti dodijeli lozinku."
+  },
   "region": {
     "message": "Regija"
   },
@@ -3158,28 +3200,28 @@
     "message": "Uređaj pouzdan"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Vjeruj organizaciji"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Vjeruj"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Nemoj vjerovati"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Organizacija nije pouzdana"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Radi sigurnosti tvojeg računa, potvrdi samo ako je ovom korisniku odobren pristup u hitnim slučajevima i ako se otisak prsta podudara s onim prikazanim u računu"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Radi sigurnosti tvojeg računa, nastavi samo ako si član ove organizacije, imaš omogućen oporavak računa i otisak prsta prikazan u nastavku odgovara otisku prsta organizacije."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Ova organizacija ima poslovno pravilo koje će te prijaviti za oporavak računa. Prijava će omogućiti administratorima organizacije da promijene tvoju lozinku. Nastavi samo ako prepoznaješ ovu organizaciju i ako se fraza otiska prsta prikazana u nastavku podudara s otiskom prsta organizacije."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Vjeruj korisniku"
   },
   "inputRequired": {
     "message": "Potreban je unos."
@@ -3352,7 +3394,7 @@
     "message": "Prati korake za dovršetak prijave."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Prati korake za dovršetak prijave svojim sigurnosnim ključem."
   },
   "launchDuo": {
     "message": "Pokreni Duo u pregledniku"
@@ -3508,6 +3550,30 @@
     "message": "Uobičajeni oblici",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Otkrivanje podudaranja URI-ja je način na koji Bitwarden identificira prijedloge za auto-ispunu.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "„Regularni izraz” je napredna mogućnost s povećanim rizikom od otkrivanja vjerodajnica.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "„Počinje s” je napredna mogućnost s povećnim rizikom od otkrivanja vjerodajnica.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Više o otkrivanju podudaranja",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Napredne mogućnosti",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Upozorenje",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Uspješno"
   },
@@ -3579,14 +3645,14 @@
     "message": "Nisu nađeni slobodni portovi za SSO prijavu."
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "Sigurna lozinka generirana! Ne zaboravi ažurirati lozinku na web stranici."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Koristi generator",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "za stvaranje snažne, jedinstvene lozinke",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "biometricsStatusHelptextUnlockNeeded": {
@@ -3614,25 +3680,25 @@
     "message": "Biometrijsko otključavanje trenutno nije dostupno iz nepoznatog razloga."
   },
   "itemDetails": {
-    "message": "Item details"
+    "message": "Detalji stavke"
   },
   "itemName": {
-    "message": "Item name"
+    "message": "Naziv stavke"
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "Vjerodajnice za prijavu"
   },
   "additionalOptions": {
-    "message": "Additional options"
+    "message": "Dodatne mogućnosti"
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "Povijest stavke"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "Zadnje uređeno"
   },
   "upload": {
-    "message": "Upload"
+    "message": "Prijenos"
   },
   "authorize": {
     "message": "Autoriziraj"
@@ -3704,7 +3770,7 @@
     "message": "Promijeni rizičnu lozinku"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "S dopuštenjima samo za prikaz ne možeš ukloniti zbirke: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3713,64 +3779,223 @@
     }
   },
   "move": {
-    "message": "Move"
+    "message": "Premjesti"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Nova mapa"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "Naziv mape"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Ugnijezdi mapu dodavanjem naziva roditeljske mape i znaka kroz. Npr. Mreže/Forumi"
+  },
+  "sendsTitleNoItems": {
+    "message": "Sigurno pošalji osjetljive podatke",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Sigurno dijeli datoteke i podatke s bilo kime, na bilo kojoj platformi. Tvoji podaci ostaju kriptirani uz ograničenje izloženosti.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Brzo stvori lozinke"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Jednostavno stvori jake i jedinstvene lozinke odabirom tipke",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "kako bi tvoje prijave ostale sigurne.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Jednostavno stvori jake i sigurne lozinke odabirom tipke Generiraj lozinku kako bi tvoje prijave ostale sigurne.",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Uštedi vrijeme s auto-ispunom"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Uključi",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "web stranicu",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "kako bi ova prijava bila predložena u auto-ispuni.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Jednostavna online kupnja"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "S karticama jednostavno i sigurno automatski ispunjavaš obrasce za plaćanje."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Pojednostavi stvaranje računa"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "S identitetima brzo automatski ispunjavaš duge registracijske i kontaktne obrasce."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Čuvaj svoje osjetljive podatke na sigurnom"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "S bilješkama sigurno pohrani svoje osjetljive podatke poput podataka o banci ili osiguranju."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "SSH pristup prilagođen programerima"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Pohrani svoje ključeve i poveži se sa SSH agentom za brzu, šifriranu autentifikaciju.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Saznaj više o SSH agentu",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Dodijeli zbirkama"
+  },
+  "assignToTheseCollections": {
+    "message": "Dodijeli ovim zbirkama"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Stavku će moći vidjeti samo članovi organizacije s pristupom ovim zbirkama."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Stavke će moći vidjeti samo članovi organizacije s pristupom ovim zbirkama."
+  },
+  "noCollectionsAssigned": {
+    "message": "Niti jedna zbirka nije dodijeljena"
+  },
+  "assign": {
+    "message": "Dodijeli"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Stavke će moći vidjeti samo članovi organizacije s pristupom ovim zbirkama."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Odabrano je $TOTAL_COUNT$ stavki. Nije moguće ažurirati $READONLY_COUNT$ stavki jer nemaš dopuštenje za uređivanje.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Odaberi zbirke za dodjelu"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ stavke/i će biti trajno preneseno u odabranu organizaciju. Više nećeš posjedovati ove stavke.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ stavke/i će biti trajno prenesene u $ORG$. Više nećeš posjedovati ove stavke.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 stavka će biti trajno prenesena u odabranu organizaciju. Više nećeš posjedovati ovu stavku."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 stavka će biti trajno prenesena u $ORG$. Više nećeš posjedovati ovu stavku.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Zbirke uspješno dodijeljene"
+  },
+  "nothingSelected": {
+    "message": "Ništa nije odabrano."
+  },
+  "itemsMovedToOrg": {
+    "message": "Stavke premještene u $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Stavka premještena u $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Odabrane stavke premještene u $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/hu/messages.json b/apps/desktop/src/locales/hu/messages.json
index f7eb77766c1..cd30ee6edaa 100644
--- a/apps/desktop/src/locales/hu/messages.json
+++ b/apps/desktop/src/locales/hu/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Személyazonosság"
   },
+  "typeNote": {
+    "message": "Jegyzet"
+  },
   "typeSecureNote": {
     "message": "Biztonságos jegyzet"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Egyéb"
   },
-  "generatePassword": {
-    "message": "Jelszó generálása"
-  },
-  "generatePassphrase": {
-    "message": "Jelmondat generálás"
-  },
   "type": {
     "message": "Típus"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximális fájl méret 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Titkosítási kulcs migráció szükséges. Jelentkezzünk be a webes széfen keresztül a titkosítási kulcs frissítéséhez."
+  "legacyEncryptionUnsupported": {
+    "message": "A régi titkosítás már nem támogatott. Lépjünk kapcsolatba a támogatással a fiók helyreállításához."
   },
   "editedFolder": {
     "message": "A mappa mentésre került."
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Korlátozott fiók"
   },
+  "restrictCardTypeImport": {
+    "message": "A kártya elem típusokat nem lehet importálni."
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Egy vagy több szervezet által beállított szabályzat megakadályozza a kártyák importálását a széfekbe."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "A “Fájl jelszó”  és a  “Fájl jelszó megerősítés“ nem egyezik."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Ez a művelet védett. A folytatásért ismételten meg kell adni a mesterjelszőt az személyazonosság ellenőrzéséhez."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "A mesterjelszó sikeresen beállításra került."
+  },
   "updatedMasterPassword": {
     "message": "A mesterjelszó frisstésre került."
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "A mesterjelszó nem felel meg egy vagy több szervezeti szabályzatnak. A széf eléréséhez frissíteni kell a meszerjelszót. A továbblépés kijelentkeztet az aktuális munkamenetből és újra be kell jelentkezni. A többi eszközön lévő aktív munkamenetek akár egy óráig is aktívak maradhatnak."
   },
+  "changePasswordWarning": {
+    "message": "A jelszó megváltoztatása után be kell jelentkezni az új jelszóval. Az aktív munkamenetek más eszközökön egy órán belül kijelentkeznek."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Módosítsuk a mesterjelszót a fiók helyreállításának befejezéséhez."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "A mesterjelszó nem felel meg a szervezet követelményeinek. Módosítsuk a mesterjelszót a folytatáshoz."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "A szervezete letiltotta a megbízható eszközök titkosítását. Állítsunk be egy mesterjelszót a széf eléréséhez."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Felhasználónév generátor"
   },
+  "generatePassword": {
+    "message": "Jelszó generálása"
+  },
+  "generatePassphrase": {
+    "message": "Jelmondat generálás"
+  },
+  "passwordGenerated": {
+    "message": "A jelszó generálásra került."
+  },
+  "passphraseGenerated": {
+    "message": "A jelmondat generálásra került."
+  },
+  "usernameGenerated": {
+    "message": "A felhasználónév generálásra került."
+  },
+  "emailGenerated": {
+    "message": "Az email generálásra került."
+  },
   "spinboxBoundariesHint": {
     "message": "Az érték legyen $MIN$ és $MAX$ között.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Ezen email használata"
   },
+  "useThisPassword": {
+    "message": "Jelszó használata"
+  },
+  "useThisPassphrase": {
+    "message": "Jelmondat használata"
+  },
+  "useThisUsername": {
+    "message": "Felhasználónév használata"
+  },
   "random": {
     "message": "Véletlen"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Gyenge jelszó lett azonosítva és megtalálva egy adatvédelmi incidens során. A fók védelme érdekében használjunk erős és egyedi jelszót. Biztosan használni szeretnénk ezt a jelszót?"
   },
-  "useThisPassword": {
-    "message": "Jelszó használata"
-  },
-  "useThisUsername": {
-    "message": "Felhasználónév használata"
-  },
   "checkForBreaches": {
     "message": "Az ehhez a jelszóhoz tartozó ismert adatvédelmi incidensek ellenőrzése"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Adminisztrátori jóváhagyás kérés"
   },
+  "unableToCompleteLogin": {
+    "message": "Nem lehet befejezni a bejelentkezést."
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Be kell jelentkezni egy megbízható eszközön vagy meg kell kérni az adminisztrátort, hogy rendeljen hozzá egy jelszót."
+  },
   "region": {
     "message": "Régió"
   },
@@ -3508,6 +3550,30 @@
     "message": "Általános formátumok",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Az URI egyezés észlelése az, ahogyan a Bitwarden azonosítja az automatikus kitöltési javaslatokat.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "A \"normál kifejezés“ egy fejlett opció, amely a hitelesítő adatok növekvő kiszivárgásának kockázatával.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "A \"Kezdés\" egy fejlett opció, amely a hitelesítő adatok kiszivárgásának növekvő kockázatával.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Bővebben az egyezés felismerésről",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Haladó opciók",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Figyelmeztetés",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Sikeres"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Mappa beágyazása a szülőmappa nevének hozzáadásával, majd egy “/” karakterrel. Példa: Közösségi/Fórumok"
   },
+  "sendsTitleNoItems": {
+    "message": "Érzékeny információt küldése biztonságosan",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Fájlok vagy adatok megosztása biztonságosan bárkivel, bármilyen platformon. Az információk titkosítva maradnak a végpontokon, korlátozva a kitettséget.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Jelszavak gyors létrehozása"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Könnyen létrehozhatunk erős és egyedi jelszavakat a gombra kattintva",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "a bejelentkezések biztonságának megőrzéséhez.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Könnyedén hozhatunk létre erős és egyedi jelszavakat a Jelszó generálása gombra kattintva, amely segít megőrizni a bejelentkezések biztonságát.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Idő megtakarítás automatikus kitöltéssel"
   },
@@ -3772,5 +3863,139 @@
     "message": "Tudjon meg többet az SSH ügynökröl",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Hozzárendelés gyűjteményekhez"
+  },
+  "assignToTheseCollections": {
+    "message": "Hozzárendelés ezen gyűjteményekhez"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Csak az ezekhez a gyűjteményekhez hozzáféréssel rendelkező szervezeti tagok láthatják az elemet."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Csak az ezekhez a gyűjteményekhez hozzáféréssel rendelkező szervezeti tagok láthatják az elemeket."
+  },
+  "noCollectionsAssigned": {
+    "message": "Nem lettek gyűjtemények hozzárendelve."
+  },
+  "assign": {
+    "message": "Hozzárendelés"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Csak az ezekhez a gyűjteményekhez hozzáféréssel rendelkező szervezeti tagok láthatják az elemeket."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "$TOTAL_COUNT$ elem lett kiválasztva. Az elemek közül $READONLY_COUNT$ nem frissíthető, mert nincs szerkesztési jogosultság.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Hozzárendelendő gyűjtemények kiválasztása"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ véglegesen átkerül a kiválasztott szervezethez. A továbbiakban nem leszünk a tulajdonosa ezeknek az elemeknek.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ véglegesen átkerül $ORG$ szervezeti egységbe. A továbbiakban nem leszünk a tulajdonosa ezeknek az elemeknek.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 elem véglegesen átkerül a kiválasztott szervezethez. A továbbiakban nem leszünk az elem tulajdonosa."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 véglegesen átkerül $ORG$ szervezeti egységbe. A továbbiakban nem leszünk a tulajdonosa ennek az elemnek.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "A gyűjtemények sikeresen hozzárendelésre kerültek."
+  },
+  "nothingSelected": {
+    "message": "Nincs kiválasztva semmi."
+  },
+  "itemsMovedToOrg": {
+    "message": "Az elemek áthelyezésre kerültek: $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Az elem áthelyezésre került: $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "A kiválasztott elemek átkerültek $ORGNAME$ szervezethez",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/id/messages.json b/apps/desktop/src/locales/id/messages.json
index 70be61f4bf3..0634ad80722 100644
--- a/apps/desktop/src/locales/id/messages.json
+++ b/apps/desktop/src/locales/id/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identitas"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Catatan yang aman"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Lainnya"
   },
-  "generatePassword": {
-    "message": "Buat Kata Sandi"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Tipe"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Ukuran berkas maksimal adalah 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder yang di Edit"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Aksi ini terproteksi. Untuk melanjutkan, masukkan kembali sandi utama Anda untuk verifikasi identitas."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Kata sandi utama diperbarui"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Buat Kata Sandi"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Acak"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Periksa pelanggaran data yang diketahui untuk kata sandi ini"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/it/messages.json b/apps/desktop/src/locales/it/messages.json
index a3dcb13fa76..0476024f926 100644
--- a/apps/desktop/src/locales/it/messages.json
+++ b/apps/desktop/src/locales/it/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identità"
   },
+  "typeNote": {
+    "message": "Nota"
+  },
   "typeSecureNote": {
     "message": "Nota sicura"
   },
@@ -238,22 +241,22 @@
     "message": "L'agente SSH è un servizio rivolto agli sviluppatori che consente di firmare le richieste SSH direttamente dalla tua cassaforte Bitwarden."
   },
   "sshAgentPromptBehavior": {
-    "message": "Ask for authorization when using SSH agent"
+    "message": "Chiedi autorizzazioni per l'agente SSH"
   },
   "sshAgentPromptBehaviorDesc": {
-    "message": "Choose how to handle SSH-agent authorization requests."
+    "message": "Scegli come gestire le richieste di autorizzazione dell'agente SSH."
   },
   "sshAgentPromptBehaviorHelp": {
-    "message": "Remember SSH authorizations"
+    "message": "Ricorda le autorizzazioni SSH"
   },
   "sshAgentPromptBehaviorAlways": {
-    "message": "Always"
+    "message": "Sempre"
   },
   "sshAgentPromptBehaviorNever": {
-    "message": "Never"
+    "message": "Mai"
   },
   "sshAgentPromptBehaviorRememberUntilLock": {
-    "message": "Remember until vault is locked"
+    "message": "Ricorda fino a quando la cassaforte è bloccata"
   },
   "premiumRequired": {
     "message": "Premium necessario"
@@ -351,12 +354,6 @@
   "other": {
     "message": "Altro"
   },
-  "generatePassword": {
-    "message": "Genera password"
-  },
-  "generatePassphrase": {
-    "message": "Genera passphrase"
-  },
   "type": {
     "message": "Tipo"
   },
@@ -412,16 +409,16 @@
     "message": "Chiave di autenticazione (TOTP)"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "Chiave di autenticazione"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "Riempimento automatico"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "URL"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "URL $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -431,49 +428,49 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "URL aggiunto"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "Aggiungi URL"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "Elimina URL"
   },
   "owner": {
-    "message": "Owner"
+    "message": "Proprietario"
   },
   "addField": {
-    "message": "Add field"
+    "message": "Aggiungi campo"
   },
   "editField": {
-    "message": "Edit field"
+    "message": "Modifica campo"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "Vuoi davvero eliminare definitivamente questo allegato?"
   },
   "fieldType": {
-    "message": "Field type"
+    "message": "Tipo di campo"
   },
   "fieldLabel": {
-    "message": "Field label"
+    "message": "Etichetta campo"
   },
   "add": {
-    "message": "Add"
+    "message": "Aggiungi"
   },
   "textHelpText": {
-    "message": "Use text fields for data like security questions"
+    "message": "Usa campi di testo per dati come domande di sicurezza"
   },
   "hiddenHelpText": {
-    "message": "Use hidden fields for sensitive data like a password"
+    "message": "Usa campi nascosti per dati sensibili come le password"
   },
   "checkBoxHelpText": {
-    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+    "message": "Usa le caselle di controllo per attivare automaticamente le checkbox come 'Mantieni attiva la sessione'"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "Usa un campo collegato quando si verificano problemi di riempimento automatico per un sito web specifico."
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "Inserisci l'ID HTML, il nome, l'aria-label o il segnaposto del campo."
   },
   "folder": {
     "message": "Cartella"
@@ -501,7 +498,7 @@
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "cfTypeCheckbox": {
-    "message": "Checkbox"
+    "message": "Caselle di controllo"
   },
   "linkedValue": {
     "message": "Valore collegato",
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "La dimensione massima del file è 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Migrazione della chiave di crittografia obbligatoria. Accedi tramite la cassaforte web per aggiornare la tua chiave di crittografia."
+  "legacyEncryptionUnsupported": {
+    "message": "La crittografia legacy non è più supportata. Contatta l'assistenza per recuperare il tuo account."
   },
   "editedFolder": {
     "message": "Cartella salvata"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account limitato"
   },
+  "restrictCardTypeImport": {
+    "message": "Impossibile importare elementi di tipo carta"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Non puoi importare carte nelle tue casseforti a causa di una politica impostata da una o più organizzazioni."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "Le due password del file non corrispondono."
   },
@@ -1967,10 +1970,10 @@
     }
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "Dati della carta"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "Dati di $BRAND$",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -1979,32 +1982,32 @@
     }
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "Info sulle app di autenticazione"
   },
   "copyTOTP": {
-    "message": "Copy Authenticator key (TOTP)"
+    "message": "Copia la chiave di autenticazione (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "Semplifica l'accesso a doppia verifica"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden può memorizzare e riempire automaticamente i codici di verifica in due passaggi. Copia e incolla la chiave in questo campo."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden può memorizzare e riempire automaticamente i codici di verifica in due passaggi. Clicca sull'icona fotocamera per leggere il codice QR dell'app di autenticazione per questo sito, oppure copia e incolla la chiave in questo campo."
   },
   "premium": {
     "message": "Premium",
     "description": "Premium membership"
   },
   "freeOrgsCannotUseAttachments": {
-    "message": "Free organizations cannot use attachments"
+    "message": "Le organizzazioni create con account gratuiti non possono utilizzare gli allegati"
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "Un campo richiede tua attenzione."
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "$COUNT$ campi richiedono la tua attenzione.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2013,10 +2016,10 @@
     }
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Carta scaduta"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "Aggiorna le informazioni con i dati di una nuova carta"
   },
   "verificationRequired": {
     "message": "Verifica necessaria",
@@ -2176,7 +2179,7 @@
     "message": "A causa di una politica aziendale, non puoi salvare elementi nella tua cassaforte personale. Cambia l'opzione di proprietà in un'organizzazione e scegli tra le raccolte disponibili."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "La tua nuova password non può essere identica alla precedente."
   },
   "hintEqualsPassword": {
     "message": "Il suggerimento per la password non può essere uguale alla tua password."
@@ -2188,13 +2191,13 @@
     "message": "Una politica dell'organizzazione ti impedisce di importare elementi nella tua cassaforte individuale."
   },
   "personalDetails": {
-    "message": "Personal details"
+    "message": "Dati personali"
   },
   "identification": {
-    "message": "Identification"
+    "message": "Identificazione"
   },
   "contactInfo": {
-    "message": "Contact information"
+    "message": "Informazioni di contatto"
   },
   "allSends": {
     "message": "Tutti i Send",
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Questa azione è protetta. Inserisci la tua password principale di nuovo per verificare la tua identità."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Password principale aggiornata"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "La tua password principale non soddisfa uno o più politiche della tua organizzazione. Per accedere alla cassaforte, aggiornala ora. Procedere ti farà uscire dalla sessione corrente, richiedendoti di accedere di nuovo. Le sessioni attive su altri dispositivi potrebbero continuare a rimanere attive per un massimo di un'ora."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "La tua organizzazione ha disabilitato la crittografia affidabile del dispositivo. Per favore imposta una password principale per accedere alla tua cassaforte."
   },
@@ -2513,13 +2528,13 @@
     "message": "Password principale rimossa"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "La password principale non è più richiesta per i membri dell'organizzazione. Per favore, conferma il dominio qui sotto con l'amministratore."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Nome dell'organizzazione"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Dominio Key Connector"
   },
   "leaveOrganization": {
     "message": "Lascia organizzazione"
@@ -2582,7 +2597,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "Solo gli elementi della cassaforte personale associati a $EMAIL$, inclusi gli allegati, saranno esportati. Gli elementi della cassaforte dell'organizzazione non saranno inclusi",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2631,7 +2646,25 @@
     "message": "Genera e-mail"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Generatore di nomi utente"
+  },
+  "generatePassword": {
+    "message": "Genera password"
+  },
+  "generatePassphrase": {
+    "message": "Genera passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Generatore di password"
+  },
+  "passphraseGenerated": {
+    "message": "Frase segreta generata"
+  },
+  "usernameGenerated": {
+    "message": "Nome utente generato"
+  },
+  "emailGenerated": {
+    "message": "Email generata"
   },
   "spinboxBoundariesHint": {
     "message": "Il valore deve essere compreso tra $MIN$ e $MAX$.",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Usa questa e-mail"
   },
+  "useThisPassword": {
+    "message": "Usa questa parola d'accesso"
+  },
+  "useThisPassphrase": {
+    "message": "Usa questa frase segreta"
+  },
+  "useThisUsername": {
+    "message": "Usa questo nome utente"
+  },
   "random": {
     "message": "Casuale"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Password debole e trovata in una violazione dei dati. Usa una password forte e unica per proteggere il tuo account. Sei sicuro di voler usare questa password?"
   },
-  "useThisPassword": {
-    "message": "Usa questa parola d'accesso"
-  },
-  "useThisUsername": {
-    "message": "Usa questo nome utente"
-  },
   "checkForBreaches": {
     "message": "Controlla se la tua password è presente in una violazione dei dati"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Richiedi approvazione dell'amministratore"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Regione"
   },
@@ -3158,28 +3200,28 @@
     "message": "Dispositivo fidato"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Contrassegna organizzazione come affidabile"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Contrassegna come affidabile"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Non considerare affidabile"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "L'organizzazione non è contrassegnata come affidabile"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Per la sicurezza del tuo account, conferma solo se hai concesso l'accesso di emergenza a questo utente e le loro frasi impronta corrispondono a quanto visualizzato nel loro account"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Per la sicurezza del tuo account, procedi solo se sei un membro di questa organizzazione, se il recupero dell'account è abilitato e se la frase impronta visualizzata di seguito corrisponde a quella dell'organizzazione."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Questa organizzazione ha una politica Enterprise che ti abiliterà al recupero dell'account. Ciò consentirà agli amministratori di modificare la password. Procedi solo se riconosci questa organizzazione e se la frase impronta mostrata di seguito corrisponde a quella dell'organizzazione."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Considera l'utente affidabile"
   },
   "inputRequired": {
     "message": "Input obbligatorio."
@@ -3352,7 +3394,7 @@
     "message": "Segui i passaggi qui sotto per completare l'accesso."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Segui i prossimi passaggi per completare l'accesso con la tua chiave di sicurezza."
   },
   "launchDuo": {
     "message": "Avvia Duo nel browser"
@@ -3508,6 +3550,30 @@
     "message": "Formati comuni",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Successo"
   },
@@ -3579,14 +3645,14 @@
     "message": "Non è stato possibile trovare nessuna porta libera per il login Sso."
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "Password sicura generata! Non dimenticare di aggiornare la tua password anche sul sito web."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Usa il generatore",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "per creare una password univoca forte",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "biometricsStatusHelptextUnlockNeeded": {
@@ -3614,25 +3680,25 @@
     "message": "Lo sblocco biometrico non è attualmente disponibile per un motivo sconosciuto."
   },
   "itemDetails": {
-    "message": "Item details"
+    "message": "Dettagli elemento"
   },
   "itemName": {
-    "message": "Item name"
+    "message": "Nome elemento"
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "Credenziali di accesso"
   },
   "additionalOptions": {
-    "message": "Additional options"
+    "message": "Opzioni aggiuntive"
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "Cronologia elemento"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "Ultima modifica"
   },
   "upload": {
-    "message": "Upload"
+    "message": "Carica"
   },
   "authorize": {
     "message": "Autorizza"
@@ -3704,7 +3770,7 @@
     "message": "Modifica la password non sicura o esposta"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Non puoi rimuovere raccolte con i soli permessi di visualizzazione: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3713,64 +3779,223 @@
     }
   },
   "move": {
-    "message": "Move"
+    "message": "Sposta"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Nuova cartella"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "Nome cartella"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Annida una cartella aggiungendo il nome della cartella superiore seguito da un '/'. Esempio: Social/Forums"
+  },
+  "sendsTitleNoItems": {
+    "message": "Invia informazioni sensibili in modo sicuro",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Condividi facilmente file e dati con chiunque, su qualsiasi piattaforma. Le tue informazioni saranno crittografate end-to-end per la massima sicurezza.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Crea rapidamente password sicure"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Crea facilmente password forti e uniche cliccando su",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "per aiutarti a mantenere i tuoi login al sicuro.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Crea facilmente password forti e uniche cliccando sul pulsante 'Genera password' per aiutarti a mantenere al sicuro i tuoi login.",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Accedi in un attimo grazie al riempimento automatico"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Includi",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Sito",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "in modo che questo login appaia come un suggerimento per il riempimento automatico.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Accesso e pagamento online semplificati"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Con le carte memorizzate, riempi i campi di pagamento in modo facile e veloce."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Semplifica la creazione di account"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Con le identità, riempi in un attimo i moduli di registrazione per la creazione di account."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Mantieni al sicuro i tuoi dati sensibili"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Usa le note per memorizzare in modo sicuro i dati sensibili come i dettagli bancari o assicurativi."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Accesso SSH ideale per gli sviluppatori"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Memorizza le chiavi e connettiti con l'agente SSH per un'autenticazione crittografata veloce.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Scopri di più sull'agente SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assegna a una raccolta"
+  },
+  "assignToTheseCollections": {
+    "message": "Assegna a queste raccolte"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Solo i membri dell'organizzazione con accesso a queste raccolte saranno in grado di vedere l'elemento."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Solo i membri dell'organizzazione con accesso a queste raccolte saranno in grado di vedere gli elementi."
+  },
+  "noCollectionsAssigned": {
+    "message": "Nessuna raccolta assegnata"
+  },
+  "assign": {
+    "message": "Assegna"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Solo i membri dell'organizzazione con accesso a queste raccolte saranno in grado di vedere gli elementi."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Hai selezionato $TOTAL_COUNT$ elementi. Di questi, $READONLY_COUNT$ non possono essere aggiornati perché non hai l'autorizzazione per la modifica.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Seleziona le raccolte da assegnare"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ elementi saranno trasferiti definitivamente all'organizzazione selezionata e non saranno più di tua proprietà.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ elementi saranno trasferiti definitivamente a $ORG$ e non saranno più di tua proprietà.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "Un elemento sarà trasferito definitivamente all'organizzazione selezionata e non sarà più di tua proprietà."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "Un elemento sarà trasferito definitivamente a $ORG$ e non sarà più di tua proprietà.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Raccolte assegnate correttamente"
+  },
+  "nothingSelected": {
+    "message": "La selezione è vuota."
+  },
+  "itemsMovedToOrg": {
+    "message": "Elementi spostati in $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Elemento spostato in $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Elementi selezionati spostati in $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/ja/messages.json b/apps/desktop/src/locales/ja/messages.json
index 624a296f32b..7b8eddc693b 100644
--- a/apps/desktop/src/locales/ja/messages.json
+++ b/apps/desktop/src/locales/ja/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "ID"
   },
+  "typeNote": {
+    "message": "メモ"
+  },
   "typeSecureNote": {
     "message": "セキュアメモ"
   },
@@ -238,22 +241,22 @@
     "message": "SSH エージェントとは、Bitwarden 保管庫から直接 SSH リクエストに署名できる、開発者を対象としたサービスです。"
   },
   "sshAgentPromptBehavior": {
-    "message": "Ask for authorization when using SSH agent"
+    "message": "SSHエージェントを使用する際に認証を要求する"
   },
   "sshAgentPromptBehaviorDesc": {
-    "message": "Choose how to handle SSH-agent authorization requests."
+    "message": "SSHエージェント認可リクエストの処理方法を選択します。"
   },
   "sshAgentPromptBehaviorHelp": {
-    "message": "Remember SSH authorizations"
+    "message": "SSH認可を記憶する"
   },
   "sshAgentPromptBehaviorAlways": {
-    "message": "Always"
+    "message": "常に表示する"
   },
   "sshAgentPromptBehaviorNever": {
-    "message": "Never"
+    "message": "表示しない"
   },
   "sshAgentPromptBehaviorRememberUntilLock": {
-    "message": "Remember until vault is locked"
+    "message": "保管庫がロックされるまで記憶する"
   },
   "premiumRequired": {
     "message": "プレミアム会員専用"
@@ -351,12 +354,6 @@
   "other": {
     "message": "その他"
   },
-  "generatePassword": {
-    "message": "パスワードの自動生成"
-  },
-  "generatePassphrase": {
-    "message": "パスフレーズを生成"
-  },
   "type": {
     "message": "タイプ"
   },
@@ -412,16 +409,16 @@
     "message": "認証キー (TOTP)"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "認証キー"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "自動入力のオプション"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "ウェブサイト (URI)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "ウェブサイト (URI) $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -431,49 +428,49 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "ウェブサイトを追加しました"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "ウェブサイトを追加"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "ウェブサイトを削除"
   },
   "owner": {
-    "message": "Owner"
+    "message": "所有者"
   },
   "addField": {
-    "message": "Add field"
+    "message": "フィールドを追加"
   },
   "editField": {
-    "message": "Edit field"
+    "message": "フィールドを編集"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "この添付ファイルを完全に削除してもよろしいですか？"
   },
   "fieldType": {
-    "message": "Field type"
+    "message": "フィールドの種類"
   },
   "fieldLabel": {
-    "message": "Field label"
+    "message": "フィールドのラベル"
   },
   "add": {
-    "message": "Add"
+    "message": "追加"
   },
   "textHelpText": {
-    "message": "Use text fields for data like security questions"
+    "message": "秘密の質問などのデータには、テキストフィールドを使用します"
   },
   "hiddenHelpText": {
-    "message": "Use hidden fields for sensitive data like a password"
+    "message": "パスワードのような機密データには、非表示フィールドを使用します"
   },
   "checkBoxHelpText": {
-    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+    "message": "「メールアドレスを記憶する」などのフォームのチェックボックスを自動入力する場合は、チェックボックスを使用します"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "特定のウェブサイトで自動入力の問題が発生している場合は、リンクされたフィールドを使用します。"
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "フィールドの HTML の id、name、aria-label、placeholder を入力します。"
   },
   "folder": {
     "message": "フォルダー"
@@ -501,7 +498,7 @@
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "cfTypeCheckbox": {
-    "message": "Checkbox"
+    "message": "チェックボックス"
   },
   "linkedValue": {
     "message": "リンクされた値",
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "最大ファイルサイズは500MBです。"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "暗号化キーの移行が必要です。暗号化キーを更新するには、ウェブ保管庫からログインしてください。"
+  "legacyEncryptionUnsupported": {
+    "message": "従来の暗号化はサポートされていません。アカウントを復元するにはサポートにお問い合わせください。"
   },
   "editedFolder": {
     "message": "フォルダーを編集しました"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "アカウント制限"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "「ファイルパスワード」と「ファイルパスワードの確認」が一致しません。"
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "この操作は保護されています。続行するには、確認のためにマスターパスワードを再入力してください。"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "マスターパスワードを更新しました"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "マスターパスワードが組織のポリシーに適合していません。保管庫にアクセスするには、今すぐマスターパスワードを更新しなければなりません。続行すると現在のセッションからログアウトし、再度ログインする必要があります。 他のデバイス上のアクティブなセッションは、最大1時間アクティブであり続けることがあります。"
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "あなたの組織は信頼できるデバイスの暗号化を無効化しました。保管庫にアクセスするにはマスターパスワードを設定してください。"
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "パスワードの自動生成"
+  },
+  "generatePassphrase": {
+    "message": "パスフレーズを生成"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "値は $MIN$ から $MAX$ の間でなければなりません。",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "このメールアドレスを使う"
   },
+  "useThisPassword": {
+    "message": "このパスワードを使用する"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "このユーザー名を使用する"
+  },
   "random": {
     "message": "ランダム"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "入力されたパスワードは脆弱かつすでに流出済みです。アカウントを守るためより強力で一意なパスワードを使用してください。本当にこの脆弱なパスワードを使用しますか？"
   },
-  "useThisPassword": {
-    "message": "このパスワードを使用する"
-  },
-  "useThisUsername": {
-    "message": "このユーザー名を使用する"
-  },
   "checkForBreaches": {
     "message": "このパスワードの既知のデータ流出を確認"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "管理者の承認を要求する"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "リージョン"
   },
@@ -3508,6 +3550,30 @@
     "message": "一般的な形式",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "成功"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/ka/messages.json b/apps/desktop/src/locales/ka/messages.json
index 45047cd678f..7b98da76026 100644
--- a/apps/desktop/src/locales/ka/messages.json
+++ b/apps/desktop/src/locales/ka/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "იდენტიფიკაცია"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Secure note"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "სხვა"
   },
-  "generatePassword": {
-    "message": "პაროლის გენერირება"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "ტიპი"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "პაროლის გენერირება"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "შემთხვევითი"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "რეგიონი"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "წარმატება"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/km/messages.json b/apps/desktop/src/locales/km/messages.json
index 17495f96785..304d07ee3cd 100644
--- a/apps/desktop/src/locales/km/messages.json
+++ b/apps/desktop/src/locales/km/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identity"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Secure note"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Other"
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/kn/messages.json b/apps/desktop/src/locales/kn/messages.json
index e74fc479016..8a1798ce386 100644
--- a/apps/desktop/src/locales/kn/messages.json
+++ b/apps/desktop/src/locales/kn/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "ಗುರುತಿಸುವಿಕೆ"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "ಸುರಕ್ಷಿತ ಟಿಪ್ಪಣಿ"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "ಇತರೆ"
   },
-  "generatePassword": {
-    "message": "ಪಾಸ್ವರ್ಡ್ ರಚಿಸಿ"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "ಪ್ರಕಾರ"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "ಗರಿಷ್ಠ ಫೈಲ್ ಗಾತ್ರ 500 ಎಂಬಿ."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "ಫೋಲ್ಡರ್ ತಿದ್ದಲಾಗಿದೆ"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "ಮುಂದುವರಿಯಲು ಈ ಕ್ರಿಯೆಯನ್ನು ರಕ್ಷಿಸಲಾಗಿದೆ, ದಯವಿಟ್ಟು ನಿಮ್ಮ ಗುರುತನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಮಾಸ್ಟರ್ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಮರು ನಮೂದಿಸಿ."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "ಪಾಸ್ವರ್ಡ್ ರಚಿಸಿ"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/ko/messages.json b/apps/desktop/src/locales/ko/messages.json
index 371f4cae1c8..9127f4f76a9 100644
--- a/apps/desktop/src/locales/ko/messages.json
+++ b/apps/desktop/src/locales/ko/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "신원"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "보안 메모"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "기타"
   },
-  "generatePassword": {
-    "message": "비밀번호 생성"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "유형"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "최대 파일 크기는 500MB입니다."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "암호화 키 마이그레이션이 필요합니다. 웹 보관함에 로그인하여 암호화 키를 업데이트하세요."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "폴더 편집함"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "이 작업은 보호되어 있습니다. 계속하려면 마스터 비밀번호를 입력하여 신원을 인증하세요."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "마스터 비밀번호 변경됨"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "비밀번호 생성"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "무작위"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/lt/messages.json b/apps/desktop/src/locales/lt/messages.json
index f98a5dba2e1..84e5a9d36a6 100644
--- a/apps/desktop/src/locales/lt/messages.json
+++ b/apps/desktop/src/locales/lt/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Tapatybė"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Saugus įrašas"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Kita"
   },
-  "generatePassword": {
-    "message": "Sugeneruoti slaptažodį"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Tipas"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Didžiausias failo dydis – 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Privaloma migruoti šifravimo raktą. Prašome prisijungti per internetinę saugyklą norint jį atnaujinti."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Aplankas išsaugotas"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Šis veiksmas yra apsaugotas. Jei norite tęsti, iš naujo įveskite pagrindinį slaptažodį, kad patvirtintumėte savo tapatybę."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Atnaujintas pagrindinis slaptažodis"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Jūsų pagrindinis slaptažodis neatitinka vieno ar kelių organizacijos slaptažodžiui keliamų reikalavimų. Norėdami prisijungti prie saugyklos, jūs turite atnaujinti savo pagrindinį slaptažodį. Jeigu nuspręsite tęsti, jūs būsite atjungti nuo dabartinės sesijos ir jums reikės vėl prisijungti. Visos aktyvios sesijos kituose įrenginiuose gali išlikti aktyvios iki vienos valandos."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Sugeneruoti slaptažodį"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Atsitiktinis"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Silpnas slaptažodis nustatytas ir rastas per duomenų pažeidimą. Norėdami apsaugoti paskyrą, naudokite stiprų ir unikalų slaptažodį. Ar tikrai norite naudoti šį slaptažodį?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Patikrinti žinomus šio slaptažodžio duomenų pažeidimus"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Prašyti administratoriaus patvirtinimo"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Regionas"
   },
@@ -3508,6 +3550,30 @@
     "message": "Dažni formatai",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/lv/messages.json b/apps/desktop/src/locales/lv/messages.json
index 6c35520605d..d1bf2382e58 100644
--- a/apps/desktop/src/locales/lv/messages.json
+++ b/apps/desktop/src/locales/lv/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identitāte"
   },
+  "typeNote": {
+    "message": "Piezīme"
+  },
   "typeSecureNote": {
     "message": "Droša piezīme"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Cits"
   },
-  "generatePassword": {
-    "message": "Veidot paroli"
-  },
-  "generatePassphrase": {
-    "message": "Izveidot paroles vārdkopu"
-  },
   "type": {
     "message": "Veids"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Lielākais pieļaujamais datnes izmērs ir 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Nepieciešama šifrēšanas atslēgas nomaiņa. Lūgums pieteikties tīmekļa glabātavā, lai atjauninātu savu šifrēšanas atslēgu."
+  "legacyEncryptionUnsupported": {
+    "message": "Mantota šifrēšana vairs netiek atbalstīta. Lūgums sazināties ar atbalstu, lai atkoptu savu kontu."
   },
   "editedFolder": {
     "message": "Mape labota"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Konts ir ierobežots"
   },
+  "restrictCardTypeImport": {
+    "message": "Nevar ievietot karšu vienumu veidus"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Pamatnostādne, ko ir iestatījusi viena vai vairākas apvienības, liedz karšu ievietošanu savās glabātavās."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Datnes parole\" un \"Apstiprināt datnes paroli\" vērtības nesakrīt."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Šī darbība ir aizsargāta. Lai turpinātu, ir jāievada galvenā parole, lai apliecinātu savu identitāti."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Galvenā parole sekmīgi iestatīta"
+  },
   "updatedMasterPassword": {
     "message": "Galvenā parole atjaunināta"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Galvenā parole neatbilst vienam vai vairākiem apvienības nosacījumiem. Ir jāatjaunina galvenā parole, lai varētu piekļūt glabātavai. Turpinot notiks atteikšanās no pašreizējās sesijas, un būs nepieciešams pieteikties no jauna. Citās ierīcēs esošās sesijas var turpināt darboties līdz vienai stundai."
   },
+  "changePasswordWarning": {
+    "message": "Pēc savas paroles nomainīšanas būs nepieciešams pieteikties ar jauno paroli. Spēkā esošajās sesijās citās ierīcēs stundas laikā notiks atteikšanās."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Jānomaina sava galvenā'parole, lai pabeigtu konta atkopi."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Galvenā parole neatbilst šīs apvienības prasībām. Jānomaina sava galvenā parole, lai turpinātu."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Tava apvienība ir atspējojusi uzticamo ierīču šifrēšanu. Lūgums iestatīt galveno paroli, lai piekļūtu savai glabātavai."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Lietotājvārdu veidotājs"
   },
+  "generatePassword": {
+    "message": "Veidot paroli"
+  },
+  "generatePassphrase": {
+    "message": "Izveidot paroles vārdkopu"
+  },
+  "passwordGenerated": {
+    "message": "Parole izveidota"
+  },
+  "passphraseGenerated": {
+    "message": "Paroles vārdkopa izveidota"
+  },
+  "usernameGenerated": {
+    "message": "Lietotājvārds izveidots"
+  },
+  "emailGenerated": {
+    "message": "E-pasta adrese izveidota"
+  },
   "spinboxBoundariesHint": {
     "message": "Vērtībai jābūt starp $MIN$ un $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Izmantot šo e-pasta adresi"
   },
+  "useThisPassword": {
+    "message": "Izmantot šo paroli"
+  },
+  "useThisPassphrase": {
+    "message": "Izmantot šo paroles vārdkopu"
+  },
+  "useThisUsername": {
+    "message": "Izmantot šo lietotājvārdu"
+  },
   "random": {
     "message": "Nejauši"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Noteikta vāja parole, un tā ir atrasta datu noplūdē. Jāizmanto spēcīga un neatkārtojama parole, lai aizsargātu savu kontu. Vai tiešām izmantot šo paroli?"
   },
-  "useThisPassword": {
-    "message": "Izmantot šo paroli"
-  },
-  "useThisUsername": {
-    "message": "Izmantot šo lietotājvārdu"
-  },
   "checkForBreaches": {
     "message": "Meklēt šo paroli zināmās datu noplūdēs"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Pieprasīt pārvaldītāja apstiprinājumu"
   },
+  "unableToCompleteLogin": {
+    "message": "Nevar pabeigt pieteikšanos"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Nepieciešams pieteikties uzticamā ierīcē vai vaicāt pārvaldītājam, lai piešķir paroli."
+  },
   "region": {
     "message": "Apgabals"
   },
@@ -3508,6 +3550,30 @@
     "message": "Izplatīti veidoli",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI atbilstības noteikšana ir veids, kā Bitwarden atpazīst automātiskās aizpildes ieteikumus.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regulārā izteiksme\" ir lietpratējiem paredzēta iespēja ar paaugstinātu piekļuves datu atklāšanas bīstamību.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Sākas ar' ir lietpratējiem paredzēta iespēja ar paaugstinātu piekļuves datu atklāšanas bīstamību.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Vairāk par atbilstības noteikšanu",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Papildu iespējas",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Brīdinājums",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Izdevās"
   },
@@ -3704,7 +3770,7 @@
     "message": "Mainīt riskam pakļautu paroli"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Nevar noņemt krājumus ar tiesībām \"Tikai skatīt\": $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Apakšmapes var izveidot, ja pievieno iekļaujošās mapes nosaukumu, aiz kura ir \"/\". Piemēram: Tīklošanās/Forumi"
   },
+  "sendsTitleNoItems": {
+    "message": "Drošā veidā nosūti jūtīgu informāciju",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Kopīgo datnes un datus drošā veidā ar ikvienu jebkurā platformā! Tava informācija paliks pilnībā šifrēta, vienlaikus ierobežojot riskantumu.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Ātra paroļu izveidošana"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Vienkārša spēcīgu un neatkārtojamu paroļu izveidošana ar",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": ", lai palīdzētu uzturērt pieteikšanās vienumus drošus.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Vienkārša spēcīgu un neatkārtojamu paroļu izveidošana ar pogu \"Izveidot paroli\", lai palīdzētu uzturēt pieteikšanās vienumus drošus.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Laika ietaupīšana ar automātisko aizpildi"
   },
@@ -3772,5 +3863,139 @@
     "message": "Uzzināt vairāk par SSH aģentu",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Piešķirt krājumiem"
+  },
+  "assignToTheseCollections": {
+    "message": "Piešķirt šiem krājumiem"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Vienumu varēs redzēt tikai apvnienības dalībnieki ar piekļuvi šiem krājumiem."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Vienumus varēs redzēt tikai apvnienības dalībnieki ar piekļuvi šiem krājumiem."
+  },
+  "noCollectionsAssigned": {
+    "message": "Neviens krājums nav piešķirts"
+  },
+  "assign": {
+    "message": "Piešķirt"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Vienumus varēs redzēt tikai apvnienības dalībnieki ar piekļuvi šiem krājumiem."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Ir atlasīti $TOTAL_COUNT$ vienumi. Nevar atjaunināt $READONLY_COUNT$ no vienumiem, jo trūkst labošanas atļaujas.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Atlasīt krājumus, lai piešķirtu"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ tiks neatgriezeniski nodoti atlasītajai apvienībai. Šie vienumi Tev vairs nepiederēs.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ tiks neatgriezeniski nodoti $ORG$. Šie vienumi Tev vairs nepiederēs.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 vienums tiks neatgriezeniski nodots atlasītajai apvienībai. Šis vienums Tev vairs nepiederēs."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 vienums tiks neatgriezeniski nodots $ORG$. Šis vienums Tev vairs nepiederēs.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Krājumi veiksmīgi piešķirti"
+  },
+  "nothingSelected": {
+    "message": "Nekas nav atlasīts."
+  },
+  "itemsMovedToOrg": {
+    "message": "Vienumi pārvietoti uz $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Vienums pārvietots uz $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Atlasītie vienumi pārvietoti uz $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/me/messages.json b/apps/desktop/src/locales/me/messages.json
index 51310719f0a..98794eed175 100644
--- a/apps/desktop/src/locales/me/messages.json
+++ b/apps/desktop/src/locales/me/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identitet"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Sigurna belješka"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Drugo"
   },
-  "generatePassword": {
-    "message": "Generiši lozinku"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Tip"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximalna veličina datoteke je 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Izmijenjena fascikla"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generiši lozinku"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/ml/messages.json b/apps/desktop/src/locales/ml/messages.json
index a760acb86ec..9cb27605db5 100644
--- a/apps/desktop/src/locales/ml/messages.json
+++ b/apps/desktop/src/locales/ml/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "തിരിച്ചറിയൽ"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "സുരക്ഷിത കുറിപ്പ്"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "മറ്റുള്ളവ"
   },
-  "generatePassword": {
-    "message": "പാസ്‌വേഡ് സൃഷ്ടിക്കുക"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "തരം"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "പരമാവധി ഫയൽ വലുപ്പം 500 MB ആണ്."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "ഫോൾഡർ തിരുത്തി"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "പാസ്‌വേഡ് സൃഷ്ടിക്കുക"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/mr/messages.json b/apps/desktop/src/locales/mr/messages.json
index 17495f96785..304d07ee3cd 100644
--- a/apps/desktop/src/locales/mr/messages.json
+++ b/apps/desktop/src/locales/mr/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identity"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Secure note"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Other"
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/my/messages.json b/apps/desktop/src/locales/my/messages.json
index 2179311c501..4629ba25d93 100644
--- a/apps/desktop/src/locales/my/messages.json
+++ b/apps/desktop/src/locales/my/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identity"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "လုံခြုံတဲ့မှတ်စု"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Other"
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/nb/messages.json b/apps/desktop/src/locales/nb/messages.json
index 3ddf3e44e5f..53125c8e290 100644
--- a/apps/desktop/src/locales/nb/messages.json
+++ b/apps/desktop/src/locales/nb/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identitet"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Sikker notis"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Annet"
   },
-  "generatePassword": {
-    "message": "Generer et passord"
-  },
-  "generatePassphrase": {
-    "message": "Generér passordfrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Den maksimale filstørrelsen er 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Redigerte mappen"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Konto begrenset"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "«Filpassord» og «Bekreft filpassord» stemmer ikke overens."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Denne handlingen er beskyttet. For å fortsette, skriv inn hovedpassordet ditt på nytt for å verifisere din identitet."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Oppdaterte hovedpassordet"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Brukernavngenerator"
   },
+  "generatePassword": {
+    "message": "Generer et passord"
+  },
+  "generatePassphrase": {
+    "message": "Generér passordfrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Verdien må være mellom $MIN$ og $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Bruk denne E-postadressen"
   },
+  "useThisPassword": {
+    "message": "Bruk dette passordet"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Bruk dette brukernavnet"
+  },
   "random": {
     "message": "Tilfeldig"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Bruk dette passordet"
-  },
-  "useThisUsername": {
-    "message": "Bruk dette brukernavnet"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Be om administratorgodkjennelse"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Vanlige formater",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Suksess"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Spar tid med auto-utfylling"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/ne/messages.json b/apps/desktop/src/locales/ne/messages.json
index 9ae7b7af955..8ea29998406 100644
--- a/apps/desktop/src/locales/ne/messages.json
+++ b/apps/desktop/src/locales/ne/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "पहिचान"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "सुरक्षित नोट"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Other"
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/nl/messages.json b/apps/desktop/src/locales/nl/messages.json
index b1e04600908..90669dd1c93 100644
--- a/apps/desktop/src/locales/nl/messages.json
+++ b/apps/desktop/src/locales/nl/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identiteit"
   },
+  "typeNote": {
+    "message": "Notitie"
+  },
   "typeSecureNote": {
     "message": "Veilige notitie"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Overig"
   },
-  "generatePassword": {
-    "message": "Genereer wachtwoord"
-  },
-  "generatePassphrase": {
-    "message": "Wachtwoordzin genereren"
-  },
   "type": {
     "message": "Categorie"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximale bestandsgrootte is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Migratie van de encryptiesleutel vereist. Login via de website om je sleutel te bij te werken."
+  "legacyEncryptionUnsupported": {
+    "message": "Oude versleuteling wordt niet langer ondersteund. Neem contact op voor ondersteuning om je account te herstellen."
   },
   "editedFolder": {
     "message": "Map is bewerkt"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account beperkt"
   },
+  "restrictCardTypeImport": {
+    "message": "Kan kaart item types niet importeren"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Een beleid ingesteld door 1 of meer organisaties voorkomt dat je kaarten naar je kluizen kunt importeren."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Bestandswachtwoord\" en \"Bestandswachtwoord bevestigen\" komen niet overeen."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Deze actie is beveiligd. Voer je hoofdwachtwoord opnieuw in om je identiteit vast te stellen en door te gaan."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Hoofdwachtwoord succesvol ingesteld"
+  },
   "updatedMasterPassword": {
     "message": "Hoofdwachtwoord bijgewerkt"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Je hoofdwachtwoord voldoet niet aan en of meerdere oganisatiebeleidsonderdelen. Om toegang te krijgen tot de kluis, moet je je hoofdwachtwoord nu bijwerken. Doorgaan zal je huidige sessie uitloggen, waarna je opnieuw moet inloggen. Actieve sessies op andere apparaten blijven mogelijk nog een uur actief."
   },
+  "changePasswordWarning": {
+    "message": "Na het wijzigen van je wachtwoord moet je inloggen met je nieuwe wachtwoord. Actieve sessies op andere apparaten worden binnen één uur uitgelogd."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Wijzig je hoofdwachtwoord om je account te herstellen."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Je hoofdwachtwoord voldoet niet aan de eisen van deze organisatie. Wijzig je hoofdwachtwoord om door te gaan."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Je organisatie heeft het versleutelen van vertrouwde apparaten uitgeschakeld. Stel een hoofdwachtwoord in om toegang te krijgen tot je kluis."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Gebruikersnaamgenerator"
   },
+  "generatePassword": {
+    "message": "Genereer wachtwoord"
+  },
+  "generatePassphrase": {
+    "message": "Wachtwoordzin genereren"
+  },
+  "passwordGenerated": {
+    "message": "Wachtwoord gegenereerd"
+  },
+  "passphraseGenerated": {
+    "message": "Wachtwoordzin gegenereerd"
+  },
+  "usernameGenerated": {
+    "message": "Gebruikersnaam gegenereerd"
+  },
+  "emailGenerated": {
+    "message": "E-mail gegenereerd"
+  },
   "spinboxBoundariesHint": {
     "message": "Waarde moet tussen $MIN$ en $MAX$ liggen.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Dit e-mailadres gebruiken"
   },
+  "useThisPassword": {
+    "message": "Dit wachtwoord gebruiken"
+  },
+  "useThisPassphrase": {
+    "message": "Deze wachtwoordzin gebruiken"
+  },
+  "useThisUsername": {
+    "message": "Deze gebruikersnaam gebruiken"
+  },
   "random": {
     "message": "Willekeurig"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Zwak wachtwoord geïdentificeerd en gevonden in een datalek. Gebruik een sterk en uniek wachtwoord om je account te beschermen. Weet je zeker dat je dit wachtwoord wilt gebruiken?"
   },
-  "useThisPassword": {
-    "message": "Dit wachtwoord gebruiken"
-  },
-  "useThisUsername": {
-    "message": "Deze gebruikersnaam gebruiken"
-  },
   "checkForBreaches": {
     "message": "Bekende datalekken voor dit wachtwoord controleren"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Goedkeuring van beheerder vragen"
   },
+  "unableToCompleteLogin": {
+    "message": "Kan login niet voltooien"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Je moet inloggen op een vertrouwd apparaat of je beheerder vragen om je een wachtwoord toe te wijzen."
+  },
   "region": {
     "message": "Regio"
   },
@@ -3508,6 +3550,30 @@
     "message": "Veelvoorkomende formaten",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI-matche-detectie is hoe Bitwarden invulsuggesties herkent.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Reguliere expressie\" is een geavanceerde optie met een verhoogd risico op het blootstellen van inloggegevens.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Begint met\" is een geavanceerde optie met een verhoogd risico op het blootstellen van inloggegevens.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Lees meer over overeenkomstdetectie",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Geavanceerde opties",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Waarschuwing",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Succes"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Je kunt een map onderbrengen door het toevoegen van de naam van de bovenliggende map gevolgd door een \"/\". Voorbeeld: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Gevoelige informatie veilig versturen",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Deel bestanden en gegevens veilig met iedereen, op elk platform. Je informatie blijft end-to-end versleuteld terwijl en blootstelling beperkt.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Snel wachtwoorden maken"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Maak eenvoudig sterke en unieke wachtwoorden door te klikken op",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "om je te helpen je inloggegevens veilig te houden.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Maak eenvoudig sterke en unieke wachtwoorden door op de knop Wachtwoord genereren te klikken om je logins veilig te houden.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Tijd besparen met automatisch aanvullen"
   },
@@ -3772,5 +3863,139 @@
     "message": "Meer informatie over SSH-agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Aan collecties toewijzen"
+  },
+  "assignToTheseCollections": {
+    "message": "Aan deze collecties toewijzen"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Alleen organisatieleden met toegang tot deze collecties kunnen de items zien."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Alleen organisatieleden met toegang tot deze collecties kunnen de items zien."
+  },
+  "noCollectionsAssigned": {
+    "message": "Er zijn geen collecties toegewezen"
+  },
+  "assign": {
+    "message": "Toewijzen"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Alleen organisatieleden met toegang tot deze collecties kunnen de items zien."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Je hebt $TOTAL_COUNT$ items geselecteerd. Je kunt $READONLY_COUNT$ items niet bijwerken omdat je geen bewerkrechten hebt.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Collecties voor toewijzen selecteren"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ worden permanent overgedragen aan de geselecteerde organisatie. Je bent niet langer de eigenaar van deze items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ wordt permanent overgedragen aan $ORG$. Je bent niet langer de eigenaar van deze items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item wordt permanent overgedragen aan de geselecteerde organisatie. Je bent niet langer de eigenaar van dit item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item wordt permanent overgedragen aan $ORG$. Je bent niet langer de eigenaar van dit item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Succesvol toegewezen collecties"
+  },
+  "nothingSelected": {
+    "message": "Je hebt niets geselecteerd."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items verplaatst naar $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item verplaatst naar $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Geselecteerde items verplaatst naar $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/nn/messages.json b/apps/desktop/src/locales/nn/messages.json
index 097da5886a6..af6a64710a7 100644
--- a/apps/desktop/src/locales/nn/messages.json
+++ b/apps/desktop/src/locales/nn/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identitet"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Trygg notat"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Andre"
   },
-  "generatePassword": {
-    "message": "Generer passord"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Den høgaste tillatne filstorleiken er 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Mappe lagra"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generer passord"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/or/messages.json b/apps/desktop/src/locales/or/messages.json
index a71275e64ac..3ce27e673b7 100644
--- a/apps/desktop/src/locales/or/messages.json
+++ b/apps/desktop/src/locales/or/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "ପରିଚୟ"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Secure note"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "ଅନ୍ୟ"
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "ପ୍ରକାର"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/pl/messages.json b/apps/desktop/src/locales/pl/messages.json
index 84ef8f0ca9a..b09bc908c47 100644
--- a/apps/desktop/src/locales/pl/messages.json
+++ b/apps/desktop/src/locales/pl/messages.json
@@ -23,8 +23,11 @@
   "typeIdentity": {
     "message": "Tożsamość"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
-    "message": "Bezpieczna notatka"
+    "message": "Notatka"
   },
   "typeSshKey": {
     "message": "Klucz SSH"
@@ -238,22 +241,22 @@
     "message": "Agent SSH to usługa skierowana do programistów, która umożliwia podpisywanie żądań SSH bezpośrednio z Twojego sejfu Bitwarden."
   },
   "sshAgentPromptBehavior": {
-    "message": "Ask for authorization when using SSH agent"
+    "message": "Zapytaj o autoryzację podczas używania agenta SSH"
   },
   "sshAgentPromptBehaviorDesc": {
-    "message": "Choose how to handle SSH-agent authorization requests."
+    "message": "Wybierz sposób obsługi żądań autoryzacyjnych agenta SSH."
   },
   "sshAgentPromptBehaviorHelp": {
-    "message": "Remember SSH authorizations"
+    "message": "Zapamiętaj autoryzacje SSH"
   },
   "sshAgentPromptBehaviorAlways": {
-    "message": "Always"
+    "message": "Zawsze"
   },
   "sshAgentPromptBehaviorNever": {
-    "message": "Never"
+    "message": "Nigdy"
   },
   "sshAgentPromptBehaviorRememberUntilLock": {
-    "message": "Remember until vault is locked"
+    "message": "Zapamiętaj aż sejf będzie zablokowany"
   },
   "premiumRequired": {
     "message": "Konto Premium jest wymagane"
@@ -351,12 +354,6 @@
   "other": {
     "message": "Inne"
   },
-  "generatePassword": {
-    "message": "Wygeneruj hasło"
-  },
-  "generatePassphrase": {
-    "message": "Wygeneruj hasło wyrazowe"
-  },
   "type": {
     "message": "Rodzaj"
   },
@@ -412,16 +409,16 @@
     "message": "Klucz uwierzytelniający (TOTP)"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "Klucz uwierzytelniający"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "Opcje autouzupełniania"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "Strona internetowa (URI)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "Strona internetowa (URI) $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -431,49 +428,49 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Strona dodana"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "Dodaj stronę internetową"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "Usuń stronę internetową"
   },
   "owner": {
-    "message": "Owner"
+    "message": "Właściciel"
   },
   "addField": {
-    "message": "Add field"
+    "message": "Dodaj pole"
   },
   "editField": {
-    "message": "Edit field"
+    "message": "Edytuj pole"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "Czy na pewno chcesz trwale usunąć ten załącznik?"
   },
   "fieldType": {
-    "message": "Field type"
+    "message": "Typ pola"
   },
   "fieldLabel": {
-    "message": "Field label"
+    "message": "Etykieta pola"
   },
   "add": {
-    "message": "Add"
+    "message": "Dodaj"
   },
   "textHelpText": {
-    "message": "Use text fields for data like security questions"
+    "message": "Użyj pól tekstowych dla danych takich jak pytania bezpieczeństwa"
   },
   "hiddenHelpText": {
-    "message": "Use hidden fields for sensitive data like a password"
+    "message": "Użyj ukrytych pól dla danych poufnych, takich jak hasło"
   },
   "checkBoxHelpText": {
-    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+    "message": "Użyj pól wyboru, jeśli chcesz automatycznie wypełnić pole wyboru formularza, np. zapamiętaj e-mail"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "Użyj powiązanego pola, gdy masz problemy z autouzupełnianiem na konkretnej stronie internetowej."
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "Wprowadź atrybut z HTML'a: id, name, aria-label lub placeholder."
   },
   "folder": {
     "message": "Folder"
@@ -501,7 +498,7 @@
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "cfTypeCheckbox": {
-    "message": "Checkbox"
+    "message": "Pole wyboru"
   },
   "linkedValue": {
     "message": "Powiązana wartość",
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maksymalny rozmiar pliku to 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Wymagana jest migracja klucza szyfrowania. Zaloguj się przez sejf internetowy, aby zaktualizować klucz szyfrowania."
+  "legacyEncryptionUnsupported": {
+    "message": "Starsze szyfrowanie nie jest już obsługiwane. Skontaktuj się z pomocą techniczną, aby odzyskać swoje konto."
   },
   "editedFolder": {
     "message": "Folder został zapisany"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Konto ograniczone"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“Hasło pliku” i “Potwierdź hasło pliku“ nie pasują do siebie."
   },
@@ -1967,10 +1970,10 @@
     }
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "Szczegóły karty"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "Szczegóły $BRAND$",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -1979,32 +1982,32 @@
     }
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "Dowiedz się więcej o uwierzytelniaczach"
   },
   "copyTOTP": {
-    "message": "Copy Authenticator key (TOTP)"
+    "message": "Kopiuj klucz uwierzytelniający (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "Spraw, aby dwuetapowa weryfikacja była bezproblemowa"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden może przechowywać i wypełniać kody weryfikacyjne. Skopiuj i wklej klucz do tego pola."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden może przechowywać i wypełniać kody weryfikacyjne. Wybierz ikonę aparatu, aby zrobić zrzut ekranu z kodem QR lub skopiuj i wklej klucz do tego pola."
   },
   "premium": {
     "message": "Premium",
     "description": "Premium membership"
   },
   "freeOrgsCannotUseAttachments": {
-    "message": "Free organizations cannot use attachments"
+    "message": "Darmowe organizacje nie mogą używać załączników"
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "1 pole wymaga Twojej uwagi."
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "Pola wymagające Twojej uwagi: $COUNT$.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2013,10 +2016,10 @@
     }
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Karta wygasła"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "Jeśli ją wznowiłeś, zaktualizuj informacje o karcie"
   },
   "verificationRequired": {
     "message": "Wymagana weryfikacja",
@@ -2176,7 +2179,7 @@
     "message": "Ze względu na zasadę przedsiębiorstwa, nie możesz zapisywać elementów w osobistym sejfie. Zmień właściciela elementu na organizację i wybierz jedną z dostępnych kolekcji."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Twoje nowe hasło nie może być takie samo jak Twoje aktualne hasło."
   },
   "hintEqualsPassword": {
     "message": "Podpowiedź do hasła nie może być taka sama jak hasło."
@@ -2188,13 +2191,13 @@
     "message": "Polityka organizacji zablokowała importowanie elementów do Twojego sejfu."
   },
   "personalDetails": {
-    "message": "Personal details"
+    "message": "Dane osobowe"
   },
   "identification": {
-    "message": "Identification"
+    "message": "Tożsamość"
   },
   "contactInfo": {
-    "message": "Contact information"
+    "message": "Informacje kontaktowe"
   },
   "allSends": {
     "message": "Wszystkie wysyłki",
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Ta operacja jest chroniona. Aby kontynuować, wpisz ponownie hasło główne."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Hasło główne zostało zaktualizowane"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Twoje hasło główne nie spełnia jednej lub kilku zasad organizacji. Aby uzyskać dostęp do sejfu, musisz teraz zaktualizować swoje hasło główne. Kontynuacja wyloguje Cię z bieżącej sesji, wymagając zalogowania się ponownie. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie jedną godzinę."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Twoja organizacja wyłączyła szyfrowanie zaufanego urządzenia. Ustaw hasło główne, aby uzyskać dostęp do sejfu."
   },
@@ -2513,13 +2528,13 @@
     "message": "Hasło główne zostało usunięte"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Hasło główne nie jest już wymagane dla członków następującej organizacji. Proszę potwierdzić poniższą domenę u administratora organizacji."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Nazwa organizacji"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Domena Key Connector'a"
   },
   "leaveOrganization": {
     "message": "Opuść organizację"
@@ -2582,7 +2597,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "Tylko poszczególne elementy sejfu łącznie z załącznikami powiązanymi z $EMAIL$ zostaną wyeksportowane. Elementy sejfu organizacji nie będą dołączone",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2631,7 +2646,25 @@
     "message": "Wygeneruj e-mail"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Generator nazw użytkownika"
+  },
+  "generatePassword": {
+    "message": "Wygeneruj hasło"
+  },
+  "generatePassphrase": {
+    "message": "Wygeneruj hasło wyrazowe"
+  },
+  "passwordGenerated": {
+    "message": "Hasło zostało wygenerowane"
+  },
+  "passphraseGenerated": {
+    "message": "Hasło wyrazowe zostało wygenerowane"
+  },
+  "usernameGenerated": {
+    "message": "Nazwa użytkownika została wygenerowana"
+  },
+  "emailGenerated": {
+    "message": "E-mail został wygenerowany"
   },
   "spinboxBoundariesHint": {
     "message": "Wartość musi być pomiędzy $MIN$ a $MAX$.",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Użyj tego adresu e-mail"
   },
+  "useThisPassword": {
+    "message": "Użyj tego hasła"
+  },
+  "useThisPassphrase": {
+    "message": "Użyj tego hasła wyrazowego"
+  },
+  "useThisUsername": {
+    "message": "Użyj tej nazwy użytkownika"
+  },
   "random": {
     "message": "Losowa"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Słabe hasło ujawnione w wyniku naruszenia ochrony danych. Użyj silnego i unikalnego hasła, aby chronić swoje konto. Czy na pewno chcesz użyć tego hasła?"
   },
-  "useThisPassword": {
-    "message": "Użyj tego hasła"
-  },
-  "useThisUsername": {
-    "message": "Użyj tej nazwy użytkownika"
-  },
   "checkForBreaches": {
     "message": "Sprawdź znane naruszenia ochrony danych tego hasła"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Poproś administratora o zatwierdzenie"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3158,28 +3200,28 @@
     "message": "Zaufano urządzeniu"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Zaufaj organizacji"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Zaufaj"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Nie ufaj"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Organizacja nie jest zaufana"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Dla bezpieczeństwa Twojego konta potwierdź tylko, jeśli przyznano temu użytkownikowi dostęp awaryjny i jego odcisk palca pasuje do tego, co widnieje na jego koncie"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Dla zapewnienia bezpieczeństwa konta kontynuuj tylko wtedy, gdy jesteś członkiem tej organizacji, włączono odzyskiwanie konta, a odcisk palca wyświetlany poniżej pasuje do odcisku palca organizacji."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Polityka korporacyjna tej organizacji umożliwia zapisanie Cię do programu odzyskiwania kont. Rejestracja umożliwi administratorom organizacji zmianę Twojego hasła. Możesz kontynuować tylko wtedy, gdy znasz tę organizację, a odcisk palca pokazany poniżej pasuje do odcisku palca tej organizacji."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Zaufaj użytkownikowi"
   },
   "inputRequired": {
     "message": "Dane wejściowe są wymagane."
@@ -3352,7 +3394,7 @@
     "message": "Wykonaj poniższe kroki, by dokończyć logowanie"
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Wykonaj poniższe kroki, aby zakończyć logowanie za pomocą klucza bezpieczeństwa."
   },
   "launchDuo": {
     "message": "Uruchom Duo w przeglądarce"
@@ -3508,6 +3550,30 @@
     "message": "Popularne formaty",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Sukces"
   },
@@ -3579,14 +3645,14 @@
     "message": "Nie znaleziono wolnych portów dla logowania SSO."
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "Wygenerowane bezpieczne hasło! Nie zapomnij również zaktualizować hasła na stronie."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Użyj generatora",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": ", aby utworzyć mocne unikalne hasło",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "biometricsStatusHelptextUnlockNeeded": {
@@ -3614,25 +3680,25 @@
     "message": "Odblokowanie biometryczne jest obecnie niedostępne z nieznanego powodu."
   },
   "itemDetails": {
-    "message": "Item details"
+    "message": "Szczegóły elementu"
   },
   "itemName": {
-    "message": "Item name"
+    "message": "Nazwa elementu"
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "Dane logowania"
   },
   "additionalOptions": {
-    "message": "Additional options"
+    "message": "Dodatkowe opcje"
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "Historia elementu"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "Ostatnio edytowane"
   },
   "upload": {
-    "message": "Upload"
+    "message": "Wyślij"
   },
   "authorize": {
     "message": "Autoryzuj"
@@ -3704,7 +3770,7 @@
     "message": "Zmień zagrożone hasło"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Nie można usunąć kolekcji z uprawnieniami tylko do przeglądania: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3713,64 +3779,223 @@
     }
   },
   "move": {
-    "message": "Move"
+    "message": "Przenieś"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Nowy folder"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "Nazwa folderu"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Zagnieżdżaj foldery dodając nazwę folderu nadrzędnego, a następnie “/”. Przykład: Społeczne/Fora"
+  },
+  "sendsTitleNoItems": {
+    "message": "Wysyłaj bezpiecznie poufne informacje",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Udostępniaj pliki i dane bezpiecznie każdemu, na każdej platformie. Twoje dane pozostaną zaszyfrowane end-to-end przy jednoczesnym ograniczeniu narażenia.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Szybko twórz hasła"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Łatwo twórz silne i unikalne hasła, klikając na",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": ", aby pomóc Ci zachować bezpieczeństwo Twoich danych logowania.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Łatwo twórz silne i unikalne hasła, klikając na Wygeneruj Hasło, aby pomóc Ci zachować bezpieczeństwo Twoich danych logowania.",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Oszczędzaj czas dzięki autouzupełnianiu"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Dołącz",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Strona",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": ", aby ten login pojawił się jako sugestia autouzupełniania.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Bezproblemowe zamówienia online"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Z kartami łatwe autouzupełnianie formularzy płatności w sposób bezpieczny i dokładny."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Uprość tworzenie kont"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Z tożsamościami, szybko autouzupełnij długie formularze rejestracyjne lub kontaktowe."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Zachowaj bezpieczeństwo wrażliwych danych"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Z notatkami bezpiecznie przechowuj dane szczególnie chronione, takie jak dane bankowe lub ubezpieczeniowe."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Przyjazny dla deweloperów dostęp SSH"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Przechowuj swoje klucze i połącz się z agentem SSH dla szybkiego, szyfrowanego uwierzytelniania.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Dowiedz się więcej o agencie SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/pt_BR/messages.json b/apps/desktop/src/locales/pt_BR/messages.json
index 43fa1087988..ab65e0a4912 100644
--- a/apps/desktop/src/locales/pt_BR/messages.json
+++ b/apps/desktop/src/locales/pt_BR/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identidade"
   },
+  "typeNote": {
+    "message": "Notas"
+  },
   "typeSecureNote": {
     "message": "Nota Segura"
   },
@@ -238,22 +241,22 @@
     "message": "O agente SSH é um serviço direcionado a desenvolvedores que permite que você assine solicitações SSH diretamente do seu cofre do Bitwarden."
   },
   "sshAgentPromptBehavior": {
-    "message": "Ask for authorization when using SSH agent"
+    "message": "Solicitar autorização ao usar o agente SSH"
   },
   "sshAgentPromptBehaviorDesc": {
-    "message": "Choose how to handle SSH-agent authorization requests."
+    "message": "Defina como lidar com as solicitações de autorização do agente-SSH."
   },
   "sshAgentPromptBehaviorHelp": {
-    "message": "Remember SSH authorizations"
+    "message": "Lembrar das autorizações de SSH"
   },
   "sshAgentPromptBehaviorAlways": {
-    "message": "Always"
+    "message": "Sempre"
   },
   "sshAgentPromptBehaviorNever": {
-    "message": "Never"
+    "message": "Nunca"
   },
   "sshAgentPromptBehaviorRememberUntilLock": {
-    "message": "Remember until vault is locked"
+    "message": "Lembrar até o repositório estar trancado"
   },
   "premiumRequired": {
     "message": "Requer Assinatura Premium"
@@ -351,12 +354,6 @@
   "other": {
     "message": "Outros"
   },
-  "generatePassword": {
-    "message": "Gerar Senha"
-  },
-  "generatePassphrase": {
-    "message": "Gerar frase secreta"
-  },
   "type": {
     "message": "Tipo"
   },
@@ -412,16 +409,16 @@
     "message": "Chave de Autenticação (TOTP)"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "Chave de autenticação"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "Opções de preenchimento automático"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "Site (URI)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "Site (URI) $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -431,49 +428,49 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Site adicionado"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "Adicionar site"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "Deletar site"
   },
   "owner": {
-    "message": "Owner"
+    "message": "Proprietário"
   },
   "addField": {
-    "message": "Add field"
+    "message": "Adicionar campo"
   },
   "editField": {
-    "message": "Edit field"
+    "message": "Editar campo"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "Tem certeza de que deseja deletar permanentemente esse anexo?"
   },
   "fieldType": {
-    "message": "Field type"
+    "message": "Tipo do campo"
   },
   "fieldLabel": {
-    "message": "Field label"
+    "message": "Rótulo de campo"
   },
   "add": {
-    "message": "Add"
+    "message": "Adicionar"
   },
   "textHelpText": {
-    "message": "Use text fields for data like security questions"
+    "message": "Use campos de texto para dados como questões de segurança"
   },
   "hiddenHelpText": {
-    "message": "Use hidden fields for sensitive data like a password"
+    "message": "Use campos ocultos para dados sensíveis como senhas"
   },
   "checkBoxHelpText": {
-    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+    "message": "Use caixas de seleção caso deseje preencher automaticamente as caixas de seleção de um formulário, como um email de lembrete"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "Use um campo vinculado quando você estiver experienciando problemas de preenchimento automático para um site específico."
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "Digite o ID html, nome, rótulo acessível (aria-label), ou espaço reservado do campo."
   },
   "folder": {
     "message": "Pasta"
@@ -501,7 +498,7 @@
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "cfTypeCheckbox": {
-    "message": "Checkbox"
+    "message": "Caixa de seleção"
   },
   "linkedValue": {
     "message": "Valor vinculado",
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "O tamanho máximo do arquivo é de 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Migração de chave de criptografia necessária. Faça login através do cofre web para atualizar sua chave de criptografia."
+  "legacyEncryptionUnsupported": {
+    "message": "A criptografia legada não é mais suportada. Por favor, contate o suporte para recuperar a sua conta."
   },
   "editedFolder": {
     "message": "Pasta editada"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Conta restrita"
   },
+  "restrictCardTypeImport": {
+    "message": "Não é possível importar os tipos de item cartão"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Uma política definida por 1 ou mais organizações impedem que você importe cartões dos seus repositórios."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Senha do arquivo\" e \"Confirmação de senha\" não correspondem."
   },
@@ -1967,10 +1970,10 @@
     }
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "Detalhes do cartão"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "$BRAND$ Detalhes",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -1979,32 +1982,32 @@
     }
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "Aprenda mais sobre autenticadores"
   },
   "copyTOTP": {
-    "message": "Copy Authenticator key (TOTP)"
+    "message": "Copiar a chave de autenticação (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "Tornar a verificação em 2 etapas mais simples"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden pode armazenar e preencher códigos de verificação de 2 etapas. Copie e cole a chave nesse campo."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden pode armazenar e preencher códigos de verificação de 2 etapas. Selecione o ícone da câmera e tire uma captura de tela do código QR de autenticação desse site ou copie e cole a chave nesse campo."
   },
   "premium": {
     "message": "Premium",
     "description": "Premium membership"
   },
   "freeOrgsCannotUseAttachments": {
-    "message": "Free organizations cannot use attachments"
+    "message": "Organizações gratuitas não podem utilizar anexos"
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "1 campo precisa da sua atenção."
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "$COUNT$ campos precisam da sua atenção.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2013,10 +2016,10 @@
     }
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Cartão expirado"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "Se você fez uma renovação recente, atualize as informações do cartão"
   },
   "verificationRequired": {
     "message": "Verificação necessária",
@@ -2188,13 +2191,13 @@
     "message": "A política da organização bloqueou a importação de itens para o seu cofre."
   },
   "personalDetails": {
-    "message": "Personal details"
+    "message": "Detalhes pessoais"
   },
   "identification": {
-    "message": "Identification"
+    "message": "Identificação"
   },
   "contactInfo": {
-    "message": "Contact information"
+    "message": "Informações de contato"
   },
   "allSends": {
     "message": "Todos os Sends",
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Esta ação está protegida. Para continuar, por favor, reinsira a sua senha mestra para verificar sua identidade."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Senha mestra definida com sucesso"
+  },
   "updatedMasterPassword": {
     "message": "Senha mestra atualizada"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "A sua senha mestra não atende a uma ou mais das políticas da sua organização. Para acessar o cofre, você deve atualizar a sua senha mestra agora. O processo desconectará você da sessão atual, exigindo que você inicie a sessão novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
   },
+  "changePasswordWarning": {
+    "message": "Após mudar a sua senha, será necessário entrar novamente com a sua nova senha. Sessões ativas em outros dispositivos serão encerradas em até uma hora."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Mude a sua senha mestra para completar a recuperação de conta."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Sua senha mestra não corresponde aos requerimentos da organização. Mude a sua senha mestra para continuar."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Sua organização desativou a criptografia confiável do dispositivo. Por favor, defina uma senha mestra para acessar o seu cofre."
   },
@@ -2513,13 +2528,13 @@
     "message": "Senha mestra removida."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Uma senha mestra não é mais necessária para membros da seguinte organização. Por favor, confirme o domínio abaixo com o administrador da sua organização."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Nome da organização"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Chave de conexão do domínio"
   },
   "leaveOrganization": {
     "message": "Sair da Organização"
@@ -2631,7 +2646,25 @@
     "message": "Gerar e-mail"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Gerador de nome de usuário"
+  },
+  "generatePassword": {
+    "message": "Gerar Senha"
+  },
+  "generatePassphrase": {
+    "message": "Gerar frase secreta"
+  },
+  "passwordGenerated": {
+    "message": "Gerador de senhas"
+  },
+  "passphraseGenerated": {
+    "message": "Gerador de palavra-passe"
+  },
+  "usernameGenerated": {
+    "message": "Nome de usuário gerado"
+  },
+  "emailGenerated": {
+    "message": "E-mail gerado"
   },
   "spinboxBoundariesHint": {
     "message": "Valor deve ser entre $MIN$ e $MAX$.",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Usar este e-mail"
   },
+  "useThisPassword": {
+    "message": "Use esta senha"
+  },
+  "useThisPassphrase": {
+    "message": "Use essa palavra-passe"
+  },
+  "useThisUsername": {
+    "message": "Use este nome de usuário"
+  },
   "random": {
     "message": "Aleatório"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Senha fraca identificada e encontrada em um vazamento de dados. Use uma senha forte e única para proteger a sua conta. Tem certeza de que deseja usar essa senha?"
   },
-  "useThisPassword": {
-    "message": "Use esta senha"
-  },
-  "useThisUsername": {
-    "message": "Use este nome de usuário"
-  },
   "checkForBreaches": {
     "message": "Verificar vazamentos de dados conhecidos para esta senha"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Solicitar aprovação do administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Incapaz de completar o login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Você precisar entrar em um dispositivo confiável ou solicitar ao administrador que lhe atribua uma senha."
+  },
   "region": {
     "message": "Região"
   },
@@ -3158,28 +3200,28 @@
     "message": "Dispositivo confiável"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Organização confiável"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Confiar"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Não confiar"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Organização não confiável"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Para a segurança da sua conta, apenas confirme se você permitiu o acesso de emergência a esse usuário e se a impressão digital dele coincide com a que é exibida em sua conta"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Para a segurança da sua conta, prossiga apenas se você for um membro dessa organização, tem uma recuperação de conta ativa e a impressão digital exibida abaixo corresponde com a impressão digital da organização."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Esta organização tem uma política empresarial que lhe inscreverá na recuperação de conta. A matrícula permitirá que os administradores da organização alterem sua senha. Prossiga somente se você reconhecer esta organização e se a frase biométrica exibida abaixo corresponde com a impressão digital da organização."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Usuário confiável"
   },
   "inputRequired": {
     "message": "Entrada necessária."
@@ -3352,7 +3394,7 @@
     "message": "Siga os passos abaixo para finalizar o login."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Siga os passos abaixo para finalizar o login com a sua chave de segurança."
   },
   "launchDuo": {
     "message": "Iniciar o Duo no navegador"
@@ -3508,6 +3550,30 @@
     "message": "Formatos comuns",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Detecção de correspondência de URI é como o Bitwarden identifica sugestões de autopreenchimento.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Expressão regular\" é uma opção avançada com maior risco de exposição de credenciais.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Começa com\" é uma opção avançada com maior risco de exposição de credenciais.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Mais sobre detecção de correspondências",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Opções avançadas",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Aviso",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Sucesso"
   },
@@ -3579,14 +3645,14 @@
     "message": "Nenhuma porta livre foi encontrada para o cliente final."
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "Senha segura gerada! Não esqueça de também atualizar a sua senha no site."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Usar o gerador",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "ppara criar uma senha única e segura",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "biometricsStatusHelptextUnlockNeeded": {
@@ -3614,25 +3680,25 @@
     "message": "O desbloqueio por biometria está indisponível por razões desconhecidas."
   },
   "itemDetails": {
-    "message": "Item details"
+    "message": "Detalhes do item"
   },
   "itemName": {
-    "message": "Item name"
+    "message": "Nome do item"
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "Credenciais de login"
   },
   "additionalOptions": {
-    "message": "Additional options"
+    "message": "Opções adicionais"
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "Histórico do item"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "Última edição"
   },
   "upload": {
-    "message": "Upload"
+    "message": "Fazer upload"
   },
   "authorize": {
     "message": "Autorizar"
@@ -3704,7 +3770,7 @@
     "message": "Alterar senhas vulneráveis"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Você não pode remover coleções com permissões de Apenas visualização: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3716,61 +3782,220 @@
     "message": "Mover"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Nova pasta"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "Nome da pasta"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Aninhe uma pasta adicionando o nome da pasta pai seguido de uma \"/\". Exemplo: Social/Fóruns"
+  },
+  "sendsTitleNoItems": {
+    "message": "Enviar informações sensíveis com segurança",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Compartilhe dados e arquivos com segurança com qualquer pessoa ou plataforma. Suas informações permanecerão com criptografia de ponta a ponta, limitando exposições.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Criação rápida de senhas"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Crie facilmente senhas únicas e fortes clicando em",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "para ajudá-lo a manter seus logins seguros.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Crie facilmente senhas únicas e fortes clicando no botão Gerador de senhas para ajudá-lo a manter seus logins seguros.",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Economize tempo com o preenchimento automático"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Incluir em",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Site",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "assim este login aparece como uma sugestão de preenchimento automático.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Pagamento online simplificado"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Preencha automaticamente formulários de pagamento com cartões de forma segura e precisa."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Criação de contas simplificada"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Preencha automaticamente formulários longos de registro ou contato de forma rápida."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Mantenha seus dados sensíveis seguros"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Com notas, armazena com segurança dados sensíveis como detalhes de informações bancárias ou de seguro."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Acesso SSH amigável para desenvolvedores"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Armazena suas chaves e conecta com o agente SSH para uma autenticação rápida e criptografada.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Aprenda mais sobre o agente SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Atribuído a coleções"
+  },
+  "assignToTheseCollections": {
+    "message": "Atribuído a essas coleções"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Apenas membros da organização com acesso a essas coleções poderão ver o item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Apenas membros da organização com acesso a essas coleções poderão ver os itens."
+  },
+  "noCollectionsAssigned": {
+    "message": "Nenhuma coleção foi atribuída"
+  },
+  "assign": {
+    "message": "Atribuir"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Apenas membros da organização com acesso a essas coleções poderão ver os itens."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Você selecionou $TOTAL_COUNT$ itens. Você não pode atualizar $READONLY_COUNT$ dos itens, pois você não tem as permissões de edição.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Selecionar coleções para atribuir"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ serão permanentemente transferidas para a organização selecionada. Você deixará de ser o proprietário desses itens.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ serão permanentemente transferidas para $ORG$. Você deixará de ser o proprietário desses itens.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item será permanentemente transferido para a organização selecionada. Você deixará de ser o proprietário desse item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item será permanentemente transferido para $ORG$. Você deixará de ser o proprietário desse item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Coleções atribuídas com sucesso"
+  },
+  "nothingSelected": {
+    "message": "Você não selecionou nada."
+  },
+  "itemsMovedToOrg": {
+    "message": "Itens movidos para $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item movido para $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Itens selecionados movidos para $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/pt_PT/messages.json b/apps/desktop/src/locales/pt_PT/messages.json
index dc40c91960e..2b5d7e00f61 100644
--- a/apps/desktop/src/locales/pt_PT/messages.json
+++ b/apps/desktop/src/locales/pt_PT/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identidade"
   },
+  "typeNote": {
+    "message": "Nota"
+  },
   "typeSecureNote": {
     "message": "Nota segura"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Outros"
   },
-  "generatePassword": {
-    "message": "Gerar palavra-passe"
-  },
-  "generatePassphrase": {
-    "message": "Gerar frase de acesso"
-  },
   "type": {
     "message": "Tipo"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "O tamanho máximo do ficheiro é de 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "É necessária a migração da chave de encriptação. Inicie sessão através do cofre web para atualizar a sua chave de encriptação."
+  "legacyEncryptionUnsupported": {
+    "message": "A encriptação herdada já não é suportada. Por favor, contacte o suporte para recuperar a sua conta."
   },
   "editedFolder": {
     "message": "Pasta guardada"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Conta restringida"
   },
+  "restrictCardTypeImport": {
+    "message": "Não é possível importar tipos de itens de cartão"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Uma política definida por 1 ou mais organizações impede-o de importar cartões para os seus cofres."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Palavra-passe do ficheiro\" e \"Confirmar palavra-passe do ficheiro\" não correspondem."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Esta ação está protegida. Para continuar, por favor, reintroduza a sua palavra-passe mestra para verificar a sua identidade."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Palavra-passe mestra definida com sucesso"
+  },
   "updatedMasterPassword": {
     "message": "Palavra-passe mestra atualizada"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "A sua palavra-passe mestra não cumpre uma ou mais políticas da sua organização. Para aceder ao cofre, tem de atualizar a sua palavra-passe mestra agora. Ao prosseguir, terminará a sua sessão atual e terá de iniciar sessão novamente. As sessões ativas noutros dispositivos poderão continuar ativas até uma hora."
   },
+  "changePasswordWarning": {
+    "message": "Depois de ter alterado a sua palavra-passe, é necessário iniciar sessão com a sua nova palavra-passe. As sessões ativas noutros dispositivos serão interrompidas dentro de uma hora."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Altere a sua palavra-passe mestra para concluir a recuperação da conta."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "A sua palavra-passe mestra não cumpre os requisitos desta organização. Altere a sua palavra-passe mestra para continuar."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "A sua organização desativou a encriptação de dispositivos fiáveis. Por favor, defina uma palavra-passe mestra para aceder ao seu cofre."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Gerador de nomes de utilizador"
   },
+  "generatePassword": {
+    "message": "Gerar palavra-passe"
+  },
+  "generatePassphrase": {
+    "message": "Gerar frase de acesso"
+  },
+  "passwordGenerated": {
+    "message": "Palavra-passe gerada"
+  },
+  "passphraseGenerated": {
+    "message": "Frase de acesso gerada"
+  },
+  "usernameGenerated": {
+    "message": "Nome de utilizador gerado"
+  },
+  "emailGenerated": {
+    "message": "E-mail gerado"
+  },
   "spinboxBoundariesHint": {
     "message": "O valor deve estar entre $MIN$ e $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Utilizar este e-mail"
   },
+  "useThisPassword": {
+    "message": "Utilizar esta palavra-passe"
+  },
+  "useThisPassphrase": {
+    "message": "Utilizar esta frase de acesso"
+  },
+  "useThisUsername": {
+    "message": "Utilizar este nome de utilizador"
+  },
   "random": {
     "message": "Aleatório"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Palavra-passe fraca identificada e encontrada numa violação de dados. Utilize uma palavra-passe forte e única para proteger a sua conta. Tem a certeza de que pretende utilizar esta palavra-passe?"
   },
-  "useThisPassword": {
-    "message": "Utilizar esta palavra-passe"
-  },
-  "useThisUsername": {
-    "message": "Utilizar este nome de utilizador"
-  },
   "checkForBreaches": {
     "message": "Verificar violações de dados conhecidas para esta palavra-passe"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Pedir aprovação do administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Não é possível concluir o início de sessão"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Tem de iniciar sessão num dispositivo de confiança ou pedir ao seu administrador que lhe atribua uma palavra-passe."
+  },
   "region": {
     "message": "Região"
   },
@@ -3508,6 +3550,30 @@
     "message": "Formatos comuns",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "A deteção de correspondência de URI é a forma como o Bitwarden identifica sugestões de preenchimento automático.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "A \"expressão regular\" é uma opção avançada com um risco acrescido de exposição de credenciais.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Começa com\" é uma opção avançada com um risco acrescido de exposição de credenciais.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Mais informações sobre a deteção de correspondências",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Opções avançadas",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Aviso",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Com sucesso"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Crie uma subpasta adicionando o nome da pasta principal seguido de um \"/\". Exemplo: Redes Sociais/Fóruns"
   },
+  "sendsTitleNoItems": {
+    "message": "Envie informações sensíveis com segurança",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Partilhe ficheiros e dados de forma segura com qualquer pessoa, em qualquer plataforma. As suas informações permanecerão encriptadas ponto a ponto, limitando a exposição.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Criar rapidamente palavras-passe"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Crie facilmente palavras-passe fortes e únicas clicando em",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "para o ajudar a manter as suas credenciais seguras.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Crie facilmente palavras-passe fortes e únicas clicando no botão Gerar palavra-passe para o ajudar a manter as suas credenciais seguras.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Poupe tempo com o preenchimento automático"
   },
@@ -3772,5 +3863,139 @@
     "message": "Saiba mais sobre o agente SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Atribuir às coleções"
+  },
+  "assignToTheseCollections": {
+    "message": "Atribuir a estas coleções"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Apenas os membros da organização com acesso a estas coleções poderão ver o item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Apenas os membros da organização com acesso a estas coleções poderão ver os itens."
+  },
+  "noCollectionsAssigned": {
+    "message": "Não foram atribuídas quaisquer coleções"
+  },
+  "assign": {
+    "message": "Atribuir"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Apenas os membros da organização com acesso a estas coleções poderão ver os itens."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Selecionou $TOTAL_COUNT$ itens. Não pode atualizar $READONLY_COUNT$ dos itens porque não tem permissões de edição.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Selecione as coleções a atribuir"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ serão permanentemente transferidos para a organização selecionada. Estes itens deixarão de lhe pertencer.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ serão permanentemente transferidos para $ORG$. Deixará de ser proprietário destes itens.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item será permanentemente transferido para a organização selecionada. Este item deixará de lhe pertencer."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item será permanentemente transferido para a $ORG$. Este item deixará de lhe pertencer.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Coleções atribuídas com sucesso"
+  },
+  "nothingSelected": {
+    "message": "Não selecionou nada."
+  },
+  "itemsMovedToOrg": {
+    "message": "Itens movidos para $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item movido para $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Itens selecionados movidos para $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/ro/messages.json b/apps/desktop/src/locales/ro/messages.json
index f108d420829..e3608836d26 100644
--- a/apps/desktop/src/locales/ro/messages.json
+++ b/apps/desktop/src/locales/ro/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identitate"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Notă securizată"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Altele"
   },
-  "generatePassword": {
-    "message": "Generare parolă"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Tip"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Mărimea maximă a fișierului este de 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Dosar salvat"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Această acțiune este protejată. Pentru a continua, vă rugăm să reintroduceți parola principală pentru a vă verifica identitatea."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Parola principală actualizată"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generare parolă"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Aleatoriu"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/ru/messages.json b/apps/desktop/src/locales/ru/messages.json
index 52dea4d205c..8991d3dacb0 100644
--- a/apps/desktop/src/locales/ru/messages.json
+++ b/apps/desktop/src/locales/ru/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Личная информация"
   },
+  "typeNote": {
+    "message": "Заметка"
+  },
   "typeSecureNote": {
     "message": "Защищенная заметка"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Прочее"
   },
-  "generatePassword": {
-    "message": "Сгенерировать пароль"
-  },
-  "generatePassphrase": {
-    "message": "Создать парольную фразу"
-  },
   "type": {
     "message": "Тип"
   },
@@ -517,7 +514,7 @@
     "message": "Элемент добавлен"
   },
   "editedItem": {
-    "message": "Элемент изменен"
+    "message": "Элемент сохранен"
   },
   "deleteItem": {
     "message": "Удалить элемент"
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Максимальный размер файла 500 МБ."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Требуется миграция ключа шифрования. Чтобы обновить ключ шифрования, войдите через веб-хранилище."
+  "legacyEncryptionUnsupported": {
+    "message": "Устаревшее шифрование больше не поддерживается. Для восстановления аккаунта обратитесь в службу поддержки."
   },
   "editedFolder": {
     "message": "Папка сохранена"
@@ -941,7 +938,7 @@
     "message": "Вставьте ключ безопасности в USB-порт компьютера. Если у ключа есть кнопка, нажмите ее."
   },
   "recoveryCodeDesc": {
-    "message": "Потеряли доступ ко всем вариантам двухэтапной аутентификации? Используйте код восстановления, чтобы отключить двухэтапную аутентификацию для вашей учетной записи."
+    "message": "Потеряли доступ ко всем вариантам двухэтапной аутентификации? Используйте код восстановления, чтобы отключить двухэтапную аутентификацию для вашего аккаунта."
   },
   "recoveryCodeTitle": {
     "message": "Код восстановления"
@@ -980,7 +977,7 @@
     "message": "FIDO2 WebAuthn"
   },
   "webAuthnDesc": {
-    "message": "Используйте любой ключ безопасности с поддержкой WebAuthn для доступа к вашей учетной записи."
+    "message": "Используйте любой ключ безопасности с поддержкой WebAuthn для доступа к вашему аккаунту."
   },
   "emailTitle": {
     "message": "Email"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Ограничено аккаунтом"
   },
+  "restrictCardTypeImport": {
+    "message": "Невозможно импортировать элементы карт"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Политика, установленная 1 или более организациями, не позволяет импортировать карты в ваши хранилища."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Пароль к файлу\" и \"Подтверждение пароля к файлу\" не совпадают."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Это действие защищено. Чтобы продолжить, введите ваш мастер-пароль для подтверждения личности."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Мастер-пароль успешно установлен"
+  },
   "updatedMasterPassword": {
     "message": "Мастер-пароль обновлен"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ваш мастер-пароль не соответствует требованиям политики вашей организации. Для доступа к хранилищу вы должны обновить свой мастер-пароль прямо сейчас. При этом текущий сеанс будет завершен и потребуется повторная авторизация. Сеансы на других устройствах могут оставаться активными в течение часа."
   },
+  "changePasswordWarning": {
+    "message": "После смены пароля потребуется авторизоваться с новым паролем. Активные сессии на других устройствах будут завершены в течение одного часа."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Измените мастер-пароль, чтобы завершить восстановление аккаунта."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Ваш мастер-пароль не соответствует требованиям этой организации. Измените его, чтобы продолжить."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "В вашей организации отключено шифрование доверенных устройств. Пожалуйста, установите мастер-пароль для доступа к вашему хранилищу."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Генератор имени пользователя"
   },
+  "generatePassword": {
+    "message": "Сгенерировать пароль"
+  },
+  "generatePassphrase": {
+    "message": "Создать парольную фразу"
+  },
+  "passwordGenerated": {
+    "message": "Пароль создан"
+  },
+  "passphraseGenerated": {
+    "message": "Парольная фраза создана"
+  },
+  "usernameGenerated": {
+    "message": "Имя пользователя создано"
+  },
+  "emailGenerated": {
+    "message": "Email создан"
+  },
   "spinboxBoundariesHint": {
     "message": "Значение должно быть между $MIN$ и $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Использовать этот email"
   },
+  "useThisPassword": {
+    "message": "Использовать этот пароль"
+  },
+  "useThisPassphrase": {
+    "message": "Использовать эту парольную фразу"
+  },
+  "useThisUsername": {
+    "message": "Использовать это имя пользователя"
+  },
   "random": {
     "message": "Случайно"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Обнаружен слабый пароль, найденный в утечке данных. Используйте надежный и уникальный пароль для защиты вашего аккаунта. Вы уверены, что хотите использовать этот пароль?"
   },
-  "useThisPassword": {
-    "message": "Использовать этот пароль"
-  },
-  "useThisUsername": {
-    "message": "Использовать это имя пользователя"
-  },
   "checkForBreaches": {
     "message": "Проверять известные случаи утечки данных для этого пароля"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Запросить одобрение администратора"
   },
+  "unableToCompleteLogin": {
+    "message": "Не удалось завершить вход"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Вам необходимо авторизоваться с доверенного устройства или попросить вашего администратора назначить вам пароль."
+  },
   "region": {
     "message": "Регион"
   },
@@ -3508,6 +3550,30 @@
     "message": "Основные форматы",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Обнаружение совпадения URI - это способ, с помощью которого Bitwarden идентифицирует предложения по автозаполнению.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Регулярное выражение\" - это расширенный вариант с повышенным риском раскрытия учетных данных.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Начинается с\" - это расширенный вариант с повышенным риском раскрытия учетных данных.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Подробнее об обнаружении совпадений",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Расширенные настройки",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Предупреждение",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Успешно"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Создайте вложенную папку, добавив название родительской папки и символ \"/\". Пример: Сообщества/Форумы"
   },
+  "sendsTitleNoItems": {
+    "message": "Безопасная отправка конфиденциальной информации",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Безопасно обменивайтесь файлами и данными с кем угодно на любой платформе. Ваша информация надежно шифруется и доступ к ней ограничен.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Быстрое создание паролей"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Легко создавайте надежные и уникальные пароли, нажатием на кнопку,",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "чтобы обеспечить безопасность ваших логинов.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Легко создавайте надежные и уникальные пароли, нажатием на кнопку 'Сгенерировать пароль', чтобы обеспечить безопасность ваших логинов.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Экономьте время с помощью автозаполнения"
   },
@@ -3772,5 +3863,139 @@
     "message": "Узнайте больше об агенте SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Назначить коллекциям"
+  },
+  "assignToTheseCollections": {
+    "message": "Назначить этим коллекциям"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Только члены организации, имеющие доступ к этим коллекциям, смогут видеть элементы."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Только члены организации, имеющие доступ к этим коллекциям, смогут видеть элементы."
+  },
+  "noCollectionsAssigned": {
+    "message": "Коллекции не назначены"
+  },
+  "assign": {
+    "message": "Назначить"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Только члены организации, имеющие доступ к этим коллекциям, смогут видеть элементы."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Вы выбрали $TOTAL_COUNT$ элемента(-ов). Вы не можете обновить $READONLY_COUNT$ элемента(-ов), поскольку у вас нет прав на редактирование.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Выбрать коллекции для назначения"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ будут навсегда переданы выбранной организации. Вы больше не будете владельцем этих элементов.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ будут навсегда переданы $ORG$. Вы больше не будете владельцем этих элементов.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 элемент будет навсегда передан выбранной организации. Вы больше не будете владельцем этих элементов."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 элемент будет навсегда передан $ORG$. Вы больше не будете владельцем этих элементов.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Коллекции успешно назначены"
+  },
+  "nothingSelected": {
+    "message": "Вы ничего не выбрали."
+  },
+  "itemsMovedToOrg": {
+    "message": "Элементы перемещены в $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Элемент перемещен в $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Выбранные элементы перемещены в $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/si/messages.json b/apps/desktop/src/locales/si/messages.json
index 03124c345da..b50d0252f61 100644
--- a/apps/desktop/src/locales/si/messages.json
+++ b/apps/desktop/src/locales/si/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "අනන්‍යතාව"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "ආරක්ෂිත සටහන"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Other"
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/sk/messages.json b/apps/desktop/src/locales/sk/messages.json
index 3ee4a800a61..383e35f2826 100644
--- a/apps/desktop/src/locales/sk/messages.json
+++ b/apps/desktop/src/locales/sk/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identita"
   },
+  "typeNote": {
+    "message": "Poznámka"
+  },
   "typeSecureNote": {
     "message": "Zabezpečená poznámka"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Ostatné"
   },
-  "generatePassword": {
-    "message": "Generovať heslo"
-  },
-  "generatePassphrase": {
-    "message": "Generovať prístupovú frázu"
-  },
   "type": {
     "message": "Typ"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximálna veľkosť súboru je 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Vyžaduje sa migrácia šifrovacieho kľúča. Na aktualizáciu šifrovacieho kľúča sa prihláste cez webový trezor."
+  "legacyEncryptionUnsupported": {
+    "message": "Staršie šifrovanie už nie je podporované. Ak chcete obnoviť svoj účet, obráťte sa na podporu."
   },
   "editedFolder": {
     "message": "Priečinok upravený"
@@ -1643,11 +1640,11 @@
     "description": "A programming term, also known as 'RegEx'."
   },
   "matchDetection": {
-    "message": "Spôsob mapovania",
+    "message": "Zisťovanie zhody",
     "description": "URI match detection for auto-fill."
   },
   "defaultMatchDetection": {
-    "message": "Predvolené mapovanie",
+    "message": "Predvolené zisťovanie zhody",
     "description": "Default URI match detection for auto-fill."
   },
   "toggleOptions": {
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Obmedzený účet"
   },
+  "restrictCardTypeImport": {
+    "message": "Položky typu karta sa nedajú importovať"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Politika nastavená 1 alebo viacerými organizáciami vám bráni v importovaní kariet do vašich trezorov."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Heslo súboru\" a \"Potvrdiť heslo súboru\" sa nezhodujú."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Táto akcia je chránená. Ak chcete pokračovať, znova zadajte hlavné heslo a overte svoju totožnosť."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Hlavné heslo bolo úspešne nastavené"
+  },
   "updatedMasterPassword": {
     "message": "Hlavné heslo aktualizované"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Vaše hlavné heslo nespĺňa jednu alebo viacero podmienok vašej organizácie. Ak chcete získať prístup k trezoru, musíte teraz aktualizovať svoje hlavné heslo. Pokračovaním sa odhlásite z aktuálnej relácie a budete sa musieť znova prihlásiť. Aktívne relácie na iných zariadeniach môžu zostať aktívne až jednu hodinu."
   },
+  "changePasswordWarning": {
+    "message": "Po zmene hesla sa musíte prihlásiť pomocou nového hesla. Aktívne relácie na iných zariadeniach budú do jednej hodiny odhlásené."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Zmeňte hlavné heslo, aby ste dokončili obnovenie účtu."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Vaše hlavné heslo nespĺňa požiadavky tejto organizácie. Ak chcete pokračovať, zmeňte hlavné heslo."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Vaša organizácia zakázala šifrovanie dôveryhodného zariadenia. Na prístup k trezoru nastavte hlavné heslo."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Generátor používateľského mena"
   },
+  "generatePassword": {
+    "message": "Generovať heslo"
+  },
+  "generatePassphrase": {
+    "message": "Generovať prístupovú frázu"
+  },
+  "passwordGenerated": {
+    "message": "Heslo vygenerované"
+  },
+  "passphraseGenerated": {
+    "message": "Prístupová fráza vygenerovaná"
+  },
+  "usernameGenerated": {
+    "message": "Používateľské meno vygenerované"
+  },
+  "emailGenerated": {
+    "message": "E-mail vygenerovaný"
+  },
   "spinboxBoundariesHint": {
     "message": "Hodnota musí byť medzi $MIN$ a $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Použiť tento e-mail"
   },
+  "useThisPassword": {
+    "message": "Použiť toto heslo"
+  },
+  "useThisPassphrase": {
+    "message": "Použiť túto prístupovú frázu"
+  },
+  "useThisUsername": {
+    "message": "Použiť toto používateľské meno"
+  },
   "random": {
     "message": "Náhodné"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Nájdené slabé heslo v uniknuných údajoch. Na ochranu svojho účtu používajte silné a jedinečné heslo. Naozaj chcete používať toto heslo?"
   },
-  "useThisPassword": {
-    "message": "Použiť toto heslo"
-  },
-  "useThisUsername": {
-    "message": "Použiť toto používateľské meno"
-  },
   "checkForBreaches": {
     "message": "Skontrolovať známe úniky údajov pre toto heslo"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Žiadosť o schválenie správcom"
   },
+  "unableToCompleteLogin": {
+    "message": "Nepodarilo sa dokončiť prihlásenie"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Musíte sa prihlásiť na dôveryhodnom zariadení alebo požiadať správcu o priradenie hesla."
+  },
   "region": {
     "message": "Región"
   },
@@ -3508,6 +3550,30 @@
     "message": "Bežné formáty",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Zisťovanie zhody URI je spôsob, akým Bitwarden identifikuje návrhy na automatické vypĺňanie.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regulárny výraz\" je pokročilá možnosť so zvýšeným rizikom odhalenia prihlasovacích údajov.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Začína na\" je rozšírená možnosť so zvýšeným rizikom odhalenia prihlasovacích údajov.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Viac informácií o zisťovaní zhody",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Rozšírené možnosti",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Upozornenie",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Úspech"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Vnorte priečinok pridaním názvu nadradeného priečinka a znaku \"/\". Príklad: Sociálne siete/Fóra"
   },
+  "sendsTitleNoItems": {
+    "message": "Send, citlivé informácie bezpečne",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Bezpečne zdieľajte súbory a údaje s kýmkoľvek a na akejkoľvek platforme. Vaše informácie zostanú end-to-end zašifrované a zároveň sa obmedzí ich odhalenie.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Rýchle vytváranie hesiel"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Jednoducho vytvorte silné a jedinečné heslá kliknutím na",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "aby ste mohli ochrániť prihlasovacie údaje.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Jednoducho vytvorte silné a jedinečné heslá kliknutím na tlačidlo Generovať heslo, aby ste zabezpečili prihlasovacie údaje.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Ušetrite čas s automatickým vypĺňaním"
   },
@@ -3772,5 +3863,139 @@
     "message": "Viac informácií o agentovi SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Priradiť ku zbierkam"
+  },
+  "assignToTheseCollections": {
+    "message": "Priradiť k týmto zbierkam"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Položku si budú môcť pozrieť len členovia organizácie s prístupom k týmto zbierkam."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Položky si budú môcť pozrieť len členovia organizácie s prístupom k týmto zbierkam."
+  },
+  "noCollectionsAssigned": {
+    "message": "Neboli priradené žiadne zbierky"
+  },
+  "assign": {
+    "message": "Priradiť"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Položky si budú môcť pozrieť len členovia organizácie s prístupom k týmto zbierkam."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Vybrali ste položky ($TOTAL_COUNT$). Nemôžete aktualizovať $READONLY_COUNT$ položky(-iek), pretože nemáte oprávnenie na úpravu.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Vyberte zbierky na priradenie"
+  },
+  "personalItemsTransferWarning": {
+    "message": "Do vybranej organizácie sa natrvalo presunú $PERSONAL_ITEMS_COUNT$. Tieto položky už nebudete vlastniť.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "Do $ORG$ sa natrvalo presunú $PERSONAL_ITEMS_COUNT$. Tieto položky už nebudete vlastniť.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "Položka sa natrvalo presunie do vybranej organizácie. Už ju nebudete vlastniť."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "Položka sa natrvalo presunie do $ORG$. Už ju nebudete vlastniť.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Zbierky boli úspešne priradené"
+  },
+  "nothingSelected": {
+    "message": "Nič ste nevybrali."
+  },
+  "itemsMovedToOrg": {
+    "message": "Položky presunuté do $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Položka presunutá do $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Vybraté položky boli presunuté do $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/sl/messages.json b/apps/desktop/src/locales/sl/messages.json
index e1f7dcd578b..db25a4623ee 100644
--- a/apps/desktop/src/locales/sl/messages.json
+++ b/apps/desktop/src/locales/sl/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identiteta"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Varni zapisek"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Drugo"
   },
-  "generatePassword": {
-    "message": "Generiraj geslo"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Tip"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Največja velikost datoteke je 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Mapa je bila urejena"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Glavno geslo je bilo posodobljeno"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generiraj geslo"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/sr/messages.json b/apps/desktop/src/locales/sr/messages.json
index d13c28ae4da..514276fb136 100644
--- a/apps/desktop/src/locales/sr/messages.json
+++ b/apps/desktop/src/locales/sr/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Идентитет"
   },
+  "typeNote": {
+    "message": "Белешка"
+  },
   "typeSecureNote": {
     "message": "Сигурносна белешка"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Остало"
   },
-  "generatePassword": {
-    "message": "Генерисање лозинке"
-  },
-  "generatePassphrase": {
-    "message": "Генеришите приступну фразу"
-  },
   "type": {
     "message": "Тип"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Максимална величина је 500МБ."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Потребна је миграција кључа за шифровање. Пријавите се преко веб сефа да бисте ажурирали кључ за шифровање."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy енкрипција више није подржана. Молимо контактирајте подршку за повраћај налога."
   },
   "editedFolder": {
     "message": "Фасцикла измењена"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Налог је ограничен"
   },
+  "restrictCardTypeImport": {
+    "message": "Не могу увозити врсте картица"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Политика која је поставила 1 или више организација спречава вас да се увозе картице у сефу."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "Унете лозинке се не подударају."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Ова акција је заштићена. Да бисте наставили, поново унесите своју главну лозинку да бисте проверили идентитет."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Главна лозинка успешно постављена"
+  },
   "updatedMasterPassword": {
     "message": "Главна лозинка ажурирана"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ваша главна лозинка не испуњава једну или више смерница ваше организације. Да бисте приступили сефу, морате одмах да ажурирате главну лозинку. Ако наставите, одјавићете се са ваше тренутне сесије, што захтева да се поново пријавите. Активне сесије на другим уређајима могу да остану активне до један сат."
   },
+  "changePasswordWarning": {
+    "message": "Након промене лозинке, мораћете да се пријавите са новом лозинком. Активне сесије на другим уређајима биће одјављене у року од једног сата."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Промените главну лозинку да бисте завршили опоравак налога."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Ваша главна лозинка не испуњава захтеве ове организације. Промените главну лозинку да бисте наставили."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Ваша организација је онемогућила шифровање поузданог уређаја. Поставите главну лозинку за приступ вашем трезору."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Генератор корисничког имена"
   },
+  "generatePassword": {
+    "message": "Генерисање лозинке"
+  },
+  "generatePassphrase": {
+    "message": "Генеришите приступну фразу"
+  },
+  "passwordGenerated": {
+    "message": "Лозинка генерисана"
+  },
+  "passphraseGenerated": {
+    "message": "Приступна фраза је генерисана"
+  },
+  "usernameGenerated": {
+    "message": "Корисничко име генерисано"
+  },
+  "emailGenerated": {
+    "message": "Имејл генерисан"
+  },
   "spinboxBoundariesHint": {
     "message": "Вредност мора бити између $MIN$ и $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Користи овај имејл"
   },
+  "useThisPassword": {
+    "message": "Употреби ову лозинку"
+  },
+  "useThisPassphrase": {
+    "message": "Употреби ову приступну фразу"
+  },
+  "useThisUsername": {
+    "message": "Употреби ово корисничко име"
+  },
   "random": {
     "message": "Случајно"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Идентификована је слаба лозинка и пронађена у упаду података. Користите јаку и јединствену лозинку да заштитите свој налог. Да ли сте сигурни да желите да користите ову лозинку?"
   },
-  "useThisPassword": {
-    "message": "Употреби ову лозинку"
-  },
-  "useThisUsername": {
-    "message": "Употреби ово корисничко име"
-  },
   "checkForBreaches": {
     "message": "Проверите познате упада података за ову лозинку"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Затражити одобрење администратора"
   },
+  "unableToCompleteLogin": {
+    "message": "Није могуће завршити пријаву"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Потребно је да се пријавите на поузданом уређају или да замолите администратора да вам додели лозинку."
+  },
   "region": {
     "message": "Регион"
   },
@@ -3508,6 +3550,30 @@
     "message": "Уобичајени формати",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Детекција подударања URI-ја је начин на који Bitwarden идентификује предлоге за ауто-попуњавање.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "„Регуларни израз“ је напредна опција са повећаним ризиком од откривања акредитива.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "„Почиње са“ је напредна опција са повећаним ризиком од откривања акредитива.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Више о откривању подударања",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Напредне опције",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Упозорење",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Успех"
   },
@@ -3704,7 +3770,7 @@
     "message": "Променити ризичну лозинку"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Не можете уклонити колекције са дозволама само за приказ: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Угнездите фасциклу додавањем имена надређене фасцкле праћеног знаком „/“. Пример: Друштвени/Форуми"
   },
+  "sendsTitleNoItems": {
+    "message": "Шаљите бзбедно осетљиве информације",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Делите датотеке и податке безбедно са било ким, на било којој платформи. Ваше информације ће остати шифроване од почетка-до-краја уз ограничење изложености.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Брзо креирајте лозинке"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Лако креирајте снажне и јединствене лозинке кликом на",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "да вам помогне да задржите своје пријаве сигурно.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Лако креирајте снажне и јединствене лозинке кликом на дугме „Генерирате лозинку“ да вам помогне да чувате своје пријаве на сигурно.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Уштедите време са ауто-пуњењем"
   },
@@ -3772,5 +3863,139 @@
     "message": "Сазнајте више о SSH агенту",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Додели колекцијама"
+  },
+  "assignToTheseCollections": {
+    "message": "Додели овим колекцијама"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Само чланови организације са приступом овим збиркама ће моћи да виде ставку."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Само чланови организације са приступом овим збиркама ће моћи да виде ставке."
+  },
+  "noCollectionsAssigned": {
+    "message": "Није додељена ниједна колекција"
+  },
+  "assign": {
+    "message": "Додели"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Само чланови организације са приступом овим збиркама ће моћи да виде ставке."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Одабрали сте $TOTAL_COUNT$ ставки. Не можете да ажурирате $READONLY_COUNT$ од ставки јер немате дозволе за уређивање.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Изаберите колекције за доделу"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ биће трајно пребачени у изабрану организацију. Више нећете имати ове ставке.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ биће трајно пребачени у $ORG$. Више нећете имати ове ставке.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 ставка биће трајно пребачена у изабрану организацију. Више нећете имати ову ставку."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 ставка биће трајно пребачена у $ORG$. Више нећете имати ову ставку.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Успешно додељене колекције"
+  },
+  "nothingSelected": {
+    "message": "Нисте ништа изабрали."
+  },
+  "itemsMovedToOrg": {
+    "message": "Ставке премештене у $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Ставка премештена у $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Одабране ставке премештене у $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/sv/messages.json b/apps/desktop/src/locales/sv/messages.json
index e4fbc6f5773..20140cb7ae0 100644
--- a/apps/desktop/src/locales/sv/messages.json
+++ b/apps/desktop/src/locales/sv/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identitet"
   },
+  "typeNote": {
+    "message": "Anteckning"
+  },
   "typeSecureNote": {
     "message": "Säker anteckning"
   },
@@ -208,52 +211,52 @@
     "message": "En ny SSH-nyckel har genererats"
   },
   "sshKeyWrongPassword": {
-    "message": "The password you entered is incorrect."
+    "message": "Lösenordet du har angett är felaktigt."
   },
   "importSshKey": {
-    "message": "Import"
+    "message": "Importera"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirm password"
+    "message": "Bekräfta lösenord"
   },
   "enterSshKeyPasswordDesc": {
-    "message": "Enter the password for the SSH key."
+    "message": "Ange lösenordet för SSH-nyckeln."
   },
   "enterSshKeyPassword": {
-    "message": "Enter password"
+    "message": "Ange lösenord"
   },
   "sshAgentUnlockRequired": {
-    "message": "Please unlock your vault to approve the SSH key request."
+    "message": "Lås upp ditt valv för att godkänna begäran om SSH-nyckel."
   },
   "sshAgentUnlockTimeout": {
-    "message": "SSH key request timed out."
+    "message": "Begäran om SSH-nyckel timade ut."
   },
   "enableSshAgent": {
     "message": "Aktivera SSH-agent"
   },
   "enableSshAgentDesc": {
-    "message": "Enable the SSH agent to sign SSH requests right from your Bitwarden vault."
+    "message": "Aktivera SSH-agenten för att signera SSH-förfrågningar direkt från ditt Bitwarden-valv."
   },
   "enableSshAgentHelp": {
-    "message": "The SSH agent is a service targeted at developers that allows you to sign SSH requests directly from your Bitwarden vault."
+    "message": "SSH-agenten är en tjänst riktad till utvecklare som gör att du kan signera SSH-förfrågningar direkt från ditt Bitwarden-valv."
   },
   "sshAgentPromptBehavior": {
-    "message": "Ask for authorization when using SSH agent"
+    "message": "Be om auktorisering när du använder SSH-agent"
   },
   "sshAgentPromptBehaviorDesc": {
-    "message": "Choose how to handle SSH-agent authorization requests."
+    "message": "Välj hur du vill hantera SSH-agentens auktoriseringsbegäran."
   },
   "sshAgentPromptBehaviorHelp": {
-    "message": "Remember SSH authorizations"
+    "message": "Kom ihåg SSH-behörigheter"
   },
   "sshAgentPromptBehaviorAlways": {
-    "message": "Always"
+    "message": "Alltid"
   },
   "sshAgentPromptBehaviorNever": {
-    "message": "Never"
+    "message": "Aldrig"
   },
   "sshAgentPromptBehaviorRememberUntilLock": {
-    "message": "Remember until vault is locked"
+    "message": "Kom ihåg tills valvet är låst"
   },
   "premiumRequired": {
     "message": "Premium krävs"
@@ -268,17 +271,17 @@
     "message": "Fel"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Dekrypteringsfel"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "Bitwarden kunde inte dekryptera valvföremålet/valvföremålen som listas nedan."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "Kontakta kundtjänst",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "för att undvika ytterligare dataförlust.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "january": {
@@ -351,12 +354,6 @@
   "other": {
     "message": "Annat"
   },
-  "generatePassword": {
-    "message": "Generera lösenord"
-  },
-  "generatePassphrase": {
-    "message": "Generera lösenfras"
-  },
   "type": {
     "message": "Typ"
   },
@@ -412,16 +409,16 @@
     "message": "Autentiseringsnyckel (TOTP)"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "Autentiseringsnyckel"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "Alternativ för automatisk ifyllning"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "Webbplats (URI)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "Webbplats (URI) $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -431,49 +428,49 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Webbplats tillagd"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "Lägg till webbplats"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "Ta bort webbplats"
   },
   "owner": {
-    "message": "Owner"
+    "message": "Ägare"
   },
   "addField": {
-    "message": "Add field"
+    "message": "Lägg till fält"
   },
   "editField": {
-    "message": "Edit field"
+    "message": "Redigera fält"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "Är du säker på att du vill radera den här bilagan permanent?"
   },
   "fieldType": {
-    "message": "Field type"
+    "message": "Fälttyp"
   },
   "fieldLabel": {
-    "message": "Field label"
+    "message": "Fältetikett"
   },
   "add": {
-    "message": "Add"
+    "message": "Lägg till"
   },
   "textHelpText": {
-    "message": "Use text fields for data like security questions"
+    "message": "Använd textfält för data som säkerhetsfrågor"
   },
   "hiddenHelpText": {
-    "message": "Use hidden fields for sensitive data like a password"
+    "message": "Använd dolda fält för känsliga uppgifter som lösenord"
   },
   "checkBoxHelpText": {
-    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+    "message": "Använd kryssrutor om du vill fylla i en kryssruta i ett formulär automatiskt, t.ex. för att komma ihåg e-post"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "Använd ett länkat fält när du har problem med autofyll för en viss webbplats."
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "Ange fältets html-id, namn, aria-label eller platshållare."
   },
   "folder": {
     "message": "Mapp"
@@ -501,7 +498,7 @@
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "cfTypeCheckbox": {
-    "message": "Checkbox"
+    "message": "Kryssruta"
   },
   "linkedValue": {
     "message": "Länkat värde",
@@ -560,7 +557,7 @@
     "message": "Kopiera lösenord"
   },
   "regenerateSshKey": {
-    "message": "Regenerate SSH key"
+    "message": "Återskapa SSH-nyckel"
   },
   "copySshPrivateKey": {
     "message": "Kopiera privat SSH-nyckel"
@@ -660,7 +657,7 @@
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "generatorPolicyInEffect": {
-    "message": "Enterprise policy requirements have been applied to your generator options.",
+    "message": "Företagets policykrav har tillämpats på dina generatoralternativ.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "searchCollection": {
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximal filstorlek är 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Migrering av krypteringsnyckel krävs. Logga in på webbvalvet för att uppdatera din krypteringsnyckel."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy-kryptering stöds inte längre. Vänligen kontakta support för att återställa ditt konto."
   },
   "editedFolder": {
     "message": "Mapp sparad"
@@ -725,7 +722,7 @@
     "message": "Ställ in ett starkt lösenord"
   },
   "finishCreatingYourAccountBySettingAPassword": {
-    "message": "Finish creating your account by setting a password"
+    "message": "Avsluta skapandet av ditt konto genom att ange ett lösenord"
   },
   "logIn": {
     "message": "Logga in"
@@ -734,13 +731,13 @@
     "message": "Logga in på Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Enter the code sent to your email"
+    "message": "Ange koden som skickats till din e-post"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "Ange koden från din autentiseringsapp"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Press your YubiKey to authenticate"
+    "message": "Tryck på din YubiKey för att autentisera"
   },
   "logInWithPasskey": {
     "message": "Logga in med nyckel"
@@ -795,7 +792,7 @@
     "message": "Huvudlösenordsledtråd"
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "Lösenordsstyrka $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -804,10 +801,10 @@
     }
   },
   "joinOrganization": {
-    "message": "Join organization"
+    "message": "Gå med i organisation"
   },
   "joinOrganizationName": {
-    "message": "Join $ORGANIZATIONNAME$",
+    "message": "Gå med i $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -816,13 +813,13 @@
     }
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Finish joining this organization by setting a master password."
+    "message": "Avsluta anslutningen till denna organisation genom att ange ett huvudlösenord."
   },
   "settings": {
     "message": "Inställningar"
   },
   "accountEmail": {
-    "message": "Account email"
+    "message": "Konto E-post"
   },
   "requestHint": {
     "message": "Begär ledtråd"
@@ -831,7 +828,7 @@
     "message": "Begär lösenordsledtråd"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Enter your account email address and your password hint will be sent to you"
+    "message": "Ange din e-postadress för kontot så skickas en lösenordshint till dig"
   },
   "getMasterPasswordHint": {
     "message": "Hämta huvudlösenordsledtråd"
@@ -907,10 +904,10 @@
     "message": "Verifieringskod krävs."
   },
   "webauthnCancelOrTimeout": {
-    "message": "The authentication was cancelled or took too long. Please try again."
+    "message": "Autentiseringen avbröts eller tog för lång tid. Vänligen försök igen."
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "Öppna i ny flik"
   },
   "invalidVerificationCode": {
     "message": "Ogiltig verifieringskod"
@@ -928,14 +925,14 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "Fråga inte igen på den här enheten under 30 dagar"
   },
   "selectAnotherMethod": {
-    "message": "Select another method",
+    "message": "Välj en annan metod",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use your recovery code"
+    "message": "Använd din återställningskod"
   },
   "insertU2f": {
     "message": "Anslut din säkerhetsnyckel till datorns USB-port. Om den har en knapp, tryck på den."
@@ -950,7 +947,7 @@
     "message": "Autentiseringsapp"
   },
   "authenticatorAppDescV2": {
-    "message": "Enter a code generated by an authenticator app like Bitwarden Authenticator.",
+    "message": "Ange en kod som genereras av en autentiseringsapp som Bitwarden Authenticator.",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
@@ -968,13 +965,13 @@
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "verifyYourIdentity": {
-    "message": "Verify your Identity"
+    "message": "Verifiera din identitet"
   },
   "weDontRecognizeThisDevice": {
-    "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
+    "message": "Vi känner inte igen den här enheten. Ange koden som skickats till din e-post för att verifiera din identitet."
   },
   "continueLoggingIn": {
-    "message": "Continue logging in"
+    "message": "Fortsätt logga in"
   },
   "webAuthnTitle": {
     "message": "FIDO2 WebAuthn"
@@ -1001,19 +998,19 @@
     "message": "Alternativ för tvåstegsverifiering"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "Välj tvåstegsinloggningsmetod"
   },
   "selfHostedEnvironment": {
     "message": "Egen-hostad miljö"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com"
+    "message": "Ange bas-URL:en för din lokala Bitwarden-installation. Exempel: https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
-    "message": "For advanced configuration, you can specify the base URL of each service independently."
+    "message": "För avancerad konfiguration kan du ange bas-URL:en för varje tjänst separat."
   },
   "selfHostedEnvFormInvalid": {
-    "message": "You must add either the base Server URL or at least one custom environment."
+    "message": "Du måste lägga till antingen basserverns URL eller minst en anpassad miljö."
   },
   "customEnvironment": {
     "message": "Anpassad miljö"
@@ -1022,13 +1019,13 @@
     "message": "Server-URL"
   },
   "authenticationTimeout": {
-    "message": "Authentication timeout"
+    "message": "Timeout för autentisering"
   },
   "authenticationSessionTimedOut": {
-    "message": "The authentication session timed out. Please restart the login process."
+    "message": "Autentiseringssessionen timade ut. Vänligen starta om inloggningsprocessen."
   },
   "selfHostBaseUrl": {
-    "message": "Self-host server URL",
+    "message": "URL för server med egen värd",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "apiUrl": {
@@ -1059,7 +1056,7 @@
     "message": "Nej"
   },
   "location": {
-    "message": "Location"
+    "message": "Plats"
   },
   "overwritePassword": {
     "message": "Skriv över lösenord"
@@ -1080,13 +1077,13 @@
     "message": "Din inloggningssession har löpt ut."
   },
   "restartRegistration": {
-    "message": "Restart registration"
+    "message": "Starta om registreringen"
   },
   "expiredLink": {
-    "message": "Expired link"
+    "message": "Utgången länk"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "Please restart registration or try logging in."
+    "message": "Starta om registreringen eller försök logga in."
   },
   "youMayAlreadyHaveAnAccount": {
     "message": "Har du redan skapat ett konto?"
@@ -1215,7 +1212,7 @@
     "message": "Valvets tidsgräns"
   },
   "vaultTimeout1": {
-    "message": "Timeout"
+    "message": "Tidsgräns"
   },
   "vaultTimeoutDesc": {
     "message": "Välj när valvets tidsgräns överskrids och den valda åtgärden utförs."
@@ -1468,7 +1465,7 @@
     "message": "Köp Premium"
   },
   "premiumPurchaseAlertV2": {
-    "message": "You can purchase Premium from your account settings on the Bitwarden web app."
+    "message": "Du kan köpa Premium från dina kontoinställningar i Bitwardens webbapp."
   },
   "premiumCurrentMember": {
     "message": "Du är en premium-medlem!"
@@ -1492,13 +1489,13 @@
     "message": "Lösenordshistorik"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "Generatorns historia"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "Rensa generatorhistorik"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "Om du fortsätter kommer alla poster att raderas permanent från generatorns historik. Är du säker på att du vill fortsätta?"
   },
   "clear": {
     "message": "Rensa",
@@ -1508,13 +1505,13 @@
     "message": "Det finns inga lösenord att visa."
   },
   "clearHistory": {
-    "message": "Clear history"
+    "message": "Töm historik"
   },
   "nothingToShow": {
-    "message": "Nothing to show"
+    "message": "Inget att visa"
   },
   "nothingGeneratedRecently": {
-    "message": "You haven't generated anything recently"
+    "message": "Du har inte genererat något nyligen"
   },
   "undo": {
     "message": "Ångra"
@@ -1591,13 +1588,13 @@
     }
   },
   "copySuccessful": {
-    "message": "Copy Successful"
+    "message": "Kopiering lyckades"
   },
   "errorRefreshingAccessToken": {
-    "message": "Access Token Refresh Error"
+    "message": "Fel vid uppdatering av åtkomsttoken"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "No refresh token or API keys found. Please try logging out and logging back in."
+    "message": "Ingen uppdateringstoken eller API-nyckel hittades. Försök att logga ut och logga in igen."
   },
   "help": {
     "message": "Hjälp"
@@ -1696,31 +1693,37 @@
     "message": "Filformat"
   },
   "fileEncryptedExportWarningDesc": {
-    "message": "This file export will be password protected and require the file password to decrypt."
+    "message": "Den här filexporten kommer att vara lösenordsskyddad och kräver filens lösenord för att dekryptera."
   },
   "filePassword": {
-    "message": "File password"
+    "message": "Fillösenord"
   },
   "exportPasswordDescription": {
-    "message": "This password will be used to export and import this file"
+    "message": "Detta lösenord kommer att användas för att exportera och importera denna fil"
   },
   "accountRestrictedOptionDescription": {
-    "message": "Use your account encryption key, derived from your account's username and Master Password, to encrypt the export and restrict import to only the current Bitwarden account."
+    "message": "Använd ditt kontos krypteringsnyckel, som härrör från ditt kontos användarnamn och huvudlösenord, för att kryptera exporten och begränsa importen till endast det aktuella Bitwarden-kontot."
   },
   "passwordProtected": {
-    "message": "Password protected"
+    "message": "Lösenordsskyddad"
   },
   "passwordProtectedOptionDescription": {
-    "message": "Set a file password to encrypt the export and import it to any Bitwarden account using the password for decryption."
+    "message": "Ange ett lösenord för filen för att kryptera exporten och importera den till valfritt Bitwarden-konto med lösenordet för dekryptering."
   },
   "exportTypeHeading": {
     "message": "Exporttyp"
   },
   "accountRestricted": {
-    "message": "Account restricted"
+    "message": "Konto med restriktioner"
+  },
+  "restrictCardTypeImport": {
+    "message": "Det går inte att importera typer av kortposter"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "En policy som har fastställts av en eller flera organisationer hindrar dig från att importera kort till dina valv."
   },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
-    "message": "“File password”  and “Confirm file password“ do not match."
+    "message": "\"Fillösenord\" och \"Bekräfta fillösenord\" stämmer inte överens."
   },
   "done": {
     "message": "Klar"
@@ -1797,7 +1800,7 @@
     "message": "Ytterligare inställningar för Windows Hello"
   },
   "unlockWithPolkit": {
-    "message": "Unlock with system authentication"
+    "message": "Lås upp med systemautentisering"
   },
   "windowsHelloConsentMessage": {
     "message": "Bekräfta för Bitwarden."
@@ -1815,7 +1818,7 @@
     "message": "Be om Windows Hello vid appstart"
   },
   "autoPromptPolkit": {
-    "message": "Ask for system authentication on launch"
+    "message": "Be om systemautentisering vid start"
   },
   "autoPromptTouchId": {
     "message": "Be om Touch ID vid appstart"
@@ -1824,13 +1827,13 @@
     "message": "Kräv lösenord eller PIN-kod vid appstart"
   },
   "requirePasswordWithoutPinOnStart": {
-    "message": "Require password on app start"
+    "message": "Kräv lösenord vid appstart"
   },
   "recommendedForSecurity": {
     "message": "Rekommenderas för säkerhet."
   },
   "lockWithMasterPassOnRestart1": {
-    "message": "Lock with master password on restart"
+    "message": "Lås med huvudlösenord vid omstart"
   },
   "deleteAccount": {
     "message": "Radera konto"
@@ -1845,7 +1848,7 @@
     "message": "Kan inte radera konto"
   },
   "cannotDeleteAccountDesc": {
-    "message": "This action cannot be completed because your account is owned by an organization. Contact your organization administrator for additional details."
+    "message": "Den här åtgärden kan inte slutföras eftersom ditt konto ägs av en organisation. Kontakta din organisationsadministratör om du vill ha mer information."
   },
   "accountDeleted": {
     "message": "Kontot raderades"
@@ -1967,10 +1970,10 @@
     }
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "Begär kort"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "$BRAND$ detaljer",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -1979,32 +1982,32 @@
     }
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "Läs mer om autentiseringsverktyg"
   },
   "copyTOTP": {
-    "message": "Copy Authenticator key (TOTP)"
+    "message": "Kopiera autentiseringsnyckel (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "Gör 2-stegsverifiering sömlös"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden kan lagra och fylla i 2-stegs verifieringskoder. Kopiera och klistra in nyckeln i detta fält."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden kan lagra och fylla i 2-stegsverifieringskoder. Välj kameraikonen för att ta en skärmdump av den här webbplatsens QR-kod för autentisering, eller kopiera och klistra in nyckeln i det här fältet."
   },
   "premium": {
     "message": "Premium",
     "description": "Premium membership"
   },
   "freeOrgsCannotUseAttachments": {
-    "message": "Free organizations cannot use attachments"
+    "message": "Fria organisationer kan inte använda bilagor"
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "1 fält behöver din uppmärksamhet."
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "$COUNT$-fälten behöver din uppmärksamhet.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2013,10 +2016,10 @@
     }
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Utgånget kort"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "Om du har förnyat kortet ska du uppdatera kortinformationen"
   },
   "verificationRequired": {
     "message": "Verifiering krävs",
@@ -2077,13 +2080,13 @@
     "message": "Få råd, tillkännagivanden och forskningsmöjligheter från Bitwarden i din inkorg."
   },
   "unsubscribe": {
-    "message": "Unsubscribe"
+    "message": "Avsluta prenumeration"
   },
   "atAnyTime": {
     "message": "när som helst."
   },
   "byContinuingYouAgreeToThe": {
-    "message": "By continuing, you agree to the"
+    "message": "Genom att fortsätta samtycker du till"
   },
   "and": {
     "message": "och"
@@ -2098,7 +2101,7 @@
     "message": "Tillåt webbläsarintegration"
   },
   "enableBrowserIntegrationDesc1": {
-    "message": "Used to allow biometric unlock in browsers that are not Safari."
+    "message": "Används för att tillåta biometrisk upplåsning i webbläsare som inte är Safari."
   },
   "enableDuckDuckGoBrowserIntegration": {
     "message": "Tillåt integration av webbläsaren DuckDuckGo"
@@ -2167,16 +2170,16 @@
     "message": "Biometri i webbläsaren kräver att biometri på skrivbordet aktiveras i inställningarna först."
   },
   "biometricsManualSetupTitle": {
-    "message": "Automatic setup not available"
+    "message": "Automatisk inställning inte tillgänglig"
   },
   "biometricsManualSetupDesc": {
-    "message": "Due to the installation method, biometrics support could not be automatically enabled. Would you like to open the documentation on how to do this manually?"
+    "message": "På grund av installationsmetoden kunde biometriskt stöd inte aktiveras automatiskt. Vill du öppna dokumentationen om hur du gör detta manuellt?"
   },
   "personalOwnershipSubmitError": {
     "message": "På grund av en av företagets policyer är du begränsad från att spara objekt till ditt personliga valv. Ändra ägarskap till en organisation och välj från tillgängliga samlingar."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Ditt nya lösenord får inte vara samma som ditt aktuella lösenord."
   },
   "hintEqualsPassword": {
     "message": "Din lösenordsledtråd får inte vara samma som ditt lösenord."
@@ -2188,13 +2191,13 @@
     "message": "En organisationspolicy har blockerat importering av objekt till ditt personliga valv."
   },
   "personalDetails": {
-    "message": "Personal details"
+    "message": "Personuppgifter"
   },
   "identification": {
-    "message": "Identification"
+    "message": "Identifiering"
   },
   "contactInfo": {
-    "message": "Contact information"
+    "message": "Kontaktinformation"
   },
   "allSends": {
     "message": "Alla Sends",
@@ -2360,10 +2363,10 @@
     "message": "Autentisera WebAuthn"
   },
   "readSecurityKey": {
-    "message": "Read security key"
+    "message": "Läs säkerhetsnyckel"
   },
   "awaitingSecurityKeyInteraction": {
-    "message": "Awaiting security key interaction..."
+    "message": "Väntar på interaktion med säkerhetsnyckel..."
   },
   "hideEmail": {
     "message": "Dölj min e-postadress för mottagare."
@@ -2375,7 +2378,7 @@
     "message": "E-postverifiering krävs"
   },
   "emailVerifiedV2": {
-    "message": "Email verified"
+    "message": "E-post verifierad"
   },
   "emailVerificationRequiredDesc": {
     "message": "Du måste verifiera din e-post för att använda den här funktionen."
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Denna åtgärd är skyddad. För att fortsätta, vänligen verifiera din identitet genom att ange ditt huvudlösenord."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Masterlösenordet har ställts in"
+  },
   "updatedMasterPassword": {
     "message": "Huvudlösenord uppdaterades"
   },
@@ -2401,8 +2407,17 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ditt huvudlösenord följer inte ett eller flera av din organisations regler. För att komma åt ditt valv så måste du ändra ditt huvudlösenord nu. Om du gör det kommer du att loggas du ut ur din nuvarande session så du måste logga in på nytt. Aktiva sessioner på andra enheter kommer fortsatt vara aktiva i upp till en timme."
   },
+  "changePasswordWarning": {
+    "message": "När du har ändrat ditt lösenord måste du logga in med det nya lösenordet. Aktiva sessioner på andra enheter kommer att loggas ut inom en timme."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Ändra ditt huvudlösenord för att slutföra återställningen av kontot."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Ditt huvudlösenord uppfyller inte organisationens krav. Ändra ditt huvudlösenord för att fortsätta."
+  },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
+    "message": "Din organisation har inaktiverat betrodd enhetskryptering. Ange ett huvudlösenord för att komma åt ditt valv."
   },
   "tryAgain": {
     "message": "Försök igen"
@@ -2447,7 +2462,7 @@
     "message": "Minuter"
   },
   "vaultTimeoutPolicyInEffect1": {
-    "message": "$HOURS$ hour(s) and $MINUTES$ minute(s) maximum.",
+    "message": "$HOURS$ timmar och $MINUTES$ minuter maximalt.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2489,7 +2504,7 @@
     "message": "Ditt valvs tid för timeout överskrider de begränsningar som fastställts av din organisation."
   },
   "inviteAccepted": {
-    "message": "Invitation accepted"
+    "message": "Inbjudan accepterad"
   },
   "resetPasswordPolicyAutoEnroll": {
     "message": "Automatiskt deltagande"
@@ -2513,13 +2528,13 @@
     "message": "Huvudlösenord togs bort"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Ett huvudlösenord krävs inte längre för medlemmar i följande organisation. Vänligen bekräfta domänen nedan med din organisationsadministratör."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Organisationsnamn"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Key Connector-domän"
   },
   "leaveOrganization": {
     "message": "Lämna organisation"
@@ -2582,7 +2597,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "Endast de enskilda valvobjekten inklusive bilagor som är associerade med $EMAIL$ exporteras. Organisationens valvobjekt kommer inte att inkluderas",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2591,10 +2606,10 @@
     }
   },
   "exportingOrganizationVaultTitle": {
-    "message": "Exporting organization vault"
+    "message": "Exportera organisationsvalv"
   },
   "exportingOrganizationVaultDesc": {
-    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. Items in individual vaults or other organizations will not be included.",
+    "message": "Endast det organisationsvalv som är associerat med $ORGANIZATION$ exporteras. Objekt i enskilda valv eller andra organisationer kommer inte att inkluderas.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2628,13 +2643,31 @@
     "message": "Generera användarnamn"
   },
   "generateEmail": {
-    "message": "Generate email"
+    "message": "Generera e-post"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Generator för användarnamn"
+  },
+  "generatePassword": {
+    "message": "Generera lösenord"
+  },
+  "generatePassphrase": {
+    "message": "Generera lösenfras"
+  },
+  "passwordGenerated": {
+    "message": "Lösenord genererat"
+  },
+  "passphraseGenerated": {
+    "message": "Lösenfras genererad"
+  },
+  "usernameGenerated": {
+    "message": "Användarnamn genererat"
+  },
+  "emailGenerated": {
+    "message": "E-post genererad"
   },
   "spinboxBoundariesHint": {
-    "message": "Value must be between $MIN$ and $MAX$.",
+    "message": "Värdet måste ligga mellan $MIN$ och $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
     "placeholders": {
       "min": {
@@ -2648,7 +2681,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " Use $RECOMMENDED$ characters or more to generate a strong password.",
+    "message": " Använd $RECOMMENDED$ tecken eller fler för att skapa ett starkt lösenord.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -2658,7 +2691,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Use $RECOMMENDED$ words or more to generate a strong passphrase.",
+    "message": " Använd $RECOMMENDED$ ord eller mer för att generera en stark lösenfras.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -2684,7 +2717,16 @@
     "message": "Använd din domäns konfigurerade catch-all inkorg."
   },
   "useThisEmail": {
-    "message": "Use this email"
+    "message": "Använd denna e-post"
+  },
+  "useThisPassword": {
+    "message": "Använd detta lösenord"
+  },
+  "useThisPassphrase": {
+    "message": "Använd denna lösenfras"
+  },
+  "useThisUsername": {
+    "message": "Använd detta användarnamn"
   },
   "random": {
     "message": "Slumpmässig"
@@ -2718,7 +2760,7 @@
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Choose a domain that is supported by the selected service",
+    "message": "Välj en domän som stöds av den valda tjänsten",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
@@ -2774,7 +2816,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "message": "$SERVICENAME$ avvisade din begäran. Vänligen kontakta din tjänsteleverantör för hjälp.",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2784,7 +2826,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ avvisade din begäran: $ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -2897,25 +2939,25 @@
     "message": "Inloggning påbörjad"
   },
   "logInRequestSent": {
-    "message": "Request sent"
+    "message": "Begäran skickad"
   },
   "notificationSentDevice": {
     "message": "En avisering har skickats till din enhet."
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "A notification was sent to your device"
+    "message": "Ett meddelande har skickats till din enhet"
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the "
+    "message": "Lås upp Bitwarden på din enhet eller på "
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "webbapp"
   },
   "notificationSentDevicePart2": {
-    "message": "Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Kontrollera att fingeravtrycksfrasen stämmer överens med den nedan innan du godkänner."
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "Behöver du ett annat alternativ?"
   },
   "fingerprintMatchInfo": {
     "message": "Se till att ditt valv är upplåst och att fingeravtrycksfrasen matchar på den andra enheten."
@@ -2924,13 +2966,13 @@
     "message": "Fingeravtrycksfras"
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "You will be notified once the request is approved"
+    "message": "Du kommer att få ett meddelande när begäran har godkänts"
   },
   "needAnotherOption": {
     "message": "\"Logga in med enhet\" måste ställas in i inställningarna i Bitwardens app. Behöver du ett annat alternativ?"
   },
   "viewAllLogInOptions": {
-    "message": "View all log in options"
+    "message": "Visa alla inloggningsalternativ"
   },
   "viewAllLoginOptions": {
     "message": "Visa alla inloggningsalternativ"
@@ -2943,10 +2985,10 @@
     "description": "'Character count' describes a feature that displays a number next to each character of the password."
   },
   "areYouTryingToAccessYourAccount": {
-    "message": "Are you trying to access your account?"
+    "message": "Försöker du komma åt ditt konto?"
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "Åtkomstförsök via $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2964,10 +3006,10 @@
     "message": "Tid"
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "Bekräfta åtkomst"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "Neka åtkomst"
   },
   "logInConfirmedForEmailOnDevice": {
     "message": "Inloggning bekräftad för $EMAIL$ på $DEVICE$",
@@ -3004,7 +3046,7 @@
     "message": "Denna begäran är inte längre giltig."
   },
   "confirmAccessAttempt": {
-    "message": "Confirm access attempt for $EMAIL$",
+    "message": "Bekräfta åtkomstförsök för $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3016,7 +3058,7 @@
     "message": "Inloggning begärd"
   },
   "accountAccessRequested": {
-    "message": "Account access requested"
+    "message": "Kontoåtkomst begärd"
   },
   "creatingAccountOn": {
     "message": "Skapa konto på"
@@ -3051,29 +3093,23 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Lösenordet är svagt och avslöjades vid ett dataintrång. Använd ett starkt och unikt lösenord för att skydda ditt konto. Är det säkert att du vill använda detta lösenord?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Kontrollera kända dataintrång för detta lösenord"
   },
   "loggedInExclamation": {
-    "message": "Logged in!"
+    "message": "Inloggad!"
   },
   "important": {
     "message": "Viktigt:"
   },
   "accessing": {
-    "message": "Accessing"
+    "message": "Åtkomst via"
   },
   "accessTokenUnableToBeDecrypted": {
-    "message": "You have been logged out because your access token could not be decrypted. Please log in again to resolve this issue."
+    "message": "Du har blivit utloggad eftersom din access token inte kunde dekrypteras. Vänligen logga in igen för att lösa problemet."
   },
   "refreshTokenSecureStorageRetrievalFailure": {
-    "message": "You have been logged out because your refresh token could not be retrieved. Please log in again to resolve this issue."
+    "message": "Du har blivit utloggad eftersom din uppdateringstoken inte kunde hämtas. Logga in igen för att lösa problemet."
   },
   "masterPasswordHint": {
     "message": "Ditt huvudlösenord kan inte återställas om du glömmer det!"
@@ -3094,16 +3130,16 @@
     "message": "Rekommenderade inställningsuppdateringar"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Remember this device to make future logins seamless"
+    "message": "Kom ihåg den här enheten för att göra framtida inloggningar smidiga"
   },
   "deviceApprovalRequired": {
     "message": "Godkännande av enhet krävs. Välj ett godkännandealternativ nedan:"
   },
   "deviceApprovalRequiredV2": {
-    "message": "Device approval required"
+    "message": "Godkännande av utrustning krävs"
   },
   "selectAnApprovalOptionBelow": {
-    "message": "Select an approval option below"
+    "message": "Välj ett godkännandealternativ nedan"
   },
   "rememberThisDevice": {
     "message": "Kom ihåg denna enhet"
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Be om godkännande från administratör"
   },
+  "unableToCompleteLogin": {
+    "message": "Kunde inte slutföra inloggningen"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Du måste logga in på en betrodd enhet eller fråga din administratör att tilldela dig ett lösenord."
+  },
   "region": {
     "message": "Region"
   },
@@ -3152,34 +3194,34 @@
     "message": "Användarens e-postadress saknas"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "E-postadressen för aktiv användare hittades inte. Loggar ut dig."
   },
   "deviceTrusted": {
     "message": "Enhet betrodd"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Lita på organisation"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Förtroende"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Lita inte på"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Organisationen är inte betrodd"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "För att skydda ditt konto ska du bara bekräfta om du har beviljat nödåtkomst till den här användaren och om fingeravtrycket matchar det som visas på användarens konto"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "För att skydda ditt konto ska du bara fortsätta om du är medlem i den här organisationen, har aktiverat kontoåterställning och om det fingeravtryck som visas nedan matchar organisationens fingeravtryck."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Den här organisationen har en företagspolicy som gör att du kan registrera dig till kontoåterställning. Registreringen gör det möjligt för organisationens administratörer att ändra ditt lösenord. Fortsätt bara om du känner igen den här organisationen och om fingeravtrycksfrasen som visas nedan matchar organisationens fingeravtryck."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Lita på användare"
   },
   "inputRequired": {
     "message": "Inmatning är obligatoriskt."
@@ -3282,7 +3324,7 @@
     "message": "Undermeny"
   },
   "toggleSideNavigation": {
-    "message": "Toggle side navigation"
+    "message": "Växla sidonavigering"
   },
   "skipToContent": {
     "message": "Hoppa till innehåll"
@@ -3340,19 +3382,19 @@
     }
   },
   "duoHealthCheckResultsInNullAuthUrlError": {
-    "message": "Error connecting with the Duo service. Use a different two-step login method or contact Duo for assistance."
+    "message": "Fel vid anslutning till Duo-tjänsten. Använd en annan tvåstegsinloggningsmetod eller kontakta Duo för hjälp."
   },
   "duoRequiredByOrgForAccount": {
     "message": "Duo tvåstegsverifiering krävs för ditt konto."
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "Tvåstegsinloggning med Duo krävs för ditt konto. Följ stegen nedan för att slutföra inloggningen."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "Följ stegen nedan för att slutföra inloggningen."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Följ stegen nedan för att slutföra inloggningen med din säkerhetsnyckel."
   },
   "launchDuo": {
     "message": "Starta Duo i webbläsaren"
@@ -3429,7 +3471,7 @@
     "message": "Bekräfta fillösenord"
   },
   "exportSuccess": {
-    "message": "Vault data exported"
+    "message": "Valvdata exporteras"
   },
   "multifactorAuthenticationCancelled": {
     "message": "Flerfaktorsautentisering avbruten"
@@ -3508,6 +3550,30 @@
     "message": "Vanliga format",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Detektering av URI-matchning är hur Bitwarden identifierar autofyllförslag.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Reguljär uttryck\" är ett avancerat alternativ med ökad risk för att röja inloggningsuppgifter.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Börjar med\" är ett avancerat alternativ med ökad risk för att röja inloggningsuppgifter.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Mer om matchdetektering",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Avancerade alternativ",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Varning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Lyckades"
   },
@@ -3570,39 +3636,39 @@
     "message": "Data"
   },
   "fileSends": {
-    "message": "File Sends"
+    "message": "Skicka filer"
   },
   "textSends": {
-    "message": "Text Sends"
+    "message": "Text skickas"
   },
   "ssoError": {
-    "message": "No free ports could be found for the sso login."
+    "message": "Inga lediga portar kunde hittas för sso-inloggningen."
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "Säkert lösenord genererat! Glöm inte att även uppdatera ditt lösenord på hemsidan."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Använd generatorn",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "för att skapa ett starkt unikt lösenord",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+    "message": "Biometrisk upplåsning är inte tillgänglig eftersom upplåsning med PIN-kod eller lösenord krävs först."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Biometric unlock is currently unavailable."
+    "message": "Biometrisk upplåsning är för närvarande inte tillgänglig."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Biometrisk upplåsning är inte tillgänglig på grund av felkonfigurerade systemfiler."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Biometrisk upplåsning är inte tillgänglig på grund av felkonfigurerade systemfiler."
   },
   "biometricsStatusHelptextNotEnabledLocally": {
-    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "message": "Biometrisk upplåsning är inte tillgänglig eftersom den inte är aktiverad för $EMAIL$ i Bitwardens skrivbordsapp.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3611,58 +3677,58 @@
     }
   },
   "biometricsStatusHelptextUnavailableReasonUnknown": {
-    "message": "Biometric unlock is currently unavailable for an unknown reason."
+    "message": "Biometrisk upplåsning är för närvarande inte tillgänglig av okänd anledning."
   },
   "itemDetails": {
-    "message": "Item details"
+    "message": "Objektdetaljer"
   },
   "itemName": {
-    "message": "Item name"
+    "message": "Objektnamn"
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "Inloggningsuppgifter"
   },
   "additionalOptions": {
-    "message": "Additional options"
+    "message": "Ytterligare alternativ"
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "Objekthistorik"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "Senast redigerad"
   },
   "upload": {
-    "message": "Upload"
+    "message": "Ladda upp"
   },
   "authorize": {
-    "message": "Authorize"
+    "message": "Auktorisera"
   },
   "deny": {
-    "message": "Deny"
+    "message": "Neka"
   },
   "sshkeyApprovalTitle": {
-    "message": "Confirm SSH key usage"
+    "message": "Bekräfta användning av SSH-nyckel"
   },
   "agentForwardingWarningTitle": {
-    "message": "Warning: Agent Forwarding"
+    "message": "Varning: Agent vidarebefordran"
   },
   "agentForwardingWarningText": {
-    "message": "This request comes from a remote device that you are logged into"
+    "message": "Denna begäran kommer från en fjärrenhet som du är inloggad på"
   },
   "sshkeyApprovalMessageInfix": {
     "message": "begär tillgång till"
   },
   "sshkeyApprovalMessageSuffix": {
-    "message": "in order to"
+    "message": "för att"
   },
   "sshActionLogin": {
-    "message": "authenticate to a server"
+    "message": "autentisera till en server"
   },
   "sshActionSign": {
-    "message": "sign a message"
+    "message": "signera ett meddelande"
   },
   "sshActionGitSign": {
-    "message": "sign a git commit"
+    "message": "signera en git commit"
   },
   "unknownApplication": {
     "message": "En applikation"
@@ -3671,40 +3737,40 @@
     "message": "SSH-nyckeln är ogiltig"
   },
   "sshKeyTypeUnsupported": {
-    "message": "The SSH key type is not supported"
+    "message": "SSH-nyckeltypen stöds inte"
   },
   "importSshKeyFromClipboard": {
     "message": "Importera nyckel från urklipp"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "SSH-nyckel importerad framgångsrikt"
   },
   "fileSavedToDevice": {
-    "message": "File saved to device. Manage from your device downloads."
+    "message": "Fil sparad till enhet. Hantera nedladdningar från din enhet."
   },
   "allowScreenshots": {
-    "message": "Allow screen capture"
+    "message": "Tillåt skärmdump"
   },
   "allowScreenshotsDesc": {
-    "message": "Allow the Bitwarden desktop application to be captured in screenshots and viewed in remote desktop sessions. Disabling this will prevent access on some external displays."
+    "message": "Tillåt att Bitwardens skrivbordsapplikation fångas i skärmdumpar och visas i fjärrskrivbordssessioner. Om du avaktiverar detta kommer åtkomst att förhindras på vissa externa skärmar."
   },
   "confirmWindowStillVisibleTitle": {
-    "message": "Confirm window still visible"
+    "message": "Bekräftelsefönstret är fortfarande synligt"
   },
   "confirmWindowStillVisibleContent": {
-    "message": "Please confirm that the window is still visible."
+    "message": "Bekräfta att fönstret fortfarande är synligt."
   },
   "updateBrowserOrDisableFingerprintDialogTitle": {
-    "message": "Extension update required"
+    "message": "Uppdatering av förlängning krävs"
   },
   "updateBrowserOrDisableFingerprintDialogMessage": {
-    "message": "The browser extension you are using is out of date. Please update it or disable browser integration fingerprint validation in the desktop app settings."
+    "message": "Det webbläsartillägg du använder är föråldrat. Uppdatera det eller inaktivera validering av fingeravtryck i webbläsaren i inställningarna för skrivbordsappen."
   },
   "changeAtRiskPassword": {
-    "message": "Change at-risk password"
+    "message": "Ändra lösenord för riskgrupper"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Du kan inte ta bort samlingar med behörigheten Visa endast: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3713,64 +3779,223 @@
     }
   },
   "move": {
-    "message": "Move"
+    "message": "Flytta"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Ny mapp"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "Mappnamn"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Nästla en mapp genom att lägga till namnet på den överordnade mappen följt av \"/\". Exempel: Sociala/Forums"
+  },
+  "sendsTitleNoItems": {
+    "message": "Skicka känslig information på ett säkert sätt",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Dela filer och data på ett säkert sätt med vem som helst, på vilken plattform som helst. Din information kommer att förbli krypterad från början till slut samtidigt som exponeringen begränsas.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Skapa lösenord snabbt"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Skapa enkelt starka och unika lösenord genom att klicka på",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "för att hjälpa dig att hålla dina inloggningar säkra.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Skapa enkelt starka och unika lösenord genom att klicka på knappen Generera lösenord så att du kan hålla dina inloggningar säkra.",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Spara tid med autofyll"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Inkludera ett",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Webbplats",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "så att den här inloggningen visas som ett autofyllningsförslag.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Sömlös utcheckning online"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Med kort kan du enkelt autofylla betalningsformulär på ett säkert och exakt sätt."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Förenkla skapandet av konton"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Med identiteter kan du snabbt autofylla långa registrerings- eller kontaktformulär."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Håll ditt känsliga data säkert"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Med anteckningar kan du säkert lagra känslig information som bank- eller försäkringsuppgifter."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Utvecklarvänlig SSH-åtkomst"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Förvara dina nycklar och anslut till SSH-agenten för snabb, krypterad autentisering.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Läs mer om SSH-agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Tilldela till samlingar"
+  },
+  "assignToTheseCollections": {
+    "message": "Tilldela till dessa samlingar"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Endast organisationsmedlemmar med tillgång till dessa samlingar kan se objektet."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Endast organisationsmedlemmar med tillgång till dessa samlingar kan se objekten."
+  },
+  "noCollectionsAssigned": {
+    "message": "Inga samlingar har tilldelats"
+  },
+  "assign": {
+    "message": "Tilldela"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Endast organisationsmedlemmar med tillgång till dessa samlingar kan se objekten."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Du har valt $TOTAL_COUNT$ artiklar. Du kan inte uppdatera $READONLY_COUNT$ av objekten eftersom du inte har redigeringsbehörighet.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Välj samlingar som ska tilldelas"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ kommer att överföras permanent till den valda organisationen. Du kommer inte längre att äga dessa föremål.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ kommer att överföras permanent till $ORG$. Du kommer inte längre att äga dessa objekt.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 objekt kommer att permanent överföras till den valda organisationen. Du kommer inte längre att äga detta objekt."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 objekt kommer att överföras permanent till $ORG$. Du kommer inte längre att äga det här objektet.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Framgångsrikt tilldelade samlingar"
+  },
+  "nothingSelected": {
+    "message": "Du har inte valt något."
+  },
+  "itemsMovedToOrg": {
+    "message": "Objekten flyttade till $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Objekt flyttat till $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Valda objekt flyttade till $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/te/messages.json b/apps/desktop/src/locales/te/messages.json
index 17495f96785..304d07ee3cd 100644
--- a/apps/desktop/src/locales/te/messages.json
+++ b/apps/desktop/src/locales/te/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Identity"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "Secure note"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Other"
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "Type"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maximum file size is 500 MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Folder saved"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/th/messages.json b/apps/desktop/src/locales/th/messages.json
index 34669ba21c4..678346257f2 100644
--- a/apps/desktop/src/locales/th/messages.json
+++ b/apps/desktop/src/locales/th/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "ข้อมูลระบุตัวตน"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "บันทึกการรักษาปลอดภัย"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "อื่น ๆ"
   },
-  "generatePassword": {
-    "message": "สร้างรหัสผ่าน"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "type": {
     "message": "ประเภท"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "ขนาดไฟล์สูงสุดคือ 500 MB"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Encryption key migration required. Please login through the web vault to update your encryption key."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "แก้​ไข​โฟลเดอร์แล้ว"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Account restricted"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Updated master password"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "สร้างรหัสผ่าน"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "random": {
     "message": "Random"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
-  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Region"
   },
@@ -3508,6 +3550,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Success"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/tr/messages.json b/apps/desktop/src/locales/tr/messages.json
index 43a134abfb0..255f03025d0 100644
--- a/apps/desktop/src/locales/tr/messages.json
+++ b/apps/desktop/src/locales/tr/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Kimlik"
   },
+  "typeNote": {
+    "message": "Not"
+  },
   "typeSecureNote": {
     "message": "Güvenli not"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Diğer"
   },
-  "generatePassword": {
-    "message": "Parola oluştur"
-  },
-  "generatePassphrase": {
-    "message": "Parola üret"
-  },
   "type": {
     "message": "Tür"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "Maksimum dosya boyutu 500 MB'dir."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Şifreleme anahtarınızın güncellenmesi gerekiyor. Şifreleme anahtarınızı güncellemek için lütfen web kasasına giriş yapın."
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "Klasör kaydedildi"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Hesap kısıtlı"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "\"Dosya parolası\" ile \"Dosya parolasını onaylayın\" eşleşmiyor."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Bu işleme devam etmek için lütfen ana parolanızı yeniden girin."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Ana parola başarıyla ayarlandı"
+  },
   "updatedMasterPassword": {
     "message": "Ana parola güncellendi"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ana parolanız kuruluş ilkelerinizi karşılamıyor. Kasanıza erişmek için ana parolanızı güncellemelisiniz. Devam ettiğinizde oturumunuz kapanacak ve yeniden oturum açmanız gerekecektir. Diğer cihazlardaki aktif oturumlar bir saate kadar aktif kalabilir."
   },
+  "changePasswordWarning": {
+    "message": "Parolanızı değiştirdikten sonra yeni parolanızyla tekrar giriş yapmanız gerekecektir. Diğer cihazlarınızdaki aktif oturumlar bir saat içinde kapatılacaktır."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Hesap kurtarmayı tamamlamak için ana parolanızı değiştirin."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Ana parolanız bu kuruluşun gereksinimlerini karşılamıyor. Devam için ana parolanızı değiştirin."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Kullanıcı adı üreteci"
   },
+  "generatePassword": {
+    "message": "Parola oluştur"
+  },
+  "generatePassphrase": {
+    "message": "Parola üret"
+  },
+  "passwordGenerated": {
+    "message": "Parola üretildi"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Kullanıcı adı üretildi"
+  },
+  "emailGenerated": {
+    "message": "E-posta üretildi"
+  },
   "spinboxBoundariesHint": {
     "message": "Değer $MIN$ ile $MAX$ arasında olmalıdır.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Bu e-postayı kullan"
   },
+  "useThisPassword": {
+    "message": "Bu parolayı kullan"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "Bu kullanıcı adını kullan"
+  },
   "random": {
     "message": "Rasgele"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Hem zayıf hem de veri ihlalinde yer alan bir tespit edildi. Hesabınızı korumak için güçlü bir parola seçin ve o parolayı başka yerlerde kullanmayın. Bu parolayı kullanmak istediğinizden emin misiniz?"
   },
-  "useThisPassword": {
-    "message": "Bu parolayı kullan"
-  },
-  "useThisUsername": {
-    "message": "Bu kullanıcı adını kullan"
-  },
   "checkForBreaches": {
     "message": "Bilinen veri ihlallerinde bu parolayı kontrol et"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Yönetici onayı iste"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "Bölge"
   },
@@ -3508,6 +3550,30 @@
     "message": "Sık kullanılan biçimler",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Gelişmiş seçenekler",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Uyarı",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Başarılı"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Üst klasörün adının sonuna “/” ekleyerek klasörleri iç içe koyabilirsiniz. Örnek: Sosyal/Forumlar"
   },
+  "sendsTitleNoItems": {
+    "message": "Hassas bilgileri güvenle paylaşın",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Dosyaları ve verileri istediğiniz kişilerle, istediğiniz platformda paylaşın. Bilgileriniz başkalarının eline geçmemesi için uçtan şifrelenecektir.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Hızlıca parola oluşturun"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Otomatik doldurmayla zaman kazanın"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/uk/messages.json b/apps/desktop/src/locales/uk/messages.json
index a4a63da8089..649b3af622f 100644
--- a/apps/desktop/src/locales/uk/messages.json
+++ b/apps/desktop/src/locales/uk/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Посвідчення"
   },
+  "typeNote": {
+    "message": "Нотатка"
+  },
   "typeSecureNote": {
     "message": "Захищена нотатка"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "Інше"
   },
-  "generatePassword": {
-    "message": "Генерувати пароль"
-  },
-  "generatePassphrase": {
-    "message": "Генерувати парольну фразу"
-  },
   "type": {
     "message": "Тип"
   },
@@ -695,10 +692,10 @@
     "message": "Оберіть файл"
   },
   "maxFileSize": {
-    "message": "Максимальний розмір файлу 500 Мб."
+    "message": "Максимальний розмір файлу 500 МБ."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Потрібно перенести ключ шифрування. Увійдіть у вебсховище та оновіть свій ключ шифрування."
+  "legacyEncryptionUnsupported": {
+    "message": "Застаріле шифрування більше не підтримується. Зверніться до служби підтримки, щоб відновити обліковий запис."
   },
   "editedFolder": {
     "message": "Теку збережено"
@@ -1639,7 +1636,7 @@
     "message": "Починається з"
   },
   "regEx": {
-    "message": "Звичайний вираз",
+    "message": "Регулярний вираз",
     "description": "A programming term, also known as 'RegEx'."
   },
   "matchDetection": {
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "Обмежено обліковим записом"
   },
+  "restrictCardTypeImport": {
+    "message": "Не вдається імпортувати записи карток"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Політика принаймні однієї організації не дозволяє вам імпортувати записи карток до сховища."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "Пароль файлу та підтвердження пароля відрізняються."
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "Ця дія захищена. Щоб продовжити, повторно введіть головний пароль."
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Головний пароль успішно встановлено"
+  },
   "updatedMasterPassword": {
     "message": "Головний пароль оновлено"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "Ваш головний пароль не відповідає одній або більше політикам вашої організації. Щоб отримати доступ до сховища, вам необхідно оновити свій головний пароль зараз. Продовживши, ви вийдете з поточного сеансу, після чого потрібно буде повторно виконати вхід. Сеанси на інших пристроях можуть залишатися активними протягом однієї години."
   },
+  "changePasswordWarning": {
+    "message": "Після зміни пароля потрібно буде ввійти в систему з новим паролем. Активні сеанси на інших пристроях буде завершено протягом години."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Змініть свій головний пароль, щоб завершити відновлення облікового запису."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Ваш головний пароль не відповідає вимогам цієї організації. Змініть свій головний пароль, щоб продовжити."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Ваша організація вимкнула шифрування довірених пристроїв. Встановіть головний пароль для доступу до сховища."
   },
@@ -2513,13 +2528,13 @@
     "message": "Головний пароль вилучено"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Головний пароль більше не є обов'язковим для учасників зазначеної організації. Підтвердьте вказаний нижче домен з адміністратором вашої організації."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Назва організації"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Домен Key Connector"
   },
   "leaveOrganization": {
     "message": "Покинути організацію"
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Генератор імені користувача"
   },
+  "generatePassword": {
+    "message": "Генерувати пароль"
+  },
+  "generatePassphrase": {
+    "message": "Генерувати парольну фразу"
+  },
+  "passwordGenerated": {
+    "message": "Пароль згенеровано"
+  },
+  "passphraseGenerated": {
+    "message": "Парольну фразу згенеровано"
+  },
+  "usernameGenerated": {
+    "message": "Ім'я користувача згенеровано"
+  },
+  "emailGenerated": {
+    "message": "Адресу е-пошти згенеровано"
+  },
   "spinboxBoundariesHint": {
     "message": "Значення має бути між $MIN$ та $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Використати цю е-пошту"
   },
+  "useThisPassword": {
+    "message": "Використати цей пароль"
+  },
+  "useThisPassphrase": {
+    "message": "Використати цю парольну фразу"
+  },
+  "useThisUsername": {
+    "message": "Використати це ім'я користувача"
+  },
   "random": {
     "message": "Випадково"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Виявлено слабкий пароль, який знайдено у витоку даних. Використовуйте надійний та унікальний пароль для захисту свого облікового запису. Ви дійсно хочете використати цей пароль?"
   },
-  "useThisPassword": {
-    "message": "Використати цей пароль"
-  },
-  "useThisUsername": {
-    "message": "Використати це ім'я користувача"
-  },
   "checkForBreaches": {
     "message": "Перевірити відомі витоки даних для цього пароля"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "Запит підтвердження адміністратора"
   },
+  "unableToCompleteLogin": {
+    "message": "Не вдалося завершити вхід"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Ви повинні ввійти до системи на довіреному пристрої або попросити адміністратора призначити вам пароль."
+  },
   "region": {
     "message": "Регіон"
   },
@@ -3508,6 +3550,30 @@
     "message": "Поширені формати",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Виявлення збігів URI – це спосіб ідентифікації пропозицій автозаповнення Bitwarden.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "Регулярний вираз – це функція, що має підвищений ризик розкриття облікових даних, призначена для досвідчених користувачів.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Починається з\" – це функція, що має підвищений ризик розкриття облікових даних, призначена для досвідчених користувачів.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Докладніше про виявлення збігів",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Додаткові налаштування",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Попередження",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Успішно"
   },
@@ -3704,7 +3770,7 @@
     "message": "Змінити ризикований пароль"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Ви не можете вилучати збірки, маючи дозвіл лише на перегляд: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3716,13 +3782,38 @@
     "message": "Перемістити"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Нова тека"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "Назва теки"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Зробіть теку вкладеною, вказавши після основної теки \"/\". Наприклад: Обговорення/Форуми"
+  },
+  "sendsTitleNoItems": {
+    "message": "Безпечно надсилайте конфіденційну інформацію",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Безпечно діліться файлами й даними з ким завгодно, на будь-якій платформі. Ваша інформація наскрізно зашифрована та має обмежений доступ.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Швидко створюйте паролі"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Легко створюйте надійні та унікальні паролі, натиснувши на",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "щоб зберегти свої записи в безпеці.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Легко створюйте надійні та унікальні паролі, натиснувши кнопку Генерувати пароль, щоб зберегти свої записи в безпеці.",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
     "message": "Заощаджуйте час з автозаповненням"
@@ -3772,5 +3863,139 @@
     "message": "Докладніше про SSH-агента",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Призначити до збірок"
+  },
+  "assignToTheseCollections": {
+    "message": "Призначити до цих збірок"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Лише учасники організації з доступом до цих збірок зможуть переглядати запис."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Лише учасники організації з доступом до цих збірок зможуть переглядати записи."
+  },
+  "noCollectionsAssigned": {
+    "message": "Не призначено жодної збірки"
+  },
+  "assign": {
+    "message": "Призначити"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Лише учасники організації з доступом до цих збірок зможуть переглядати записи."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Ви вибрали $TOTAL_COUNT$ записів. Ви не можете оновити $READONLY_COUNT$ записів, тому що у вас немає дозволу на редагування.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Оберіть збірки для призначення"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ буде остаточно перенесено до вибраної організації. Ви більше не будете власником цих елементів.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ буде остаточно перенесено до $ORG$. Ви більше не будете власником цих елементів.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 запис буде остаточно перенесено до вибраної організації. Ви більше не будете власником цього запису."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 запис буде остаточно перенесено до $ORG$. Ви більше не будете власником цього запису.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Збірки успішно призначено"
+  },
+  "nothingSelected": {
+    "message": "Ви нічого не вибрали."
+  },
+  "itemsMovedToOrg": {
+    "message": "Записи переміщено до $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Запис переміщено до $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Вибрані записи переміщено до $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/vi/messages.json b/apps/desktop/src/locales/vi/messages.json
index 4ab9257691c..42246285f80 100644
--- a/apps/desktop/src/locales/vi/messages.json
+++ b/apps/desktop/src/locales/vi/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "Danh tính"
   },
+  "typeNote": {
+    "message": "Ghi chú"
+  },
   "typeSecureNote": {
     "message": "Ghi chú bảo mật"
   },
@@ -33,13 +36,13 @@
     "message": "Thư mục"
   },
   "collections": {
-    "message": "Các Bộ Sưu Tập"
+    "message": "Các bộ sưu tập"
   },
   "searchVault": {
     "message": "Tìm kiếm trong Kho"
   },
   "addItem": {
-    "message": "Thêm"
+    "message": "Thêm mục"
   },
   "shared": {
     "message": "Đã chia sẻ"
@@ -70,19 +73,19 @@
     "message": "Chọn một tổ chức mà bạn muốn chuyển mục này đến. Việc chuyển đến một tổ chức sẽ chuyển quyền sở hữu mục này cho tổ chức đó. Bạn sẽ không còn là chủ sở hữu trực tiếp của mục này khi đã chuyển."
   },
   "attachments": {
-    "message": "Đính kèm"
+    "message": "Tệp đính kèm"
   },
   "viewItem": {
-    "message": "Chi tiết"
+    "message": "Xem mục"
   },
   "name": {
     "message": "Tên"
   },
   "uri": {
-    "message": "Đường dẫn"
+    "message": "Đường dẫn (URI)"
   },
   "uriPosition": {
-    "message": "URL $POSITION$",
+    "message": "Đường dẫn $POSITION$",
     "description": "A listing of URIs. Ex: URI 1, URI 2, URI 3, etc.",
     "placeholders": {
       "position": {
@@ -92,19 +95,19 @@
     }
   },
   "newUri": {
-    "message": "URI Mới"
+    "message": "Đường dẫn mới"
   },
   "username": {
-    "message": "Tên người dùng"
+    "message": "Tên đăng nhập"
   },
   "password": {
     "message": "Mật khẩu"
   },
   "passphrase": {
-    "message": "Cụm từ mật khẩu"
+    "message": "Cụm mật khẩu"
   },
   "editItem": {
-    "message": "Chỉnh sửa"
+    "message": "Chỉnh sửa mục"
   },
   "emailAddress": {
     "message": "Địa chỉ email"
@@ -113,7 +116,7 @@
     "message": "Mã xác thực (TOTP)"
   },
   "website": {
-    "message": "Địa chỉ"
+    "message": "Trang web"
   },
   "notes": {
     "message": "Ghi chú"
@@ -129,10 +132,10 @@
     "description": "Copy value to clipboard"
   },
   "minimizeOnCopyToClipboard": {
-    "message": "Thu nhỏ sau khi sao chép vào khay nhớ tạm"
+    "message": "Thu nhỏ sau khi sao chép vào bảng nhớ tạm"
   },
   "minimizeOnCopyToClipboardDesc": {
-    "message": "Thu nhỏ ứng dụng sau khi sao chép thông tin của một mục vào khay nhớ tạm."
+    "message": "Thu nhỏ ứng dụng sau khi sao chép thông tin của một mục vào bảng nhớ tạm."
   },
   "toggleVisibility": {
     "message": "Bật/tắt khả năng hiển thị"
@@ -157,7 +160,7 @@
     "message": "Mã bảo mật"
   },
   "identityName": {
-    "message": "Tên danh tính"
+    "message": "Tên định danh"
   },
   "company": {
     "message": "Công ty"
@@ -169,7 +172,7 @@
     "message": "Số hộ chiếu"
   },
   "licenseNumber": {
-    "message": "Số giấy phép"
+    "message": "Số giấy phép lái xe"
   },
   "email": {
     "message": "Email"
@@ -181,16 +184,16 @@
     "message": "Địa chỉ"
   },
   "sshPrivateKey": {
-    "message": "Khóa riêng SSH"
+    "message": "Khóa riêng tư"
   },
   "sshPublicKey": {
-    "message": "Khóa công khai SSH"
+    "message": "Khóa công khai"
   },
   "sshFingerprint": {
-    "message": "Mã vân tay SSH"
+    "message": "Vân tay"
   },
   "sshKeyAlgorithm": {
-    "message": "Loại thuật toán"
+    "message": "Kiểu khoá"
   },
   "sshKeyAlgorithmED25519": {
     "message": "ED25519"
@@ -208,10 +211,10 @@
     "message": "Khóa SSH mới đã được tạo"
   },
   "sshKeyWrongPassword": {
-    "message": "Mật khẩu bạn đã nhập không chính xác."
+    "message": "Mật khẩu bạn đã nhập không đúng."
   },
   "importSshKey": {
-    "message": "Nhập khóa"
+    "message": "Nhập"
   },
   "confirmSshKeyPassword": {
     "message": "Xác nhận mật khẩu"
@@ -226,7 +229,7 @@
     "message": "Vui lòng mở khóa kho lưu trữ của bạn để phê duyệt yêu cầu khóa SSH."
   },
   "sshAgentUnlockTimeout": {
-    "message": "Hết thời gian chờ yêu cầu khóa SSH."
+    "message": "Yêu cầu khóa SSH đã hết thời gian."
   },
   "enableSshAgent": {
     "message": "Bật SSH agent"
@@ -241,10 +244,10 @@
     "message": "Yêu cầu cấp quyền khi sử dụng SSH agent"
   },
   "sshAgentPromptBehaviorDesc": {
-    "message": "Chọn cách xử lý các yêu cầu cấp quyền của SSH-agent."
+    "message": "Chọn cách xử lý yêu cầu ủy quyền SSH-agent."
   },
   "sshAgentPromptBehaviorHelp": {
-    "message": "Ghi nhớ các quyền SSH"
+    "message": "Nhớ các ủy quyền SSH"
   },
   "sshAgentPromptBehaviorAlways": {
     "message": "Luôn luôn"
@@ -253,13 +256,13 @@
     "message": "Không bao giờ"
   },
   "sshAgentPromptBehaviorRememberUntilLock": {
-    "message": "Ghi nhớ cho đến khi kho lưu trữ bị khóa"
+    "message": "Ghi nhớ đến khi khóa kho lưu trữ"
   },
   "premiumRequired": {
-    "message": "Cần có tài khoản cao cấp"
+    "message": "Cần có tài khoản Cao cấp"
   },
   "premiumRequiredDesc": {
-    "message": "Cần là thành viên cao cấp để sử dụng tính năng này."
+    "message": "Cần là thành viên Cao cấp để sử dụng tính năng này."
   },
   "errorOccurred": {
     "message": "Đã xảy ra lỗi."
@@ -271,7 +274,7 @@
     "message": "Lỗi giải mã"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden không thể giải mã các kho lưu trữ được liệt kê dưới đây."
+    "message": "Bitwarden không thể giải mã các mục trong kho lưu trữ được liệt kê bên dưới."
   },
   "contactCSToAvoidDataLossPart1": {
     "message": "Liên hệ hỗ trợ khách hàng thành công",
@@ -351,12 +354,6 @@
   "other": {
     "message": "Khác"
   },
-  "generatePassword": {
-    "message": "Tạo mật khẩu"
-  },
-  "generatePassphrase": {
-    "message": "Tạo cụm mật khẩu"
-  },
   "type": {
     "message": "Loại"
   },
@@ -370,7 +367,7 @@
     "message": "Họ"
   },
   "fullName": {
-    "message": "Tên đầy đủ"
+    "message": "Họ và tên"
   },
   "address1": {
     "message": "Địa chỉ 1"
@@ -382,7 +379,7 @@
     "message": "Địa chỉ 3"
   },
   "cityTown": {
-    "message": "Quận/Huyện/Thị trấn"
+    "message": "Xã / Phường"
   },
   "stateProvince": {
     "message": "Tỉnh/Thành Phố"
@@ -391,7 +388,7 @@
     "message": "Mã bưu chính"
   },
   "country": {
-    "message": "Quốc Gia"
+    "message": "Quốc gia"
   },
   "save": {
     "message": "Lưu"
@@ -449,13 +446,13 @@
     "message": "Chỉnh sửa trường"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Bạn có chắc muốn xóa vĩnh viễn tệp đính kèm này không?"
+    "message": "Bạn có chắc chắn muốn xóa vĩnh viễn tệp đính kèm này không?"
   },
   "fieldType": {
     "message": "Loại trường"
   },
   "fieldLabel": {
-    "message": "Nhãn trường"
+    "message": "Tiêu đề trường"
   },
   "add": {
     "message": "Thêm"
@@ -464,16 +461,16 @@
     "message": "Sử dụng các trường văn bản cho dữ liệu như câu hỏi bảo mật"
   },
   "hiddenHelpText": {
-    "message": "Sử dụng trường ẩn cho dữ liệu nhạy cảm như mật khẩu"
+    "message": "Sử dụng các trường ẩn để lưu dữ liệu nhạy cảm như mật khẩu"
   },
   "checkBoxHelpText": {
     "message": "Dùng các ô tích chọn nếu bạn muốn tự động điền vào ô tích chọn của biểu mẫu, chẳng hạn như ghi nhớ email"
   },
   "linkedHelpText": {
-    "message": "Sử dụng trường liên kết khi bạn gặp sự cố tự động điền trên một trang web cụ thể."
+    "message": "Sử dụng trường liên kết khi bạn gặp vấn đề với tính năng tự động điền trên một trang web cụ thể."
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "Nhập html id, name, aria-label hoặc placeholder của các trường."
   },
   "folder": {
     "message": "Thư mục"
@@ -501,7 +498,7 @@
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "cfTypeCheckbox": {
-    "message": "Checkbox"
+    "message": "Hộp chọn"
   },
   "linkedValue": {
     "message": "Giá trị được liên kết",
@@ -529,19 +526,19 @@
     "message": "Xoá tệp đính kèm"
   },
   "deleteItemConfirmation": {
-    "message": "Bạn có chắc muốn cho vào thùng rác?"
+    "message": "Bạn có chắc muốn cho nó vào thùng rác?"
   },
   "deletedItem": {
     "message": "Mục đã được cho vào thùng rác"
   },
   "overwritePasswordConfirmation": {
-    "message": "Bạn có chắc chắn muốn ghi đè mật khẩu hiện tại không?"
+    "message": "Bạn có chắc chắn muốn ghi đè lên mật khẩu hiện tại không?"
   },
   "overwriteUsername": {
-    "message": "Ghi đè tên người dùng"
+    "message": "Ghi đè tên đăng nhập"
   },
   "overwriteUsernameConfirmation": {
-    "message": "Bạn có chắc muốn ghi đè lên tên người dùng hiện tại không?"
+    "message": "Bạn có chắc chắn muốn ghi đè tên đăng nhập hiện tại không?"
   },
   "noneFolder": {
     "message": "Chưa phân loại",
@@ -557,23 +554,23 @@
     "message": "Tạo lại mật khẩu"
   },
   "copyPassword": {
-    "message": "Sao chép Mật khẩu"
+    "message": "Sao chép mật khẩu"
   },
   "regenerateSshKey": {
-    "message": "Regenerate SSH key"
+    "message": "Tạo lại khóa SSH"
   },
   "copySshPrivateKey": {
-    "message": "Copy SSH private key"
+    "message": "Sao chép khóa riêng tư SSH"
   },
   "copyPassphrase": {
-    "message": "Copy passphrase",
+    "message": "Sao chép cụm mật khẩu",
     "description": "Copy passphrase to clipboard"
   },
   "copyUri": {
-    "message": "Sao chép URI"
+    "message": "Sao chép đường dẫn"
   },
   "copyVerificationCodeTotp": {
-    "message": "Sao chép Mã xác thực (TOTP)"
+    "message": "Sao chép mã xác thực (TOTP)"
   },
   "length": {
     "message": "Độ dài"
@@ -586,7 +583,7 @@
     "description": "deprecated. Use uppercaseLabel instead."
   },
   "lowercase": {
-    "message": "Chữ in thường (a-z)",
+    "message": "Chữ thường (a-z)",
     "description": "deprecated. Use lowercaseLabel instead."
   },
   "numbers": {
@@ -597,11 +594,11 @@
     "message": "Ký tự đặc biệt (!@#$%^&*)"
   },
   "include": {
-    "message": "Include",
+    "message": "Bao gồm",
     "description": "Card header for password generator include block"
   },
   "uppercaseDescription": {
-    "message": "Include uppercase characters",
+    "message": "Bao gồm các ký tự viết hoa",
     "description": "Tooltip for the password generator uppercase character checkbox"
   },
   "uppercaseLabel": {
@@ -609,7 +606,7 @@
     "description": "Label for the password generator uppercase character checkbox"
   },
   "lowercaseDescription": {
-    "message": "Include lowercase characters",
+    "message": "Bao gồm các ký tự viết thường",
     "description": "Full description for the password generator lowercase character checkbox"
   },
   "lowercaseLabel": {
@@ -617,7 +614,7 @@
     "description": "Label for the password generator lowercase character checkbox"
   },
   "numbersDescription": {
-    "message": "Include numbers",
+    "message": "Bao gồm cả số",
     "description": "Full description for the password generator numbers checkbox"
   },
   "numbersLabel": {
@@ -625,14 +622,14 @@
     "description": "Label for the password generator numbers checkbox"
   },
   "specialCharactersDescription": {
-    "message": "Include special characters",
+    "message": "Bao gồm các ký tự đặc biệt",
     "description": "Full description for the password generator special characters checkbox"
   },
   "numWords": {
-    "message": "Số lượng chữ"
+    "message": "Số lượng từ"
   },
   "wordSeparator": {
-    "message": "Dấu tách từ"
+    "message": "Dấu phân cách từ"
   },
   "capitalize": {
     "message": "Viết hoa",
@@ -645,22 +642,22 @@
     "message": "Đóng"
   },
   "minNumbers": {
-    "message": "Số chữ số"
+    "message": "Số kí tự tối thiểu"
   },
   "minSpecial": {
-    "message": "Số kí tự đặc biệt",
+    "message": "Số kí tự đặc biệt tối thiểu",
     "description": "Minimum Special Characters"
   },
   "ambiguous": {
-    "message": "Tránh các ký tự dễ gây nhầm lẫn",
+    "message": "Tránh các ký tự dễ nhầm lẫn",
     "description": "deprecated. Use avoidAmbiguous instead."
   },
   "avoidAmbiguous": {
-    "message": "Avoid ambiguous characters",
+    "message": "Tránh các ký tự dễ nhầm lẫn",
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "generatorPolicyInEffect": {
-    "message": "Enterprise policy requirements have been applied to your generator options.",
+    "message": "Các yêu cầu chính sách của doanh nghiệp đã được áp dụng cho các tùy chọn trình tạo của bạn.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "searchCollection": {
@@ -670,10 +667,10 @@
     "message": "Tìm kiếm thư mục"
   },
   "searchFavorites": {
-    "message": "Tìm trong danh sách Yêu thích"
+    "message": "Tìm kiếm mục yêu thích"
   },
   "searchType": {
-    "message": "Tìm thể loại",
+    "message": "Tìm theo thể loại",
     "description": "Search item type"
   },
   "newAttachment": {
@@ -686,19 +683,19 @@
     "message": "Bạn có muốn xóa tệp đính kèm này không?"
   },
   "attachmentSaved": {
-    "message": "Tệp đính kèm đã được lưu."
+    "message": "Đã lưu tệp đính kèm"
   },
   "file": {
     "message": "Tập tin"
   },
   "selectFile": {
-    "message": "Chọn 1 tập tin."
+    "message": "Chọn tập tin"
   },
   "maxFileSize": {
     "message": "Kích thước tối đa của tập tin là 500MB."
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "Cần di chuyển khóa mã hóa. Vui lòng đăng nhập trang web Bitwaden để cập nhật khóa mã hóa của bạn."
+  "legacyEncryptionUnsupported": {
+    "message": "Mã hóa cổ điển không còn được hỗ trợ. Vui lòng liên hệ bộ phận hỗ trợ để khôi phục tài khoản của bạn."
   },
   "editedFolder": {
     "message": "Đã lưu thư mục"
@@ -713,43 +710,43 @@
     "message": "Đã xóa thư mục"
   },
   "loginOrCreateNewAccount": {
-    "message": "Đăng nhập hoặc tạo tài khoản mới để truy cập kho mật khẩu của bạn."
+    "message": "Đăng nhập hoặc tạo tài khoản mới để truy cập kho lưu trữ của bạn."
   },
   "createAccount": {
     "message": "Tạo tài khoản"
   },
   "newToBitwarden": {
-    "message": "New to Bitwarden?"
+    "message": "Bạn mới sử dụng Bitwarden?"
   },
   "setAStrongPassword": {
-    "message": "Đặt mật khẩu mạnh"
+    "message": "Đặt một mật khẩu mạnh"
   },
   "finishCreatingYourAccountBySettingAPassword": {
-    "message": "Hoàn thành việc tạo tài khoản của bạn bằng cách đặt mật khẩu"
+    "message": "Hoàn tất việc tạo tài khoản bằng cách đặt mật khẩu"
   },
   "logIn": {
-    "message": "Đăng Nhập"
+    "message": "Đăng nhập"
   },
   "logInToBitwarden": {
-    "message": "Log in to Bitwarden"
+    "message": "Đăng nhập Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Enter the code sent to your email"
+    "message": "Nhập mã được gửi về email của bạn"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "Nhập mã từ ứng dụng xác thực của bạn"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Press your YubiKey to authenticate"
+    "message": "Nhấn YubiKey của bạn để xác thực"
   },
   "logInWithPasskey": {
-    "message": "Log in with passkey"
+    "message": "Đăng nhập bằng mã khoá"
   },
   "loginWithDevice": {
-    "message": "Log in with device"
+    "message": "Đăng nhập bằng thiết bị"
   },
   "useSingleSignOn": {
-    "message": "Use single sign-on"
+    "message": "Dùng đăng nhập một lần"
   },
   "submit": {
     "message": "Gửi"
@@ -758,10 +755,10 @@
     "message": "Mật khẩu chính"
   },
   "masterPassDesc": {
-    "message": "Mật khẩu chính là mật khẩu bạn sử dụng để truy cập kho mật khẩu của bạn. Nó rất quan trọng vì sẽ không có cách nào để lấy lại mật khẩu nếu bạn quên."
+    "message": "Mật khẩu chính là mật khẩu bạn sử dụng để truy cập vào kho lưu trữ của mình. Điều rất quan trọng là bạn không được quên mật khẩu chính. Không có cách nào để khôi phục mật khẩu nếu bạn quên nó."
   },
   "masterPassHintDesc": {
-    "message": "Một gợi ý mật khẩu có thể giúp bạn nhớ lại mật khẩu chính của bạn nếu bạn quên nó."
+    "message": "Một gợi ý mật khẩu có thể giúp bạn nhớ lại mật khẩu chính của bạn nếu bạn chợt quên."
   },
   "reTypeMasterPass": {
     "message": "Nhập lại mật khẩu chính"
@@ -786,7 +783,7 @@
     "message": "Mật khẩu chính"
   },
   "masterPassImportant": {
-    "message": "Mật khẩu chính của bạn không thể phục hồi nếu bạn quên nó!"
+    "message": "Mật khẩu chính của bạn không thể khôi phục nếu bạn quên nó!"
   },
   "confirmMasterPassword": {
     "message": "Nhập lại mật khẩu chính"
@@ -795,7 +792,7 @@
     "message": "Gợi ý mật khẩu chính"
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "Độ mạnh của mật khẩu $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -807,7 +804,7 @@
     "message": "Tham gia tổ chức"
   },
   "joinOrganizationName": {
-    "message": "Join $ORGANIZATIONNAME$",
+    "message": "Tham gia $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -822,22 +819,22 @@
     "message": "Cài đặt"
   },
   "accountEmail": {
-    "message": "Account email"
+    "message": "Email tài khoản"
   },
   "requestHint": {
-    "message": "Request hint"
+    "message": "Yêu cầu gợi ý"
   },
   "requestPasswordHint": {
-    "message": "Request password hint"
+    "message": "Yêu cầu gợi ý mật khẩu"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Enter your account email address and your password hint will be sent to you"
+    "message": "Nhập địa chỉ email tài khoản của bạn và gợi ý mật khẩu sẽ được gửi đến bạn"
   },
   "getMasterPasswordHint": {
     "message": "Nhận gợi ý mật khẩu chính"
   },
   "emailRequired": {
-    "message": "Địa chỉ email là bắt buộc."
+    "message": "Cần điền địa chỉ email."
   },
   "invalidEmail": {
     "message": "Địa chỉ email không hợp lệ."
@@ -846,7 +843,7 @@
     "message": "Yêu cầu mật khẩu chính."
   },
   "confirmMasterPasswordRequired": {
-    "message": "Yêu cầu nhập lại mật khẩu chính."
+    "message": "Cần nhập lại mật khẩu chính."
   },
   "masterPasswordMinlength": {
     "message": "Mật khẩu chính phải có ít nhất $VALUE$ kí tự.",
@@ -877,10 +874,10 @@
     "message": "Bạn đã đăng nhập thành công!"
   },
   "masterPassSent": {
-    "message": "Chúng tôi đã gửi cho bạn email có chứa gợi ý mật khẩu chính của bạn."
+    "message": "Chúng tôi đã gửi cho bạn một email chứa gợi ý mật khẩu chính của bạn."
   },
   "unexpectedError": {
-    "message": "Một lỗi bất ngờ đã xảy ra."
+    "message": "Đã xảy ra lỗi không mong muốn."
   },
   "itemInformation": {
     "message": "Thông tin mục"
@@ -910,7 +907,7 @@
     "message": "Quá trình xác thực đã bị hủy hoặc mất quá nhiều thời gian. Vui lòng thử lại."
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "Mở trong tab mới"
   },
   "invalidVerificationCode": {
     "message": "Mã xác minh không đúng"
@@ -919,7 +916,7 @@
     "message": "Tiếp tục"
   },
   "verificationCodeEmailSent": {
-    "message": "Email xác minh được gửi tới $EMAIL$.",
+    "message": "Email xác minh đã được gửi tới $EMAIL$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -928,53 +925,53 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "Không yêu cầu lại trên thiết bị này trong vòng 30 ngày"
   },
   "selectAnotherMethod": {
-    "message": "Select another method",
+    "message": "Chọn phương pháp khác",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use your recovery code"
+    "message": "Sử dụng mã khôi phục của bạn"
   },
   "insertU2f": {
-    "message": "Lắp khóa bảo mật vào cổng USB của máy tính. Nếu nó có một nút, nhấn vào nó."
+    "message": "Cắm khóa bảo mật vào cổng USB của máy tính. Nếu có nút bấm, hãy nhấn vào nó."
   },
   "recoveryCodeDesc": {
-    "message": "Bạn mất quyền truy cập vào tất cả các dịch vụ xác thực hai bước? Sử dụng mã phục hồi của bạn để vô hiệu hóa tất cả các dịch vụ xác thực hai bước trong tài khoản của bạn."
+    "message": "Bạn đã mất quyền truy cập vào tất cả các dịch vụ xác thực 2 lớp? Sử dụng mã khôi phục để tắt tất cả các phương pháp xác thực hai lớp trong tài khoản của bạn."
   },
   "recoveryCodeTitle": {
-    "message": "Mã phục hồi"
+    "message": "Mã khôi phục"
   },
   "authenticatorAppTitle": {
-    "message": "Ứng dụng Authenticator"
+    "message": "Ứng dụng xác thực"
   },
   "authenticatorAppDescV2": {
     "message": "Nhập mã được tạo bởi ứng dụng xác thực như Bitwarden Authenticator.",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
-    "message": "Khóa bảo mật OTP Yubico"
+    "message": "Khóa bảo mật Yubico OTP"
   },
   "yubiKeyDesc": {
-    "message": "Sử dụng YubiKey để truy cập tài khoản của bạn. Hoạt động với thiết bị YubiKey 4, 4 Nano, 4C và NEO."
+    "message": "Sử dụng YubiKey để truy cập tài khoản của bạn. Hỗ trợ các thiết bị YubiKey 4, 4 Nano, 4C và NEO."
   },
   "duoDescV2": {
     "message": "Nhập mã được tạo bởi Duo Security.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
-    "message": "Xác minh với Duo Security cho tổ chức của bạn sử dụng ứng dụng Duo Mobile, SMS, cuộc gọi điện thoại, hoặc khoá bảo mật U2F.",
+    "message": "Xác minh với Duo Security cho tổ chức của bạn bằng ứng dụng Duo Mobile, tin nhắn SMS, cuộc gọi điện thoại hoặc khóa bảo mật U2F.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "verifyYourIdentity": {
-    "message": "Verify your Identity"
+    "message": "Xác minh danh tính của bạn"
   },
   "weDontRecognizeThisDevice": {
-    "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
+    "message": "Chúng tôi không nhận diện được thiết bị này. Nhập mã được gửi đến email để xác minh danh tính của bạn."
   },
   "continueLoggingIn": {
-    "message": "Continue logging in"
+    "message": "Tiếp tục đăng nhập"
   },
   "webAuthnTitle": {
     "message": "FIDO2 WebAuthn"
@@ -989,31 +986,31 @@
     "message": "Nhập mã được gửi về email của bạn."
   },
   "loginUnavailable": {
-    "message": "Đăng nhập không được"
+    "message": "Không thể đăng nhập"
   },
   "noTwoStepProviders": {
-    "message": "Tài khoản này đã thiết lập xác minh hai bước. Tuy nhiên, thiết bị này không hỗ trợ dịch vụ xác minh hai bước đang sử dụng."
+    "message": "Tài khoản này đã kích hoạt đăng nhập 2 bước, tuy nhiên, thiết bị này không hỗ trợ dịch vụ xác thực hai lớp đang sử dụng."
   },
   "noTwoStepProviders2": {
-    "message": "Vui lòng thêm các nhà cung cấp khác được hỗ trợ tốt hơn trên các thiết bị (chẳng hạn như một ứng dụng xác thực)."
+    "message": "Vui lòng thêm các nhà cung cấp bổ sung tương thích tốt hơn trên các thiết bị (chẳng hạn như ứng dụng xác thực)."
   },
   "twoStepOptions": {
-    "message": "Tùy chọn xác minh hai bước"
+    "message": "Tùy chọn đăng nhập 2 bước"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "Chọn phương pháp đăng nhập hai bước"
   },
   "selfHostedEnvironment": {
     "message": "Môi trường tự lưu trữ"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Nhập địa chỉ cơ sở của bản cài đặt Bitwarden được lưu trữ tại máy chủ của bạn. Ví dụ: https://bitwarden.company.com"
+    "message": "Nhập URL cơ sở của cài đặt Bitwarden được lưu trữ trên máy chủ nội bộ của bạn. Ví dụ: https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
-    "message": "Đối với cấu hình nâng cao. Bạn có thể chỉ định địa chỉ cơ sở của mỗi dịch vụ một cách độc lập."
+    "message": "Đối với cấu hình nâng cao, bạn có thể chỉ định URL cơ sở của từng dịch vụ một cách độc lập."
   },
   "selfHostedEnvFormInvalid": {
-    "message": "Bạn phải thêm địa chỉ máy chủ cơ sở hoặc ít nhất một môi trường tùy chỉnh."
+    "message": "Bạn phải thêm URL máy chủ cơ sở hoặc ít nhất một môi trường tùy chỉnh."
   },
   "customEnvironment": {
     "message": "Môi trường tùy chỉnh"
@@ -1022,32 +1019,32 @@
     "message": "Địa chỉ máy chủ"
   },
   "authenticationTimeout": {
-    "message": "Authentication timeout"
+    "message": "Thời gian chờ xác thực"
   },
   "authenticationSessionTimedOut": {
-    "message": "The authentication session timed out. Please restart the login process."
+    "message": "Phiên xác thực đã hết thời gian chờ. Vui lòng đăng nhập lại từ đầu."
   },
   "selfHostBaseUrl": {
-    "message": "Self-host server URL",
+    "message": "URL máy chủ tự lưu trữ",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "apiUrl": {
-    "message": "Địa chỉ API máy chủ"
+    "message": "Địa chỉ máy chủ API"
   },
   "webVaultUrl": {
     "message": "Địa chỉ máy chủ lưu trữ web"
   },
   "identityUrl": {
-    "message": "Địa chỉ nhận dạng máy chủ"
+    "message": "URL máy chủ định danh"
   },
   "notificationsUrl": {
-    "message": "Địa chỉ máy chủ thông báo"
+    "message": "URL máy chủ thông báo"
   },
   "iconsUrl": {
-    "message": "Địa chỉ biểu tượng máy chủ"
+    "message": "URL máy chủ biểu tượng"
   },
   "environmentSaved": {
-    "message": "Địa chỉ môi trường đã được lưu."
+    "message": "Các URL môi trường đã được lưu"
   },
   "ok": {
     "message": "Ok"
@@ -1059,10 +1056,10 @@
     "message": "Không"
   },
   "location": {
-    "message": "Location"
+    "message": "Vị trí"
   },
   "overwritePassword": {
-    "message": "Ghi đè lên mật khẩu"
+    "message": "Ghi đè mật khẩu"
   },
   "learnMore": {
     "message": "Tìm hiểu thêm"
@@ -1071,7 +1068,7 @@
     "message": "Tính năng không có sẵn"
   },
   "loggedOut": {
-    "message": "Đăng xuất"
+    "message": "Đã đăng xuất"
   },
   "loggedOutDesc": {
     "message": "Bạn đã đăng xuất khỏi tài khoản của mình."
@@ -1146,14 +1143,14 @@
     "message": "Tiếp tục tới ứng dụng web?"
   },
   "changeMasterPasswordOnWebConfirmation": {
-    "message": "Bạn có thể thay đổi mật khẩu chính của mình trên Bitwarden bản web."
+    "message": "Bạn có thể thay đổi mật khẩu chính của mình trên trang web Bitwarden."
   },
   "fingerprintPhrase": {
-    "message": "Cụm vân tay",
+    "message": "Cụm từ xác thực",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "yourAccountsFingerprint": {
-    "message": "Cụm vân tay tài khoản của bạn",
+    "message": "Cụm từ xác thực tài khoản của bạn",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "goToWebVault": {
@@ -1175,13 +1172,13 @@
     "message": "Kho của bạn đã bị khóa. Xác minh danh tính của bạn để mở khoá."
   },
   "yourAccountIsLocked": {
-    "message": "Your account is locked"
+    "message": "Tài khoản của bạn đã bị khóa"
   },
   "or": {
-    "message": "or"
+    "message": "hoặc"
   },
   "unlockWithBiometrics": {
-    "message": "Unlock with biometrics"
+    "message": "Mở khóa bằng sinh trắc học"
   },
   "unlockWithMasterPassword": {
     "message": "Mở khóa bằng mật khẩu chính"
@@ -1206,19 +1203,19 @@
     "message": "Mật khẩu chính không hợp lệ"
   },
   "twoStepLoginConfirmation": {
-    "message": "Xác minh 2 bước giúp tài khoản của bạn an toàn hơn bằng cách yêu cầu bạn xác minh bằng một thiết bị khác như khóa bảo mật, ứng dụng xác thực, SMS, cuộc gọi điện thoại hoặc email. Xác minh 2 bước có thể được thiết lập trên bitwarden.com. Bạn có muốn truy cập trang web bây giờ không?"
+    "message": "Đăng nhập hai bước giúp tài khoản của bạn an toàn hơn bằng cách yêu cầu bạn xác minh việc đăng nhập bằng một thiết bị khác như khóa bảo mật, ứng dụng xác thực, SMS, cuộc gọi điện thoại hoặc email. Đăng nhập hai bước có thể được thiết lập trên bitwarden.com. Bạn có muốn truy cập trang web bây giờ không?"
   },
   "twoStepLogin": {
-    "message": "Xác minh hai bước"
+    "message": "Đăng nhập hai bước"
   },
   "vaultTimeout": {
-    "message": "Thời gian mở kho"
+    "message": "Đóng kho sau"
   },
   "vaultTimeout1": {
-    "message": "Timeout"
+    "message": "Quá hạn"
   },
   "vaultTimeoutDesc": {
-    "message": "Chọn khi nào thì kho của bạn sẽ hết thời gian chờ và thực hiện hành động đã được chọn."
+    "message": "Chọn thời điểm đóng kho của bạn và thực hiện hành động đã được chọn."
   },
   "immediately": {
     "message": "Tức thì"
@@ -1254,7 +1251,7 @@
     "message": "4 giờ"
   },
   "onIdle": {
-    "message": "Khi hệ thống rảnh"
+    "message": "Khi hệ thống không hoạt động (rảnh rỗi)"
   },
   "onSleep": {
     "message": "Khi hệ thống ngủ"
@@ -1272,11 +1269,11 @@
     "message": "Bảo mật"
   },
   "clearClipboard": {
-    "message": "Xóa khay nhớ tạm",
+    "message": "Xóa bảng nhớ tạm",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "clearClipboardDesc": {
-    "message": "Tự động xóa mọi thứ đã sao chép khỏi khay nhớ tạm.",
+    "message": "Tự động xóa mọi thứ đã sao chép khỏi bảng nhớ tạm.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "enableFavicon": {
@@ -1289,28 +1286,28 @@
     "message": "Thu nhỏ vào khay hệ thống"
   },
   "enableMinToTrayDesc": {
-    "message": "Khi thu nhỏ cửa sổ, thay vào đó sẽ hiện một biểu tượng trên khay hệ thống."
+    "message": "Thu nhỏ cửa sổ trực tiếp vào khay hệ thống."
   },
   "enableMinToMenuBar": {
     "message": "Thu nhỏ vào thanh menu"
   },
   "enableMinToMenuBarDesc": {
-    "message": "Khi thu nhỏ sổ, thay vào đó sẽ hiện một biểu tượng trên thanh menu."
+    "message": "Thu nhỏ cửa sổ trực tiếp vào thanh menu."
   },
   "enableCloseToTray": {
     "message": "Đóng vào khay hệ thống"
   },
   "enableCloseToTrayDesc": {
-    "message": "Khi đóng cửa sổ, thay vào đó sẽ hiện một biểu tượng trên khay hệ thống."
+    "message": "Khi đóng cửa sổ, hiển thị biểu tượng trong khay hệ thống thay vì đóng ứng dụng."
   },
   "enableCloseToMenuBar": {
     "message": "Đóng vào thanh menu"
   },
   "enableCloseToMenuBarDesc": {
-    "message": "Khi đóng cửa sổ, thay vào đó sẽ hiện một biểu tượng trên thanh menu."
+    "message": "Khi đóng cửa sổ, hiển thị biểu tượng trong thanh menu thay vì đóng ứng dụng."
   },
   "enableTray": {
-    "message": "Hiện biểu tượng khay hệ thống"
+    "message": "Hiện biểu tượng trên khay hệ thống"
   },
   "enableTrayDesc": {
     "message": "Luôn hiện biểu tượng trên khay hệ thống."
@@ -1319,22 +1316,22 @@
     "message": "Khởi động vào khay hệ thống"
   },
   "startToTrayDesc": {
-    "message": "Khi ứng dụng mới mở, chỉ hiện biểu tượng trên khay hệ thống."
+    "message": "Khi ứng dụng được khởi động lần đầu tiên, chỉ hiện biểu tượng trong khay hệ thống."
   },
   "startToMenuBar": {
     "message": "Khởi động vào thanh menu"
   },
   "startToMenuBarDesc": {
-    "message": "Khi ứng dụng mới mở, chỉ hiện biểu tượng trên thanh menu."
+    "message": "Khi ứng dụng được khởi động lần đầu tiên, chỉ hiện biểu tượng trên thanh menu."
   },
   "openAtLogin": {
-    "message": "Khởi động cùng lúc với máy tính"
+    "message": "Khởi động cùng máy tính"
   },
   "openAtLoginDesc": {
     "message": "Tự động khởi động ứng dụng Bitwarden trên máy tính khi đăng nhập."
   },
   "alwaysShowDock": {
-    "message": "Luôn hiện ở thanh Dock"
+    "message": "Giữ lại trong Dock"
   },
   "alwaysShowDockDesc": {
     "message": "Hiện biểu tượng Bitwarden trong Dock ngay cả khi thu nhỏ về thanh menu."
@@ -1343,19 +1340,19 @@
     "message": "Xác nhận ẩn khay"
   },
   "confirmTrayDesc": {
-    "message": "Việc tắt cài đặt này cũng sẽ tắt tất cả các cài đặt liên quan khác."
+    "message": "Tắt cài đặt này cũng sẽ tắt tất cả các cài đặt liên quan đến khay khác."
   },
   "language": {
     "message": "Ngôn ngữ"
   },
   "languageDesc": {
-    "message": "Thay đổi ngôn ngữ được ứng dụng sử dụng. Yêu cầu khởi động lại."
+    "message": "Thay đổi ngôn ngữ được ứng dụng sử dụng. Cần khởi động lại."
   },
   "theme": {
     "message": "Chủ đề"
   },
   "themeDesc": {
-    "message": "Change the application's color theme."
+    "message": "Thay đổi màu sắc ứng dụng."
   },
   "dark": {
     "message": "Tối",
@@ -1397,7 +1394,7 @@
     "message": "Có bản cập nhật mới"
   },
   "updateAvailableDesc": {
-    "message": "Một bản cập nhật đã được tìm thấy. Bạn có muốn tải xuống bây giờ không?"
+    "message": "Đã tìm thấy một bản cập nhật mới. Bạn có muốn tải xuống bây giờ không?"
   },
   "restart": {
     "message": "Khởi động lại"
@@ -1406,7 +1403,7 @@
     "message": "Để sau"
   },
   "noUpdatesAvailable": {
-    "message": "Hiện không có cập nhật nào. Bạn đang sử dụng phiên bản mới nhất."
+    "message": "Hiện không có bản cập nhật nào. Bạn đang sử dụng phiên bản mới nhất."
   },
   "updateError": {
     "message": "Cập nhật bị lỗi"
@@ -1418,33 +1415,33 @@
     "message": "Sao chép tên đăng nhập"
   },
   "copyNumber": {
-    "message": "Chép số",
+    "message": "Sao chép số",
     "description": "Copy credit card number"
   },
   "copyEmail": {
-    "message": "Copy email"
+    "message": "Sao chép email"
   },
   "copySecurityCode": {
-    "message": "Sao chép Mã bảo mật",
+    "message": "Sao chép mã bảo mật",
     "description": "Copy credit card security code (CVV)"
   },
   "premiumMembership": {
     "message": "Thành viên Cao Cấp"
   },
   "premiumManage": {
-    "message": "Quản lý Thành viên"
+    "message": "Quản lý thành viên"
   },
   "premiumManageAlert": {
-    "message": "Bạn có thể quản lý các thành viên trong kho bitwarden nền web. Bạn có muốn truy cập trang web bây giờ?"
+    "message": "Bạn có thể quản lý tài khoản thành viên của mình trên trang web bitwarden.com. Bạn có muốn truy cập trang web bây giờ không?"
   },
   "premiumRefresh": {
     "message": "Làm mới thành viên"
   },
   "premiumNotCurrentMember": {
-    "message": "Bạn hiện không phải là một thành viên cao cấp."
+    "message": "Bạn hiện không phải là thành viên Cao cấp."
   },
   "premiumSignUpAndGet": {
-    "message": "Đăng ký làm thành viên cao cấp và nhận được:"
+    "message": "Đăng ký làm thành viên Cao cấp và nhận được:"
   },
   "premiumSignUpStorage": {
     "message": "1GB bộ nhớ lưu trữ được mã hóa cho các tệp đính kèm."
@@ -1453,7 +1450,7 @@
     "message": "Các tùy chọn xác minh hai bước như YubiKey và Duo."
   },
   "premiumSignUpReports": {
-    "message": "Thanh lọc mật khẩu, kiểm tra an toàn tài khoản và các báo cáo rò rĩ dữ liệu là để giữ cho kho của bạn an toàn."
+    "message": "Thanh lọc mật khẩu, kiểm tra an toàn tài khoản và các báo cáo rò rỉ dữ liệu để bảo vệ kho dữ liệu của bạn."
   },
   "premiumSignUpTotp": {
     "message": "Mã xác nhận TOTP (2FA) để đăng nhập vào kho của bạn."
@@ -1468,16 +1465,16 @@
     "message": "Mua bản Cao Cấp"
   },
   "premiumPurchaseAlertV2": {
-    "message": "Bạn có thể mua gói Premium từ cài đặt tài khoản trên trang Bitwarden."
+    "message": "Bạn có thể mua gói Cao cấp từ cài đặt tài khoản trên kho web Bitwarden."
   },
   "premiumCurrentMember": {
-    "message": "Bạn là một thành viên cao cấp!"
+    "message": "Bạn là một thành viên Cao cấp!"
   },
   "premiumCurrentMemberThanks": {
     "message": "Cảm ơn bạn đã hỗ trợ Bitwarden."
   },
   "premiumPrice": {
-    "message": "Tất cả chỉ với $PRICE$ /năm!",
+    "message": "Tất cả chỉ với $PRICE$/năm!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -1492,20 +1489,20 @@
     "message": "Lịch sử mật khẩu"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "Lịch sử trình tạo"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "Dọn dẹp lịch sử trình tạo"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "Nếu bạn tiếp tục, tất cả các mục sẽ bị xóa vĩnh viễn khỏi lịch sử của trình tạo. Bạn có chắc chắn muốn tiếp tục không?"
   },
   "clear": {
     "message": "Xoá",
     "description": "To clear something out. example: To clear browser history."
   },
   "noPasswordsInList": {
-    "message": "Chưa có mật khẩu."
+    "message": "Không có mật khẩu để liệt kê."
   },
   "clearHistory": {
     "message": "Xóa lịch sử"
@@ -1543,13 +1540,13 @@
     "message": "Đặt lại thu phóng"
   },
   "toggleFullScreen": {
-    "message": "Bật/Tắt Toàn Màn Hình"
+    "message": "Bật/Tắt Toàn màn hình"
   },
   "reload": {
     "message": "Tải lại"
   },
   "toggleDevTools": {
-    "message": "Bật/Tắt Công Cụ Nhà Phát Triển"
+    "message": "Bật/Tắt Công cụ nhà phát triển"
   },
   "minimize": {
     "message": "Thu nhỏ",
@@ -1559,7 +1556,7 @@
     "message": "Phóng to"
   },
   "bringAllToFront": {
-    "message": "Hiển thị trên tất cả",
+    "message": "Đưa tất cả lên phía trước",
     "description": "Bring all windows to front (foreground)"
   },
   "aboutBitwarden": {
@@ -1572,7 +1569,7 @@
     "message": "Ẩn Bitwarden"
   },
   "hideOthers": {
-    "message": "Ẩn Khác"
+    "message": "Ẩn khác"
   },
   "showAll": {
     "message": "Hiện tất cả"
@@ -1594,7 +1591,7 @@
     "message": "Sao chép thành công"
   },
   "errorRefreshingAccessToken": {
-    "message": "Lỗi làm mới khoá truy cập"
+    "message": "Lỗi cập nhật token truy cập"
   },
   "errorRefreshingAccessTokenDesc": {
     "message": "Bạn có thể đã bị đăng xuất. Vui lòng đăng xuất và đăng nhập lại."
@@ -1609,7 +1606,7 @@
     "message": "Kiểm tra xem mật khẩu có bị lộ không."
   },
   "passwordExposed": {
-    "message": "Mật khẩu này đã bị lộ $VALUE$ lần trong các vụ rò rỉ dữ liệu. Bạn nên đổi nó.",
+    "message": "Mật khẩu này đã bị lộ $VALUE$ lần trong các vụ rò rỉ dữ liệu. Bạn nên thay đổi nó.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -1618,7 +1615,7 @@
     }
   },
   "passwordSafe": {
-    "message": "Mật khẩu này không tìm thấy trong bất kỳ vụ rò rỉ dữ liệu nào. Nó an toàn để sử dụng."
+    "message": "Không tìm thấy mật khẩu này trong các vụ rò rỉ dữ liệu trước đây. Nó an toàn để sử dụng."
   },
   "baseDomain": {
     "message": "Tên miền cơ sở",
@@ -1661,21 +1658,21 @@
     "message": "Mặc định"
   },
   "exit": {
-    "message": "Thoát ra"
+    "message": "Thoát"
   },
   "showHide": {
-    "message": "Hiển thị / Ẩn",
+    "message": "Hiện / Ẩn",
     "description": "Text for a button that toggles the visibility of the window. Shows the window when it is hidden or hides the window if it is currently open."
   },
   "hideToTray": {
     "message": "Ẩn xuống khay hệ thống"
   },
   "alwaysOnTop": {
-    "message": "Luôn trên cùng",
+    "message": "Luôn ở trên cùng",
     "description": "Application window should always stay on top of other windows"
   },
   "dateUpdated": {
-    "message": "Cập nhật vào",
+    "message": "Cập nhật lúc",
     "description": "ex. Date this item was updated"
   },
   "dateCreated": {
@@ -1683,7 +1680,7 @@
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
-    "message": "Đã cập nhật mật khẩu",
+    "message": "Mật khẩu được cập nhật lần cuối",
     "description": "ex. Date this password was updated"
   },
   "exportFrom": {
@@ -1696,16 +1693,16 @@
     "message": "Định dạng tập tin"
   },
   "fileEncryptedExportWarningDesc": {
-    "message": "Tập tin xuất này sẽ được bảo vệ bằng mật khẩu và yêu cầu mật khẩu để giải mã."
+    "message": "Tệp tin này sẽ được bảo vệ bằng mật khẩu và yêu cầu mật khẩu tệp tin để giải mã."
   },
   "filePassword": {
     "message": "Mật khẩu tập tin"
   },
   "exportPasswordDescription": {
-    "message": "Mật khẩu này sẽ được sử dụng để xuất và nhập tập tin này"
+    "message": "Mật khẩu này sẽ được dùng để xuất và nhập tập tin này"
   },
   "accountRestrictedOptionDescription": {
-    "message": "Sử dụng khóa mã hóa tài khoản của bạn, được tạo từ tên người dùng và mật khẩu chính của bạn để mã hóa tệp xuất và giới hạn việc nhập chỉ cho tài khoản Bitwarden hiện tại."
+    "message": "Sử dụng khóa mã hóa tài khoản của bạn, được tạo từ tên đăng nhập và mật khẩu chính của bạn để mã hóa tệp xuất và giới hạn việc nhập chỉ cho tài khoản Bitwarden hiện tại."
   },
   "passwordProtected": {
     "message": "Mật khẩu đã được bảo vệ"
@@ -1714,11 +1711,17 @@
     "message": "Thiết lập mật khẩu cho tệp để mã hóa dữ liệu xuất và nhập nó vào bất kỳ tài khoản Bitwarden nào bằng cách sử dụng mật khẩu đó để giải mã."
   },
   "exportTypeHeading": {
-    "message": "Loại xuất"
+    "message": "Xuất kiểu"
   },
   "accountRestricted": {
     "message": "Tài khoản bị hạn chế"
   },
+  "restrictCardTypeImport": {
+    "message": "Không thể nhập mục thẻ"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Một chính sách được thiết lập bởi 1 hoặc nhiều tổ chức ngăn bạn nhập thẻ vào kho của mình."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“Mật khẩu tập tin” và “Nhập lại mật khẩu tập tin” không khớp."
   },
@@ -1736,7 +1739,7 @@
     "message": "Bản xuất này chứa dữ liệu kho bạn và không được mã hóa. Bạn không nên lưu trữ hay gửi tập tin đã xuất thông qua phương thức rủi ro (như email). Vui lòng xóa nó ngay lập tức khi bạn đã sử dụng xong."
   },
   "encExportKeyWarningDesc": {
-    "message": "Quá trình xuất này mã hóa dữ liệu của bạn bằng khóa mã hóa của tài khoản. Nếu bạn đã từng thay đổi khóa mã hóa của tài khoản, bạn cần xuất lại vì bạn sẽ không thể giải mã tệp xuất này."
+    "message": "Quá trình xuất này sẽ mã hóa dữ liệu của bạn bằng khóa mã hóa của tài khoản. Nếu bạn từng thay đổi mã hóa tài khoản của mình, bạn nên xuất lại vì bạn sẽ không thể giải mã tập tin xuất này."
   },
   "encExportAccountWarningDesc": {
     "message": "Khóa mã hóa tài khoản là duy nhất cho mỗi tài khoản Bitwarden, vì vậy bạn không thể nhập tệp xuất được mã hóa vào một tài khoản khác."
@@ -1769,32 +1772,32 @@
     "message": "Mật khẩu chính Yếu"
   },
   "weakMasterPasswordDesc": {
-    "message": "Mật khẩu chính bạn vừa chọn có vẻ yếu. Bạn nên chọn mật khẩu chính (hoặc cụm từ mật khẩu) mạnh để bảo vệ đúng cách tài khoản Bitwarden của bạn. Bạn có thực sự muốn dùng mật khẩu chính này?"
+    "message": "Mật khẩu chính bạn vừa chọn hơi yếu. Bạn nên chọn mật khẩu chính mạnh(hoặc một cụm mật khẩu) để bảo vệ tài khoản Bitwarden của mình một cách an toàn. Bạn có thực sự muốn dùng mật khẩu chính này không?"
   },
   "pin": {
     "message": "Mã PIN",
     "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
   },
   "unlockWithPin": {
-    "message": "Mở khóa với mã PIN"
+    "message": "Mở khóa bằng mã PIN"
   },
   "setYourPinCode": {
-    "message": "Đặt mã PIN của bạn để mở khóa Bitwarden. Cài đặt mã PIN của bạn sẽ bị xóa nếu bạn hoàn toàn đăng xuất khỏi ứng dụng."
+    "message": "Đặt mã PIN của bạn để mở khóa Bitwarden. Cài đặt mã PIN của bạn sẽ bị xóa nếu bạn đăng xuất hoàn toàn khỏi ứng dụng."
   },
   "pinRequired": {
     "message": "Mã PIN là bắt buộc."
   },
   "invalidPin": {
-    "message": "Mã PIN không hợp lệ."
+    "message": "Mã PIN không chính xác."
   },
   "tooManyInvalidPinEntryAttemptsLoggingOut": {
-    "message": "Mã PIN bị gõ sai quá nhiều lần. Đang đăng xuất."
+    "message": "Gõ sai mã PIN quá nhiều lần. Đang đăng xuất."
   },
   "unlockWithWindowsHello": {
     "message": "Mở khóa với Windows Hello"
   },
   "additionalWindowsHelloSettings": {
-    "message": "Cài đặt Windows Hello bổ sung"
+    "message": "Cài đặt bổ sung cho Windows Hello"
   },
   "unlockWithPolkit": {
     "message": "Mở khóa bằng bảo mật hệ thống"
@@ -1806,28 +1809,28 @@
     "message": "Mở khóa với Touch ID"
   },
   "additionalTouchIdSettings": {
-    "message": "Cài đặt Touch ID bổ sung"
+    "message": "Cài đặt bổ sung cho Touch ID"
   },
   "touchIdConsentMessage": {
     "message": "mở khoá kho của bạn"
   },
   "autoPromptWindowsHello": {
-    "message": "Yêu cầu xác minh Windows Hello khi mở"
+    "message": "Yêu cầu xác minh Windows Hello khi mở ứng dụng"
   },
   "autoPromptPolkit": {
-    "message": "Hỏi xác thực hệ thống khi khởi chạy"
+    "message": "Yêu cầu xác thực hệ thống khi khởi động"
   },
   "autoPromptTouchId": {
-    "message": "Yêu cầu xác minh Touch ID khi mở"
+    "message": "Yêu cầu xác minh Touch ID khi mở ứng dụng"
   },
   "requirePasswordOnStart": {
-    "message": "Yêu cầu mật khẩu hoặc mã PIN khi mở"
+    "message": "Yêu cầu mật khẩu hoặc mã PIN khi mở ứng dụng"
   },
   "requirePasswordWithoutPinOnStart": {
     "message": "Yêu cầu mật khẩu khi khởi động ứng dụng"
   },
   "recommendedForSecurity": {
-    "message": "Đề xuất để tăng cường bảo mật."
+    "message": "Khuyến nghị để bảo mật."
   },
   "lockWithMasterPassOnRestart1": {
     "message": "Khóa bằng mật khẩu chính khi khởi động lại"
@@ -1836,10 +1839,10 @@
     "message": "Xóa tài khoản"
   },
   "deleteAccountDesc": {
-    "message": "Tiếp tục bên dưới để xóa tài khoản và tất cả dữ liệu của bạn."
+    "message": "Tiếp tục bên dưới để xóa tài khoản và tất cả dữ liệu trong kho của bạn."
   },
   "deleteAccountWarning": {
-    "message": "Việc xóa tài khoản là vĩnh viễn và không thể hoàn tác."
+    "message": "Tài khoản sẽ bị xóa vĩnh viễn và không thể hoàn tác."
   },
   "cannotDeleteAccount": {
     "message": "Không thể xóa tài khoản"
@@ -1851,16 +1854,16 @@
     "message": "Đã xóa tài khoản"
   },
   "accountDeletedDesc": {
-    "message": "Tài khoản của bạn đã được đóng và tất cả những dữ liệu liên quan đã được xóa."
+    "message": "Đã đóng tài khoản của bạn và đã xóa tất cả những dữ liệu liên quan."
   },
   "preferences": {
     "message": "Tuỳ chỉnh"
   },
   "enableMenuBar": {
-    "message": "Hiển thị biểu tượng thanh menu"
+    "message": "Hiện biểu tượng trên thanh menu"
   },
   "enableMenuBarDesc": {
-    "message": "Luôn hiển biểu tượng trên thanh menu."
+    "message": "Luôn hiện biểu tượng trên thanh menu."
   },
   "hideToMenuBar": {
     "message": "Ẩn vào thanh menu"
@@ -1869,26 +1872,26 @@
     "message": "Bạn phải chọn ít nhất một bộ sưu tập."
   },
   "premiumUpdated": {
-    "message": "Bạn đã nâng cấp lên Cao Cấp."
+    "message": "Bạn đã nâng cấp lên gói Cao Cấp."
   },
   "restore": {
     "message": "Khôi phục"
   },
   "premiumManageAlertAppStore": {
-    "message": "Bạn có thể quản lý đăng ký của từ App Store. Bạn có muốn truy cập vào App Store ngay không?"
+    "message": "Bạn có thể quản lý gói đăng ký của mình từ App Store. Bạn có muốn truy cập App Store ngay bây giờ không?"
   },
   "legal": {
     "message": "Pháp lý",
     "description": "Noun. As in 'legal documents', like our terms of service and privacy policy."
   },
   "termsOfService": {
-    "message": "Điều khoản dịch vụ"
+    "message": "Điều khoản Dịch vụ"
   },
   "privacyPolicy": {
-    "message": "Chính sách bảo mật"
+    "message": "Chính sách Bảo mật"
   },
   "unsavedChangesConfirmation": {
-    "message": "Bạn có chắc là muốn thoát? Nếu bạn thoát bây giờ, thông tin hiện tại sẽ không được lưu lại."
+    "message": "Bạn có chắc là muốn thoát không? Nếu bạn thoát bây giờ, thông tin hiện tại sẽ không được lưu lại."
   },
   "unsavedChangesTitle": {
     "message": "Những thay đổi chưa được lưu"
@@ -1900,16 +1903,16 @@
     "message": "Các chính sách của tổ chức đang ảnh hưởng đến cài đặt tạo mật khẩu của bạn."
   },
   "vaultTimeoutAction": {
-    "message": "Khi hết thời gian mở kho"
+    "message": "Hành động sau khi đóng kho"
   },
   "vaultTimeoutActionLockDesc": {
-    "message": "Kho bị khóa sẽ yêu cầu bạn nhập lại mật khẩu chính để có thể truy cập."
+    "message": "Bạn cần nhập mật khẩu chính hoặc phương thức mở khóa khác để truy cập lại vào kho lưu trữ."
   },
   "vaultTimeoutActionLogOutDesc": {
-    "message": "Kho bị đăng xuất sẽ yêu cầu bạn xác thực lại để có thể truy cập."
+    "message": "Bạn cần xác thực lại để mở khóa kho lưu trữ."
   },
   "unlockMethodNeededToChangeTimeoutActionDesc": {
-    "message": "Thiết lập khóa khi hết thời gian chờ kho."
+    "message": "Thiết lập phương thức mở khóa để thay đổi hành động sau khi đóng kho."
   },
   "lock": {
     "message": "Khóa",
@@ -1938,23 +1941,23 @@
     "message": "Xoá vĩnh viễn"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "Đăng xuất sẽ xóa tất cả quyền truy cập vào kho của bạn và yêu cầu xác minh trực tuyến sau khi hết thời gian chờ. Bạn có chắc chắn muốn sử dụng cài đặt này không?"
+    "message": "Đăng xuất sẽ xóa toàn bộ quyền truy cập vào kho của bạn và yêu cầu xác minh lại sau khi đóng kho. Bạn có chắc chắn muốn sử dụng cài đặt này không?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
-    "message": "Xác nhận hành động khi hết thời gian chờ"
+    "message": "Xác nhận hành động sau khi đóng kho"
   },
   "enterpriseSingleSignOn": {
-    "message": "Đăng nhập theo tài khoản tổ chức"
+    "message": "Đăng nhập một lần cho doanh nghiệp"
   },
   "setMasterPassword": {
-    "message": "Thiết lập mật khẩu chính"
+    "message": "Đặt mật khẩu chính"
   },
   "orgPermissionsUpdatedMustSetPassword": {
-    "message": "Quyền tổ chức của bạn đã được cập nhật, yêu cầu bạn đặt mật khẩu chính.",
+    "message": "Quyền truy cập của tổ chức bạn đã được cập nhật, yêu cầu bạn phải thiết lập mật khẩu chính.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "orgRequiresYouToSetPassword": {
-    "message": "Tổ chức của bạn yêu cầu bạn đặt mật khẩu chính.",
+    "message": "Tổ chức của bạn yêu cầu bạn thiết lập mật khẩu chính.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
@@ -1985,16 +1988,16 @@
     "message": "Sao chép khóa xác thực (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Làm cho xác thực 2 bước trở nên liền mạch"
+    "message": "Giúp quá trình xác minh 2 bước diễn ra liền mạch"
   },
   "totpHelper": {
-    "message": "Bitwarden có thể lưu trữ và điền mã xác thực 2 bước. Hãy sao chép và dán khóa vào trường này."
+    "message": "Bitwarden có thể lưu trữ và điền mã xác thực 2 bước. Sao chép và dán khóa vào ô này."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden có thể lưu trữ và điền mã xác thực 2 bước. Hãy chọn biểu tượng máy ảnh để chụp mã QR xác thực trên trang web này, hoặc sao chép và dán khóa vào trường này."
+    "message": "Bitwarden có thể lưu trữ và điền mã xác minh 2 bước. Hãy chọn biểu tượng máy ảnh để quét mã QR xác thực của trang web, hoặc sao chép và dán khoá vào ô này."
   },
   "premium": {
-    "message": "Phiên bản cao cấp",
+    "message": "Cao cấp",
     "description": "Premium membership"
   },
   "freeOrgsCannotUseAttachments": {
@@ -2032,7 +2035,7 @@
     "message": "Xác nhận mật khẩu chính mới"
   },
   "masterPasswordPolicyInEffect": {
-    "message": "Các chính sách của tổ chức yêu cầu mật khẩu chính của bạn phải:"
+    "message": "Các chính sách của tổ chức yêu cầu mật khẩu chính của bạn phải đáp ứng các yêu cầu sau:"
   },
   "policyInEffectMinComplexity": {
     "message": "Độ mạnh tối thiểu $SCORE$",
@@ -2056,13 +2059,13 @@
     "message": "Có chứa một hay nhiều ký tự viết hoa"
   },
   "policyInEffectLowercase": {
-    "message": "Có chứa một hay nhiều ký tự thường"
+    "message": "Có chứa một hay nhiều ký tự viết thường"
   },
   "policyInEffectNumbers": {
-    "message": "Có chứa một hay nhiều số"
+    "message": "Có chứa một hay nhiều chữ số"
   },
   "policyInEffectSpecial": {
-    "message": "Có chứa một hay nhiều ký tự đặc biệt sau: $CHARS$",
+    "message": "Có chứa một hay nhiều ký tự đặc biệt sau $CHARS$",
     "placeholders": {
       "chars": {
         "content": "$1",
@@ -2083,31 +2086,31 @@
     "message": "bất cứ lúc nào."
   },
   "byContinuingYouAgreeToThe": {
-    "message": "Nếu tiếp tục, bạn đồng ý"
+    "message": "Bằng cách tiếp tục, bạn đồng ý với"
   },
   "and": {
     "message": "và"
   },
   "acceptPolicies": {
-    "message": "Bạn đồng ý với những điều sau khi nhấn chọn ô này:"
+    "message": "Bạn đồng ý với những điều sau khi tích chọn ô này:"
   },
   "acceptPoliciesRequired": {
-    "message": "Điều khoản sử dụng và chính sách quyền riêng tư chưa được đồng ý."
+    "message": "Bạn chưa đồng ý với Điều khoản Dịch vụ và Chính sách Bảo mật."
   },
   "enableBrowserIntegration": {
     "message": "Cho phép tích hợp với trình duyệt"
   },
   "enableBrowserIntegrationDesc1": {
-    "message": "Used to allow biometric unlock in browsers that are not Safari."
+    "message": "Dùng để cho phép mở khóa bằng sinh trắc học trên các trình duyệt không phải Safari."
   },
   "enableDuckDuckGoBrowserIntegration": {
     "message": "Cho phép tích hợp trình duyệt DuckDuckGo"
   },
   "enableDuckDuckGoBrowserIntegrationDesc": {
-    "message": "Sử dụng kho Bitwarden của bạn khi tìm kiếm bằng DuckDuckGo."
+    "message": "Sử dụng kho Bitwarden của bạn khi duyệt web với DuckDuckGo."
   },
   "browserIntegrationUnsupportedTitle": {
-    "message": "Tích hợp trình duyệt không được hỗ trợ"
+    "message": "Trình duyệt không hỗ trợ tích hợp"
   },
   "browserIntegrationErrorTitle": {
     "message": "Lỗi khi bật tích hợp trình duyệt"
@@ -2116,7 +2119,7 @@
     "message": "Đã xảy ra lỗi khi bật tích hợp với trình duyệt."
   },
   "browserIntegrationMasOnlyDesc": {
-    "message": "Rất tiếc, tính năng tích hợp trình duyệt hiện chỉ được hỗ trợ trong phiên bản App Store trên Mac."
+    "message": "Rất tiếc, tính năng tích hợp trình duyệt hiện chỉ được hỗ trợ trong phiên bản Mac App Store."
   },
   "browserIntegrationWindowsStoreDesc": {
     "message": "Rất tiếc, tính năng tích hợp trình duyệt hiện không được hỗ trợ trong phiên bản Microsoft Store."
@@ -2125,16 +2128,16 @@
     "message": "Rất tiếc, tính năng tích hợp trình duyệt hiện không được hỗ trợ trong phiên bản linux."
   },
   "enableBrowserIntegrationFingerprint": {
-    "message": "Yêu cầu xác minh để tích hợp trình duyệt"
+    "message": "Yêu cầu xác thực để tích hợp trình duyệt"
   },
   "enableBrowserIntegrationFingerprintDesc": {
-    "message": "Tăng cường bảo mật bằng cách yêu cầu xác nhận cụm vân tay khi kết nối máy tính với trình duyệt. Việc này yêu cầu bạn phải thực hiện thao tác xác minh mỗi khi tạo kết nối."
+    "message": "Thêm một lớp bảo mật bổ sung bằng cách yêu cầu xác nhận cụm từ xác thực khi thiết lập kết nối giữa máy tính với trình duyệt. Việc này yêu cầu bạn phải thực hiện thao tác và xác minh mỗi khi tạo kết nối."
   },
   "enableHardwareAcceleration": {
-    "message": "Dùng tính năng tăng tốc phần cứng"
+    "message": "Sử dụng tăng tốc phần cứng"
   },
   "enableHardwareAccelerationDesc": {
-    "message": "Mặc định cài đặt này được bật. Chỉ tắt khi gặp sự cố đồ họa. Cần khởi động lại."
+    "message": "Theo mặc định, cài đặt này được BẬT. Chỉ TẮT nếu bạn gặp sự cố đồ họa. Cần khởi động lại."
   },
   "approve": {
     "message": "Phê duyệt"
@@ -2143,7 +2146,7 @@
     "message": "Xác minh kết nối trình duyệt"
   },
   "verifyBrowserDesc": {
-    "message": "Vui lòng đảm bảo cụm vân tay hiển thị giống hệt với cụm vân tay được hiển thị trong tiện ích mở rộng trình duyệt."
+    "message": "Vui lòng đảm bảo rằng cụm từ xác thực hiển thị trùng khớp với cụm từ xác thực được hiển thị trong tiện ích mở rộng trình duyệt."
   },
   "verifyNativeMessagingConnectionTitle": {
     "message": "$APPID$ muốn kết nối với Bitwarden",
@@ -2158,25 +2161,25 @@
     "message": "Bạn có muốn chấp thuận yêu cầu này không?"
   },
   "verifyNativeMessagingConnectionWarning": {
-    "message": "Nếu bạn không gửi yêu cầu này, đừng chấp thuận."
+    "message": "Nếu bạn không gửi yêu cầu này, đừng phê duyệt."
   },
   "biometricsNotEnabledTitle": {
-    "message": "Sinh trắc học chưa được thiết lập"
+    "message": "Chưa thiết lập sinh trắc học"
   },
   "biometricsNotEnabledDesc": {
-    "message": "Sinh trắc học trên trình duyệt yêu cầu sinh trắc học trên máy tính phải được cài đặt trước."
+    "message": "Để dùng tính năng xác thực sinh trắc học trên trình duyệt, bạn cần thiết lập xác thực sinh trắc học trên máy tính trước."
   },
   "biometricsManualSetupTitle": {
-    "message": "Thiết lập sinh trắc tự động không khả dụng"
+    "message": "Không hỗ trợ cài đặt tự động"
   },
   "biometricsManualSetupDesc": {
-    "message": "Do phương pháp cài đặt, sinh trắc học không thể được bật tự động. Bạn có muốn mở hướng dẫn cách thực hiện thủ công?"
+    "message": "Do phương pháp cài đặt, tính năng hỗ trợ sinh trắc học không thể được kích hoạt tự động. Bạn có muốn mở hướng dẫn cách thực hiện điều này thủ công không?"
   },
   "personalOwnershipSubmitError": {
-    "message": "Do chính sách doanh nghiệp, bạn bị hạn chế lưu các mục vào kho cá nhân của mình. Thay đổi tùy chọn quyền sở hữu thành một tổ chức và chọn từ các bộ sưu tập có sẵn."
+    "message": "Do chính sách của doanh nghiệp, bạn không thể lưu trữ các mục vào kho cá nhân của mình. Hãy thay đổi tùy chọn Quyền sở hữu thành tổ chức và chọn từ các bộ sưu tập có sẵn."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Mật khẩu mới của bạn không được trùng với mật khẩu hiện tại."
   },
   "hintEqualsPassword": {
     "message": "Gợi ý mật khẩu không được trùng với mật khẩu của bạn."
@@ -2188,16 +2191,16 @@
     "message": "Chính sách của tổ chức đã chặn việc nhập các mục vào kho cá nhân của bạn."
   },
   "personalDetails": {
-    "message": "Personal details"
+    "message": "Thông tin cá nhân"
   },
   "identification": {
-    "message": "Identification"
+    "message": "Định danh"
   },
   "contactInfo": {
-    "message": "Contact information"
+    "message": "Thông tin liên hệ"
   },
   "allSends": {
-    "message": "Tất cả mục Gửi",
+    "message": "Tất cả Send",
     "description": "'Sends' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeFile": {
@@ -2207,15 +2210,15 @@
     "message": "Văn bản"
   },
   "searchSends": {
-    "message": "Tìm kiếm mục Gửi",
+    "message": "Tìm kiếm Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
-    "message": "Sửa mục Gửi",
+    "message": "Chỉnh sửa Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "myVault": {
-    "message": "Kho của tôi"
+    "message": "Kho lưu trữ"
   },
   "text": {
     "message": "Văn bản"
@@ -2224,14 +2227,14 @@
     "message": "Ngày xóa"
   },
   "deletionDateDesc": {
-    "message": "Mục Gửi sẽ được xóa vĩnh viễn vào ngày và giờ chỉ định.",
+    "message": "Send sẽ được xóa vĩnh viễn vào ngày và giờ chỉ định.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
     "message": "Ngày hết hạn"
   },
   "expirationDateDesc": {
-    "message": "Nếu được thiết lập, mục Gửi này sẽ hết hạn vào ngày và giờ được chỉ định.",
+    "message": "Nếu được thiết lập, Send này sẽ hết hạn vào ngày và giờ được chỉ định.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "maxAccessCount": {
@@ -2239,57 +2242,57 @@
     "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "maxAccessCountDesc": {
-    "message": "Nếu được thiết lập, khi đã đạt tới số lượng truy cập tối đa, người dùng sẽ không thể truy cập mục Gửi này nữa.",
+    "message": "Nếu được thiết lập, người dùng sẽ không thể truy cập Send này khi đã đạt tới số lần truy cập tối đa.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "currentAccessCount": {
-    "message": "Số lượng truy cập hiện tại"
+    "message": "Số lần truy cập hiện tại"
   },
   "disableSend": {
-    "message": "Vô hiệu hoá mục Gửi này để không ai có thể truy cập nó.",
+    "message": "Vô hiệu hoá Send này để không ai có thể truy cập.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendPasswordDesc": {
-    "message": "Yêu cầu nhập mật khẩu khi người dùng truy cập vào phần Gửi này.",
+    "message": "Yêu cầu nhập mật khẩu khi truy cập Send này.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendNotesDesc": {
-    "message": "Ghi chú riêng tư về mục Gửi này.",
+    "message": "Ghi chú riêng tư về Send này.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLink": {
-    "message": "Liên kết Gửi",
+    "message": "Liên kết Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLinkLabel": {
-    "message": "Liên kết Gửi",
+    "message": "Liên kết Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "textHiddenByDefault": {
-    "message": "Khi truy cập vào phần Gửi, văn bản sẽ được ẩn theo mặc định",
+    "message": "Khi truy cập vào Send, văn bản sẽ được ẩn theo mặc định",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
-    "message": "Đã tạo mục Gửi",
+    "message": "Đã tạo Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
-    "message": "Đã lưu mục Gửi",
+    "message": "Đã lưu Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletedSend": {
-    "message": "Đã xóa mục Gửi",
+    "message": "Đã xóa Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "newPassword": {
     "message": "Mật khẩu mới"
   },
   "whatTypeOfSend": {
-    "message": "Đây là kiểu Gửi gì?",
+    "message": "Đây là loại Send nào?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
-    "message": "Mục Gửi mới",
+    "message": "Tạo Send mới",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTextDesc": {
@@ -2314,18 +2317,18 @@
     "message": "Tùy chỉnh"
   },
   "deleteSendConfirmation": {
-    "message": "Bạn có chắc muốn mục Gửi này?",
+    "message": "Bạn có chắc chắn muốn xóa Send này?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLinkToClipboard": {
-    "message": "Sao chép liên kết tới khay nhớ tạm",
+    "message": "Sao chép liên kết Send vào bảng nhớ tạm",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLinkOnSave": {
-    "message": "Sao chép liên kết chia sẻ của mục Gửi này tới khay nhớ tạm khi lưu."
+    "message": "Sao chép liên kết Send này vào bảng nhớ tạm khi lưu."
   },
   "sendDisabled": {
-    "message": "Đã loại bỏ Gửi",
+    "message": "Đã loại bỏ Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDisabledWarning": {
@@ -2336,7 +2339,7 @@
     "message": "Sao chép liên kết"
   },
   "disabled": {
-    "message": "Đã tắt"
+    "message": "Vô hiệu hóa"
   },
   "removePassword": {
     "message": "Xóa mật khẩu"
@@ -2345,7 +2348,7 @@
     "message": "Đã xóa mật khẩu"
   },
   "removePasswordConfirmation": {
-    "message": "Bạn có chắc muốn xóa mật khẩu này?"
+    "message": "Bạn có chắc chắn muốn xóa mật khẩu này không?"
   },
   "maxAccessCountReached": {
     "message": "Đã vượt số lần truy cập tối đa"
@@ -2360,19 +2363,19 @@
     "message": "Xác thực WebAuthn"
   },
   "readSecurityKey": {
-    "message": "Read security key"
+    "message": "Đọc khóa bảo mật"
   },
   "awaitingSecurityKeyInteraction": {
-    "message": "Awaiting security key interaction..."
+    "message": "Đang chờ tương tác với khóa bảo mật..."
   },
   "hideEmail": {
-    "message": "Ẩn địa chỉ email của tôi khỏi người nhận."
+    "message": "Ẩn địa chỉ email của tôi với người nhận."
   },
   "sendOptionsPolicyInEffect": {
-    "message": "Các chính sách của tổ chức đang ảnh hưởng đến tùy chọn Gửi của bạn."
+    "message": "Các chính sách của tổ chức đang ảnh hưởng đến tùy chọn Send của bạn."
   },
   "emailVerificationRequired": {
-    "message": "Yêu cầu xác nhận danh tính qua email"
+    "message": "Yêu cầu xác minh danh tính qua email"
   },
   "emailVerifiedV2": {
     "message": "Email đã xác minh"
@@ -2381,28 +2384,40 @@
     "message": "Bạn phải xác minh email của mình để sử dụng tính năng này."
   },
   "passwordPrompt": {
-    "message": "Nhắc lại mật khẩu chính"
+    "message": "Nhập lại mật khẩu chính"
   },
   "passwordConfirmation": {
     "message": "Xác nhận mật khẩu chính"
   },
   "passwordConfirmationDesc": {
-    "message": "Hành động này được bảo vệ. Để tiếp tục, vui lòng nhập lại mật khẩu chính của bạn để xác minh danh tính của bạn."
+    "message": "Hành động này được bảo vệ. Để tiếp tục, hãy nhập lại mật khẩu chính của bạn để xác minh danh tính."
+  },
+  "masterPasswordSuccessfullySet": {
+    "message": "Mật khẩu chính được đặt thành công"
   },
   "updatedMasterPassword": {
     "message": "Mật khẩu chính đã được cập nhật"
   },
   "updateMasterPassword": {
-    "message": "Cập nhật Mật khẩu chính"
+    "message": "Cập nhật mật khẩu chính"
   },
   "updateMasterPasswordWarning": {
-    "message": "Mật khẩu chính của bạn gần đây đã được thay đổi bởi một quản trị viên trong tổ chức của bạn. Để truy cập Kho, bạn phải cập nhật nó ngay bây giờ. Tiếp tục sẽ đăng xuất bạn khỏi phiên hiện tại của bạn, yêu cầu bạn đăng nhập lại. Các phiên hoạt động trên các thiết bị khác có thể tiếp tục hoạt động trong tối đa một giờ."
+    "message": "Mật khẩu chính của bạn gần đây đã được thay đổi bởi người quản trị trong tổ chức của bạn. Để truy cập kho, bạn phải cập nhật mật khẩu chính của mình ngay bây giờ. Việc tiếp tục sẽ đăng xuất khỏi kho và bạn sẽ cần đăng nhập lại. Ứng dụng Bitwaden trên các thiết bị khác có thể tiếp tục hoạt động trong tối đa một giờ sau đó sẽ bị đăng xuất."
   },
   "updateWeakMasterPasswordWarning": {
-    "message": "Mật khẩu chính của bạn không đáp ứng chính sách tổ chức của bạn. Để truy cập kho, bạn phải cập nhật mật khẩu chính của mình ngay bây giờ. Việc tiếp tục sẽ đăng xuất bạn khỏi phiên hiện tại và bắt buộc đăng nhập lại. Các phiên hoạt động trên các thiết bị khác có thể tiếp tục duy trì hoạt động trong tối đa một giờ."
+    "message": "Mật khẩu chính của bạn không đáp ứng chính sách của tổ chức của bạn. Để truy cập kho, bạn phải cập nhật mật khẩu chính của mình ngay bây giờ. Việc tiếp tục sẽ đăng xuất bạn khỏi phiên hiện tại và bắt buộc đăng nhập lại. Các phiên hoạt động trên các thiết bị khác có thể tiếp tục duy trì hoạt động trong tối đa một giờ."
+  },
+  "changePasswordWarning": {
+    "message": "Sau khi thay đổi mật khẩu, bạn cần đăng nhập lại bằng mật khẩu mới. Các phiên đăng nhập đang hoạt động trên các thiết bị khác sẽ bị đăng xuất trong vòng một giờ."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Thay đổi mật khẩu chính của bạn để hoàn tất quá trình khôi phục tài khoản."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Mật khẩu chính của bạn không đáp ứng yêu cầu của tổ chức này. Vui lòng thay đổi mật khẩu chính để tiếp tục."
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Tổ chức của bạn đã vô hiệu hóa mã hóa bằng thiết bị đáng tin cậy. Vui lòng đặt mật khẩu chính để truy cập Kho của bạn."
+    "message": "Tổ chức của bạn đã vô hiệu hóa tính năng mã hóa thiết bị tin cậy. Vui lòng đặt mật khẩu chính để truy cập kho của bạn."
   },
   "tryAgain": {
     "message": "Thử lại"
@@ -2420,7 +2435,7 @@
     "message": "Đang chờ xác nhận"
   },
   "couldNotCompleteBiometrics": {
-    "message": "Không thể hoàn tất sinh trắc học."
+    "message": "Không thể hoàn tất quá trình xác thực sinh trắc học."
   },
   "needADifferentMethod": {
     "message": "Cần một phương pháp khác?"
@@ -2435,7 +2450,7 @@
     "message": "Dùng sinh trắc học"
   },
   "enterVerificationCodeSentToEmail": {
-    "message": "Nhập mã xác minh được gửi đến email của bạn."
+    "message": "Nhập mã xác minh đã được gửi đến email của bạn."
   },
   "resendCode": {
     "message": "Gửi lại mã"
@@ -2447,7 +2462,7 @@
     "message": "Phút"
   },
   "vaultTimeoutPolicyInEffect1": {
-    "message": "$HOURS$ hour(s) and $MINUTES$ minute(s) maximum.",
+    "message": "Tối đa $HOURS$ giờ và $MINUTES$ phút.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2460,7 +2475,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "Tổ chức của bạn đang ảnh hưởng đến thời gian mở kho. Thời gian mở kho tối đa là $HOURS$ giờ và $MINUTES$ phút. Kho sẽ $ACTION$ sau khi hết thời gian mở kho.",
+    "message": "Các chính sách của tổ chức bạn đang ảnh hưởng đến thời gian mở kho. Thời gian mở kho tối đa được phép là $HOURS$ giờ và $MINUTES$ phút. Kho sẽ $ACTION$ sau khi đóng kho.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -2477,7 +2492,7 @@
     }
   },
   "vaultTimeoutActionPolicyInEffect": {
-    "message": "Tổ chức của bạn sẽ $ACTION$ sau khi hết thời gian mở kho.",
+    "message": "Tổ chức bạn đã thiết lập hành động sau khi hết thời gian mở kho là $ACTION$.",
     "placeholders": {
       "action": {
         "content": "$1",
@@ -2489,7 +2504,7 @@
     "message": "Thời gian mở kho vượt quá giới hạn do tổ chức của bạn đặt ra."
   },
   "inviteAccepted": {
-    "message": "Lời mời được chấp nhận"
+    "message": "Đã chấp nhận lời mời"
   },
   "resetPasswordPolicyAutoEnroll": {
     "message": "Đăng ký tự động"
@@ -2498,7 +2513,7 @@
     "message": "Tổ chức này có chính sách doanh nghiệp sẽ tự động đặt lại mật khẩu chính cho bạn. Đăng ký sẽ cho phép quản trị viên tổ chức thay đổi mật khẩu chính của bạn."
   },
   "vaultExportDisabled": {
-    "message": "Đã xoá xuất kho"
+    "message": "Đã hủy xuất kho"
   },
   "personalVaultExportPolicyInEffect": {
     "message": "Các chính sách của tổ chức ngăn cản bạn xuất kho lưu trữ cá nhân của mình."
@@ -2513,13 +2528,13 @@
     "message": "Đã xóa mật khẩu chính"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Mật khẩu chính không còn được yêu cầu đối với các thành viên của tổ chức sau đây. Vui lòng xác nhận tên miền bên dưới với quản trị viên của tổ chức."
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Tên tổ chức"
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Tên miền Key Connector"
   },
   "leaveOrganization": {
     "message": "Rời khỏi tổ chức"
@@ -2531,7 +2546,7 @@
     "message": "Bạn đã rời khỏi tổ chức."
   },
   "ssoKeyConnectorError": {
-    "message": "Lỗi kết nối khóa: hãy đảm bảo kết nối khóa khả dụng và hoạt động chính xác."
+    "message": "Lỗi kết nối khóa: hãy đảm bảo kết nối khóa khả dụng và hoạt động bình thường."
   },
   "lockAllVaults": {
     "message": "Khoá tất cả kho"
@@ -2573,7 +2588,7 @@
     "message": "Đang xuất dữ liệu kho cá nhân"
   },
   "exportingIndividualVaultDescription": {
-    "message": "Chỉ dữ liệu trong kho cá nhân liên kết với $EMAIL$ mới được xuất. Không bao gồm \ncác dữ liệu trong kho tổ chức. Chỉ thông tin mục kho mới được xuất, sẽ không có các tệp đính kèm.",
+    "message": "Chỉ dữ liệu trong kho cá nhân liên kết với $EMAIL$ mới được xuất. Không bao gồm các dữ liệu trong kho tổ chức. Chỉ thông tin về các mục trong kho mới được xuất, sẽ không có các tệp đính kèm.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2582,7 +2597,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "Chỉ các mục kho lưu trữ cá nhân bao gồm các tệp đính kèm liên quan đến $EMAIL$ sẽ được xuất. Các mục trong kho lưu trữ của tổ chức sẽ không được bao gồm",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2606,7 +2621,7 @@
     "message": "Đã khóa"
   },
   "yourVaultIsLockedV2": {
-    "message": "Kho lưu trữ đã bị khóa"
+    "message": "Kho của bạn đã khóa"
   },
   "unlocked": {
     "message": "Đã mở khóa"
@@ -2622,19 +2637,37 @@
     "message": "Loại mật khẩu"
   },
   "regenerateUsername": {
-    "message": "Tạo lại tên người dùng"
+    "message": "Tạo lại tên đăng nhập"
   },
   "generateUsername": {
-    "message": "Tạo tên tài khoản"
+    "message": "Tạo tên đăng nhập"
   },
   "generateEmail": {
-    "message": "Generate email"
+    "message": "Tạo email"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Trình tạo tên đăng nhập"
+  },
+  "generatePassword": {
+    "message": "Tạo mật khẩu"
+  },
+  "generatePassphrase": {
+    "message": "Tạo cụm mật khẩu"
+  },
+  "passwordGenerated": {
+    "message": "Đã tạo mật khẩu"
+  },
+  "passphraseGenerated": {
+    "message": "Đã tạo cụm mật khẩu"
+  },
+  "usernameGenerated": {
+    "message": "Tên đăng nhập được tạo tự động"
+  },
+  "emailGenerated": {
+    "message": "Email được tạo ra"
   },
   "spinboxBoundariesHint": {
-    "message": "Value must be between $MIN$ and $MAX$.",
+    "message": "Giá trị phải nằm trong khoảng từ $MIN$ đến $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
     "placeholders": {
       "min": {
@@ -2648,7 +2681,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " Use $RECOMMENDED$ characters or more to generate a strong password.",
+    "message": " Sử dụng ít nhất $RECOMMENDED$ ký tự để tạo một mật khẩu mạnh.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -2658,7 +2691,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Use $RECOMMENDED$ words or more to generate a strong passphrase.",
+    "message": " Sử dụng ít nhất $RECOMMENDED$ từ để tạo cụm mật khẩu mạnh.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -2668,14 +2701,14 @@
     }
   },
   "usernameType": {
-    "message": "Loại tên người dùng"
+    "message": "Loại tên đăng nhập"
   },
   "plusAddressedEmail": {
     "message": "Địa chỉ email có hậu tố",
     "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
   },
   "plusAddressedEmailDesc": {
-    "message": "Sử dụng khả năng địa chỉ phụ của nhà cung cấp dịch vụ mail của bạn."
+    "message": "Sử dụng tính năng địa chỉ phụ của nhà cung cấp dịch vụ email của bạn."
   },
   "catchallEmail": {
     "message": "Catch-all email"
@@ -2684,7 +2717,16 @@
     "message": "Sử dụng hộp thư bạn đã thiết lập để nhận tất cả email gửi đến tên miền của bạn."
   },
   "useThisEmail": {
-    "message": "Use this email"
+    "message": "Dùng email này"
+  },
+  "useThisPassword": {
+    "message": "Dùng mật khẩu này"
+  },
+  "useThisPassphrase": {
+    "message": "Dùng cụm mật khẩu này"
+  },
+  "useThisUsername": {
+    "message": "Dùng tên đăng nhập này"
   },
   "random": {
     "message": "Ngẫu nhiên"
@@ -2693,13 +2735,13 @@
     "message": "Từ ngẫu nhiên"
   },
   "websiteName": {
-    "message": "Tên website"
+    "message": "Tên trang web"
   },
   "service": {
     "message": "Dịch vụ"
   },
   "allVaults": {
-    "message": "Tất cả kho"
+    "message": "Tất cả các kho"
   },
   "searchOrganization": {
     "message": "Tìm tổ chức"
@@ -2708,17 +2750,17 @@
     "message": "Tìm kiếm trong kho"
   },
   "forwardedEmail": {
-    "message": "Đã chuyển tiếp bí danh email"
+    "message": "Địa chỉ email thay thế"
   },
   "forwardedEmailDesc": {
-    "message": "Tạo bí danh email với dịch vụ chuyển tiếp bên ngoài."
+    "message": "Tạo một địa chỉ email ảo bằng dịch vụ chuyển tiếp email bên ngoài."
   },
   "forwarderDomainName": {
-    "message": "Email domain",
+    "message": "Tên miền email",
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Choose a domain that is supported by the selected service",
+    "message": "Chọn một tên miền được hỗ trợ bởi dịch vụ đã chọn",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
@@ -2750,7 +2792,7 @@
     }
   },
   "forwaderInvalidToken": {
-    "message": "Khoá API $SERVICENAME$ không hợp lệ",
+    "message": "API token $SERVICENAME$ không hợp lệ",
     "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2760,7 +2802,7 @@
     }
   },
   "forwaderInvalidTokenWithMessage": {
-    "message": "Khoá API $SERVICENAME$ không hợp lệ: $ERRORMESSAGE$",
+    "message": "API token $SERVICENAME$ không hợp lệ: $ERRORMESSAGE$",
     "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -2774,7 +2816,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "message": "$SERVICENAME$ đã từ chối yêu cầu của bạn. Vui lòng liên hệ với nhà cung cấp dịch vụ của bạn để được hỗ trợ.",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2784,7 +2826,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ đã từ chối yêu cầu của bạn: $ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -2798,7 +2840,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Không thể lấy ID tài khoản email ẩn từ $SERVICENAME$.",
+    "message": "Không thể lấy ID tài khoản email ẩn danh của $SERVICENAME$.",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -2852,13 +2894,13 @@
     "description": "Part of a URL."
   },
   "apiAccessToken": {
-    "message": "Khoá truy cập API"
+    "message": "Token truy cập API"
   },
   "apiKey": {
     "message": "Khóa API"
   },
   "premiumSubcriptionRequired": {
-    "message": "Yêu cầu đăng ký gói Premium"
+    "message": "Yêu cầu đăng ký gói Cao cấp"
   },
   "organizationIsDisabled": {
     "message": "Tổ chức đã ngưng hoạt động"
@@ -2870,7 +2912,7 @@
     "message": "Bạn có chắc chắn muốn chọn \"Không bao giờ\" không? Lựa chọn này sẽ lưu khóa mã hóa kho của bạn trực tiếp trên thiết bị. Hãy nhớ bảo vệ thiết bị của bạn thật cẩn thận nếu bạn chọn tùy chọn này."
   },
   "vault": {
-    "message": "Kho mật khẩu"
+    "message": "Kho lưu trữ"
   },
   "loginWithMasterPassword": {
     "message": "Đăng nhập bằng mật khẩu chính"
@@ -2897,40 +2939,40 @@
     "message": "Bắt đầu đăng nhập"
   },
   "logInRequestSent": {
-    "message": "Request sent"
+    "message": "Đã gửi yêu cầu"
   },
   "notificationSentDevice": {
     "message": "Một thông báo đã được gửi đến thiết bị của bạn."
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "A notification was sent to your device"
+    "message": "Một thông báo đã được gửi đến thiết bị của bạn"
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the "
+    "message": "Mở khóa Bitwarden trên thiết bị của bạn hoặc trên "
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "ứng dụng web"
   },
   "notificationSentDevicePart2": {
-    "message": "Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Hãy đảm bảo rằng cụm từ xác thực khớp với cụm từ bên dưới trước khi phê duyệt."
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "Cần một tùy chọn khác?"
   },
   "fingerprintMatchInfo": {
-    "message": "Vui lòng đảm bảo rằng bạn đã mở khoá kho và cụm vân tay khớp trên thiết bị khác."
+    "message": "Vui lòng đảm bảo rằng bạn đã mở khoá kho và cụm từ xác thực khớp với thiết bị khác."
   },
   "fingerprintPhraseHeader": {
-    "message": "Cụm vân tay"
+    "message": "Cụm từ xác thực"
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "You will be notified once the request is approved"
+    "message": "Bạn sẽ nhận được thông báo ngay sau khi yêu cầu được phê duyệt"
   },
   "needAnotherOption": {
-    "message": "Đăng nhập bằng thiết bị phải được thiết lập trong cài đặt của ứng dụng Bitwarden. Dùng cách khác?"
+    "message": "Đăng nhập bằng thiết bị phải được thiết lập trong phần cài đặt của ứng dụng Bitwarden. Dùng cách khác?"
   },
   "viewAllLogInOptions": {
-    "message": "View all log in options"
+    "message": "Xem tất cả tùy chọn đăng nhập"
   },
   "viewAllLoginOptions": {
     "message": "Xem tất cả tùy chọn đăng nhập"
@@ -2939,14 +2981,14 @@
     "message": "Gửi lại thông báo"
   },
   "toggleCharacterCount": {
-    "message": "Bật tắt đếm kí tự",
+    "message": "Bật/tắt hiển thị số ký tự",
     "description": "'Character count' describes a feature that displays a number next to each character of the password."
   },
   "areYouTryingToAccessYourAccount": {
-    "message": "Are you trying to access your account?"
+    "message": "Bạn đang cố gắng truy cập tài khoản của mình?"
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "Cố gắng truy cập bởi $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2961,13 +3003,13 @@
     "message": "Địa chỉ IP"
   },
   "time": {
-    "message": "Thời Gian"
+    "message": "Thời gian"
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "Xác nhận truy cập"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "Từ chối truy cập"
   },
   "logInConfirmedForEmailOnDevice": {
     "message": "Đã xác nhận đăng nhập cho $EMAIL$ trên $DEVICE$",
@@ -2983,7 +3025,7 @@
     }
   },
   "youDeniedALogInAttemptFromAnotherDevice": {
-    "message": "Bạn đã từ chối đăng nhập từ thiết bị khác. Nếu đó là bạn, hãy thử đăng nhập lại bằng thiết bị đó."
+    "message": "Bạn đã từ chối một lần đăng nhập từ thiết bị khác. Nếu thực sự là bạn, hãy thử đăng nhập lại bằng thiết bị đó."
   },
   "justNow": {
     "message": "Vừa xong"
@@ -3004,7 +3046,7 @@
     "message": "Yêu cầu này không còn hiệu lực."
   },
   "confirmAccessAttempt": {
-    "message": "Confirm access attempt for $EMAIL$",
+    "message": "Phê duyệt yêu cầu truy cập cho $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3016,7 +3058,7 @@
     "message": "Yêu cầu đăng nhập"
   },
   "accountAccessRequested": {
-    "message": "Account access requested"
+    "message": "Yêu cầu truy cập tài khoản"
   },
   "creatingAccountOn": {
     "message": "Đang tạo tài khoản trên"
@@ -3025,13 +3067,13 @@
     "message": "Kiểm tra email của bạn"
   },
   "followTheLinkInTheEmailSentTo": {
-    "message": "Nhấp vào liên kết trong email được gửi đến"
+    "message": "Nhấp vào liên kết được gửi đến trong email"
   },
   "andContinueCreatingYourAccount": {
     "message": "và tiếp tục tạo tài khoản của bạn."
   },
   "noEmail": {
-    "message": "Không có email?"
+    "message": "Không nhận được email?"
   },
   "goBack": {
     "message": "Quay lại"
@@ -3040,28 +3082,22 @@
     "message": "để chỉnh sửa địa chỉ email của bạn."
   },
   "exposedMasterPassword": {
-    "message": "Mật khẩu chính bị lộ"
+    "message": "Mật khẩu chính đã bị lộ"
   },
   "exposedMasterPasswordDesc": {
-    "message": "Mật khẩu này đã bị rò rỉ trong một vụ tấn công dữ liệu. Dùng mật khẩu mới và an toàn để bảo vệ tài khoản bạn. Bạn có chắc muốn sử dụng mật khẩu đã bị rò rỉ?"
+    "message": "Mật khẩu này đã bị lộ trong một vụ rò rỉ dữ liệu. Hãy sử dụng mật khẩu mạnh và duy nhất để bảo vệ tài khoản của bạn. Bạn có chắc chắn muốn sử dụng mật khẩu đã bị lộ này không?"
   },
   "weakAndExposedMasterPassword": {
-    "message": "Mật khẩu chính yếu và bị lộ"
+    "message": "Mật khẩu chính yếu và đã bị lộ"
   },
   "weakAndBreachedMasterPasswordDesc": {
-    "message": "Mật khẩu yếu này đã bị rò rỉ trong một vụ tấn công dữ liệu. Dùng mật khẩu mới và an toàn để bảo vệ tài khoản bạn. Bạn có chắc muốn sử dụng mật khẩu đã bị rò rỉ?"
-  },
-  "useThisPassword": {
-    "message": "Use this password"
-  },
-  "useThisUsername": {
-    "message": "Use this username"
+    "message": "Mật khẩu yếu này đã bị rò rỉ trong một vụ tấn công dữ liệu. Hãy dùng mật khẩu mạnh và duy nhất để bảo vệ tài khoản của bạn. Bạn có chắc muốn sử dụng mật khẩu đã bị rò rỉ?"
   },
   "checkForBreaches": {
-    "message": "Kiểm tra mật khẩu có lộ trong các vụ rò rỉ dữ liệu hay không"
+    "message": "Kiểm tra mật khẩu có bị lộ trong các vụ rò rỉ dữ liệu hay không"
   },
   "loggedInExclamation": {
-    "message": "Logged in!"
+    "message": "Đã đăng nhập!"
   },
   "important": {
     "message": "Quan trọng:"
@@ -3070,13 +3106,13 @@
     "message": "Đang truy cập"
   },
   "accessTokenUnableToBeDecrypted": {
-    "message": "Bạn đã bị đăng xuất do khoá truy cập của bạn không thể giải mã. Vui lòng đăng nhập lại để khắc phục sự cố này."
+    "message": "Bạn đã bị đăng xuất vì token truy cập của bạn không thể được giải mã. Vui lòng đăng nhập lại để khắc phục sự cố này."
   },
   "refreshTokenSecureStorageRetrievalFailure": {
-    "message": "Bạn đã bị đăng xuất do khoá truy cập của bạn không thể truy xuất. Vui lòng đăng nhập lại để khắc phục sự cố này."
+    "message": "Bạn đã bị đăng xuất vì không thể lấy được mã làm mới (refresh token). Vui lòng đăng nhập lại để khắc phục sự cố này."
   },
   "masterPasswordHint": {
-    "message": "Mật khẩu chính của bạn không thể phục hồi nếu bạn quên nó!"
+    "message": "Mật khẩu chính của bạn không thể khôi phục nếu bạn quên nó!"
   },
   "characterMinimum": {
     "message": "Tối thiểu $LENGTH$ ký tự",
@@ -3088,22 +3124,22 @@
     }
   },
   "windowsBiometricUpdateWarning": {
-    "message": "Bitwarden khuyên bạn nên cập nhật cài đặt sinh trắc học để yêu cầu mật khẩu chính (hoặc mã PIN) trong lần mở khóa đầu tiên. Bạn có muốn cập nhật cài đặt của mình bây giờ không?"
+    "message": "Bitwarden khuyến nghị bạn cập nhật cài đặt sinh trắc học để yêu cầu nhập mật khẩu chính (hoặc mã PIN) khi mở khóa lần đầu. Bạn có muốn cập nhật cài đặt ngay bây giờ không?"
   },
   "windowsBiometricUpdateWarningTitle": {
-    "message": "Cập nhật cài đặt được đề xuất"
+    "message": "Cập nhật Cài đặt được đề xuất"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Remember this device to make future logins seamless"
+    "message": "Nhớ thiết bị này để đăng nhập dễ dàng trong tương lai"
   },
   "deviceApprovalRequired": {
     "message": "Yêu cầu phê duyệt thiết bị. Chọn một tuỳ chọn phê duyệt bên dưới:"
   },
   "deviceApprovalRequiredV2": {
-    "message": "Device approval required"
+    "message": "Yêu cầu phê duyệt trên thiết bị"
   },
   "selectAnApprovalOptionBelow": {
-    "message": "Select an approval option below"
+    "message": "Chọn một tùy chọn phê duyệt dưới đây"
   },
   "rememberThisDevice": {
     "message": "Lưu thiết bị này"
@@ -3117,11 +3153,17 @@
   "requestAdminApproval": {
     "message": "Yêu cầu quản trị viên phê duyệt"
   },
+  "unableToCompleteLogin": {
+    "message": "Không thể hoàn tất quá trình đăng nhập"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Bạn cần đăng nhập trên một thiết bị đáng tin cậy hoặc yêu cầu quản trị viên cấp cho bạn mật khẩu."
+  },
   "region": {
     "message": "Khu vực"
   },
   "ssoIdentifierRequired": {
-    "message": "Cần có mã định danh SSO của tổ chức."
+    "message": "Cần có mã định danh Đăng nhập một lần của tổ chức."
   },
   "eu": {
     "message": "Châu Âu",
@@ -3143,43 +3185,43 @@
     "message": "Yêu cầu của bạn đã được gửi đến quản trị viên."
   },
   "troubleLoggingIn": {
-    "message": "Không thể đăng nhập?"
+    "message": "Gặp vấn đề khi đăng nhập?"
   },
   "loginApproved": {
-    "message": "Lượt đăng nhập đã duyệt"
+    "message": "Lượt đăng nhập đã phê duyệt"
   },
   "userEmailMissing": {
     "message": "Thiếu email người dùng"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "Email người dùng đang hoạt động không được tìm thấy. Bạn đang bị đăng xuất."
   },
   "deviceTrusted": {
     "message": "Thiết bị tin cậy"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Tin tưởng tổ chức"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Tin tưởng"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Không tin tưởng"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Tổ chức không được tin cậy"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Để đảm bảo an toàn tài khoản của bạn, chỉ xác nhận nếu bạn đã cấp quyền truy cập khẩn cấp cho người dùng này và cụm từ nhận dạng của họ khớp với những gì hiển thị trong tài khoản của họ"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Để đảm bảo an toàn cho tài khoản của bạn, vui lòng chỉ tiếp tục nếu bạn là thành viên của tổ chức này, đã kích hoạt tính năng khôi phục tài khoản và cụm từ nhận dạng hiển thị bên dưới trùng khớp với cụm từ nhận dạng của tổ chức."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Tổ chức này có chính sách doanh nghiệp sẽ đăng ký bạn vào quy trình khôi phục tài khoản. Việc đăng ký sẽ cho phép các quản trị viên của tổ chức thay đổi mật khẩu của bạn. Chỉ tiếp tục nếu bạn nhận ra tổ chức này và cụm từ xác thực hiển thị bên dưới khớp với cụm từ xác thực của tổ chức."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Người dùng tin cậy"
   },
   "inputRequired": {
     "message": "Trường này là bắt buộc."
@@ -3191,7 +3233,7 @@
     "message": "Tìm kiếm"
   },
   "inputMinLength": {
-    "message": "Giá trị nhập vào phải ít nhất $COUNT$ ký tự.",
+    "message": "Dữ liệu nhập vào phải có độ dài ít nhất $COUNT$ ký tự.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3200,7 +3242,7 @@
     }
   },
   "inputMaxLength": {
-    "message": "Giá trị nhập vào không được vượt quá $COUNT$ ký tự.",
+    "message": "Độ dài của dữ liệu nhập vào không được vượt quá $COUNT$ ký tự.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3218,7 +3260,7 @@
     }
   },
   "inputMinValue": {
-    "message": "Giá trị nhập vào phải ít nhất $MIN$.",
+    "message": "Dữ liệu nhập vào phải ít nhất là $MIN$.",
     "placeholders": {
       "min": {
         "content": "$1",
@@ -3227,7 +3269,7 @@
     }
   },
   "inputMaxValue": {
-    "message": "Giá trị nhập vào không được vượt quá $MAX$.",
+    "message": "Dữ liệu nhập vào không được vượt quá $MAX$.",
     "placeholders": {
       "max": {
         "content": "$1",
@@ -3239,14 +3281,14 @@
     "message": "Có ít nhất 1 địa chỉ email không hợp lệ"
   },
   "inputTrimValidator": {
-    "message": "Giá trị nhập vào không được chỉ có khoảng trắng.",
+    "message": "Dữ liệu nhập vào không được chỉ chứa khoảng trắng.",
     "description": "Notification to inform the user that a form's input can't contain only whitespace."
   },
   "inputEmail": {
-    "message": "Giá trị nhập vào không phải là địa chỉ email."
+    "message": "Dữ liệu nhập vào không phải là địa chỉ email."
   },
   "fieldsNeedAttention": {
-    "message": "Có $COUNT$ trường cần bạn xem xét ở trên.",
+    "message": "$COUNT$ trường ở trên cần bạn chú ý.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3258,7 +3300,7 @@
     "message": "-- Chọn --"
   },
   "multiSelectPlaceholder": {
-    "message": "-- Nhập để lọc --"
+    "message": "-- Nhập từ khóa để lọc --"
   },
   "multiSelectLoading": {
     "message": "Đang tải các tuỳ chọn..."
@@ -3285,16 +3327,16 @@
     "message": "Ẩn/hiện thanh điều hướng bên"
   },
   "skipToContent": {
-    "message": "Chuyển đến nội dung"
+    "message": "Bỏ qua nội dung"
   },
   "typePasskey": {
     "message": "Mã khoá"
   },
   "passkeyNotCopied": {
-    "message": "Không thể sao chép mã khoá"
+    "message": "Mã khóa sẽ không được sao chép"
   },
   "passkeyNotCopiedAlert": {
-    "message": "Bản sao sẽ không bao gồm mã khoá. Bạn có muốn tiếp tục tạo bản sao mục này?"
+    "message": "Bản sao sẽ không bao gồm mã khoá. Bạn có muốn tiếp tục tạo bản sao cho mục này?"
   },
   "aliasDomain": {
     "message": "Tên miền thay thế"
@@ -3304,10 +3346,10 @@
     "description": "Used for the desktop menu item and the header of the import dialog"
   },
   "importError": {
-    "message": "Lỗi nhập"
+    "message": "Lỗi khi nhập"
   },
   "importErrorDesc": {
-    "message": "Có vấn đề với dữ liệu bạn cố gắng nhập. Vui lòng khắc phục các lỗi được liệt kê bên dưới trong tập tin nguồn của bạn và thử lại."
+    "message": "Có vấn đề với dữ liệu bạn đang cố gắng nhập. Vui lòng khắc phục các lỗi được liệt kê bên dưới trong tệp nguồn của bạn và thử lại."
   },
   "resolveTheErrorsBelowAndTryAgain": {
     "message": "Giải quyết các lỗi bên dưới và thử lại."
@@ -3343,16 +3385,16 @@
     "message": "Lỗi kết nối với dịch vụ Duo. Sử dụng phương thức đăng nhập hai bước khác hoặc liên hệ với Duo để được hỗ trợ."
   },
   "duoRequiredByOrgForAccount": {
-    "message": "Tài khoản của bạn yêu cầu xác minh hai bước với Duo."
+    "message": "Tài khoản của bạn bắt buộc đăng nhập hai bước bằng Duo."
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "Đăng nhập hai bước là bắt buộc cho tài khoản của bạn. Hãy làm theo các bước dưới đây để hoàn tất quá trình đăng nhập."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "Thực hiện các bước sau để hoàn tất đăng nhập."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Thực hiện các bước sau để hoàn tất đăng nhập bằng khóa bảo mật của bạn."
   },
   "launchDuo": {
     "message": "Khởi chạy Duo trong trình duyệt"
@@ -3382,7 +3424,7 @@
     "message": "Chọn bộ sưu tập"
   },
   "importTargetHint": {
-    "message": "Chọn tùy chọn này để di chuyển nội dung tập tin đã được nhập đến $DESTINATION$",
+    "message": "Chọn tùy chọn này nếu bạn muốn nội dung của tệp đã nhập được di chuyển đến $DESTINATION$",
     "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.",
     "placeholders": {
       "destination": {
@@ -3410,7 +3452,7 @@
     "message": "hoặc sao chép/dán nội dung của tập tin nhập"
   },
   "instructionsFor": {
-    "message": "Hướng dẫn dùng $NAME$",
+    "message": "Hướng dẫn cho $NAME$",
     "description": "The title for the import tool instructions.",
     "placeholders": {
       "name": {
@@ -3438,7 +3480,7 @@
     "message": "Không tìm thấy dữ liệu LastPass"
   },
   "incorrectUsernameOrPassword": {
-    "message": "Tên người dùng hoặc mật khẩu không đúng"
+    "message": "Tên đăng nhập hoặc mật khẩu không đúng"
   },
   "incorrectPassword": {
     "message": "Mật khẩu không đúng"
@@ -3480,7 +3522,7 @@
     "message": "Yêu cầu xác thực LastPass"
   },
   "awaitingSSO": {
-    "message": "Đang chờ xác thực SSO"
+    "message": "Đang chờ xác thực Đăng nhập một lần"
   },
   "awaitingSSODesc": {
     "message": "Vui lòng tiếp tục đăng nhập bằng thông tin đăng nhập của công ty bạn."
@@ -3496,10 +3538,10 @@
     "message": "Nhập từ CSV"
   },
   "lastPassTryAgainCheckEmail": {
-    "message": "Thử lại hoặc tìm email từ LastPass để xác minh đó là bạn."
+    "message": "Hãy thử lại hoặc kiểm tra email từ LastPass để xác minh rằng đó là bạn."
   },
   "collection": {
-    "message": "Bộ Sưu Tập"
+    "message": "Bộ sưu tập"
   },
   "lastPassYubikeyDesc": {
     "message": "Cắm khóa YubiKey được liên kết với tài khoản LastPass của bạn vào cổng USB của máy tính, sau đó nhấn nút trên YubiKey."
@@ -3508,6 +3550,30 @@
     "message": "Định dạng chung",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Bitwarden phát hiện khớp đường dẫn (URI) để xác định các đề xuất tự động điền.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Biểu thức chính quy\" là tùy chọn nâng cao với nguy cơ cao hơn trong việc lộ thông tin đăng nhập.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Bắt đầu với\" là tùy chọn nâng cao với nguy cơ cao hơn trong việc lộ thông tin đăng nhập.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Thông tin thêm về độ phù hợp",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Tùy chọn nâng cao",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Cảnh báo",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "Thành công"
   },
@@ -3518,7 +3584,7 @@
     "message": "Vô hiệu hoá tính năng tăng tốc phần cứng và khởi động lại"
   },
   "enableHardwareAccelerationRestart": {
-    "message": "Kích hoạt tính năng tăng tốc phần cứng và khởi động lại"
+    "message": "Bật tính năng tăng tốc phần cứng và khởi động lại"
   },
   "removePasskey": {
     "message": "Xóa mã khoá"
@@ -3527,10 +3593,10 @@
     "message": "Đã xóa mã khoá"
   },
   "errorAssigningTargetCollection": {
-    "message": "Lỗi khi gán vào bộ sưu tập chỉ định."
+    "message": "Lỗi khi gán vào bộ sưu tập đã chọn."
   },
   "errorAssigningTargetFolder": {
-    "message": "Lỗi khi gán vào thư mục chỉ định."
+    "message": "Lỗi khi gán vào thư mục đã chọn."
   },
   "viewItemsIn": {
     "message": "Xem các mục trong $NAME$",
@@ -3570,39 +3636,39 @@
     "message": "Dữ liệu"
   },
   "fileSends": {
-    "message": "Gửi file"
+    "message": "Gửi tệp"
   },
   "textSends": {
-    "message": "Gửi tin nhắn"
+    "message": "Gửi văn bản"
   },
   "ssoError": {
-    "message": "Không thể tìm thấy cổng trống để đăng nhập SSO."
+    "message": "Không tìm thấy cổng trống để thực hiện đăng nhập một lần."
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "Mật khẩu an toàn đã được tạo! Đừng quên cập nhật mật khẩu của bạn trên trang web."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Sử dụng trình tạo",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "để tạo một mật khẩu mạnh và duy nhất",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+    "message": "Mở khóa bằng sinh trắc học không khả dụng vì cần phải mở khóa bằng mã PIN hoặc mật khẩu trước."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Biometric unlock is currently unavailable."
+    "message": "Mở khóa bằng sinh trắc học hiện không khả dụng."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Mở khóa bằng sinh trắc học không khả dụng do các tệp hệ thống bị cấu hình sai."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Mở khóa bằng sinh trắc học không khả dụng do các tệp hệ thống bị cấu hình sai."
   },
   "biometricsStatusHelptextNotEnabledLocally": {
-    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "message": "Mở khóa bằng sinh trắc học không khả dụng vì nó chưa được kích hoạt cho $EMAIL$ trong ứng dụng Bitwarden trên máy tính.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3611,100 +3677,100 @@
     }
   },
   "biometricsStatusHelptextUnavailableReasonUnknown": {
-    "message": "Biometric unlock is currently unavailable for an unknown reason."
+    "message": "Mở khóa bằng sinh trắc học hiện không khả dụng vì lý do chưa rõ."
   },
   "itemDetails": {
-    "message": "Item details"
+    "message": "Chi tiết mục"
   },
   "itemName": {
-    "message": "Item name"
+    "message": "Tên mục"
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "Thông tin đăng nhập"
   },
   "additionalOptions": {
-    "message": "Additional options"
+    "message": "Tùy chọn bổ sung"
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "Lịch sử mục"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "Chỉnh sửa lần cuối"
   },
   "upload": {
-    "message": "Upload"
+    "message": "Tải lên"
   },
   "authorize": {
-    "message": "Authorize"
+    "message": "Uỷ quyền"
   },
   "deny": {
-    "message": "Deny"
+    "message": "Từ chối"
   },
   "sshkeyApprovalTitle": {
-    "message": "Confirm SSH key usage"
+    "message": "Xác nhận việc sử dụng khóa SSH"
   },
   "agentForwardingWarningTitle": {
-    "message": "Warning: Agent Forwarding"
+    "message": "Cảnh báo: Chuyển tiếp tác nhân"
   },
   "agentForwardingWarningText": {
-    "message": "This request comes from a remote device that you are logged into"
+    "message": "Yêu cầu này đến từ một thiết bị từ xa mà bạn đang đăng nhập vào"
   },
   "sshkeyApprovalMessageInfix": {
-    "message": "is requesting access to"
+    "message": "đang yêu cầu quyền truy cập vào"
   },
   "sshkeyApprovalMessageSuffix": {
-    "message": "in order to"
+    "message": "để"
   },
   "sshActionLogin": {
-    "message": "authenticate to a server"
+    "message": "xác thực với máy chủ"
   },
   "sshActionSign": {
-    "message": "sign a message"
+    "message": "ký tên vào tin nhắn"
   },
   "sshActionGitSign": {
-    "message": "sign a git commit"
+    "message": "ký xác nhận một Git commit"
   },
   "unknownApplication": {
-    "message": "An application"
+    "message": "Một ứng dụng"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "Khóa SSH không hợp lệ"
   },
   "sshKeyTypeUnsupported": {
-    "message": "The SSH key type is not supported"
+    "message": "Loại khóa SSH không được hỗ trợ"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "Nhập khóa từ bảng nhớ tạm"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "Khóa SSH được nhập thành công"
   },
   "fileSavedToDevice": {
-    "message": "File saved to device. Manage from your device downloads."
+    "message": "Tệp đã được lưu vào thiết bị. Quản lý từ phần Tải về trên thiết bị của bạn."
   },
   "allowScreenshots": {
-    "message": "Allow screen capture"
+    "message": "Cho phép chụp màn hình"
   },
   "allowScreenshotsDesc": {
-    "message": "Allow the Bitwarden desktop application to be captured in screenshots and viewed in remote desktop sessions. Disabling this will prevent access on some external displays."
+    "message": "Cho phép chụp ảnh màn hình và truy cập Bitwarden trong các phiên truy cập máy tính từ xa. Nếu tắt tùy chọn này, bạn sẽ không thể xem ứng dụng trên một số màn hình ngoài."
   },
   "confirmWindowStillVisibleTitle": {
-    "message": "Confirm window still visible"
+    "message": "Xác nhận cửa sổ vẫn hiển thị"
   },
   "confirmWindowStillVisibleContent": {
-    "message": "Please confirm that the window is still visible."
+    "message": "Vui lòng xác nhận rằng cửa sổ vẫn còn hiển thị."
   },
   "updateBrowserOrDisableFingerprintDialogTitle": {
-    "message": "Extension update required"
+    "message": "Cần cập nhật tiện ích mở rộng"
   },
   "updateBrowserOrDisableFingerprintDialogMessage": {
-    "message": "The browser extension you are using is out of date. Please update it or disable browser integration fingerprint validation in the desktop app settings."
+    "message": "Phần mở rộng trình duyệt mà bạn đang sử dụng đã lỗi thời. Vui lòng cập nhật nó hoặc tắt tính năng xác thực dấu vân tay tích hợp trình duyệt trong cài đặt ứng dụng máy tính."
   },
   "changeAtRiskPassword": {
-    "message": "Change at-risk password"
+    "message": "Thay đổi mật khẩu có rủi ro"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Bạn không thể xóa các bộ sưu tập với quyền chỉ xem: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3713,64 +3779,223 @@
     }
   },
   "move": {
-    "message": "Move"
+    "message": "Di chuyển"
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Thư mục mới"
   },
   "folderName": {
-    "message": "Folder Name"
+    "message": "Tên thư mục"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Tạo một thư mục con bằng cách thêm tên thư mục cha theo sau là dấu “/”. Ví dụ: Social/Forums"
+  },
+  "sendsTitleNoItems": {
+    "message": "Gửi thông tin nhạy cảm một cách an toàn",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Chia sẻ tệp tin và dữ liệu một cách an toàn với bất kỳ ai, trên bất kỳ nền tảng nào. Thông tin của bạn sẽ được mã hóa đầu cuối để hạn chế rủi ro bị lộ.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Tạo mật khẩu nhanh chóng"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Dễ dàng tạo mật khẩu mạnh và duy nhất chỉ trong một cú nhấp chuột",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "để giúp bạn bảo vệ thông tin đăng nhập của mình.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Dễ dàng tạo mật khẩu mạnh và duy nhất bằng cách nhấp vào Trình tạo mật khẩu để giúp bạn bảo vệ tài khoản đăng nhập của mình.",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Tiết kiệm thời gian với tính năng tự động điền"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Bao gồm một",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Trang web",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "vì vậy, thông tin đăng nhập này sẽ xuất hiện như đề xuất tự động điền.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Thanh toán trực tuyến không gián đoạn"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Với thẻ, dễ dàng tự động điền các biểu mẫu thanh toán an toàn và chính xác."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Đơn giản hóa việc tạo tài khoản"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Với danh tính, nhanh chóng tự động điền các biểu mẫu đăng ký hoặc liên hệ dài."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Giữ dữ liệu nhạy cảm của bạn an toàn"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Với ghi chú, lưu trữ an toàn dữ liệu nhạy cảm như thông tin ngân hàng hoặc bảo hiểm."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Truy cập SSH thân thiện với nhà phát triển"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Lưu trữ khóa của bạn và kết nối với trình quản lý khóa SSH để xác thực nhanh chóng và được mã hóa.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Tìm hiểu thêm về SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Gán vào bộ sưu tập"
+  },
+  "assignToTheseCollections": {
+    "message": "Gán vào các bộ sưu tập này"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Chỉ những thành viên của tổ chức có quyền truy cập vào các bộ sưu tập này mới có thể xem mục này."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Chỉ những thành viên của tổ chức có quyền truy cập vào các bộ sưu tập này mới có thể xem các mục này."
+  },
+  "noCollectionsAssigned": {
+    "message": "Chưa có bộ sưu tập nào được gán"
+  },
+  "assign": {
+    "message": "Gán"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Chỉ những thành viên của tổ chức có quyền truy cập vào các bộ sưu tập này mới có thể xem các mục này."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Bạn đã chọn $TOTAL_COUNT$ mục. Bạn không thể cập nhật $READONLY_COUNT$ mục vì bạn không có quyền chỉnh sửa.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Chọn bộ sưu tập để gán"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ mục sẽ được chuyển vĩnh viễn đến tổ chức đã chọn. Bạn sẽ không còn sở hữu các mục này nữa.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ mục sẽ được chuyển vĩnh viễn đến $ORG$. Bạn sẽ không còn sở hữu các mục này nữa.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 mục sẽ được chuyển vĩnh viễn đến tổ chức đã chọn. Bạn sẽ không còn sở hữu mục này nữa."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 mục sẽ được chuyển vĩnh viễn đến $ORG$. Bạn sẽ không còn sở hữu mục này nữa.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Đã gán vào bộ sưu tập thành công"
+  },
+  "nothingSelected": {
+    "message": "Bạn chưa chọn gì."
+  },
+  "itemsMovedToOrg": {
+    "message": "Các mục đã được chuyển tới $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Mục đã được chuyển tới $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Đã chuyển các mục được chọn đến $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/zh_CN/messages.json b/apps/desktop/src/locales/zh_CN/messages.json
index 69d5faa5fb7..75d8925c4f7 100644
--- a/apps/desktop/src/locales/zh_CN/messages.json
+++ b/apps/desktop/src/locales/zh_CN/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "身份"
   },
+  "typeNote": {
+    "message": "笔记"
+  },
   "typeSecureNote": {
     "message": "安全笔记"
   },
@@ -247,7 +250,7 @@
     "message": "记住 SSH 授权"
   },
   "sshAgentPromptBehaviorAlways": {
-    "message": "总是"
+    "message": "始终"
   },
   "sshAgentPromptBehaviorNever": {
     "message": "从不"
@@ -351,12 +354,6 @@
   "other": {
     "message": "其他"
   },
-  "generatePassword": {
-    "message": "生成密码"
-  },
-  "generatePassphrase": {
-    "message": "生成密码短语"
-  },
   "type": {
     "message": "类型"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "文件最大为 500 MB。"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "需要迁移加密密钥。请登录网页版密码库来更新您的加密密钥。"
+  "legacyEncryptionUnsupported": {
+    "message": "旧版加密方式已不再受支持。请联系客服恢复您的账户。"
   },
   "editedFolder": {
     "message": "文件夹已保存"
@@ -1400,7 +1397,7 @@
     "message": "发现更新。是否立即下载？"
   },
   "restart": {
-    "message": "重新启动"
+    "message": "重启"
   },
   "later": {
     "message": "稍后"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "账户限制"
   },
+  "restrictCardTypeImport": {
+    "message": "无法导入支付卡项目类型"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "由 1 个或多个组织设置的策略阻止您将支付卡导入密码库。"
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "「文件密码」与「确认文件密码」不一致。"
   },
@@ -1782,7 +1785,7 @@
     "message": "设置用于解锁 Bitwarden 的 PIN 码。您的 PIN 设置将在您完全注销应用程序时被重置。"
   },
   "pinRequired": {
-    "message": "需要 PIN 码。"
+    "message": "必须填写 PIN 码。"
   },
   "invalidPin": {
     "message": "无效的 PIN 码。"
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "此操作受到保护。若要继续，请重新输入您的主密码以验证您的身份。"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "主密码设置成功"
+  },
   "updatedMasterPassword": {
     "message": "已更新主密码"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "您的主密码不符合某一项或多项组织策略要求。要访问密码库，必须立即更新您的主密码。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
+  "changePasswordWarning": {
+    "message": "更改密码后，您需要使用新密码登录。 在其他设备上的活动会话将在一小时内注销。"
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "更改您的主密码以完成账户恢复。"
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "您的主密码不符合本组织的要求。更改您的主密码以继续。"
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "您的组织禁用了信任设备加密。要访问您的密码库，请设置一个主密码。"
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "用户名生成器"
   },
+  "generatePassword": {
+    "message": "生成密码"
+  },
+  "generatePassphrase": {
+    "message": "生成密码短语"
+  },
+  "passwordGenerated": {
+    "message": "密码已生成"
+  },
+  "passphraseGenerated": {
+    "message": "密码短语已生成"
+  },
+  "usernameGenerated": {
+    "message": "用户名已生成"
+  },
+  "emailGenerated": {
+    "message": "电子邮箱已生成"
+  },
   "spinboxBoundariesHint": {
     "message": "值必须在 $MIN$ 和 $MAX$ 之间。",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "使用此电子邮箱"
   },
+  "useThisPassword": {
+    "message": "使用此密码"
+  },
+  "useThisPassphrase": {
+    "message": "使用此密码短语"
+  },
+  "useThisUsername": {
+    "message": "使用此用户名"
+  },
   "random": {
     "message": "随机"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "识别到弱密码且其出现在数据泄露中。请使用一个强且唯一的密码以保护您的账户。确定要使用这个密码吗？"
   },
-  "useThisPassword": {
-    "message": "使用此密码"
-  },
-  "useThisUsername": {
-    "message": "使用此用户名"
-  },
   "checkForBreaches": {
     "message": "检查已知的数据泄露是否包含此密码"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "请求管理员批准"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "区域"
   },
@@ -3508,6 +3550,30 @@
     "message": "常规格式",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "高级选项",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "警告",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "成功"
   },
@@ -3704,7 +3770,7 @@
     "message": "更改有风险的密码"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "您无法移除仅具有「查看」权限的集合：$COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -3724,21 +3790,46 @@
   "folderHintText": {
     "message": "通过在父文件夹名后面添加「/」来嵌套文件夹。示例：Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "安全地发送敏感信息",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "在任何平台上安全地与任何人共享文件和数据。您的信息将在限制曝光的同时保持端到端加密。",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "快速创建密码"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "一键创建强大且唯一的密码",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "帮助您保持登录安全。",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "点击「生成密码」按钮，轻松创建强大且唯一的密码，帮助您保持登录安全。",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "使用自动填充节省时间"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "包含",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "网站",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "以便将此登录显示为自动填充建议。",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
@@ -3772,5 +3863,139 @@
     "message": "进一步了解 SSH 代理",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "分配到集合"
+  },
+  "assignToTheseCollections": {
+    "message": "分配到这些集合"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "只有具有这些集合访问权限的组织成员才能看到这个项目。"
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "只有具有这些集合访问权限的组织成员才能看到这些项目。"
+  },
+  "noCollectionsAssigned": {
+    "message": "未分配任何集合"
+  },
+  "assign": {
+    "message": "分配"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "只有具有这些集合访问权限的组织成员才能看到这些项目。"
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "您选择了 $TOTAL_COUNT$ 个项目。其中的 $READONLY_COUNT$ 个项目由于您没有编辑权限，您将无法更新它们。",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "选择要分配的集合"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ 将永久转移到所选组织。您将不再拥有这些项目。",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ 将永久转移到 $ORG$。您将不再拥有这些项目。",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 个项目将永久转移到所选组织。您将不再拥有该项目。"
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 个项目将永久转移到 $ORG$ 。您将不再拥有该项目。",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "成功分配了集合"
+  },
+  "nothingSelected": {
+    "message": "您没有选择任何内容。"
+  },
+  "itemsMovedToOrg": {
+    "message": "项目已移动到 $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "项目已移动到 $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "所选项目已移动到 $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/locales/zh_TW/messages.json b/apps/desktop/src/locales/zh_TW/messages.json
index 6080c3ee0f8..88762ea9260 100644
--- a/apps/desktop/src/locales/zh_TW/messages.json
+++ b/apps/desktop/src/locales/zh_TW/messages.json
@@ -23,6 +23,9 @@
   "typeIdentity": {
     "message": "身分"
   },
+  "typeNote": {
+    "message": "Note"
+  },
   "typeSecureNote": {
     "message": "安全筆記"
   },
@@ -351,12 +354,6 @@
   "other": {
     "message": "其他"
   },
-  "generatePassword": {
-    "message": "產生密碼"
-  },
-  "generatePassphrase": {
-    "message": "產生密碼片語"
-  },
   "type": {
     "message": "類型"
   },
@@ -697,8 +694,8 @@
   "maxFileSize": {
     "message": "檔案最大為 500MB。"
   },
-  "encryptionKeyMigrationRequired": {
-    "message": "需要遷移加密金鑰。請透過網頁版登入密碼庫以更新您的加密金鑰。"
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
   },
   "editedFolder": {
     "message": "資料夾已儲存"
@@ -1719,6 +1716,12 @@
   "accountRestricted": {
     "message": "帳戶已限制"
   },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "「檔案密碼」與「確認檔案密碼」不一致。"
   },
@@ -2389,6 +2392,9 @@
   "passwordConfirmationDesc": {
     "message": "此操作受到保護。若要繼續，請重新輸入您的主密碼以驗證您的身份。"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "已更新主密碼"
   },
@@ -2401,6 +2407,15 @@
   "updateWeakMasterPasswordWarning": {
     "message": "您的主密碼不符合一個或多個組織政策規定。您必須立即更新您的主密碼才能存取密碼庫。進行此動作將登出您目前的工作階段，需要您重新登入。其他裝置上的工作階段可能持續長達一小時。"
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "tdeDisabledMasterPasswordRequired": {
     "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault."
   },
@@ -2633,6 +2648,24 @@
   "usernameGenerator": {
     "message": "Username generator"
   },
+  "generatePassword": {
+    "message": "產生密碼"
+  },
+  "generatePassphrase": {
+    "message": "產生密碼片語"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -2686,6 +2719,15 @@
   "useThisEmail": {
     "message": "Use this email"
   },
+  "useThisPassword": {
+    "message": "使用此密碼"
+  },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
+  "useThisUsername": {
+    "message": "使用此使用者名稱"
+  },
   "random": {
     "message": "隨機"
   },
@@ -3051,12 +3093,6 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "密碼強度不足，且該密碼已洩露。請使用一個強度足夠和獨特的密碼來保護您的帳戶。您確定要使用這個密碼嗎？"
   },
-  "useThisPassword": {
-    "message": "使用此密碼"
-  },
-  "useThisUsername": {
-    "message": "使用此使用者名稱"
-  },
   "checkForBreaches": {
     "message": "檢查外洩的密碼資料庫中是否包含此密碼"
   },
@@ -3117,6 +3153,12 @@
   "requestAdminApproval": {
     "message": "要求管理員核准"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "region": {
     "message": "區域"
   },
@@ -3508,6 +3550,30 @@
     "message": "常見格式",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "success": {
     "message": "成功"
   },
@@ -3724,6 +3790,31 @@
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -3772,5 +3863,139 @@
     "message": "Learn more about SSH agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "assignToCollections": {
+    "message": "Assign to collections"
+  },
+  "assignToTheseCollections": {
+    "message": "Assign to these collections"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "noCollectionsAssigned": {
+    "message": "No collections have been assigned"
+  },
+  "assign": {
+    "message": "Assign"
+  },
+  "bulkCollectionAssignmentDialogDescription": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2"
+      }
+    }
+  },
+  "selectCollectionsToAssign": {
+    "message": "Select collections to assign"
+  },
+  "personalItemsTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarning": {
+    "message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2 items"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "successfullyAssignedCollections": {
+    "message": "Successfully assigned collections"
+  },
+  "nothingSelected": {
+    "message": "You have not selected anything."
+  },
+  "itemsMovedToOrg": {
+    "message": "Items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Item moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "movedItemsToOrg": {
+    "message": "Selected items moved to $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    },
+    "personalItemsTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        }
+      }
+    },
+    "personalItemWithOrgTransferWarningSingular": {
+      "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+      "placeholders": {
+        "org": {
+          "content": "$1",
+          "example": "Organization name"
+        }
+      }
+    },
+    "personalItemsWithOrgTransferWarningPlural": {
+      "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+      "placeholders": {
+        "personal_items_count": {
+          "content": "$1",
+          "example": "2"
+        },
+        "org": {
+          "content": "$2",
+          "example": "Organization name"
+        }
+      }
+    }
   }
 }
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index 20c632ec4ac..4821b018148 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -10,6 +10,7 @@ import { Subject, firstValueFrom } from "rxjs";
 import { SsoUrlService } from "@bitwarden/auth/common";
 import { AccountServiceImplementation } from "@bitwarden/common/auth/services/account.service";
 import { ClientType } from "@bitwarden/common/enums";
+import { EncryptServiceImplementation } from "@bitwarden/common/key-management/crypto/services/encrypt.service.implementation";
 import { RegionConfig } from "@bitwarden/common/platform/abstractions/environment.service";
 import { Message, MessageSender } from "@bitwarden/common/platform/messaging";
 // eslint-disable-next-line no-restricted-imports -- For dependency creation
@@ -96,6 +97,11 @@ export class Main {
       appDataPath = path.join(process.env.SNAP_USER_DATA, "appdata");
     }
 
+    // Workaround for bug described here: https://github.com/electron/electron/issues/46538
+    if (process.platform === "linux") {
+      app.commandLine.appendSwitch("gtk-version", "3");
+    }
+
     app.on("ready", () => {
       // on ready stuff...
     });
@@ -182,14 +188,19 @@ export class Main {
 
     this.desktopSettingsService = new DesktopSettingsService(stateProvider);
     const biometricStateService = new DefaultBiometricStateService(stateProvider);
-
+    const encryptService = new EncryptServiceImplementation(
+      this.mainCryptoFunctionService,
+      this.logService,
+      true,
+    );
     this.biometricsService = new MainBiometricsService(
       this.i18nService,
       this.windowMain,
       this.logService,
-      this.messagingService,
       process.platform,
       biometricStateService,
+      encryptService,
+      this.mainCryptoFunctionService,
     );
 
     this.windowMain = new WindowMain(
@@ -383,7 +394,7 @@ export class Main {
       this.desktopSettingsService.hardwareAcceleration$,
     );
 
-    if (!hardwareAcceleration) {
+    if (!hardwareAcceleration || process.env.ELECTRON_DISABLE_GPU) {
       this.logService.warning("Hardware acceleration is disabled");
       app.disableHardwareAcceleration();
     } else if (isMacAppStore()) {
diff --git a/apps/desktop/src/main/menu/menu.file.ts b/apps/desktop/src/main/menu/menu.file.ts
index f132a464788..19ba5e99792 100644
--- a/apps/desktop/src/main/menu/menu.file.ts
+++ b/apps/desktop/src/main/menu/menu.file.ts
@@ -99,7 +99,7 @@ export class FileMenu extends FirstMenu implements IMenubarMenu {
       },
       {
         id: "typeSecureNote",
-        label: this.localize("typeSecureNote"),
+        label: this.localize("typeNote"),
         click: () => this.sendMessage("newSecureNote"),
         accelerator: "CmdOrCtrl+Shift+S",
       },
diff --git a/apps/desktop/src/main/messaging.main.ts b/apps/desktop/src/main/messaging.main.ts
index 556fa293108..bc8d9ae4685 100644
--- a/apps/desktop/src/main/messaging.main.ts
+++ b/apps/desktop/src/main/messaging.main.ts
@@ -10,7 +10,7 @@ import { autostart } from "@bitwarden/desktop-napi";
 
 import { Main } from "../main";
 import { DesktopSettingsService } from "../platform/services/desktop-settings.service";
-import { isFlatpak } from "../utils";
+import { isFlatpak, isLinux, isSnapStore } from "../utils";
 
 import { MenuUpdateRequest } from "./menu/menu.updater";
 
@@ -26,8 +26,11 @@ export class MessagingMain {
 
   async init() {
     this.scheduleNextSync();
-    if (process.platform === "linux") {
-      await this.desktopSettingsService.setOpenAtLogin(fs.existsSync(this.linuxStartupFile()));
+    if (isLinux()) {
+      // Flatpak and snap don't have access to or use the startup file. On flatpak, the autostart portal is used
+      if (!isFlatpak() && !isSnapStore()) {
+        await this.desktopSettingsService.setOpenAtLogin(fs.existsSync(this.linuxStartupFile()));
+      }
     } else {
       const loginSettings = app.getLoginItemSettings();
       await this.desktopSettingsService.setOpenAtLogin(loginSettings.openAtLogin);
diff --git a/apps/desktop/src/main/window.main.ts b/apps/desktop/src/main/window.main.ts
index f1a55866079..5b81cf8140b 100644
--- a/apps/desktop/src/main/window.main.ts
+++ b/apps/desktop/src/main/window.main.ts
@@ -16,7 +16,15 @@ import { BiometricStateService } from "@bitwarden/key-management";
 import { WindowState } from "../platform/models/domain/window-state";
 import { applyMainWindowStyles, applyPopupModalStyles } from "../platform/popup-modal-styles";
 import { DesktopSettingsService } from "../platform/services/desktop-settings.service";
-import { cleanUserAgent, isDev, isLinux, isMac, isMacAppStore, isWindows } from "../utils";
+import {
+  cleanUserAgent,
+  isDev,
+  isLinux,
+  isMac,
+  isMacAppStore,
+  isSnapStore,
+  isWindows,
+} from "../utils";
 
 const mainWindowSizeKey = "mainWindowSize";
 const WindowEventHandlingDelay = 100;
@@ -156,9 +164,8 @@ export class WindowMain {
               }
             }
 
-            // this currently breaks the file portal, so should only be used when
-            // no files are needed but security requirements are super high https://github.com/flatpak/xdg-desktop-portal/issues/785
-            if (process.env.EXPERIMENTAL_PREVENT_DEBUGGER_MEMORY_ACCESS === "true") {
+            // this currently breaks the file portal for snap https://github.com/flatpak/xdg-desktop-portal/issues/785
+            if (!isSnapStore()) {
               this.logService.info("Disabling memory dumps in main process");
               try {
                 await processisolations.disableMemoryAccess();
@@ -288,6 +295,15 @@ export class WindowMain {
       this.win.webContents.zoomFactor = this.windowStates[mainWindowSizeKey].zoomFactor ?? 1.0;
     });
 
+    // Persist zoom changes immediately when user zooms in/out or resets zoom
+    // We can't depend on higher level web events (like close) to do this
+    // because locking the vault resets window state.
+    this.win.webContents.on("zoom-changed", async () => {
+      const newZoom = this.win.webContents.zoomFactor;
+      this.windowStates[mainWindowSizeKey].zoomFactor = newZoom;
+      await this.desktopSettingsService.setWindow(this.windowStates[mainWindowSizeKey]);
+    });
+
     if (this.windowStates[mainWindowSizeKey].isMaximized) {
       this.win.maximize();
     }
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index b3a33dc75e3..2cc106d07b0 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2025.5.0",
+  "version": "2025.7.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2025.5.0",
+      "version": "2025.7.1",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-napi": "file:../desktop_native/napi"
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index c180ed8c744..8457cb23f74 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -2,7 +2,7 @@
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.5.0",
+  "version": "2025.7.1",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/apps/desktop/src/platform/components/approve-ssh-request.ts b/apps/desktop/src/platform/components/approve-ssh-request.ts
index 515fd94ecd6..8cd63e0b1ac 100644
--- a/apps/desktop/src/platform/components/approve-ssh-request.ts
+++ b/apps/desktop/src/platform/components/approve-ssh-request.ts
@@ -24,7 +24,6 @@ export interface ApproveSshRequestParams {
 @Component({
   selector: "app-approve-ssh-request",
   templateUrl: "approve-ssh-request.html",
-  standalone: true,
   imports: [
     DialogModule,
     CommonModule,
diff --git a/apps/desktop/src/platform/main/desktop-credential-storage-listener.ts b/apps/desktop/src/platform/main/desktop-credential-storage-listener.ts
index ca4d9a2d3ca..6922911e367 100644
--- a/apps/desktop/src/platform/main/desktop-credential-storage-listener.ts
+++ b/apps/desktop/src/platform/main/desktop-credential-storage-listener.ts
@@ -35,13 +35,13 @@ export class DesktopCredentialStorageListener {
         }
         return val;
       } catch (e) {
-        if (
-          e.message === "Password not found." ||
-          e.message === "The specified item could not be found in the keychain."
-        ) {
+        if (e instanceof Error && e.message === passwords.PASSWORD_NOT_FOUND) {
+          if (message.action === "hasPassword") {
+            return false;
+          }
           return null;
         }
-        this.logService.info(e);
+        this.logService.error("[Credential Storage Listener] %s failed", message.action, e);
       }
     });
   }
diff --git a/apps/desktop/src/platform/services/desktop-settings.service.ts b/apps/desktop/src/platform/services/desktop-settings.service.ts
index 37a1fe73829..c11f10646d7 100644
--- a/apps/desktop/src/platform/services/desktop-settings.service.ts
+++ b/apps/desktop/src/platform/services/desktop-settings.service.ts
@@ -1,3 +1,13 @@
+/*
+    -- Note --
+    
+    As of June 2025, settings should only be added here if they are owned
+    by the platform team. Other settings should be added to the relevant service
+    owned by the team that owns the setting.
+
+    More info: https://bitwarden.atlassian.net/browse/PM-23126
+*/
+
 import { Observable, map } from "rxjs";
 
 import {
@@ -108,7 +118,7 @@ export class DesktopSettingsService {
 
   private readonly closeToTrayState = this.stateProvider.getGlobal(CLOSE_TO_TRAY_KEY);
   /**
-   * Tha applications setting for whether or not to close the application into the system tray.
+   * The applications setting for whether or not to close the application into the system tray.
    */
   closeToTray$ = this.closeToTrayState.state$.pipe(map(Boolean));
 
diff --git a/apps/desktop/src/platform/services/electron-platform-utils.service.ts b/apps/desktop/src/platform/services/electron-platform-utils.service.ts
index b7c82f4e5db..43b867b7a68 100644
--- a/apps/desktop/src/platform/services/electron-platform-utils.service.ts
+++ b/apps/desktop/src/platform/services/electron-platform-utils.service.ts
@@ -86,6 +86,14 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService {
     return true;
   }
 
+  supportsAutofill(): boolean {
+    return false;
+  }
+
+  supportsFileDownloads(): boolean {
+    return false;
+  }
+
   showToast(
     type: "error" | "success" | "warning" | "info",
     title: string,
diff --git a/apps/desktop/src/scss/misc.scss b/apps/desktop/src/scss/misc.scss
index ce03406dd24..3c3d4ff508c 100644
--- a/apps/desktop/src/scss/misc.scss
+++ b/apps/desktop/src/scss/misc.scss
@@ -441,10 +441,6 @@ img,
   user-select: none;
 }
 
-app-vault-view .box-footer {
-  user-select: auto;
-}
-
 /* override for vault icon in desktop */
 app-vault-icon > div {
   display: flex;
diff --git a/apps/desktop/src/services/biometric-message-handler.service.spec.ts b/apps/desktop/src/services/biometric-message-handler.service.spec.ts
index af18828b59d..727e37ce79c 100644
--- a/apps/desktop/src/services/biometric-message-handler.service.spec.ts
+++ b/apps/desktop/src/services/biometric-message-handler.service.spec.ts
@@ -335,38 +335,6 @@ describe("BiometricMessageHandlerService", () => {
       });
     });
 
-    it("should show update dialog when legacy unlock is requested with fingerprint active", async () => {
-      desktopSettingsService.browserIntegrationFingerprintEnabled$ = of(true);
-      (global as any).ipc.platform.ephemeralStore.listEphemeralValueKeys.mockResolvedValue([
-        "connectedApp_appId",
-      ]);
-      (global as any).ipc.platform.ephemeralStore.getEphemeralValue.mockResolvedValue(
-        JSON.stringify({
-          publicKey: Utils.fromUtf8ToB64("publicKey"),
-          sessionSecret: Utils.fromBufferToB64(new Uint8Array(64)),
-          trusted: false,
-        }),
-      );
-      encryptService.decryptString.mockResolvedValue(
-        JSON.stringify({
-          command: "biometricUnlock",
-          messageId: 0,
-          timestamp: Date.now(),
-          userId: SomeUser,
-        }),
-      );
-      await service.handleMessage({
-        appId: "appId",
-        message: {
-          command: "biometricUnlock",
-          messageId: 0,
-          timestamp: Date.now(),
-          userId: SomeUser,
-        },
-      });
-      expect(dialogService.openSimpleDialog).toHaveBeenCalled();
-    });
-
     it("should send verify fingerprint when fingerprinting is required on modern unlock, and dialog is accepted, and set to trusted", async () => {
       desktopSettingsService.browserIntegrationFingerprintEnabled$ = of(true);
       (global as any).ipc.platform.ephemeralStore.listEphemeralValueKeys.mockResolvedValue([
diff --git a/apps/desktop/src/services/biometric-message-handler.service.ts b/apps/desktop/src/services/biometric-message-handler.service.ts
index 42d7b8aae5f..dcca00a1686 100644
--- a/apps/desktop/src/services/biometric-message-handler.service.ts
+++ b/apps/desktop/src/services/biometric-message-handler.service.ts
@@ -1,5 +1,5 @@
 import { Injectable, NgZone } from "@angular/core";
-import { combineLatest, concatMap, firstValueFrom, map } from "rxjs";
+import { combineLatest, concatMap, firstValueFrom } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -255,102 +255,6 @@ export class BiometricMessageHandlerService {
           appId,
         );
       }
-      // TODO: legacy, remove after 2025.3
-      case BiometricsCommands.IsAvailable: {
-        const available =
-          (await this.biometricsService.getBiometricsStatus()) == BiometricsStatus.Available;
-        return this.send(
-          {
-            command: BiometricsCommands.IsAvailable,
-            response: available ? "available" : "not available",
-          },
-          appId,
-        );
-      }
-      // TODO: legacy, remove after 2025.3
-      case BiometricsCommands.Unlock: {
-        if (
-          await firstValueFrom(this.desktopSettingService.browserIntegrationFingerprintEnabled$)
-        ) {
-          await this.send({ command: "biometricUnlock", response: "not available" }, appId);
-          await this.dialogService.openSimpleDialog({
-            title: this.i18nService.t("updateBrowserOrDisableFingerprintDialogTitle"),
-            content: this.i18nService.t("updateBrowserOrDisableFingerprintDialogMessage"),
-            type: "warning",
-          });
-          return;
-        }
-
-        const isTemporarilyDisabled =
-          (await this.biometricStateService.getBiometricUnlockEnabled(message.userId as UserId)) &&
-          !((await this.biometricsService.getBiometricsStatus()) == BiometricsStatus.Available);
-        if (isTemporarilyDisabled) {
-          return this.send({ command: "biometricUnlock", response: "not available" }, appId);
-        }
-
-        if (!((await this.biometricsService.getBiometricsStatus()) == BiometricsStatus.Available)) {
-          return this.send({ command: "biometricUnlock", response: "not supported" }, appId);
-        }
-
-        const userId =
-          (message.userId as UserId) ??
-          (await firstValueFrom(this.accountService.activeAccount$.pipe(map((a) => a?.id))));
-
-        if (userId == null) {
-          return this.send({ command: "biometricUnlock", response: "not unlocked" }, appId);
-        }
-
-        const biometricUnlock =
-          message.userId == null
-            ? await firstValueFrom(this.biometricStateService.biometricUnlockEnabled$)
-            : await this.biometricStateService.getBiometricUnlockEnabled(message.userId as UserId);
-        if (!biometricUnlock) {
-          await this.send({ command: "biometricUnlock", response: "not enabled" }, appId);
-
-          return this.ngZone.run(() =>
-            this.dialogService.openSimpleDialog({
-              type: "warning",
-              title: { key: "biometricsNotEnabledTitle" },
-              content: { key: "biometricsNotEnabledDesc" },
-              cancelButtonText: null,
-              acceptButtonText: { key: "cancel" },
-            }),
-          );
-        }
-
-        try {
-          const userKey = await this.biometricsService.unlockWithBiometricsForUser(userId);
-
-          if (userKey != null) {
-            await this.send(
-              {
-                command: "biometricUnlock",
-                response: "unlocked",
-                userKeyB64: userKey.keyB64,
-              },
-              appId,
-            );
-
-            const currentlyActiveAccountId = (
-              await firstValueFrom(this.accountService.activeAccount$)
-            )?.id;
-            const isCurrentlyActiveAccountUnlocked =
-              (await this.authService.getAuthStatus(userId)) == AuthenticationStatus.Unlocked;
-
-            // prevent proc reloading an active account, when it is the same as the browser
-            if (currentlyActiveAccountId != message.userId || !isCurrentlyActiveAccountUnlocked) {
-              ipc.platform.reloadProcess();
-            }
-          } else {
-            await this.send({ command: "biometricUnlock", response: "canceled" }, appId);
-          }
-          // FIXME: Remove when updating file. Eslint update
-          // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        } catch (e) {
-          await this.send({ command: "biometricUnlock", response: "canceled" }, appId);
-        }
-        break;
-      }
       default:
         this.logService.error("NativeMessage, got unknown command: " + message.command);
         break;
diff --git a/apps/desktop/src/services/encrypted-message-handler.service.ts b/apps/desktop/src/services/encrypted-message-handler.service.ts
index 37a8114c1d1..366a144c021 100644
--- a/apps/desktop/src/services/encrypted-message-handler.service.ts
+++ b/apps/desktop/src/services/encrypted-message-handler.service.ts
@@ -147,7 +147,7 @@ export class EncryptedMessageHandlerService {
     const policyApplies$ = this.accountService.activeAccount$.pipe(
       getUserId,
       switchMap((userId) =>
-        this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
+        this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
       ),
     );
 
diff --git a/apps/desktop/src/types/biometric-message.ts b/apps/desktop/src/types/biometric-message.ts
index 7616b265005..9711b49496d 100644
--- a/apps/desktop/src/types/biometric-message.ts
+++ b/apps/desktop/src/types/biometric-message.ts
@@ -9,8 +9,6 @@ export enum BiometricAction {
   SetKeyForUser = "setKeyForUser",
   RemoveKeyForUser = "removeKeyForUser",
 
-  SetClientKeyHalf = "setClientKeyHalf",
-
   Setup = "setup",
 
   GetShouldAutoprompt = "getShouldAutoprompt",
@@ -18,21 +16,13 @@ export enum BiometricAction {
 }
 
 export type BiometricMessage =
-  | {
-      action: BiometricAction.SetClientKeyHalf;
-      userId: string;
-      key: string | null;
-    }
   | {
       action: BiometricAction.SetKeyForUser;
       userId: string;
       key: string;
     }
   | {
-      action: Exclude<
-        BiometricAction,
-        BiometricAction.SetClientKeyHalf | BiometricAction.SetKeyForUser
-      >;
+      action: Exclude<BiometricAction, BiometricAction.SetKeyForUser>;
       userId?: string;
       data?: any;
     };
diff --git a/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.html b/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.html
deleted file mode 100644
index bc0c3876b71..00000000000
--- a/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<div class="box">
-  <h2 class="box-header">
-    {{ "customFields" | i18n }}
-  </h2>
-  <div class="box-content">
-    <div cdkDropList (cdkDropListDropped)="drop($event)" *ngIf="cipher.hasFields">
-      <div
-        role="group"
-        class="box-content-row box-content-row-multi box-draggable-row"
-        cdkDrag
-        *ngFor="let f of cipher.fields; let i = index; trackBy: trackByFunction"
-        [ngClass]="{ 'box-content-row-checkbox': f.type === fieldType.Boolean }"
-        attr.aria-label="{{ f.name }}"
-      >
-        <button
-          type="button"
-          appStopClick
-          (click)="removeField(f)"
-          appA11yTitle="{{ 'remove' | i18n }}"
-          *ngIf="!(!cipher.edit && editMode)"
-        >
-          <i class="bwi bwi-minus-circle bwi-lg" aria-hidden="true"></i>
-        </button>
-        <label for="fieldName{{ i }}" class="sr-only">{{ "name" | i18n }}</label>
-        <label for="fieldValue{{ i }}" class="sr-only">{{ "value" | i18n }}</label>
-        <div class="row-main">
-          <input
-            id="fieldName{{ i }}"
-            type="text"
-            name="Field.Name{{ i }}"
-            [(ngModel)]="f.name"
-            class="row-label"
-            placeholder="{{ 'name' | i18n }}"
-            appInputVerbatim
-            [readonly]="!cipher.edit && editMode"
-          />
-          <!-- Text -->
-          <input
-            id="fieldValue{{ i }}"
-            type="text"
-            name="Field.Value{{ i }}"
-            [(ngModel)]="f.value"
-            *ngIf="f.type === fieldType.Text"
-            placeholder="{{ 'value' | i18n }}"
-            appInputVerbatim
-            attr.aria-describedby="fieldName{{ i }}"
-            [readonly]="!cipher.edit && editMode"
-          />
-          <!-- Password -->
-          <input
-            id="fieldValue{{ i }}"
-            type="{{ f.showValue ? 'text' : 'password' }}"
-            name="Field.Value{{ i }}"
-            [(ngModel)]="f.value"
-            class="monospaced"
-            *ngIf="f.type === fieldType.Hidden"
-            placeholder="{{ 'value' | i18n }}"
-            [disabled]="!cipher.viewPassword && !f.newField"
-            appInputVerbatim
-            attr.aria-describedby="fieldName{{ i }}"
-            [readonly]="!cipher.edit && editMode"
-          />
-          <!-- Linked -->
-          <select
-            id="fieldValue{{ i }}"
-            name="Field.Value{{ i }}"
-            [(ngModel)]="f.linkedId"
-            *ngIf="f.type === fieldType.Linked && cipher.linkedFieldOptions != null"
-            attr.aria-describedby="fieldName{{ i }}"
-          >
-            <option *ngFor="let o of linkedFieldOptions" [ngValue]="o.value">{{ o.name }}</option>
-          </select>
-        </div>
-        <!-- Boolean -->
-        <input
-          id="fieldValue{{ i }}"
-          name="Field.Value{{ i }}"
-          type="checkbox"
-          [(ngModel)]="f.value"
-          *ngIf="f.type === fieldType.Boolean"
-          appTrueFalseValue
-          trueValue="true"
-          falseValue="false"
-          attr.aria-describedby="fieldName{{ i }}"
-          [readonly]="!cipher.edit && editMode"
-        />
-        <div
-          class="action-buttons"
-          *ngIf="f.type === fieldType.Hidden && (cipher.viewPassword || f.newField)"
-        >
-          <button
-            type="button"
-            class="row-btn"
-            appStopClick
-            appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-            [attr.aria-pressed]="f.showValue"
-            (click)="toggleFieldValue(f)"
-            attr.aria-describedby="fieldName{{ i }}"
-          >
-            <i
-              class="bwi bwi-lg"
-              aria-hidden="true"
-              [ngClass]="{ 'bwi-eye': !f.showValue, 'bwi-eye-slash': f.showValue }"
-            ></i>
-          </button>
-        </div>
-        <div
-          class="drag-handle"
-          appA11yTitle="{{ 'dragToSort' | i18n }}"
-          *ngIf="!(!cipher.edit && editMode)"
-          cdkDragHandle
-        >
-          <i class="bwi bwi-drag-and-drop" aria-hidden="true"></i>
-        </div>
-      </div>
-    </div>
-    <!-- Add new custom field -->
-    <div class="box-content-row" *ngIf="!(!cipher.edit && editMode)" appBoxRow>
-      <button type="button" appStopClick (click)="addField()">
-        <i class="bwi bwi-plus-circle bwi-fw bwi-lg" aria-hidden="true"></i>
-        {{ "newCustomField" | i18n }}
-      </button>
-      <label for="addFieldType" class="sr-only">{{ "type" | i18n }}</label>
-      <select id="addFieldType" name="AddFieldType" [(ngModel)]="addFieldType" class="field-type">
-        <option *ngFor="let o of addFieldTypeOptions" [ngValue]="o.value">{{ o.name }}</option>
-        <option
-          *ngIf="cipher.linkedFieldOptions != null"
-          [ngValue]="addFieldLinkedTypeOption.value"
-        >
-          {{ addFieldLinkedTypeOption.name }}
-        </option>
-      </select>
-    </div>
-  </div>
-</div>
diff --git a/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.ts b/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.ts
deleted file mode 100644
index b4be2406c4b..00000000000
--- a/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component } from "@angular/core";
-
-import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/vault/components/add-edit-custom-fields.component";
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-
-@Component({
-  selector: "app-vault-add-edit-custom-fields",
-  templateUrl: "add-edit-custom-fields.component.html",
-  standalone: false,
-})
-export class AddEditCustomFieldsComponent extends BaseAddEditCustomFieldsComponent {
-  constructor(i18nService: I18nService, eventCollectionService: EventCollectionService) {
-    super(i18nService, eventCollectionService);
-  }
-}
diff --git a/apps/desktop/src/vault/app/vault/add-edit.component.html b/apps/desktop/src/vault/app/vault/add-edit.component.html
deleted file mode 100644
index 8457e72bdc1..00000000000
--- a/apps/desktop/src/vault/app/vault/add-edit.component.html
+++ /dev/null
@@ -1,818 +0,0 @@
-<form #form="ngForm" (ngSubmit)="submit()" [appApiAction]="formPromise">
-  <div class="content">
-    <div class="inner-content" *ngIf="cipher">
-      <div class="box">
-        <bit-callout type="info" *ngIf="allowOwnershipOptions() && !allowPersonal">
-          {{ "personalOwnershipPolicyInEffect" | i18n }}
-        </bit-callout>
-        <h2 class="box-header">
-          {{ title }}
-        </h2>
-        <div class="box-content">
-          <div class="box-content-row" *ngIf="!editMode" appBoxRow>
-            <label for="type">{{ "type" | i18n }}</label>
-            <select id="type" name="Type" [(ngModel)]="cipher.type" (change)="typeChange()">
-              <option *ngFor="let o of typeOptions" [ngValue]="o.value">{{ o.name }}</option>
-            </select>
-          </div>
-          <div class="box-content-row" appBoxRow>
-            <label for="name">{{ "name" | i18n }}</label>
-            <input
-              id="name"
-              type="text"
-              name="Name"
-              [(ngModel)]="cipher.name"
-              [appAutofocus]="!editMode"
-              [readonly]="!cipher.edit && editMode"
-            />
-          </div>
-          <!-- Login -->
-          <div *ngIf="cipher.type === cipherType.Login">
-            <div class="box-content-row box-content-row-flex" appBoxRow>
-              <div class="row-main">
-                <label for="loginUsername">{{ "username" | i18n }}</label>
-                <input
-                  id="loginUsername"
-                  type="text"
-                  name="Login.Username"
-                  [(ngModel)]="cipher.login.username"
-                  appInputVerbatim
-                  [readonly]="!cipher.edit && editMode"
-                />
-              </div>
-              <div class="action-buttons">
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'generateUsername' | i18n }}"
-                  (click)="generateUsername()"
-                  *ngIf="!(!cipher.edit && editMode)"
-                >
-                  <i class="bwi bwi-lg bwi-generate" aria-hidden="true"></i>
-                </button>
-              </div>
-            </div>
-            <div class="box-content-row box-content-row-flex" appBoxRow>
-              <div class="row-main">
-                <label for="loginPassword">{{ "password" | i18n }}</label>
-                <input
-                  id="loginPassword"
-                  class="monospaced"
-                  type="{{ showPassword ? 'text' : 'password' }}"
-                  name="Login.Password"
-                  [(ngModel)]="cipher.login.password"
-                  [disabled]="!cipher.viewPassword"
-                  [readonly]="!cipher.edit && editMode"
-                  appInputVerbatim
-                />
-              </div>
-              <div class="action-buttons" *ngIf="cipher.viewPassword">
-                <button
-                  type="button"
-                  #checkPasswordBtn
-                  class="row-btn btn"
-                  appA11yTitle="{{ 'checkPassword' | i18n }}"
-                  (click)="checkPassword()"
-                  [appApiAction]="checkPasswordPromise"
-                  [disabled]="$any(checkPasswordBtn).loading"
-                >
-                  <i
-                    class="bwi bwi-lg bwi-check-circle"
-                    [hidden]="$any(checkPasswordBtn).loading"
-                    aria-hidden="true"
-                  ></i>
-                  <i
-                    class="bwi bwi-lg bwi-spinner bwi-spin"
-                    [hidden]="!$any(checkPasswordBtn).loading"
-                    aria-hidden="true"
-                  ></i>
-                </button>
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                  [attr.aria-pressed]="showPassword"
-                  (click)="togglePassword()"
-                >
-                  <i
-                    class="bwi bwi-lg"
-                    aria-hidden="true"
-                    [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
-                  ></i>
-                </button>
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'generatePassword' | i18n }}"
-                  (click)="generatePassword()"
-                  *ngIf="!(!cipher.edit && editMode)"
-                >
-                  <i class="bwi bwi-lg bwi-generate" aria-hidden="true"></i>
-                </button>
-              </div>
-            </div>
-            <!--Passkey-->
-            <div
-              class="box-content-row box-content-row-multi text-muted"
-              *ngIf="cipher.login.hasFido2Credentials && !cloneMode"
-              appBoxRow
-              tabindex="0"
-              attr.aria-label="{{ 'typePasskey' | i18n }} {{ fido2CredentialCreationDateValue }}"
-            >
-              <button
-                type="button"
-                appStopClick
-                (click)="removePasskey()"
-                appA11yTitle="{{ 'removePasskey' | i18n }}"
-                *ngIf="!(!cipher.edit && editMode)"
-              >
-                <i class="bwi bwi-fw bwi-minus-circle bwi-lg" aria-hidden="true"></i>
-              </button>
-              <div class="row-main">
-                <span class="row-label">{{ "typePasskey" | i18n }}</span>
-                {{ fido2CredentialCreationDateValue }}
-              </div>
-            </div>
-
-            <div class="box-content-row" appBoxRow>
-              <label for="loginTotp">{{ "authenticatorKeyTotp" | i18n }}</label>
-              <input
-                id="loginTotp"
-                type="{{ cipher.viewPassword ? 'text' : 'password' }}"
-                name="Login.Totp"
-                class="monospaced"
-                [(ngModel)]="cipher.login.totp"
-                [disabled]="!cipher.viewPassword"
-                [readonly]="!cipher.edit && editMode"
-                appInputVerbatim
-              />
-            </div>
-          </div>
-          <!-- Card -->
-          <div *ngIf="cipher.type === cipherType.Card">
-            <div class="box-content-row" appBoxRow>
-              <label for="cardCardholderName">{{ "cardholderName" | i18n }}</label>
-              <input
-                id="cardCardholderName"
-                type="text"
-                name="Card.CardCardholderName"
-                [(ngModel)]="cipher.card.cardholderName"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row box-content-row-flex" appBoxRow>
-              <div class="row-main">
-                <label for="cardNumber">{{ "number" | i18n }}</label>
-                <input
-                  id="cardNumber"
-                  class="monospaced"
-                  type="{{ showCardNumber ? 'text' : 'password' }}"
-                  name="Card.Number"
-                  (input)="onCardNumberChange()"
-                  [(ngModel)]="cipher.card.number"
-                  appInputVerbatim
-                  [readonly]="!cipher.edit && editMode"
-                />
-              </div>
-              <div class="action-buttons">
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                  [attr.aria-pressed]="showCardNumber"
-                  (click)="toggleCardNumber()"
-                >
-                  <i
-                    class="bwi bwi-lg"
-                    aria-hidden="true"
-                    [ngClass]="{ 'bwi-eye': !showCardNumber, 'bwi-eye-slash': showCardNumber }"
-                  ></i>
-                </button>
-              </div>
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="cardBrand">{{ "brand" | i18n }}</label>
-              <span *ngIf="!(!cipher.edit && editMode); else readonlyCardBrand">
-                <select id="cardBrand" name="Card.Brand" [(ngModel)]="cipher.card.brand">
-                  <option *ngFor="let o of cardBrandOptions" [ngValue]="o.value">
-                    {{ o.name }}
-                  </option>
-                </select>
-              </span>
-              <ng-template #readonlyCardBrand>
-                <input
-                  id="cardBrand"
-                  name="Card.Brand"
-                  type="text"
-                  [readonly]="true"
-                  [value]="cipher.card.brand"
-                />
-              </ng-template>
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="cardExpMonth">{{ "expirationMonth" | i18n }}</label>
-              <span *ngIf="!(!cipher.edit && editMode); else readonlyCardExpMonth">
-                <select id="cardExpMonth" name="Card.ExpMonth" [(ngModel)]="cipher.card.expMonth">
-                  <option *ngFor="let o of cardExpMonthOptions" [ngValue]="o.value">
-                    {{ o.name }}
-                  </option>
-                </select>
-              </span>
-              <ng-template #readonlyCardExpMonth>
-                <input
-                  id="cardExpMonth"
-                  type="text"
-                  name="Card.ExpMonth"
-                  [readonly]="true"
-                  [value]="getCardExpMonthDisplay()"
-                />
-              </ng-template>
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="cardExpYear">{{ "expirationYear" | i18n }}</label>
-              <input
-                id="cardExpYear"
-                type="text"
-                name="Card.ExpYear"
-                [(ngModel)]="cipher.card.expYear"
-                placeholder="{{ 'ex' | i18n }} {{ currentDate | date: 'yyyy' }}"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row box-content-row-flex" appBoxRow>
-              <div class="row-main">
-                <label for="cardCode">{{ "securityCode" | i18n }}</label>
-                <input
-                  id="cardCode"
-                  class="monospaced"
-                  type="{{ showCardCode ? 'text' : 'password' }}"
-                  name="Card.Code"
-                  [(ngModel)]="cipher.card.code"
-                  appInputVerbatim
-                  [readonly]="!cipher.edit && editMode"
-                />
-              </div>
-              <div class="action-buttons">
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                  [attr.aria-pressed]="showCardCode"
-                  (click)="toggleCardCode()"
-                >
-                  <i
-                    class="bwi bwi-lg"
-                    aria-hidden="true"
-                    [ngClass]="{ 'bwi-eye': !showCardCode, 'bwi-eye-slash': showCardCode }"
-                  ></i>
-                </button>
-              </div>
-            </div>
-          </div>
-          <!-- Identity -->
-          <div *ngIf="cipher.type === cipherType.Identity">
-            <div class="box-content-row" appBoxRow>
-              <label for="idTitle">{{ "title" | i18n }}</label>
-              <span *ngIf="!(!cipher.edit && editMode); else readonlyIdTitle">
-                <select id="idTitle" name="Identity.Title" [(ngModel)]="cipher.identity.title">
-                  <option *ngFor="let o of identityTitleOptions" [ngValue]="o.value">
-                    {{ o.name }}
-                  </option>
-                </select>
-              </span>
-              <ng-template #readonlyIdTitle>
-                <input
-                  id="idTitle"
-                  name="Identity.Title"
-                  type="text"
-                  [readonly]="true"
-                  [value]="cipher.identity.title"
-                />
-              </ng-template>
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idFirstName">{{ "firstName" | i18n }}</label>
-              <input
-                id="idFirstName"
-                type="text"
-                name="Identity.FirstName"
-                [(ngModel)]="cipher.identity.firstName"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idMiddleName">{{ "middleName" | i18n }}</label>
-              <input
-                id="idMiddleName"
-                type="text"
-                name="Identity.MiddleName"
-                [(ngModel)]="cipher.identity.middleName"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idLastName">{{ "lastName" | i18n }}</label>
-              <input
-                id="idLastName"
-                type="text"
-                name="Identity.LastName"
-                [(ngModel)]="cipher.identity.lastName"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idUsername">{{ "username" | i18n }}</label>
-              <input
-                id="idUsername"
-                type="text"
-                name="Identity.Username"
-                [(ngModel)]="cipher.identity.username"
-                appInputVerbatim
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idCompany">{{ "company" | i18n }}</label>
-              <input
-                id="idCompany"
-                type="text"
-                name="Identity.Company"
-                [(ngModel)]="cipher.identity.company"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idSsn">{{ "ssn" | i18n }}</label>
-              <input
-                id="idSsn"
-                type="text"
-                name="Identity.SSN"
-                [(ngModel)]="cipher.identity.ssn"
-                appInputVerbatim
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idPassportNumber">{{ "passportNumber" | i18n }}</label>
-              <input
-                id="idPassportNumber"
-                type="text"
-                name="Identity.PassportNumber"
-                [(ngModel)]="cipher.identity.passportNumber"
-                appInputVerbatim
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idLicenseNumber">{{ "licenseNumber" | i18n }}</label>
-              <input
-                id="idLicenseNumber"
-                type="text"
-                name="Identity.LicenseNumber"
-                [(ngModel)]="cipher.identity.licenseNumber"
-                appInputVerbatim
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idEmail">{{ "email" | i18n }}</label>
-              <input
-                id="idEmail"
-                type="text"
-                name="Identity.Email"
-                [(ngModel)]="cipher.identity.email"
-                appInputVerbatim
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idPhone">{{ "phone" | i18n }}</label>
-              <input
-                id="idPhone"
-                type="text"
-                name="Identity.Phone"
-                [(ngModel)]="cipher.identity.phone"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idAddress1">{{ "address1" | i18n }}</label>
-              <input
-                id="idAddress1"
-                type="text"
-                name="Identity.Address1"
-                [(ngModel)]="cipher.identity.address1"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idAddress2">{{ "address2" | i18n }}</label>
-              <input
-                id="idAddress2"
-                type="text"
-                name="Identity.Address2"
-                [(ngModel)]="cipher.identity.address2"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idAddress3">{{ "address3" | i18n }}</label>
-              <input
-                id="idAddress3"
-                type="text"
-                name="Identity.Address3"
-                [(ngModel)]="cipher.identity.address3"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idCity">{{ "cityTown" | i18n }}</label>
-              <input
-                id="idCity"
-                type="text"
-                name="Identity.City"
-                [(ngModel)]="cipher.identity.city"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idState">{{ "stateProvince" | i18n }}</label>
-              <input
-                id="idState"
-                type="text"
-                name="Identity.State"
-                [(ngModel)]="cipher.identity.state"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idPostalCode">{{ "zipPostalCode" | i18n }}</label>
-              <input
-                id="idPostalCode"
-                type="text"
-                name="Identity.PostalCode"
-                [(ngModel)]="cipher.identity.postalCode"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-            <div class="box-content-row" appBoxRow>
-              <label for="idCountry">{{ "country" | i18n }}</label>
-              <input
-                id="idCountry"
-                type="text"
-                name="Identity.Country"
-                [(ngModel)]="cipher.identity.country"
-                [readonly]="!cipher.edit && editMode"
-              />
-            </div>
-          </div>
-          <!-- Ssh Key -->
-          <div *ngIf="cipher.type === cipherType.SshKey">
-            <div class="box-content-row box-content-row-flex" appBoxRow>
-              <div class="row-main">
-                <label for="sshPrivateKey">{{ "sshPrivateKey" | i18n }}</label>
-                <div
-                  *ngIf="!showPrivateKey"
-                  class="monospaced"
-                  style="white-space: pre-line"
-                  [innerText]="cipher.sshKey.maskedPrivateKey"
-                ></div>
-                <div
-                  *ngIf="showPrivateKey"
-                  class="monospaced"
-                  style="white-space: pre-line"
-                  [innerText]="cipher.sshKey.privateKey"
-                ></div>
-              </div>
-              <div class="action-buttons">
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'copySshPrivateKey' | i18n }}"
-                  (click)="copy(this.cipher.sshKey.privateKey, 'sshPrivateKey', 'SshPrivateKey')"
-                >
-                  <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-                </button>
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                  (click)="togglePrivateKey()"
-                >
-                  <i
-                    class="bwi bwi-lg"
-                    aria-hidden="true"
-                    [ngClass]="{ 'bwi-eye': !showPrivateKey, 'bwi-eye-slash': showPrivateKey }"
-                  ></i>
-                </button>
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'importSshKeyFromClipboard' | i18n }}"
-                  (click)="importSshKeyFromClipboard()"
-                >
-                  <i class="bwi bwi-lg bwi-import" aria-hidden="true"></i>
-                </button>
-              </div>
-            </div>
-            <div class="box-content-row box-content-row-flex" appBoxRow>
-              <div class="row-main">
-                <label for="sshPublicKey">{{ "sshPublicKey" | i18n }}</label>
-                <input
-                  id="sshPublicKey"
-                  type="text"
-                  name="SSHKey.SSHPublicKey"
-                  [ngModel]="cipher.sshKey.publicKey"
-                  readonly
-                />
-              </div>
-              <div class="action-buttons">
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  (click)="copy(cipher.sshKey.publicKey, 'sshPublicKey', 'SSHPublicKey')"
-                >
-                  <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-                </button>
-              </div>
-            </div>
-            <div class="box-content-row box-content-row-flex" appBoxRow>
-              <div class="row-main">
-                <label for="sshKeyFingerprint">{{ "sshFingerprint" | i18n }}</label>
-                <input
-                  id="sshKeyFingerprint"
-                  type="text"
-                  name="SSHKey.SSHKeyFingerprint"
-                  [ngModel]="cipher.sshKey.keyFingerprint"
-                  readonly
-                />
-              </div>
-              <div class="action-buttons">
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  (click)="copy(cipher.sshKey.keyFingerprint, 'sshFingerprint', 'SSHFingerprint')"
-                  appA11yTitle="{{ 'generateSSHKey' | i18n }}"
-                >
-                  <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="box" *ngIf="cipher.type === cipherType.Login">
-        <div class="box-content">
-          <ng-container *ngIf="cipher.login.hasUris">
-            <div
-              role="group"
-              class="box-content-row box-content-row-multi"
-              appBoxRow
-              *ngFor="let u of cipher.login.uris; let i = index; trackBy: trackByFunction"
-              attr.aria-label="{{ 'uriPosition' | i18n: i + 1 }}"
-            >
-              <button
-                type="button"
-                appStopClick
-                (click)="removeUri(u)"
-                appA11yTitle="{{ 'remove' | i18n }}"
-                *ngIf="!(!cipher.edit && editMode)"
-              >
-                <i class="bwi bwi-minus-circle bwi-lg" aria-hidden="true"></i>
-              </button>
-              <div class="row-main">
-                <label for="loginUri{{ i }}">{{ "uriPosition" | i18n: i + 1 }}</label>
-                <input
-                  id="loginUri{{ i }}"
-                  type="text"
-                  name="Login.Uris[{{ i }}].Uri"
-                  [(ngModel)]="u.uri"
-                  placeholder="{{ 'ex' | i18n }} https://google.com"
-                  [readonly]="!cipher.edit && editMode"
-                  appInputVerbatim
-                />
-                <label for="loginUriMatch{{ i }}" class="sr-only">
-                  {{ "matchDetection" | i18n }} {{ i + 1 }}
-                </label>
-                <select
-                  id="loginUriMatch{{ i }}"
-                  name="Login.Uris[{{ i }}].Match"
-                  [(ngModel)]="u.match"
-                  [hidden]="
-                    $any(u).showOptions === false ||
-                    ($any(u).showOptions == null && u.match == null)
-                  "
-                  (change)="loginUriMatchChanged(u)"
-                >
-                  <option *ngFor="let o of uriMatchOptions" [ngValue]="o.value">
-                    {{ o.name }}
-                  </option>
-                </select>
-              </div>
-              <div class="action-buttons">
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'toggleOptions' | i18n }}"
-                  (click)="toggleUriOptions(u)"
-                  [attr.aria-expanded]="
-                    !(
-                      $any(u).showOptions === false ||
-                      ($any(u).showOptions == null && u.match == null)
-                    )
-                  "
-                  [disabled]="!cipher.edit && editMode"
-                >
-                  <i class="bwi bwi-lg bwi-cog" aria-hidden="true"></i>
-                </button>
-              </div>
-            </div>
-          </ng-container>
-          <button
-            type="button"
-            appStopClick
-            (click)="addUri()"
-            class="box-content-row"
-            *ngIf="!(!cipher.edit && editMode)"
-          >
-            <i class="bwi bwi-plus-circle bwi-fw bwi-lg" aria-hidden="true"></i>
-            {{ "newUri" | i18n }}
-          </button>
-        </div>
-      </div>
-      <div class="box">
-        <div class="box-content">
-          <div class="box-content-row" appBoxRow>
-            <label for="folder">{{ "folder" | i18n }}</label>
-            <select id="folder" name="FolderId" [(ngModel)]="cipher.folderId">
-              <option *ngFor="let f of folders$ | async" [ngValue]="f.id">{{ f.name }}</option>
-            </select>
-          </div>
-          <div class="box-content-row box-content-row-checkbox" appBoxRow>
-            <label for="favorite">{{ "favorite" | i18n }}</label>
-            <input id="favorite" type="checkbox" name="Favorite" [(ngModel)]="cipher.favorite" />
-          </div>
-          <div class="box-content-row box-content-row-checkbox" appBoxRow *ngIf="canUseReprompt">
-            <label for="passwordPrompt"
-              >{{ "passwordPrompt" | i18n }}
-              <button
-                type="button"
-                appA11yTitle="{{ 'learnMore' | i18n }}"
-                (click)="openHelpReprompt()"
-              >
-                <i class="bwi bwi-question-circle" aria-hidden="true"></i>
-              </button>
-            </label>
-            <input
-              id="passwordPrompt"
-              type="checkbox"
-              name="PasswordPrompt"
-              [ngModel]="reprompt"
-              (change)="repromptChanged()"
-              [disabled]="!cipher.edit && editMode"
-            />
-          </div>
-          <button
-            type="button"
-            class="box-content-row box-content-row-flex text-default"
-            appStopClick
-            (click)="attachments()"
-            *ngIf="editMode && !cloneMode"
-          >
-            <div class="row-main">{{ "attachments" | i18n }}</div>
-            <i class="bwi bwi-angle-right row-sub-icon" aria-hidden="true"></i>
-          </button>
-          <button
-            type="button"
-            class="box-content-row box-content-row-flex text-default"
-            appStopClick
-            (click)="editCollections()"
-            *ngIf="editMode && !cloneMode && cipher.organizationId"
-          >
-            <div class="row-main">{{ "collections" | i18n }}</div>
-            <i class="bwi bwi-angle-right row-sub-icon" aria-hidden="true"></i>
-          </button>
-        </div>
-      </div>
-      <div class="box">
-        <h2 class="box-header">
-          <label for="notes">{{ "notes" | i18n }}</label>
-        </h2>
-        <div class="box-content">
-          <div class="box-content-row" appBoxRow>
-            <textarea
-              id="notes"
-              name="Notes"
-              rows="6"
-              [(ngModel)]="cipher.notes"
-              [readonly]="!cipher.edit && editMode"
-            ></textarea>
-          </div>
-        </div>
-      </div>
-      <app-vault-add-edit-custom-fields
-        *ngIf="!(!cipher.hasFields && !cipher.edit && editMode)"
-        [cipher]="cipher"
-        [thisCipherType]="cipher.type"
-        [editMode]="editMode"
-      >
-      </app-vault-add-edit-custom-fields>
-      <div class="box" *ngIf="allowOwnershipOptions()">
-        <h2 class="box-header">
-          {{ "ownership" | i18n }}
-        </h2>
-        <div class="box-content">
-          <div class="box-content-row" appBoxRow>
-            <label for="organizationId">{{ "whoOwnsThisItem" | i18n }}</label>
-            <select
-              id="organizationId"
-              class="form-control"
-              name="OrganizationId"
-              [(ngModel)]="cipher.organizationId"
-              (change)="organizationChanged()"
-            >
-              <option *ngFor="let o of ownershipOptions" [ngValue]="o.value">{{ o.name }}</option>
-            </select>
-          </div>
-        </div>
-      </div>
-      <div class="box" *ngIf="(!editMode || cloneMode) && cipher.organizationId">
-        <h2 class="box-header">
-          {{ "collections" | i18n }}
-        </h2>
-        <div class="box-content" *ngIf="!collections || !collections.length">
-          {{ "noCollectionsInList" | i18n }}
-        </div>
-        <div class="box-content" *ngIf="collections && collections.length">
-          <div
-            class="box-content-row box-content-row-checkbox"
-            *ngFor="let c of collections; let i = index"
-            appBoxRow
-          >
-            <label for="collection_{{ i }}">{{ c.name }}</label>
-            <input
-              id="collection_{{ i }}"
-              type="checkbox"
-              [(ngModel)]="$any(c).checked"
-              name="Collection[{{ i }}].Checked"
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="footer">
-    <button type="submit" class="primary" [disabled]="$any(form).loading">
-      <span [hidden]="$any(form).loading">{{ "save" | i18n }}</span>
-      <i
-        class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-        [hidden]="!$any(form).loading"
-        aria-hidden="true"
-      ></i>
-    </button>
-    <button type="button" (click)="cancel()">
-      {{ "cancel" | i18n }}
-    </button>
-    <div class="right">
-      <button
-        type="button"
-        (click)="share()"
-        *ngIf="editMode && cipher && !cipher.organizationId && !cloneMode"
-      >
-        {{ "move" | i18n }}
-      </button>
-      <button
-        #deleteBtn
-        type="button"
-        (click)="delete()"
-        class="danger"
-        appA11yTitle="{{ 'delete' | i18n }}"
-        *ngIf="editMode && !cloneMode && (canDeleteCipher$ | async)"
-        [disabled]="$any(deleteBtn).loading"
-        [appApiAction]="deletePromise"
-      >
-        <i
-          class="bwi bwi-trash bwi-lg bwi-fw"
-          [hidden]="$any(deleteBtn).loading"
-          aria-hidden="true"
-        ></i>
-        <i
-          class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-          [hidden]="!$any(deleteBtn).loading"
-          aria-hidden="true"
-        ></i>
-      </button>
-    </div>
-  </div>
-</form>
diff --git a/apps/desktop/src/vault/app/vault/add-edit.component.ts b/apps/desktop/src/vault/app/vault/add-edit.component.ts
deleted file mode 100644
index eb04003a418..00000000000
--- a/apps/desktop/src/vault/app/vault/add-edit.component.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { DatePipe } from "@angular/common";
-import { Component, NgZone, OnChanges, OnDestroy, OnInit, ViewChild } from "@angular/core";
-import { NgForm } from "@angular/forms";
-
-import { CollectionService } from "@bitwarden/admin-console/common";
-import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component";
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
-import { DialogService, ToastService } from "@bitwarden/components";
-import { PasswordRepromptService, SshImportPromptService } from "@bitwarden/vault";
-
-const BroadcasterSubscriptionId = "AddEditComponent";
-
-@Component({
-  selector: "app-vault-add-edit",
-  templateUrl: "add-edit.component.html",
-  standalone: false,
-})
-export class AddEditComponent extends BaseAddEditComponent implements OnInit, OnChanges, OnDestroy {
-  @ViewChild("form")
-  private form: NgForm;
-
-  constructor(
-    cipherService: CipherService,
-    folderService: FolderService,
-    i18nService: I18nService,
-    platformUtilsService: PlatformUtilsService,
-    auditService: AuditService,
-    accountService: AccountService,
-    collectionService: CollectionService,
-    messagingService: MessagingService,
-    eventCollectionService: EventCollectionService,
-    policyService: PolicyService,
-    passwordRepromptService: PasswordRepromptService,
-    private broadcasterService: BroadcasterService,
-    private ngZone: NgZone,
-    logService: LogService,
-    organizationService: OrganizationService,
-    dialogService: DialogService,
-    datePipe: DatePipe,
-    configService: ConfigService,
-    toastService: ToastService,
-    cipherAuthorizationService: CipherAuthorizationService,
-    sdkService: SdkService,
-    sshImportPromptService: SshImportPromptService,
-  ) {
-    super(
-      cipherService,
-      folderService,
-      i18nService,
-      platformUtilsService,
-      auditService,
-      accountService,
-      collectionService,
-      messagingService,
-      eventCollectionService,
-      policyService,
-      logService,
-      passwordRepromptService,
-      organizationService,
-      dialogService,
-      window,
-      datePipe,
-      configService,
-      cipherAuthorizationService,
-      toastService,
-      sdkService,
-      sshImportPromptService,
-    );
-  }
-
-  async ngOnInit() {
-    await super.ngOnInit();
-    await this.load();
-    this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
-      this.ngZone.run(() => {
-        switch (message.command) {
-          case "windowHidden":
-            this.onWindowHidden();
-            break;
-          default:
-        }
-      });
-    });
-    // We use ngOnChanges for everything else instead.
-  }
-
-  async ngOnChanges() {
-    await this.load();
-  }
-
-  ngOnDestroy() {
-    this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
-  }
-
-  async load() {
-    if (
-      document.querySelectorAll("app-vault-add-edit .ng-dirty").length === 0 ||
-      (this.cipher != null && this.cipherId !== this.cipher.id)
-    ) {
-      this.cipher = null;
-    }
-
-    await super.load();
-  }
-
-  onWindowHidden() {
-    this.showPassword = false;
-    this.showCardNumber = false;
-    this.showCardCode = false;
-    if (this.cipher !== null && this.cipher.hasFields) {
-      this.cipher.fields.forEach((field) => {
-        field.showValue = false;
-      });
-    }
-  }
-
-  allowOwnershipOptions(): boolean {
-    return (
-      (!this.editMode || this.cloneMode) &&
-      this.ownershipOptions &&
-      (this.ownershipOptions.length > 1 || !this.allowPersonal)
-    );
-  }
-
-  markPasswordAsDirty() {
-    this.form.controls["Login.Password"].markAsDirty();
-  }
-
-  openHelpReprompt() {
-    this.platformUtilsService.launchUri(
-      "https://bitwarden.com/help/managing-items/#protect-individual-items",
-    );
-  }
-
-  /**
-   * Updates the cipher when an attachment is altered.
-   * Note: This only updates the `attachments` and `revisionDate`
-   * properties to ensure any in-progress edits are not lost.
-   */
-  patchCipherAttachments(cipher: CipherView) {
-    this.cipher.attachments = cipher.attachments;
-    this.cipher.revisionDate = cipher.revisionDate;
-  }
-
-  truncateString(value: string, length: number) {
-    return value.length > length ? value.substring(0, length) + "..." : value;
-  }
-
-  togglePrivateKey() {
-    this.showPrivateKey = !this.showPrivateKey;
-  }
-}
diff --git a/apps/desktop/src/vault/app/vault/assign-collections/assign-collections-desktop.component.html b/apps/desktop/src/vault/app/vault/assign-collections/assign-collections-desktop.component.html
new file mode 100644
index 00000000000..4f5b6234ad9
--- /dev/null
+++ b/apps/desktop/src/vault/app/vault/assign-collections/assign-collections-desktop.component.html
@@ -0,0 +1,33 @@
+<bit-dialog dialogSize="large">
+  <span bitDialogTitle>
+    {{ "assignToCollections" | i18n }}
+    <span class="tw-text-sm tw-normal-case tw-text-muted">
+      {{ editableItemCount | pluralize: ("item" | i18n) : ("items" | i18n) }}
+    </span>
+  </span>
+
+  <div bitDialogContent>
+    <assign-collections
+      [params]="params"
+      [submitBtn]="assignSubmitButton"
+      (onCollectionAssign)="onCollectionAssign($event)"
+      (editableItemCountChange)="editableItemCount = $event"
+    ></assign-collections>
+  </div>
+
+  <ng-container bitDialogFooter>
+    <button
+      #assignSubmitButton
+      form="assign_collections_form"
+      type="submit"
+      bitButton
+      bitFormButton
+      buttonType="primary"
+    >
+      {{ "assign" | i18n }}
+    </button>
+    <button type="button" bitButton buttonType="secondary" bitDialogClose>
+      {{ "cancel" | i18n }}
+    </button>
+  </ng-container>
+</bit-dialog>
diff --git a/apps/desktop/src/vault/app/vault/assign-collections/assign-collections-desktop.component.ts b/apps/desktop/src/vault/app/vault/assign-collections/assign-collections-desktop.component.ts
new file mode 100644
index 00000000000..d81f1662c6c
--- /dev/null
+++ b/apps/desktop/src/vault/app/vault/assign-collections/assign-collections-desktop.component.ts
@@ -0,0 +1,36 @@
+import { DIALOG_DATA, DialogConfig, DialogRef } from "@angular/cdk/dialog";
+import { Component, Inject } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { PluralizePipe } from "@bitwarden/angular/pipes/pluralize.pipe";
+import { ButtonModule, DialogModule, DialogService } from "@bitwarden/components";
+import {
+  AssignCollectionsComponent,
+  CollectionAssignmentParams,
+  CollectionAssignmentResult,
+} from "@bitwarden/vault";
+
+@Component({
+  standalone: true,
+  templateUrl: "./assign-collections-desktop.component.html",
+  imports: [AssignCollectionsComponent, PluralizePipe, DialogModule, ButtonModule, JslibModule],
+})
+export class AssignCollectionsDesktopComponent {
+  protected editableItemCount: number;
+
+  constructor(
+    @Inject(DIALOG_DATA) public params: CollectionAssignmentParams,
+    private dialogRef: DialogRef<CollectionAssignmentResult>,
+  ) {}
+
+  protected async onCollectionAssign(result: CollectionAssignmentResult) {
+    this.dialogRef.close(result);
+  }
+
+  static open(dialogService: DialogService, config: DialogConfig<CollectionAssignmentParams>) {
+    return dialogService.open<CollectionAssignmentResult, CollectionAssignmentParams>(
+      AssignCollectionsDesktopComponent,
+      config,
+    );
+  }
+}
diff --git a/apps/desktop/src/vault/app/vault/assign-collections/index.ts b/apps/desktop/src/vault/app/vault/assign-collections/index.ts
new file mode 100644
index 00000000000..1afe7128757
--- /dev/null
+++ b/apps/desktop/src/vault/app/vault/assign-collections/index.ts
@@ -0,0 +1 @@
+export * from "./assign-collections-desktop.component";
diff --git a/apps/desktop/src/vault/app/vault/attachments.component.html b/apps/desktop/src/vault/app/vault/attachments.component.html
deleted file mode 100644
index addd068f1a4..00000000000
--- a/apps/desktop/src/vault/app/vault/attachments.component.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="attachmentsTitle">
-  <div class="modal-dialog" role="document">
-    <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
-      <div class="modal-body">
-        <div class="box" *ngIf="cipher && cipher.hasAttachments">
-          <h1 class="box-header" id="attachmentsTitle">
-            {{ "attachments" | i18n }}
-          </h1>
-          <div class="box-content no-hover">
-            <div class="box-content-row box-content-row-flex" *ngFor="let a of cipher.attachments">
-              <div class="row-main">
-                {{ a.fileName }}
-              </div>
-              <small class="row-sub-label">{{ a.sizeName }}</small>
-              <div class="action-buttons no-pad">
-                <button
-                  class="row-btn btn"
-                  type="button"
-                  appStopClick
-                  appA11yTitle="{{ 'delete' | i18n }}"
-                  (click)="delete(a)"
-                  #deleteBtn
-                  [appApiAction]="deletePromises[a.id]"
-                  [disabled]="$any(deleteBtn).loading"
-                >
-                  <i
-                    class="bwi bwi-trash bwi-lg bwi-fw"
-                    [hidden]="$any(deleteBtn).loading"
-                    aria-hidden="true"
-                  ></i>
-                  <i
-                    class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-                    [hidden]="!$any(deleteBtn).loading"
-                    aria-hidden="true"
-                  ></i>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="box">
-          <h2 class="box-header">
-            {{ "newAttachment" | i18n }}
-          </h2>
-          <div class="box-content no-hover">
-            <div class="box-content-row">
-              <label for="file">{{ "file" | i18n }}</label>
-              <input type="file" id="file" name="file" aria-describedby="fileHelp" required />
-            </div>
-          </div>
-          <div id="fileHelp" class="box-footer">
-            {{ "maxFileSize" | i18n }}
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="submit" class="primary" [disabled]="form.loading">
-          <span [hidden]="form.loading">{{ "save" | i18n }}</span>
-          <i
-            class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-            [hidden]="!form.loading"
-            aria-hidden="true"
-          ></i>
-        </button>
-        <button type="button" data-dismiss="modal">{{ "close" | i18n }}</button>
-      </div>
-    </form>
-  </div>
-</div>
diff --git a/apps/desktop/src/vault/app/vault/attachments.component.ts b/apps/desktop/src/vault/app/vault/attachments.component.ts
deleted file mode 100644
index a116a4d2acb..00000000000
--- a/apps/desktop/src/vault/app/vault/attachments.component.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Component } from "@angular/core";
-
-import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/vault/components/attachments.component";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { DialogService, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
-
-@Component({
-  selector: "app-vault-attachments",
-  templateUrl: "attachments.component.html",
-  standalone: false,
-})
-export class AttachmentsComponent extends BaseAttachmentsComponent {
-  constructor(
-    cipherService: CipherService,
-    i18nService: I18nService,
-    keyService: KeyService,
-    encryptService: EncryptService,
-    platformUtilsService: PlatformUtilsService,
-    apiService: ApiService,
-    logService: LogService,
-    stateService: StateService,
-    fileDownloadService: FileDownloadService,
-    dialogService: DialogService,
-    billingAccountProfileStateService: BillingAccountProfileStateService,
-    accountService: AccountService,
-    toastService: ToastService,
-    configService: ConfigService,
-  ) {
-    super(
-      cipherService,
-      i18nService,
-      keyService,
-      encryptService,
-      platformUtilsService,
-      apiService,
-      window,
-      logService,
-      stateService,
-      fileDownloadService,
-      dialogService,
-      billingAccountProfileStateService,
-      accountService,
-      toastService,
-      configService,
-    );
-  }
-}
diff --git a/apps/desktop/src/vault/app/vault/collections.component.html b/apps/desktop/src/vault/app/vault/collections.component.html
deleted file mode 100644
index a87cbc6b180..00000000000
--- a/apps/desktop/src/vault/app/vault/collections.component.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="collectionsTitle">
-  <div class="modal-dialog" role="document">
-    <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
-      <div class="modal-body">
-        <div class="box">
-          <h1 class="box-header" id="collectionsTitle">
-            {{ "collections" | i18n }}
-          </h1>
-          <div class="box-content" *ngIf="!collections || !collections.length">
-            {{ "noCollectionsInList" | i18n }}
-          </div>
-          <div class="box-content" *ngIf="collections && collections.length">
-            <div
-              class="box-content-row box-content-row-checkbox"
-              *ngFor="let c of collections; let i = index"
-              appBoxRow
-            >
-              <label for="collection_{{ i }}">{{ c.name }}</label>
-              <input
-                id="collection_{{ i }}"
-                type="checkbox"
-                [(ngModel)]="$any(c).checked"
-                name="Collection[{{ i }}].Checked"
-                [disabled]="!cipher.canAssignToCollections"
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="submit" class="primary" [disabled]="form.loading">
-          <span [hidden]="form.loading">{{ "save" | i18n }}</span>
-          <i
-            class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-            [hidden]="!form.loading"
-            aria-hidden="true"
-          ></i>
-        </button>
-        <button type="button" data-dismiss="modal">{{ "cancel" | i18n }}</button>
-      </div>
-    </form>
-  </div>
-</div>
diff --git a/apps/desktop/src/vault/app/vault/collections.component.ts b/apps/desktop/src/vault/app/vault/collections.component.ts
deleted file mode 100644
index 46455d04cd2..00000000000
--- a/apps/desktop/src/vault/app/vault/collections.component.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Component } from "@angular/core";
-
-import { CollectionService } from "@bitwarden/admin-console/common";
-import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/admin-console/components/collections.component";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { ToastService } from "@bitwarden/components";
-
-@Component({
-  selector: "app-vault-collections",
-  templateUrl: "collections.component.html",
-  standalone: false,
-})
-export class CollectionsComponent extends BaseCollectionsComponent {
-  constructor(
-    cipherService: CipherService,
-    i18nService: I18nService,
-    collectionService: CollectionService,
-    platformUtilsService: PlatformUtilsService,
-    organizationService: OrganizationService,
-    logService: LogService,
-    accountService: AccountService,
-    toastService: ToastService,
-  ) {
-    super(
-      collectionService,
-      platformUtilsService,
-      i18nService,
-      cipherService,
-      organizationService,
-      logService,
-      accountService,
-      toastService,
-    );
-  }
-}
diff --git a/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.ts b/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.ts
index 204615443ba..26349920106 100644
--- a/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.ts
+++ b/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.ts
@@ -3,6 +3,7 @@ import { Component, Inject } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   DIALOG_DATA,
   ButtonModule,
@@ -31,15 +32,14 @@ export interface CredentialGeneratorDialogResult {
   generatedValue?: string;
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum CredentialGeneratorDialogAction {
-  Selected = "selected",
-  Canceled = "canceled",
-}
+export const CredentialGeneratorDialogAction = {
+  Selected: "selected",
+  Canceled: "canceled",
+} as const;
+
+type CredentialGeneratorDialogAction = UnionOfValues<typeof CredentialGeneratorDialogAction>;
 
 @Component({
-  standalone: true,
   selector: "credential-generator-dialog",
   templateUrl: "credential-generator-dialog.component.html",
   imports: [
diff --git a/apps/desktop/src/vault/app/vault/folder-add-edit.component.html b/apps/desktop/src/vault/app/vault/folder-add-edit.component.html
deleted file mode 100644
index d22628df046..00000000000
--- a/apps/desktop/src/vault/app/vault/folder-add-edit.component.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="folderAddEditTitle">
-  <div class="modal-dialog modal-sm" role="document">
-    <form
-      #form
-      class="modal-content"
-      (ngSubmit)="submit()"
-      [appApiAction]="formPromise"
-      [formGroup]="formGroup"
-    >
-      <div class="modal-body">
-        <div class="box">
-          <h1 class="box-header" id="folderAddEditTitle">
-            {{ title }}
-          </h1>
-          <div class="box-content">
-            <div class="box-content-row" appBoxRow>
-              <label for="name">{{ "name" | i18n }}</label>
-              <input id="name" type="text" formControlName="name" [appAutofocus]="!editMode" />
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="submit" class="primary" [disabled]="form.loading">
-          <span [hidden]="form.loading">{{ "save" | i18n }}</span>
-          <i
-            class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-            [hidden]="!form.loading"
-            aria-hidden="true"
-          ></i>
-        </button>
-        <button type="button" data-dismiss="modal">{{ "cancel" | i18n }}</button>
-        <div class="right">
-          <button
-            #deleteBtn
-            type="button"
-            (click)="delete()"
-            class="danger"
-            appA11yTitle="{{ 'delete' | i18n }}"
-            *ngIf="editMode"
-            [disabled]="$any(deleteBtn).loading"
-            [appApiAction]="deletePromise"
-          >
-            <i
-              class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="$any(deleteBtn).loading"
-              aria-hidden="true"
-            ></i>
-            <i
-              class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!$any(deleteBtn).loading"
-              aria-hidden="true"
-            ></i>
-          </button>
-        </div>
-      </div>
-    </form>
-  </div>
-</div>
diff --git a/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts b/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts
deleted file mode 100644
index cecd5cd671c..00000000000
--- a/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
-
-import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/vault/components/folder-add-edit.component";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
-import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { DialogService, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
-
-@Component({
-  selector: "app-folder-add-edit",
-  templateUrl: "folder-add-edit.component.html",
-  standalone: false,
-})
-export class FolderAddEditComponent extends BaseFolderAddEditComponent {
-  constructor(
-    folderService: FolderService,
-    folderApiService: FolderApiServiceAbstraction,
-    accountService: AccountService,
-    keyService: KeyService,
-    i18nService: I18nService,
-    platformUtilsService: PlatformUtilsService,
-    logService: LogService,
-    dialogService: DialogService,
-    formBuilder: FormBuilder,
-    toastService: ToastService,
-  ) {
-    super(
-      folderService,
-      folderApiService,
-      accountService,
-      keyService,
-      i18nService,
-      platformUtilsService,
-      logService,
-      dialogService,
-      formBuilder,
-      toastService,
-    );
-  }
-}
diff --git a/apps/desktop/src/vault/app/vault/item-footer.component.html b/apps/desktop/src/vault/app/vault/item-footer.component.html
index 5a067da372e..c41bf254c80 100644
--- a/apps/desktop/src/vault/app/vault/item-footer.component.html
+++ b/apps/desktop/src/vault/app/vault/item-footer.component.html
@@ -36,7 +36,7 @@
       class="primary"
       (click)="restore()"
       appA11yTitle="{{ 'restore' | i18n }}"
-      *ngIf="cipher.isDeleted"
+      *ngIf="cipher.isDeleted && cipher.permissions.restore"
     >
       <i class="bwi bwi-undo bwi-fw bwi-lg" aria-hidden="true"></i>
     </button>
@@ -50,7 +50,7 @@
       <i class="bwi bwi-files bwi-fw bwi-lg" aria-hidden="true"></i>
     </button>
   </ng-container>
-  <div class="right" *ngIf="((canDeleteCipher$ | async) && action === 'edit') || action === 'view'">
+  <div class="right" *ngIf="cipher.permissions.delete && (action === 'edit' || action === 'view')">
     <button
       type="button"
       (click)="delete()"
diff --git a/apps/desktop/src/vault/app/vault/item-footer.component.ts b/apps/desktop/src/vault/app/vault/item-footer.component.ts
index 639d1557ecd..18dcec1ac3d 100644
--- a/apps/desktop/src/vault/app/vault/item-footer.component.ts
+++ b/apps/desktop/src/vault/app/vault/item-footer.component.ts
@@ -1,13 +1,13 @@
 import { CommonModule } from "@angular/common";
 import { Input, Output, EventEmitter, Component, OnInit, ViewChild } from "@angular/core";
-import { Observable, firstValueFrom } from "rxjs";
+import { firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { CollectionId, UserId } from "@bitwarden/common/types/guid";
+import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -18,7 +18,6 @@ import { PasswordRepromptService } from "@bitwarden/vault";
 @Component({
   selector: "app-vault-item-footer",
   templateUrl: "item-footer.component.html",
-  standalone: true,
   imports: [ButtonModule, CommonModule, JslibModule],
 })
 export class ItemFooterComponent implements OnInit {
@@ -26,6 +25,7 @@ export class ItemFooterComponent implements OnInit {
   @Input() collectionId: string | null = null;
   @Input({ required: true }) action: string = "view";
   @Input() isSubmitting: boolean = false;
+  @Input() masterPasswordAlreadyPrompted: boolean = false;
   @Output() onEdit = new EventEmitter<CipherView>();
   @Output() onClone = new EventEmitter<CipherView>();
   @Output() onDelete = new EventEmitter<CipherView>();
@@ -33,10 +33,8 @@ export class ItemFooterComponent implements OnInit {
   @Output() onCancel = new EventEmitter<CipherView>();
   @ViewChild("submitBtn", { static: false }) submitBtn: ButtonComponent | null = null;
 
-  canDeleteCipher$: Observable<boolean> = new Observable();
   activeUserId: UserId | null = null;
-
-  private passwordReprompted = false;
+  passwordReprompted: boolean = false;
 
   constructor(
     protected cipherService: CipherService,
@@ -50,10 +48,8 @@ export class ItemFooterComponent implements OnInit {
   ) {}
 
   async ngOnInit() {
-    this.canDeleteCipher$ = this.cipherAuthorizationService.canDeleteCipher$(this.cipher, [
-      this.collectionId as CollectionId,
-    ]);
     this.activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    this.passwordReprompted = this.masterPasswordAlreadyPrompted;
   }
 
   async clone() {
diff --git a/apps/desktop/src/vault/app/vault/password-history.component.html b/apps/desktop/src/vault/app/vault/password-history.component.html
deleted file mode 100644
index 362061b250d..00000000000
--- a/apps/desktop/src/vault/app/vault/password-history.component.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="passwordHistoryTitle">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-body">
-        <div class="box">
-          <h1 class="box-header" id="passwordHistoryTitle">
-            {{ "passwordHistory" | i18n }}
-          </h1>
-          <div class="box-content condensed">
-            <div class="box-content-row box-content-row-flex" *ngFor="let h of history">
-              <div class="row-main">
-                <span class="text monospaced" [innerHTML]="h.password | colorPassword"></span>
-                <span class="detail">{{ h.lastUsedDate | date: "medium" }}</span>
-              </div>
-              <div class="action-buttons">
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  appA11yTitle="{{ 'copyPassword' | i18n }}"
-                  (click)="copy(h.password)"
-                >
-                  <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-                </button>
-              </div>
-            </div>
-            <div class="box-content-row" *ngIf="!history.length">
-              {{ "noPasswordsInList" | i18n }}
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" data-dismiss="modal">{{ "close" | i18n }}</button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/apps/desktop/src/vault/app/vault/password-history.component.ts b/apps/desktop/src/vault/app/vault/password-history.component.ts
deleted file mode 100644
index e83ce0d56ea..00000000000
--- a/apps/desktop/src/vault/app/vault/password-history.component.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Component } from "@angular/core";
-
-import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "@bitwarden/angular/vault/components/password-history.component";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { ToastService } from "@bitwarden/components";
-
-@Component({
-  selector: "app-password-history",
-  templateUrl: "password-history.component.html",
-  standalone: false,
-})
-export class PasswordHistoryComponent extends BasePasswordHistoryComponent {
-  constructor(
-    cipherService: CipherService,
-    platformUtilsService: PlatformUtilsService,
-    i18nService: I18nService,
-    accountService: AccountService,
-    toastService: ToastService,
-  ) {
-    super(cipherService, platformUtilsService, i18nService, accountService, window, toastService);
-  }
-}
diff --git a/apps/desktop/src/vault/app/vault/share.component.html b/apps/desktop/src/vault/app/vault/share.component.html
deleted file mode 100644
index 8f85ecf891e..00000000000
--- a/apps/desktop/src/vault/app/vault/share.component.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="moveToOrgTitle">
-  <div class="modal-dialog" role="document">
-    <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
-      <ng-container *ngIf="organizations$ | async as organizations">
-        <div class="modal-body">
-          <div class="box">
-            <h1 class="box-header" id="moveToOrgTitle">
-              {{ "moveToOrganization" | i18n }}
-            </h1>
-            <div class="box-content" *ngIf="!organizations || !organizations.length">
-              <div class="box-content-row">
-                {{ "noOrganizationsList" | i18n }}
-              </div>
-            </div>
-            <div class="box-content" *ngIf="organizations && organizations.length">
-              <div class="box-content-row" appBoxRow>
-                <label for="organization">{{ "organization" | i18n }}</label>
-                <select
-                  id="organization"
-                  name="OrganizationId"
-                  aria-describedby="organizationHelp"
-                  [(ngModel)]="organizationId"
-                  (change)="filterCollections()"
-                >
-                  <option *ngFor="let o of organizations" [ngValue]="o.id">{{ o.name }}</option>
-                </select>
-              </div>
-            </div>
-            <div id="organizationHelp" class="box-footer">
-              {{ "moveToOrgDesc" | i18n }}
-            </div>
-          </div>
-          <div class="box" *ngIf="organizations && organizations.length">
-            <h2 class="box-header">
-              {{ "collections" | i18n }}
-            </h2>
-            <div class="box-content" *ngIf="!collections || !collections.length">
-              {{ "noCollectionsInList" | i18n }}
-            </div>
-            <div class="box-content" *ngIf="collections && collections.length">
-              <div
-                class="box-content-row box-content-row-checkbox"
-                *ngFor="let c of collections; let i = index"
-                appBoxRow
-              >
-                <label for="collection_{{ i }}">{{ c.name }}</label>
-                <input
-                  id="collection_{{ i }}"
-                  type="checkbox"
-                  [(ngModel)]="c.checked"
-                  name="Collection[{{ i }}].Checked"
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="modal-footer">
-          <button
-            type="submit"
-            class="primary"
-            [disabled]="form.loading || !canSave"
-            *ngIf="organizations && organizations.length"
-          >
-            <span [hidden]="form.loading">{{ "save" | i18n }}</span>
-            <i
-              class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!form.loading"
-              aria-hidden="true"
-            ></i>
-          </button>
-          <button type="button" (click)="close()">{{ "cancel" | i18n }}</button>
-        </div>
-      </ng-container>
-    </form>
-  </div>
-</div>
diff --git a/apps/desktop/src/vault/app/vault/share.component.ts b/apps/desktop/src/vault/app/vault/share.component.ts
deleted file mode 100644
index 50842439323..00000000000
--- a/apps/desktop/src/vault/app/vault/share.component.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Component } from "@angular/core";
-
-import { CollectionService } from "@bitwarden/admin-console/common";
-import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
-import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-
-@Component({
-  selector: "app-vault-share",
-  templateUrl: "share.component.html",
-  standalone: false,
-})
-export class ShareComponent extends BaseShareComponent {
-  constructor(
-    cipherService: CipherService,
-    i18nService: I18nService,
-    collectionService: CollectionService,
-    platformUtilsService: PlatformUtilsService,
-    logService: LogService,
-    organizationService: OrganizationService,
-    accountService: AccountService,
-    private modalRef: ModalRef,
-  ) {
-    super(
-      collectionService,
-      platformUtilsService,
-      i18nService,
-      cipherService,
-      logService,
-      organizationService,
-      accountService,
-    );
-  }
-
-  protected close() {
-    this.modalRef.close();
-  }
-}
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.ts
index 33a47cdc91f..503c2b2ec6e 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.ts
@@ -16,7 +16,9 @@ import { ToastService } from "@bitwarden/components";
 })
 export class OrganizationFilterComponent extends BaseOrganizationFilterComponent {
   get show() {
-    const hiddenDisplayModes: DisplayMode[] = ["singleOrganizationAndPersonalOwnershipPolicies"];
+    const hiddenDisplayModes: DisplayMode[] = [
+      "singleOrganizationAndOrganizatonDataOwnershipPolicies",
+    ];
     return (
       !this.hide &&
       this.organizations.length > 0 &&
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html
index c3dcd191dfc..f8a83e01266 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html
@@ -20,78 +20,20 @@
   </h2>
 </div>
 <ul id="type-filters" *ngIf="!isCollapsed" class="filter-options">
-  <li
-    class="filter-option"
-    [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.Login }"
-  >
-    <span class="filter-buttons">
-      <button
-        type="button"
-        class="filter-button"
-        (click)="applyFilter(cipherTypeEnum.Login)"
-        [attr.aria-pressed]="activeFilter.cipherType === cipherTypeEnum.Login"
-      >
-        <i class="bwi bwi-fw bwi-globe" aria-hidden="true"></i>&nbsp;{{ "typeLogin" | i18n }}
-      </button>
-    </span>
-  </li>
-  <li class="filter-option" [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.Card }">
-    <span class="filter-buttons">
-      <button
-        type="button"
-        class="filter-button"
-        (click)="applyFilter(cipherTypeEnum.Card)"
-        [attr.aria-pressed]="activeFilter.cipherType === cipherTypeEnum.Card"
-      >
-        <i class="bwi bwi-fw bwi-credit-card" aria-hidden="true"></i>&nbsp;{{ "typeCard" | i18n }}
-      </button>
-    </span>
-  </li>
-  <li
-    class="filter-option"
-    [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.Identity }"
-  >
-    <span class="filter-buttons">
-      <button
-        type="button"
-        class="filter-button"
-        (click)="applyFilter(cipherTypeEnum.Identity)"
-        [attr.aria-pressed]="activeFilter.cipherType === cipherTypeEnum.Identity"
-      >
-        <i class="bwi bwi-fw bwi-id-card" aria-hidden="true"></i>&nbsp;{{ "typeIdentity" | i18n }}
-      </button>
-    </span>
-  </li>
-  <li
-    class="filter-option"
-    [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.SecureNote }"
-  >
-    <span class="filter-buttons">
-      <button
-        type="button"
-        class="filter-button"
-        (click)="applyFilter(cipherTypeEnum.SecureNote)"
-        [attr.aria-pressed]="activeFilter.cipherType === cipherTypeEnum.SecureNote"
-      >
-        <i class="bwi bwi-fw bwi-sticky-note" aria-hidden="true"></i>&nbsp;{{
-          "typeSecureNote" | i18n
-        }}
-      </button>
-    </span>
-  </li>
-  <li
-    class="filter-option"
-    [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.SshKey }"
-  >
-    <span class="filter-buttons">
-      <button
-        type="button"
-        class="filter-button"
-        (click)="applyFilter(cipherTypeEnum.SshKey)"
-        [attr.aria-pressed]="activeFilter.cipherType === cipherTypeEnum.SshKey"
-      >
-        <i class="bwi bwi-fw bwi-key" aria-hidden="true"></i>&nbsp;{{ "typeSshKey" | i18n }}
-      </button>
-    </span>
-  </li>
+  @for (typeFilter of typeFilters$ | async; track typeFilter) {
+    <li class="filter-option" [ngClass]="{ active: activeFilter.cipherType === typeFilter.type }">
+      <span class="filter-buttons">
+        <button
+          type="button"
+          class="filter-button"
+          (click)="applyFilter(typeFilter.type)"
+          [attr.aria-pressed]="activeFilter.cipherType === typeFilter.type"
+        >
+          <i class="bwi bwi-fw {{ typeFilter.icon }}" aria-hidden="true"></i>&nbsp;{{
+            typeFilter.labelKey | i18n
+          }}
+        </button>
+      </span>
+    </li>
+  }
 </ul>
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts
index 5920233b206..27e7d5c5ecb 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts
@@ -1,6 +1,9 @@
 import { Component } from "@angular/core";
+import { map, shareReplay } from "rxjs";
 
 import { TypeFilterComponent as BaseTypeFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/type-filter.component";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { CIPHER_MENU_ITEMS } from "@bitwarden/common/vault/types/cipher-menu-items";
 
 @Component({
   selector: "app-type-filter",
@@ -8,7 +11,22 @@ import { TypeFilterComponent as BaseTypeFilterComponent } from "@bitwarden/angul
   standalone: false,
 })
 export class TypeFilterComponent extends BaseTypeFilterComponent {
-  constructor() {
+  protected typeFilters$ = this.restrictedItemTypesService.restricted$.pipe(
+    map((restrictedItemTypes) =>
+      // Filter out restricted item types from the typeFilters array
+      CIPHER_MENU_ITEMS.filter(
+        (typeFilter) =>
+          !restrictedItemTypes.some(
+            (restrictedType) =>
+              restrictedType.allowViewOrgIds.length === 0 &&
+              restrictedType.cipherType === typeFilter.type,
+          ),
+      ),
+    ),
+    shareReplay({ bufferSize: 1, refCount: true }),
+  );
+
+  constructor(private restrictedItemTypesService: RestrictedItemTypesService) {
     super();
   }
 }
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.html
index f44fc8f9302..0664e0591ad 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.component.html
@@ -8,7 +8,7 @@
     [activeFilter]="activeFilter"
     [collapsedFilterNodes]="collapsedFilterNodes"
     [organizations]="organizations"
-    [activePersonalOwnershipPolicy]="activePersonalOwnershipPolicy"
+    [activeOrganizationDataOwnership]="activeOrganizationDataOwnershipPolicy"
     [activeSingleOrganizationPolicy]="activeSingleOrganizationPolicy"
     (onNodeCollapseStateChange)="toggleFilterNodeCollapseState($event)"
     (onFilterChange)="applyFilter($event)"
diff --git a/apps/desktop/src/vault/app/vault/vault-items-v2.component.html b/apps/desktop/src/vault/app/vault/vault-items-v2.component.html
index 63e648e3cf3..fcf38ee39bc 100644
--- a/apps/desktop/src/vault/app/vault/vault-items-v2.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-items-v2.component.html
@@ -72,25 +72,11 @@
     <i class="bwi bwi-plus bwi-lg" aria-hidden="true"></i>
   </button>
   <bit-menu #addCipherMenu>
-    <button type="button" bitMenuItem (click)="addCipher(CipherType.Login)">
-      <i class="bwi bwi-globe tw-mr-1" aria-hidden="true"></i>
-      {{ "typeLogin" | i18n }}
-    </button>
-    <button type="button" bitMenuItem (click)="addCipher(CipherType.Card)">
-      <i class="bwi bwi-credit-card tw-mr-1" aria-hidden="true"></i>
-      {{ "typeCard" | i18n }}
-    </button>
-    <button type="button" bitMenuItem (click)="addCipher(CipherType.Identity)">
-      <i class="bwi bwi-id-card tw-mr-1" aria-hidden="true"></i>
-      {{ "typeIdentity" | i18n }}
-    </button>
-    <button type="button" bitMenuItem (click)="addCipher(CipherType.SecureNote)">
-      <i class="bwi bwi-sticky-note tw-mr-1" aria-hidden="true"></i>
-      {{ "typeSecureNote" | i18n }}
-    </button>
-    <button type="button" bitMenuItem (click)="addCipher(CipherType.SshKey)">
-      <i class="bwi bwi-key tw-mr-1" aria-hidden="true"></i>
-      {{ "typeSshKey" | i18n }}
-    </button>
+    @for (itemTypes of itemTypes$ | async; track itemTypes.type) {
+      <button type="button" bitMenuItem (click)="addCipher(itemTypes.type)">
+        <i class="bwi {{ itemTypes.icon }} tw-mr-1" aria-hidden="true"></i>
+        {{ itemTypes.labelKey | i18n }}
+      </button>
+    }
   </bit-menu>
 </ng-template>
diff --git a/apps/desktop/src/vault/app/vault/vault-items-v2.component.ts b/apps/desktop/src/vault/app/vault/vault-items-v2.component.ts
index 31d4098d2b2..21b857b551a 100644
--- a/apps/desktop/src/vault/app/vault/vault-items-v2.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-items-v2.component.ts
@@ -6,10 +6,11 @@ import { distinctUntilChanged } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/vault/components/vault-items.component";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { MenuModule } from "@bitwarden/components";
 
 import { SearchBarService } from "../../../app/layout/search/search-bar.service";
@@ -17,7 +18,6 @@ import { SearchBarService } from "../../../app/layout/search/search-bar.service"
 @Component({
   selector: "app-vault-items-v2",
   templateUrl: "vault-items-v2.component.html",
-  standalone: true,
   imports: [MenuModule, CommonModule, JslibModule, ScrollingModule],
 })
 export class VaultItemsV2Component extends BaseVaultItemsComponent {
@@ -26,8 +26,9 @@ export class VaultItemsV2Component extends BaseVaultItemsComponent {
     private readonly searchBarService: SearchBarService,
     cipherService: CipherService,
     accountService: AccountService,
+    restrictedItemTypesService: RestrictedItemTypesService,
   ) {
-    super(searchService, cipherService, accountService);
+    super(searchService, cipherService, accountService, restrictedItemTypesService);
 
     this.searchBarService.searchText$
       .pipe(distinctUntilChanged(), takeUntilDestroyed())
diff --git a/apps/desktop/src/vault/app/vault/vault-items.component.html b/apps/desktop/src/vault/app/vault/vault-items.component.html
deleted file mode 100644
index 8a869cd2a32..00000000000
--- a/apps/desktop/src/vault/app/vault/vault-items.component.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<div class="container loading-spinner" *ngIf="!loaded">
-  <i class="bwi bwi-spinner bwi-spin bwi-3x" aria-hidden="true"></i>
-</div>
-<ng-container *ngIf="loaded">
-  <div class="content">
-    <cdk-virtual-scroll-viewport
-      itemSize="42"
-      minBufferPx="400"
-      maxBufferPx="600"
-      *ngIf="ciphers.length"
-    >
-      <div class="list">
-        <button
-          type="button"
-          *cdkVirtualFor="let c of ciphers; trackBy: trackByFn"
-          appStopClick
-          (click)="selectCipher(c)"
-          (contextmenu)="rightClickCipher(c)"
-          title="{{ 'viewItem' | i18n }}"
-          [ngClass]="{ active: c.id === activeCipherId }"
-          [attr.aria-pressed]="c.id === activeCipherId"
-          class="flex-list-item virtual-scroll-item"
-        >
-          <app-vault-icon [cipher]="c"></app-vault-icon>
-          <div class="flex-cipher-list-item">
-            <span class="text">
-              <span class="truncate-box">
-                <span class="truncate">{{ c.name }}</span>
-                <ng-container *ngIf="c.organizationId">
-                  <i
-                    class="bwi bwi-collection-shared text-muted"
-                    title="{{ 'shared' | i18n }}"
-                    aria-hidden="true"
-                  ></i>
-                  <span class="sr-only">{{ "shared" | i18n }}</span>
-                </ng-container>
-                <ng-container *ngIf="c.hasAttachments">
-                  <i
-                    class="bwi bwi-paperclip text-muted"
-                    title="{{ 'attachments' | i18n }}"
-                    aria-hidden="true"
-                  ></i>
-                  <span class="sr-only">{{ "attachments" | i18n }}</span>
-                </ng-container>
-              </span>
-            </span>
-            <span *ngIf="c.subTitle" class="detail">{{ c.subTitle }}</span>
-          </div>
-        </button>
-      </div>
-    </cdk-virtual-scroll-viewport>
-    <div class="no-items" *ngIf="!ciphers.length">
-      <img class="no-items-image" aria-hidden="true" />
-      <p>{{ "noItemsInList" | i18n }}</p>
-      <button type="button" (click)="addCipher()" class="btn block primary link">
-        {{ "addItem" | i18n }}
-      </button>
-    </div>
-    <div class="footer">
-      <button
-        type="button"
-        (click)="addCipher()"
-        (contextmenu)="addCipherOptions()"
-        class="block primary"
-        appA11yTitle="{{ 'addItem' | i18n }}"
-        [disabled]="deleted"
-      >
-        <i class="bwi bwi-plus bwi-lg" aria-hidden="true"></i>
-      </button>
-    </div>
-  </div>
-</ng-container>
diff --git a/apps/desktop/src/vault/app/vault/vault-items.component.ts b/apps/desktop/src/vault/app/vault/vault-items.component.ts
deleted file mode 100644
index 2d1ba784753..00000000000
--- a/apps/desktop/src/vault/app/vault/vault-items.component.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component } from "@angular/core";
-import { distinctUntilChanged } from "rxjs";
-
-import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/vault/components/vault-items.component";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-
-import { SearchBarService } from "../../../app/layout/search/search-bar.service";
-
-@Component({
-  selector: "app-vault-items",
-  templateUrl: "vault-items.component.html",
-  standalone: false,
-})
-export class VaultItemsComponent extends BaseVaultItemsComponent {
-  constructor(
-    searchService: SearchService,
-    searchBarService: SearchBarService,
-    cipherService: CipherService,
-    accountService: AccountService,
-  ) {
-    super(searchService, cipherService, accountService);
-
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
-    searchBarService.searchText$.pipe(distinctUntilChanged()).subscribe((searchText) => {
-      this.searchText = searchText;
-    });
-  }
-
-  trackByFn(index: number, c: CipherView) {
-    return c.id;
-  }
-}
diff --git a/apps/desktop/src/vault/app/vault/vault-v2.component.html b/apps/desktop/src/vault/app/vault/vault-v2.component.html
index 4dd23466126..f1cb28f3ea5 100644
--- a/apps/desktop/src/vault/app/vault/vault-v2.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-v2.component.html
@@ -20,6 +20,7 @@
       (onDelete)="deleteCipher()"
       (onCancel)="cancelCipher($event)"
       [isSubmitting]="isSubmitting"
+      [masterPasswordAlreadyPrompted]="cipherRepromptId === cipherId"
     ></app-vault-item-footer>
     <div class="content">
       <div class="inner-content">
diff --git a/apps/desktop/src/vault/app/vault/vault-v2.component.ts b/apps/desktop/src/vault/app/vault/vault-v2.component.ts
index b45d943dcdd..6eb6b737899 100644
--- a/apps/desktop/src/vault/app/vault/vault-v2.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-v2.component.ts
@@ -9,21 +9,24 @@ import {
   ViewContainerRef,
 } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-import { firstValueFrom, Subject, takeUntil, switchMap, lastValueFrom } from "rxjs";
+import { firstValueFrom, Subject, takeUntil, switchMap, lastValueFrom, Observable } from "rxjs";
 import { filter, map, take } from "rxjs/operators";
 
 import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
-import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
-import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { VaultViewPasswordHistoryService } from "@bitwarden/angular/services/view-password-history.service";
 import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
+import { AuthRequestServiceAbstraction } from "@bitwarden/auth/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { EventType } from "@bitwarden/common/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -34,7 +37,7 @@ import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folde
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
 import { ViewPasswordHistoryService } from "@bitwarden/common/vault/abstractions/view-password-history.service";
-import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherType, toCipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import {
@@ -43,6 +46,8 @@ import {
   DialogService,
   ItemModule,
   ToastService,
+  CopyClickListener,
+  COPY_CLICK_LISTENER,
 } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 import {
@@ -57,10 +62,12 @@ import {
   CipherFormMode,
   CipherFormModule,
   CipherViewComponent,
+  CollectionAssignmentResult,
   DecryptionFailureDialogComponent,
   DefaultChangeLoginPasswordService,
   DefaultCipherFormConfigService,
   PasswordRepromptService,
+  CipherFormComponent,
 } from "@bitwarden/vault";
 
 import { NavComponent } from "../../../app/layout/nav.component";
@@ -69,6 +76,7 @@ import { DesktopCredentialGenerationService } from "../../../services/desktop-ci
 import { DesktopPremiumUpgradePromptService } from "../../../services/desktop-premium-upgrade-prompt.service";
 import { invokeMenu, RendererMenuItem } from "../../../utils";
 
+import { AssignCollectionsDesktopComponent } from "./assign-collections";
 import { ItemFooterComponent } from "./item-footer.component";
 import { VaultFilterComponent } from "./vault-filter/vault-filter.component";
 import { VaultFilterModule } from "./vault-filter/vault-filter.module";
@@ -79,7 +87,6 @@ const BroadcasterSubscriptionId = "VaultComponent";
 @Component({
   selector: "app-vault",
   templateUrl: "vault-v2.component.html",
-  standalone: true,
   imports: [
     BadgeModule,
     CommonModule,
@@ -111,15 +118,21 @@ const BroadcasterSubscriptionId = "VaultComponent";
       useClass: DesktopPremiumUpgradePromptService,
     },
     { provide: CipherFormGenerationService, useClass: DesktopCredentialGenerationService },
+    {
+      provide: COPY_CLICK_LISTENER,
+      useExisting: VaultV2Component,
+    },
   ],
 })
-export class VaultV2Component implements OnInit, OnDestroy {
+export class VaultV2Component implements OnInit, OnDestroy, CopyClickListener {
   @ViewChild(VaultItemsV2Component, { static: true })
   vaultItemsComponent: VaultItemsV2Component | null = null;
   @ViewChild(VaultFilterComponent, { static: true })
   vaultFilterComponent: VaultFilterComponent | null = null;
   @ViewChild("folderAddEdit", { read: ViewContainerRef, static: true })
   folderAddEditModalRef: ViewContainerRef | null = null;
+  @ViewChild(CipherFormComponent)
+  cipherFormComponent: CipherFormComponent | null = null;
 
   action: CipherFormMode | "view" | null = null;
   cipherId: string | null = null;
@@ -143,6 +156,11 @@ export class VaultV2Component implements OnInit, OnDestroy {
   config: CipherFormConfig | null = null;
   isSubmitting = false;
 
+  private organizations$: Observable<Organization[]> = this.accountService.activeAccount$.pipe(
+    map((a) => a?.id),
+    switchMap((id) => this.organizationService.organizations$(id)),
+  );
+
   protected canAccessAttachments$ = this.accountService.activeAccount$.pipe(
     filter((account): account is Account => !!account),
     switchMap((account) =>
@@ -150,14 +168,14 @@ export class VaultV2Component implements OnInit, OnDestroy {
     ),
   );
 
-  private modal: ModalRef | null = null;
   private componentIsDestroyed$ = new Subject<boolean>();
+  private allOrganizations: Organization[] = [];
+  private allCollections: CollectionView[] = [];
 
   constructor(
     private route: ActivatedRoute,
     private router: Router,
     private i18nService: I18nService,
-    private modalService: ModalService,
     private broadcasterService: BroadcasterService,
     private changeDetectorRef: ChangeDetectorRef,
     private ngZone: NgZone,
@@ -177,7 +195,10 @@ export class VaultV2Component implements OnInit, OnDestroy {
     private formConfigService: CipherFormConfigService,
     private premiumUpgradePromptService: PremiumUpgradePromptService,
     private collectionService: CollectionService,
+    private organizationService: OrganizationService,
     private folderService: FolderService,
+    private configService: ConfigService,
+    private authRequestService: AuthRequestServiceAbstraction,
   ) {}
 
   async ngOnInit() {
@@ -287,11 +308,26 @@ export class VaultV2Component implements OnInit, OnDestroy {
     this.searchBarService.setEnabled(true);
     this.searchBarService.setPlaceholderText(this.i18nService.t("searchVault"));
 
-    const authRequest = await this.apiService.getLastAuthRequest().catch(() => null);
-    if (authRequest != null) {
-      this.messagingService.send("openLoginApproval", {
-        notificationId: authRequest.id,
-      });
+    if (
+      (await firstValueFrom(
+        this.configService.getFeatureFlag$(FeatureFlag.PM14938_BrowserExtensionLoginApproval),
+      )) === true
+    ) {
+      const authRequests = await firstValueFrom(
+        this.authRequestService.getLatestPendingAuthRequest$(),
+      );
+      if (authRequests != null) {
+        this.messagingService.send("openLoginApproval", {
+          notificationId: authRequests.id,
+        });
+      }
+    } else {
+      const authRequest = await this.apiService.getLastAuthRequest();
+      if (authRequest != null) {
+        this.messagingService.send("openLoginApproval", {
+          notificationId: authRequest.id,
+        });
+      }
     }
 
     this.activeUserId = await firstValueFrom(
@@ -313,6 +349,16 @@ export class VaultV2Component implements OnInit, OnDestroy {
           });
         });
     }
+
+    this.organizations$.pipe(takeUntil(this.componentIsDestroyed$)).subscribe((orgs) => {
+      this.allOrganizations = orgs;
+    });
+
+    this.collectionService.decryptedCollections$
+      .pipe(takeUntil(this.componentIsDestroyed$))
+      .subscribe((collections) => {
+        this.allCollections = collections;
+      });
   }
 
   ngOnDestroy() {
@@ -324,6 +370,7 @@ export class VaultV2Component implements OnInit, OnDestroy {
 
   async load() {
     const params = await firstValueFrom(this.route.queryParams).catch();
+    const paramCipherAddType = toCipherType(params.addType);
     if (params.cipherId) {
       const cipherView = new CipherView();
       cipherView.id = params.cipherId;
@@ -334,17 +381,15 @@ export class VaultV2Component implements OnInit, OnDestroy {
       } else {
         await this.viewCipher(cipherView).catch(() => {});
       }
-    } else if (params.action === "add") {
-      this.addType = Number(params.addType);
+    } else if (params.action === "add" && paramCipherAddType) {
+      this.addType = paramCipherAddType;
       await this.addCipher(this.addType).catch(() => {});
     }
 
+    const paramCipherType = toCipherType(params.type);
     this.activeFilter = new VaultFilter({
       status: params.deleted ? "trash" : params.favorites ? "favorites" : "all",
-      cipherType:
-        params.action === "add" || params.type == null
-          ? undefined
-          : (parseInt(params.type) as CipherType),
+      cipherType: params.action === "add" || paramCipherType == null ? undefined : paramCipherType,
       selectedFolderId: params.folderId,
       selectedCollectionId: params.selectedCollectionId,
       selectedOrganizationId: params.selectedOrganizationId,
@@ -355,7 +400,21 @@ export class VaultV2Component implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Handler for Vault level CopyClickDirectives to send the minimizeOnCopy message
+   */
+  onCopy() {
+    this.messagingService.send("minimizeOnCopy");
+  }
+
   async viewCipher(cipher: CipherView) {
+    if (cipher.decryptionFailure) {
+      DecryptionFailureDialogComponent.open(this.dialogService, {
+        cipherIds: [cipher.id as CipherId],
+      });
+      return;
+    }
+
     if (await this.shouldReprompt(cipher, "view")) {
       return;
     }
@@ -366,7 +425,14 @@ export class VaultV2Component implements OnInit, OnDestroy {
         cipher.collectionIds.includes(c.id),
       ) ?? null;
     this.action = "view";
+
     await this.go().catch(() => {});
+    await this.eventCollectionService.collect(
+      EventType.Cipher_ClientViewed,
+      cipher.id,
+      false,
+      cipher.organizationId,
+    );
   }
 
   async openAttachmentsDialog() {
@@ -383,6 +449,26 @@ export class VaultV2Component implements OnInit, OnDestroy {
       result?.action === AttachmentDialogResult.Uploaded
     ) {
       await this.vaultItemsComponent?.refresh().catch(() => {});
+
+      if (this.cipherFormComponent == null) {
+        return;
+      }
+
+      const updatedCipher = await this.cipherService.get(
+        this.cipherId as CipherId,
+        this.activeUserId as UserId,
+      );
+      const updatedCipherView = await this.cipherService.decrypt(
+        updatedCipher,
+        this.activeUserId as UserId,
+      );
+
+      this.cipherFormComponent.patchCipher((currentCipher) => {
+        currentCipher.attachments = updatedCipherView.attachments;
+        currentCipher.revisionDate = updatedCipherView.revisionDate;
+
+        return currentCipher;
+      });
     }
   }
 
@@ -422,6 +508,18 @@ export class VaultV2Component implements OnInit, OnDestroy {
           },
         });
       }
+
+      const hasEditableCollections = this.allCollections.some((collection) => !collection.readOnly);
+
+      if (cipher.canAssignToCollections && hasEditableCollections) {
+        menu.push({
+          label: this.i18nService.t("assignToCollections"),
+          click: () =>
+            this.functionWithChangeDetection(async () => {
+              await this.shareCipher(cipher);
+            }),
+        });
+      }
     }
 
     switch (cipher.type) {
@@ -533,6 +631,44 @@ export class VaultV2Component implements OnInit, OnDestroy {
     await this.go().catch(() => {});
   }
 
+  async shareCipher(cipher: CipherView) {
+    if (!cipher) {
+      this.toastService.showToast({
+        variant: "error",
+        title: this.i18nService.t("errorOccurred"),
+        message: this.i18nService.t("nothingSelected"),
+      });
+      return;
+    }
+
+    if (!(await this.passwordReprompt(cipher))) {
+      return;
+    }
+
+    const availableCollections = this.getAvailableCollections(cipher);
+
+    const dialog = AssignCollectionsDesktopComponent.open(this.dialogService, {
+      data: {
+        ciphers: [cipher],
+        organizationId: cipher.organizationId as OrganizationId,
+        availableCollections,
+      },
+    });
+
+    const result = await lastValueFrom(dialog.closed);
+    if (result === CollectionAssignmentResult.Saved) {
+      const updatedCipher = await firstValueFrom(
+        // Fetch the updated cipher from the service
+        this.cipherService.cipherViews$(this.activeUserId as UserId).pipe(
+          filter((ciphers) => ciphers != null),
+          map((ciphers) => ciphers!.find((c) => c.id === cipher.id)),
+          filter((foundCipher) => foundCipher != null),
+        ),
+      );
+      await this.savedCipher(updatedCipher);
+    }
+  }
+
   async addCipher(type: CipherType) {
     if (this.action === "add") {
       return;
@@ -605,6 +741,16 @@ export class VaultV2Component implements OnInit, OnDestroy {
     await this.go().catch(() => {});
   }
 
+  private getAvailableCollections(cipher: CipherView): CollectionView[] {
+    const orgId = cipher.organizationId;
+    if (!orgId || orgId === "MyVault") {
+      return [];
+    }
+
+    const organization = this.allOrganizations.find((o) => o.id === orgId);
+    return this.allCollections.filter((c) => c.organizationId === organization?.id && !c.readOnly);
+  }
+
   private calculateSearchBarLocalizationString(vaultFilter: VaultFilter): string {
     if (vaultFilter.status === "favorites") {
       return "searchFavorites";
@@ -635,10 +781,17 @@ export class VaultV2Component implements OnInit, OnDestroy {
   }
 
   async editFolder(folderId: string) {
+    if (!this.activeUserId) {
+      return;
+    }
     const folderView = await firstValueFrom(
       this.folderService.getDecrypted$(folderId, this.activeUserId),
     );
 
+    if (!folderView) {
+      return;
+    }
+
     const dialogRef = AddEditFolderDialogComponent.open(this.dialogService, {
       editFolderConfig: {
         folder: {
@@ -653,7 +806,7 @@ export class VaultV2Component implements OnInit, OnDestroy {
       result === AddEditFolderDialogResult.Deleted ||
       result === AddEditFolderDialogResult.Created
     ) {
-      await this.vaultFilterComponent.reloadCollectionsAndFolders(this.activeFilter);
+      await this.vaultFilterComponent?.reloadCollectionsAndFolders(this.activeFilter);
     }
   }
 
@@ -698,10 +851,6 @@ export class VaultV2Component implements OnInit, OnDestroy {
       .catch(() => {});
   }
 
-  private addCipherWithChangeDetection(type: CipherType) {
-    this.functionWithChangeDetection(() => this.addCipher(type).catch(() => {}));
-  }
-
   private copyValue(cipher: CipherView, value: string, labelI18nKey: string, aType: string) {
     this.functionWithChangeDetection(() => {
       (async () => {
diff --git a/apps/desktop/src/vault/app/vault/vault.component.html b/apps/desktop/src/vault/app/vault/vault.component.html
deleted file mode 100644
index 9a25619b1a8..00000000000
--- a/apps/desktop/src/vault/app/vault/vault.component.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<div id="vault" class="vault" attr.aria-hidden="{{ showingModal }}">
-  <app-vault-items
-    id="items"
-    class="items"
-    [activeCipherId]="cipherId"
-    (onCipherClicked)="viewCipher($event)"
-    (onCipherRightClicked)="viewCipherMenu($event)"
-    (onAddCipher)="addCipher($event)"
-    (onAddCipherOptions)="addCipherOptions()"
-  >
-  </app-vault-items>
-  <app-vault-view
-    id="details"
-    class="details"
-    *ngIf="cipherId && action === 'view'"
-    [cipherId]="cipherId"
-    [collectionId]="activeFilter?.selectedCollectionId"
-    [masterPasswordAlreadyPrompted]="cipherRepromptId === cipherId"
-    (onCloneCipher)="cloneCipherWithoutPasswordPrompt($event)"
-    (onEditCipher)="editCipher($event)"
-    (onViewCipherPasswordHistory)="viewCipherPasswordHistory($event)"
-    (onRestoredCipher)="restoredCipher($event)"
-    (onDeletedCipher)="deletedCipher($event)"
-  >
-  </app-vault-view>
-  <app-vault-add-edit
-    id="addEdit"
-    class="details"
-    *ngIf="action === 'add' || action === 'edit' || action === 'clone'"
-    [cloneMode]="action === 'clone'"
-    [folderId]="action === 'add' && folderId !== 'none' ? folderId : null"
-    [organizationId]="action === 'add' ? addOrganizationId : null"
-    [collectionIds]="action === 'add' ? addCollectionIds : null"
-    [collectionId]="activeFilter?.selectedCollectionId"
-    [type]="action === 'add' ? (addType ? addType : type) : null"
-    [cipherId]="action === 'edit' || action === 'clone' ? cipherId : null"
-    (onSavedCipher)="savedCipher($event)"
-    (onDeletedCipher)="deletedCipher($event)"
-    (onEditAttachments)="editCipherAttachments($event)"
-    (onCancelled)="cancelledAddEdit($event)"
-    (onShareCipher)="shareCipher($event)"
-    (onEditCollections)="cipherCollections($event)"
-    (onGeneratePassword)="openGenerator(true)"
-    (onGenerateUsername)="openGenerator(false)"
-  >
-  </app-vault-add-edit>
-  <div
-    id="logo"
-    class="logo"
-    *ngIf="action !== 'add' && action !== 'edit' && action !== 'view' && action !== 'clone'"
-  >
-    <div class="content">
-      <div class="inner-content">
-        <img class="logo-image" alt="Bitwarden" aria-hidden="true" />
-      </div>
-    </div>
-  </div>
-  <div class="left-nav">
-    <app-vault-filter
-      class="vault-filters"
-      [activeFilter]="activeFilter"
-      (onFilterChange)="applyVaultFilter($event)"
-      (onAddFolder)="addFolder()"
-      (onEditFolder)="editFolder($event.id)"
-    ></app-vault-filter>
-    <app-nav class="nav"></app-nav>
-  </div>
-</div>
-<ng-template #generator></ng-template>
-<ng-template #attachments></ng-template>
-<ng-template #collections></ng-template>
-<ng-template #share></ng-template>
-<ng-template #folderAddEdit></ng-template>
-<ng-template #passwordHistory></ng-template>
diff --git a/apps/desktop/src/vault/app/vault/vault.component.ts b/apps/desktop/src/vault/app/vault/vault.component.ts
deleted file mode 100644
index 6c9a3217bfc..00000000000
--- a/apps/desktop/src/vault/app/vault/vault.component.ts
+++ /dev/null
@@ -1,846 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import {
-  ChangeDetectorRef,
-  Component,
-  NgZone,
-  OnDestroy,
-  OnInit,
-  ViewChild,
-  ViewContainerRef,
-} from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
-import { firstValueFrom, Subject, takeUntil, switchMap, lastValueFrom } from "rxjs";
-import { filter, first, map, take } from "rxjs/operators";
-
-import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
-import { ModalService } from "@bitwarden/angular/services/modal.service";
-import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { EventType } from "@bitwarden/common/enums";
-import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SyncService } from "@bitwarden/common/platform/sync";
-import { CipherId, UserId } from "@bitwarden/common/types/guid";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
-import { CipherType } from "@bitwarden/common/vault/enums";
-import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { DialogService, ToastService } from "@bitwarden/components";
-import {
-  AddEditFolderDialogComponent,
-  AddEditFolderDialogResult,
-  DecryptionFailureDialogComponent,
-  PasswordRepromptService,
-} from "@bitwarden/vault";
-
-import { SearchBarService } from "../../../app/layout/search/search-bar.service";
-import { invokeMenu, RendererMenuItem } from "../../../utils";
-
-import { AddEditComponent } from "./add-edit.component";
-import { AttachmentsComponent } from "./attachments.component";
-import { CollectionsComponent } from "./collections.component";
-import { CredentialGeneratorDialogComponent } from "./credential-generator-dialog.component";
-import { PasswordHistoryComponent } from "./password-history.component";
-import { ShareComponent } from "./share.component";
-import { VaultFilterComponent } from "./vault-filter/vault-filter.component";
-import { VaultItemsComponent } from "./vault-items.component";
-import { ViewComponent } from "./view.component";
-
-const BroadcasterSubscriptionId = "VaultComponent";
-
-@Component({
-  selector: "app-vault",
-  templateUrl: "vault.component.html",
-  standalone: false,
-})
-export class VaultComponent implements OnInit, OnDestroy {
-  @ViewChild(ViewComponent) viewComponent: ViewComponent;
-  @ViewChild(AddEditComponent) addEditComponent: AddEditComponent;
-  @ViewChild(VaultItemsComponent, { static: true }) vaultItemsComponent: VaultItemsComponent;
-  @ViewChild("generator", { read: ViewContainerRef, static: true })
-  generatorModalRef: ViewContainerRef;
-  @ViewChild(VaultFilterComponent, { static: true }) vaultFilterComponent: VaultFilterComponent;
-  @ViewChild("attachments", { read: ViewContainerRef, static: true })
-  attachmentsModalRef: ViewContainerRef;
-  @ViewChild("passwordHistory", { read: ViewContainerRef, static: true })
-  passwordHistoryModalRef: ViewContainerRef;
-  @ViewChild("share", { read: ViewContainerRef, static: true }) shareModalRef: ViewContainerRef;
-  @ViewChild("collections", { read: ViewContainerRef, static: true })
-  collectionsModalRef: ViewContainerRef;
-
-  action: string;
-  cipherId: string = null;
-  favorites = false;
-  type: CipherType = null;
-  folderId: string = null;
-  collectionId: string = null;
-  organizationId: string = null;
-  myVaultOnly = false;
-  addType: CipherType = null;
-  addOrganizationId: string = null;
-  addCollectionIds: string[] = null;
-  showingModal = false;
-  deleted = false;
-  userHasPremiumAccess = false;
-  activeFilter: VaultFilter = new VaultFilter();
-  activeUserId: UserId;
-  cipherRepromptId: string | null = null;
-
-  private modal: ModalRef = null;
-  private componentIsDestroyed$ = new Subject<boolean>();
-
-  constructor(
-    private route: ActivatedRoute,
-    private router: Router,
-    private i18nService: I18nService,
-    private modalService: ModalService,
-    private broadcasterService: BroadcasterService,
-    private changeDetectorRef: ChangeDetectorRef,
-    private ngZone: NgZone,
-    private syncService: SyncService,
-    private messagingService: MessagingService,
-    private platformUtilsService: PlatformUtilsService,
-    private eventCollectionService: EventCollectionService,
-    private totpService: TotpService,
-    private passwordRepromptService: PasswordRepromptService,
-    private searchBarService: SearchBarService,
-    private apiService: ApiService,
-    private dialogService: DialogService,
-    private billingAccountProfileStateService: BillingAccountProfileStateService,
-    private toastService: ToastService,
-    private accountService: AccountService,
-    private cipherService: CipherService,
-    private folderService: FolderService,
-  ) {}
-
-  async ngOnInit() {
-    this.accountService.activeAccount$
-      .pipe(
-        switchMap((account) =>
-          this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
-        ),
-        takeUntil(this.componentIsDestroyed$),
-      )
-      .subscribe((canAccessPremium: boolean) => {
-        this.userHasPremiumAccess = canAccessPremium;
-      });
-
-    this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.ngZone.run(async () => {
-        let detectChanges = true;
-
-        switch (message.command) {
-          case "newLogin":
-            await this.addCipher(CipherType.Login);
-            break;
-          case "newCard":
-            await this.addCipher(CipherType.Card);
-            break;
-          case "newIdentity":
-            await this.addCipher(CipherType.Identity);
-            break;
-          case "newSecureNote":
-            await this.addCipher(CipherType.SecureNote);
-            break;
-          case "newSshKey":
-            await this.addCipher(CipherType.SshKey);
-            break;
-          case "focusSearch":
-            (document.querySelector("#search") as HTMLInputElement).select();
-            detectChanges = false;
-            break;
-          case "syncCompleted":
-            await this.vaultItemsComponent.reload(this.activeFilter.buildFilter());
-            await this.vaultFilterComponent.reloadCollectionsAndFolders(this.activeFilter);
-            await this.vaultFilterComponent.reloadOrganizations();
-            break;
-          case "modalShown":
-            this.showingModal = true;
-            break;
-          case "modalClosed":
-            this.showingModal = false;
-            break;
-          case "copyUsername": {
-            const uComponent =
-              this.addEditComponent == null ? this.viewComponent : this.addEditComponent;
-            const uCipher = uComponent != null ? uComponent.cipher : null;
-            if (
-              this.cipherId != null &&
-              uCipher != null &&
-              uCipher.id === this.cipherId &&
-              uCipher.login != null &&
-              uCipher.login.username != null
-            ) {
-              this.copyValue(uCipher, uCipher.login.username, "username", "Username");
-            }
-            break;
-          }
-          case "copyPassword": {
-            const pComponent =
-              this.addEditComponent == null ? this.viewComponent : this.addEditComponent;
-            const pCipher = pComponent != null ? pComponent.cipher : null;
-            if (
-              this.cipherId != null &&
-              pCipher != null &&
-              pCipher.id === this.cipherId &&
-              pCipher.login != null &&
-              pCipher.login.password != null &&
-              pCipher.viewPassword
-            ) {
-              this.copyValue(pCipher, pCipher.login.password, "password", "Password");
-            }
-            break;
-          }
-          case "copyTotp": {
-            const tComponent =
-              this.addEditComponent == null ? this.viewComponent : this.addEditComponent;
-            const tCipher = tComponent != null ? tComponent.cipher : null;
-            if (
-              this.cipherId != null &&
-              tCipher != null &&
-              tCipher.id === this.cipherId &&
-              tCipher.login != null &&
-              tCipher.login.hasTotp &&
-              this.userHasPremiumAccess
-            ) {
-              const value = await firstValueFrom(this.totpService.getCode$(tCipher.login.totp));
-              this.copyValue(tCipher, value.code, "verificationCodeTotp", "TOTP");
-            }
-            break;
-          }
-          default:
-            detectChanges = false;
-            break;
-        }
-
-        if (detectChanges) {
-          this.changeDetectorRef.detectChanges();
-        }
-      });
-    });
-
-    if (!this.syncService.syncInProgress) {
-      await this.load();
-    }
-
-    this.searchBarService.setEnabled(true);
-    this.searchBarService.setPlaceholderText(this.i18nService.t("searchVault"));
-
-    const authRequest = await this.apiService.getLastAuthRequest();
-    if (authRequest != null) {
-      this.messagingService.send("openLoginApproval", {
-        notificationId: authRequest.id,
-      });
-    }
-
-    this.activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-
-    this.cipherService
-      .failedToDecryptCiphers$(this.activeUserId)
-      .pipe(
-        map((ciphers) => ciphers?.filter((c) => !c.isDeleted) ?? []),
-        filter((ciphers) => ciphers.length > 0),
-        take(1),
-        takeUntil(this.componentIsDestroyed$),
-      )
-      .subscribe((ciphers) => {
-        DecryptionFailureDialogComponent.open(this.dialogService, {
-          cipherIds: ciphers.map((c) => c.id as CipherId),
-        });
-      });
-  }
-
-  ngOnDestroy() {
-    this.searchBarService.setEnabled(false);
-    this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
-    this.componentIsDestroyed$.next(true);
-    this.componentIsDestroyed$.complete();
-  }
-
-  async load() {
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
-    this.route.queryParams.pipe(first()).subscribe(async (params) => {
-      if (params.cipherId) {
-        const cipherView = new CipherView();
-        cipherView.id = params.cipherId;
-        if (params.action === "clone") {
-          await this.cloneCipher(cipherView);
-        } else if (params.action === "edit") {
-          await this.editCipher(cipherView);
-        } else {
-          await this.viewCipher(cipherView);
-        }
-      } else if (params.action === "add") {
-        this.addType = Number(params.addType);
-        // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        this.addCipher(this.addType);
-      }
-
-      this.activeFilter = new VaultFilter({
-        status: params.deleted ? "trash" : params.favorites ? "favorites" : "all",
-        cipherType:
-          params.action === "add" || params.type == null ? null : parseInt(params.type, null),
-        selectedFolderId: params.folderId,
-        selectedCollectionId: params.selectedCollectionId,
-        selectedOrganizationId: params.selectedOrganizationId,
-        myVaultOnly: params.myVaultOnly ?? false,
-      });
-      await this.vaultItemsComponent.reload(this.activeFilter.buildFilter());
-    });
-  }
-
-  async viewCipher(cipher: CipherView) {
-    if (!(await this.canNavigateAway("view", cipher))) {
-      return;
-    } else if (!(await this.passwordReprompt(cipher))) {
-      return;
-    }
-
-    this.cipherId = cipher.id;
-    this.action = "view";
-    this.go();
-  }
-
-  viewCipherMenu(cipher: CipherView) {
-    const menu: RendererMenuItem[] = [
-      {
-        label: this.i18nService.t("view"),
-        click: () =>
-          this.functionWithChangeDetection(() => {
-            // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            this.viewCipher(cipher);
-          }),
-      },
-    ];
-
-    if (cipher.decryptionFailure) {
-      invokeMenu(menu);
-      return;
-    }
-
-    if (!cipher.isDeleted) {
-      menu.push({
-        label: this.i18nService.t("edit"),
-        click: () =>
-          this.functionWithChangeDetection(() => {
-            // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            this.editCipher(cipher);
-          }),
-      });
-      if (!cipher.organizationId) {
-        menu.push({
-          label: this.i18nService.t("clone"),
-          click: () =>
-            this.functionWithChangeDetection(() => {
-              // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-              // eslint-disable-next-line @typescript-eslint/no-floating-promises
-              this.cloneCipher(cipher);
-            }),
-        });
-      }
-    }
-
-    switch (cipher.type) {
-      case CipherType.Login:
-        if (
-          cipher.login.canLaunch ||
-          cipher.login.username != null ||
-          cipher.login.password != null
-        ) {
-          menu.push({ type: "separator" });
-        }
-        if (cipher.login.canLaunch) {
-          menu.push({
-            label: this.i18nService.t("launch"),
-            click: () => this.platformUtilsService.launchUri(cipher.login.launchUri),
-          });
-        }
-        if (cipher.login.username != null) {
-          menu.push({
-            label: this.i18nService.t("copyUsername"),
-            click: () => this.copyValue(cipher, cipher.login.username, "username", "Username"),
-          });
-        }
-        if (cipher.login.password != null && cipher.viewPassword) {
-          menu.push({
-            label: this.i18nService.t("copyPassword"),
-            click: () => {
-              this.copyValue(cipher, cipher.login.password, "password", "Password");
-              // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-              // eslint-disable-next-line @typescript-eslint/no-floating-promises
-              this.eventCollectionService.collect(EventType.Cipher_ClientCopiedPassword, cipher.id);
-            },
-          });
-        }
-        if (cipher.login.hasTotp && (cipher.organizationUseTotp || this.userHasPremiumAccess)) {
-          menu.push({
-            label: this.i18nService.t("copyVerificationCodeTotp"),
-            click: async () => {
-              const value = await firstValueFrom(this.totpService.getCode$(cipher.login.totp));
-              this.copyValue(cipher, value.code, "verificationCodeTotp", "TOTP");
-            },
-          });
-        }
-        break;
-      case CipherType.Card:
-        if (cipher.card.number != null || cipher.card.code != null) {
-          menu.push({ type: "separator" });
-        }
-        if (cipher.card.number != null) {
-          menu.push({
-            label: this.i18nService.t("copyNumber"),
-            click: () => this.copyValue(cipher, cipher.card.number, "number", "Card Number"),
-          });
-        }
-        if (cipher.card.code != null) {
-          menu.push({
-            label: this.i18nService.t("copySecurityCode"),
-            click: () => {
-              this.copyValue(cipher, cipher.card.code, "securityCode", "Security Code");
-              // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-              // eslint-disable-next-line @typescript-eslint/no-floating-promises
-              this.eventCollectionService.collect(EventType.Cipher_ClientCopiedCardCode, cipher.id);
-            },
-          });
-        }
-        break;
-      default:
-        break;
-    }
-
-    invokeMenu(menu);
-  }
-
-  async editCipher(cipher: CipherView) {
-    if (!(await this.canNavigateAway("edit", cipher))) {
-      return;
-    } else if (!(await this.passwordReprompt(cipher))) {
-      return;
-    }
-
-    await this.editCipherWithoutPasswordPrompt(cipher);
-  }
-
-  async editCipherWithoutPasswordPrompt(cipher: CipherView) {
-    if (!(await this.canNavigateAway("edit", cipher))) {
-      return;
-    }
-
-    this.cipherId = cipher.id;
-    this.action = "edit";
-    this.go();
-  }
-
-  async cloneCipher(cipher: CipherView) {
-    if (!(await this.canNavigateAway("clone", cipher))) {
-      return;
-    } else if (!(await this.passwordReprompt(cipher))) {
-      return;
-    }
-
-    await this.cloneCipherWithoutPasswordPrompt(cipher);
-  }
-
-  async cloneCipherWithoutPasswordPrompt(cipher: CipherView) {
-    if (!(await this.canNavigateAway("edit", cipher))) {
-      return;
-    }
-
-    this.cipherId = cipher.id;
-    this.action = "clone";
-    this.go();
-  }
-
-  async addCipher(type: CipherType = null) {
-    if (!(await this.canNavigateAway("add", null))) {
-      return;
-    }
-
-    this.addType = type || this.activeFilter.cipherType;
-    this.action = "add";
-    this.cipherId = null;
-    this.prefillNewCipherFromFilter();
-    this.go();
-
-    if (type === CipherType.SshKey) {
-      this.toastService.showToast({
-        variant: "success",
-        title: "",
-        message: this.i18nService.t("sshKeyGenerated"),
-      });
-    }
-  }
-
-  addCipherOptions() {
-    const menu: RendererMenuItem[] = [
-      {
-        label: this.i18nService.t("typeLogin"),
-        click: () => this.addCipherWithChangeDetection(CipherType.Login),
-      },
-      {
-        label: this.i18nService.t("typeCard"),
-        click: () => this.addCipherWithChangeDetection(CipherType.Card),
-      },
-      {
-        label: this.i18nService.t("typeIdentity"),
-        click: () => this.addCipherWithChangeDetection(CipherType.Identity),
-      },
-      {
-        label: this.i18nService.t("typeSecureNote"),
-        click: () => this.addCipherWithChangeDetection(CipherType.SecureNote),
-      },
-    ];
-
-    invokeMenu(menu);
-  }
-
-  async savedCipher(cipher: CipherView) {
-    this.cipherId = null;
-    this.action = "view";
-    await this.vaultItemsComponent.refresh();
-    this.cipherId = cipher.id;
-    await this.cipherService.clearCache(this.activeUserId);
-    await this.vaultItemsComponent.load(this.activeFilter.buildFilter());
-    this.go();
-    await this.vaultItemsComponent.refresh();
-  }
-
-  async deletedCipher(cipher: CipherView) {
-    this.cipherId = null;
-    this.action = null;
-    this.go();
-    await this.vaultItemsComponent.refresh();
-  }
-
-  async restoredCipher(cipher: CipherView) {
-    this.cipherId = null;
-    this.action = null;
-    this.go();
-    await this.vaultItemsComponent.refresh();
-  }
-
-  async editCipherAttachments(cipher: CipherView) {
-    if (this.modal != null) {
-      this.modal.close();
-    }
-
-    const [modal, childComponent] = await this.modalService.openViewRef(
-      AttachmentsComponent,
-      this.attachmentsModalRef,
-      (comp) => (comp.cipherId = cipher.id),
-    );
-    this.modal = modal;
-
-    let madeAttachmentChanges = false;
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
-    childComponent.onUploadedAttachment.subscribe((cipher) => {
-      madeAttachmentChanges = true;
-      // Update the edit component cipher with the updated cipher,
-      // which is needed because the revision date is updated when an attachment is altered
-      this.addEditComponent.patchCipherAttachments(cipher);
-    });
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
-    childComponent.onDeletedAttachment.subscribe((cipher) => {
-      madeAttachmentChanges = true;
-      // Update the edit component cipher with the updated cipher,
-      // which is needed because the revision date is updated when an attachment is altered
-      this.addEditComponent.patchCipherAttachments(cipher);
-    });
-
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
-    this.modal.onClosed.subscribe(async () => {
-      this.modal = null;
-      if (madeAttachmentChanges) {
-        await this.vaultItemsComponent.refresh();
-      }
-      madeAttachmentChanges = false;
-    });
-  }
-
-  async shareCipher(cipher: CipherView) {
-    if (this.modal != null) {
-      this.modal.close();
-    }
-
-    const [modal, childComponent] = await this.modalService.openViewRef(
-      ShareComponent,
-      this.shareModalRef,
-      (comp) => (comp.cipherId = cipher.id),
-    );
-    this.modal = modal;
-
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
-    childComponent.onSharedCipher.subscribe(async () => {
-      this.modal.close();
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.viewCipher(cipher);
-      await this.vaultItemsComponent.refresh();
-      await this.cipherService.clearCache(this.activeUserId);
-      await this.vaultItemsComponent.load(this.activeFilter.buildFilter());
-    });
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
-    this.modal.onClosed.subscribe(async () => {
-      this.modal = null;
-    });
-  }
-
-  async cipherCollections(cipher: CipherView) {
-    if (this.modal != null) {
-      this.modal.close();
-    }
-
-    const [modal, childComponent] = await this.modalService.openViewRef(
-      CollectionsComponent,
-      this.collectionsModalRef,
-      (comp) => (comp.cipherId = cipher.id),
-    );
-    this.modal = modal;
-
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
-    childComponent.onSavedCollections.subscribe(() => {
-      this.modal.close();
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.viewCipher(cipher);
-    });
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
-    this.modal.onClosed.subscribe(async () => {
-      this.modal = null;
-    });
-  }
-
-  async viewCipherPasswordHistory(cipher: CipherView) {
-    if (this.modal != null) {
-      this.modal.close();
-    }
-
-    [this.modal] = await this.modalService.openViewRef(
-      PasswordHistoryComponent,
-      this.passwordHistoryModalRef,
-      (comp) => (comp.cipherId = cipher.id),
-    );
-
-    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
-    this.modal.onClosed.subscribe(async () => {
-      this.modal = null;
-    });
-  }
-
-  cancelledAddEdit(cipher: CipherView) {
-    this.cipherId = cipher.id;
-    this.action = this.cipherId != null ? "view" : null;
-    this.go();
-  }
-
-  async applyVaultFilter(vaultFilter: VaultFilter) {
-    this.searchBarService.setPlaceholderText(
-      this.i18nService.t(this.calculateSearchBarLocalizationString(vaultFilter)),
-    );
-    this.activeFilter = vaultFilter;
-    await this.vaultItemsComponent.reload(
-      this.activeFilter.buildFilter(),
-      vaultFilter.status === "trash",
-    );
-    this.go();
-  }
-
-  private calculateSearchBarLocalizationString(vaultFilter: VaultFilter): string {
-    if (vaultFilter.status === "favorites") {
-      return "searchFavorites";
-    }
-    if (vaultFilter.status === "trash") {
-      return "searchTrash";
-    }
-    if (vaultFilter.cipherType != null) {
-      return "searchType";
-    }
-    if (vaultFilter.selectedFolderId != null && vaultFilter.selectedFolderId != "none") {
-      return "searchFolder";
-    }
-    if (vaultFilter.selectedCollectionId != null) {
-      return "searchCollection";
-    }
-    if (vaultFilter.selectedOrganizationId != null) {
-      return "searchOrganization";
-    }
-    if (vaultFilter.myVaultOnly) {
-      return "searchMyVault";
-    }
-
-    return "searchVault";
-  }
-
-  async openGenerator(passwordType = true) {
-    CredentialGeneratorDialogComponent.open(this.dialogService, {
-      onCredentialGenerated: (value?: string) => {
-        if (this.addEditComponent != null) {
-          this.addEditComponent.markPasswordAsDirty();
-          if (passwordType) {
-            this.addEditComponent.cipher.login.password = value ?? "";
-          } else {
-            this.addEditComponent.cipher.login.username = value ?? "";
-          }
-        }
-      },
-      type: passwordType ? "password" : "username",
-    });
-    return;
-  }
-
-  async addFolder() {
-    this.messagingService.send("newFolder");
-  }
-
-  async editFolder(folderId: string) {
-    const folderView = await firstValueFrom(
-      this.folderService.getDecrypted$(folderId, this.activeUserId),
-    );
-
-    const dialogRef = AddEditFolderDialogComponent.open(this.dialogService, {
-      editFolderConfig: {
-        folder: {
-          ...folderView,
-        },
-      },
-    });
-
-    const result = await lastValueFrom(dialogRef.closed);
-
-    if (
-      result === AddEditFolderDialogResult.Deleted ||
-      result === AddEditFolderDialogResult.Created
-    ) {
-      await this.vaultFilterComponent.reloadCollectionsAndFolders(this.activeFilter);
-    }
-  }
-
-  private dirtyInput(): boolean {
-    return (
-      (this.action === "add" || this.action === "edit" || this.action === "clone") &&
-      document.querySelectorAll("app-vault-add-edit .ng-dirty").length > 0
-    );
-  }
-
-  private async wantsToSaveChanges(): Promise<boolean> {
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: { key: "unsavedChangesTitle" },
-      content: { key: "unsavedChangesConfirmation" },
-      type: "warning",
-    });
-    return !confirmed;
-  }
-
-  private go(queryParams: any = null) {
-    if (queryParams == null) {
-      queryParams = {
-        action: this.action,
-        cipherId: this.cipherId,
-        favorites: this.favorites ? true : null,
-        type: this.type,
-        folderId: this.folderId,
-        collectionId: this.collectionId,
-        deleted: this.deleted ? true : null,
-        organizationId: this.organizationId,
-        myVaultOnly: this.myVaultOnly,
-      };
-    }
-
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.router.navigate([], {
-      relativeTo: this.route,
-      queryParams: queryParams,
-      replaceUrl: true,
-    });
-  }
-
-  private addCipherWithChangeDetection(type: CipherType = null) {
-    this.functionWithChangeDetection(() => this.addCipher(type));
-  }
-
-  private copyValue(cipher: CipherView, value: string, labelI18nKey: string, aType: string) {
-    this.functionWithChangeDetection(async () => {
-      if (
-        this.passwordRepromptService.protectedFields().includes(aType) &&
-        !(await this.passwordReprompt(cipher))
-      ) {
-        return;
-      }
-
-      this.platformUtilsService.copyToClipboard(value);
-      this.toastService.showToast({
-        variant: "info",
-        title: null,
-        message: this.i18nService.t("valueCopied", this.i18nService.t(labelI18nKey)),
-      });
-      if (this.action === "view") {
-        this.messagingService.send("minimizeOnCopy");
-      }
-    });
-  }
-
-  private functionWithChangeDetection(func: () => void) {
-    this.ngZone.run(() => {
-      func();
-      this.changeDetectorRef.detectChanges();
-    });
-  }
-
-  private prefillNewCipherFromFilter() {
-    if (this.activeFilter.selectedCollectionId != null) {
-      const collection = this.vaultFilterComponent.collections.fullList.filter(
-        (c) => c.id === this.activeFilter.selectedCollectionId,
-      );
-      if (collection.length > 0) {
-        this.addOrganizationId = collection[0].organizationId;
-        this.addCollectionIds = [this.activeFilter.selectedCollectionId];
-      }
-    } else if (this.activeFilter.selectedOrganizationId) {
-      this.addOrganizationId = this.activeFilter.selectedOrganizationId;
-    }
-    if (this.activeFilter.selectedFolderId && this.activeFilter.selectedFolder) {
-      this.folderId = this.activeFilter.selectedFolderId;
-    }
-  }
-
-  private async canNavigateAway(action: string, cipher?: CipherView) {
-    // Don't navigate to same route
-    if (this.action === action && (cipher == null || this.cipherId === cipher.id)) {
-      return false;
-    } else if (this.dirtyInput() && (await this.wantsToSaveChanges())) {
-      return false;
-    }
-
-    return true;
-  }
-
-  private async passwordReprompt(cipher: CipherView) {
-    if (cipher.reprompt === CipherRepromptType.None) {
-      this.cipherRepromptId = null;
-      return true;
-    }
-    if (this.cipherRepromptId === cipher.id) {
-      return true;
-    }
-    const repromptResult = await this.passwordRepromptService.showPasswordPrompt();
-    if (repromptResult) {
-      this.cipherRepromptId = cipher.id;
-    }
-    return repromptResult;
-  }
-}
diff --git a/apps/desktop/src/vault/app/vault/view-custom-fields.component.html b/apps/desktop/src/vault/app/vault/view-custom-fields.component.html
deleted file mode 100644
index 5e0389af25a..00000000000
--- a/apps/desktop/src/vault/app/vault/view-custom-fields.component.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<div class="box">
-  <h2 class="box-header">
-    {{ "customFields" | i18n }}
-  </h2>
-  <div class="box-content">
-    <div
-      class="box-content-row box-content-row-flex"
-      *ngFor="let field of cipher.fields; index as i"
-    >
-      <div class="row-main">
-        <span
-          *ngIf="field.type != fieldType.Linked"
-          class="row-label draggable"
-          draggable="true"
-          (dragstart)="setTextDataOnDrag($event, field.value)"
-          [id]="'customField-' + i"
-        >
-          {{ field.name }}
-        </span>
-        <span *ngIf="field.type === fieldType.Linked" class="row-label">
-          {{ "cfTypeLinked" | i18n }}: {{ field.name }}
-        </span>
-        <div *ngIf="field.type === fieldType.Text">
-          {{ field.value || "&nbsp;" }}
-        </div>
-        <div *ngIf="field.type === fieldType.Hidden">
-          <span *ngIf="!field.showValue" class="monospaced">{{ field.maskedValue }}</span>
-          <span
-            *ngIf="field.showValue && !field.showCount"
-            class="monospaced show-whitespace"
-            [innerHTML]="field.value | colorPassword"
-          ></span>
-          <span
-            *ngIf="field.showValue && field.showCount"
-            [innerHTML]="field.value | colorPasswordCount"
-          ></span>
-        </div>
-        <div *ngIf="field.type === fieldType.Boolean">
-          <input
-            type="checkbox"
-            [checked]="field.value === 'true'"
-            disabled="true"
-            [attr.aria-labelledby]="'customField-' + i"
-          />
-        </div>
-        <div *ngIf="field.type === fieldType.Linked" class="box-content-row-flex">
-          <span>{{ cipher.linkedFieldI18nKey(field.linkedId) | i18n }}</span>
-        </div>
-      </div>
-      <div class="action-buttons action-buttons-fixed">
-        <button
-          type="button"
-          class="row-btn"
-          appStopClick
-          appA11yTitle="{{ 'toggleCharacterCount' | i18n }}"
-          *ngIf="field.type === fieldType.Hidden && cipher.viewPassword && field.showValue"
-          (click)="toggleFieldCount(field)"
-          [attr.aria-pressed]="field.showCount"
-        >
-          <i class="bwi bwi-lg bwi-numbered-list" aria-hidden="true"></i>
-        </button>
-        <button
-          type="button"
-          class="row-btn"
-          appStopClick
-          appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-          *ngIf="field.type === fieldType.Hidden && cipher.viewPassword"
-          (click)="toggleFieldValue(field)"
-        >
-          <i
-            class="bwi bwi-lg"
-            aria-hidden="true"
-            [ngClass]="{ 'bwi-eye': !field.showValue, 'bwi-eye-slash': field.showValue }"
-          ></i>
-        </button>
-        <button
-          type="button"
-          class="row-btn"
-          appStopClick
-          appA11yTitle="{{ 'copyValue' | i18n }}"
-          *ngIf="
-            field.value &&
-            field.type !== fieldType.Boolean &&
-            field.type !== fieldType.Linked &&
-            !(field.type === fieldType.Hidden && !cipher.viewPassword)
-          "
-          (click)="
-            copy(field.value, 'value', field.type === fieldType.Hidden ? 'H_Field' : 'Field')
-          "
-        >
-          <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/apps/desktop/src/vault/app/vault/view-custom-fields.component.ts b/apps/desktop/src/vault/app/vault/view-custom-fields.component.ts
deleted file mode 100644
index efe61ad1fa7..00000000000
--- a/apps/desktop/src/vault/app/vault/view-custom-fields.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component } from "@angular/core";
-
-import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "@bitwarden/angular/vault/components/view-custom-fields.component";
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-
-@Component({
-  selector: "app-vault-view-custom-fields",
-  templateUrl: "view-custom-fields.component.html",
-  standalone: false,
-})
-export class ViewCustomFieldsComponent extends BaseViewCustomFieldsComponent {
-  constructor(eventCollectionService: EventCollectionService) {
-    super(eventCollectionService);
-  }
-}
diff --git a/apps/desktop/src/vault/app/vault/view.component.html b/apps/desktop/src/vault/app/vault/view.component.html
deleted file mode 100644
index 8477a588fef..00000000000
--- a/apps/desktop/src/vault/app/vault/view.component.html
+++ /dev/null
@@ -1,687 +0,0 @@
-<div class="content">
-  <div class="inner-content" *ngIf="cipher">
-    <div class="box">
-      <h2 class="box-header">
-        {{ "itemInformation" | i18n }}
-      </h2>
-      <div class="box-content">
-        <div class="box-content-row">
-          <span
-            class="row-label draggable"
-            draggable="true"
-            (dragstart)="setTextDataOnDrag($event, cipher.name)"
-            >{{ "name" | i18n }}</span
-          >
-          {{ cipher.name }}
-        </div>
-        <!-- Login -->
-        <div *ngIf="cipher.login">
-          <div class="box-content-row box-content-row-flex" *ngIf="cipher.login.username">
-            <div class="row-main">
-              <span
-                class="row-label draggable"
-                draggable="true"
-                (dragstart)="setTextDataOnDrag($event, cipher.login.username)"
-                >{{ "username" | i18n }}</span
-              >
-              {{ cipher.login.username }}
-            </div>
-            <div class="action-buttons">
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                appA11yTitle="{{ 'copyUsername' | i18n }}"
-                (click)="copy(cipher.login.username, 'username', 'Username')"
-              >
-                <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-              </button>
-            </div>
-          </div>
-          <div class="box-content-row box-content-row-flex" *ngIf="cipher.login.password">
-            <div class="row-main">
-              <span
-                class="row-label draggable"
-                draggable="true"
-                (dragstart)="setTextDataOnDrag($event, cipher.login.password)"
-                >{{ "password" | i18n }}</span
-              >
-              <div *ngIf="!showPassword" class="monospaced">
-                {{ cipher.login.maskedPassword }}
-              </div>
-              <div
-                *ngIf="showPassword && !showPasswordCount"
-                class="monospaced password-wrapper"
-                [appCopyText]="cipher.login.password"
-                [innerHTML]="cipher.login.password | colorPassword"
-              ></div>
-              <div
-                *ngIf="showPassword && showPasswordCount"
-                [innerHTML]="cipher.login.password | colorPasswordCount"
-              ></div>
-            </div>
-            <div class="action-buttons" *ngIf="cipher.viewPassword">
-              <button
-                type="button"
-                #checkPasswordBtn
-                class="row-btn btn"
-                appA11yTitle="{{ 'checkPassword' | i18n }}"
-                (click)="checkPassword()"
-                [appApiAction]="checkPasswordPromise"
-                [disabled]="$any(checkPasswordBtn).loading"
-              >
-                <i
-                  class="bwi bwi-lg bwi-check-circle"
-                  [hidden]="$any(checkPasswordBtn).loading"
-                  aria-hidden="true"
-                ></i>
-                <i
-                  class="bwi bwi-lg bwi-spinner bwi-spin"
-                  [hidden]="!$any(checkPasswordBtn).loading"
-                  aria-hidden="true"
-                ></i>
-              </button>
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                attr.aria-label="{{ 'toggleCharacterCount' | i18n }} {{ 'password' | i18n }}"
-                appA11yTitle="{{ 'toggleCharacterCount' | i18n }}"
-                (click)="togglePasswordCount()"
-                *ngIf="showPassword"
-                [attr.aria-pressed]="showPasswordCount"
-              >
-                <i class="bwi bwi-lg bwi-numbered-list" aria-hidden="true"></i>
-              </button>
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                [attr.aria-pressed]="showPassword"
-                (click)="togglePassword()"
-              >
-                <i
-                  class="bwi bwi-lg"
-                  aria-hidden="true"
-                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
-                ></i>
-              </button>
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                appA11yTitle="{{ 'copyPassword' | i18n }}"
-                (click)="copy(cipher.login.password, 'password', 'Password')"
-              >
-                <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-              </button>
-            </div>
-          </div>
-          <!--Passkey-->
-          <div
-            class="box-content-row text-muted"
-            *ngIf="cipher.login.hasFido2Credentials"
-            tabindex="0"
-            attr.aria-label="{{ 'typePasskey' | i18n }} {{ fido2CredentialCreationDateValue }}"
-          >
-            <span class="row-label">{{ "typePasskey" | i18n }}</span>
-            {{ fido2CredentialCreationDateValue }}
-          </div>
-
-          <ng-container *ngIf="cipher.login.totp && totpInfo$ | async as totpInfo">
-            <div
-              class="box-content-row box-content-row-flex totp"
-              [ngClass]="{ low: totpInfo.totpLow }"
-            >
-              <div class="row-main">
-                <span
-                  class="row-label draggable"
-                  draggable="true"
-                  (dragstart)="setTextDataOnDrag($event, totpInfo.totpCode)"
-                  >{{ "verificationCodeTotp" | i18n }}</span
-                >
-                <span class="totp-code">{{ totpInfo.totpCodeFormatted }}</span>
-              </div>
-              <span class="totp-countdown" aria-hidden="true">
-                <span class="totp-sec">{{ totpInfo.totpSec }}</span>
-                <svg>
-                  <g>
-                    <circle
-                      class="totp-circle inner"
-                      r="12.6"
-                      cy="16"
-                      cx="16"
-                      [ngStyle]="{ 'stroke-dashoffset.px': totpInfo.totpDash }"
-                    ></circle>
-                    <circle class="totp-circle outer" r="14" cy="16" cx="16"></circle>
-                  </g>
-                </svg>
-              </span>
-              <div class="action-buttons">
-                <button
-                  type="button"
-                  class="row-btn"
-                  appStopClick
-                  title="{{ 'copyValue' | i18n }}"
-                  (click)="copy(totpInfo.totpCode, 'verificationCodeTotp', 'TOTP')"
-                >
-                  <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-                  <span class="sr-only">{{ "copyValue" | i18n }}</span>
-                  <span
-                    class="sr-only exists-only-on-parent-focus"
-                    aria-live="polite"
-                    aria-atomic="true"
-                    >{{ totpInfo.totpSec }}</span
-                  >
-                </button>
-              </div>
-            </div>
-          </ng-container>
-
-          <div class="box-content-row box-content-row-flex totp" *ngIf="showPremiumRequiredTotp">
-            <div class="row-main">
-              <span class="row-label">{{ "verificationCodeTotp" | i18n }}</span>
-              <span class="row-label">
-                <a [routerLink]="" (click)="showGetPremium()"
-                  >{{ "premiumSubcriptionRequired" | i18n }}
-                </a>
-              </span>
-            </div>
-          </div>
-        </div>
-        <!-- Card -->
-        <div *ngIf="cipher.card">
-          <div class="box-content-row" *ngIf="cipher.card.cardholderName">
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, cipher.card.cardholderName)"
-              >{{ "cardholderName" | i18n }}</span
-            >
-            {{ cipher.card.cardholderName }}
-          </div>
-          <div class="box-content-row box-content-row-flex" *ngIf="cipher.card.number">
-            <div class="row-main">
-              <span
-                class="row-label draggable"
-                draggable="true"
-                (dragstart)="setTextDataOnDrag($event, cipher.card.number)"
-                >{{ "number" | i18n }}</span
-              >
-              <span *ngIf="!showCardNumber" class="monospaced">{{
-                cipher.card.maskedNumber | creditCardNumber: cipher.card.brand
-              }}</span>
-              <span *ngIf="showCardNumber" class="monospaced">{{
-                cipher.card.number | creditCardNumber: cipher.card.brand
-              }}</span>
-            </div>
-            <div class="action-buttons">
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                [attr.aria-pressed]="showCardNumber"
-                (click)="toggleCardNumber()"
-              >
-                <i
-                  class="bwi bwi-lg"
-                  aria-hidden="true"
-                  [ngClass]="{ 'bwi-eye': !showCardNumber, 'bwi-eye-slash': showCardNumber }"
-                ></i>
-              </button>
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                appA11yTitle="{{ 'copyNumber' | i18n }}"
-                (click)="copy(cipher.card.number, 'number', 'Card Number')"
-              >
-                <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-              </button>
-            </div>
-          </div>
-          <div class="box-content-row" *ngIf="cipher.card.brand">
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, cipher.card.brand)"
-              >{{ "brand" | i18n }}</span
-            >
-            {{ cipher.card.brand }}
-          </div>
-          <div class="box-content-row" *ngIf="cipher.card.expiration">
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, cipher.card.expiration)"
-              >{{ "expiration" | i18n }}</span
-            >
-            {{ cipher.card.expiration }}
-          </div>
-          <div class="box-content-row box-content-row-flex" *ngIf="cipher.card.code">
-            <div class="row-main">
-              <span
-                class="row-label draggable"
-                draggable="true"
-                (dragstart)="setTextDataOnDrag($event, cipher.card.code)"
-                >{{ "securityCode" | i18n }}</span
-              >
-              <span *ngIf="!showCardCode" class="monospaced">{{ cipher.card.maskedCode }}</span>
-              <span *ngIf="showCardCode" class="monospaced">{{ cipher.card.code }}</span>
-            </div>
-            <div class="action-buttons">
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                [attr.aria-pressed]="showCardCode"
-                (click)="toggleCardCode()"
-              >
-                <i
-                  class="bwi bwi-lg"
-                  aria-hidden="true"
-                  [ngClass]="{ 'bwi-eye': !showCardCode, 'bwi-eye-slash': showCardCode }"
-                ></i>
-              </button>
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                appA11yTitle="{{ 'copySecurityCode' | i18n }}"
-                (click)="copy(cipher.card.code, 'securityCode', 'Security Code')"
-              >
-                <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-              </button>
-            </div>
-          </div>
-        </div>
-        <!-- Identity -->
-        <div *ngIf="cipher.identity">
-          <div class="box-content-row" *ngIf="cipher.identity.fullName">
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, cipher.identity.fullName)"
-              >{{ "identityName" | i18n }}</span
-            >
-            {{ cipher.identity.fullName }}
-          </div>
-          <div class="box-content-row" *ngIf="cipher.identity.username">
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, cipher.identity.username)"
-              >{{ "username" | i18n }}</span
-            >
-            {{ cipher.identity.username }}
-          </div>
-          <div class="box-content-row" *ngIf="cipher.identity.company">
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, cipher.identity.company)"
-              >{{ "company" | i18n }}</span
-            >
-            {{ cipher.identity.company }}
-          </div>
-          <div class="box-content-row" *ngIf="cipher.identity.ssn">
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, cipher.identity.ssn)"
-              >{{ "ssn" | i18n }}</span
-            >
-            {{ cipher.identity.ssn }}
-          </div>
-          <div class="box-content-row" *ngIf="cipher.identity.passportNumber">
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, cipher.identity.passportNumber)"
-              >{{ "passportNumber" | i18n }}</span
-            >
-            {{ cipher.identity.passportNumber }}
-          </div>
-          <div class="box-content-row" *ngIf="cipher.identity.licenseNumber">
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, cipher.identity.licenseNumber)"
-              >{{ "licenseNumber" | i18n }}</span
-            >
-            {{ cipher.identity.licenseNumber }}
-          </div>
-          <div class="box-content-row" *ngIf="cipher.identity.email">
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, cipher.identity.email)"
-              >{{ "email" | i18n }}</span
-            >
-            {{ cipher.identity.email }}
-          </div>
-          <div class="box-content-row" *ngIf="cipher.identity.phone">
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, cipher.identity.phone)"
-              >{{ "phone" | i18n }}</span
-            >
-            {{ cipher.identity.phone }}
-          </div>
-          <div
-            class="box-content-row"
-            *ngIf="cipher.identity.address1 || cipher.identity.city || cipher.identity.country"
-          >
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="
-                setTextDataOnDrag(
-                  $event,
-                  (cipher.identity.address1 ? cipher.identity.address1 + '\n' : '') +
-                    (cipher.identity.address2 ? cipher.identity.address2 + '\n' : '') +
-                    (cipher.identity.address3 ? cipher.identity.address3 + '\n' : '') +
-                    (cipher.identity.fullAddressPart2
-                      ? cipher.identity.fullAddressPart2 + '\n'
-                      : '') +
-                    (cipher.identity.country ? cipher.identity.country : '')
-                )
-              "
-              >{{ "address" | i18n }}</span
-            >
-            <div *ngIf="cipher.identity.address1">{{ cipher.identity.address1 }}</div>
-            <div *ngIf="cipher.identity.address2">{{ cipher.identity.address2 }}</div>
-            <div *ngIf="cipher.identity.address3">{{ cipher.identity.address3 }}</div>
-            <div *ngIf="cipher.identity.fullAddressPart2">
-              {{ cipher.identity.fullAddressPart2 }}
-            </div>
-            <div *ngIf="cipher.identity.country">{{ cipher.identity.country }}</div>
-          </div>
-        </div>
-        <!-- Ssh Key -->
-        <div *ngIf="cipher.sshKey">
-          <div class="box-content-row box-content-row-flex" *ngIf="cipher.sshKey.privateKey">
-            <div class="row-main">
-              <span class="row-label">{{ "sshPrivateKey" | i18n }}</span>
-              <div
-                *ngIf="!showPrivateKey"
-                class="monospaced"
-                style="white-space: pre-line"
-                [innerText]="cipher.sshKey.maskedPrivateKey"
-              ></div>
-              <div
-                *ngIf="showPrivateKey"
-                class="monospaced"
-                style="white-space: pre-line"
-                [innerText]="cipher.sshKey.privateKey"
-              ></div>
-            </div>
-            <div class="action-buttons" *ngIf="cipher.viewPassword">
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-                [attr.aria-pressed]="showPrivateKey"
-                (click)="togglePrivateKey()"
-              >
-                <i
-                  class="bwi bwi-lg"
-                  aria-hidden="true"
-                  [ngClass]="{ 'bwi-eye': !showPrivateKey, 'bwi-eye-slash': showPrivateKey }"
-                ></i>
-              </button>
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                appA11yTitle="{{ 'copySSHPrivateKey' | i18n }}"
-                (click)="copy(cipher.sshKey.privateKey, 'sshPrivateKey', 'SshPrivateKey')"
-              >
-                <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-              </button>
-            </div>
-          </div>
-          <div
-            class="box-content-row box-content-row-flex"
-            *ngIf="cipher.sshKey.publicKey"
-            appBoxRow
-          >
-            <div class="row-main">
-              <label for="sshPublicKey">{{ "sshPublicKey" | i18n }}</label>
-              <input
-                id="sshPublicKey"
-                type="text"
-                name="SshKey.SshPublicKey"
-                [ngModel]="cipher.sshKey.publicKey"
-                readonly
-              />
-            </div>
-            <div class="action-buttons">
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                (click)="copy(cipher.sshKey.publicKey, 'sshPublicKey', 'SshPublicKey')"
-                appA11yTitle="{{ 'generateSshKey' | i18n }}"
-              >
-                <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-              </button>
-            </div>
-          </div>
-          <div
-            class="box-content-row box-content-row-flex"
-            *ngIf="cipher.sshKey.keyFingerprint"
-            appBoxRow
-          >
-            <div class="row-main">
-              <label for="sshKeyFingerprint">{{ "sshFingerprint" | i18n }}</label>
-              <input
-                id="sshKeyFingerprint"
-                type="text"
-                name="SshKey.SshKeyFingerprint"
-                [ngModel]="cipher.sshKey.keyFingerprint"
-                readonly
-              />
-            </div>
-            <div class="action-buttons">
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                (click)="copy(cipher.sshKey.keyFingerprint, 'sshFingerprint', 'SshFingerprint')"
-                appA11yTitle="{{ 'generateSshKey' | i18n }}"
-              >
-                <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="box" *ngIf="cipher.login && cipher.login.hasUris">
-      <div class="box-content">
-        <div
-          class="box-content-row box-content-row-flex"
-          *ngFor="let u of cipher.login.uris; let i = index"
-        >
-          <div class="row-main">
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, u.uri)"
-              *ngIf="!u.isWebsite"
-              >{{ "uri" | i18n }}</span
-            >
-            <span
-              class="row-label draggable"
-              draggable="true"
-              (dragstart)="setTextDataOnDrag($event, u.uri)"
-              *ngIf="u.isWebsite"
-              >{{ "website" | i18n }}</span
-            >
-            <span title="{{ u.uri }}">{{ u.hostOrUri }}</span>
-          </div>
-          <div class="action-buttons">
-            <button
-              type="button"
-              class="row-btn"
-              appStopClick
-              appA11yTitle="{{ 'launch' | i18n }}"
-              *ngIf="u.canLaunch"
-              (click)="launch(u)"
-            >
-              <i class="bwi bwi-lg bwi-external-link" aria-hidden="true"></i>
-            </button>
-            <button
-              type="button"
-              class="row-btn"
-              appStopClick
-              appA11yTitle="{{ 'copyUri' | i18n }}"
-              (click)="copy(u.uri, u.isWebsite ? 'website' : 'uri', 'URI')"
-            >
-              <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="box" *ngIf="cipher.folderId && folder">
-      <div class="box-content">
-        <div class="box-content-row">
-          <label
-            for="folderName"
-            class="draggable"
-            draggable="true"
-            (dragstart)="setTextDataOnDrag($event, folder.name)"
-            >{{ "folder" | i18n }}</label
-          >
-          <input id="folderName" type="text" name="folderName" [value]="folder.name" readonly />
-        </div>
-      </div>
-    </div>
-    <div class="box" *ngIf="cipher.notes">
-      <h2 class="box-header">
-        <span
-          class="draggable"
-          draggable="true"
-          (dragstart)="setTextDataOnDrag($event, cipher.notes)"
-          >{{ "notes" | i18n }}</span
-        >
-      </h2>
-      <div class="box-content">
-        <div class="box-content-row pre-wrap">{{ cipher.notes }}</div>
-      </div>
-    </div>
-    <app-vault-view-custom-fields
-      *ngIf="cipher.hasFields"
-      [cipher]="cipher"
-      [promptPassword]="promptPassword.bind(this)"
-      [copy]="copy.bind(this)"
-    >
-    </app-vault-view-custom-fields>
-    <div class="box" *ngIf="cipher.hasAttachments && (canAccessPremium || cipher.organizationId)">
-      <h2 class="box-header">
-        {{ "attachments" | i18n }}
-      </h2>
-      <div class="box-content">
-        <button
-          type="button"
-          class="box-content-row box-content-row-flex text-default"
-          *ngFor="let attachment of cipher.attachments"
-          appStopClick
-          (click)="downloadAttachment(attachment)"
-        >
-          <span class="row-main">{{ attachment.fileName }}</span>
-          <small class="row-sub-label">{{ attachment.sizeName }}</small>
-          <i
-            class="bwi bwi-download bwi-fw row-sub-icon"
-            *ngIf="!$any(attachment).downloading"
-            aria-hidden="true"
-          ></i>
-          <i
-            class="bwi bwi-spinner bwi-fw bwi-spin row-sub-icon"
-            *ngIf="$any(attachment).downloading"
-            aria-hidden="true"
-          ></i>
-        </button>
-      </div>
-    </div>
-    <div class="box">
-      <div class="box-footer">
-        <div>
-          <b class="font-weight-semibold">{{ "dateUpdated" | i18n }}:</b>
-          {{ cipher.revisionDate | date: "medium" }}
-        </div>
-        <div *ngIf="cipher.creationDate">
-          <b class="font-weight-semibold">{{ "dateCreated" | i18n }}:</b>
-          {{ cipher.creationDate | date: "medium" }}
-        </div>
-        <div *ngIf="cipher.passwordRevisionDisplayDate">
-          <b class="font-weight-semibold">{{ "datePasswordUpdated" | i18n }}:</b>
-          {{ cipher.passwordRevisionDisplayDate | date: "medium" }}
-        </div>
-        <div *ngIf="cipher.hasPasswordHistory">
-          <b class="font-weight-semibold">{{ "passwordHistory" | i18n }}:</b>
-          <button
-            type="button"
-            (click)="viewHistory()"
-            appStopClick
-            appA11yTitle="{{ 'passwordHistory' | i18n }}, {{ cipher.passwordHistory.length }}"
-          >
-            <span aria-hidden="true">{{ cipher.passwordHistory.length }}</span>
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="footer" *ngIf="cipher">
-  <ng-container *ngIf="!cipher.decryptionFailure">
-    <button
-      type="button"
-      class="primary"
-      (click)="edit()"
-      appA11yTitle="{{ 'edit' | i18n }}"
-      *ngIf="!cipher.isDeleted"
-    >
-      <i class="bwi bwi-pencil bwi-fw bwi-lg" aria-hidden="true"></i>
-    </button>
-    <button
-      type="button"
-      class="primary"
-      (click)="restore()"
-      appA11yTitle="{{ 'restore' | i18n }}"
-      *ngIf="
-        (limitItemDeletion$ | async)
-          ? (canRestoreCipher$ | async) && cipher.isDeleted
-          : cipher.isDeleted
-      "
-    >
-      <i class="bwi bwi-undo bwi-fw bwi-lg" aria-hidden="true"></i>
-    </button>
-    <button
-      type="button"
-      class="primary"
-      *ngIf="!cipher?.organizationId && !cipher.isDeleted"
-      (click)="clone()"
-      appA11yTitle="{{ 'clone' | i18n }}"
-    >
-      <i class="bwi bwi-files bwi-fw bwi-lg" aria-hidden="true"></i>
-    </button>
-  </ng-container>
-  <div class="right" *ngIf="canDeleteCipher$ | async">
-    <button
-      type="button"
-      (click)="delete()"
-      class="danger"
-      appA11yTitle="{{ (cipher.isDeleted ? 'permanentlyDelete' : 'delete') | i18n }}"
-    >
-      <i class="bwi bwi-trash bwi-lg bwi-fw" aria-hidden="true"></i>
-    </button>
-  </div>
-</div>
diff --git a/apps/desktop/src/vault/app/vault/view.component.ts b/apps/desktop/src/vault/app/vault/view.component.ts
deleted file mode 100644
index 33dfc600265..00000000000
--- a/apps/desktop/src/vault/app/vault/view.component.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-import { DatePipe } from "@angular/common";
-import {
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Input,
-  NgZone,
-  OnChanges,
-  OnDestroy,
-  OnInit,
-  Output,
-  SimpleChanges,
-} from "@angular/core";
-
-import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/vault/components/view.component";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
-import { CipherId } from "@bitwarden/common/types/guid";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
-import { DialogService, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
-import { DecryptionFailureDialogComponent, PasswordRepromptService } from "@bitwarden/vault";
-
-const BroadcasterSubscriptionId = "ViewComponent";
-
-@Component({
-  selector: "app-vault-view",
-  templateUrl: "view.component.html",
-  standalone: false,
-})
-export class ViewComponent extends BaseViewComponent implements OnInit, OnDestroy, OnChanges {
-  @Output() onViewCipherPasswordHistory = new EventEmitter<CipherView>();
-  @Input() masterPasswordAlreadyPrompted: boolean = false;
-
-  constructor(
-    cipherService: CipherService,
-    folderService: FolderService,
-    totpService: TotpService,
-    tokenService: TokenService,
-    i18nService: I18nService,
-    keyService: KeyService,
-    encryptService: EncryptService,
-    platformUtilsService: PlatformUtilsService,
-    auditService: AuditService,
-    broadcasterService: BroadcasterService,
-    ngZone: NgZone,
-    changeDetectorRef: ChangeDetectorRef,
-    eventCollectionService: EventCollectionService,
-    apiService: ApiService,
-    private messagingService: MessagingService,
-    passwordRepromptService: PasswordRepromptService,
-    logService: LogService,
-    stateService: StateService,
-    fileDownloadService: FileDownloadService,
-    dialogService: DialogService,
-    datePipe: DatePipe,
-    billingAccountProfileStateService: BillingAccountProfileStateService,
-    accountService: AccountService,
-    toastService: ToastService,
-    cipherAuthorizationService: CipherAuthorizationService,
-    configService: ConfigService,
-  ) {
-    super(
-      cipherService,
-      folderService,
-      totpService,
-      tokenService,
-      i18nService,
-      keyService,
-      encryptService,
-      platformUtilsService,
-      auditService,
-      window,
-      broadcasterService,
-      ngZone,
-      changeDetectorRef,
-      eventCollectionService,
-      apiService,
-      passwordRepromptService,
-      logService,
-      stateService,
-      fileDownloadService,
-      dialogService,
-      datePipe,
-      accountService,
-      billingAccountProfileStateService,
-      toastService,
-      cipherAuthorizationService,
-      configService,
-    );
-  }
-
-  protected limitItemDeletion$ = this.configService.getFeatureFlag$(FeatureFlag.LimitItemDeletion);
-
-  ngOnInit() {
-    super.ngOnInit();
-
-    this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
-      this.ngZone.run(() => {
-        switch (message.command) {
-          case "windowHidden":
-            this.onWindowHidden();
-            break;
-          default:
-        }
-      });
-    });
-    this.passwordReprompted = this.masterPasswordAlreadyPrompted;
-  }
-
-  ngOnDestroy() {
-    super.ngOnDestroy();
-    this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
-  }
-
-  async ngOnChanges(changes: SimpleChanges) {
-    if (this.cipher?.decryptionFailure) {
-      DecryptionFailureDialogComponent.open(this.dialogService, {
-        cipherIds: [this.cipherId as CipherId],
-      });
-      return;
-    }
-    this.passwordReprompted = this.masterPasswordAlreadyPrompted;
-
-    if (changes["cipherId"]) {
-      if (changes["cipherId"].currentValue !== changes["cipherId"].previousValue) {
-        this.showPrivateKey = false;
-      }
-    }
-  }
-
-  viewHistory() {
-    this.onViewCipherPasswordHistory.emit(this.cipher);
-  }
-
-  async copy(value: string, typeI18nKey: string, aType: string): Promise<boolean> {
-    const hasCopied = await super.copy(value, typeI18nKey, aType);
-    if (hasCopied) {
-      this.messagingService.send("minimizeOnCopy");
-    }
-
-    return hasCopied;
-  }
-
-  onWindowHidden() {
-    this.showPassword = false;
-    this.showCardNumber = false;
-    this.showCardCode = false;
-    if (this.cipher !== null && this.cipher.hasFields) {
-      this.cipher.fields.forEach((field) => {
-        field.showValue = false;
-      });
-    }
-  }
-
-  showGetPremium() {
-    if (!this.canAccessPremium) {
-      this.messagingService.send("premiumRequired");
-    }
-  }
-}
diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
index 78b3512405e..7db3e84e451 100644
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -1,50 +1,5 @@
 {
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "module": "ES2020",
-    "target": "ES2016",
-    "sourceMap": true,
-    "types": [],
-    "baseUrl": ".",
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
-      "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
-      "@bitwarden/billing": ["../../libs/billing/src"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/components": ["../../libs/components/src"],
-      "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer-core": ["../../libs/importer/src"],
-      "@bitwarden/importer-ui": ["../../libs/importer/src/components"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
-      "@bitwarden/node/*": ["../../libs/node/src/*"],
-      "@bitwarden/platform": ["../../libs/platform/src"],
-      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
-      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
-      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["../../libs/vault/src"]
-    },
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ],
-    "useDefineForClassFields": false
-  },
+  "extends": "../../tsconfig.base",
   "angularCompilerOptions": {
     "strictTemplates": true
   },
diff --git a/apps/desktop/tsconfig.spec.json b/apps/desktop/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/apps/desktop/tsconfig.spec.json
+++ b/apps/desktop/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/apps/desktop/webpack.renderer.js b/apps/desktop/webpack.renderer.js
index e9a44a9e725..7c80c719aca 100644
--- a/apps/desktop/webpack.renderer.js
+++ b/apps/desktop/webpack.renderer.js
@@ -110,7 +110,7 @@ const renderer = {
         test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
         exclude: /loading.svg/,
         generator: {
-          filename: "fonts/[name][ext]",
+          filename: "fonts/[name].[contenthash][ext]",
         },
         type: "asset/resource",
       },
diff --git a/apps/web/crowdin.yml b/apps/web/crowdin.yml
index ffd50d6e3f9..cea3d92c64a 100644
--- a/apps/web/crowdin.yml
+++ b/apps/web/crowdin.yml
@@ -14,5 +14,5 @@ files:
         zh-TW: zh_TW
         en-GB: en_GB
         en-IN: en_IN
-        sr-CY: sr_CY
+        sr: sr_CY
         sr-CS: sr_CS
diff --git a/apps/web/entrypoint.sh b/apps/web/entrypoint.sh
index 16d1c78fb77..53e8af235fb 100644
--- a/apps/web/entrypoint.sh
+++ b/apps/web/entrypoint.sh
@@ -19,20 +19,29 @@ then
     LGID=65534
 fi
 
-# Create user and group
+if [ "$(id -u)" = "0" ]; then
+    # Create user and group
 
-groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
-groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
-useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
-usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
-mkhomedir_helper $USERNAME
+    groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
+    groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
+    useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
+    usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
+    mkhomedir_helper $USERNAME
 
-# The rest...
+    # The rest...
 
-chown -R $USERNAME:$GROUPNAME /etc/bitwarden
-cp /etc/bitwarden/web/app-id.json /app/app-id.json
-chown -R $USERNAME:$GROUPNAME /app
-chown -R $USERNAME:$GROUPNAME /bitwarden_server
+    chown -R $USERNAME:$GROUPNAME /etc/bitwarden
+    chown -R $USERNAME:$GROUPNAME /app
+    chown -R $USERNAME:$GROUPNAME /bitwarden_server
 
-exec gosu $USERNAME:$GROUPNAME dotnet /bitwarden_server/Server.dll \
-    /contentRoot=/app /webRoot=. /serveUnknown=false /webVault=true
+    gosu_cmd="gosu $USERNAME:$GROUPNAME"
+else
+    gosu_cmd=""
+fi
+
+exec $gosu_cmd /bitwarden_server/Server \
+    /contentRoot=/app \
+    /webRoot=. \
+    /serveUnknown=false \
+    /webVault=true \
+    /appIdLocation=/etc/bitwarden/web/app-id.json
diff --git a/apps/web/jest.config.js b/apps/web/jest.config.js
index 9b5d6fdc766..e1d64fa64c3 100644
--- a/apps/web/jest.config.js
+++ b/apps/web/jest.config.js
@@ -1,13 +1,12 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
 /** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: {
     // Replace ESM SDK with Node compatible SDK
@@ -16,11 +15,11 @@ module.exports = {
     ...pathsToModuleNameMapper(
       {
         // lets us use @bitwarden/common/spec in web tests
-        "@bitwarden/common/spec": ["../../libs/common/spec"],
+        "@bitwarden/common/spec": ["libs/common/spec"],
         ...(compilerOptions?.paths ?? {}),
       },
       {
-        prefix: "<rootDir>/",
+        prefix: "<rootDir>/../../",
       },
     ),
   },
diff --git a/apps/web/package.json b/apps/web/package.json
index 6df2974129e..98f6e76c26d 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/web-vault",
-  "version": "2025.5.1",
+  "version": "2025.7.1",
   "scripts": {
     "build:oss": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" webpack",
     "build:bit": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-web/webpack.config.js",
diff --git a/apps/web/src/app/admin-console/common/base-members.component.ts b/apps/web/src/app/admin-console/common/base-members.component.ts
index 488af7ee518..624615edd6a 100644
--- a/apps/web/src/app/admin-console/common/base-members.component.ts
+++ b/apps/web/src/app/admin-console/common/base-members.component.ts
@@ -86,7 +86,7 @@ export abstract class BaseMembersComponent<UserView extends UserViewTypes> {
     protected i18nService: I18nService,
     protected keyService: KeyService,
     protected validationService: ValidationService,
-    private logService: LogService,
+    protected logService: LogService,
     protected userNamePipe: UserNamePipe,
     protected dialogService: DialogService,
     protected organizationManagementPreferencesService: OrganizationManagementPreferencesService,
diff --git a/apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/bulk-collections-dialog.component.ts b/apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/bulk-collections-dialog.component.ts
index 147340e6a00..7c4e2156ffb 100644
--- a/apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/bulk-collections-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/bulk-collections-dialog/bulk-collections-dialog.component.ts
@@ -54,7 +54,6 @@ export enum BulkCollectionsDialogResult {
   imports: [SharedModule, AccessSelectorModule],
   selector: "app-bulk-collections-dialog",
   templateUrl: "bulk-collections-dialog.component.html",
-  standalone: true,
 })
 export class BulkCollectionsDialogComponent implements OnDestroy {
   protected readonly PermissionMode = PermissionMode;
diff --git a/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts b/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts
index 15ba10a0d59..3f26e03e203 100644
--- a/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts
@@ -12,7 +12,6 @@ const icon = svgIcon`<svg xmlns="http://www.w3.org/2000/svg" width="120" height=
 
 @Component({
   selector: "collection-access-restricted",
-  standalone: true,
   imports: [SharedModule, ButtonModule, NoItemsModule],
   template: `<bit-no-items [icon]="icon" class="tw-mt-2 tw-block">
     <span slot="title" class="tw-mt-4 tw-block">{{ "youDoNotHavePermissions" | i18n }}</span>
diff --git a/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts b/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts
index d8ace8acc56..728faaf66e2 100644
--- a/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/collection-badge/collection-name.badge.component.ts
@@ -10,7 +10,6 @@ import { GetCollectionNameFromIdPipe } from "../pipes";
 @Component({
   selector: "app-collection-badge",
   templateUrl: "collection-name-badge.component.html",
-  standalone: true,
   imports: [SharedModule, GetCollectionNameFromIdPipe],
 })
 export class CollectionNameBadgeComponent {
diff --git a/apps/web/src/app/admin-console/organizations/collections/pipes/get-collection-name.pipe.ts b/apps/web/src/app/admin-console/organizations/collections/pipes/get-collection-name.pipe.ts
index 8833ddfa382..b52719304b8 100644
--- a/apps/web/src/app/admin-console/organizations/collections/pipes/get-collection-name.pipe.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/pipes/get-collection-name.pipe.ts
@@ -5,7 +5,6 @@ import { CollectionView } from "@bitwarden/admin-console/common";
 @Pipe({
   name: "collectionNameFromId",
   pure: true,
-  standalone: true,
 })
 export class GetCollectionNameFromIdPipe implements PipeTransform {
   transform(value: string, collections: CollectionView[]) {
diff --git a/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.component.ts
index f7d7acfdc2d..49bf43d60bf 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.component.ts
@@ -11,6 +11,7 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
 import { VaultFilterComponent as BaseVaultFilterComponent } from "../../../../vault/individual-vault/vault-filter/components/vault-filter.component";
@@ -51,6 +52,7 @@ export class VaultFilterComponent
     protected dialogService: DialogService,
     protected configService: ConfigService,
     protected accountService: AccountService,
+    protected restrictedItemTypesService: RestrictedItemTypesService,
   ) {
     super(
       vaultFilterService,
@@ -62,6 +64,7 @@ export class VaultFilterComponent
       dialogService,
       configService,
       accountService,
+      restrictedItemTypesService,
     );
   }
 
diff --git a/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.service.ts b/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.service.ts
index f4b6f41fab6..dc05248d7ba 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.service.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/vault-filter/vault-filter.service.ts
@@ -5,6 +5,7 @@ import { CollectionAdminView, CollectionService } from "@bitwarden/admin-console
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -34,6 +35,7 @@ export class VaultFilterService extends BaseVaultFilterService implements OnDest
     stateProvider: StateProvider,
     collectionService: CollectionService,
     accountService: AccountService,
+    configService: ConfigService,
   ) {
     super(
       organizationService,
@@ -44,6 +46,7 @@ export class VaultFilterService extends BaseVaultFilterService implements OnDest
       stateProvider,
       collectionService,
       accountService,
+      configService,
     );
   }
 
diff --git a/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts
index 4c129e325c5..b343d5874bc 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.ts
@@ -35,7 +35,6 @@ import {
 import { CollectionDialogTabType } from "../../shared/components/collection-dialog";
 
 @Component({
-  standalone: true,
   selector: "app-org-vault-header",
   templateUrl: "./vault-header.component.html",
   imports: [
diff --git a/apps/web/src/app/admin-console/organizations/collections/vault.component.html b/apps/web/src/app/admin-console/organizations/collections/vault.component.html
index e8782ca0f2d..ddfcda04c76 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault.component.html
+++ b/apps/web/src/app/admin-console/organizations/collections/vault.component.html
@@ -1,14 +1,14 @@
-<app-free-trial-warning
+<app-organization-free-trial-warning
   *ngIf="useOrganizationWarningsService$ | async"
   [organization]="organization"
   (clicked)="navigateToPaymentMethod()"
 >
-</app-free-trial-warning>
-<app-reseller-renewal-warning
+</app-organization-free-trial-warning>
+<app-organization-reseller-renewal-warning
   *ngIf="useOrganizationWarningsService$ | async"
   [organization]="organization"
 >
-</app-reseller-renewal-warning>
+</app-organization-reseller-renewal-warning>
 <ng-container *ngIf="freeTrialWhenWarningsServiceDisabled$ | async as freeTrial">
   <bit-banner
     id="free-trial-banner"
diff --git a/apps/web/src/app/admin-console/organizations/collections/vault.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault.component.ts
index a3b62838d6a..197fc0ada0f 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/vault.component.ts
@@ -35,7 +35,6 @@ import {
 import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
@@ -55,6 +54,7 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { CipherId, CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
@@ -78,8 +78,8 @@ import {
   DecryptionFailureDialogComponent,
   PasswordRepromptService,
 } from "@bitwarden/vault";
-import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/services/organization-warnings.service";
-import { ResellerRenewalWarningComponent } from "@bitwarden/web-vault/app/billing/warnings/reseller-renewal-warning.component";
+import { OrganizationResellerRenewalWarningComponent } from "@bitwarden/web-vault/app/billing/warnings/components/organization-reseller-renewal-warning.component";
+import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/warnings/services/organization-warnings.service";
 
 import { BillingNotificationService } from "../../../billing/services/billing-notification.service";
 import {
@@ -88,7 +88,7 @@ import {
 } from "../../../billing/services/reseller-warning.service";
 import { TrialFlowService } from "../../../billing/services/trial-flow.service";
 import { FreeTrial } from "../../../billing/types/free-trial";
-import { FreeTrialWarningComponent } from "../../../billing/warnings/free-trial-warning.component";
+import { OrganizationFreeTrialWarningComponent } from "../../../billing/warnings/components/organization-free-trial-warning.component";
 import { SharedModule } from "../../../shared";
 import { AssignCollectionsWebComponent } from "../../../vault/components/assign-collections";
 import {
@@ -125,7 +125,7 @@ import {
   BulkCollectionsDialogResult,
 } from "./bulk-collections-dialog";
 import { CollectionAccessRestrictedComponent } from "./collection-access-restricted.component";
-import { getNestedCollectionTree, getFlatCollectionTree } from "./utils";
+import { getFlatCollectionTree, getNestedCollectionTree } from "./utils";
 import { VaultFilterModule } from "./vault-filter/vault-filter.module";
 import { VaultHeaderComponent } from "./vault-header/vault-header.component";
 
@@ -140,7 +140,6 @@ enum AddAccessStatusType {
 }
 
 @Component({
-  standalone: true,
   selector: "app-org-vault",
   templateUrl: "vault.component.html",
   imports: [
@@ -151,8 +150,8 @@ enum AddAccessStatusType {
     SharedModule,
     BannerModule,
     NoItemsModule,
-    FreeTrialWarningComponent,
-    ResellerRenewalWarningComponent,
+    OrganizationFreeTrialWarningComponent,
+    OrganizationResellerRenewalWarningComponent,
   ],
   providers: [
     RoutedVaultFilterService,
@@ -750,10 +749,13 @@ export class VaultComponent implements OnInit, OnDestroy {
   }
 
   async navigateToPaymentMethod() {
-    await this.router.navigate(
-      ["organizations", `${this.organization?.id}`, "billing", "payment-method"],
-      { state: { launchPaymentModalAutomatically: true } },
+    const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
+      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
     );
+    const route = managePaymentDetailsOutsideCheckout ? "payment-details" : "payment-method";
+    await this.router.navigate(["organizations", `${this.organization?.id}`, "billing", route], {
+      state: { launchPaymentModalAutomatically: true },
+    });
   }
 
   addAccessToggle(e: AddAccessStatusType) {
@@ -1066,6 +1068,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     if (unassignedCiphers.length > 0 || editAccessCiphers.length > 0) {
       await this.cipherService.restoreManyWithServer(
         [...unassignedCiphers, ...editAccessCiphers],
+        this.userId,
         this.organization.id,
       );
     }
@@ -1136,10 +1139,11 @@ export class VaultComponent implements OnInit, OnDestroy {
         message: this.i18nService.t("deletedCollectionId", collection.name),
       });
 
+      // Clear the cipher cache to clear the deleted collection from the cipher state
+      await this.cipherService.clear();
+
       // Navigate away if we deleted the collection we were viewing
       if (this.selectedCollection?.node.id === collection.id) {
-        // Clear the cipher cache to clear the deleted collection from the cipher state
-        await this.cipherService.clear();
         void this.router.navigate([], {
           queryParams: { collectionId: this.selectedCollection.parent?.node.id ?? null },
           queryParamsHandling: "merge",
diff --git a/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts b/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts
index 80c12af8522..e6a62b1db73 100644
--- a/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts
+++ b/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts
@@ -22,7 +22,6 @@ import { Integration } from "../shared/components/integrations/models";
 @Component({
   selector: "ac-integrations",
   templateUrl: "./integrations.component.html",
-  standalone: true,
   imports: [
     SharedModule,
     SharedOrganizationModule,
diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
index f991678e834..cbb4e1cf064 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
@@ -4,7 +4,7 @@
     <org-switcher [filter]="orgFilter" [hideNewButton]="hideNewOrgButton$ | async"></org-switcher>
     <bit-nav-group
       icon="bwi-filter"
-      *ngIf="organization.useRiskInsights"
+      *ngIf="organization.useRiskInsights && organization.canAccessReports"
       [text]="'accessIntelligence' | i18n"
       route="access-intelligence"
     >
@@ -74,7 +74,11 @@
     >
       <bit-nav-item [text]="'subscription' | i18n" route="billing/subscription"></bit-nav-item>
       <ng-container *ngIf="(showPaymentAndHistory$ | async) && (organizationIsUnmanaged$ | async)">
-        <bit-nav-item [text]="'paymentMethod' | i18n" route="billing/payment-method"></bit-nav-item>
+        @let paymentDetailsPageData = paymentDetailsPageData$ | async;
+        <bit-nav-item
+          [text]="paymentDetailsPageData.textKey | i18n"
+          [route]="paymentDetailsPageData.route"
+        ></bit-nav-item>
         <bit-nav-item [text]="'billingHistory' | i18n" route="billing/history"></bit-nav-item>
       </ng-container>
     </bit-nav-group>
diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
index 726832b478a..89f62ed8975 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
@@ -27,17 +27,15 @@ import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { getById } from "@bitwarden/common/platform/misc";
-import { BannerModule, IconModule } from "@bitwarden/components";
+import { BannerModule, IconModule, AdminConsoleLogo } from "@bitwarden/components";
 
 import { FreeFamiliesPolicyService } from "../../../billing/services/free-families-policy.service";
 import { OrgSwitcherComponent } from "../../../layouts/org-switcher/org-switcher.component";
 import { WebLayoutModule } from "../../../layouts/web-layout.module";
-import { AdminConsoleLogo } from "../../icons/admin-console-logo";
 
 @Component({
   selector: "app-organization-layout",
   templateUrl: "organization-layout.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     RouterModule,
@@ -66,6 +64,11 @@ export class OrganizationLayoutComponent implements OnInit {
   protected showSponsoredFamiliesDropdown$: Observable<boolean>;
   protected canShowPoliciesTab$: Observable<boolean>;
 
+  protected paymentDetailsPageData$: Observable<{
+    route: string;
+    textKey: string;
+  }>;
+
   constructor(
     private route: ActivatedRoute,
     private organizationService: OrganizationService,
@@ -137,6 +140,16 @@ export class OrganizationLayoutComponent implements OnInit {
           ),
       ),
     );
+
+    this.paymentDetailsPageData$ = this.configService
+      .getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout)
+      .pipe(
+        map((managePaymentDetailsOutsideCheckout) =>
+          managePaymentDetailsOutsideCheckout
+            ? { route: "billing/payment-details", textKey: "paymentDetails" }
+            : { route: "billing/payment-method", textKey: "paymentMethod" },
+        ),
+      );
   }
 
   canShowVaultTab(organization: Organization): boolean {
diff --git a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
index 4eab2969fff..10f68695e88 100644
--- a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
@@ -38,7 +38,6 @@ export interface EntityEventsDialogParams {
 @Component({
   imports: [SharedModule],
   templateUrl: "entity-events.component.html",
-  standalone: true,
 })
 export class EntityEventsComponent implements OnInit, OnDestroy {
   loading = true;
diff --git a/apps/web/src/app/admin-console/organizations/manage/groups.component.html b/apps/web/src/app/admin-console/organizations/manage/groups.component.html
index caae23f500d..4518513ba7d 100644
--- a/apps/web/src/app/admin-console/organizations/manage/groups.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/groups.component.html
@@ -22,7 +22,7 @@
   <p *ngIf="!dataSource.filteredData.length">{{ "noGroupsInList" | i18n }}</p>
   <!-- The padding on the bottom of the cdk-virtual-scroll-viewport element is required to prevent table row content
   from overflowing the <main> element. -->
-  <cdk-virtual-scroll-viewport scrollWindow [itemSize]="rowHeight" class="tw-pb-8">
+  <cdk-virtual-scroll-viewport bitScrollLayout [itemSize]="rowHeight" class="tw-pb-8">
     <bit-table *ngIf="dataSource.filteredData.length" [dataSource]="dataSource">
       <ng-container header>
         <tr>
diff --git a/apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.ts b/apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.ts
index 6dcdff00160..f88eb82e529 100644
--- a/apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.ts
@@ -14,7 +14,6 @@ import { SharedModule } from "../../../shared/shared.module";
 
 @Component({
   templateUrl: "verify-recover-delete-org.component.html",
-  standalone: true,
   imports: [SharedModule],
 })
 export class VerifyRecoverDeleteOrgComponent implements OnInit {
diff --git a/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.html
new file mode 100644
index 00000000000..7fa063364e3
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.html
@@ -0,0 +1,21 @@
+<bit-dialog [title]="'recoverAccount' | i18n" [subtitle]="dialogData.name">
+  <ng-container bitDialogContent>
+    <bit-callout type="warning"
+      >{{ "resetPasswordLoggedOutWarning" | i18n: loggedOutWarningName }}
+    </bit-callout>
+
+    <auth-input-password
+      [flow]="inputPasswordFlow"
+      [masterPasswordPolicyOptions]="masterPasswordPolicyOptions$ | async"
+    ></auth-input-password>
+  </ng-container>
+
+  <ng-container bitDialogFooter>
+    <button type="button" bitButton buttonType="primary" [bitAction]="handlePrimaryButtonClick">
+      {{ "save" | i18n }}
+    </button>
+    <button type="button" bitButton buttonType="secondary" bitDialogClose>
+      {{ "cancel" | i18n }}
+    </button>
+  </ng-container>
+</bit-dialog>
diff --git a/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.ts
new file mode 100644
index 00000000000..3240b8d707a
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/components/account-recovery/account-recovery-dialog.component.ts
@@ -0,0 +1,146 @@
+import { CommonModule } from "@angular/common";
+import { Component, Inject, ViewChild } from "@angular/core";
+import { switchMap } from "rxjs";
+
+import { InputPasswordComponent, InputPasswordFlow } from "@bitwarden/auth/angular";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import {
+  AsyncActionsModule,
+  ButtonModule,
+  CalloutModule,
+  DIALOG_DATA,
+  DialogConfig,
+  DialogModule,
+  DialogRef,
+  DialogService,
+  ToastService,
+} from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+
+import { OrganizationUserResetPasswordService } from "../../services/organization-user-reset-password/organization-user-reset-password.service";
+
+/**
+ * Encapsulates a few key data inputs needed to initiate an account recovery
+ * process for the organization user in question.
+ */
+export type AccountRecoveryDialogData = {
+  /**
+   * The organization user's full name
+   */
+  name: string;
+
+  /**
+   * The organization user's email address
+   */
+  email: string;
+
+  /**
+   * The `organizationUserId` for the user
+   */
+  organizationUserId: string;
+
+  /**
+   * The organization's `organizationId`
+   */
+  organizationId: OrganizationId;
+};
+
+export const AccountRecoveryDialogResultType = {
+  Ok: "ok",
+} as const;
+
+export type AccountRecoveryDialogResultType =
+  (typeof AccountRecoveryDialogResultType)[keyof typeof AccountRecoveryDialogResultType];
+
+/**
+ * Used in a dialog for initiating the account recovery process against a
+ * given organization user. An admin will access this form when they want to
+ * reset a user's password and log them out of sessions.
+ */
+@Component({
+  standalone: true,
+  selector: "app-account-recovery-dialog",
+  templateUrl: "account-recovery-dialog.component.html",
+  imports: [
+    AsyncActionsModule,
+    ButtonModule,
+    CalloutModule,
+    CommonModule,
+    DialogModule,
+    I18nPipe,
+    InputPasswordComponent,
+  ],
+})
+export class AccountRecoveryDialogComponent {
+  @ViewChild(InputPasswordComponent)
+  inputPasswordComponent: InputPasswordComponent | undefined = undefined;
+
+  masterPasswordPolicyOptions$ = this.accountService.activeAccount$.pipe(
+    getUserId,
+    switchMap((userId) => this.policyService.masterPasswordPolicyOptions$(userId)),
+  );
+
+  inputPasswordFlow = InputPasswordFlow.ChangePasswordDelegation;
+
+  get loggedOutWarningName() {
+    return this.dialogData.name != null ? this.dialogData.name : this.i18nService.t("thisUser");
+  }
+
+  constructor(
+    @Inject(DIALOG_DATA) protected dialogData: AccountRecoveryDialogData,
+    private accountService: AccountService,
+    private dialogRef: DialogRef<AccountRecoveryDialogResultType>,
+    private i18nService: I18nService,
+    private policyService: PolicyService,
+    private resetPasswordService: OrganizationUserResetPasswordService,
+    private toastService: ToastService,
+  ) {}
+
+  handlePrimaryButtonClick = async () => {
+    if (!this.inputPasswordComponent) {
+      throw new Error("InputPasswordComponent is not initialized");
+    }
+
+    const passwordInputResult = await this.inputPasswordComponent.submit();
+    if (!passwordInputResult) {
+      return;
+    }
+
+    await this.resetPasswordService.resetMasterPassword(
+      passwordInputResult.newPassword,
+      this.dialogData.email,
+      this.dialogData.organizationUserId,
+      this.dialogData.organizationId,
+    );
+
+    this.toastService.showToast({
+      variant: "success",
+      title: "",
+      message: this.i18nService.t("resetPasswordSuccess"),
+    });
+
+    this.dialogRef.close(AccountRecoveryDialogResultType.Ok);
+  };
+
+  /**
+   * Strongly typed helper to open an `AccountRecoveryDialogComponent`
+   * @param dialogService Instance of the dialog service that will be used to open the dialog
+   * @param dialogConfig Configuration for the dialog
+   */
+  static open = (
+    dialogService: DialogService,
+    dialogConfig: DialogConfig<
+      AccountRecoveryDialogData,
+      DialogRef<AccountRecoveryDialogResultType, unknown>
+    >,
+  ) => {
+    return dialogService.open<AccountRecoveryDialogResultType, AccountRecoveryDialogData>(
+      AccountRecoveryDialogComponent,
+      dialogConfig,
+    );
+  };
+}
diff --git a/apps/web/src/app/admin-console/organizations/members/components/account-recovery/index.ts b/apps/web/src/app/admin-console/organizations/members/components/account-recovery/index.ts
new file mode 100644
index 00000000000..e15fb7b40ef
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/components/account-recovery/index.ts
@@ -0,0 +1 @@
+export * from "./account-recovery-dialog.component";
diff --git a/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts b/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts
index 80f0745f6d5..961d5482d8a 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts
@@ -13,6 +13,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import {
   DIALOG_DATA,
   DialogConfig,
@@ -47,7 +48,7 @@ export type ResetPasswordDialogData = {
   /**
    * The organization's `organizationId`
    */
-  organizationId: string;
+  organizationId: OrganizationId;
 };
 
 // FIXME: update to use a const object instead of a typescript enum
@@ -56,16 +57,18 @@ export enum ResetPasswordDialogResult {
   Ok = "ok",
 }
 
+/**
+ * Used in a dialog for initiating the account recovery process against a
+ * given organization user. An admin will access this form when they want to
+ * reset a user's password and log them out of sessions.
+ *
+ * @deprecated Use the `AccountRecoveryDialogComponent` instead.
+ */
 @Component({
   selector: "app-reset-password",
   templateUrl: "reset-password.component.html",
   standalone: false,
 })
-/**
- * Used in a dialog for initiating the account recovery process against a
- * given organization user. An admin will access this form when they want to
- * reset a user's password and log them out of sessions.
- */
 export class ResetPasswordComponent implements OnInit, OnDestroy {
   formGroup = this.formBuilder.group({
     newPassword: ["", Validators.required],
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.html b/apps/web/src/app/admin-console/organizations/members/members.component.html
index 610821cfd1b..962191021e8 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.html
@@ -75,7 +75,7 @@
     </bit-callout>
     <!-- The padding on the bottom of the cdk-virtual-scroll-viewport element is required to prevent table row content
     from overflowing the <main> element. -->
-    <cdk-virtual-scroll-viewport scrollWindow [itemSize]="rowHeight" class="tw-pb-8">
+    <cdk-virtual-scroll-viewport bitScrollLayout [itemSize]="rowHeight" class="tw-pb-8">
       <bit-table [dataSource]="dataSource">
         <ng-container header>
           <tr>
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.ts b/apps/web/src/app/admin-console/organizations/members/members.component.ts
index e5a94bc4b4f..0247a8c881b 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.ts
@@ -52,6 +52,7 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService, SimpleDialogOptions, ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
@@ -66,6 +67,10 @@ import { GroupApiService } from "../core";
 import { OrganizationUserView } from "../core/views/organization-user.view";
 import { openEntityEventsDialog } from "../manage/entity-events.component";
 
+import {
+  AccountRecoveryDialogComponent,
+  AccountRecoveryDialogResultType,
+} from "./components/account-recovery/account-recovery-dialog.component";
 import { BulkConfirmDialogComponent } from "./components/bulk/bulk-confirm-dialog.component";
 import { BulkDeleteDialogComponent } from "./components/bulk/bulk-delete-dialog.component";
 import { BulkEnableSecretsManagerDialogComponent } from "./components/bulk/bulk-enable-sm-dialog.component";
@@ -83,6 +88,7 @@ import {
   ResetPasswordDialogResult,
 } from "./components/reset-password.component";
 import { DeleteManagedMemberWarningService } from "./services/delete-managed-member/delete-managed-member-warning.service";
+import { OrganizationUserService } from "./services/organization-user/organization-user.service";
 
 class MembersTableDataSource extends PeopleTableDataSource<OrganizationUserView> {
   protected statusType = OrganizationUserStatusType;
@@ -110,8 +116,10 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
   protected rowHeight = 69;
   protected rowHeightClass = `tw-h-[69px]`;
 
+  private organizationUsersCount = 0;
+
   get occupiedSeatCount(): number {
-    return this.dataSource.activeUserCount;
+    return this.organizationUsersCount;
   }
 
   constructor(
@@ -139,6 +147,7 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
     private billingApiService: BillingApiServiceAbstraction,
     protected deleteManagedMemberWarningService: DeleteManagedMemberWarningService,
     private configService: ConfigService,
+    private organizationUserService: OrganizationUserService,
   ) {
     super(
       apiService,
@@ -218,6 +227,7 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
           );
 
           this.orgIsOnSecretsManagerStandalone = billingMetadata.isOnSecretsManagerStandalone;
+          this.organizationUsersCount = billingMetadata.organizationOccupiedSeats;
 
           await this.load();
 
@@ -238,10 +248,13 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
     const separateCustomRolePermissionsEnabled$ = this.configService.getFeatureFlag$(
       FeatureFlag.SeparateCustomRolePermissions,
     );
-    this.showUserManagementControls$ = separateCustomRolePermissionsEnabled$.pipe(
+    this.showUserManagementControls$ = combineLatest([
+      separateCustomRolePermissionsEnabled$,
+      organization$,
+    ]).pipe(
       map(
-        (separateCustomRolePermissionsEnabled) =>
-          !separateCustomRolePermissionsEnabled || this.organization.canManageUsers,
+        ([separateCustomRolePermissionsEnabled, organization]) =>
+          !separateCustomRolePermissionsEnabled || organization.canManageUsers,
       ),
     );
   }
@@ -324,15 +337,23 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
   }
 
   async confirmUser(user: OrganizationUserView, publicKey: Uint8Array): Promise<void> {
-    const orgKey = await this.keyService.getOrgKey(this.organization.id);
-    const key = await this.encryptService.encapsulateKeyUnsigned(orgKey, publicKey);
-    const request = new OrganizationUserConfirmRequest();
-    request.key = key.encryptedString;
-    await this.organizationUserApiService.postOrganizationUserConfirm(
-      this.organization.id,
-      user.id,
-      request,
-    );
+    if (
+      await firstValueFrom(this.configService.getFeatureFlag$(FeatureFlag.CreateDefaultLocation))
+    ) {
+      await firstValueFrom(
+        this.organizationUserService.confirmUser(this.organization, user, publicKey),
+      );
+    } else {
+      const orgKey = await this.keyService.getOrgKey(this.organization.id);
+      const key = await this.encryptService.encapsulateKeyUnsigned(orgKey, publicKey);
+      const request = new OrganizationUserConfirmRequest();
+      request.key = key.encryptedString;
+      await this.organizationUserApiService.postOrganizationUserConfirm(
+        this.organization.id,
+        user.id,
+        request,
+      );
+    }
   }
 
   async revoke(user: OrganizationUserView) {
@@ -735,11 +756,44 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
   }
 
   async resetPassword(user: OrganizationUserView) {
+    const changePasswordRefactorFlag = await this.configService.getFeatureFlag(
+      FeatureFlag.PM16117_ChangeExistingPasswordRefactor,
+    );
+
+    if (changePasswordRefactorFlag) {
+      if (!user || !user.email || !user.id) {
+        this.toastService.showToast({
+          variant: "error",
+          title: this.i18nService.t("errorOccurred"),
+          message: this.i18nService.t("orgUserDetailsNotFound"),
+        });
+        this.logService.error("Org user details not found when attempting account recovery");
+
+        return;
+      }
+
+      const dialogRef = AccountRecoveryDialogComponent.open(this.dialogService, {
+        data: {
+          name: this.userNamePipe.transform(user),
+          email: user.email,
+          organizationId: this.organization.id as OrganizationId,
+          organizationUserId: user.id,
+        },
+      });
+
+      const result = await lastValueFrom(dialogRef.closed);
+      if (result === AccountRecoveryDialogResultType.Ok) {
+        await this.load();
+      }
+
+      return;
+    }
+
     const dialogRef = ResetPasswordComponent.open(this.dialogService, {
       data: {
         name: this.userNamePipe.transform(user),
         email: user != null ? user.email : null,
-        organizationId: this.organization.id,
+        organizationId: this.organization.id as OrganizationId,
         id: user != null ? user.id : null,
       },
     });
diff --git a/apps/web/src/app/admin-console/organizations/members/members.module.ts b/apps/web/src/app/admin-console/organizations/members/members.module.ts
index 81697f8c845..98431758d2f 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.module.ts
+++ b/apps/web/src/app/admin-console/organizations/members/members.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from "@angular/core";
 
 import { PasswordStrengthV2Component } from "@bitwarden/angular/tools/password-strength/password-strength-v2.component";
 import { PasswordCalloutComponent } from "@bitwarden/auth/angular";
+import { ScrollLayoutDirective } from "@bitwarden/components";
 
 import { LooseComponentsModule } from "../../../shared";
 import { SharedOrganizationModule } from "../shared";
@@ -27,6 +28,7 @@ import { MembersComponent } from "./members.component";
     PasswordCalloutComponent,
     ScrollingModule,
     PasswordStrengthV2Component,
+    ScrollLayoutDirective,
   ],
   declarations: [
     BulkConfirmDialogComponent,
diff --git a/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts b/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts
index ecf4d26eb52..d54e12c0ee7 100644
--- a/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts
+++ b/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts
@@ -14,7 +14,7 @@ import { EncryptService } from "@bitwarden/common/key-management/crypto/abstract
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncryptedString, EncString } from "@bitwarden/common/platform/models/domain/enc-string";
-import { UserId } from "@bitwarden/common/types/guid";
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { UserKey } from "@bitwarden/common/types/key";
 import {
   Argon2KdfConfig,
@@ -96,7 +96,7 @@ export class OrganizationUserResetPasswordService
     newMasterPassword: string,
     email: string,
     orgUserId: string,
-    orgId: string,
+    orgId: OrganizationId,
   ): Promise<void> {
     const response = await this.organizationUserApiService.getOrganizationUserResetPasswordDetails(
       orgId,
diff --git a/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.ts b/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.ts
new file mode 100644
index 00000000000..79efeebca2a
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.ts
@@ -0,0 +1,69 @@
+import { Injectable } from "@angular/core";
+import { combineLatest, filter, map, Observable, switchMap } from "rxjs";
+
+import {
+  OrganizationUserConfirmRequest,
+  OrganizationUserApiService,
+} from "@bitwarden/admin-console/common";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import { KeyService } from "@bitwarden/key-management";
+
+import { OrganizationUserView } from "../../../core/views/organization-user.view";
+
+@Injectable({
+  providedIn: "root",
+})
+export class OrganizationUserService {
+  constructor(
+    protected keyService: KeyService,
+    private encryptService: EncryptService,
+    private organizationUserApiService: OrganizationUserApiService,
+    private accountService: AccountService,
+    private i18nService: I18nService,
+  ) {}
+
+  private orgKey$(organization: Organization) {
+    return this.accountService.activeAccount$.pipe(
+      getUserId,
+      switchMap((userId) => this.keyService.orgKeys$(userId)),
+      filter((orgKeys) => !!orgKeys),
+      map((organizationKeysById) => organizationKeysById[organization.id as OrganizationId]),
+    );
+  }
+
+  confirmUser(
+    organization: Organization,
+    user: OrganizationUserView,
+    publicKey: Uint8Array,
+  ): Observable<void> {
+    const encryptedCollectionName$ = this.orgKey$(organization).pipe(
+      switchMap((orgKey) =>
+        this.encryptService.encryptString(this.i18nService.t("myItems"), orgKey),
+      ),
+    );
+
+    const encryptedKey$ = this.orgKey$(organization).pipe(
+      switchMap((orgKey) => this.encryptService.encapsulateKeyUnsigned(orgKey, publicKey)),
+    );
+
+    return combineLatest([encryptedKey$, encryptedCollectionName$]).pipe(
+      switchMap(([key, collectionName]) => {
+        const request: OrganizationUserConfirmRequest = {
+          key: key.encryptedString,
+          defaultUserCollectionName: collectionName.encryptedString,
+        };
+
+        return this.organizationUserApiService.postOrganizationUserConfirm(
+          organization.id,
+          user.id,
+          request,
+        );
+      }),
+    );
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts
index 4d8971f74fd..ab32a0b1eef 100644
--- a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts
+++ b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts
@@ -17,7 +17,6 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { deepLinkGuard } from "../../auth/guards/deep-link/deep-link.guard";
 
 import { VaultModule } from "./collections/vault.module";
-import { isEnterpriseOrgGuard } from "./guards/is-enterprise-org.guard";
 import { organizationPermissionsGuard } from "./guards/org-permissions.guard";
 import { organizationRedirectGuard } from "./guards/org-redirect.guard";
 import { AdminConsoleIntegrationsComponent } from "./integrations/integrations.component";
@@ -42,10 +41,7 @@ const routes: Routes = [
       },
       {
         path: "integrations",
-        canActivate: [
-          isEnterpriseOrgGuard(false),
-          organizationPermissionsGuard(canAccessIntegrations),
-        ],
+        canActivate: [organizationPermissionsGuard(canAccessIntegrations)],
         component: AdminConsoleIntegrationsComponent,
         data: {
           titleId: "integrations",
diff --git a/apps/web/src/app/admin-console/organizations/organization.module.ts b/apps/web/src/app/admin-console/organizations/organization.module.ts
index 459948d0f13..687361760c9 100644
--- a/apps/web/src/app/admin-console/organizations/organization.module.ts
+++ b/apps/web/src/app/admin-console/organizations/organization.module.ts
@@ -1,6 +1,8 @@
 import { ScrollingModule } from "@angular/cdk/scrolling";
 import { NgModule } from "@angular/core";
 
+import { ScrollLayoutDirective } from "@bitwarden/components";
+
 import { LooseComponentsModule } from "../../shared";
 
 import { CoreOrganizationModule } from "./core";
@@ -18,6 +20,7 @@ import { AccessSelectorModule } from "./shared/components/access-selector";
     OrganizationsRoutingModule,
     LooseComponentsModule,
     ScrollingModule,
+    ScrollLayoutDirective,
   ],
   declarations: [GroupsComponent, GroupAddEditComponent],
 })
diff --git a/apps/web/src/app/admin-console/organizations/policies/index.ts b/apps/web/src/app/admin-console/organizations/policies/index.ts
index 20137105993..828aa8230fa 100644
--- a/apps/web/src/app/admin-console/organizations/policies/index.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/index.ts
@@ -3,7 +3,7 @@ export { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 export { DisableSendPolicy } from "./disable-send.component";
 export { MasterPasswordPolicy } from "./master-password.component";
 export { PasswordGeneratorPolicy } from "./password-generator.component";
-export { PersonalOwnershipPolicy } from "./personal-ownership.component";
+export { OrganizationDataOwnershipPolicy } from "./organization-data-ownership.component";
 export { RequireSsoPolicy } from "./require-sso.component";
 export { ResetPasswordPolicy } from "./reset-password.component";
 export { SendOptionsPolicy } from "./send-options.component";
@@ -11,3 +11,4 @@ export { SingleOrgPolicy } from "./single-org.component";
 export { TwoFactorAuthenticationPolicy } from "./two-factor-authentication.component";
 export { PoliciesComponent } from "./policies.component";
 export { RemoveUnlockWithPinPolicy } from "./remove-unlock-with-pin.component";
+export { RestrictedItemTypesPolicy } from "./restricted-item-types.component";
diff --git a/apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.html b/apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.html
similarity index 100%
rename from apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.html
rename to apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.html
diff --git a/apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.ts b/apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.ts
new file mode 100644
index 00000000000..1c1710f7662
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.ts
@@ -0,0 +1,19 @@
+import { Component } from "@angular/core";
+
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+
+import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+
+export class OrganizationDataOwnershipPolicy extends BasePolicy {
+  name = "organizationDataOwnership";
+  description = "personalOwnershipPolicyDesc";
+  type = PolicyType.OrganizationDataOwnership;
+  component = OrganizationDataOwnershipPolicyComponent;
+}
+
+@Component({
+  selector: "policy-organization-data-ownership",
+  templateUrl: "organization-data-ownership.component.html",
+  standalone: false,
+})
+export class OrganizationDataOwnershipPolicyComponent extends BasePolicyComponent {}
diff --git a/apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.ts b/apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.ts
deleted file mode 100644
index ef92ee90581..00000000000
--- a/apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Component } from "@angular/core";
-
-import { PolicyType } from "@bitwarden/common/admin-console/enums";
-
-import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
-
-export class PersonalOwnershipPolicy extends BasePolicy {
-  name = "personalOwnership";
-  description = "personalOwnershipPolicyDesc";
-  type = PolicyType.PersonalOwnership;
-  component = PersonalOwnershipPolicyComponent;
-}
-
-@Component({
-  selector: "policy-personal-ownership",
-  templateUrl: "personal-ownership.component.html",
-  standalone: false,
-})
-export class PersonalOwnershipPolicyComponent extends BasePolicyComponent {}
diff --git a/apps/web/src/app/admin-console/organizations/policies/policies.component.ts b/apps/web/src/app/admin-console/organizations/policies/policies.component.ts
index 73f0d99b4f9..8b6894871bd 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policies.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policies.component.ts
@@ -15,6 +15,8 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { DialogService } from "@bitwarden/components";
 import {
   ChangePlanDialogResultType,
@@ -23,7 +25,7 @@ import {
 import { All } from "@bitwarden/web-vault/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model";
 
 import { PolicyListService } from "../../core/policy-list.service";
-import { BasePolicy } from "../policies";
+import { BasePolicy, RestrictedItemTypesPolicy } from "../policies";
 import { CollectionDialogTabType } from "../shared/components/collection-dialog";
 
 import { PolicyEditComponent, PolicyEditDialogResult } from "./policy-edit.component";
@@ -51,6 +53,7 @@ export class PoliciesComponent implements OnInit {
     private policyListService: PolicyListService,
     private organizationBillingService: OrganizationBillingServiceAbstraction,
     private dialogService: DialogService,
+    private configService: ConfigService,
   ) {}
 
   async ngOnInit() {
@@ -91,6 +94,12 @@ export class PoliciesComponent implements OnInit {
   }
 
   async load() {
+    if (
+      (await this.configService.getFeatureFlag(FeatureFlag.RemoveCardItemTypePolicy)) &&
+      this.policyListService.getPolicies().every((p) => !(p instanceof RestrictedItemTypesPolicy))
+    ) {
+      this.policyListService.addPolicies([new RestrictedItemTypesPolicy()]);
+    }
     const response = await this.policyApiService.getPolicies(this.organizationId);
     this.orgPolicies = response.data != null && response.data.length > 0 ? response.data : [];
     this.orgPolicies.forEach((op) => {
diff --git a/apps/web/src/app/admin-console/organizations/policies/policies.module.ts b/apps/web/src/app/admin-console/organizations/policies/policies.module.ts
index 1b8ec5089f9..3999f36ecad 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policies.module.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policies.module.ts
@@ -4,13 +4,14 @@ import { LooseComponentsModule, SharedModule } from "../../../shared";
 
 import { DisableSendPolicyComponent } from "./disable-send.component";
 import { MasterPasswordPolicyComponent } from "./master-password.component";
+import { OrganizationDataOwnershipPolicyComponent } from "./organization-data-ownership.component";
 import { PasswordGeneratorPolicyComponent } from "./password-generator.component";
-import { PersonalOwnershipPolicyComponent } from "./personal-ownership.component";
 import { PoliciesComponent } from "./policies.component";
 import { PolicyEditComponent } from "./policy-edit.component";
 import { RemoveUnlockWithPinPolicyComponent } from "./remove-unlock-with-pin.component";
 import { RequireSsoPolicyComponent } from "./require-sso.component";
 import { ResetPasswordPolicyComponent } from "./reset-password.component";
+import { RestrictedItemTypesPolicyComponent } from "./restricted-item-types.component";
 import { SendOptionsPolicyComponent } from "./send-options.component";
 import { SingleOrgPolicyComponent } from "./single-org.component";
 import { TwoFactorAuthenticationPolicyComponent } from "./two-factor-authentication.component";
@@ -21,7 +22,7 @@ import { TwoFactorAuthenticationPolicyComponent } from "./two-factor-authenticat
     DisableSendPolicyComponent,
     MasterPasswordPolicyComponent,
     PasswordGeneratorPolicyComponent,
-    PersonalOwnershipPolicyComponent,
+    OrganizationDataOwnershipPolicyComponent,
     RequireSsoPolicyComponent,
     ResetPasswordPolicyComponent,
     SendOptionsPolicyComponent,
@@ -30,12 +31,13 @@ import { TwoFactorAuthenticationPolicyComponent } from "./two-factor-authenticat
     PoliciesComponent,
     PolicyEditComponent,
     RemoveUnlockWithPinPolicyComponent,
+    RestrictedItemTypesPolicyComponent,
   ],
   exports: [
     DisableSendPolicyComponent,
     MasterPasswordPolicyComponent,
     PasswordGeneratorPolicyComponent,
-    PersonalOwnershipPolicyComponent,
+    OrganizationDataOwnershipPolicyComponent,
     RequireSsoPolicyComponent,
     ResetPasswordPolicyComponent,
     SendOptionsPolicyComponent,
diff --git a/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.html b/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.html
new file mode 100644
index 00000000000..8665cc1fa6a
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.html
@@ -0,0 +1,6 @@
+<bit-form-control>
+  <input type="checkbox" bitCheckbox [formControl]="enabled" id="enabled" />
+  <bit-label>{{ "turnOn" | i18n }}</bit-label>
+</bit-form-control>
+<!-- To allow for multiple item types we can add a data formGroup, iterate over the
+ cipher types as checkboxes/multi-select and use that as a means to track which types are restricted -->
diff --git a/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.ts b/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.ts
new file mode 100644
index 00000000000..1bee5583718
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.ts
@@ -0,0 +1,23 @@
+import { Component } from "@angular/core";
+
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+
+import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+
+export class RestrictedItemTypesPolicy extends BasePolicy {
+  name = "restrictedItemTypePolicy";
+  description = "restrictedItemTypePolicyDesc";
+  type = PolicyType.RestrictedItemTypes;
+  component = RestrictedItemTypesPolicyComponent;
+}
+
+@Component({
+  selector: "policy-restricted-item-types",
+  templateUrl: "restricted-item-types.component.html",
+  standalone: false,
+})
+export class RestrictedItemTypesPolicyComponent extends BasePolicyComponent {
+  constructor() {
+    super();
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.html b/apps/web/src/app/admin-console/organizations/settings/account.component.html
index e6064779ece..4ce4398aadc 100644
--- a/apps/web/src/app/admin-console/organizations/settings/account.component.html
+++ b/apps/web/src/app/admin-console/organizations/settings/account.component.html
@@ -70,7 +70,7 @@
       <bit-label>{{ "limitCollectionDeletionDesc" | i18n }}</bit-label>
       <input type="checkbox" bitCheckbox formControlName="limitCollectionDeletion" />
     </bit-form-control>
-    <bit-form-control *ngIf="limitItemDeletionFeatureFlagIsEnabled">
+    <bit-form-control>
       <bit-label>{{ "limitItemDeletionDescription" | i18n }}</bit-label>
       <input type="checkbox" bitCheckbox formControlName="limitItemDeletion" />
     </bit-form-control>
diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.ts b/apps/web/src/app/admin-console/organizations/settings/account.component.ts
index b376c48b39a..ecb2dbc54a2 100644
--- a/apps/web/src/app/admin-console/organizations/settings/account.component.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/account.component.ts
@@ -25,8 +25,6 @@ import { OrganizationUpdateRequest } from "@bitwarden/common/admin-console/model
 import { OrganizationResponse } from "@bitwarden/common/admin-console/models/response/organization.response";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -51,8 +49,6 @@ export class AccountComponent implements OnInit, OnDestroy {
   org: OrganizationResponse;
   taxFormPromise: Promise<unknown>;
 
-  limitItemDeletionFeatureFlagIsEnabled: boolean;
-
   // FormGroup validators taken from server Organization domain object
   protected formGroup = this.formBuilder.group({
     orgName: this.formBuilder.control(
@@ -95,17 +91,11 @@ export class AccountComponent implements OnInit, OnDestroy {
     private dialogService: DialogService,
     private formBuilder: FormBuilder,
     private toastService: ToastService,
-    private configService: ConfigService,
   ) {}
 
   async ngOnInit() {
     this.selfHosted = this.platformUtilsService.isSelfHost();
 
-    this.configService
-      .getFeatureFlag$(FeatureFlag.LimitItemDeletion)
-      .pipe(takeUntil(this.destroy$))
-      .subscribe((isAble) => (this.limitItemDeletionFeatureFlagIsEnabled = isAble));
-
     const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
     this.route.params
       .pipe(
diff --git a/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts b/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts
index e942eecbd37..1b41dc31a62 100644
--- a/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts
@@ -18,7 +18,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherType, toCipherTypeName } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import {
   DIALOG_DATA,
@@ -80,7 +80,6 @@ export enum DeleteOrganizationDialogResult {
 
 @Component({
   selector: "app-delete-organization",
-  standalone: true,
   imports: [SharedModule, UserVerificationModule],
   templateUrl: "delete-organization-dialog.component.html",
 })
@@ -163,7 +162,7 @@ export class DeleteOrganizationDialogComponent implements OnInit, OnDestroy {
         organizationContentSummary.itemCountByType.push(
           new OrganizationContentSummaryItem(
             count,
-            this.getOrganizationItemLocalizationKeysByType(CipherType[cipherType]),
+            this.getOrganizationItemLocalizationKeysByType(toCipherTypeName(cipherType)),
           ),
         );
       }
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html
index 4226862fde7..e9b7ba39aa5 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html
+++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html
@@ -1,22 +1,19 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable tailwindcss/no-custom-classname -->
 <div class="tw-flex" *ngIf="!hideMultiSelect">
-  <bit-form-field *ngIf="permissionMode == 'edit'" class="tw-mr-3 tw-shrink-0">
+  <bit-form-field *ngIf="permissionMode == 'edit'" class="tw-mr-3 tw-shrink-0 tw-basis-2/5">
     <bit-label>{{ "permission" | i18n }}</bit-label>
-    <select
+    <bit-select
       bitInput
       [disabled]="disabled"
       [(ngModel)]="initialPermission"
       [ngModelOptions]="{ standalone: true }"
-      (blur)="handleBlur()"
+      (closed)="handleBlur()"
     >
-      <option *ngFor="let p of permissionList" [value]="p.perm">
-        {{ p.labelId | i18n }}
-      </option>
-    </select>
+      <bit-option *ngFor="let p of permissionList" [value]="p.perm" [label]="p.labelId | i18n">
+      </bit-option>
+    </bit-select>
   </bit-form-field>
 
-  <bit-form-field class="tw-grow" *ngIf="!disabled">
+  <bit-form-field class="tw-grow tw-p-3" *ngIf="!disabled">
     <bit-label>{{ selectorLabelText }}</bit-label>
     <bit-multi-select
       class="tw-w-full"
@@ -51,7 +48,7 @@
       [formGroupName]="i"
       [ngClass]="{ 'tw-text-muted': item.readonly }"
     >
-      <td bitCell [ngSwitch]="item.type">
+      <td bitCell [ngSwitch]="item.type" class="tw-w-5/12">
         <div class="tw-flex tw-items-center" *ngSwitchCase="itemType.Member">
           <bit-avatar size="small" class="tw-mr-3" text="{{ item.labelName }}"></bit-avatar>
           <div class="tw-flex tw-flex-col">
@@ -79,28 +76,22 @@
 
       <td bitCell *ngIf="permissionMode != 'hidden'">
         <ng-container *ngIf="canEditItemPermission(item); else readOnlyPerm">
-          <label class="tw-sr-only" [for]="'permission' + i"
-            >{{ item.labelName }} {{ "permission" | i18n }}</label
-          >
-          <div class="tw-relative tw-inline-block">
-            <select
+          <bit-form-field>
+            <bit-label>{{ item.labelName }} {{ "permission" | i18n }}</bit-label>
+            <bit-select
               bitInput
-              class="tw-apperance-none -tw-ml-3 tw-max-w-40 tw-appearance-none tw-overflow-ellipsis !tw-rounded tw-border-transparent !tw-bg-transparent tw-pr-6 tw-font-bold hover:tw-border-primary-700"
               formControlName="permission"
               [id]="'permission' + i"
-              (blur)="handleBlur()"
+              (closed)="handleBlur()"
             >
-              <option *ngFor="let p of permissionList" [value]="p.perm">
-                {{ p.labelId | i18n }}
-              </option>
-            </select>
-            <label
-              [for]="'permission' + i"
-              class="tw-absolute tw-inset-y-0 tw-right-4 tw-mb-0 tw-flex tw-items-center"
-            >
-              <i class="bwi bwi-sm bwi-angle-down tw-leading-[0]"></i>
-            </label>
-          </div>
+              <bit-option
+                *ngFor="let p of permissionList"
+                [value]="p.perm"
+                [label]="p.labelId | i18n"
+              >
+              </bit-option>
+            </bit-select>
+          </bit-form-field>
         </ng-container>
 
         <ng-template #readOnlyPerm>
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.spec.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.spec.ts
index 86c348f0326..a5a632678c9 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.spec.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.spec.ts
@@ -14,6 +14,7 @@ import {
   ButtonModule,
   FormFieldModule,
   IconButtonModule,
+  SelectModule,
   TableModule,
   TabsModule,
 } from "@bitwarden/components";
@@ -71,6 +72,7 @@ describe("AccessSelectorComponent", () => {
         PreloadedEnglishI18nModule,
         JslibModule,
         IconButtonModule,
+        SelectModule,
       ],
       declarations: [TestableAccessSelectorComponent, UserTypePipe],
       providers: [],
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.stories.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.stories.ts
index 095be1df966..e98160d78d0 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.stories.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.stories.ts
@@ -10,6 +10,7 @@ import {
   DialogModule,
   FormFieldModule,
   IconButtonModule,
+  SelectModule,
   TableModule,
   TabsModule,
 } from "@bitwarden/components";
@@ -47,6 +48,7 @@ export default {
         TableModule,
         JslibModule,
         IconButtonModule,
+        SelectModule,
       ],
       providers: [],
     }),
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts
index 70b26041df6..8763b75ffca 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts
@@ -117,7 +117,6 @@ export enum CollectionDialogAction {
 
 @Component({
   templateUrl: "collection-dialog.component.html",
-  standalone: true,
   imports: [SharedModule, AccessSelectorModule, SelectModule],
 })
 export class CollectionDialogComponent implements OnInit, OnDestroy {
@@ -592,5 +591,5 @@ export function openCollectionDialog(
   dialogService: DialogService,
   config: DialogConfig<CollectionDialogParams, DialogRef<CollectionDialogResult>>,
 ) {
-  return dialogService.open(CollectionDialogComponent, config);
+  return dialogService.open<CollectionDialogResult>(CollectionDialogComponent, config);
 }
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.ts b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.ts
index 3943ceb22ed..20e4028e9df 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.ts
@@ -20,7 +20,6 @@ import { SharedModule } from "../../../../../../shared/shared.module";
 @Component({
   selector: "app-integration-card",
   templateUrl: "./integration-card.component.html",
-  standalone: true,
   imports: [SharedModule],
 })
 export class IntegrationCardComponent implements AfterViewInit, OnDestroy {
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.ts b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.ts
index 2e3158f9894..55b552bd251 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.ts
@@ -11,7 +11,6 @@ import { Integration } from "../models";
 @Component({
   selector: "app-integration-grid",
   templateUrl: "./integration-grid.component.html",
-  standalone: true,
   imports: [IntegrationCardComponent, SharedModule],
 })
 export class IntegrationGridComponent {
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integrations.pipe.ts b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integrations.pipe.ts
index 760d9913e9e..ae9f73e78c0 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integrations.pipe.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integrations.pipe.ts
@@ -6,7 +6,6 @@ import { Integration } from "../../../shared/components/integrations/models";
 
 @Pipe({
   name: "filterIntegrations",
-  standalone: true,
 })
 export class FilterIntegrationsPipe implements PipeTransform {
   transform(integrations: Integration[], type: IntegrationType): Integration[] {
diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
index 4df6defe8ad..b0c89cd30ab 100644
--- a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
@@ -3,11 +3,10 @@
 import { Component, inject } from "@angular/core";
 import { Params } from "@angular/router";
 
-import { BitwardenLogo } from "@bitwarden/auth/angular";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { OrganizationSponsorshipResponse } from "@bitwarden/common/admin-console/models/response/organization-sponsorship.response";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { ToastService } from "@bitwarden/components";
+import { Icons, ToastService } from "@bitwarden/components";
 
 import { BaseAcceptComponent } from "../../../common/base.accept.component";
 
@@ -22,7 +21,7 @@ import { BaseAcceptComponent } from "../../../common/base.accept.component";
   standalone: false,
 })
 export class AcceptFamilySponsorshipComponent extends BaseAcceptComponent {
-  protected logo = BitwardenLogo;
+  protected logo = Icons.BitwardenLogo;
   failedShortMessage = "inviteAcceptFailedShort";
   failedMessage = "inviteAcceptFailed";
 
diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts
index 57fe212fa65..30c0ba159c1 100644
--- a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts
@@ -30,7 +30,6 @@ import {
 
 @Component({
   templateUrl: "families-for-enterprise-setup.component.html",
-  standalone: true,
   imports: [SharedModule, OrganizationPlansComponent],
 })
 export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy {
diff --git a/apps/web/src/app/admin-console/settings/create-organization.component.ts b/apps/web/src/app/admin-console/settings/create-organization.component.ts
index 7a20826086d..f87e9ec5b72 100644
--- a/apps/web/src/app/admin-console/settings/create-organization.component.ts
+++ b/apps/web/src/app/admin-console/settings/create-organization.component.ts
@@ -13,7 +13,6 @@ import { SharedModule } from "../../shared";
 
 @Component({
   templateUrl: "create-organization.component.html",
-  standalone: true,
   imports: [SharedModule, OrganizationPlansComponent, HeaderModule],
 })
 export class CreateOrganizationComponent {
diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts
index 3de9bf0a8c8..ada73dd0059 100644
--- a/apps/web/src/app/app.component.ts
+++ b/apps/web/src/app/app.component.ts
@@ -1,15 +1,14 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { DOCUMENT } from "@angular/common";
-import { Component, Inject, NgZone, OnDestroy, OnInit } from "@angular/core";
+import { Component, DestroyRef, NgZone, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { Router } from "@angular/router";
-import { Subject, filter, firstValueFrom, map, takeUntil, timeout } from "rxjs";
+import { Subject, filter, firstValueFrom, map, timeout } from "rxjs";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
 import { DeviceTrustToastService } from "@bitwarden/angular/auth/services/device-trust-toast.service.abstraction";
+import { DocumentLangSetter } from "@bitwarden/angular/platform/i18n";
 import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -26,6 +25,7 @@ import { NotificationsService } from "@bitwarden/common/platform/notifications";
 import { StateEventRunnerService } from "@bitwarden/common/platform/state";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 import { KeyService, BiometricStateService } from "@bitwarden/key-management";
 
@@ -34,7 +34,7 @@ import {
   DisableSendPolicy,
   MasterPasswordPolicy,
   PasswordGeneratorPolicy,
-  PersonalOwnershipPolicy,
+  OrganizationDataOwnershipPolicy,
   RequireSsoPolicy,
   ResetPasswordPolicy,
   SendOptionsPolicy,
@@ -60,7 +60,6 @@ export class AppComponent implements OnDestroy, OnInit {
   loading = false;
 
   constructor(
-    @Inject(DOCUMENT) private document: Document,
     private broadcasterService: BroadcasterService,
     private folderService: InternalFolderService,
     private cipherService: CipherService,
@@ -86,15 +85,16 @@ export class AppComponent implements OnDestroy, OnInit {
     private accountService: AccountService,
     private processReloadService: ProcessReloadServiceAbstraction,
     private deviceTrustToastService: DeviceTrustToastService,
+    private readonly destoryRef: DestroyRef,
+    private readonly documentLangSetter: DocumentLangSetter,
   ) {
     this.deviceTrustToastService.setupListeners$.pipe(takeUntilDestroyed()).subscribe();
+
+    const langSubscription = this.documentLangSetter.start();
+    this.destoryRef.onDestroy(() => langSubscription.unsubscribe());
   }
 
   ngOnInit() {
-    this.i18nService.locale$.pipe(takeUntil(this.destroy$)).subscribe((locale) => {
-      this.document.documentElement.lang = locale;
-    });
-
     this.ngZone.runOutsideAngular(() => {
       window.onmousemove = () => this.recordActivity();
       window.onmousedown = () => this.recordActivity();
@@ -243,7 +243,7 @@ export class AppComponent implements OnDestroy, OnInit {
       new PasswordGeneratorPolicy(),
       new SingleOrgPolicy(),
       new RequireSsoPolicy(),
-      new PersonalOwnershipPolicy(),
+      new OrganizationDataOwnershipPolicy(),
       new DisableSendPolicy(),
       new SendOptionsPolicy(),
     ]);
diff --git a/apps/web/src/app/auth/core/services/change-password/web-change-password.service.ts b/apps/web/src/app/auth/core/services/change-password/web-change-password.service.ts
index b75aef0f1fc..ed384763241 100644
--- a/apps/web/src/app/auth/core/services/change-password/web-change-password.service.ts
+++ b/apps/web/src/app/auth/core/services/change-password/web-change-password.service.ts
@@ -1,8 +1,12 @@
-import { ChangePasswordService, DefaultChangePasswordService } from "@bitwarden/auth/angular";
+import {
+  ChangePasswordService,
+  DefaultChangePasswordService,
+} from "@bitwarden/angular/auth/password-management/change-password";
 import { Account } from "@bitwarden/common/auth/abstractions/account.service";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { KeyService } from "@bitwarden/key-management";
+import { RouterService } from "@bitwarden/web-vault/app/core";
 import { UserKeyRotationService } from "@bitwarden/web-vault/app/key-management/key-rotation/user-key-rotation.service";
 
 export class WebChangePasswordService
@@ -14,6 +18,7 @@ export class WebChangePasswordService
     protected masterPasswordApiService: MasterPasswordApiService,
     protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
     private userKeyRotationService: UserKeyRotationService,
+    private routerService: RouterService,
   ) {
     super(keyService, masterPasswordApiService, masterPasswordService);
   }
@@ -31,4 +36,8 @@ export class WebChangePasswordService
       newPasswordHint,
     );
   }
+
+  async clearDeeplinkState() {
+    await this.routerService.getAndClearLoginRedirectUrl();
+  }
 }
diff --git a/apps/web/src/app/auth/core/services/index.ts b/apps/web/src/app/auth/core/services/index.ts
index 5539e3b76ea..8c556986225 100644
--- a/apps/web/src/app/auth/core/services/index.ts
+++ b/apps/web/src/app/auth/core/services/index.ts
@@ -2,6 +2,7 @@ export * from "./change-password";
 export * from "./login";
 export * from "./login-decryption-options";
 export * from "./webauthn-login";
+export * from "./password-management";
 export * from "./set-password-jit";
 export * from "./registration";
 export * from "./two-factor-auth";
diff --git a/apps/web/src/app/auth/core/services/login-decryption-options/web-login-decryption-options.service.ts b/apps/web/src/app/auth/core/services/login-decryption-options/web-login-decryption-options.service.ts
index 3de3ec46457..fb30f04ffc4 100644
--- a/apps/web/src/app/auth/core/services/login-decryption-options/web-login-decryption-options.service.ts
+++ b/apps/web/src/app/auth/core/services/login-decryption-options/web-login-decryption-options.service.ts
@@ -4,10 +4,10 @@ import {
   LoginDecryptionOptionsService,
   DefaultLoginDecryptionOptionsService,
 } from "@bitwarden/auth/angular";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 
 import { RouterService } from "../../../../core/router.service";
-import { AcceptOrganizationInviteService } from "../../../organization-invite/accept-organization.service";
 
 export class WebLoginDecryptionOptionsService
   extends DefaultLoginDecryptionOptionsService
@@ -16,7 +16,7 @@ export class WebLoginDecryptionOptionsService
   constructor(
     protected messagingService: MessagingService,
     private routerService: RouterService,
-    private acceptOrganizationInviteService: AcceptOrganizationInviteService,
+    private organizationInviteService: OrganizationInviteService,
   ) {
     super(messagingService);
   }
@@ -27,7 +27,7 @@ export class WebLoginDecryptionOptionsService
       // accepted while being enrolled in admin recovery. So we need to clear
       // the redirect and stored org invite.
       await this.routerService.getAndClearLoginRedirectUrl();
-      await this.acceptOrganizationInviteService.clearOrganizationInvitation();
+      await this.organizationInviteService.clearOrganizationInvitation();
     } catch (error) {
       throw new Error(error);
     }
diff --git a/apps/web/src/app/auth/core/services/login/web-login-component.service.spec.ts b/apps/web/src/app/auth/core/services/login/web-login-component.service.spec.ts
index 95ddc74c3c5..4cc06baf32b 100644
--- a/apps/web/src/app/auth/core/services/login/web-login-component.service.spec.ts
+++ b/apps/web/src/app/auth/core/services/login/web-login-component.service.spec.ts
@@ -10,7 +10,9 @@ import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { ResetPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/reset-password-policy-options";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -22,7 +24,6 @@ import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legac
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { RouterService } from "../../../../../../../../apps/web/src/app/core";
-import { AcceptOrganizationInviteService } from "../../../organization-invite/accept-organization.service";
 
 import { WebLoginComponentService } from "./web-login-component.service";
 
@@ -32,7 +33,7 @@ jest.mock("../../../../../utils/flags", () => ({
 
 describe("WebLoginComponentService", () => {
   let service: WebLoginComponentService;
-  let acceptOrganizationInviteService: MockProxy<AcceptOrganizationInviteService>;
+  let organizationInviteService: MockProxy<OrganizationInviteService>;
   let logService: MockProxy<LogService>;
   let policyApiService: MockProxy<PolicyApiServiceAbstraction>;
   let internalPolicyService: MockProxy<InternalPolicyService>;
@@ -44,9 +45,10 @@ describe("WebLoginComponentService", () => {
   let ssoLoginService: MockProxy<SsoLoginServiceAbstraction>;
   const mockUserId = Utils.newGuid() as UserId;
   let accountService: FakeAccountService;
+  let configService: MockProxy<ConfigService>;
 
   beforeEach(() => {
-    acceptOrganizationInviteService = mock<AcceptOrganizationInviteService>();
+    organizationInviteService = mock<OrganizationInviteService>();
     logService = mock<LogService>();
     policyApiService = mock<PolicyApiServiceAbstraction>();
     internalPolicyService = mock<InternalPolicyService>();
@@ -57,12 +59,13 @@ describe("WebLoginComponentService", () => {
     platformUtilsService = mock<PlatformUtilsService>();
     ssoLoginService = mock<SsoLoginServiceAbstraction>();
     accountService = mockAccountServiceWith(mockUserId);
+    configService = mock<ConfigService>();
 
     TestBed.configureTestingModule({
       providers: [
         WebLoginComponentService,
         { provide: DefaultLoginComponentService, useClass: WebLoginComponentService },
-        { provide: AcceptOrganizationInviteService, useValue: acceptOrganizationInviteService },
+        { provide: OrganizationInviteService, useValue: organizationInviteService },
         { provide: LogService, useValue: logService },
         { provide: PolicyApiServiceAbstraction, useValue: policyApiService },
         { provide: InternalPolicyService, useValue: internalPolicyService },
@@ -73,6 +76,7 @@ describe("WebLoginComponentService", () => {
         { provide: PlatformUtilsService, useValue: platformUtilsService },
         { provide: SsoLoginServiceAbstraction, useValue: ssoLoginService },
         { provide: AccountService, useValue: accountService },
+        { provide: ConfigService, useValue: configService },
       ],
     });
     service = TestBed.inject(WebLoginComponentService);
@@ -84,14 +88,14 @@ describe("WebLoginComponentService", () => {
 
   describe("getOrgPoliciesFromOrgInvite", () => {
     it("returns undefined if organization invite is null", async () => {
-      acceptOrganizationInviteService.getOrganizationInvite.mockResolvedValue(null);
+      organizationInviteService.getOrganizationInvite.mockResolvedValue(null);
       const result = await service.getOrgPoliciesFromOrgInvite();
       expect(result).toBeUndefined();
     });
 
     it("logs an error if getPoliciesByToken throws an error", async () => {
       const error = new Error("Test error");
-      acceptOrganizationInviteService.getOrganizationInvite.mockResolvedValue({
+      organizationInviteService.getOrganizationInvite.mockResolvedValue({
         organizationId: "org-id",
         token: "token",
         email: "email",
@@ -117,7 +121,7 @@ describe("WebLoginComponentService", () => {
         const resetPasswordPolicyOptions = new ResetPasswordPolicyOptions();
         resetPasswordPolicyOptions.autoEnrollEnabled = autoEnrollEnabled;
 
-        acceptOrganizationInviteService.getOrganizationInvite.mockResolvedValue({
+        organizationInviteService.getOrganizationInvite.mockResolvedValue({
           organizationId: "org-id",
           token: "token",
           email: "email",
diff --git a/apps/web/src/app/auth/core/services/login/web-login-component.service.ts b/apps/web/src/app/auth/core/services/login/web-login-component.service.ts
index 36e7143ccd0..cf0adb91144 100644
--- a/apps/web/src/app/auth/core/services/login/web-login-component.service.ts
+++ b/apps/web/src/app/auth/core/services/login/web-login-component.service.ts
@@ -11,18 +11,21 @@ import {
 } from "@bitwarden/auth/angular";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
 import { RouterService } from "../../../../core/router.service";
-import { AcceptOrganizationInviteService } from "../../../organization-invite/accept-organization.service";
 
 @Injectable()
 export class WebLoginComponentService
@@ -30,7 +33,7 @@ export class WebLoginComponentService
   implements LoginComponentService
 {
   constructor(
-    protected acceptOrganizationInviteService: AcceptOrganizationInviteService,
+    protected organizationInviteService: OrganizationInviteService,
     protected logService: LogService,
     protected policyApiService: PolicyApiServiceAbstraction,
     protected policyService: InternalPolicyService,
@@ -42,6 +45,7 @@ export class WebLoginComponentService
     ssoLoginService: SsoLoginServiceAbstraction,
     private router: Router,
     private accountService: AccountService,
+    private configService: ConfigService,
   ) {
     super(
       cryptoFunctionService,
@@ -66,8 +70,8 @@ export class WebLoginComponentService
     return;
   }
 
-  async getOrgPoliciesFromOrgInvite(): Promise<PasswordPolicies | null> {
-    const orgInvite = await this.acceptOrganizationInviteService.getOrganizationInvite();
+  async getOrgPoliciesFromOrgInvite(): Promise<PasswordPolicies | undefined> {
+    const orgInvite = await this.organizationInviteService.getOrganizationInvite();
 
     if (orgInvite != null) {
       let policies: Policy[];
@@ -84,7 +88,7 @@ export class WebLoginComponentService
       }
 
       if (policies == null) {
-        return;
+        return undefined;
       }
 
       const resetPasswordPolicy = this.policyService.getResetPasswordPolicyOptions(
@@ -95,12 +99,23 @@ export class WebLoginComponentService
       const isPolicyAndAutoEnrollEnabled =
         resetPasswordPolicy[1] && resetPasswordPolicy[0].autoEnrollEnabled;
 
-      const enforcedPasswordPolicyOptions = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(
-          getUserId,
-          switchMap((userId) => this.policyService.masterPasswordPolicyOptions$(userId, policies)),
-        ),
-      );
+      let enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions;
+
+      if (
+        await this.configService.getFeatureFlag(FeatureFlag.PM16117_ChangeExistingPasswordRefactor)
+      ) {
+        enforcedPasswordPolicyOptions =
+          this.policyService.combinePoliciesIntoMasterPasswordPolicyOptions(policies);
+      } else {
+        enforcedPasswordPolicyOptions = await firstValueFrom(
+          this.accountService.activeAccount$.pipe(
+            getUserId,
+            switchMap((userId) =>
+              this.policyService.masterPasswordPolicyOptions$(userId, policies),
+            ),
+          ),
+        );
+      }
 
       return {
         policies,
diff --git a/apps/web/src/app/auth/core/services/organization-invite/web-organization-invite.service.ts b/apps/web/src/app/auth/core/services/organization-invite/web-organization-invite.service.ts
new file mode 100644
index 00000000000..b799358dbae
--- /dev/null
+++ b/apps/web/src/app/auth/core/services/organization-invite/web-organization-invite.service.ts
@@ -0,0 +1,38 @@
+import { firstValueFrom } from "rxjs";
+
+import { OrganizationInvite } from "@bitwarden/common/auth/services/organization-invite/organization-invite";
+import { ORGANIZATION_INVITE } from "@bitwarden/common/auth/services/organization-invite/organization-invite-state";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
+import { GlobalState, GlobalStateProvider } from "@bitwarden/common/platform/state";
+
+export class WebOrganizationInviteService implements OrganizationInviteService {
+  private organizationInvitationState: GlobalState<OrganizationInvite | null>;
+
+  constructor(private readonly globalStateProvider: GlobalStateProvider) {
+    this.organizationInvitationState = this.globalStateProvider.get(ORGANIZATION_INVITE);
+  }
+
+  /**
+   * Returns the currently stored organization invite
+   */
+  async getOrganizationInvite(): Promise<OrganizationInvite | null> {
+    return await firstValueFrom(this.organizationInvitationState.state$);
+  }
+
+  /**
+   * Stores a new organization invite
+   * @param invite an organization invite
+   * @throws if the invite is nullish
+   */
+  async setOrganizationInvitation(invite: OrganizationInvite): Promise<void> {
+    if (invite == null) {
+      throw new Error("Invite cannot be null. Use clearOrganizationInvitation instead.");
+    }
+    await this.organizationInvitationState.update(() => invite);
+  }
+
+  /** Clears the currently stored organization invite */
+  async clearOrganizationInvitation(): Promise<void> {
+    await this.organizationInvitationState.update(() => null);
+  }
+}
diff --git a/apps/web/src/app/auth/core/services/password-management/index.ts b/apps/web/src/app/auth/core/services/password-management/index.ts
new file mode 100644
index 00000000000..1444fd024af
--- /dev/null
+++ b/apps/web/src/app/auth/core/services/password-management/index.ts
@@ -0,0 +1 @@
+export * from "./set-initial-password/web-set-initial-password.service";
diff --git a/apps/web/src/app/auth/core/services/password-management/set-initial-password/web-set-initial-password.service.spec.ts b/apps/web/src/app/auth/core/services/password-management/set-initial-password/web-set-initial-password.service.spec.ts
new file mode 100644
index 00000000000..b562c54894b
--- /dev/null
+++ b/apps/web/src/app/auth/core/services/password-management/set-initial-password/web-set-initial-password.service.spec.ts
@@ -0,0 +1,206 @@
+import { MockProxy, mock } from "jest-mock-extended";
+import { BehaviorSubject, of } from "rxjs";
+
+import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
+import {
+  SetInitialPasswordCredentials,
+  SetInitialPasswordService,
+  SetInitialPasswordUserType,
+} from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.service.abstraction";
+import {
+  FakeUserDecryptionOptions as UserDecryptionOptions,
+  InternalUserDecryptionOptionsServiceAbstraction,
+} from "@bitwarden/auth/common";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
+import { SetPasswordRequest } from "@bitwarden/common/auth/models/request/set-password.request";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { KeysRequest } from "@bitwarden/common/models/request/keys.request";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { CsprngArray } from "@bitwarden/common/types/csprng";
+import { UserId } from "@bitwarden/common/types/guid";
+import { MasterKey, UserKey } from "@bitwarden/common/types/key";
+import { DEFAULT_KDF_CONFIG, KdfConfigService, KeyService } from "@bitwarden/key-management";
+import { RouterService } from "@bitwarden/web-vault/app/core";
+
+import { WebSetInitialPasswordService } from "./web-set-initial-password.service";
+
+describe("WebSetInitialPasswordService", () => {
+  let sut: SetInitialPasswordService;
+
+  let apiService: MockProxy<ApiService>;
+  let encryptService: MockProxy<EncryptService>;
+  let i18nService: MockProxy<I18nService>;
+  let kdfConfigService: MockProxy<KdfConfigService>;
+  let keyService: MockProxy<KeyService>;
+  let masterPasswordApiService: MockProxy<MasterPasswordApiService>;
+  let masterPasswordService: MockProxy<InternalMasterPasswordServiceAbstraction>;
+  let organizationApiService: MockProxy<OrganizationApiServiceAbstraction>;
+  let organizationUserApiService: MockProxy<OrganizationUserApiService>;
+  let userDecryptionOptionsService: MockProxy<InternalUserDecryptionOptionsServiceAbstraction>;
+  let organizationInviteService: MockProxy<OrganizationInviteService>;
+  let routerService: MockProxy<RouterService>;
+
+  beforeEach(() => {
+    apiService = mock<ApiService>();
+    encryptService = mock<EncryptService>();
+    i18nService = mock<I18nService>();
+    kdfConfigService = mock<KdfConfigService>();
+    keyService = mock<KeyService>();
+    masterPasswordApiService = mock<MasterPasswordApiService>();
+    masterPasswordService = mock<InternalMasterPasswordServiceAbstraction>();
+    organizationApiService = mock<OrganizationApiServiceAbstraction>();
+    organizationUserApiService = mock<OrganizationUserApiService>();
+    userDecryptionOptionsService = mock<InternalUserDecryptionOptionsServiceAbstraction>();
+    organizationInviteService = mock<OrganizationInviteService>();
+    routerService = mock<RouterService>();
+
+    sut = new WebSetInitialPasswordService(
+      apiService,
+      encryptService,
+      i18nService,
+      kdfConfigService,
+      keyService,
+      masterPasswordApiService,
+      masterPasswordService,
+      organizationApiService,
+      organizationUserApiService,
+      userDecryptionOptionsService,
+      organizationInviteService,
+      routerService,
+    );
+  });
+
+  it("should instantiate", () => {
+    expect(sut).not.toBeFalsy();
+  });
+
+  describe("setInitialPassword(...)", () => {
+    // Mock function parameters
+    let credentials: SetInitialPasswordCredentials;
+    let userType: SetInitialPasswordUserType;
+    let userId: UserId;
+
+    // Mock other function data
+    let userKey: UserKey;
+    let userKeyEncString: EncString;
+    let masterKeyEncryptedUserKey: [UserKey, EncString];
+
+    let keyPair: [string, EncString];
+    let keysRequest: KeysRequest;
+
+    let userDecryptionOptions: UserDecryptionOptions;
+    let userDecryptionOptionsSubject: BehaviorSubject<UserDecryptionOptions>;
+    let setPasswordRequest: SetPasswordRequest;
+
+    beforeEach(() => {
+      // Mock function parameters
+      credentials = {
+        newMasterKey: new SymmetricCryptoKey(new Uint8Array(32).buffer as CsprngArray) as MasterKey,
+        newServerMasterKeyHash: "newServerMasterKeyHash",
+        newLocalMasterKeyHash: "newLocalMasterKeyHash",
+        newPasswordHint: "newPasswordHint",
+        kdfConfig: DEFAULT_KDF_CONFIG,
+        orgSsoIdentifier: "orgSsoIdentifier",
+        orgId: "orgId",
+        resetPasswordAutoEnroll: false,
+      };
+      userId = "userId" as UserId;
+      userType = SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER;
+
+      // Mock other function data
+      userKey = new SymmetricCryptoKey(new Uint8Array(64).buffer as CsprngArray) as UserKey;
+      userKeyEncString = new EncString("masterKeyEncryptedUserKey");
+      masterKeyEncryptedUserKey = [userKey, userKeyEncString];
+
+      keyPair = ["publicKey", new EncString("privateKey")];
+      keysRequest = new KeysRequest(keyPair[0], keyPair[1].encryptedString);
+
+      userDecryptionOptions = new UserDecryptionOptions({ hasMasterPassword: true });
+      userDecryptionOptionsSubject = new BehaviorSubject(userDecryptionOptions);
+      userDecryptionOptionsService.userDecryptionOptions$ = userDecryptionOptionsSubject;
+
+      setPasswordRequest = new SetPasswordRequest(
+        credentials.newServerMasterKeyHash,
+        masterKeyEncryptedUserKey[1].encryptedString,
+        credentials.newPasswordHint,
+        credentials.orgSsoIdentifier,
+        keysRequest,
+        credentials.kdfConfig.kdfType,
+        credentials.kdfConfig.iterations,
+      );
+    });
+
+    function setupMocks() {
+      // Mock makeMasterKeyEncryptedUserKey() values
+      keyService.userKey$.mockReturnValue(of(userKey));
+      keyService.encryptUserKeyWithMasterKey.mockResolvedValue(masterKeyEncryptedUserKey);
+
+      // Mock keyPair values
+      keyService.userPrivateKey$.mockReturnValue(of(null));
+      keyService.userPublicKey$.mockReturnValue(of(null));
+      keyService.makeKeyPair.mockResolvedValue(keyPair);
+    }
+
+    describe("given the initial password was successfully set", () => {
+      it("should call routerService.getAndClearLoginRedirectUrl()", async () => {
+        // Arrange
+        setupMocks();
+
+        // Act
+        await sut.setInitialPassword(credentials, userType, userId);
+
+        // Assert
+        expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+        expect(routerService.getAndClearLoginRedirectUrl).toHaveBeenCalledTimes(1);
+      });
+
+      it("should call acceptOrganizationInviteService.clearOrganizationInvitation()", async () => {
+        // Arrange
+        setupMocks();
+
+        // Act
+        await sut.setInitialPassword(credentials, userType, userId);
+
+        // Assert
+        expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+        expect(organizationInviteService.clearOrganizationInvitation).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe("given the initial password was NOT successfully set (due to some error in setInitialPassword())", () => {
+      it("should NOT call routerService.getAndClearLoginRedirectUrl()", async () => {
+        // Arrange
+        credentials.newMasterKey = null; // will trigger an error in setInitialPassword()
+        setupMocks();
+
+        // Act
+        const promise = sut.setInitialPassword(credentials, userType, userId);
+
+        // Assert
+        await expect(promise).rejects.toThrow();
+        expect(masterPasswordApiService.setPassword).not.toHaveBeenCalled();
+        expect(routerService.getAndClearLoginRedirectUrl).not.toHaveBeenCalled();
+      });
+
+      it("should NOT call acceptOrganizationInviteService.clearOrganizationInvitation()", async () => {
+        // Arrange
+        credentials.newMasterKey = null; // will trigger an error in setInitialPassword()
+        setupMocks();
+
+        // Act
+        const promise = sut.setInitialPassword(credentials, userType, userId);
+
+        // Assert
+        await expect(promise).rejects.toThrow();
+        expect(masterPasswordApiService.setPassword).not.toHaveBeenCalled();
+        expect(organizationInviteService.clearOrganizationInvitation).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/apps/web/src/app/auth/core/services/password-management/set-initial-password/web-set-initial-password.service.ts b/apps/web/src/app/auth/core/services/password-management/set-initial-password/web-set-initial-password.service.ts
new file mode 100644
index 00000000000..19ddbf5e260
--- /dev/null
+++ b/apps/web/src/app/auth/core/services/password-management/set-initial-password/web-set-initial-password.service.ts
@@ -0,0 +1,83 @@
+import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
+import { DefaultSetInitialPasswordService } from "@bitwarden/angular/auth/password-management/set-initial-password/default-set-initial-password.service.implementation";
+import {
+  SetInitialPasswordCredentials,
+  SetInitialPasswordService,
+  SetInitialPasswordUserType,
+} from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.service.abstraction";
+import { InternalUserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { UserId } from "@bitwarden/common/types/guid";
+import { KdfConfigService, KeyService } from "@bitwarden/key-management";
+import { RouterService } from "@bitwarden/web-vault/app/core";
+
+export class WebSetInitialPasswordService
+  extends DefaultSetInitialPasswordService
+  implements SetInitialPasswordService
+{
+  constructor(
+    protected apiService: ApiService,
+    protected encryptService: EncryptService,
+    protected i18nService: I18nService,
+    protected kdfConfigService: KdfConfigService,
+    protected keyService: KeyService,
+    protected masterPasswordApiService: MasterPasswordApiService,
+    protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
+    protected organizationApiService: OrganizationApiServiceAbstraction,
+    protected organizationUserApiService: OrganizationUserApiService,
+    protected userDecryptionOptionsService: InternalUserDecryptionOptionsServiceAbstraction,
+    private organizationInviteService: OrganizationInviteService,
+    private routerService: RouterService,
+  ) {
+    super(
+      apiService,
+      encryptService,
+      i18nService,
+      kdfConfigService,
+      keyService,
+      masterPasswordApiService,
+      masterPasswordService,
+      organizationApiService,
+      organizationUserApiService,
+      userDecryptionOptionsService,
+    );
+  }
+
+  override async setInitialPassword(
+    credentials: SetInitialPasswordCredentials,
+    userType: SetInitialPasswordUserType,
+    userId: UserId,
+  ) {
+    await super.setInitialPassword(credentials, userType, userId);
+
+    /**
+     * TODO: Investigate refactoring the following logic in https://bitwarden.atlassian.net/browse/PM-22615
+     * ---
+     * When a user has been invited to an org, they can be accepted into the org in two different ways:
+     *
+     *  1) By clicking the email invite link, which triggers the normal AcceptOrganizationComponent flow
+     *     a. This flow sets an org invite in state
+     *     b. However, if the user does not already have an account AND the org has SSO enabled AND the require
+     *        SSO policy enabled, the AcceptOrganizationComponent will send the user to /sso to accelerate
+     *        the user through the SSO JIT provisioning process (see #2 below)
+     *
+     *  2) By logging in via SSO, which triggers the JIT provisioning process
+     *     a. This flow does NOT (itself) set an org invite in state
+     *     b. The set initial password process on the server accepts the user into the org after successfully
+     *        setting the password (see server - SetInitialMasterPasswordCommand.cs)
+     *
+     * If a user clicks the email link but gets accelerated through the SSO JIT process (see 1b),
+     * the SSO JIT process will accept the user into the org upon setting their initial password (see 2b),
+     * at which point we must remember to clear the deep linked URL used for accepting the org invite, as well
+     * as clear the org invite itself that was originally set in state by the AcceptOrganizationComponent.
+     */
+    await this.routerService.getAndClearLoginRedirectUrl();
+    await this.organizationInviteService.clearOrganizationInvitation();
+  }
+}
diff --git a/apps/web/src/app/auth/core/services/registration/web-registration-finish.service.spec.ts b/apps/web/src/app/auth/core/services/registration/web-registration-finish.service.spec.ts
index fe3b0837aa8..e491f95c1b9 100644
--- a/apps/web/src/app/auth/core/services/registration/web-registration-finish.service.spec.ts
+++ b/apps/web/src/app/auth/core/services/registration/web-registration-finish.service.spec.ts
@@ -9,19 +9,16 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { AccountApiService } from "@bitwarden/common/auth/abstractions/account-api.service";
+import { OrganizationInvite } from "@bitwarden/common/auth/services/organization-invite/organization-invite";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
 import { CsprngArray } from "@bitwarden/common/types/csprng";
-import { UserId } from "@bitwarden/common/types/guid";
 import { MasterKey, UserKey } from "@bitwarden/common/types/key";
 import { DEFAULT_KDF_CONFIG, KeyService } from "@bitwarden/key-management";
 
-import { AcceptOrganizationInviteService } from "../../../organization-invite/accept-organization.service";
-import { OrganizationInvite } from "../../../organization-invite/organization-invite";
-
 import { WebRegistrationFinishService } from "./web-registration-finish.service";
 
 describe("WebRegistrationFinishService", () => {
@@ -29,30 +26,29 @@ describe("WebRegistrationFinishService", () => {
 
   let keyService: MockProxy<KeyService>;
   let accountApiService: MockProxy<AccountApiService>;
-  let acceptOrgInviteService: MockProxy<AcceptOrganizationInviteService>;
+  let organizationInviteService: MockProxy<OrganizationInviteService>;
   let policyApiService: MockProxy<PolicyApiServiceAbstraction>;
   let logService: MockProxy<LogService>;
   let policyService: MockProxy<PolicyService>;
-  const mockUserId = Utils.newGuid() as UserId;
-  let accountService: FakeAccountService;
+  let configService: MockProxy<ConfigService>;
 
   beforeEach(() => {
     keyService = mock<KeyService>();
     accountApiService = mock<AccountApiService>();
-    acceptOrgInviteService = mock<AcceptOrganizationInviteService>();
+    organizationInviteService = mock<OrganizationInviteService>();
     policyApiService = mock<PolicyApiServiceAbstraction>();
     logService = mock<LogService>();
     policyService = mock<PolicyService>();
-    accountService = mockAccountServiceWith(mockUserId);
+    configService = mock<ConfigService>();
 
     service = new WebRegistrationFinishService(
       keyService,
       accountApiService,
-      acceptOrgInviteService,
+      organizationInviteService,
       policyApiService,
       logService,
       policyService,
-      accountService,
+      configService,
     );
   });
 
@@ -72,21 +68,21 @@ describe("WebRegistrationFinishService", () => {
     });
 
     it("returns null when the org invite is null", async () => {
-      acceptOrgInviteService.getOrganizationInvite.mockResolvedValue(null);
+      organizationInviteService.getOrganizationInvite.mockResolvedValue(null);
 
       const result = await service.getOrgNameFromOrgInvite();
 
       expect(result).toBeNull();
-      expect(acceptOrgInviteService.getOrganizationInvite).toHaveBeenCalled();
+      expect(organizationInviteService.getOrganizationInvite).toHaveBeenCalled();
     });
 
     it("returns the organization name from the organization invite when it exists", async () => {
-      acceptOrgInviteService.getOrganizationInvite.mockResolvedValue(orgInvite);
+      organizationInviteService.getOrganizationInvite.mockResolvedValue(orgInvite);
 
       const result = await service.getOrgNameFromOrgInvite();
 
       expect(result).toEqual(orgInvite.organizationName);
-      expect(acceptOrgInviteService.getOrganizationInvite).toHaveBeenCalled();
+      expect(organizationInviteService.getOrganizationInvite).toHaveBeenCalled();
     });
   });
 
@@ -102,22 +98,22 @@ describe("WebRegistrationFinishService", () => {
     });
 
     it("returns null when the org invite is null", async () => {
-      acceptOrgInviteService.getOrganizationInvite.mockResolvedValue(null);
+      organizationInviteService.getOrganizationInvite.mockResolvedValue(null);
 
       const result = await service.getMasterPasswordPolicyOptsFromOrgInvite();
 
       expect(result).toBeNull();
-      expect(acceptOrgInviteService.getOrganizationInvite).toHaveBeenCalled();
+      expect(organizationInviteService.getOrganizationInvite).toHaveBeenCalled();
     });
 
     it("returns null when the policies are null", async () => {
-      acceptOrgInviteService.getOrganizationInvite.mockResolvedValue(orgInvite);
+      organizationInviteService.getOrganizationInvite.mockResolvedValue(orgInvite);
       policyApiService.getPoliciesByToken.mockResolvedValue(null);
 
       const result = await service.getMasterPasswordPolicyOptsFromOrgInvite();
 
       expect(result).toBeNull();
-      expect(acceptOrgInviteService.getOrganizationInvite).toHaveBeenCalled();
+      expect(organizationInviteService.getOrganizationInvite).toHaveBeenCalled();
       expect(policyApiService.getPoliciesByToken).toHaveBeenCalledWith(
         orgInvite.organizationId,
         orgInvite.token,
@@ -127,13 +123,13 @@ describe("WebRegistrationFinishService", () => {
     });
 
     it("logs an error and returns null when policies cannot be fetched", async () => {
-      acceptOrgInviteService.getOrganizationInvite.mockResolvedValue(orgInvite);
+      organizationInviteService.getOrganizationInvite.mockResolvedValue(orgInvite);
       policyApiService.getPoliciesByToken.mockRejectedValue(new Error("error"));
 
       const result = await service.getMasterPasswordPolicyOptsFromOrgInvite();
 
       expect(result).toBeNull();
-      expect(acceptOrgInviteService.getOrganizationInvite).toHaveBeenCalled();
+      expect(organizationInviteService.getOrganizationInvite).toHaveBeenCalled();
       expect(policyApiService.getPoliciesByToken).toHaveBeenCalledWith(
         orgInvite.organizationId,
         orgInvite.token,
@@ -147,14 +143,14 @@ describe("WebRegistrationFinishService", () => {
       const masterPasswordPolicies = [new Policy()];
       const masterPasswordPolicyOptions = new MasterPasswordPolicyOptions();
 
-      acceptOrgInviteService.getOrganizationInvite.mockResolvedValue(orgInvite);
+      organizationInviteService.getOrganizationInvite.mockResolvedValue(orgInvite);
       policyApiService.getPoliciesByToken.mockResolvedValue(masterPasswordPolicies);
       policyService.masterPasswordPolicyOptions$.mockReturnValue(of(masterPasswordPolicyOptions));
 
       const result = await service.getMasterPasswordPolicyOptsFromOrgInvite();
 
       expect(result).toEqual(masterPasswordPolicyOptions);
-      expect(acceptOrgInviteService.getOrganizationInvite).toHaveBeenCalled();
+      expect(organizationInviteService.getOrganizationInvite).toHaveBeenCalled();
       expect(policyApiService.getPoliciesByToken).toHaveBeenCalledWith(
         orgInvite.organizationId,
         orgInvite.token,
@@ -221,7 +217,7 @@ describe("WebRegistrationFinishService", () => {
       keyService.makeUserKey.mockResolvedValue([userKey, userKeyEncString]);
       keyService.makeKeyPair.mockResolvedValue(userKeyPair);
       accountApiService.registerFinish.mockResolvedValue();
-      acceptOrgInviteService.getOrganizationInvite.mockResolvedValue(null);
+      organizationInviteService.getOrganizationInvite.mockResolvedValue(null);
 
       await service.finishRegistration(email, passwordInputResult, emailVerificationToken);
 
@@ -257,7 +253,7 @@ describe("WebRegistrationFinishService", () => {
       keyService.makeUserKey.mockResolvedValue([userKey, userKeyEncString]);
       keyService.makeKeyPair.mockResolvedValue(userKeyPair);
       accountApiService.registerFinish.mockResolvedValue();
-      acceptOrgInviteService.getOrganizationInvite.mockResolvedValue(orgInvite);
+      organizationInviteService.getOrganizationInvite.mockResolvedValue(orgInvite);
 
       await service.finishRegistration(email, passwordInputResult);
 
@@ -293,7 +289,7 @@ describe("WebRegistrationFinishService", () => {
       keyService.makeUserKey.mockResolvedValue([userKey, userKeyEncString]);
       keyService.makeKeyPair.mockResolvedValue(userKeyPair);
       accountApiService.registerFinish.mockResolvedValue();
-      acceptOrgInviteService.getOrganizationInvite.mockResolvedValue(null);
+      organizationInviteService.getOrganizationInvite.mockResolvedValue(null);
 
       await service.finishRegistration(
         email,
@@ -334,7 +330,7 @@ describe("WebRegistrationFinishService", () => {
       keyService.makeUserKey.mockResolvedValue([userKey, userKeyEncString]);
       keyService.makeKeyPair.mockResolvedValue(userKeyPair);
       accountApiService.registerFinish.mockResolvedValue();
-      acceptOrgInviteService.getOrganizationInvite.mockResolvedValue(null);
+      organizationInviteService.getOrganizationInvite.mockResolvedValue(null);
 
       await service.finishRegistration(
         email,
@@ -377,7 +373,7 @@ describe("WebRegistrationFinishService", () => {
       keyService.makeUserKey.mockResolvedValue([userKey, userKeyEncString]);
       keyService.makeKeyPair.mockResolvedValue(userKeyPair);
       accountApiService.registerFinish.mockResolvedValue();
-      acceptOrgInviteService.getOrganizationInvite.mockResolvedValue(null);
+      organizationInviteService.getOrganizationInvite.mockResolvedValue(null);
 
       await service.finishRegistration(
         email,
@@ -418,4 +414,22 @@ describe("WebRegistrationFinishService", () => {
       );
     });
   });
+
+  describe("determineLoginSuccessRoute", () => {
+    it("returns /setup-extension when the end user activation feature flag is enabled", async () => {
+      configService.getFeatureFlag.mockResolvedValue(true);
+
+      const result = await service.determineLoginSuccessRoute();
+
+      expect(result).toBe("/setup-extension");
+    });
+
+    it("returns /vault when the end user activation feature flag is disabled", async () => {
+      configService.getFeatureFlag.mockResolvedValue(false);
+
+      const result = await service.determineLoginSuccessRoute();
+
+      expect(result).toBe("/vault");
+    });
+  });
 });
diff --git a/apps/web/src/app/auth/core/services/registration/web-registration-finish.service.ts b/apps/web/src/app/auth/core/services/registration/web-registration-finish.service.ts
index 3d99b3b6712..d6f0a27a79c 100644
--- a/apps/web/src/app/auth/core/services/registration/web-registration-finish.service.ts
+++ b/apps/web/src/app/auth/core/services/registration/web-registration-finish.service.ts
@@ -12,14 +12,14 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { AccountApiService } from "@bitwarden/common/auth/abstractions/account-api.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { RegisterFinishRequest } from "@bitwarden/common/auth/models/request/registration/register-finish.request";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { EncryptedString, EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { KeyService } from "@bitwarden/key-management";
 
-import { AcceptOrganizationInviteService } from "../../../organization-invite/accept-organization.service";
-
 export class WebRegistrationFinishService
   extends DefaultRegistrationFinishService
   implements RegistrationFinishService
@@ -27,17 +27,17 @@ export class WebRegistrationFinishService
   constructor(
     protected keyService: KeyService,
     protected accountApiService: AccountApiService,
-    private acceptOrgInviteService: AcceptOrganizationInviteService,
+    private organizationInviteService: OrganizationInviteService,
     private policyApiService: PolicyApiServiceAbstraction,
     private logService: LogService,
     private policyService: PolicyService,
-    private accountService: AccountService,
+    private configService: ConfigService,
   ) {
     super(keyService, accountApiService);
   }
 
   override async getOrgNameFromOrgInvite(): Promise<string | null> {
-    const orgInvite = await this.acceptOrgInviteService.getOrganizationInvite();
+    const orgInvite = await this.organizationInviteService.getOrganizationInvite();
     if (orgInvite == null) {
       return null;
     }
@@ -47,7 +47,7 @@ export class WebRegistrationFinishService
 
   override async getMasterPasswordPolicyOptsFromOrgInvite(): Promise<MasterPasswordPolicyOptions | null> {
     // If there's a deep linked org invite, use it to get the password policies
-    const orgInvite = await this.acceptOrgInviteService.getOrganizationInvite();
+    const orgInvite = await this.organizationInviteService.getOrganizationInvite();
 
     if (orgInvite == null) {
       return null;
@@ -76,6 +76,18 @@ export class WebRegistrationFinishService
     return masterPasswordPolicyOpts;
   }
 
+  override async determineLoginSuccessRoute(): Promise<string> {
+    const endUserActivationFlagEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.PM19315EndUserActivationMvp,
+    );
+
+    if (endUserActivationFlagEnabled) {
+      return "/setup-extension";
+    } else {
+      return super.determineLoginSuccessRoute();
+    }
+  }
+
   // Note: the org invite token and email verification are mutually exclusive. Only one will be present.
   override async buildRegisterRequest(
     email: string,
@@ -100,7 +112,7 @@ export class WebRegistrationFinishService
     // web specific logic
     // Org invites are deep linked. Non-existent accounts are redirected to the register page.
     // Org user id and token are included here only for validation and two factor purposes.
-    const orgInvite = await this.acceptOrgInviteService.getOrganizationInvite();
+    const orgInvite = await this.organizationInviteService.getOrganizationInvite();
     if (orgInvite != null) {
       registerRequest.organizationUserId = orgInvite.organizationUserId;
       registerRequest.orgInviteToken = orgInvite.token;
diff --git a/apps/web/src/app/auth/core/services/set-password-jit/web-set-password-jit.service.ts b/apps/web/src/app/auth/core/services/set-password-jit/web-set-password-jit.service.ts
index 62175f1256d..3078b8e3b83 100644
--- a/apps/web/src/app/auth/core/services/set-password-jit/web-set-password-jit.service.ts
+++ b/apps/web/src/app/auth/core/services/set-password-jit/web-set-password-jit.service.ts
@@ -5,16 +5,16 @@ import {
   SetPasswordCredentials,
   SetPasswordJitService,
 } from "@bitwarden/auth/angular";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
 
 import { RouterService } from "../../../../core/router.service";
-import { AcceptOrganizationInviteService } from "../../../organization-invite/accept-organization.service";
 
 export class WebSetPasswordJitService
   extends DefaultSetPasswordJitService
   implements SetPasswordJitService
 {
   routerService = inject(RouterService);
-  acceptOrganizationInviteService = inject(AcceptOrganizationInviteService);
+  organizationInviteService = inject(OrganizationInviteService);
 
   override async setPassword(credentials: SetPasswordCredentials) {
     await super.setPassword(credentials);
@@ -22,6 +22,6 @@ export class WebSetPasswordJitService
     // SSO JIT accepts org invites when setting their MP, meaning
     // we can clear the deep linked url for accepting it.
     await this.routerService.getAndClearLoginRedirectUrl();
-    await this.acceptOrganizationInviteService.clearOrganizationInvitation();
+    await this.organizationInviteService.clearOrganizationInvitation();
   }
 }
diff --git a/apps/web/src/app/auth/core/services/two-factor-auth/index.ts b/apps/web/src/app/auth/core/services/two-factor-auth/index.ts
index ba2697fdee4..4ca57b34737 100644
--- a/apps/web/src/app/auth/core/services/two-factor-auth/index.ts
+++ b/apps/web/src/app/auth/core/services/two-factor-auth/index.ts
@@ -1,2 +1 @@
-export * from "./web-two-factor-auth-component.service";
 export * from "./web-two-factor-auth-duo-component.service";
diff --git a/apps/web/src/app/auth/core/services/two-factor-auth/web-two-factor-auth-component.service.ts b/apps/web/src/app/auth/core/services/two-factor-auth/web-two-factor-auth-component.service.ts
deleted file mode 100644
index 451cec57ddd..00000000000
--- a/apps/web/src/app/auth/core/services/two-factor-auth/web-two-factor-auth-component.service.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import {
-  DefaultTwoFactorAuthComponentService,
-  TwoFactorAuthComponentService,
-  LegacyKeyMigrationAction,
-} from "@bitwarden/auth/angular";
-
-export class WebTwoFactorAuthComponentService
-  extends DefaultTwoFactorAuthComponentService
-  implements TwoFactorAuthComponentService
-{
-  override determineLegacyKeyMigrationAction(): LegacyKeyMigrationAction {
-    return LegacyKeyMigrationAction.NAVIGATE_TO_MIGRATION_COMPONENT;
-  }
-}
diff --git a/apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.ts b/apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.ts
index b3f635aee92..e1b7329504c 100644
--- a/apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.ts
+++ b/apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.ts
@@ -13,7 +13,6 @@ import { EmergencyAccessModule } from "../emergency-access.module";
 import { EmergencyAccessService } from "../services/emergency-access.service";
 
 @Component({
-  standalone: true,
   imports: [SharedModule, EmergencyAccessModule],
   templateUrl: "accept-emergency.component.html",
 })
diff --git a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts
index 5094c0c09ab..2cc9ff8b302 100644
--- a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts
+++ b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Injectable } from "@angular/core";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -87,13 +85,23 @@ export class EmergencyAccessService
   }
 
   /**
-   * Returns policies that apply to the grantor.
+   * Returns policies that apply to the grantor if the grantor is the owner of an org, otherwise returns null.
    * Intended for grantee.
    * @param id emergency access id
+   *
+   * @remarks
+   * The ONLY time the API call will return an array of policies is when the Grantor is the OWNER
+   * of an organization. In all other scenarios the server returns null. Even if the Grantor
+   * is the member of an org that has enforced MP policies, the server will still return null
+   * because in the Emergency Access Takeover process, the Grantor gets removed from the org upon
+   * takeover, and therefore the MP policies are irrelevant.
+   *
+   * The only scenario where a Grantor does NOT get removed from the org is when that Grantor is the
+   * OWNER of the org. In that case the server returns Grantor policies and we enforce them on the client.
    */
   async getGrantorPolicies(id: string): Promise<Policy[]> {
     const response = await this.emergencyAccessApiService.getEmergencyGrantorPolicies(id);
-    let policies: Policy[];
+    let policies: Policy[] = [];
     if (response.data != null && response.data.length > 0) {
       policies = response.data.map((policyResponse) => new Policy(new PolicyData(policyResponse)));
     }
@@ -299,6 +307,10 @@ export class EmergencyAccessService
 
     const encKey = await this.keyService.encryptUserKeyWithMasterKey(masterKey, grantorUserKey);
 
+    if (encKey == null || !encKey[1].encryptedString) {
+      throw new Error("masterKeyEncryptedUserKey not found");
+    }
+
     const request = new EmergencyAccessPasswordRequest();
     request.newMasterPasswordHash = masterKeyHash;
     request.key = encKey[1].encryptedString;
@@ -405,6 +417,15 @@ export class EmergencyAccessService
   }
 
   private async encryptKey(userKey: UserKey, publicKey: Uint8Array): Promise<EncryptedString> {
-    return (await this.encryptService.encapsulateKeyUnsigned(userKey, publicKey)).encryptedString;
+    const publicKeyEncryptedUserKey = await this.encryptService.encapsulateKeyUnsigned(
+      userKey,
+      publicKey,
+    );
+
+    if (publicKeyEncryptedUserKey == null || !publicKeyEncryptedUserKey.encryptedString) {
+      throw new Error("publicKeyEncryptedUserKey not found");
+    }
+
+    return publicKeyEncryptedUserKey.encryptedString;
   }
 }
diff --git a/apps/web/src/app/auth/organization-invite/accept-organization.component.ts b/apps/web/src/app/auth/organization-invite/accept-organization.component.ts
index 838a3029711..b60007ca91e 100644
--- a/apps/web/src/app/auth/organization-invite/accept-organization.component.ts
+++ b/apps/web/src/app/auth/organization-invite/accept-organization.component.ts
@@ -4,13 +4,14 @@ import { Component } from "@angular/core";
 import { ActivatedRoute, Params, Router } from "@angular/router";
 
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { OrganizationInvite } from "@bitwarden/common/auth/services/organization-invite/organization-invite";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
 import { BaseAcceptComponent } from "../../common/base.accept.component";
 
 import { AcceptOrganizationInviteService } from "./accept-organization.service";
-import { OrganizationInvite } from "./organization-invite";
 
 @Component({
   templateUrl: "accept-organization.component.html",
@@ -21,18 +22,19 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
   protected requiredParameters: string[] = ["organizationId", "organizationUserId", "token"];
 
   constructor(
-    router: Router,
-    platformUtilsService: PlatformUtilsService,
-    i18nService: I18nService,
-    route: ActivatedRoute,
-    authService: AuthService,
+    protected router: Router,
+    protected platformUtilsService: PlatformUtilsService,
+    protected i18nService: I18nService,
+    protected route: ActivatedRoute,
+    protected authService: AuthService,
     private acceptOrganizationInviteService: AcceptOrganizationInviteService,
+    private organizationInviteService: OrganizationInviteService,
   ) {
     super(router, platformUtilsService, i18nService, route, authService);
   }
 
   async authedHandler(qParams: Params): Promise<void> {
-    const invite = OrganizationInvite.fromParams(qParams);
+    const invite = this.fromParams(qParams);
     const success = await this.acceptOrganizationInviteService.validateAndAcceptInvite(invite);
 
     if (!success) {
@@ -52,9 +54,9 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
   }
 
   async unauthedHandler(qParams: Params): Promise<void> {
-    const invite = OrganizationInvite.fromParams(qParams);
+    const invite = this.fromParams(qParams);
 
-    await this.acceptOrganizationInviteService.setOrganizationInvitation(invite);
+    await this.organizationInviteService.setOrganizationInvitation(invite);
     await this.navigateInviteAcceptance(invite);
   }
 
@@ -94,4 +96,21 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
     });
     return;
   }
+
+  private fromParams(params: Params): OrganizationInvite | null {
+    if (params == null) {
+      return null;
+    }
+
+    return Object.assign(new OrganizationInvite(), {
+      email: params.email,
+      initOrganization: params.initOrganization?.toLocaleLowerCase() === "true",
+      orgSsoIdentifier: params.orgSsoIdentifier,
+      orgUserHasExistingUser: params.orgUserHasExistingUser?.toLocaleLowerCase() === "true",
+      organizationId: params.organizationId,
+      organizationName: params.organizationName,
+      organizationUserId: params.organizationUserId,
+      token: params.token,
+    });
+  }
 }
diff --git a/apps/web/src/app/auth/organization-invite/accept-organization.service.spec.ts b/apps/web/src/app/auth/organization-invite/accept-organization.service.spec.ts
index 253328b0c04..2fd869049bb 100644
--- a/apps/web/src/app/auth/organization-invite/accept-organization.service.spec.ts
+++ b/apps/web/src/app/auth/organization-invite/accept-organization.service.spec.ts
@@ -1,6 +1,5 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { FakeGlobalStateProvider } from "@bitwarden/common/../spec/fake-state-provider";
 import { MockProxy, mock } from "jest-mock-extended";
 import { BehaviorSubject } from "rxjs";
 
@@ -15,22 +14,18 @@ import { ResetPasswordPolicyOptions } from "@bitwarden/common/admin-console/mode
 import { OrganizationKeysResponse } from "@bitwarden/common/admin-console/models/response/organization-keys.response";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { OrganizationInvite } from "@bitwarden/common/auth/services/organization-invite/organization-invite";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
-import { FakeGlobalState } from "@bitwarden/common/spec/fake-state";
 import { OrgKey } from "@bitwarden/common/types/key";
-import { DialogService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 
 import { I18nService } from "../../core/i18n.service";
 
-import {
-  AcceptOrganizationInviteService,
-  ORGANIZATION_INVITE,
-} from "./accept-organization.service";
-import { OrganizationInvite } from "./organization-invite";
+import { AcceptOrganizationInviteService } from "./accept-organization.service";
 
 describe("AcceptOrganizationInviteService", () => {
   let sut: AcceptOrganizationInviteService;
@@ -43,10 +38,8 @@ describe("AcceptOrganizationInviteService", () => {
   let logService: MockProxy<LogService>;
   let organizationApiService: MockProxy<OrganizationApiServiceAbstraction>;
   let organizationUserApiService: MockProxy<OrganizationUserApiService>;
+  let organizationInviteService: MockProxy<OrganizationInviteService>;
   let i18nService: MockProxy<I18nService>;
-  let globalStateProvider: FakeGlobalStateProvider;
-  let globalState: FakeGlobalState<OrganizationInvite>;
-  let dialogService: MockProxy<DialogService>;
   let accountService: MockProxy<AccountService>;
 
   beforeEach(() => {
@@ -59,10 +52,8 @@ describe("AcceptOrganizationInviteService", () => {
     logService = mock();
     organizationApiService = mock();
     organizationUserApiService = mock();
+    organizationInviteService = mock();
     i18nService = mock();
-    globalStateProvider = new FakeGlobalStateProvider();
-    globalState = globalStateProvider.getFake(ORGANIZATION_INVITE);
-    dialogService = mock();
     accountService = mock();
 
     sut = new AcceptOrganizationInviteService(
@@ -76,8 +67,7 @@ describe("AcceptOrganizationInviteService", () => {
       organizationApiService,
       organizationUserApiService,
       i18nService,
-      globalStateProvider,
-      dialogService,
+      organizationInviteService,
       accountService,
     );
   });
@@ -103,8 +93,10 @@ describe("AcceptOrganizationInviteService", () => {
       expect(result).toBe(true);
       expect(organizationUserApiService.postOrganizationUserAcceptInit).toHaveBeenCalled();
       expect(apiService.refreshIdentityToken).toHaveBeenCalled();
-      expect(globalState.nextMock).toHaveBeenCalledWith(null);
       expect(organizationUserApiService.postOrganizationUserAccept).not.toHaveBeenCalled();
+      expect(organizationInviteService.getOrganizationInvite).not.toHaveBeenCalled();
+      expect(organizationInviteService.setOrganizationInvitation).not.toHaveBeenCalled();
+      expect(organizationInviteService.clearOrganizationInvitation).toHaveBeenCalled();
       expect(authService.logOut).not.toHaveBeenCalled();
     });
 
@@ -121,13 +113,16 @@ describe("AcceptOrganizationInviteService", () => {
 
       expect(result).toBe(false);
       expect(authService.logOut).toHaveBeenCalled();
-      expect(globalState.nextMock).toHaveBeenCalledWith(invite);
+      expect(organizationInviteService.setOrganizationInvitation).toHaveBeenCalledWith(invite);
+      expect(organizationInviteService.clearOrganizationInvitation).toHaveBeenCalled();
     });
 
     it("clears the stored invite when a master password policy check is required but the stored invite doesn't match the provided one", async () => {
       const storedInvite = createOrgInvite({ email: "wrongemail@example.com" });
       const providedInvite = createOrgInvite();
-      await globalState.update(() => storedInvite);
+      organizationInviteService.getOrganizationInvite.mockReturnValueOnce(
+        Promise.resolve(storedInvite),
+      );
       policyApiService.getPoliciesByToken.mockResolvedValue([
         {
           type: PolicyType.MasterPassword,
@@ -139,7 +134,11 @@ describe("AcceptOrganizationInviteService", () => {
 
       expect(result).toBe(false);
       expect(authService.logOut).toHaveBeenCalled();
-      expect(globalState.nextMock).toHaveBeenCalledWith(providedInvite);
+      expect(organizationInviteService.setOrganizationInvitation).toHaveBeenCalledWith(
+        providedInvite,
+      );
+      expect(organizationInviteService.getOrganizationInvite).toHaveBeenCalledWith();
+      expect(organizationInviteService.clearOrganizationInvitation).toHaveBeenCalled();
     });
 
     it("accepts the invitation request when the organization doesn't have a master password policy", async () => {
@@ -151,8 +150,10 @@ describe("AcceptOrganizationInviteService", () => {
       expect(result).toBe(true);
       expect(organizationUserApiService.postOrganizationUserAccept).toHaveBeenCalled();
       expect(apiService.refreshIdentityToken).toHaveBeenCalled();
-      expect(globalState.nextMock).toHaveBeenCalledWith(null);
       expect(organizationUserApiService.postOrganizationUserAcceptInit).not.toHaveBeenCalled();
+      expect(organizationInviteService.setOrganizationInvitation).not.toHaveBeenCalled();
+      expect(organizationInviteService.getOrganizationInvite).not.toHaveBeenCalled();
+      expect(organizationInviteService.clearOrganizationInvitation).toHaveBeenCalled();
       expect(authService.logOut).not.toHaveBeenCalled();
     });
 
@@ -165,7 +166,7 @@ describe("AcceptOrganizationInviteService", () => {
         } as Policy,
       ]);
       // an existing invite means the user has already passed the master password policy
-      await globalState.update(() => invite);
+      organizationInviteService.getOrganizationInvite.mockReturnValueOnce(Promise.resolve(invite));
 
       policyService.getResetPasswordPolicyOptions.mockReturnValue([
         {
@@ -179,6 +180,8 @@ describe("AcceptOrganizationInviteService", () => {
       expect(result).toBe(true);
       expect(organizationUserApiService.postOrganizationUserAccept).toHaveBeenCalled();
       expect(organizationUserApiService.postOrganizationUserAcceptInit).not.toHaveBeenCalled();
+      expect(organizationInviteService.getOrganizationInvite).toHaveBeenCalledWith();
+      expect(organizationInviteService.clearOrganizationInvitation).toHaveBeenCalled();
       expect(authService.logOut).not.toHaveBeenCalled();
     });
 
@@ -202,7 +205,7 @@ describe("AcceptOrganizationInviteService", () => {
         encryptedString: "encryptedString",
       } as EncString);
 
-      await globalState.update(() => invite);
+      organizationInviteService.getOrganizationInvite.mockReturnValueOnce(Promise.resolve(invite));
 
       policyService.getResetPasswordPolicyOptions.mockReturnValue([
         {
@@ -220,6 +223,9 @@ describe("AcceptOrganizationInviteService", () => {
       );
       expect(organizationUserApiService.postOrganizationUserAccept).toHaveBeenCalled();
       expect(organizationUserApiService.postOrganizationUserAcceptInit).not.toHaveBeenCalled();
+      expect(organizationInviteService.getOrganizationInvite).toHaveBeenCalledTimes(1);
+      expect(organizationInviteService.getOrganizationInvite).toHaveBeenCalledWith();
+      expect(organizationInviteService.clearOrganizationInvitation).toHaveBeenCalled();
       expect(authService.logOut).not.toHaveBeenCalled();
     });
   });
diff --git a/apps/web/src/app/auth/organization-invite/accept-organization.service.ts b/apps/web/src/app/auth/organization-invite/accept-organization.service.ts
index c68b174166d..a5f5eb828fa 100644
--- a/apps/web/src/app/auth/organization-invite/accept-organization.service.ts
+++ b/apps/web/src/app/auth/organization-invite/accept-organization.service.ts
@@ -17,36 +17,17 @@ import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { OrganizationInvite } from "@bitwarden/common/auth/services/organization-invite/organization-invite";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import {
-  GlobalState,
-  GlobalStateProvider,
-  KeyDefinition,
-  ORGANIZATION_INVITE_DISK,
-} from "@bitwarden/common/platform/state";
 import { OrgKey } from "@bitwarden/common/types/key";
-import { DialogService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 
-import { OrganizationInvite } from "./organization-invite";
-
-// We're storing the organization invite for 2 reasons:
-// 1. If the org requires a MP policy check, we need to keep track that the user has already been redirected when they return.
-// 2. The MP policy check happens on login/register flows, we need to store the token to retrieve the policies then.
-export const ORGANIZATION_INVITE = new KeyDefinition<OrganizationInvite | null>(
-  ORGANIZATION_INVITE_DISK,
-  "organizationInvite",
-  {
-    deserializer: (invite) => (invite ? OrganizationInvite.fromJSON(invite) : null),
-  },
-);
-
 @Injectable()
 export class AcceptOrganizationInviteService {
-  private organizationInvitationState: GlobalState<OrganizationInvite | null>;
   private orgNameSubject: BehaviorSubject<string> = new BehaviorSubject<string>(null);
   private policyCache: Policy[];
 
@@ -64,34 +45,9 @@ export class AcceptOrganizationInviteService {
     private readonly organizationApiService: OrganizationApiServiceAbstraction,
     private readonly organizationUserApiService: OrganizationUserApiService,
     private readonly i18nService: I18nService,
-    private readonly globalStateProvider: GlobalStateProvider,
-    private readonly dialogService: DialogService,
+    private readonly organizationInviteService: OrganizationInviteService,
     private readonly accountService: AccountService,
-  ) {
-    this.organizationInvitationState = this.globalStateProvider.get(ORGANIZATION_INVITE);
-  }
-
-  /** Returns the currently stored organization invite */
-  async getOrganizationInvite(): Promise<OrganizationInvite | null> {
-    return await firstValueFrom(this.organizationInvitationState.state$);
-  }
-
-  /**
-   * Stores a new organization invite
-   * @param invite an organization invite
-   * @throws if the invite is nullish
-   */
-  async setOrganizationInvitation(invite: OrganizationInvite): Promise<void> {
-    if (invite == null) {
-      throw new Error("Invite cannot be null. Use clearOrganizationInvitation instead.");
-    }
-    await this.organizationInvitationState.update(() => invite);
-  }
-
-  /** Clears the currently stored organization invite */
-  async clearOrganizationInvitation(): Promise<void> {
-    await this.organizationInvitationState.update(() => null);
-  }
+  ) {}
 
   /**
    * Validates and accepts the organization invitation if possible.
@@ -113,7 +69,7 @@ export class AcceptOrganizationInviteService {
 
     // Accepting an org invite from existing org
     if (await this.masterPasswordPolicyCheckRequired(invite)) {
-      await this.setOrganizationInvitation(invite);
+      await this.organizationInviteService.setOrganizationInvitation(invite);
       this.authService.logOut(() => {
         /* Do nothing */
       });
@@ -134,7 +90,7 @@ export class AcceptOrganizationInviteService {
       ),
     );
     await this.apiService.refreshIdentityToken();
-    await this.clearOrganizationInvitation();
+    await this.organizationInviteService.clearOrganizationInvitation();
   }
 
   private async prepareAcceptAndInitRequest(
@@ -170,7 +126,7 @@ export class AcceptOrganizationInviteService {
     );
 
     await this.apiService.refreshIdentityToken();
-    await this.clearOrganizationInvitation();
+    await this.organizationInviteService.clearOrganizationInvitation();
   }
 
   private async prepareAcceptRequest(
@@ -224,10 +180,10 @@ export class AcceptOrganizationInviteService {
       (p) => p.type === PolicyType.MasterPassword && p.enabled,
     );
 
-    let storedInvite = await this.getOrganizationInvite();
+    let storedInvite = await this.organizationInviteService.getOrganizationInvite();
     if (storedInvite?.email !== invite.email) {
       // clear stored invites if the email doesn't match
-      await this.clearOrganizationInvitation();
+      await this.organizationInviteService.clearOrganizationInvitation();
       storedInvite = null;
     }
     // if we don't have an org invite stored, we know the user hasn't been redirected yet to check the MP policy
diff --git a/apps/web/src/app/auth/organization-invite/organization-invite.ts b/apps/web/src/app/auth/organization-invite/organization-invite.ts
deleted file mode 100644
index 65414113e74..00000000000
--- a/apps/web/src/app/auth/organization-invite/organization-invite.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Params } from "@angular/router";
-import { Jsonify } from "type-fest";
-
-export class OrganizationInvite {
-  email: string;
-  initOrganization: boolean;
-  orgSsoIdentifier: string;
-  orgUserHasExistingUser: boolean;
-  organizationId: string;
-  organizationName: string;
-  organizationUserId: string;
-  token: string;
-
-  static fromJSON(json: Jsonify<OrganizationInvite>): OrganizationInvite | null {
-    if (json == null) {
-      return null;
-    }
-
-    return Object.assign(new OrganizationInvite(), json);
-  }
-
-  static fromParams(params: Params): OrganizationInvite | null {
-    if (params == null) {
-      return null;
-    }
-
-    return Object.assign(new OrganizationInvite(), {
-      email: params.email,
-      initOrganization: params.initOrganization?.toLocaleLowerCase() === "true",
-      orgSsoIdentifier: params.orgSsoIdentifier,
-      orgUserHasExistingUser: params.orgUserHasExistingUser?.toLocaleLowerCase() === "true",
-      organizationId: params.organizationId,
-      organizationName: params.organizationName,
-      organizationUserId: params.organizationUserId,
-      token: params.token,
-    });
-  }
-}
diff --git a/apps/web/src/app/auth/set-password.component.ts b/apps/web/src/app/auth/set-password.component.ts
index e297426f2c1..f61981a93d3 100644
--- a/apps/web/src/app/auth/set-password.component.ts
+++ b/apps/web/src/app/auth/set-password.component.ts
@@ -1,13 +1,12 @@
 import { Component, inject } from "@angular/core";
 
 import { SetPasswordComponent as BaseSetPasswordComponent } from "@bitwarden/angular/auth/components/set-password.component";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { MasterKey, UserKey } from "@bitwarden/common/types/key";
 
 import { RouterService } from "../core";
 
-import { AcceptOrganizationInviteService } from "./organization-invite/accept-organization.service";
-
 @Component({
   selector: "app-set-password",
   templateUrl: "set-password.component.html",
@@ -15,7 +14,7 @@ import { AcceptOrganizationInviteService } from "./organization-invite/accept-or
 })
 export class SetPasswordComponent extends BaseSetPasswordComponent {
   routerService = inject(RouterService);
-  acceptOrganizationInviteService = inject(AcceptOrganizationInviteService);
+  organizationInviteService = inject(OrganizationInviteService);
 
   protected override async onSetPasswordSuccess(
     masterKey: MasterKey,
@@ -26,6 +25,6 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
     // SSO JIT accepts org invites when setting their MP, meaning
     // we can clear the deep linked url for accepting it.
     await this.routerService.getAndClearLoginRedirectUrl();
-    await this.acceptOrganizationInviteService.clearOrganizationInvitation();
+    await this.organizationInviteService.clearOrganizationInvitation();
   }
 }
diff --git a/apps/web/src/app/auth/settings/account/account.component.ts b/apps/web/src/app/auth/settings/account/account.component.ts
index c06df56e386..921db19bc49 100644
--- a/apps/web/src/app/auth/settings/account/account.component.ts
+++ b/apps/web/src/app/auth/settings/account/account.component.ts
@@ -21,7 +21,6 @@ import { SetAccountVerifyDevicesDialogComponent } from "./set-account-verify-dev
 
 @Component({
   templateUrl: "account.component.html",
-  standalone: true,
   imports: [
     SharedModule,
     HeaderModule,
diff --git a/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.ts b/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.ts
index 80fdb20954f..6bb785fb8f5 100644
--- a/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.ts
@@ -35,7 +35,6 @@ type ChangeAvatarDialogData = {
 @Component({
   templateUrl: "change-avatar-dialog.component.html",
   encapsulation: ViewEncapsulation.None,
-  standalone: true,
   imports: [SharedModule, SelectableAvatarComponent],
 })
 export class ChangeAvatarDialogComponent implements OnInit, OnDestroy {
diff --git a/apps/web/src/app/auth/settings/account/change-email.component.ts b/apps/web/src/app/auth/settings/account/change-email.component.ts
index 98f704d6044..a55846a5c0f 100644
--- a/apps/web/src/app/auth/settings/account/change-email.component.ts
+++ b/apps/web/src/app/auth/settings/account/change-email.component.ts
@@ -19,7 +19,6 @@ import { SharedModule } from "../../../shared";
 @Component({
   selector: "app-change-email",
   templateUrl: "change-email.component.html",
-  standalone: true,
   imports: [SharedModule],
 })
 export class ChangeEmailComponent implements OnInit {
diff --git a/apps/web/src/app/auth/settings/account/danger-zone.component.ts b/apps/web/src/app/auth/settings/account/danger-zone.component.ts
index e07b6e6b8db..05fd22d087d 100644
--- a/apps/web/src/app/auth/settings/account/danger-zone.component.ts
+++ b/apps/web/src/app/auth/settings/account/danger-zone.component.ts
@@ -12,7 +12,6 @@ import { I18nPipe } from "@bitwarden/ui-common";
 @Component({
   selector: "app-danger-zone",
   templateUrl: "danger-zone.component.html",
-  standalone: true,
   imports: [CommonModule, TypographyModule, I18nPipe],
 })
 export class DangerZoneComponent {}
diff --git a/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.ts b/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.ts
index a48e968ab3e..f75320e8335 100644
--- a/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.ts
+++ b/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.ts
@@ -14,7 +14,6 @@ import { SharedModule } from "../../../shared";
 
 @Component({
   templateUrl: "deauthorize-sessions.component.html",
-  standalone: true,
   imports: [SharedModule, UserVerificationFormInputComponent],
 })
 export class DeauthorizeSessionsComponent {
diff --git a/apps/web/src/app/auth/settings/account/delete-account-dialog.component.ts b/apps/web/src/app/auth/settings/account/delete-account-dialog.component.ts
index 0fc2276b779..7e8f169994f 100644
--- a/apps/web/src/app/auth/settings/account/delete-account-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/account/delete-account-dialog.component.ts
@@ -14,7 +14,6 @@ import { SharedModule } from "../../../shared";
 
 @Component({
   templateUrl: "delete-account-dialog.component.html",
-  standalone: true,
   imports: [SharedModule, UserVerificationFormInputComponent],
 })
 export class DeleteAccountDialogComponent {
diff --git a/apps/web/src/app/auth/settings/account/profile.component.html b/apps/web/src/app/auth/settings/account/profile.component.html
index d2a887c9b98..74e9cf08f89 100644
--- a/apps/web/src/app/auth/settings/account/profile.component.html
+++ b/apps/web/src/app/auth/settings/account/profile.component.html
@@ -38,7 +38,11 @@
       </div>
       <div *ngIf="managingOrganization$ | async as managingOrganization">
         {{ "accountIsOwnedMessage" | i18n: managingOrganization?.name }}
-        <a href="https://bitwarden.com/help/claimed-accounts">
+        <a
+          target="_blank"
+          rel="noopener noreferrer"
+          href="https://bitwarden.com/help/claimed-accounts"
+        >
           <i class="bwi bwi-question-circle" aria-hidden="true"></i>
         </a>
       </div>
diff --git a/apps/web/src/app/auth/settings/account/profile.component.ts b/apps/web/src/app/auth/settings/account/profile.component.ts
index a33efd742aa..a0572b846db 100644
--- a/apps/web/src/app/auth/settings/account/profile.component.ts
+++ b/apps/web/src/app/auth/settings/account/profile.component.ts
@@ -23,7 +23,6 @@ import { ChangeAvatarDialogComponent } from "./change-avatar-dialog.component";
 @Component({
   selector: "app-profile",
   templateUrl: "profile.component.html",
-  standalone: true,
   imports: [SharedModule, DynamicAvatarComponent, AccountFingerprintComponent],
 })
 export class ProfileComponent implements OnInit, OnDestroy {
diff --git a/apps/web/src/app/auth/settings/account/selectable-avatar.component.ts b/apps/web/src/app/auth/settings/account/selectable-avatar.component.ts
index a53e3990090..630c0e949ad 100644
--- a/apps/web/src/app/auth/settings/account/selectable-avatar.component.ts
+++ b/apps/web/src/app/auth/settings/account/selectable-avatar.component.ts
@@ -27,7 +27,6 @@ import { AvatarModule } from "@bitwarden/components";
     >
     </bit-avatar>
   </span>`,
-  standalone: true,
   imports: [NgClass, AvatarModule],
 })
 export class SelectableAvatarComponent {
diff --git a/apps/web/src/app/auth/settings/account/set-account-verify-devices-dialog.component.ts b/apps/web/src/app/auth/settings/account/set-account-verify-devices-dialog.component.ts
index 69240426249..63a26f08eee 100644
--- a/apps/web/src/app/auth/settings/account/set-account-verify-devices-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/account/set-account-verify-devices-dialog.component.ts
@@ -29,7 +29,6 @@ import {
 
 @Component({
   templateUrl: "./set-account-verify-devices-dialog.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     ReactiveFormsModule,
diff --git a/apps/web/src/app/auth/settings/change-password.component.ts b/apps/web/src/app/auth/settings/change-password.component.ts
index 1d95a498694..ce10a0e5a34 100644
--- a/apps/web/src/app/auth/settings/change-password.component.ts
+++ b/apps/web/src/app/auth/settings/change-password.component.ts
@@ -12,16 +12,10 @@ import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/ma
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { HashPurpose } from "@bitwarden/common/platform/enums";
-import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
-import { UserId } from "@bitwarden/common/types/guid";
-import { MasterKey, UserKey } from "@bitwarden/common/types/key";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService, ToastService } from "@bitwarden/components";
@@ -47,45 +41,41 @@ export class ChangePasswordComponent
   masterPasswordHint: string;
   checkForBreaches = true;
   characterMinimumMessage = "";
-  userkeyRotationV2 = false;
 
   constructor(
-    i18nService: I18nService,
-    keyService: KeyService,
-    messagingService: MessagingService,
-    platformUtilsService: PlatformUtilsService,
-    policyService: PolicyService,
     private auditService: AuditService,
     private cipherService: CipherService,
-    private syncService: SyncService,
+    private keyRotationService: UserKeyRotationService,
     private masterPasswordApiService: MasterPasswordApiService,
     private router: Router,
-    dialogService: DialogService,
+    private syncService: SyncService,
     private userVerificationService: UserVerificationService,
-    private keyRotationService: UserKeyRotationService,
-    kdfConfigService: KdfConfigService,
+    protected accountService: AccountService,
+    protected dialogService: DialogService,
+    protected i18nService: I18nService,
+    protected kdfConfigService: KdfConfigService,
+    protected keyService: KeyService,
     protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
-    accountService: AccountService,
-    toastService: ToastService,
-    private configService: ConfigService,
+    protected messagingService: MessagingService,
+    protected platformUtilsService: PlatformUtilsService,
+    protected policyService: PolicyService,
+    protected toastService: ToastService,
   ) {
     super(
+      accountService,
+      dialogService,
       i18nService,
+      kdfConfigService,
       keyService,
+      masterPasswordService,
       messagingService,
       platformUtilsService,
       policyService,
-      dialogService,
-      kdfConfigService,
-      masterPasswordService,
-      accountService,
       toastService,
     );
   }
 
   async ngOnInit() {
-    this.userkeyRotationV2 = await this.configService.getFeatureFlag(FeatureFlag.UserKeyRotationV2);
-
     if (!(await this.userVerificationService.hasMasterPassword())) {
       // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -148,22 +138,14 @@ export class ChangePasswordComponent
   }
 
   async submit() {
-    if (this.userkeyRotationV2) {
-      this.loading = true;
-      await this.submitNew();
-      this.loading = false;
-    } else {
-      await this.submitOld();
-    }
-  }
-
-  async submitNew() {
+    this.loading = true;
     if (this.currentMasterPassword == null || this.currentMasterPassword === "") {
       this.toastService.showToast({
         variant: "error",
         title: this.i18nService.t("errorOccurred"),
         message: this.i18nService.t("masterPasswordRequired"),
       });
+      this.loading = false;
       return;
     }
 
@@ -176,6 +158,7 @@ export class ChangePasswordComponent
         title: this.i18nService.t("errorOccurred"),
         message: this.i18nService.t("hintEqualsPassword"),
       });
+      this.loading = false;
       return;
     }
 
@@ -185,6 +168,7 @@ export class ChangePasswordComponent
     }
 
     if (!(await this.strongPassword())) {
+      this.loading = false;
       return;
     }
 
@@ -207,6 +191,8 @@ export class ChangePasswordComponent
         title: this.i18nService.t("errorOccurred"),
         message: e.message,
       });
+    } finally {
+      this.loading = false;
     }
   }
 
@@ -258,8 +244,7 @@ export class ChangePasswordComponent
       await this.masterPasswordApiService.postPassword(request);
       this.toastService.showToast({
         variant: "success",
-        title: this.i18nService.t("masterPasswordChanged"),
-        message: this.i18nService.t("masterPasswordChangedDesc"),
+        message: this.i18nService.t("masterPasswordChanged"),
       });
       this.messagingService.send("logout");
     } catch {
@@ -270,116 +255,4 @@ export class ChangePasswordComponent
       });
     }
   }
-
-  async submitOld() {
-    if (
-      this.masterPasswordHint != null &&
-      this.masterPasswordHint.toLowerCase() === this.masterPassword.toLowerCase()
-    ) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("hintEqualsPassword"),
-      });
-      return;
-    }
-
-    this.leakedPassword = false;
-    if (this.checkForBreaches) {
-      this.leakedPassword = (await this.auditService.passwordLeaked(this.masterPassword)) > 0;
-    }
-
-    await super.submit();
-  }
-
-  async setupSubmitActions() {
-    if (this.currentMasterPassword == null || this.currentMasterPassword === "") {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("masterPasswordRequired"),
-      });
-      return false;
-    }
-
-    if (this.rotateUserKey) {
-      await this.syncService.fullSync(true);
-    }
-
-    return super.setupSubmitActions();
-  }
-
-  async performSubmitActions(
-    newMasterPasswordHash: string,
-    newMasterKey: MasterKey,
-    newUserKey: [UserKey, EncString],
-  ) {
-    const [userId, email] = await firstValueFrom(
-      this.accountService.activeAccount$.pipe(map((a) => [a?.id, a?.email])),
-    );
-
-    const masterKey = await this.keyService.makeMasterKey(
-      this.currentMasterPassword,
-      email,
-      await this.kdfConfigService.getKdfConfig(userId),
-    );
-
-    const newLocalKeyHash = await this.keyService.hashMasterKey(
-      this.masterPassword,
-      newMasterKey,
-      HashPurpose.LocalAuthorization,
-    );
-
-    const userKey = await this.masterPasswordService.decryptUserKeyWithMasterKey(masterKey, userId);
-    if (userKey == null) {
-      this.toastService.showToast({
-        variant: "error",
-        title: null,
-        message: this.i18nService.t("invalidMasterPassword"),
-      });
-      return;
-    }
-
-    const request = new PasswordRequest();
-    request.masterPasswordHash = await this.keyService.hashMasterKey(
-      this.currentMasterPassword,
-      masterKey,
-    );
-    request.masterPasswordHint = this.masterPasswordHint;
-    request.newMasterPasswordHash = newMasterPasswordHash;
-    request.key = newUserKey[1].encryptedString;
-
-    try {
-      if (this.rotateUserKey) {
-        this.formPromise = this.masterPasswordApiService.postPassword(request).then(async () => {
-          // we need to save this for local masterkey verification during rotation
-          await this.masterPasswordService.setMasterKeyHash(newLocalKeyHash, userId as UserId);
-          await this.masterPasswordService.setMasterKey(newMasterKey, userId as UserId);
-          return this.updateKey();
-        });
-      } else {
-        this.formPromise = this.masterPasswordApiService.postPassword(request);
-      }
-
-      await this.formPromise;
-
-      this.toastService.showToast({
-        variant: "success",
-        title: this.i18nService.t("masterPasswordChanged"),
-        message: this.i18nService.t("logBackIn"),
-      });
-      this.messagingService.send("logout");
-    } catch {
-      this.toastService.showToast({
-        variant: "error",
-        title: null,
-        message: this.i18nService.t("errorOccurred"),
-      });
-    }
-  }
-
-  private async updateKey() {
-    const user = await firstValueFrom(this.accountService.activeAccount$);
-    await this.keyRotationService.rotateUserKeyAndEncryptedDataLegacy(this.masterPassword, user);
-  }
 }
diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts
index 23bf0c22bc7..1d78bb7dd17 100644
--- a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts
@@ -10,6 +10,8 @@ import { OrganizationManagementPreferencesService } from "@bitwarden/common/admi
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -34,6 +36,10 @@ import {
   EmergencyAccessAddEditComponent,
   EmergencyAccessAddEditDialogResult,
 } from "./emergency-access-add-edit.component";
+import {
+  EmergencyAccessTakeoverDialogComponent,
+  EmergencyAccessTakeoverDialogResultType,
+} from "./takeover/emergency-access-takeover-dialog.component";
 import {
   EmergencyAccessTakeoverComponent,
   EmergencyAccessTakeoverResultType,
@@ -69,6 +75,7 @@ export class EmergencyAccessComponent implements OnInit {
     private toastService: ToastService,
     private apiService: ApiService,
     private accountService: AccountService,
+    private configService: ConfigService,
   ) {
     this.canAccessPremium$ = this.accountService.activeAccount$.pipe(
       switchMap((account) =>
@@ -285,6 +292,45 @@ export class EmergencyAccessComponent implements OnInit {
   }
 
   takeover = async (details: GrantorEmergencyAccess) => {
+    const changePasswordRefactorFlag = await this.configService.getFeatureFlag(
+      FeatureFlag.PM16117_ChangeExistingPasswordRefactor,
+    );
+
+    if (changePasswordRefactorFlag) {
+      if (!details || !details.email || !details.id) {
+        this.toastService.showToast({
+          variant: "error",
+          title: this.i18nService.t("errorOccurred"),
+          message: this.i18nService.t("grantorDetailsNotFound"),
+        });
+        this.logService.error(
+          "Grantor details not found when attempting emergency access takeover",
+        );
+
+        return;
+      }
+
+      const grantorName = this.userNamePipe.transform(details);
+
+      const dialogRef = EmergencyAccessTakeoverDialogComponent.open(this.dialogService, {
+        data: {
+          grantorName,
+          grantorEmail: details.email,
+          emergencyAccessId: details.id,
+        },
+      });
+      const result = await lastValueFrom(dialogRef.closed);
+      if (result === EmergencyAccessTakeoverDialogResultType.Done) {
+        this.toastService.showToast({
+          variant: "success",
+          title: "",
+          message: this.i18nService.t("passwordResetFor", grantorName),
+        });
+      }
+
+      return;
+    }
+
     const dialogRef = EmergencyAccessTakeoverComponent.open(this.dialogService, {
       data: {
         name: this.userNamePipe.transform(details),
diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html
new file mode 100644
index 00000000000..2e0a81da976
--- /dev/null
+++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html
@@ -0,0 +1,46 @@
+<bit-dialog>
+  <span bitDialogTitle>
+    {{ "takeover" | i18n }}
+    <small class="tw-text-muted" *ngIf="dialogData.grantorName">{{ dialogData.grantorName }}</small>
+  </span>
+
+  <div bitDialogContent>
+    @if (initializing) {
+      <div class="tw-flex tw-items-center tw-justify-center">
+        <i
+          class="bwi bwi-spinner bwi-spin bwi-2x tw-text-muted"
+          title="{{ 'loading' | i18n }}"
+          aria-hidden="true"
+        ></i>
+        <span class="tw-sr-only">{{ "loading" | i18n }}</span>
+      </div>
+    } @else {
+      <!-- TODO: PM-22237 -->
+      <!-- <bit-callout type="warning">{{
+        "emergencyAccessLoggedOutWarning" | i18n: dialogData.grantorName
+      }}</bit-callout> -->
+
+      <auth-input-password
+        [flow]="inputPasswordFlow"
+        [masterPasswordPolicyOptions]="masterPasswordPolicyOptions"
+        (onPasswordFormSubmit)="handlePasswordFormSubmit($event)"
+        (isSubmitting)="handleIsSubmittingChange($event)"
+      ></auth-input-password>
+    }
+  </div>
+
+  <ng-container bitDialogFooter>
+    <button
+      type="button"
+      bitButton
+      buttonType="primary"
+      [disabled]="submitting$ | async"
+      (click)="handlePrimaryButtonClick()"
+    >
+      {{ "save" | i18n }}
+    </button>
+    <button type="button" bitButton buttonType="secondary" bitDialogClose>
+      {{ "cancel" | i18n }}
+    </button>
+  </ng-container>
+</bit-dialog>
diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
new file mode 100644
index 00000000000..3ad9ce6b1fb
--- /dev/null
+++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
@@ -0,0 +1,160 @@
+import { CommonModule } from "@angular/common";
+import { Component, Inject, OnInit, ViewChild } from "@angular/core";
+import { BehaviorSubject, combineLatest, firstValueFrom, map } from "rxjs";
+
+import {
+  InputPasswordComponent,
+  InputPasswordFlow,
+  PasswordInputResult,
+} from "@bitwarden/auth/angular";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import {
+  ButtonModule,
+  CalloutModule,
+  DIALOG_DATA,
+  DialogConfig,
+  DialogModule,
+  DialogRef,
+  DialogService,
+  ToastService,
+} from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+
+import { EmergencyAccessService } from "../../../emergency-access";
+
+type EmergencyAccessTakeoverDialogData = {
+  grantorName: string;
+  grantorEmail: string;
+  /** Traces a unique emergency request */
+  emergencyAccessId: string;
+};
+
+export const EmergencyAccessTakeoverDialogResultType = {
+  Done: "done",
+} as const;
+
+export type EmergencyAccessTakeoverDialogResultType =
+  (typeof EmergencyAccessTakeoverDialogResultType)[keyof typeof EmergencyAccessTakeoverDialogResultType];
+
+/**
+ * This component is used by a Grantee to take over emergency access of a Grantor's account
+ * by changing the Grantor's master password. It is displayed as a dialog when the Grantee
+ * clicks the "Takeover" button while on the `/settings/emergency-access` page (see `EmergencyAccessComponent`).
+ *
+ * @link https://bitwarden.com/help/emergency-access/
+ */
+@Component({
+  standalone: true,
+  selector: "auth-emergency-access-takeover-dialog",
+  templateUrl: "./emergency-access-takeover-dialog.component.html",
+  imports: [
+    ButtonModule,
+    CalloutModule,
+    CommonModule,
+    DialogModule,
+    I18nPipe,
+    InputPasswordComponent,
+  ],
+})
+export class EmergencyAccessTakeoverDialogComponent implements OnInit {
+  @ViewChild(InputPasswordComponent)
+  inputPasswordComponent: InputPasswordComponent | undefined = undefined;
+
+  private parentSubmittingBehaviorSubject = new BehaviorSubject(false);
+  parentSubmitting$ = this.parentSubmittingBehaviorSubject.asObservable();
+
+  private childSubmittingBehaviorSubject = new BehaviorSubject(false);
+  childSubmitting$ = this.childSubmittingBehaviorSubject.asObservable();
+
+  submitting$ = combineLatest([this.parentSubmitting$, this.childSubmitting$]).pipe(
+    map(([parentIsSubmitting, childIsSubmitting]) => parentIsSubmitting || childIsSubmitting),
+  );
+
+  initializing = true;
+  inputPasswordFlow = InputPasswordFlow.ChangePasswordDelegation;
+  masterPasswordPolicyOptions?: MasterPasswordPolicyOptions;
+
+  constructor(
+    @Inject(DIALOG_DATA) protected dialogData: EmergencyAccessTakeoverDialogData,
+    private accountService: AccountService,
+    private dialogRef: DialogRef<EmergencyAccessTakeoverDialogResultType>,
+    private emergencyAccessService: EmergencyAccessService,
+    private i18nService: I18nService,
+    private logService: LogService,
+    private policyService: PolicyService,
+    private toastService: ToastService,
+  ) {}
+
+  async ngOnInit() {
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+
+    const grantorPolicies = await this.emergencyAccessService.getGrantorPolicies(
+      this.dialogData.emergencyAccessId,
+    );
+
+    this.masterPasswordPolicyOptions = await firstValueFrom(
+      this.policyService.masterPasswordPolicyOptions$(activeUserId, grantorPolicies),
+    );
+
+    this.initializing = false;
+  }
+
+  protected handlePrimaryButtonClick = async () => {
+    if (!this.inputPasswordComponent) {
+      throw new Error("InputPasswordComponent is not initialized");
+    }
+
+    await this.inputPasswordComponent.submit();
+  };
+
+  protected async handlePasswordFormSubmit(passwordInputResult: PasswordInputResult) {
+    this.parentSubmittingBehaviorSubject.next(true);
+
+    try {
+      await this.emergencyAccessService.takeover(
+        this.dialogData.emergencyAccessId,
+        passwordInputResult.newPassword,
+        this.dialogData.grantorEmail,
+      );
+    } catch (e) {
+      this.logService.error(e);
+
+      this.toastService.showToast({
+        variant: "error",
+        title: this.i18nService.t("errorOccurred"),
+        message: this.i18nService.t("unexpectedError"),
+      });
+    } finally {
+      this.parentSubmittingBehaviorSubject.next(false);
+    }
+
+    this.dialogRef.close(EmergencyAccessTakeoverDialogResultType.Done);
+  }
+
+  protected handleIsSubmittingChange(isSubmitting: boolean) {
+    this.childSubmittingBehaviorSubject.next(isSubmitting);
+  }
+
+  /**
+   * Strongly typed helper to open an EmergencyAccessTakeoverDialogComponent
+   * @param dialogService Instance of the dialog service that will be used to open the dialog
+   * @param dialogConfig Configuration for the dialog
+   */
+  static open = (
+    dialogService: DialogService,
+    dialogConfig: DialogConfig<
+      EmergencyAccessTakeoverDialogData,
+      DialogRef<EmergencyAccessTakeoverDialogResultType, unknown>
+    >,
+  ) => {
+    return dialogService.open<
+      EmergencyAccessTakeoverDialogResultType,
+      EmergencyAccessTakeoverDialogData
+    >(EmergencyAccessTakeoverDialogComponent, dialogConfig);
+  };
+}
diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts
index d683545db59..ede60887725 100644
--- a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover.component.ts
@@ -71,15 +71,15 @@ export class EmergencyAccessTakeoverComponent
     protected toastService: ToastService,
   ) {
     super(
+      accountService,
+      dialogService,
       i18nService,
+      kdfConfigService,
       keyService,
+      masterPasswordService,
       messagingService,
       platformUtilsService,
       policyService,
-      dialogService,
-      kdfConfigService,
-      masterPasswordService,
-      accountService,
       toastService,
     );
   }
diff --git a/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.ts b/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.ts
index 0022da7f3a9..67612e5dcd3 100644
--- a/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.ts
@@ -38,7 +38,6 @@ class PremiumUpgradePromptNoop implements PremiumUpgradePromptService {
 @Component({
   selector: "app-emergency-view-dialog",
   templateUrl: "emergency-view-dialog.component.html",
-  standalone: true,
   imports: [ButtonModule, CipherViewComponent, DialogModule, CommonModule, JslibModule],
   providers: [
     { provide: ViewPasswordHistoryService, useClass: VaultViewPasswordHistoryService },
diff --git a/apps/web/src/app/auth/settings/security/api-key.component.ts b/apps/web/src/app/auth/settings/security/api-key.component.ts
index 5e61b4b4584..82d1010f020 100644
--- a/apps/web/src/app/auth/settings/security/api-key.component.ts
+++ b/apps/web/src/app/auth/settings/security/api-key.component.ts
@@ -25,7 +25,6 @@ export type ApiKeyDialogData = {
 };
 @Component({
   templateUrl: "api-key.component.html",
-  standalone: true,
   imports: [SharedModule, UserVerificationFormInputComponent],
 })
 export class ApiKeyComponent {
diff --git a/apps/web/src/app/auth/settings/security/device-management.component.spec.ts b/apps/web/src/app/auth/settings/security/device-management.component.spec.ts
index 84c1dfcb63b..2821d4a6d76 100644
--- a/apps/web/src/app/auth/settings/security/device-management.component.spec.ts
+++ b/apps/web/src/app/auth/settings/security/device-management.component.spec.ts
@@ -2,14 +2,20 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { RouterTestingModule } from "@angular/router/testing";
 import { of, Subject } from "rxjs";
 
-import { AuthRequestApiService } from "@bitwarden/auth/common";
+import { AuthRequestApiServiceAbstraction } from "@bitwarden/auth/common";
 import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
 import { DeviceView } from "@bitwarden/common/auth/abstractions/devices/views/device.view";
 import { DeviceType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { MessageListener } from "@bitwarden/common/platform/messaging";
-import { DialogService, ToastService, TableModule, PopoverModule } from "@bitwarden/components";
+import {
+  DialogService,
+  ToastService,
+  TableModule,
+  PopoverModule,
+  LayoutComponent,
+} from "@bitwarden/components";
 
 import { SharedModule } from "../../../shared";
 import { VaultBannersService } from "../../../vault/individual-vault/vault-banners/services/vault-banners.service";
@@ -73,7 +79,7 @@ describe("DeviceManagementComponent", () => {
           },
         },
         {
-          provide: AuthRequestApiService,
+          provide: AuthRequestApiServiceAbstraction,
           useValue: {
             getAuthRequest: jest.fn().mockResolvedValue(mockDeviceResponse),
           },
@@ -115,6 +121,12 @@ describe("DeviceManagementComponent", () => {
             showError: jest.fn(),
           },
         },
+        {
+          provide: LayoutComponent,
+          useValue: {
+            mainContent: jest.fn(),
+          },
+        },
       ],
     }).compileComponents();
 
diff --git a/apps/web/src/app/auth/settings/security/device-management.component.ts b/apps/web/src/app/auth/settings/security/device-management.component.ts
index 631ab02db7d..854a13faa99 100644
--- a/apps/web/src/app/auth/settings/security/device-management.component.ts
+++ b/apps/web/src/app/auth/settings/security/device-management.component.ts
@@ -4,7 +4,7 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { firstValueFrom } from "rxjs";
 
 import { LoginApprovalComponent } from "@bitwarden/auth/angular";
-import { AuthRequestApiService } from "@bitwarden/auth/common";
+import { AuthRequestApiServiceAbstraction } from "@bitwarden/auth/common";
 import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
 import {
   DevicePendingAuthRequest,
@@ -46,7 +46,6 @@ interface DeviceTableData {
 @Component({
   selector: "app-device-management",
   templateUrl: "./device-management.component.html",
-  standalone: true,
   imports: [CommonModule, SharedModule, TableModule, PopoverModule],
 })
 export class DeviceManagementComponent {
@@ -62,7 +61,7 @@ export class DeviceManagementComponent {
     private toastService: ToastService,
     private validationService: ValidationService,
     private messageListener: MessageListener,
-    private authRequestApiService: AuthRequestApiService,
+    private authRequestApiService: AuthRequestApiServiceAbstraction,
     private destroyRef: DestroyRef,
   ) {
     void this.initializeDevices();
diff --git a/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.html b/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.html
index fc6620762f9..b918e113e46 100644
--- a/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.html
+++ b/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.html
@@ -1,7 +1,6 @@
 <h1 class="tw-mt-6 tw-mb-2 tw-pb-2.5">{{ "changeMasterPassword" | i18n }}</h1>
 
 <div class="tw-max-w-lg tw-mb-12">
-  <bit-callout type="warning">{{ "loggedOutWarning" | i18n }}</bit-callout>
   <auth-change-password [inputPasswordFlow]="inputPasswordFlow"></auth-change-password>
 </div>
 
diff --git a/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.ts b/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.ts
index ee30543fba2..0698ffe1f8d 100644
--- a/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.ts
+++ b/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.ts
@@ -2,7 +2,8 @@ import { Component, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
-import { ChangePasswordComponent, InputPasswordFlow } from "@bitwarden/auth/angular";
+import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-management/change-password";
+import { InputPasswordFlow } from "@bitwarden/auth/angular";
 import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
 import { CalloutModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
@@ -10,13 +11,13 @@ import { I18nPipe } from "@bitwarden/ui-common";
 import { WebauthnLoginSettingsModule } from "../../webauthn-login-settings";
 
 @Component({
-  standalone: true,
   selector: "app-password-settings",
   templateUrl: "password-settings.component.html",
   imports: [CalloutModule, ChangePasswordComponent, I18nPipe, WebauthnLoginSettingsModule],
 })
 export class PasswordSettingsComponent implements OnInit {
   inputPasswordFlow = InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation;
+  changePasswordFeatureFlag = false;
 
   constructor(
     private router: Router,
diff --git a/apps/web/src/app/auth/settings/security/security-keys.component.ts b/apps/web/src/app/auth/settings/security/security-keys.component.ts
index 6d33193cdde..c77109936ee 100644
--- a/apps/web/src/app/auth/settings/security/security-keys.component.ts
+++ b/apps/web/src/app/auth/settings/security/security-keys.component.ts
@@ -15,7 +15,6 @@ import { ChangeKdfModule } from "./change-kdf/change-kdf.module";
 
 @Component({
   templateUrl: "security-keys.component.html",
-  standalone: true,
   imports: [SharedModule, ChangeKdfModule],
 })
 export class SecurityKeysComponent implements OnInit {
diff --git a/apps/web/src/app/auth/settings/security/security.component.ts b/apps/web/src/app/auth/settings/security/security.component.ts
index 95733d693e2..2240371637d 100644
--- a/apps/web/src/app/auth/settings/security/security.component.ts
+++ b/apps/web/src/app/auth/settings/security/security.component.ts
@@ -9,7 +9,6 @@ import { SharedModule } from "../../../shared";
 
 @Component({
   templateUrl: "security.component.html",
-  standalone: true,
   imports: [SharedModule, HeaderModule],
 })
 export class SecurityComponent implements OnInit {
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-recovery.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-recovery.component.ts
index 75a97661311..37d94bfae0e 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-recovery.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-recovery.component.ts
@@ -18,7 +18,6 @@ import { I18nPipe } from "@bitwarden/ui-common";
 @Component({
   selector: "app-two-factor-recovery",
   templateUrl: "two-factor-recovery.component.html",
-  standalone: true,
   imports: [CommonModule, DialogModule, ButtonModule, TypographyModule, I18nPipe],
 })
 export class TwoFactorRecoveryComponent {
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.ts
index 030805ed3eb..698e0911b04 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-authenticator.component.ts
@@ -56,7 +56,6 @@ declare global {
 @Component({
   selector: "app-two-factor-setup-authenticator",
   templateUrl: "two-factor-setup-authenticator.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     ReactiveFormsModule,
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.ts
index bada3301a97..0efd0c79b4e 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-duo.component.ts
@@ -33,7 +33,6 @@ import { TwoFactorSetupMethodBaseComponent } from "./two-factor-setup-method-bas
 @Component({
   selector: "app-two-factor-setup-duo",
   templateUrl: "two-factor-setup-duo.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     DialogModule,
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.ts
index c5692c3f080..544f3850ea6 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-email.component.ts
@@ -36,7 +36,6 @@ import { TwoFactorSetupMethodBaseComponent } from "./two-factor-setup-method-bas
 @Component({
   selector: "app-two-factor-setup-email",
   templateUrl: "two-factor-setup-email.component.html",
-  standalone: true,
   imports: [
     AsyncActionsModule,
     ButtonModule,
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-method-base.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-method-base.component.ts
index 0654ad126e2..7569577e781 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-method-base.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-method-base.component.ts
@@ -15,9 +15,7 @@ import { DialogService, ToastService } from "@bitwarden/components";
 /**
  * Base class for two-factor setup components (ex: email, yubikey, webauthn, duo).
  */
-@Directive({
-  standalone: true,
-})
+@Directive({})
 export abstract class TwoFactorSetupMethodBaseComponent {
   @Output() onUpdated = new EventEmitter<boolean>();
 
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.ts
index 44acc6dabca..66cd3596063 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.ts
@@ -46,7 +46,6 @@ interface Key {
 @Component({
   selector: "app-two-factor-setup-webauthn",
   templateUrl: "two-factor-setup-webauthn.component.html",
-  standalone: true,
   imports: [
     AsyncActionsModule,
     ButtonModule,
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.ts
index 92236fe21ab..0b85d219928 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.ts
@@ -47,7 +47,6 @@ interface Key {
 @Component({
   selector: "app-two-factor-setup-yubikey",
   templateUrl: "two-factor-setup-yubikey.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     ReactiveFormsModule,
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts
index 88c9eea2cb0..7259c3f0fe8 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup.component.ts
@@ -47,7 +47,6 @@ import { TwoFactorVerifyComponent } from "./two-factor-verify.component";
 @Component({
   selector: "app-two-factor-setup",
   templateUrl: "two-factor-setup.component.html",
-  standalone: true,
   imports: [ItemModule, LooseComponentsModule, SharedModule],
 })
 export class TwoFactorSetupComponent implements OnInit, OnDestroy {
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-verify.component.ts b/apps/web/src/app/auth/settings/two-factor/two-factor-verify.component.ts
index a153a9ec56a..07939db7eff 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-verify.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-verify.component.ts
@@ -31,7 +31,6 @@ type TwoFactorVerifyDialogData = {
 @Component({
   selector: "app-two-factor-verify",
   templateUrl: "two-factor-verify.component.html",
-  standalone: true,
   imports: [
     AsyncActionsModule,
     ButtonModule,
diff --git a/apps/web/src/app/auth/settings/verify-email.component.ts b/apps/web/src/app/auth/settings/verify-email.component.ts
index 001b791b748..7088dae8d0f 100644
--- a/apps/web/src/app/auth/settings/verify-email.component.ts
+++ b/apps/web/src/app/auth/settings/verify-email.component.ts
@@ -17,7 +17,6 @@ import {
 } from "@bitwarden/components";
 
 @Component({
-  standalone: true,
   selector: "app-verify-email",
   templateUrl: "verify-email.component.html",
   imports: [AsyncActionsModule, BannerModule, ButtonModule, CommonModule, JslibModule, LinkModule],
diff --git a/apps/web/src/app/auth/update-password.component.ts b/apps/web/src/app/auth/update-password.component.ts
index c975f7c4168..bc53f824228 100644
--- a/apps/web/src/app/auth/update-password.component.ts
+++ b/apps/web/src/app/auth/update-password.component.ts
@@ -1,11 +1,10 @@
 import { Component, inject } from "@angular/core";
 
 import { UpdatePasswordComponent as BaseUpdatePasswordComponent } from "@bitwarden/angular/auth/components/update-password.component";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
 
 import { RouterService } from "../core";
 
-import { AcceptOrganizationInviteService } from "./organization-invite/accept-organization.service";
-
 @Component({
   selector: "app-update-password",
   templateUrl: "update-password.component.html",
@@ -13,13 +12,13 @@ import { AcceptOrganizationInviteService } from "./organization-invite/accept-or
 })
 export class UpdatePasswordComponent extends BaseUpdatePasswordComponent {
   private routerService = inject(RouterService);
-  private acceptOrganizationInviteService = inject(AcceptOrganizationInviteService);
+  private organizationInviteService = inject(OrganizationInviteService);
 
   override async cancel() {
     // clearing the login redirect url so that the user
     // does not join the organization if they cancel
     await this.routerService.getAndClearLoginRedirectUrl();
-    await this.acceptOrganizationInviteService.clearOrganizationInvitation();
+    await this.organizationInviteService.clearOrganizationInvitation();
     await super.cancel();
   }
 }
diff --git a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
index 63c42139648..fda7faeeb25 100644
--- a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
+++ b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
@@ -68,7 +68,6 @@ export enum SubscriptionProduct {
   selector: "app-trial-billing-step",
   templateUrl: "trial-billing-step.component.html",
   imports: [BillingSharedModule],
-  standalone: true,
 })
 export class TrialBillingStepComponent implements OnInit, OnDestroy {
   @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
diff --git a/apps/web/src/app/billing/individual/individual-billing-routing.module.ts b/apps/web/src/app/billing/individual/individual-billing-routing.module.ts
index bb1ada0b719..87b342ed997 100644
--- a/apps/web/src/app/billing/individual/individual-billing-routing.module.ts
+++ b/apps/web/src/app/billing/individual/individual-billing-routing.module.ts
@@ -1,6 +1,8 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
+import { AccountPaymentDetailsComponent } from "@bitwarden/web-vault/app/billing/individual/payment-details/account-payment-details.component";
+
 import { PaymentMethodComponent } from "../shared";
 
 import { BillingHistoryViewComponent } from "./billing-history-view.component";
@@ -30,6 +32,11 @@ const routes: Routes = [
         component: PaymentMethodComponent,
         data: { titleId: "paymentMethod" },
       },
+      {
+        path: "payment-details",
+        component: AccountPaymentDetailsComponent,
+        data: { titleId: "paymentDetails" },
+      },
       {
         path: "billing-history",
         component: BillingHistoryViewComponent,
diff --git a/apps/web/src/app/billing/individual/payment-details/account-payment-details.component.html b/apps/web/src/app/billing/individual/payment-details/account-payment-details.component.html
new file mode 100644
index 00000000000..c10590d8b1b
--- /dev/null
+++ b/apps/web/src/app/billing/individual/payment-details/account-payment-details.component.html
@@ -0,0 +1,26 @@
+<bit-container>
+  @let view = view$ | async;
+  @if (!view) {
+    <ng-container>
+      <i
+        class="bwi bwi-spinner bwi-spin tw-text-muted"
+        title="{{ 'loading' | i18n }}"
+        aria-hidden="true"
+      ></i>
+      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
+    </ng-container>
+  } @else {
+    <ng-container>
+      <app-display-payment-method
+        [owner]="view.account"
+        [paymentMethod]="view.paymentMethod"
+        (updated)="setPaymentMethod($event)"
+      ></app-display-payment-method>
+
+      <app-display-account-credit
+        [owner]="view.account"
+        [credit]="view.credit"
+      ></app-display-account-credit>
+    </ng-container>
+  }
+</bit-container>
diff --git a/apps/web/src/app/billing/individual/payment-details/account-payment-details.component.ts b/apps/web/src/app/billing/individual/payment-details/account-payment-details.component.ts
new file mode 100644
index 00000000000..4a4d0f60c0b
--- /dev/null
+++ b/apps/web/src/app/billing/individual/payment-details/account-payment-details.component.ts
@@ -0,0 +1,116 @@
+import { Component } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  BehaviorSubject,
+  EMPTY,
+  filter,
+  from,
+  map,
+  merge,
+  Observable,
+  shareReplay,
+  switchMap,
+  tap,
+} from "rxjs";
+import { catchError } from "rxjs/operators";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+
+import { HeaderModule } from "../../../layouts/header/header.module";
+import { SharedModule } from "../../../shared";
+import {
+  DisplayAccountCreditComponent,
+  DisplayPaymentMethodComponent,
+} from "../../payment/components";
+import { MaskedPaymentMethod } from "../../payment/types";
+import { BillingClient } from "../../services";
+import { accountToBillableEntity, BillableEntity } from "../../types";
+
+class RedirectError {
+  constructor(
+    public path: string[],
+    public relativeTo: ActivatedRoute,
+  ) {}
+}
+
+type View = {
+  account: BillableEntity;
+  paymentMethod: MaskedPaymentMethod | null;
+  credit: number | null;
+};
+
+@Component({
+  templateUrl: "./account-payment-details.component.html",
+  standalone: true,
+  imports: [
+    DisplayAccountCreditComponent,
+    DisplayPaymentMethodComponent,
+    HeaderModule,
+    SharedModule,
+  ],
+  providers: [BillingClient],
+})
+export class AccountPaymentDetailsComponent {
+  private viewState$ = new BehaviorSubject<View | null>(null);
+
+  private load$: Observable<View> = this.accountService.activeAccount$.pipe(
+    switchMap((account) =>
+      this.configService
+        .getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout)
+        .pipe(
+          map((managePaymentDetailsOutsideCheckout) => {
+            if (!managePaymentDetailsOutsideCheckout) {
+              throw new RedirectError(["../payment-method"], this.activatedRoute);
+            }
+            return account;
+          }),
+        ),
+    ),
+    accountToBillableEntity,
+    switchMap(async (account) => {
+      const [paymentMethod, credit] = await Promise.all([
+        this.billingClient.getPaymentMethod(account),
+        this.billingClient.getCredit(account),
+      ]);
+
+      return {
+        account,
+        paymentMethod,
+        credit,
+      };
+    }),
+    shareReplay({ bufferSize: 1, refCount: false }),
+    catchError((error: unknown) => {
+      if (error instanceof RedirectError) {
+        return from(this.router.navigate(error.path, { relativeTo: error.relativeTo })).pipe(
+          switchMap(() => EMPTY),
+        );
+      }
+      throw error;
+    }),
+  );
+
+  view$: Observable<View> = merge(
+    this.load$.pipe(tap((view) => this.viewState$.next(view))),
+    this.viewState$.pipe(filter((view): view is View => view !== null)),
+  ).pipe(shareReplay({ bufferSize: 1, refCount: true }));
+
+  constructor(
+    private accountService: AccountService,
+    private activatedRoute: ActivatedRoute,
+    private billingClient: BillingClient,
+    private configService: ConfigService,
+    private router: Router,
+  ) {}
+
+  setPaymentMethod = (paymentMethod: MaskedPaymentMethod) => {
+    if (this.viewState$.value) {
+      this.viewState$.next({
+        ...this.viewState$.value,
+        paymentMethod,
+      });
+    }
+  };
+}
diff --git a/apps/web/src/app/billing/individual/subscription.component.html b/apps/web/src/app/billing/individual/subscription.component.html
index 934a24570f4..fa2eb0412a9 100644
--- a/apps/web/src/app/billing/individual/subscription.component.html
+++ b/apps/web/src/app/billing/individual/subscription.component.html
@@ -3,7 +3,10 @@
     <bit-tab-link [route]="(hasPremium$ | async) ? 'user-subscription' : 'premium'">{{
       "subscription" | i18n
     }}</bit-tab-link>
-    <bit-tab-link route="payment-method">{{ "paymentMethod" | i18n }}</bit-tab-link>
+    @let paymentMethodPageData = paymentDetailsPageData$ | async;
+    <bit-tab-link [route]="paymentMethodPageData.route">{{
+      paymentMethodPageData.textKey | i18n
+    }}</bit-tab-link>
     <bit-tab-link route="billing-history">{{ "billingHistory" | i18n }}</bit-tab-link>
   </bit-tab-nav-bar>
 </app-header>
diff --git a/apps/web/src/app/billing/individual/subscription.component.ts b/apps/web/src/app/billing/individual/subscription.component.ts
index 2a08ec85127..c6a20a9f6a3 100644
--- a/apps/web/src/app/billing/individual/subscription.component.ts
+++ b/apps/web/src/app/billing/individual/subscription.component.ts
@@ -1,10 +1,12 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
-import { Observable, switchMap } from "rxjs";
+import { map, Observable, switchMap } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
 @Component({
@@ -13,16 +15,32 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 })
 export class SubscriptionComponent implements OnInit {
   hasPremium$: Observable<boolean>;
+  paymentDetailsPageData$: Observable<{
+    route: string;
+    textKey: string;
+  }>;
+
   selfHosted: boolean;
 
   constructor(
     private platformUtilsService: PlatformUtilsService,
     billingAccountProfileStateService: BillingAccountProfileStateService,
     accountService: AccountService,
+    private configService: ConfigService,
   ) {
     this.hasPremium$ = accountService.activeAccount$.pipe(
       switchMap((account) => billingAccountProfileStateService.hasPremiumPersonally$(account.id)),
     );
+
+    this.paymentDetailsPageData$ = this.configService
+      .getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout)
+      .pipe(
+        map((managePaymentDetailsOutsideCheckout) =>
+          managePaymentDetailsOutsideCheckout
+            ? { route: "payment-details", textKey: "paymentDetails" }
+            : { route: "payment-method", textKey: "paymentMethod" },
+        ),
+      );
   }
 
   ngOnInit() {
diff --git a/apps/web/src/app/billing/members/add-sponsorship-dialog.component.ts b/apps/web/src/app/billing/members/add-sponsorship-dialog.component.ts
index 7e6c0d464c3..38ae39cabfe 100644
--- a/apps/web/src/app/billing/members/add-sponsorship-dialog.component.ts
+++ b/apps/web/src/app/billing/members/add-sponsorship-dialog.component.ts
@@ -1,4 +1,3 @@
-import { DIALOG_DATA, DialogConfig, DialogRef } from "@angular/cdk/dialog";
 import { Component, Inject } from "@angular/core";
 import {
   AbstractControl,
@@ -19,7 +18,10 @@ import { EncryptService } from "@bitwarden/common/key-management/crypto/abstract
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { OrgKey } from "@bitwarden/common/types/key";
 import {
+  DialogRef,
   ButtonModule,
+  DialogConfig,
+  DIALOG_DATA,
   DialogModule,
   DialogService,
   FormFieldModule,
@@ -38,7 +40,6 @@ interface AddSponsorshipDialogParams {
 
 @Component({
   templateUrl: "add-sponsorship-dialog.component.html",
-  standalone: true,
   imports: [
     JslibModule,
     ButtonModule,
diff --git a/apps/web/src/app/billing/members/free-bitwarden-families.component.html b/apps/web/src/app/billing/members/free-bitwarden-families.component.html
index 243cf612c73..ddf7c506745 100644
--- a/apps/web/src/app/billing/members/free-bitwarden-families.component.html
+++ b/apps/web/src/app/billing/members/free-bitwarden-families.component.html
@@ -56,20 +56,21 @@
                       appA11yTitle="{{ 'options' | i18n }}"
                     ></button>
                     <bit-menu #appListDropdown>
-                      <button
-                        type="button"
-                        bitMenuItem
-                        [attr.aria-label]="'resendEmailLabel' | i18n"
-                        *ngIf="!isSelfHosted && !sponsoredFamily.validUntil"
-                        (click)="resendEmail(sponsoredFamily)"
-                      >
-                        <i aria-hidden="true" class="bwi bwi-envelope"></i>
-                        {{ "resendInvitation" | i18n }}
-                      </button>
+                      @if (!isSelfHosted && !sponsoredFamily.validUntil) {
+                        <button
+                          type="button"
+                          bitMenuItem
+                          [attr.aria-label]="'resendEmailLabel' | i18n"
+                          (click)="resendEmail(sponsoredFamily)"
+                        >
+                          <i aria-hidden="true" class="bwi bwi-envelope"></i>
+                          {{ "resendInvitation" | i18n }}
+                        </button>
+                      }
 
-                      <ng-container *ngIf="!isSelfHosted && !sponsoredFamily.validUntil">
+                      @if (!isSelfHosted && !sponsoredFamily.validUntil) {
                         <hr class="tw-m-0" />
-                      </ng-container>
+                      }
 
                       <button
                         type="button"
@@ -78,7 +79,7 @@
                         (click)="removeSponsorship(sponsoredFamily)"
                       >
                         <i aria-hidden="true" class="bwi bwi-close tw-text-danger"></i>
-                        <span class="tw-text-danger pl-1">{{ "remove" | i18n }}</span>
+                        <span class="tw-text-danger tw-pl-1">{{ "remove" | i18n }}</span>
                       </button>
                     </bit-menu>
                   </td>
@@ -87,12 +88,12 @@
             }
           </ng-template>
         </bit-table>
-        <hr class="mt-0" />
+        <hr class="tw-mt-0" />
       </ng-container>
     } @else if (!loading()) {
       <div class="tw-my-5 tw-py-5 tw-flex tw-flex-col tw-items-center">
         <img class="tw-w-32" src="./../../../images/search.svg" alt="Search" />
-        <h4 class="mt-3" bitTypography="h4">{{ "noSponsoredFamiliesMessage" | i18n }}</h4>
+        <h4 class="tw-mt-3" bitTypography="h4">{{ "noSponsoredFamiliesMessage" | i18n }}</h4>
         <p bitTypography="body2">{{ "nosponsoredFamiliesDetails" | i18n }}</p>
       </div>
     }
diff --git a/apps/web/src/app/billing/members/free-bitwarden-families.component.ts b/apps/web/src/app/billing/members/free-bitwarden-families.component.ts
index 5b249683b57..edd918ce059 100644
--- a/apps/web/src/app/billing/members/free-bitwarden-families.component.ts
+++ b/apps/web/src/app/billing/members/free-bitwarden-families.component.ts
@@ -1,4 +1,3 @@
-import { DialogRef } from "@angular/cdk/dialog";
 import { formatDate } from "@angular/common";
 import { Component, OnInit, signal } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
@@ -16,7 +15,7 @@ import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { OrgKey } from "@bitwarden/common/types/key";
-import { DialogService, ToastService } from "@bitwarden/components";
+import { DialogRef, DialogService, ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 
 import { AddSponsorshipDialogComponent } from "./add-sponsorship-dialog.component";
@@ -160,7 +159,7 @@ export class FreeBitwardenFamiliesComponent implements OnInit {
   private async doRevokeSponsorship(sponsorship: OrganizationSponsorshipInvitesResponse) {
     const content = sponsorship.validUntil
       ? this.i18nService.t(
-          "updatedRevokeSponsorshipConfirmationForAcceptedSponsorship",
+          "revokeActiveSponsorshipConfirmation",
           sponsorship.friendlyName,
           formatDate(sponsorship.validUntil, "MM/dd/yyyy", this.locale),
         )
diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
index a6e8670d944..dc8474d24d6 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
@@ -109,7 +109,6 @@ interface OnSuccessArgs {
 
 @Component({
   templateUrl: "./change-plan-dialog.component.html",
-  standalone: true,
   imports: [BillingSharedModule],
 })
 export class ChangePlanDialogComponent implements OnInit, OnDestroy {
@@ -240,13 +239,15 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
           .organizations$(userId)
           .pipe(getOrganizationById(this.organizationId)),
       );
-      try {
-        const { accountCredit, paymentSource } =
-          await this.billingApiService.getOrganizationPaymentMethod(this.organizationId);
-        this.accountCredit = accountCredit;
-        this.paymentSource = paymentSource;
-      } catch (error) {
-        this.billingNotificationService.handleError(error);
+      if (this.sub?.subscription?.status !== "canceled") {
+        try {
+          const { accountCredit, paymentSource } =
+            await this.billingApiService.getOrganizationPaymentMethod(this.organizationId);
+          this.accountCredit = accountCredit;
+          this.paymentSource = paymentSource;
+        } catch (error) {
+          this.billingNotificationService.handleError(error);
+        }
       }
     }
 
@@ -318,8 +319,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
 
   resolveHeaderName(subscription: OrganizationSubscriptionResponse): string {
     if (subscription.subscription != null) {
-      this.isSubscriptionCanceled = subscription.subscription.cancelled;
-      if (subscription.subscription.cancelled) {
+      this.isSubscriptionCanceled =
+        subscription.subscription.cancelled && this.sub?.plan.productTier !== ProductTierType.Free;
+      if (this.isSubscriptionCanceled) {
         return this.i18nService.t("restartSubscription");
       }
     }
@@ -768,7 +770,12 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
 
     const doSubmit = async (): Promise<string> => {
       let orgId: string = null;
-      if (this.sub?.subscription?.status === "canceled") {
+      const sub = this.sub?.subscription;
+      const isCanceled = sub?.status === "canceled";
+      const isCancelledDowngradedToFreeOrg =
+        sub?.cancelled && this.organization.productTierType === ProductTierType.Free;
+
+      if (isCanceled || isCancelledDowngradedToFreeOrg) {
         await this.restartSubscription();
         orgId = this.organizationId;
       } else {
diff --git a/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts b/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts
index 1bfb9fc4912..692791db855 100644
--- a/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts
+++ b/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
 import { canAccessBillingTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationPaymentDetailsComponent } from "@bitwarden/web-vault/app/billing/organizations/payment-details/organization-payment-details.component";
 
 import { organizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard";
 import { organizationIsUnmanaged } from "../../billing/guards/organization-is-unmanaged.guard";
@@ -36,6 +37,17 @@ const routes: Routes = [
           titleId: "paymentMethod",
         },
       },
+      {
+        path: "payment-details",
+        component: OrganizationPaymentDetailsComponent,
+        canActivate: [
+          organizationPermissionsGuard((org) => org.canEditPaymentMethods),
+          organizationIsUnmanaged,
+        ],
+        data: {
+          titleId: "paymentDetails",
+        },
+      },
       {
         path: "history",
         component: OrgBillingHistoryViewComponent,
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts
index aad3b8df763..ca8db39a047 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -77,7 +77,6 @@ const Allowed2020PlansForLegacyProviders = [
 @Component({
   selector: "app-organization-plans",
   templateUrl: "organization-plans.component.html",
-  standalone: true,
   imports: [BillingSharedModule, OrganizationCreateModule],
 })
 export class OrganizationPlansComponent implements OnInit, OnDestroy {
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
index 385d9b8ae1a..3b3e08764ff 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
@@ -10,6 +10,7 @@
     <app-subscription-status
       [organizationSubscriptionResponse]="sub"
       (reinstatementRequested)="reinstate()"
+      *ngIf="!userOrg.isFreeOrg"
     ></app-subscription-status>
     <ng-container *ngIf="userOrg.canEditSubscription">
       <div class="tw-flex-col">
@@ -25,7 +26,7 @@
         >
         <bit-table>
           <ng-template body>
-            <ng-container *ngIf="subscription">
+            <ng-container *ngIf="subscription && !userOrg.isFreeOrg">
               <tr bitRow *ngFor="let i of subscriptionLineItems">
                 <td
                   bitCell
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
index 792a138c2d1..19c4ba04799 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
@@ -496,9 +496,10 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
 
   get showChangePlanButton() {
     return (
-      !this.showChangePlan &&
-      this.sub.plan.productTier !== ProductTierType.Enterprise &&
-      !this.sub.subscription?.cancelled
+      (!this.showChangePlan &&
+        this.sub.plan.productTier !== ProductTierType.Enterprise &&
+        !this.sub.subscription?.cancelled) ||
+      (this.sub.subscription?.cancelled && this.sub.plan.productTier === ProductTierType.Free)
     );
   }
 
diff --git a/apps/web/src/app/billing/organizations/payment-details/organization-payment-details.component.html b/apps/web/src/app/billing/organizations/payment-details/organization-payment-details.component.html
new file mode 100644
index 00000000000..17f4349fdd5
--- /dev/null
+++ b/apps/web/src/app/billing/organizations/payment-details/organization-payment-details.component.html
@@ -0,0 +1,41 @@
+@let organization = organization$ | async;
+@if (organization) {
+  <app-organization-free-trial-warning
+    [organization]="organization"
+    (clicked)="changePaymentMethod()"
+  >
+  </app-organization-free-trial-warning>
+}
+<app-header></app-header>
+<bit-container>
+  @let view = view$ | async;
+  @if (!view) {
+    <ng-container>
+      <i
+        class="bwi bwi-spinner bwi-spin tw-text-muted"
+        title="{{ 'loading' | i18n }}"
+        aria-hidden="true"
+      ></i>
+      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
+    </ng-container>
+  } @else {
+    <ng-container>
+      <app-display-payment-method
+        [owner]="view.organization"
+        [paymentMethod]="view.paymentMethod"
+        (updated)="setPaymentMethod($event)"
+      ></app-display-payment-method>
+
+      <app-display-billing-address
+        [owner]="view.organization"
+        [billingAddress]="view.billingAddress"
+        (updated)="setBillingAddress($event)"
+      ></app-display-billing-address>
+
+      <app-display-account-credit
+        [owner]="view.organization"
+        [credit]="view.credit"
+      ></app-display-account-credit>
+    </ng-container>
+  }
+</bit-container>
diff --git a/apps/web/src/app/billing/organizations/payment-details/organization-payment-details.component.ts b/apps/web/src/app/billing/organizations/payment-details/organization-payment-details.component.ts
new file mode 100644
index 00000000000..e357444b943
--- /dev/null
+++ b/apps/web/src/app/billing/organizations/payment-details/organization-payment-details.component.ts
@@ -0,0 +1,186 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  BehaviorSubject,
+  catchError,
+  EMPTY,
+  filter,
+  firstValueFrom,
+  from,
+  lastValueFrom,
+  map,
+  merge,
+  Observable,
+  shareReplay,
+  switchMap,
+  tap,
+} from "rxjs";
+
+import {
+  getOrganizationById,
+  OrganizationService,
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { DialogService } from "@bitwarden/components";
+
+import { HeaderModule } from "../../../layouts/header/header.module";
+import { SharedModule } from "../../../shared";
+import {
+  ChangePaymentMethodDialogComponent,
+  DisplayAccountCreditComponent,
+  DisplayBillingAddressComponent,
+  DisplayPaymentMethodComponent,
+} from "../../payment/components";
+import { BillingAddress, MaskedPaymentMethod } from "../../payment/types";
+import { BillingClient } from "../../services";
+import { BillableEntity, organizationToBillableEntity } from "../../types";
+import { OrganizationFreeTrialWarningComponent } from "../../warnings/components";
+
+class RedirectError {
+  constructor(
+    public path: string[],
+    public relativeTo: ActivatedRoute,
+  ) {}
+}
+
+type View = {
+  organization: BillableEntity;
+  paymentMethod: MaskedPaymentMethod | null;
+  billingAddress: BillingAddress | null;
+  credit: number | null;
+};
+
+@Component({
+  templateUrl: "./organization-payment-details.component.html",
+  standalone: true,
+  imports: [
+    DisplayBillingAddressComponent,
+    DisplayAccountCreditComponent,
+    DisplayPaymentMethodComponent,
+    HeaderModule,
+    OrganizationFreeTrialWarningComponent,
+    SharedModule,
+  ],
+  providers: [BillingClient],
+})
+export class OrganizationPaymentDetailsComponent implements OnInit {
+  @ViewChild(OrganizationFreeTrialWarningComponent)
+  organizationFreeTrialWarningComponent!: OrganizationFreeTrialWarningComponent;
+
+  private viewState$ = new BehaviorSubject<View | null>(null);
+
+  private load$: Observable<View> = this.accountService.activeAccount$
+    .pipe(
+      getUserId,
+      switchMap((userId) =>
+        this.organizationService
+          .organizations$(userId)
+          .pipe(getOrganizationById(this.activatedRoute.snapshot.params.organizationId)),
+      ),
+    )
+    .pipe(
+      switchMap((organization) =>
+        this.configService
+          .getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout)
+          .pipe(
+            map((managePaymentDetailsOutsideCheckout) => {
+              if (!managePaymentDetailsOutsideCheckout) {
+                throw new RedirectError(["../payment-method"], this.activatedRoute);
+              }
+              return organization;
+            }),
+          ),
+      ),
+      organizationToBillableEntity,
+      switchMap(async (organization) => {
+        const [paymentMethod, billingAddress, credit] = await Promise.all([
+          this.billingClient.getPaymentMethod(organization),
+          this.billingClient.getBillingAddress(organization),
+          this.billingClient.getCredit(organization),
+        ]);
+
+        return {
+          organization,
+          paymentMethod,
+          billingAddress,
+          credit,
+        };
+      }),
+      catchError((error: unknown) => {
+        if (error instanceof RedirectError) {
+          return from(this.router.navigate(error.path, { relativeTo: error.relativeTo })).pipe(
+            switchMap(() => EMPTY),
+          );
+        }
+        throw error;
+      }),
+    );
+
+  view$: Observable<View> = merge(
+    this.load$.pipe(tap((view) => this.viewState$.next(view))),
+    this.viewState$.pipe(filter((view): view is View => view !== null)),
+  ).pipe(shareReplay({ bufferSize: 1, refCount: true }));
+
+  organization$ = this.view$.pipe(map((view) => view.organization.data as Organization));
+
+  constructor(
+    private accountService: AccountService,
+    private activatedRoute: ActivatedRoute,
+    private billingClient: BillingClient,
+    private configService: ConfigService,
+    private dialogService: DialogService,
+    private organizationService: OrganizationService,
+    private router: Router,
+  ) {}
+
+  async ngOnInit() {
+    const openChangePaymentMethodDialogOnStart =
+      (history.state?.launchPaymentModalAutomatically as boolean) ?? false;
+
+    if (openChangePaymentMethodDialogOnStart) {
+      history.replaceState({ ...history.state, launchPaymentModalAutomatically: false }, "");
+      await this.changePaymentMethod();
+    }
+  }
+
+  changePaymentMethod = async () => {
+    const view = await firstValueFrom(this.view$);
+    const dialogRef = ChangePaymentMethodDialogComponent.open(this.dialogService, {
+      data: {
+        owner: view.organization,
+      },
+    });
+    const result = await lastValueFrom(dialogRef.closed);
+    if (result?.type === "success") {
+      await this.setPaymentMethod(result.paymentMethod);
+      this.organizationFreeTrialWarningComponent.refresh();
+    }
+  };
+
+  setBillingAddress = (billingAddress: BillingAddress) => {
+    if (this.viewState$.value) {
+      this.viewState$.next({
+        ...this.viewState$.value,
+        billingAddress,
+      });
+    }
+  };
+
+  setPaymentMethod = async (paymentMethod: MaskedPaymentMethod) => {
+    if (this.viewState$.value) {
+      const billingAddress =
+        this.viewState$.value.billingAddress ??
+        (await this.billingClient.getBillingAddress(this.viewState$.value.organization));
+
+      this.viewState$.next({
+        ...this.viewState$.value,
+        paymentMethod,
+        billingAddress,
+      });
+    }
+  };
+}
diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
index fbd7453c712..9b144fe59a7 100644
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
+++ b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
@@ -4,7 +4,7 @@ import { Location } from "@angular/common";
 import { Component, OnDestroy } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ActivatedRoute, Router } from "@angular/router";
-import { firstValueFrom, from, lastValueFrom, map, switchMap } from "rxjs";
+import { combineLatest, firstValueFrom, from, lastValueFrom, map, switchMap } from "rxjs";
 
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import {
@@ -15,9 +15,12 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { PaymentMethodType } from "@bitwarden/common/billing/enums";
+import { TaxInformation } from "@bitwarden/common/billing/models/domain";
 import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
@@ -54,6 +57,8 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
   protected readonly Math = Math;
   launchPaymentModalAutomatically = false;
 
+  protected taxInformation: TaxInformation;
+
   constructor(
     private activatedRoute: ActivatedRoute,
     private billingApiService: BillingApiServiceAbstraction,
@@ -69,24 +74,37 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
     private accountService: AccountService,
     protected syncService: SyncService,
     private billingNotificationService: BillingNotificationService,
+    private configService: ConfigService,
   ) {
-    this.activatedRoute.params
+    combineLatest([
+      this.activatedRoute.params,
+      this.configService.getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout),
+    ])
       .pipe(
-        takeUntilDestroyed(),
-        switchMap(({ organizationId }) => {
+        switchMap(([{ organizationId }, managePaymentDetailsOutsideCheckout]) => {
           if (this.platformUtilsService.isSelfHost()) {
             return from(this.router.navigate(["/settings/subscription"]));
           }
 
+          if (managePaymentDetailsOutsideCheckout) {
+            return from(
+              this.router.navigate(["../payment-details"], { relativeTo: this.activatedRoute }),
+            );
+          }
+
           this.organizationId = organizationId;
           return from(this.load());
         }),
+        takeUntilDestroyed(),
       )
       .subscribe();
 
     const state = this.router.getCurrentNavigation()?.extras?.state;
     // incase the above state is undefined or null we use redundantState
     const redundantState: any = location.getState();
+    const queryParam = this.activatedRoute.snapshot.queryParamMap.get(
+      "launchPaymentModalAutomatically",
+    );
     if (state && Object.prototype.hasOwnProperty.call(state, "launchPaymentModalAutomatically")) {
       this.launchPaymentModalAutomatically = state.launchPaymentModalAutomatically;
     } else if (
@@ -94,6 +112,8 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
       Object.prototype.hasOwnProperty.call(redundantState, "launchPaymentModalAutomatically")
     ) {
       this.launchPaymentModalAutomatically = redundantState.launchPaymentModalAutomatically;
+    } else if (queryParam === "true") {
+      this.launchPaymentModalAutomatically = true;
     } else {
       this.launchPaymentModalAutomatically = false;
     }
@@ -103,6 +123,12 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
   }
 
   protected addAccountCredit = async (): Promise<void> => {
+    if (this.subscriptionStatus === "trialing") {
+      const hasValidBillingAddress = await this.checkBillingAddressForTrialingOrg();
+      if (!hasValidBillingAddress) {
+        return;
+      }
+    }
     const dialogRef = openAddCreditDialog(this.dialogService, {
       data: {
         organizationId: this.organizationId,
@@ -119,11 +145,12 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
   protected load = async (): Promise<void> => {
     this.loading = true;
     try {
-      const { accountCredit, paymentSource, subscriptionStatus } =
+      const { accountCredit, paymentSource, subscriptionStatus, taxInformation } =
         await this.billingApiService.getOrganizationPaymentMethod(this.organizationId);
       this.accountCredit = accountCredit;
       this.paymentSource = paymentSource;
       this.subscriptionStatus = subscriptionStatus;
+      this.taxInformation = taxInformation;
 
       if (this.organizationId) {
         const organizationSubscriptionPromise = this.organizationApiService.getSubscription(
@@ -242,4 +269,17 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
     const key = this.paymentSource == null ? "addPaymentMethod" : "changePaymentMethod";
     return this.i18nService.t(key);
   }
+
+  private async checkBillingAddressForTrialingOrg(): Promise<boolean> {
+    const hasBillingAddress = this.taxInformation != null;
+    if (!hasBillingAddress) {
+      this.toastService.showToast({
+        variant: "error",
+        title: null,
+        message: this.i18nService.t("billingAddressRequiredToAddCredit"),
+      });
+      return false;
+    }
+    return true;
+  }
 }
diff --git a/apps/web/src/app/billing/payment/components/add-account-credit-dialog.component.ts b/apps/web/src/app/billing/payment/components/add-account-credit-dialog.component.ts
new file mode 100644
index 00000000000..2030d0e73ec
--- /dev/null
+++ b/apps/web/src/app/billing/payment/components/add-account-credit-dialog.component.ts
@@ -0,0 +1,241 @@
+import { DIALOG_DATA } from "@angular/cdk/dialog";
+import { Component, ElementRef, Inject, ViewChild } from "@angular/core";
+import {
+  AbstractControl,
+  FormControl,
+  FormGroup,
+  ValidationErrors,
+  ValidatorFn,
+  Validators,
+} from "@angular/forms";
+import { map } from "rxjs";
+
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { DialogConfig, DialogRef, DialogService, ToastService } from "@bitwarden/components";
+
+import { SharedModule } from "../../../shared";
+import { BillingClient } from "../../services";
+import { BillableEntity } from "../../types";
+
+type DialogParams = {
+  owner: BillableEntity;
+};
+
+type DialogResult = "cancelled" | "error" | "launched";
+
+type PayPalConfig = {
+  businessId: string;
+  buttonAction: string;
+};
+
+declare const process: {
+  env: {
+    PAYPAL_CONFIG: PayPalConfig;
+  };
+};
+
+const positiveNumberValidator =
+  (message: string): ValidatorFn =>
+  (control: AbstractControl): ValidationErrors | null => {
+    if (!control.value) {
+      return null;
+    }
+
+    const value = parseFloat(control.value);
+
+    if (isNaN(value) || value <= 0) {
+      return { notPositiveNumber: { message } };
+    }
+
+    return null;
+  };
+
+@Component({
+  template: `
+    <form [formGroup]="formGroup" [bitSubmit]="submit">
+      <bit-dialog>
+        <span bitDialogTitle class="tw-font-semibold">
+          {{ "addCredit" | i18n }}
+        </span>
+        <div bitDialogContent>
+          <p bitTypography="body1">{{ "creditDelayed" | i18n }}</p>
+          <div class="tw-grid tw-grid-cols-2">
+            <bit-radio-group [formControl]="formGroup.controls.paymentMethod">
+              <bit-radio-button id="credit-method-paypal" [value]="'payPal'">
+                <bit-label> <i class="bwi bwi-paypal"></i>PayPal</bit-label>
+              </bit-radio-button>
+              <bit-radio-button id="credit-method-bitcoin" [value]="'bitPay'">
+                <bit-label> <i class="bwi bwi-bitcoin"></i>Bitcoin</bit-label>
+              </bit-radio-button>
+            </bit-radio-group>
+          </div>
+          <div class="tw-grid tw-grid-cols-2">
+            <bit-form-field>
+              <bit-label>{{ "amount" | i18n }}</bit-label>
+              <input
+                bitInput
+                [formControl]="formGroup.controls.amount"
+                type="text"
+                (blur)="formatAmount()"
+                required
+              />
+              <span bitPrefix>$USD</span>
+            </bit-form-field>
+          </div>
+        </div>
+        <ng-container bitDialogFooter>
+          <button type="submit" bitButton bitFormButton buttonType="primary">
+            {{ "submit" | i18n }}
+          </button>
+          <button
+            type="button"
+            bitButton
+            bitFormButton
+            buttonType="secondary"
+            [bitDialogClose]="'cancelled'"
+          >
+            {{ "cancel" | i18n }}
+          </button>
+        </ng-container>
+      </bit-dialog>
+    </form>
+    <form #payPalForm action="{{ payPalConfig.buttonAction }}" method="post" target="_top">
+      <input type="hidden" name="cmd" value="_xclick" />
+      <input type="hidden" name="business" value="{{ payPalConfig.businessId }}" />
+      <input type="hidden" name="button_subtype" value="services" />
+      <input type="hidden" name="no_note" value="1" />
+      <input type="hidden" name="no_shipping" value="1" />
+      <input type="hidden" name="rm" value="1" />
+      <input type="hidden" name="return" value="{{ redirectUrl }}" />
+      <input type="hidden" name="cancel_return" value="{{ redirectUrl }}" />
+      <input type="hidden" name="currency_code" value="USD" />
+      <input
+        type="hidden"
+        name="image_url"
+        value="https://bitwarden.com/images/paypal-banner.png"
+      />
+      <input type="hidden" name="bn" value="PP-BuyNowBF:btn_buynow_LG.gif:NonHosted" />
+      <input type="hidden" name="amount" value="{{ amount }}" />
+      <input type="hidden" name="custom" value="{{ payPalCustom$ | async }}" />
+      <input type="hidden" name="item_name" value="Bitwarden Account Credit" />
+      <input type="hidden" name="item_number" value="{{ payPalSubject }}" />
+    </form>
+  `,
+  standalone: true,
+  imports: [SharedModule],
+  providers: [BillingClient],
+})
+export class AddAccountCreditDialogComponent {
+  @ViewChild("payPalForm", { read: ElementRef, static: true }) payPalForm!: ElementRef;
+
+  protected payPalConfig = process.env.PAYPAL_CONFIG as PayPalConfig;
+  protected redirectUrl = window.location.href;
+
+  protected formGroup = new FormGroup({
+    paymentMethod: new FormControl<"payPal" | "bitPay">("payPal"),
+    amount: new FormControl<string | null>("0.00", [
+      Validators.required,
+      positiveNumberValidator(this.i18nService.t("mustBePositiveNumber")),
+    ]),
+  });
+
+  protected payPalCustom$ = this.configService.cloudRegion$.pipe(
+    map((cloudRegion) => {
+      switch (this.dialogParams.owner.type) {
+        case "account": {
+          return `user_id=${this.dialogParams.owner.data.id},account_credit=1,region=${cloudRegion}`;
+        }
+        case "organization": {
+          return `organization_id=${this.dialogParams.owner.data.id},account_credit=1,region=${cloudRegion}`;
+        }
+        case "provider": {
+          return `provider_id=${this.dialogParams.owner.data.id},account_credit=1,region=${cloudRegion}`;
+        }
+      }
+    }),
+  );
+
+  constructor(
+    private billingClient: BillingClient,
+    private configService: ConfigService,
+    @Inject(DIALOG_DATA) private dialogParams: DialogParams,
+    private dialogRef: DialogRef<DialogResult>,
+    private i18nService: I18nService,
+    private platformUtilsService: PlatformUtilsService,
+    private toastService: ToastService,
+  ) {}
+
+  submit = async (): Promise<void> => {
+    this.formGroup.markAllAsTouched();
+
+    if (!this.formGroup.valid) {
+      return;
+    }
+
+    if (this.formGroup.value.paymentMethod === "bitPay") {
+      const result = await this.billingClient.addCreditWithBitPay(this.dialogParams.owner, {
+        amount: this.amount!,
+        redirectUrl: this.redirectUrl,
+      });
+
+      switch (result.type) {
+        case "success": {
+          this.platformUtilsService.launchUri(result.value);
+          this.dialogRef.close("launched");
+          break;
+        }
+        case "error": {
+          this.toastService.showToast({
+            variant: "error",
+            title: "",
+            message: result.message,
+          });
+          this.dialogRef.close("error");
+          break;
+        }
+      }
+    }
+
+    this.payPalForm.nativeElement.submit();
+    this.dialogRef.close("launched");
+  };
+
+  formatAmount = (): void => {
+    if (this.formGroup.value.amount) {
+      const amount = parseFloat(this.formGroup.value.amount);
+      if (isNaN(amount)) {
+        this.formGroup.controls.amount.setValue(null);
+      } else {
+        this.formGroup.controls.amount.setValue(amount.toFixed(2).toString());
+      }
+    }
+  };
+
+  get amount(): number | null {
+    if (this.formGroup.value.amount) {
+      const amount = parseFloat(this.formGroup.value.amount);
+      if (isNaN(amount)) {
+        return null;
+      }
+      return amount;
+    }
+    return null;
+  }
+
+  get payPalSubject(): string {
+    switch (this.dialogParams.owner.type) {
+      case "account": {
+        return this.dialogParams.owner.data.email;
+      }
+      case "organization":
+      case "provider": {
+        return this.dialogParams.owner.data.name;
+      }
+    }
+  }
+
+  static open = (dialogService: DialogService, dialogConfig: DialogConfig<DialogParams>) =>
+    dialogService.open<DialogResult>(AddAccountCreditDialogComponent, dialogConfig);
+}
diff --git a/apps/web/src/app/billing/payment/components/change-payment-method-dialog.component.ts b/apps/web/src/app/billing/payment/components/change-payment-method-dialog.component.ts
new file mode 100644
index 00000000000..efd0055fb95
--- /dev/null
+++ b/apps/web/src/app/billing/payment/components/change-payment-method-dialog.component.ts
@@ -0,0 +1,113 @@
+import { DIALOG_DATA } from "@angular/cdk/dialog";
+import { Component, Inject, ViewChild } from "@angular/core";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DialogConfig, DialogRef, DialogService, ToastService } from "@bitwarden/components";
+
+import { SharedModule } from "../../../shared";
+import { BillingClient } from "../../services";
+import { BillableEntity } from "../../types";
+import { MaskedPaymentMethod } from "../types";
+
+import { EnterPaymentMethodComponent } from "./enter-payment-method.component";
+
+type DialogParams = {
+  owner: BillableEntity;
+};
+
+type DialogResult =
+  | { type: "cancelled" }
+  | { type: "error" }
+  | { type: "success"; paymentMethod: MaskedPaymentMethod };
+
+@Component({
+  template: `
+    <form [formGroup]="formGroup" [bitSubmit]="submit">
+      <bit-dialog>
+        <span bitDialogTitle class="tw-font-semibold">
+          {{ "changePaymentMethod" | i18n }}
+        </span>
+        <div bitDialogContent>
+          <app-enter-payment-method [group]="formGroup" [includeBillingAddress]="true">
+          </app-enter-payment-method>
+        </div>
+        <ng-container bitDialogFooter>
+          <button bitButton bitFormButton buttonType="primary" type="submit">
+            {{ "save" | i18n }}
+          </button>
+          <button
+            bitButton
+            buttonType="secondary"
+            type="button"
+            [bitDialogClose]="{ type: 'cancelled' }"
+          >
+            {{ "cancel" | i18n }}
+          </button>
+        </ng-container>
+      </bit-dialog>
+    </form>
+  `,
+  standalone: true,
+  imports: [EnterPaymentMethodComponent, SharedModule],
+  providers: [BillingClient],
+})
+export class ChangePaymentMethodDialogComponent {
+  @ViewChild(EnterPaymentMethodComponent)
+  private enterPaymentMethodComponent!: EnterPaymentMethodComponent;
+  protected formGroup = EnterPaymentMethodComponent.getFormGroup();
+
+  constructor(
+    private billingClient: BillingClient,
+    @Inject(DIALOG_DATA) protected dialogParams: DialogParams,
+    private dialogRef: DialogRef<DialogResult>,
+    private i18nService: I18nService,
+    private toastService: ToastService,
+  ) {}
+
+  submit = async () => {
+    this.formGroup.markAllAsTouched();
+
+    if (!this.formGroup.valid) {
+      return;
+    }
+
+    const paymentMethod = await this.enterPaymentMethodComponent.tokenize();
+    const billingAddress =
+      this.formGroup.value.type !== "payPal"
+        ? this.formGroup.controls.billingAddress.getRawValue()
+        : null;
+
+    const result = await this.billingClient.updatePaymentMethod(
+      this.dialogParams.owner,
+      paymentMethod,
+      billingAddress,
+    );
+
+    switch (result.type) {
+      case "success": {
+        this.toastService.showToast({
+          variant: "success",
+          title: "",
+          message: this.i18nService.t("paymentMethodUpdated"),
+        });
+        this.dialogRef.close({
+          type: "success",
+          paymentMethod: result.value,
+        });
+        break;
+      }
+      case "error": {
+        this.toastService.showToast({
+          variant: "error",
+          title: "",
+          message: result.message,
+        });
+        this.dialogRef.close({ type: "error" });
+        break;
+      }
+    }
+  };
+
+  static open = (dialogService: DialogService, dialogConfig: DialogConfig<DialogParams>) =>
+    dialogService.open<DialogResult>(ChangePaymentMethodDialogComponent, dialogConfig);
+}
diff --git a/apps/web/src/app/billing/payment/components/display-account-credit.component.ts b/apps/web/src/app/billing/payment/components/display-account-credit.component.ts
new file mode 100644
index 00000000000..7cbe3a27f30
--- /dev/null
+++ b/apps/web/src/app/billing/payment/components/display-account-credit.component.ts
@@ -0,0 +1,63 @@
+import { CurrencyPipe } from "@angular/common";
+import { Component, Input } from "@angular/core";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DialogService, ToastService } from "@bitwarden/components";
+
+import { SharedModule } from "../../../shared";
+import { BillingClient } from "../../services";
+import { BillableEntity } from "../../types";
+
+import { AddAccountCreditDialogComponent } from "./add-account-credit-dialog.component";
+
+@Component({
+  selector: "app-display-account-credit",
+  template: `
+    <bit-section>
+      <h2 bitTypography="h2">{{ "accountCredit" | i18n }}: {{ formattedCredit }}</h2>
+      <p>{{ "availableCreditAppliedToInvoice" | i18n }}</p>
+      <button type="button" bitButton buttonType="secondary" [bitAction]="addAccountCredit">
+        {{ "addCredit" | i18n }}
+      </button>
+    </bit-section>
+  `,
+  standalone: true,
+  imports: [SharedModule],
+  providers: [BillingClient, CurrencyPipe],
+})
+export class DisplayAccountCreditComponent {
+  @Input({ required: true }) owner!: BillableEntity;
+  @Input({ required: true }) credit!: number | null;
+
+  constructor(
+    private billingClient: BillingClient,
+    private currencyPipe: CurrencyPipe,
+    private dialogService: DialogService,
+    private i18nService: I18nService,
+    private toastService: ToastService,
+  ) {}
+
+  addAccountCredit = async () => {
+    if (this.owner.type !== "account") {
+      const billingAddress = await this.billingClient.getBillingAddress(this.owner);
+      if (!billingAddress) {
+        this.toastService.showToast({
+          variant: "error",
+          title: "",
+          message: this.i18nService.t("billingAddressRequiredToAddCredit"),
+        });
+      }
+    }
+
+    AddAccountCreditDialogComponent.open(this.dialogService, {
+      data: {
+        owner: this.owner,
+      },
+    });
+  };
+
+  get formattedCredit(): string | null {
+    const credit = this.credit ?? 0;
+    return this.currencyPipe.transform(credit, "$");
+  }
+}
diff --git a/apps/web/src/app/billing/payment/components/display-billing-address.component.ts b/apps/web/src/app/billing/payment/components/display-billing-address.component.ts
new file mode 100644
index 00000000000..f0a11321e5d
--- /dev/null
+++ b/apps/web/src/app/billing/payment/components/display-billing-address.component.ts
@@ -0,0 +1,56 @@
+import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { lastValueFrom } from "rxjs";
+
+import { DialogService } from "@bitwarden/components";
+
+import { SharedModule } from "../../../shared";
+import { BillableEntity } from "../../types";
+import { AddressPipe } from "../pipes";
+import { BillingAddress } from "../types";
+
+import { EditBillingAddressDialogComponent } from "./edit-billing-address-dialog.component";
+
+@Component({
+  selector: "app-display-billing-address",
+  template: `
+    <bit-section>
+      <h2 bitTypography="h2">{{ "billingAddress" | i18n }}</h2>
+      @if (billingAddress) {
+        <p>{{ billingAddress | address }}</p>
+        @if (billingAddress.taxId) {
+          <p>{{ "taxId" | i18n: billingAddress.taxId.value }}</p>
+        }
+      } @else {
+        <p>{{ "noBillingAddress" | i18n }}</p>
+      }
+      @let key = billingAddress ? "editBillingAddress" : "addBillingAddress";
+      <button type="button" bitButton buttonType="secondary" [bitAction]="editBillingAddress">
+        {{ key | i18n }}
+      </button>
+    </bit-section>
+  `,
+  standalone: true,
+  imports: [AddressPipe, SharedModule],
+})
+export class DisplayBillingAddressComponent {
+  @Input({ required: true }) owner!: BillableEntity;
+  @Input({ required: true }) billingAddress!: BillingAddress | null;
+  @Output() updated = new EventEmitter<BillingAddress>();
+
+  constructor(private dialogService: DialogService) {}
+
+  editBillingAddress = async (): Promise<void> => {
+    const dialogRef = EditBillingAddressDialogComponent.open(this.dialogService, {
+      data: {
+        owner: this.owner,
+        billingAddress: this.billingAddress,
+      },
+    });
+
+    const result = await lastValueFrom(dialogRef.closed);
+
+    if (result?.type === "success") {
+      this.updated.emit(result.billingAddress);
+    }
+  };
+}
diff --git a/apps/web/src/app/billing/payment/components/display-payment-method.component.ts b/apps/web/src/app/billing/payment/components/display-payment-method.component.ts
new file mode 100644
index 00000000000..769472bcfcf
--- /dev/null
+++ b/apps/web/src/app/billing/payment/components/display-payment-method.component.ts
@@ -0,0 +1,107 @@
+import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { lastValueFrom } from "rxjs";
+
+import { DialogService } from "@bitwarden/components";
+
+import { SharedModule } from "../../../shared";
+import { BillableEntity } from "../../types";
+import { MaskedPaymentMethod } from "../types";
+
+import { ChangePaymentMethodDialogComponent } from "./change-payment-method-dialog.component";
+import { VerifyBankAccountComponent } from "./verify-bank-account.component";
+
+@Component({
+  selector: "app-display-payment-method",
+  template: `
+    <bit-section>
+      <h2 bitTypography="h2">{{ "paymentMethod" | i18n }}</h2>
+      @if (paymentMethod) {
+        @switch (paymentMethod.type) {
+          @case ("bankAccount") {
+            @if (!paymentMethod.verified) {
+              <app-verify-bank-account [owner]="owner" (verified)="onBankAccountVerified($event)">
+              </app-verify-bank-account>
+            }
+
+            <p>
+              <i class="bwi bwi-fw bwi-billing"></i>
+              {{ paymentMethod.bankName }}, *{{ paymentMethod.last4 }}
+              @if (!paymentMethod.verified) {
+                <span>- {{ "unverified" | i18n }}</span>
+              }
+            </p>
+          }
+          @case ("card") {
+            <p class="tw-flex tw-items-center tw-gap-2">
+              @let brandIcon = getBrandIconForCard();
+              @if (brandIcon !== null) {
+                <i class="bwi bwi-fw credit-card-icon {{ brandIcon }}"></i>
+              } @else {
+                <i class="bwi bwi-fw bwi-credit-card"></i>
+              }
+              {{ paymentMethod.brand | titlecase }}, *{{ paymentMethod.last4 }},
+              {{ paymentMethod.expiration }}
+            </p>
+          }
+          @case ("payPal") {
+            <p>
+              <i class="bwi bwi-fw bwi-paypal tw-text-primary-600"></i>
+              {{ paymentMethod.email }}
+            </p>
+          }
+        }
+      } @else {
+        <p bitTypography="body1">{{ "noPaymentMethod" | i18n }}</p>
+      }
+      @let key = paymentMethod ? "changePaymentMethod" : "addPaymentMethod";
+      <button type="button" bitButton buttonType="secondary" [bitAction]="changePaymentMethod">
+        {{ key | i18n }}
+      </button>
+    </bit-section>
+  `,
+  standalone: true,
+  imports: [SharedModule, VerifyBankAccountComponent],
+})
+export class DisplayPaymentMethodComponent {
+  @Input({ required: true }) owner!: BillableEntity;
+  @Input({ required: true }) paymentMethod!: MaskedPaymentMethod | null;
+  @Output() updated = new EventEmitter<MaskedPaymentMethod>();
+
+  protected availableCardIcons: Record<string, string> = {
+    amex: "card-amex",
+    diners: "card-diners-club",
+    discover: "card-discover",
+    jcb: "card-jcb",
+    mastercard: "card-mastercard",
+    unionpay: "card-unionpay",
+    visa: "card-visa",
+  };
+
+  constructor(private dialogService: DialogService) {}
+
+  changePaymentMethod = async (): Promise<void> => {
+    const dialogRef = ChangePaymentMethodDialogComponent.open(this.dialogService, {
+      data: {
+        owner: this.owner,
+      },
+    });
+
+    const result = await lastValueFrom(dialogRef.closed);
+
+    if (result?.type === "success") {
+      this.updated.emit(result.paymentMethod);
+    }
+  };
+
+  onBankAccountVerified = (paymentMethod: MaskedPaymentMethod) => this.updated.emit(paymentMethod);
+
+  protected getBrandIconForCard = (): string | null => {
+    if (this.paymentMethod?.type !== "card") {
+      return null;
+    }
+
+    return this.paymentMethod.brand in this.availableCardIcons
+      ? this.availableCardIcons[this.paymentMethod.brand]
+      : null;
+  };
+}
diff --git a/apps/web/src/app/billing/payment/components/edit-billing-address-dialog.component.ts b/apps/web/src/app/billing/payment/components/edit-billing-address-dialog.component.ts
new file mode 100644
index 00000000000..c844d08df58
--- /dev/null
+++ b/apps/web/src/app/billing/payment/components/edit-billing-address-dialog.component.ts
@@ -0,0 +1,147 @@
+import { DIALOG_DATA } from "@angular/cdk/dialog";
+import { Component, Inject } from "@angular/core";
+
+import { ProductTierType } from "@bitwarden/common/billing/enums";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DialogConfig, DialogRef, DialogService, ToastService } from "@bitwarden/components";
+
+import { SharedModule } from "../../../shared";
+import { BillingClient } from "../../services";
+import { BillableEntity } from "../../types";
+import { BillingAddress, getTaxIdTypeForCountry } from "../types";
+
+import { EnterBillingAddressComponent } from "./enter-billing-address.component";
+
+type DialogParams = {
+  owner: BillableEntity;
+  billingAddress: BillingAddress | null;
+};
+
+type DialogResult =
+  | { type: "cancelled" }
+  | { type: "error" }
+  | { type: "success"; billingAddress: BillingAddress };
+
+@Component({
+  template: `
+    <form [formGroup]="formGroup" [bitSubmit]="submit">
+      <bit-dialog>
+        <span bitDialogTitle class="tw-font-semibold">
+          {{ "editBillingAddress" | i18n }}
+        </span>
+        <div bitDialogContent>
+          <app-enter-billing-address
+            [scenario]="{
+              type: 'update',
+              existing: dialogParams.billingAddress,
+              supportsTaxId,
+            }"
+            [group]="formGroup"
+          ></app-enter-billing-address>
+        </div>
+        <ng-container bitDialogFooter>
+          <button bitButton bitFormButton buttonType="primary" type="submit">
+            {{ "save" | i18n }}
+          </button>
+          <button
+            bitButton
+            buttonType="secondary"
+            type="button"
+            [bitDialogClose]="{ type: 'cancelled' }"
+          >
+            {{ "cancel" | i18n }}
+          </button>
+        </ng-container>
+      </bit-dialog>
+    </form>
+  `,
+  standalone: true,
+  imports: [EnterBillingAddressComponent, SharedModule],
+  providers: [BillingClient],
+})
+export class EditBillingAddressDialogComponent {
+  protected formGroup = EnterBillingAddressComponent.getFormGroup();
+
+  constructor(
+    private billingClient: BillingClient,
+    @Inject(DIALOG_DATA) protected dialogParams: DialogParams,
+    private dialogRef: DialogRef<DialogResult>,
+    private i18nService: I18nService,
+    private toastService: ToastService,
+  ) {
+    if (dialogParams.billingAddress) {
+      this.formGroup.patchValue({
+        ...dialogParams.billingAddress,
+        taxId: dialogParams.billingAddress.taxId?.value,
+      });
+    }
+  }
+
+  submit = async (): Promise<void> => {
+    this.formGroup.markAllAsTouched();
+
+    if (this.formGroup.invalid) {
+      return;
+    }
+
+    const { taxId, ...addressFields } = this.formGroup.getRawValue();
+
+    const taxIdType = taxId ? getTaxIdTypeForCountry(addressFields.country) : null;
+
+    const billingAddress = taxIdType
+      ? { ...addressFields, taxId: { code: taxIdType.code, value: taxId! } }
+      : { ...addressFields, taxId: null };
+
+    const result = await this.billingClient.updateBillingAddress(
+      this.dialogParams.owner,
+      billingAddress,
+    );
+
+    switch (result.type) {
+      case "success": {
+        this.toastService.showToast({
+          variant: "success",
+          title: "",
+          message: this.i18nService.t("billingAddressUpdated"),
+        });
+        this.dialogRef.close({
+          type: "success",
+          billingAddress: result.value,
+        });
+        break;
+      }
+      case "error": {
+        this.toastService.showToast({
+          variant: "error",
+          title: "",
+          message: result.message,
+        });
+        this.dialogRef.close({
+          type: "error",
+        });
+        break;
+      }
+    }
+  };
+
+  get supportsTaxId(): boolean {
+    switch (this.dialogParams.owner.type) {
+      case "account": {
+        return false;
+      }
+      case "organization": {
+        return [
+          ProductTierType.TeamsStarter,
+          ProductTierType.Teams,
+          ProductTierType.Enterprise,
+        ].includes(this.dialogParams.owner.data.productTierType);
+      }
+      case "provider": {
+        return true;
+      }
+    }
+  }
+
+  static open = (dialogService: DialogService, dialogConfig: DialogConfig<DialogParams>) =>
+    dialogService.open<DialogResult>(EditBillingAddressDialogComponent, dialogConfig);
+}
diff --git a/apps/web/src/app/billing/payment/components/enter-billing-address.component.ts b/apps/web/src/app/billing/payment/components/enter-billing-address.component.ts
new file mode 100644
index 00000000000..0419828d8ba
--- /dev/null
+++ b/apps/web/src/app/billing/payment/components/enter-billing-address.component.ts
@@ -0,0 +1,194 @@
+import { Component, Input, OnDestroy, OnInit } from "@angular/core";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { map, Observable, startWith, Subject, takeUntil } from "rxjs";
+
+import { ControlsOf } from "@bitwarden/angular/types/controls-of";
+
+import { SharedModule } from "../../../shared";
+import { BillingAddress, selectableCountries, taxIdTypes } from "../types";
+
+export interface BillingAddressControls {
+  country: string;
+  postalCode: string;
+  line1: string | null;
+  line2: string | null;
+  city: string | null;
+  state: string | null;
+  taxId: string | null;
+}
+
+export type BillingAddressFormGroup = FormGroup<ControlsOf<BillingAddressControls>>;
+
+type Scenario =
+  | {
+      type: "checkout";
+      supportsTaxId: boolean;
+    }
+  | {
+      type: "update";
+      existing?: BillingAddress;
+      supportsTaxId: boolean;
+    };
+
+@Component({
+  selector: "app-enter-billing-address",
+  template: `
+    <form [formGroup]="group">
+      <div class="tw-grid tw-grid-cols-12 tw-gap-4">
+        <div class="tw-col-span-6">
+          <bit-form-field [disableMargin]="true">
+            <bit-label>{{ "country" | i18n }}</bit-label>
+            <bit-select [formControl]="group.controls.country">
+              @for (selectableCountry of selectableCountries; track selectableCountry.value) {
+                <bit-option
+                  [value]="selectableCountry.value"
+                  [disabled]="selectableCountry.disabled"
+                  [label]="selectableCountry.name"
+                ></bit-option>
+              }
+            </bit-select>
+          </bit-form-field>
+        </div>
+        <div class="tw-col-span-6">
+          <bit-form-field [disableMargin]="true">
+            <bit-label>{{ "zipPostalCode" | i18n }}</bit-label>
+            <input
+              bitInput
+              type="text"
+              [formControl]="group.controls.postalCode"
+              autocomplete="postal-code"
+            />
+          </bit-form-field>
+        </div>
+        <div class="tw-col-span-6">
+          <bit-form-field [disableMargin]="true">
+            <bit-label>{{ "address1" | i18n }}</bit-label>
+            <input
+              bitInput
+              type="text"
+              [formControl]="group.controls.line1"
+              autocomplete="address-line1"
+            />
+          </bit-form-field>
+        </div>
+        <div class="tw-col-span-6">
+          <bit-form-field [disableMargin]="true">
+            <bit-label>{{ "address2" | i18n }}</bit-label>
+            <input
+              bitInput
+              type="text"
+              [formControl]="group.controls.line2"
+              autocomplete="address-line2"
+            />
+          </bit-form-field>
+        </div>
+        <div class="tw-col-span-6">
+          <bit-form-field [disableMargin]="true">
+            <bit-label>{{ "cityTown" | i18n }}</bit-label>
+            <input
+              bitInput
+              type="text"
+              [formControl]="group.controls.city"
+              autocomplete="address-level2"
+            />
+          </bit-form-field>
+        </div>
+        <div class="tw-col-span-6">
+          <bit-form-field [disableMargin]="true">
+            <bit-label>{{ "stateProvince" | i18n }}</bit-label>
+            <input
+              bitInput
+              type="text"
+              [formControl]="group.controls.state"
+              autocomplete="address-level1"
+            />
+          </bit-form-field>
+        </div>
+        @if (supportsTaxId$ | async) {
+          <div class="tw-col-span-6">
+            <bit-form-field [disableMargin]="true">
+              <bit-label>{{ "taxIdNumber" | i18n }}</bit-label>
+              <input bitInput type="text" [formControl]="group.controls.taxId" />
+            </bit-form-field>
+          </div>
+        }
+      </div>
+    </form>
+  `,
+  standalone: true,
+  imports: [SharedModule],
+})
+export class EnterBillingAddressComponent implements OnInit, OnDestroy {
+  @Input({ required: true }) scenario!: Scenario;
+  @Input({ required: true }) group!: BillingAddressFormGroup;
+
+  protected selectableCountries = selectableCountries;
+  protected supportsTaxId$!: Observable<boolean>;
+
+  private destroy$ = new Subject<void>();
+
+  ngOnInit() {
+    switch (this.scenario.type) {
+      case "checkout": {
+        this.disableAddressControls();
+        break;
+      }
+      case "update": {
+        if (this.scenario.existing) {
+          this.group.patchValue({
+            ...this.scenario.existing,
+            taxId: this.scenario.existing.taxId?.value,
+          });
+        }
+      }
+    }
+
+    this.supportsTaxId$ = this.group.controls.country.valueChanges.pipe(
+      startWith(this.group.value.country ?? this.selectableCountries[0].value),
+      map((country) => {
+        if (!this.scenario.supportsTaxId) {
+          return false;
+        }
+
+        return taxIdTypes.filter((taxIdType) => taxIdType.iso === country).length > 0;
+      }),
+    );
+
+    this.supportsTaxId$.pipe(takeUntil(this.destroy$)).subscribe((supportsTaxId) => {
+      if (supportsTaxId) {
+        this.group.controls.taxId.enable();
+      } else {
+        this.group.controls.taxId.disable();
+      }
+    });
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
+  disableAddressControls = () => {
+    this.group.controls.line1.disable();
+    this.group.controls.line2.disable();
+    this.group.controls.city.disable();
+    this.group.controls.state.disable();
+  };
+
+  static getFormGroup = (): BillingAddressFormGroup =>
+    new FormGroup({
+      country: new FormControl<string>("", {
+        nonNullable: true,
+        validators: [Validators.required],
+      }),
+      postalCode: new FormControl<string>("", {
+        nonNullable: true,
+        validators: [Validators.required],
+      }),
+      line1: new FormControl<string | null>(null),
+      line2: new FormControl<string | null>(null),
+      city: new FormControl<string | null>(null),
+      state: new FormControl<string | null>(null),
+      taxId: new FormControl<string | null>(null),
+    });
+}
diff --git a/apps/web/src/app/billing/payment/components/enter-payment-method.component.ts b/apps/web/src/app/billing/payment/components/enter-payment-method.component.ts
new file mode 100644
index 00000000000..4f5b2e3b15c
--- /dev/null
+++ b/apps/web/src/app/billing/payment/components/enter-payment-method.component.ts
@@ -0,0 +1,408 @@
+import { Component, Input, OnInit } from "@angular/core";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { BehaviorSubject, startWith, Subject, takeUntil } from "rxjs";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PopoverModule, ToastService } from "@bitwarden/components";
+
+import { SharedModule } from "../../../shared";
+import { BillingServicesModule, BraintreeService, StripeService } from "../../services";
+import { PaymentLabelComponent } from "../../shared/payment/payment-label.component";
+import {
+  isTokenizablePaymentMethod,
+  selectableCountries,
+  TokenizablePaymentMethod,
+  TokenizedPaymentMethod,
+} from "../types";
+
+type PaymentMethodOption = TokenizablePaymentMethod | "accountCredit";
+
+type PaymentMethodFormGroup = FormGroup<{
+  type: FormControl<PaymentMethodOption>;
+  bankAccount: FormGroup<{
+    routingNumber: FormControl<string>;
+    accountNumber: FormControl<string>;
+    accountHolderName: FormControl<string>;
+    accountHolderType: FormControl<"" | "company" | "individual">;
+  }>;
+  billingAddress: FormGroup<{
+    country: FormControl<string>;
+    postalCode: FormControl<string>;
+  }>;
+}>;
+
+@Component({
+  selector: "app-enter-payment-method",
+  template: `
+    @let showBillingDetails = includeBillingAddress && selected !== "payPal";
+    <form [formGroup]="group">
+      @if (showBillingDetails) {
+        <h5 bitTypography="h5">{{ "paymentMethod" | i18n }}</h5>
+      }
+      <div class="tw-mb-4 tw-text-lg">
+        <bit-radio-group [formControl]="group.controls.type">
+          <bit-radio-button id="card-payment-method" [value]="'card'">
+            <bit-label>
+              <i class="bwi bwi-fw bwi-credit-card" aria-hidden="true"></i>
+              {{ "creditCard" | i18n }}
+            </bit-label>
+          </bit-radio-button>
+          @if (showBankAccount) {
+            <bit-radio-button id="bank-payment-method" [value]="'bankAccount'">
+              <bit-label>
+                <i class="bwi bwi-fw bwi-billing" aria-hidden="true"></i>
+                {{ "bankAccount" | i18n }}
+              </bit-label>
+            </bit-radio-button>
+          }
+          @if (showPayPal) {
+            <bit-radio-button id="paypal-payment-method" [value]="'payPal'">
+              <bit-label>
+                <i class="bwi bwi-fw bwi-paypal" aria-hidden="true"></i>
+                {{ "payPal" | i18n }}
+              </bit-label>
+            </bit-radio-button>
+          }
+          @if (showAccountCredit) {
+            <bit-radio-button id="credit-payment-method" [value]="'accountCredit'">
+              <bit-label>
+                <i class="bwi bwi-fw bwi-dollar" aria-hidden="true"></i>
+                {{ "accountCredit" | i18n }}
+              </bit-label>
+            </bit-radio-button>
+          }
+        </bit-radio-group>
+      </div>
+      @switch (selected) {
+        @case ("card") {
+          <div class="tw-grid tw-grid-cols-2 tw-gap-4 tw-mb-4">
+            <div class="tw-col-span-1">
+              <app-payment-label for="stripe-card-number" required>
+                {{ "number" | i18n }}
+              </app-payment-label>
+              <div id="stripe-card-number" class="tw-stripe-form-control"></div>
+            </div>
+            <div class="tw-col-span-1 tw-flex tw-items-end">
+              <img
+                src="../../../images/cards.png"
+                alt="Visa, MasterCard, Discover, AmEx, JCB, Diners Club, UnionPay"
+                class="tw-max-w-full"
+              />
+            </div>
+            <div class="tw-col-span-1">
+              <app-payment-label for="stripe-card-expiry" required>
+                {{ "expiration" | i18n }}
+              </app-payment-label>
+              <div id="stripe-card-expiry" class="tw-stripe-form-control"></div>
+            </div>
+            <div class="tw-col-span-1">
+              <app-payment-label for="stripe-card-cvc" required>
+                {{ "securityCodeSlashCVV" | i18n }}
+                <button
+                  [bitPopoverTriggerFor]="cardSecurityCodePopover"
+                  type="button"
+                  class="tw-border-none tw-bg-transparent tw-text-primary-600 tw-p-0"
+                  [position]="'above-end'"
+                >
+                  <i class="bwi bwi-question-circle tw-text-lg" aria-hidden="true"></i>
+                </button>
+                <bit-popover [title]="'cardSecurityCode' | i18n" #cardSecurityCodePopover>
+                  <p>{{ "cardSecurityCodeDescription" | i18n }}</p>
+                </bit-popover>
+              </app-payment-label>
+              <div id="stripe-card-cvc" class="tw-stripe-form-control"></div>
+            </div>
+          </div>
+        }
+        @case ("bankAccount") {
+          <ng-container>
+            <bit-callout type="warning" title="{{ 'verifyBankAccount' | i18n }}">
+              {{ "verifyBankAccountWarning" | i18n }}
+            </bit-callout>
+            <div class="tw-grid tw-grid-cols-2 tw-gap-4 tw-mb-4" formGroupName="bankAccount">
+              <bit-form-field class="tw-col-span-1" [disableMargin]="true">
+                <bit-label>{{ "routingNumber" | i18n }}</bit-label>
+                <input
+                  bitInput
+                  id="routingNumber"
+                  type="text"
+                  [formControl]="group.controls.bankAccount.controls.routingNumber"
+                  required
+                />
+              </bit-form-field>
+              <bit-form-field class="tw-col-span-1" [disableMargin]="true">
+                <bit-label>{{ "accountNumber" | i18n }}</bit-label>
+                <input
+                  bitInput
+                  id="accountNumber"
+                  type="text"
+                  [formControl]="group.controls.bankAccount.controls.accountNumber"
+                  required
+                />
+              </bit-form-field>
+              <bit-form-field class="tw-col-span-1" [disableMargin]="true">
+                <bit-label>{{ "accountHolderName" | i18n }}</bit-label>
+                <input
+                  id="accountHolderName"
+                  bitInput
+                  type="text"
+                  [formControl]="group.controls.bankAccount.controls.accountHolderName"
+                  required
+                />
+              </bit-form-field>
+              <bit-form-field class="tw-col-span-1" [disableMargin]="true">
+                <bit-label>{{ "bankAccountType" | i18n }}</bit-label>
+                <bit-select
+                  id="accountHolderType"
+                  [formControl]="group.controls.bankAccount.controls.accountHolderType"
+                  required
+                >
+                  <bit-option [value]="''" label="-- {{ 'select' | i18n }} --"></bit-option>
+                  <bit-option
+                    [value]="'company'"
+                    label="{{ 'bankAccountTypeCompany' | i18n }}"
+                  ></bit-option>
+                  <bit-option
+                    [value]="'individual'"
+                    label="{{ 'bankAccountTypeIndividual' | i18n }}"
+                  ></bit-option>
+                </bit-select>
+              </bit-form-field>
+            </div>
+          </ng-container>
+        }
+        @case ("payPal") {
+          <ng-container>
+            <div class="tw-mb-3">
+              <div id="braintree-container" class="tw-mb-1 tw-content-center"></div>
+              <small class="tw-text-muted">{{ "paypalClickSubmit" | i18n }}</small>
+            </div>
+          </ng-container>
+        }
+        @case ("accountCredit") {
+          <ng-container>
+            <bit-callout type="info">
+              {{ "makeSureEnoughCredit" | i18n }}
+            </bit-callout>
+          </ng-container>
+        }
+      }
+      @if (showBillingDetails) {
+        <h5 bitTypography="h5">{{ "billingAddress" | i18n }}</h5>
+        <div class="tw-grid tw-grid-cols-12 tw-gap-4">
+          <div class="tw-col-span-6">
+            <bit-form-field [disableMargin]="true">
+              <bit-label>{{ "country" | i18n }}</bit-label>
+              <bit-select [formControl]="group.controls.billingAddress.controls.country">
+                @for (selectableCountry of selectableCountries; track selectableCountry.value) {
+                  <bit-option
+                    [value]="selectableCountry.value"
+                    [disabled]="selectableCountry.disabled"
+                    [label]="selectableCountry.name"
+                  ></bit-option>
+                }
+              </bit-select>
+            </bit-form-field>
+          </div>
+          <div class="tw-col-span-6">
+            <bit-form-field [disableMargin]="true">
+              <bit-label>{{ "zipPostalCode" | i18n }}</bit-label>
+              <input
+                bitInput
+                type="text"
+                [formControl]="group.controls.billingAddress.controls.postalCode"
+                autocomplete="postal-code"
+              />
+            </bit-form-field>
+          </div>
+        </div>
+      }
+    </form>
+  `,
+  standalone: true,
+  imports: [BillingServicesModule, PaymentLabelComponent, PopoverModule, SharedModule],
+})
+export class EnterPaymentMethodComponent implements OnInit {
+  @Input({ required: true }) group!: PaymentMethodFormGroup;
+
+  private showBankAccountSubject = new BehaviorSubject<boolean>(true);
+  showBankAccount$ = this.showBankAccountSubject.asObservable();
+  @Input()
+  set showBankAccount(value: boolean) {
+    this.showBankAccountSubject.next(value);
+  }
+  get showBankAccount(): boolean {
+    return this.showBankAccountSubject.value;
+  }
+
+  @Input() showPayPal: boolean = true;
+  @Input() showAccountCredit: boolean = false;
+  @Input() includeBillingAddress: boolean = false;
+
+  protected selectableCountries = selectableCountries;
+
+  private destroy$ = new Subject<void>();
+
+  constructor(
+    private braintreeService: BraintreeService,
+    private i18nService: I18nService,
+    private logService: LogService,
+    private stripeService: StripeService,
+    private toastService: ToastService,
+  ) {}
+
+  ngOnInit() {
+    this.stripeService.loadStripe(
+      {
+        cardNumber: "#stripe-card-number",
+        cardExpiry: "#stripe-card-expiry",
+        cardCvc: "#stripe-card-cvc",
+      },
+      true,
+    );
+
+    if (this.showPayPal) {
+      this.braintreeService.loadBraintree("#braintree-container", false);
+    }
+
+    if (!this.includeBillingAddress) {
+      this.group.controls.billingAddress.disable();
+    }
+
+    this.group.controls.type.valueChanges
+      .pipe(startWith(this.group.controls.type.value), takeUntil(this.destroy$))
+      .subscribe((selected) => {
+        if (selected === "bankAccount") {
+          this.group.controls.bankAccount.enable();
+          if (this.includeBillingAddress) {
+            this.group.controls.billingAddress.enable();
+          }
+        } else {
+          switch (selected) {
+            case "card": {
+              this.stripeService.mountElements();
+              if (this.includeBillingAddress) {
+                this.group.controls.billingAddress.enable();
+              }
+              break;
+            }
+            case "payPal": {
+              this.braintreeService.createDropin();
+              if (this.includeBillingAddress) {
+                this.group.controls.billingAddress.disable();
+              }
+              break;
+            }
+          }
+          this.group.controls.bankAccount.disable();
+        }
+      });
+
+    this.showBankAccount$.pipe(takeUntil(this.destroy$)).subscribe((showBankAccount) => {
+      if (!showBankAccount && this.selected === "bankAccount") {
+        this.select("card");
+      }
+    });
+  }
+
+  select = (paymentMethod: PaymentMethodOption) =>
+    this.group.controls.type.patchValue(paymentMethod);
+
+  tokenize = async (): Promise<TokenizedPaymentMethod> => {
+    const exchange = async (paymentMethod: TokenizablePaymentMethod) => {
+      switch (paymentMethod) {
+        case "bankAccount": {
+          this.group.controls.bankAccount.markAllAsTouched();
+          if (!this.group.controls.bankAccount.valid) {
+            throw new Error("Attempted to tokenize invalid bank account information.");
+          }
+
+          const bankAccount = this.group.controls.bankAccount.getRawValue();
+          const clientSecret = await this.stripeService.createSetupIntent("bankAccount");
+          const billingDetails = this.group.controls.billingAddress.enabled
+            ? this.group.controls.billingAddress.getRawValue()
+            : undefined;
+          return await this.stripeService.setupBankAccountPaymentMethod(
+            clientSecret,
+            bankAccount,
+            billingDetails,
+          );
+        }
+        case "card": {
+          const clientSecret = await this.stripeService.createSetupIntent("card");
+          const billingDetails = this.group.controls.billingAddress.enabled
+            ? this.group.controls.billingAddress.getRawValue()
+            : undefined;
+          return this.stripeService.setupCardPaymentMethod(clientSecret, billingDetails);
+        }
+        case "payPal": {
+          return this.braintreeService.requestPaymentMethod();
+        }
+      }
+    };
+
+    if (!isTokenizablePaymentMethod(this.selected)) {
+      throw new Error(`Attempted to tokenize a non-tokenizable payment method: ${this.selected}`);
+    }
+
+    try {
+      const token = await exchange(this.selected);
+      return { type: this.selected, token };
+    } catch (error: unknown) {
+      this.logService.error(error);
+      this.toastService.showToast({
+        variant: "error",
+        title: "",
+        message: this.i18nService.t("problemSubmittingPaymentMethod"),
+      });
+      throw error;
+    }
+  };
+
+  validate = (): boolean => {
+    if (this.selected === "bankAccount") {
+      this.group.controls.bankAccount.markAllAsTouched();
+      return this.group.controls.bankAccount.valid;
+    }
+
+    return true;
+  };
+
+  get selected(): PaymentMethodOption {
+    return this.group.value.type!;
+  }
+
+  static getFormGroup = (): PaymentMethodFormGroup =>
+    new FormGroup({
+      type: new FormControl<PaymentMethodOption>("card", { nonNullable: true }),
+      bankAccount: new FormGroup({
+        routingNumber: new FormControl<string>("", {
+          nonNullable: true,
+          validators: [Validators.required],
+        }),
+        accountNumber: new FormControl<string>("", {
+          nonNullable: true,
+          validators: [Validators.required],
+        }),
+        accountHolderName: new FormControl<string>("", {
+          nonNullable: true,
+          validators: [Validators.required],
+        }),
+        accountHolderType: new FormControl<"" | "company" | "individual">("", {
+          nonNullable: true,
+          validators: [Validators.required],
+        }),
+      }),
+      billingAddress: new FormGroup({
+        country: new FormControl<string>("", {
+          nonNullable: true,
+          validators: [Validators.required],
+        }),
+        postalCode: new FormControl<string>("", {
+          nonNullable: true,
+          validators: [Validators.required],
+        }),
+      }),
+    });
+}
diff --git a/apps/web/src/app/billing/payment/components/index.ts b/apps/web/src/app/billing/payment/components/index.ts
new file mode 100644
index 00000000000..3bf7f5ecd36
--- /dev/null
+++ b/apps/web/src/app/billing/payment/components/index.ts
@@ -0,0 +1,9 @@
+export * from "./add-account-credit-dialog.component";
+export * from "./change-payment-method-dialog.component";
+export * from "./display-account-credit.component";
+export * from "./display-billing-address.component";
+export * from "./display-payment-method.component";
+export * from "./edit-billing-address-dialog.component";
+export * from "./enter-billing-address.component";
+export * from "./enter-payment-method.component";
+export * from "./verify-bank-account.component";
diff --git a/apps/web/src/app/billing/payment/components/verify-bank-account.component.ts b/apps/web/src/app/billing/payment/components/verify-bank-account.component.ts
new file mode 100644
index 00000000000..f79e9a1b5fc
--- /dev/null
+++ b/apps/web/src/app/billing/payment/components/verify-bank-account.component.ts
@@ -0,0 +1,86 @@
+import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ToastService } from "@bitwarden/components";
+
+import { SharedModule } from "../../../shared";
+import { BillingClient } from "../../services";
+import { BillableEntity } from "../../types";
+import { MaskedPaymentMethod } from "../types";
+
+@Component({
+  selector: "app-verify-bank-account",
+  template: `
+    <bit-callout type="warning" title="{{ 'verifyBankAccount' | i18n }}">
+      <p>{{ "verifyBankAccountWithStatementDescriptorInstructions" | i18n }}</p>
+      <form [formGroup]="formGroup" [bitSubmit]="submit">
+        <bit-form-field class="tw-mr-2 tw-w-48">
+          <bit-label>{{ "descriptorCode" | i18n }}</bit-label>
+          <input
+            bitInput
+            type="text"
+            placeholder="SMAB12"
+            [formControl]="formGroup.controls.descriptorCode"
+          />
+        </bit-form-field>
+        <button type="submit" bitButton bitFormButton buttonType="primary">
+          {{ "submit" | i18n }}
+        </button>
+      </form>
+    </bit-callout>
+  `,
+  standalone: true,
+  imports: [SharedModule],
+  providers: [BillingClient],
+})
+export class VerifyBankAccountComponent {
+  @Input({ required: true }) owner!: BillableEntity;
+  @Output() verified = new EventEmitter<MaskedPaymentMethod>();
+
+  protected formGroup = new FormGroup({
+    descriptorCode: new FormControl<string>("", [
+      Validators.required,
+      Validators.minLength(6),
+      Validators.maxLength(6),
+    ]),
+  });
+
+  constructor(
+    private billingClient: BillingClient,
+    private i18nService: I18nService,
+    private toastService: ToastService,
+  ) {}
+
+  submit = async (): Promise<void> => {
+    this.formGroup.markAllAsTouched();
+
+    if (!this.formGroup.valid) {
+      return;
+    }
+
+    const result = await this.billingClient.verifyBankAccount(
+      this.owner,
+      this.formGroup.value.descriptorCode!,
+    );
+
+    switch (result.type) {
+      case "success": {
+        this.toastService.showToast({
+          variant: "success",
+          title: "",
+          message: this.i18nService.t("bankAccountVerified"),
+        });
+        this.verified.emit(result.value);
+        break;
+      }
+      case "error": {
+        this.toastService.showToast({
+          variant: "error",
+          title: "",
+          message: result.message,
+        });
+      }
+    }
+  };
+}
diff --git a/apps/web/src/app/billing/payment/pipes/address.pipe.spec.ts b/apps/web/src/app/billing/payment/pipes/address.pipe.spec.ts
new file mode 100644
index 00000000000..c497bbf2f0f
--- /dev/null
+++ b/apps/web/src/app/billing/payment/pipes/address.pipe.spec.ts
@@ -0,0 +1,65 @@
+import { AddressPipe } from "./address.pipe";
+
+describe("AddressPipe", () => {
+  let pipe: AddressPipe;
+
+  beforeEach(() => {
+    pipe = new AddressPipe();
+  });
+
+  it("should format a complete address with all fields", () => {
+    const address = {
+      country: "United States",
+      postalCode: "10001",
+      line1: "123 Main St",
+      line2: "Apt 4B",
+      city: "New York",
+      state: "NY",
+    };
+
+    const result = pipe.transform(address);
+    expect(result).toBe("123 Main St, Apt 4B, New York, NY, 10001, United States");
+  });
+
+  it("should format address without line2", () => {
+    const address = {
+      country: "United States",
+      postalCode: "10001",
+      line1: "123 Main St",
+      line2: null,
+      city: "New York",
+      state: "NY",
+    };
+
+    const result = pipe.transform(address);
+    expect(result).toBe("123 Main St, New York, NY, 10001, United States");
+  });
+
+  it("should format address without state", () => {
+    const address = {
+      country: "United Kingdom",
+      postalCode: "SW1A 1AA",
+      line1: "123 Main St",
+      line2: "Apt 4B",
+      city: "London",
+      state: null,
+    };
+
+    const result = pipe.transform(address);
+    expect(result).toBe("123 Main St, Apt 4B, London, SW1A 1AA, United Kingdom");
+  });
+
+  it("should format minimal address with only required fields", () => {
+    const address = {
+      country: "United States",
+      postalCode: "10001",
+      line1: null,
+      line2: null,
+      city: null,
+      state: null,
+    };
+
+    const result = pipe.transform(address);
+    expect(result).toBe("10001, United States");
+  });
+});
diff --git a/apps/web/src/app/billing/payment/pipes/address.pipe.ts b/apps/web/src/app/billing/payment/pipes/address.pipe.ts
new file mode 100644
index 00000000000..da612950a27
--- /dev/null
+++ b/apps/web/src/app/billing/payment/pipes/address.pipe.ts
@@ -0,0 +1,32 @@
+import { Pipe, PipeTransform } from "@angular/core";
+
+import { BillingAddress } from "../types";
+
+@Pipe({
+  name: "address",
+})
+export class AddressPipe implements PipeTransform {
+  transform(address: Omit<BillingAddress, "taxId">): string {
+    const parts: string[] = [];
+
+    if (address.line1) {
+      parts.push(address.line1);
+    }
+
+    if (address.line2) {
+      parts.push(address.line2);
+    }
+
+    if (address.city) {
+      parts.push(address.city);
+    }
+
+    if (address.state) {
+      parts.push(address.state);
+    }
+
+    parts.push(address.postalCode, address.country);
+
+    return parts.join(", ");
+  }
+}
diff --git a/apps/web/src/app/billing/payment/pipes/index.ts b/apps/web/src/app/billing/payment/pipes/index.ts
new file mode 100644
index 00000000000..d95cff6b6f8
--- /dev/null
+++ b/apps/web/src/app/billing/payment/pipes/index.ts
@@ -0,0 +1 @@
+export * from "./address.pipe";
diff --git a/apps/web/src/app/billing/payment/types/billing-address.ts b/apps/web/src/app/billing/payment/types/billing-address.ts
new file mode 100644
index 00000000000..eddb24673f5
--- /dev/null
+++ b/apps/web/src/app/billing/payment/types/billing-address.ts
@@ -0,0 +1,37 @@
+import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+
+import { TaxId, TaxIdResponse } from "./tax-id";
+
+export type BillingAddress = {
+  country: string;
+  postalCode: string;
+  line1: string | null;
+  line2: string | null;
+  city: string | null;
+  state: string | null;
+  taxId: TaxId | null;
+};
+
+export class BillingAddressResponse extends BaseResponse implements BillingAddress {
+  country: string;
+  postalCode: string;
+  line1: string | null;
+  line2: string | null;
+  city: string | null;
+  state: string | null;
+  taxId: TaxId | null;
+
+  constructor(response: any) {
+    super(response);
+
+    this.country = this.getResponseProperty("Country");
+    this.postalCode = this.getResponseProperty("PostalCode");
+    this.line1 = this.getResponseProperty("Line1");
+    this.line2 = this.getResponseProperty("Line2");
+    this.city = this.getResponseProperty("City");
+    this.state = this.getResponseProperty("State");
+
+    const taxId = this.getResponseProperty("TaxId");
+    this.taxId = taxId ? new TaxIdResponse(taxId) : null;
+  }
+}
diff --git a/apps/web/src/app/billing/payment/types/index.ts b/apps/web/src/app/billing/payment/types/index.ts
new file mode 100644
index 00000000000..a8534c5aba4
--- /dev/null
+++ b/apps/web/src/app/billing/payment/types/index.ts
@@ -0,0 +1,6 @@
+export * from "./billing-address";
+export * from "./masked-payment-method";
+export * from "./selectable-country";
+export * from "./tax-id";
+export * from "./tax-id-type";
+export * from "./tokenized-payment-method";
diff --git a/apps/web/src/app/billing/payment/types/masked-payment-method.ts b/apps/web/src/app/billing/payment/types/masked-payment-method.ts
new file mode 100644
index 00000000000..8d07706b14c
--- /dev/null
+++ b/apps/web/src/app/billing/payment/types/masked-payment-method.ts
@@ -0,0 +1,114 @@
+import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+
+import {
+  BankAccountPaymentMethod,
+  CardPaymentMethod,
+  PayPalPaymentMethod,
+} from "./tokenized-payment-method";
+
+export const StripeCardBrands = {
+  amex: "amex",
+  diners: "diners",
+  discover: "discover",
+  eftpos_au: "eftpos_au",
+  jcb: "jcb",
+  link: "link",
+  mastercard: "mastercard",
+  unionpay: "unionpay",
+  visa: "visa",
+  unknown: "unknown",
+} as const;
+
+export type StripeCardBrand = (typeof StripeCardBrands)[keyof typeof StripeCardBrands];
+
+type MaskedBankAccount = {
+  type: BankAccountPaymentMethod;
+  bankName: string;
+  last4: string;
+  verified: boolean;
+};
+
+type MaskedCard = {
+  type: CardPaymentMethod;
+  brand: StripeCardBrand;
+  last4: string;
+  expiration: string;
+};
+
+type MaskedPayPalAccount = {
+  type: PayPalPaymentMethod;
+  email: string;
+};
+
+export type MaskedPaymentMethod = MaskedBankAccount | MaskedCard | MaskedPayPalAccount;
+
+export class MaskedPaymentMethodResponse extends BaseResponse {
+  value: MaskedPaymentMethod;
+
+  constructor(response: any) {
+    super(response);
+
+    const type = this.getResponseProperty("Type");
+    switch (type) {
+      case "card": {
+        this.value = new MaskedCardResponse(response);
+        break;
+      }
+      case "bankAccount": {
+        this.value = new MaskedBankAccountResponse(response);
+        break;
+      }
+      case "payPal": {
+        this.value = new MaskedPayPalAccountResponse(response);
+        break;
+      }
+      default: {
+        throw new Error(`Cannot deserialize unsupported payment method type: ${type}`);
+      }
+    }
+  }
+}
+
+class MaskedBankAccountResponse extends BaseResponse implements MaskedBankAccount {
+  type: BankAccountPaymentMethod;
+  bankName: string;
+  last4: string;
+  verified: boolean;
+
+  constructor(response: any) {
+    super(response);
+
+    this.type = "bankAccount";
+    this.bankName = this.getResponseProperty("BankName");
+    this.last4 = this.getResponseProperty("Last4");
+    this.verified = this.getResponseProperty("Verified");
+  }
+}
+
+class MaskedCardResponse extends BaseResponse implements MaskedCard {
+  type: CardPaymentMethod;
+  brand: StripeCardBrand;
+  last4: string;
+  expiration: string;
+
+  constructor(response: any) {
+    super(response);
+
+    this.type = "card";
+    this.brand = this.getResponseProperty("Brand");
+    this.last4 = this.getResponseProperty("Last4");
+    this.expiration = this.getResponseProperty("Expiration");
+  }
+}
+
+class MaskedPayPalAccountResponse extends BaseResponse implements MaskedPayPalAccount {
+  type: PayPalPaymentMethod;
+  email: string;
+
+  constructor(response: any) {
+    super(response);
+
+    this.type = "payPal";
+    this.email = this.getResponseProperty("Email");
+  }
+}
diff --git a/apps/web/src/app/billing/payment/types/selectable-country.ts b/apps/web/src/app/billing/payment/types/selectable-country.ts
new file mode 100644
index 00000000000..71d6af95cc7
--- /dev/null
+++ b/apps/web/src/app/billing/payment/types/selectable-country.ts
@@ -0,0 +1,259 @@
+type SelectableCountry = Readonly<{
+  name: string;
+  value: string;
+  disabled: boolean;
+}>;
+
+export const selectableCountries: ReadonlyArray<SelectableCountry> = [
+  { name: "-- Select --", value: "", disabled: false },
+  { name: "United States", value: "US", disabled: false },
+  { name: "China", value: "CN", disabled: false },
+  { name: "France", value: "FR", disabled: false },
+  { name: "Germany", value: "DE", disabled: false },
+  { name: "Canada", value: "CA", disabled: false },
+  { name: "United Kingdom", value: "GB", disabled: false },
+  { name: "Australia", value: "AU", disabled: false },
+  { name: "India", value: "IN", disabled: false },
+  { name: "", value: "-", disabled: true },
+  { name: "Afghanistan", value: "AF", disabled: false },
+  { name: "Åland Islands", value: "AX", disabled: false },
+  { name: "Albania", value: "AL", disabled: false },
+  { name: "Algeria", value: "DZ", disabled: false },
+  { name: "American Samoa", value: "AS", disabled: false },
+  { name: "Andorra", value: "AD", disabled: false },
+  { name: "Angola", value: "AO", disabled: false },
+  { name: "Anguilla", value: "AI", disabled: false },
+  { name: "Antarctica", value: "AQ", disabled: false },
+  { name: "Antigua and Barbuda", value: "AG", disabled: false },
+  { name: "Argentina", value: "AR", disabled: false },
+  { name: "Armenia", value: "AM", disabled: false },
+  { name: "Aruba", value: "AW", disabled: false },
+  { name: "Austria", value: "AT", disabled: false },
+  { name: "Azerbaijan", value: "AZ", disabled: false },
+  { name: "Bahamas", value: "BS", disabled: false },
+  { name: "Bahrain", value: "BH", disabled: false },
+  { name: "Bangladesh", value: "BD", disabled: false },
+  { name: "Barbados", value: "BB", disabled: false },
+  { name: "Belarus", value: "BY", disabled: false },
+  { name: "Belgium", value: "BE", disabled: false },
+  { name: "Belize", value: "BZ", disabled: false },
+  { name: "Benin", value: "BJ", disabled: false },
+  { name: "Bermuda", value: "BM", disabled: false },
+  { name: "Bhutan", value: "BT", disabled: false },
+  { name: "Bolivia, Plurinational State of", value: "BO", disabled: false },
+  { name: "Bonaire, Sint Eustatius and Saba", value: "BQ", disabled: false },
+  { name: "Bosnia and Herzegovina", value: "BA", disabled: false },
+  { name: "Botswana", value: "BW", disabled: false },
+  { name: "Bouvet Island", value: "BV", disabled: false },
+  { name: "Brazil", value: "BR", disabled: false },
+  { name: "British Indian Ocean Territory", value: "IO", disabled: false },
+  { name: "Brunei Darussalam", value: "BN", disabled: false },
+  { name: "Bulgaria", value: "BG", disabled: false },
+  { name: "Burkina Faso", value: "BF", disabled: false },
+  { name: "Burundi", value: "BI", disabled: false },
+  { name: "Cambodia", value: "KH", disabled: false },
+  { name: "Cameroon", value: "CM", disabled: false },
+  { name: "Cape Verde", value: "CV", disabled: false },
+  { name: "Cayman Islands", value: "KY", disabled: false },
+  { name: "Central African Republic", value: "CF", disabled: false },
+  { name: "Chad", value: "TD", disabled: false },
+  { name: "Chile", value: "CL", disabled: false },
+  { name: "Christmas Island", value: "CX", disabled: false },
+  { name: "Cocos (Keeling) Islands", value: "CC", disabled: false },
+  { name: "Colombia", value: "CO", disabled: false },
+  { name: "Comoros", value: "KM", disabled: false },
+  { name: "Congo", value: "CG", disabled: false },
+  { name: "Congo, the Democratic Republic of the", value: "CD", disabled: false },
+  { name: "Cook Islands", value: "CK", disabled: false },
+  { name: "Costa Rica", value: "CR", disabled: false },
+  { name: "Côte d'Ivoire", value: "CI", disabled: false },
+  { name: "Croatia", value: "HR", disabled: false },
+  { name: "Cuba", value: "CU", disabled: false },
+  { name: "Curaçao", value: "CW", disabled: false },
+  { name: "Cyprus", value: "CY", disabled: false },
+  { name: "Czech Republic", value: "CZ", disabled: false },
+  { name: "Denmark", value: "DK", disabled: false },
+  { name: "Djibouti", value: "DJ", disabled: false },
+  { name: "Dominica", value: "DM", disabled: false },
+  { name: "Dominican Republic", value: "DO", disabled: false },
+  { name: "Ecuador", value: "EC", disabled: false },
+  { name: "Egypt", value: "EG", disabled: false },
+  { name: "El Salvador", value: "SV", disabled: false },
+  { name: "Equatorial Guinea", value: "GQ", disabled: false },
+  { name: "Eritrea", value: "ER", disabled: false },
+  { name: "Estonia", value: "EE", disabled: false },
+  { name: "Ethiopia", value: "ET", disabled: false },
+  { name: "Falkland Islands (Malvinas)", value: "FK", disabled: false },
+  { name: "Faroe Islands", value: "FO", disabled: false },
+  { name: "Fiji", value: "FJ", disabled: false },
+  { name: "Finland", value: "FI", disabled: false },
+  { name: "French Guiana", value: "GF", disabled: false },
+  { name: "French Polynesia", value: "PF", disabled: false },
+  { name: "French Southern Territories", value: "TF", disabled: false },
+  { name: "Gabon", value: "GA", disabled: false },
+  { name: "Gambia", value: "GM", disabled: false },
+  { name: "Georgia", value: "GE", disabled: false },
+  { name: "Ghana", value: "GH", disabled: false },
+  { name: "Gibraltar", value: "GI", disabled: false },
+  { name: "Greece", value: "GR", disabled: false },
+  { name: "Greenland", value: "GL", disabled: false },
+  { name: "Grenada", value: "GD", disabled: false },
+  { name: "Guadeloupe", value: "GP", disabled: false },
+  { name: "Guam", value: "GU", disabled: false },
+  { name: "Guatemala", value: "GT", disabled: false },
+  { name: "Guernsey", value: "GG", disabled: false },
+  { name: "Guinea", value: "GN", disabled: false },
+  { name: "Guinea-Bissau", value: "GW", disabled: false },
+  { name: "Guyana", value: "GY", disabled: false },
+  { name: "Haiti", value: "HT", disabled: false },
+  { name: "Heard Island and McDonald Islands", value: "HM", disabled: false },
+  { name: "Holy See (Vatican City State)", value: "VA", disabled: false },
+  { name: "Honduras", value: "HN", disabled: false },
+  { name: "Hong Kong", value: "HK", disabled: false },
+  { name: "Hungary", value: "HU", disabled: false },
+  { name: "Iceland", value: "IS", disabled: false },
+  { name: "Indonesia", value: "ID", disabled: false },
+  { name: "Iran, Islamic Republic of", value: "IR", disabled: false },
+  { name: "Iraq", value: "IQ", disabled: false },
+  { name: "Ireland", value: "IE", disabled: false },
+  { name: "Isle of Man", value: "IM", disabled: false },
+  { name: "Israel", value: "IL", disabled: false },
+  { name: "Italy", value: "IT", disabled: false },
+  { name: "Jamaica", value: "JM", disabled: false },
+  { name: "Japan", value: "JP", disabled: false },
+  { name: "Jersey", value: "JE", disabled: false },
+  { name: "Jordan", value: "JO", disabled: false },
+  { name: "Kazakhstan", value: "KZ", disabled: false },
+  { name: "Kenya", value: "KE", disabled: false },
+  { name: "Kiribati", value: "KI", disabled: false },
+  { name: "Korea, Democratic People's Republic of", value: "KP", disabled: false },
+  { name: "Korea, Republic of", value: "KR", disabled: false },
+  { name: "Kuwait", value: "KW", disabled: false },
+  { name: "Kyrgyzstan", value: "KG", disabled: false },
+  { name: "Lao People's Democratic Republic", value: "LA", disabled: false },
+  { name: "Latvia", value: "LV", disabled: false },
+  { name: "Lebanon", value: "LB", disabled: false },
+  { name: "Lesotho", value: "LS", disabled: false },
+  { name: "Liberia", value: "LR", disabled: false },
+  { name: "Libya", value: "LY", disabled: false },
+  { name: "Liechtenstein", value: "LI", disabled: false },
+  { name: "Lithuania", value: "LT", disabled: false },
+  { name: "Luxembourg", value: "LU", disabled: false },
+  { name: "Macao", value: "MO", disabled: false },
+  { name: "Macedonia, the former Yugoslav Republic of", value: "MK", disabled: false },
+  { name: "Madagascar", value: "MG", disabled: false },
+  { name: "Malawi", value: "MW", disabled: false },
+  { name: "Malaysia", value: "MY", disabled: false },
+  { name: "Maldives", value: "MV", disabled: false },
+  { name: "Mali", value: "ML", disabled: false },
+  { name: "Malta", value: "MT", disabled: false },
+  { name: "Marshall Islands", value: "MH", disabled: false },
+  { name: "Martinique", value: "MQ", disabled: false },
+  { name: "Mauritania", value: "MR", disabled: false },
+  { name: "Mauritius", value: "MU", disabled: false },
+  { name: "Mayotte", value: "YT", disabled: false },
+  { name: "Mexico", value: "MX", disabled: false },
+  { name: "Micronesia, Federated States of", value: "FM", disabled: false },
+  { name: "Moldova, Republic of", value: "MD", disabled: false },
+  { name: "Monaco", value: "MC", disabled: false },
+  { name: "Mongolia", value: "MN", disabled: false },
+  { name: "Montenegro", value: "ME", disabled: false },
+  { name: "Montserrat", value: "MS", disabled: false },
+  { name: "Morocco", value: "MA", disabled: false },
+  { name: "Mozambique", value: "MZ", disabled: false },
+  { name: "Myanmar", value: "MM", disabled: false },
+  { name: "Namibia", value: "NA", disabled: false },
+  { name: "Nauru", value: "NR", disabled: false },
+  { name: "Nepal", value: "NP", disabled: false },
+  { name: "Netherlands", value: "NL", disabled: false },
+  { name: "New Caledonia", value: "NC", disabled: false },
+  { name: "New Zealand", value: "NZ", disabled: false },
+  { name: "Nicaragua", value: "NI", disabled: false },
+  { name: "Niger", value: "NE", disabled: false },
+  { name: "Nigeria", value: "NG", disabled: false },
+  { name: "Niue", value: "NU", disabled: false },
+  { name: "Norfolk Island", value: "NF", disabled: false },
+  { name: "Northern Mariana Islands", value: "MP", disabled: false },
+  { name: "Norway", value: "NO", disabled: false },
+  { name: "Oman", value: "OM", disabled: false },
+  { name: "Pakistan", value: "PK", disabled: false },
+  { name: "Palau", value: "PW", disabled: false },
+  { name: "Palestinian Territory, Occupied", value: "PS", disabled: false },
+  { name: "Panama", value: "PA", disabled: false },
+  { name: "Papua New Guinea", value: "PG", disabled: false },
+  { name: "Paraguay", value: "PY", disabled: false },
+  { name: "Peru", value: "PE", disabled: false },
+  { name: "Philippines", value: "PH", disabled: false },
+  { name: "Pitcairn", value: "PN", disabled: false },
+  { name: "Poland", value: "PL", disabled: false },
+  { name: "Portugal", value: "PT", disabled: false },
+  { name: "Puerto Rico", value: "PR", disabled: false },
+  { name: "Qatar", value: "QA", disabled: false },
+  { name: "Réunion", value: "RE", disabled: false },
+  { name: "Romania", value: "RO", disabled: false },
+  { name: "Russian Federation", value: "RU", disabled: false },
+  { name: "Rwanda", value: "RW", disabled: false },
+  { name: "Saint Barthélemy", value: "BL", disabled: false },
+  { name: "Saint Helena, Ascension and Tristan da Cunha", value: "SH", disabled: false },
+  { name: "Saint Kitts and Nevis", value: "KN", disabled: false },
+  { name: "Saint Lucia", value: "LC", disabled: false },
+  { name: "Saint Martin (French part)", value: "MF", disabled: false },
+  { name: "Saint Pierre and Miquelon", value: "PM", disabled: false },
+  { name: "Saint Vincent and the Grenadines", value: "VC", disabled: false },
+  { name: "Samoa", value: "WS", disabled: false },
+  { name: "San Marino", value: "SM", disabled: false },
+  { name: "Sao Tome and Principe", value: "ST", disabled: false },
+  { name: "Saudi Arabia", value: "SA", disabled: false },
+  { name: "Senegal", value: "SN", disabled: false },
+  { name: "Serbia", value: "RS", disabled: false },
+  { name: "Seychelles", value: "SC", disabled: false },
+  { name: "Sierra Leone", value: "SL", disabled: false },
+  { name: "Singapore", value: "SG", disabled: false },
+  { name: "Sint Maarten (Dutch part)", value: "SX", disabled: false },
+  { name: "Slovakia", value: "SK", disabled: false },
+  { name: "Slovenia", value: "SI", disabled: false },
+  { name: "Solomon Islands", value: "SB", disabled: false },
+  { name: "Somalia", value: "SO", disabled: false },
+  { name: "South Africa", value: "ZA", disabled: false },
+  { name: "South Georgia and the South Sandwich Islands", value: "GS", disabled: false },
+  { name: "South Sudan", value: "SS", disabled: false },
+  { name: "Spain", value: "ES", disabled: false },
+  { name: "Sri Lanka", value: "LK", disabled: false },
+  { name: "Sudan", value: "SD", disabled: false },
+  { name: "Suriname", value: "SR", disabled: false },
+  { name: "Svalbard and Jan Mayen", value: "SJ", disabled: false },
+  { name: "Swaziland", value: "SZ", disabled: false },
+  { name: "Sweden", value: "SE", disabled: false },
+  { name: "Switzerland", value: "CH", disabled: false },
+  { name: "Syrian Arab Republic", value: "SY", disabled: false },
+  { name: "Taiwan", value: "TW", disabled: false },
+  { name: "Tajikistan", value: "TJ", disabled: false },
+  { name: "Tanzania, United Republic of", value: "TZ", disabled: false },
+  { name: "Thailand", value: "TH", disabled: false },
+  { name: "Timor-Leste", value: "TL", disabled: false },
+  { name: "Togo", value: "TG", disabled: false },
+  { name: "Tokelau", value: "TK", disabled: false },
+  { name: "Tonga", value: "TO", disabled: false },
+  { name: "Trinidad and Tobago", value: "TT", disabled: false },
+  { name: "Tunisia", value: "TN", disabled: false },
+  { name: "Turkey", value: "TR", disabled: false },
+  { name: "Turkmenistan", value: "TM", disabled: false },
+  { name: "Turks and Caicos Islands", value: "TC", disabled: false },
+  { name: "Tuvalu", value: "TV", disabled: false },
+  { name: "Uganda", value: "UG", disabled: false },
+  { name: "Ukraine", value: "UA", disabled: false },
+  { name: "United Arab Emirates", value: "AE", disabled: false },
+  { name: "United States Minor Outlying Islands", value: "UM", disabled: false },
+  { name: "Uruguay", value: "UY", disabled: false },
+  { name: "Uzbekistan", value: "UZ", disabled: false },
+  { name: "Vanuatu", value: "VU", disabled: false },
+  { name: "Venezuela, Bolivarian Republic of", value: "VE", disabled: false },
+  { name: "Viet Nam", value: "VN", disabled: false },
+  { name: "Virgin Islands, British", value: "VG", disabled: false },
+  { name: "Virgin Islands, U.S.", value: "VI", disabled: false },
+  { name: "Wallis and Futuna", value: "WF", disabled: false },
+  { name: "Western Sahara", value: "EH", disabled: false },
+  { name: "Yemen", value: "YE", disabled: false },
+  { name: "Zambia", value: "ZM", disabled: false },
+  { name: "Zimbabwe", value: "ZW", disabled: false },
+];
diff --git a/apps/web/src/app/billing/payment/types/tax-id-type.ts b/apps/web/src/app/billing/payment/types/tax-id-type.ts
new file mode 100644
index 00000000000..8f6264e088c
--- /dev/null
+++ b/apps/web/src/app/billing/payment/types/tax-id-type.ts
@@ -0,0 +1,1123 @@
+export type TaxIdType = Readonly<{
+  country: string;
+  iso: string;
+  code: string;
+  description: string;
+  example: string;
+  impactsTaxCalculation: boolean;
+}>;
+
+export const getTaxIdTypeForCountry = (country: string): TaxIdType | null => {
+  const types = taxIdTypes.filter((type) => type.iso === country);
+  if (types.length === 0) {
+    return null;
+  } else if (types.length === 1) {
+    return types[0];
+  } else {
+    const impactful = types.find((taxIdType) => taxIdType.impactsTaxCalculation);
+    if (!impactful) {
+      return types[0];
+    }
+    return impactful;
+  }
+};
+
+export const taxIdTypes: ReadonlyArray<TaxIdType> = [
+  {
+    country: "Albania",
+    iso: "AL",
+    code: "al_tin",
+    description: "Albania Tax Identification Number",
+    example: "J12345678N",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Andorra",
+    iso: "AD",
+    code: "ad_nrt",
+    description: "Andorran NRT number",
+    example: "A-123456-Z",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Angola",
+    iso: "AO",
+    code: "ao_tin",
+    description: "Angola Tax Identification Number",
+    example: "5123456789",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Argentina",
+    iso: "AR",
+    code: "ar_cuit",
+    description: "Argentinian tax ID number",
+    example: "12-3456789-01",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Armenia",
+    iso: "AM",
+    code: "am_tin",
+    description: "Armenia Tax Identification Number",
+    example: "2538904",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Aruba",
+    iso: "AW",
+    code: "aw_tin",
+    description: "Aruba Tax Identification Number",
+    example: "12345678",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Australia",
+    iso: "AU",
+    code: "au_abn",
+    description: "Australian Business Number (AU ABN)",
+    example: "12345678912",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Australia",
+    iso: "AU",
+    code: "au_arn",
+    description: "Australian Taxation Office Reference Number",
+    example: "123456789123",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Austria",
+    iso: "AT",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "ATU12345678",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Azerbaijan",
+    iso: "AZ",
+    code: "az_tin",
+    description: "Azerbaijan Tax Identification Number",
+    example: "123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Bahamas",
+    iso: "BS",
+    code: "bs_tin",
+    description: "Bahamas Tax Identification Number",
+    example: "123.456.789",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Bahrain",
+    iso: "BH",
+    code: "bh_vat",
+    description: "Bahraini VAT Number",
+    example: "123456789012345",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Bangladesh",
+    iso: "BD",
+    code: "bd_bin",
+    description: "Bangladesh Business Identification Number",
+    example: "123456789-0123",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Barbados",
+    iso: "BB",
+    code: "bb_tin",
+    description: "Barbados Tax Identification Number",
+    example: "1123456789012",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Belarus",
+    iso: "BY",
+    code: "by_tin",
+    description: "Belarus TIN Number",
+    example: "123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Belgium",
+    iso: "BE",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "BE0123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Benin",
+    iso: "BJ",
+    code: "bj_ifu",
+    description: "Benin Tax Identification Number (Identifiant Fiscal Unique)",
+    example: "1234567890123",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Bolivia",
+    iso: "BO",
+    code: "bo_tin",
+    description: "Bolivian tax ID",
+    example: "123456789",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Bosnia & Herzegovina",
+    iso: "BA",
+    code: "ba_tin",
+    description: "Bosnia and Herzegovina Tax Identification Number",
+    example: "123456789012",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Brazil",
+    iso: "BR",
+    code: "br_cnpj",
+    description: "Brazilian CNPJ number",
+    example: "01.234.456/5432-10",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Brazil",
+    iso: "BR",
+    code: "br_cpf",
+    description: "Brazilian CPF number",
+    example: "123.456.789-87",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Bulgaria",
+    iso: "BG",
+    code: "bg_uic",
+    description: "Bulgaria Unified Identification Code",
+    example: "123456789",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Bulgaria",
+    iso: "BG",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "BG0123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Burkina Faso",
+    iso: "BF",
+    code: "bf_ifu",
+    description: "Burkina Faso Tax Identification Number (Numéro d'Identifiant Fiscal Unique)",
+    example: "12345678A",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Cambodia",
+    iso: "KH",
+    code: "kh_tin",
+    description: "Cambodia Tax Identification Number",
+    example: "1001-123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Cameroon",
+    iso: "CM",
+    code: "cm_niu",
+    description: "Cameroon Tax Identification Number (Numéro d'Identifiant fiscal Unique)",
+    example: "M123456789000L",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Canada",
+    iso: "CA",
+    code: "ca_bn",
+    description: "Canadian BN",
+    example: "123456789",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Canada",
+    iso: "CA",
+    code: "ca_gst_hst",
+    description: "Canadian GST/HST number",
+    example: "123456789RT0002",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Canada",
+    iso: "CA",
+    code: "ca_pst_bc",
+    description: "Canadian PST number (British Columbia)",
+    example: "PST-1234-5678",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Canada",
+    iso: "CA",
+    code: "ca_pst_mb",
+    description: "Canadian PST number (Manitoba)",
+    example: "123456-7",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Canada",
+    iso: "CA",
+    code: "ca_pst_sk",
+    description: "Canadian PST number (Saskatchewan)",
+    example: "1234567",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Canada",
+    iso: "CA",
+    code: "ca_qst",
+    description: "Canadian QST number (Québec)",
+    example: "1234567890TQ1234",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Cape Verde",
+    iso: "CV",
+    code: "cv_nif",
+    description: "Cape Verde Tax Identification Number (Número de Identificação Fiscal)",
+    example: "213456789",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Chile",
+    iso: "CL",
+    code: "cl_tin",
+    description: "Chilean TIN",
+    example: "12.345.678-K",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "China",
+    iso: "CN",
+    code: "cn_tin",
+    description: "Chinese tax ID",
+    example: "123456789012345678",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Colombia",
+    iso: "CO",
+    code: "co_nit",
+    description: "Colombian NIT number",
+    example: "123.456.789-0",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Congo - Kinshasa",
+    iso: "CD",
+    code: "cd_nif",
+    description: "Congo (DR) Tax Identification Number (Número de Identificação Fiscal)",
+    example: "A0123456M",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Costa Rica",
+    iso: "CR",
+    code: "cr_tin",
+    description: "Costa Rican tax ID",
+    example: "1-234-567890",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Croatia",
+    iso: "HR",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "HR12345678912",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Croatia",
+    iso: "HR",
+    code: "hr_oib",
+    description: "Croatian Personal Identification Number",
+    example: "12345678901",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Cyprus",
+    iso: "CY",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "CY12345678Z",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Czech Republic",
+    iso: "CZ",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "CZ1234567890",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Denmark",
+    iso: "DK",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "DK12345678",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Dominican Republic",
+    iso: "DO",
+    code: "do_rcn",
+    description: "Dominican RCN number",
+    example: "123-4567890-1",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Ecuador",
+    iso: "EC",
+    code: "ec_ruc",
+    description: "Ecuadorian RUC number",
+    example: "1234567890001",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Egypt",
+    iso: "EG",
+    code: "eg_tin",
+    description: "Egyptian Tax Identification Number",
+    example: "123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "El Salvador",
+    iso: "SV",
+    code: "sv_nit",
+    description: "El Salvadorian NIT number",
+    example: "1234-567890-123-4",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Estonia",
+    iso: "EE",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "EE123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Ethiopia",
+    iso: "ET",
+    code: "et_tin",
+    description: "Ethiopia Tax Identification Number",
+    example: "1234567890",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "EU",
+    iso: "EU",
+    code: "eu_oss_vat",
+    description: "European One Stop Shop VAT number for non-Union scheme",
+    example: "EU123456789",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Finland",
+    iso: "FI",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "FI12345678",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "France",
+    iso: "FR",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "FRAB123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Georgia",
+    iso: "GE",
+    code: "ge_vat",
+    description: "Georgian VAT",
+    example: "123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Germany",
+    iso: "DE",
+    code: "de_stn",
+    description: "German Tax Number (Steuernummer)",
+    example: "1234567890",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Germany",
+    iso: "DE",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "DE123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Greece",
+    iso: "GR",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "EL123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Guinea",
+    iso: "GN",
+    code: "gn_nif",
+    description: "Guinea Tax Identification Number (Número de Identificação Fiscal)",
+    example: "123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Hong Kong",
+    iso: "HK",
+    code: "hk_br",
+    description: "Hong Kong BR number",
+    example: "12345678",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Hungary",
+    iso: "HU",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "HU12345678",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Hungary",
+    iso: "HU",
+    code: "hu_tin",
+    description: "Hungary tax number (adószám)",
+    example: "12345678-1-23",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Iceland",
+    iso: "IS",
+    code: "is_vat",
+    description: "Icelandic VAT",
+    example: "123456",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "India",
+    iso: "IN",
+    code: "in_gst",
+    description: "Indian GST number",
+    example: "12ABCDE3456FGZH",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Indonesia",
+    iso: "ID",
+    code: "id_npwp",
+    description: "Indonesian NPWP number",
+    example: "012.345.678.9-012.345",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Ireland",
+    iso: "IE",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "IE1234567AB",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Israel",
+    iso: "IL",
+    code: "il_vat",
+    description: "Israel VAT",
+    example: "12345",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Italy",
+    iso: "IT",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "IT12345678912",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Japan",
+    iso: "JP",
+    code: "jp_cn",
+    description: "Japanese Corporate Number (*Hōjin Bangō*)",
+    example: "1234567891234",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Japan",
+    iso: "JP",
+    code: "jp_rn",
+    description:
+      "Japanese Registered Foreign Businesses' Registration Number (*Tōroku Kokugai Jigyōsha no Tōroku Bangō*)",
+    example: "12345",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Japan",
+    iso: "JP",
+    code: "jp_trn",
+    description: "Japanese Tax Registration Number (*Tōroku Bangō*)",
+    example: "T1234567891234",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Kazakhstan",
+    iso: "KZ",
+    code: "kz_bin",
+    description: "Kazakhstani Business Identification Number",
+    example: "123456789012",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Kenya",
+    iso: "KE",
+    code: "ke_pin",
+    description: "Kenya Revenue Authority Personal Identification Number",
+    example: "P000111111A",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Kyrgyzstan",
+    iso: "KG",
+    code: "kg_tin",
+    description: "Kyrgyzstan Tax Identification Number",
+    example: "12345678901234",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Laos",
+    iso: "LA",
+    code: "la_tin",
+    description: "Laos Tax Identification Number",
+    example: "123456789-000",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Latvia",
+    iso: "LV",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "LV12345678912",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Liechtenstein",
+    iso: "LI",
+    code: "li_uid",
+    description: "Liechtensteinian UID number",
+    example: "CHE123456789",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Liechtenstein",
+    iso: "LI",
+    code: "li_vat",
+    description: "Liechtensteinian VAT number",
+    example: "12345",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Lithuania",
+    iso: "LT",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "LT123456789123",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Luxembourg",
+    iso: "LU",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "LU12345678",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Malaysia",
+    iso: "MY",
+    code: "my_frp",
+    description: "Malaysian FRP number",
+    example: "12345678",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Malaysia",
+    iso: "MY",
+    code: "my_itn",
+    description: "Malaysian ITN",
+    example: "C 1234567890",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Malaysia",
+    iso: "MY",
+    code: "my_sst",
+    description: "Malaysian SST number",
+    example: "A12-3456-78912345",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Malta",
+    iso: "MT",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "MT12345678",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Mauritania",
+    iso: "MR",
+    code: "mr_nif",
+    description: "Mauritania Tax Identification Number (Número de Identificação Fiscal)",
+    example: "12345678",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Mexico",
+    iso: "MX",
+    code: "mx_rfc",
+    description: "Mexican RFC number",
+    example: "ABC010203AB9",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Moldova",
+    iso: "MD",
+    code: "md_vat",
+    description: "Moldova VAT Number",
+    example: "1234567",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Montenegro",
+    iso: "ME",
+    code: "me_pib",
+    description: "Montenegro PIB Number",
+    example: "12345678",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Morocco",
+    iso: "MA",
+    code: "ma_vat",
+    description: "Morocco VAT Number",
+    example: "12345678",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Nepal",
+    iso: "NP",
+    code: "np_pan",
+    description: "Nepal PAN Number",
+    example: "123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Netherlands",
+    iso: "NL",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "NL123456789B12",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "New Zealand",
+    iso: "NZ",
+    code: "nz_gst",
+    description: "New Zealand GST number",
+    example: "123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Nigeria",
+    iso: "NG",
+    code: "ng_tin",
+    description: "Nigerian Tax Identification Number",
+    example: "12345678-0001",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "North Macedonia",
+    iso: "MK",
+    code: "mk_vat",
+    description: "North Macedonia VAT Number",
+    example: "MK1234567890123",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Norway",
+    iso: "NO",
+    code: "no_vat",
+    description: "Norwegian VAT number",
+    example: "123456789MVA",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Norway",
+    iso: "NO",
+    code: "no_voec",
+    description: "Norwegian VAT on e-commerce number",
+    example: "1234567",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Oman",
+    iso: "OM",
+    code: "om_vat",
+    description: "Omani VAT Number",
+    example: "OM1234567890",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Peru",
+    iso: "PE",
+    code: "pe_ruc",
+    description: "Peruvian RUC number",
+    example: "12345678901",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Philippines",
+    iso: "PH",
+    code: "ph_tin",
+    description: "Philippines Tax Identification Number",
+    example: "123456789012",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Poland",
+    iso: "PL",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "PL1234567890",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Portugal",
+    iso: "PT",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "PT123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Romania",
+    iso: "RO",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "RO1234567891",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Romania",
+    iso: "RO",
+    code: "ro_tin",
+    description: "Romanian tax ID number",
+    example: "1234567890123",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Russia",
+    iso: "RU",
+    code: "ru_inn",
+    description: "Russian INN",
+    example: "1234567891",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Russia",
+    iso: "RU",
+    code: "ru_kpp",
+    description: "Russian KPP",
+    example: "123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Saudi Arabia",
+    iso: "SA",
+    code: "sa_vat",
+    description: "Saudi Arabia VAT",
+    example: "123456789012345",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Senegal",
+    iso: "SN",
+    code: "sn_ninea",
+    description: "Senegal NINEA Number",
+    example: "12345672A2",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Serbia",
+    iso: "RS",
+    code: "rs_pib",
+    description: "Serbian PIB number",
+    example: "123456789",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Singapore",
+    iso: "SG",
+    code: "sg_gst",
+    description: "Singaporean GST",
+    example: "M12345678X",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Singapore",
+    iso: "SG",
+    code: "sg_uen",
+    description: "Singaporean UEN",
+    example: "123456789F",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Slovakia",
+    iso: "SK",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "SK1234567891",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Slovenia",
+    iso: "SI",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "SI12345678",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Slovenia",
+    iso: "SI",
+    code: "si_tin",
+    description: "Slovenia tax number (davčna številka)",
+    example: "12345678",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "South Africa",
+    iso: "ZA",
+    code: "za_vat",
+    description: "South African VAT number",
+    example: "4123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "South Korea",
+    iso: "KR",
+    code: "kr_brn",
+    description: "Korean BRN",
+    example: "123-45-67890",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Spain",
+    iso: "ES",
+    code: "es_cif",
+    description: "Spanish NIF number (previously Spanish CIF number)",
+    example: "A12345678",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Spain",
+    iso: "ES",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "ESA1234567Z",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Suriname",
+    iso: "SR",
+    code: "sr_fin",
+    description: "Suriname FIN Number",
+    example: "1234567890",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Sweden",
+    iso: "SE",
+    code: "eu_vat",
+    description: "European VAT number",
+    example: "SE123456789123",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Switzerland",
+    iso: "CH",
+    code: "ch_uid",
+    description: "Switzerland UID number",
+    example: "CHE-123.456.789 HR",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Switzerland",
+    iso: "CH",
+    code: "ch_vat",
+    description: "Switzerland VAT number",
+    example: "CHE-123.456.789 MWST",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Taiwan",
+    iso: "TW",
+    code: "tw_vat",
+    description: "Taiwanese VAT",
+    example: "12345678",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Tajikistan",
+    iso: "TJ",
+    code: "tj_tin",
+    description: "Tajikistan Tax Identification Number",
+    example: "123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Tanzania",
+    iso: "TZ",
+    code: "tz_vat",
+    description: "Tanzania VAT Number",
+    example: "12345678A",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Thailand",
+    iso: "TH",
+    code: "th_vat",
+    description: "Thai VAT",
+    example: "1234567891234",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Turkey",
+    iso: "TR",
+    code: "tr_tin",
+    description: "Turkish Tax Identification Number",
+    example: "123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Uganda",
+    iso: "UG",
+    code: "ug_tin",
+    description: "Uganda Tax Identification Number",
+    example: "1014751879",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Ukraine",
+    iso: "UA",
+    code: "ua_vat",
+    description: "Ukrainian VAT",
+    example: "123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "United Arab Emirates",
+    iso: "AE",
+    code: "ae_trn",
+    description: "United Arab Emirates TRN",
+    example: "123456789012345",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "United Kingdom",
+    iso: "GB",
+    code: "eu_vat",
+    description: "Northern Ireland VAT number",
+    example: "XI123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "United Kingdom",
+    iso: "GB",
+    code: "gb_vat",
+    description: "United Kingdom VAT number",
+    example: "GB123456789",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "United States",
+    iso: "US",
+    code: "us_ein",
+    description: "United States EIN",
+    example: "12-3456789",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Uruguay",
+    iso: "UY",
+    code: "uy_ruc",
+    description: "Uruguayan RUC number",
+    example: "123456789012",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Uzbekistan",
+    iso: "UZ",
+    code: "uz_tin",
+    description: "Uzbekistan TIN Number",
+    example: "123456789",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Uzbekistan",
+    iso: "UZ",
+    code: "uz_vat",
+    description: "Uzbekistan VAT Number",
+    example: "123456789012",
+    impactsTaxCalculation: true,
+  },
+  {
+    country: "Venezuela",
+    iso: "VE",
+    code: "ve_rif",
+    description: "Venezuelan RIF number",
+    example: "A-12345678-9",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Vietnam",
+    iso: "VN",
+    code: "vn_tin",
+    description: "Vietnamese tax ID number",
+    example: "1234567890",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Zambia",
+    iso: "ZM",
+    code: "zm_tin",
+    description: "Zambia Tax Identification Number",
+    example: "1004751879",
+    impactsTaxCalculation: false,
+  },
+  {
+    country: "Zimbabwe",
+    iso: "ZW",
+    code: "zw_tin",
+    description: "Zimbabwe Tax Identification Number",
+    example: "1234567890",
+    impactsTaxCalculation: false,
+  },
+];
diff --git a/apps/web/src/app/billing/payment/types/tax-id.ts b/apps/web/src/app/billing/payment/types/tax-id.ts
new file mode 100644
index 00000000000..80df42a3436
--- /dev/null
+++ b/apps/web/src/app/billing/payment/types/tax-id.ts
@@ -0,0 +1,18 @@
+import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+
+export interface TaxId {
+  code: string;
+  value: string;
+}
+
+export class TaxIdResponse extends BaseResponse implements TaxId {
+  code: string;
+  value: string;
+
+  constructor(response: any) {
+    super(response);
+
+    this.code = this.getResponseProperty("Code");
+    this.value = this.getResponseProperty("Value");
+  }
+}
diff --git a/apps/web/src/app/billing/payment/types/tokenized-payment-method.ts b/apps/web/src/app/billing/payment/types/tokenized-payment-method.ts
new file mode 100644
index 00000000000..def240f534b
--- /dev/null
+++ b/apps/web/src/app/billing/payment/types/tokenized-payment-method.ts
@@ -0,0 +1,22 @@
+export const TokenizablePaymentMethods = {
+  bankAccount: "bankAccount",
+  card: "card",
+  payPal: "payPal",
+} as const;
+
+export type BankAccountPaymentMethod = typeof TokenizablePaymentMethods.bankAccount;
+export type CardPaymentMethod = typeof TokenizablePaymentMethods.card;
+export type PayPalPaymentMethod = typeof TokenizablePaymentMethods.payPal;
+
+export type TokenizablePaymentMethod =
+  (typeof TokenizablePaymentMethods)[keyof typeof TokenizablePaymentMethods];
+
+export const isTokenizablePaymentMethod = (value: string): value is TokenizablePaymentMethod => {
+  const valid = Object.values(TokenizablePaymentMethods) as readonly string[];
+  return valid.includes(value);
+};
+
+export type TokenizedPaymentMethod = {
+  type: TokenizablePaymentMethod;
+  token: string;
+};
diff --git a/apps/web/src/app/billing/services/billing.client.ts b/apps/web/src/app/billing/services/billing.client.ts
new file mode 100644
index 00000000000..69f82eab19a
--- /dev/null
+++ b/apps/web/src/app/billing/services/billing.client.ts
@@ -0,0 +1,153 @@
+import { Injectable } from "@angular/core";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
+
+import {
+  BillingAddress,
+  BillingAddressResponse,
+  MaskedPaymentMethod,
+  MaskedPaymentMethodResponse,
+  TokenizedPaymentMethod,
+} from "../payment/types";
+import { BillableEntity } from "../types";
+
+type Result<T> =
+  | {
+      type: "success";
+      value: T;
+    }
+  | {
+      type: "error";
+      message: string;
+    };
+
+@Injectable()
+export class BillingClient {
+  constructor(private apiService: ApiService) {}
+
+  private getEndpoint = (entity: BillableEntity): string => {
+    switch (entity.type) {
+      case "account": {
+        return "/account/billing/vnext";
+      }
+      case "organization": {
+        return `/organizations/${entity.data.id}/billing/vnext`;
+      }
+      case "provider": {
+        return `/providers/${entity.data.id}/billing/vnext`;
+      }
+    }
+  };
+
+  addCreditWithBitPay = async (
+    owner: BillableEntity,
+    credit: { amount: number; redirectUrl: string },
+  ): Promise<Result<string>> => {
+    const path = `${this.getEndpoint(owner)}/credit/bitpay`;
+    try {
+      const data = await this.apiService.send("POST", path, credit, true, true);
+      return {
+        type: "success",
+        value: data as string,
+      };
+    } catch (error: any) {
+      if (error instanceof ErrorResponse) {
+        return {
+          type: "error",
+          message: error.message,
+        };
+      }
+      throw error;
+    }
+  };
+
+  getBillingAddress = async (owner: BillableEntity): Promise<BillingAddress | null> => {
+    const path = `${this.getEndpoint(owner)}/address`;
+    const data = await this.apiService.send("GET", path, null, true, true);
+    return data ? new BillingAddressResponse(data) : null;
+  };
+
+  getCredit = async (owner: BillableEntity): Promise<number | null> => {
+    const path = `${this.getEndpoint(owner)}/credit`;
+    const data = await this.apiService.send("GET", path, null, true, true);
+    return data ? (data as number) : null;
+  };
+
+  getPaymentMethod = async (owner: BillableEntity): Promise<MaskedPaymentMethod | null> => {
+    const path = `${this.getEndpoint(owner)}/payment-method`;
+    const data = await this.apiService.send("GET", path, null, true, true);
+    return data ? new MaskedPaymentMethodResponse(data).value : null;
+  };
+
+  updateBillingAddress = async (
+    owner: BillableEntity,
+    billingAddress: BillingAddress,
+  ): Promise<Result<BillingAddress>> => {
+    const path = `${this.getEndpoint(owner)}/address`;
+    try {
+      const data = await this.apiService.send("PUT", path, billingAddress, true, true);
+      return {
+        type: "success",
+        value: new BillingAddressResponse(data),
+      };
+    } catch (error: any) {
+      if (error instanceof ErrorResponse) {
+        return {
+          type: "error",
+          message: error.message,
+        };
+      }
+      throw error;
+    }
+  };
+
+  updatePaymentMethod = async (
+    owner: BillableEntity,
+    paymentMethod: TokenizedPaymentMethod,
+    billingAddress: Pick<BillingAddress, "country" | "postalCode"> | null,
+  ): Promise<Result<MaskedPaymentMethod>> => {
+    const path = `${this.getEndpoint(owner)}/payment-method`;
+    try {
+      const request = {
+        ...paymentMethod,
+        billingAddress,
+      };
+      const data = await this.apiService.send("PUT", path, request, true, true);
+      return {
+        type: "success",
+        value: new MaskedPaymentMethodResponse(data).value,
+      };
+    } catch (error: any) {
+      if (error instanceof ErrorResponse) {
+        return {
+          type: "error",
+          message: error.message,
+        };
+      }
+      throw error;
+    }
+  };
+
+  verifyBankAccount = async (
+    owner: BillableEntity,
+    descriptorCode: string,
+  ): Promise<Result<MaskedPaymentMethod>> => {
+    const path = `${this.getEndpoint(owner)}/payment-method/verify-bank-account`;
+    try {
+      const data = await this.apiService.send("POST", path, { descriptorCode }, true, true);
+      return {
+        type: "success",
+        value: new MaskedPaymentMethodResponse(data).value,
+      };
+    } catch (error: any) {
+      if (error instanceof ErrorResponse) {
+        return {
+          type: "error",
+          message: error.message,
+        };
+      }
+      throw error;
+    }
+  };
+}
diff --git a/apps/web/src/app/billing/services/index.ts b/apps/web/src/app/billing/services/index.ts
index e291ca6a454..dcd2c05034a 100644
--- a/apps/web/src/app/billing/services/index.ts
+++ b/apps/web/src/app/billing/services/index.ts
@@ -1,3 +1,4 @@
+export * from "./billing.client";
 export * from "./billing-services.module";
 export * from "./braintree.service";
 export * from "./stripe.service";
diff --git a/apps/web/src/app/billing/services/stripe.service.ts b/apps/web/src/app/billing/services/stripe.service.ts
index 360187ecd1e..7ea0d7d52c8 100644
--- a/apps/web/src/app/billing/services/stripe.service.ts
+++ b/apps/web/src/app/billing/services/stripe.service.ts
@@ -2,11 +2,43 @@
 // @ts-strict-ignore
 import { Injectable } from "@angular/core";
 
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { BankAccount } from "@bitwarden/common/billing/models/domain";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 
+import { BankAccountPaymentMethod, CardPaymentMethod } from "../payment/types";
+
 import { BillingServicesModule } from "./billing-services.module";
 
+type SetupBankAccountRequest = {
+  payment_method: {
+    us_bank_account: {
+      routing_number: string;
+      account_number: string;
+      account_holder_type: string;
+    };
+    billing_details: {
+      name: string;
+      address?: {
+        country: string;
+        postal_code: string;
+      };
+    };
+  };
+};
+
+type SetupCardRequest = {
+  payment_method: {
+    card: string;
+    billing_details?: {
+      address: {
+        country: string;
+        postal_code: string;
+      };
+    };
+  };
+};
+
 @Injectable({ providedIn: BillingServicesModule })
 export class StripeService {
   private stripe: any;
@@ -17,7 +49,28 @@ export class StripeService {
     cardCvc: string;
   };
 
-  constructor(private logService: LogService) {}
+  constructor(
+    private apiService: ApiService,
+    private logService: LogService,
+  ) {}
+
+  createSetupIntent = async (
+    paymentMethod: BankAccountPaymentMethod | CardPaymentMethod,
+  ): Promise<string> => {
+    const getPath = () => {
+      switch (paymentMethod) {
+        case "bankAccount": {
+          return "/setup-intent/bank-account";
+        }
+        case "card": {
+          return "/setup-intent/card";
+        }
+      }
+    };
+
+    const response = await this.apiService.send("POST", getPath(), null, true, true);
+    return response as string;
+  };
 
   /**
    * Loads [Stripe JS]{@link https://docs.stripe.com/js} in the <head> element of the current page and mounts
@@ -51,25 +104,28 @@ export class StripeService {
     window.document.head.appendChild(script);
   }
 
-  /**
-   * Re-mounts previously created Stripe credit card [elements]{@link https://docs.stripe.com/js/elements_object/create} into the HTML elements
-   * specified during the {@link loadStripe} call. This is useful for when those HTML elements are removed from the DOM by Angular.
-   */
-  mountElements(i: number = 0) {
+  mountElements(attempt: number = 1) {
     setTimeout(() => {
-      if (!document.querySelector(this.elementIds.cardNumber) && i < 10) {
-        this.logService.warning("Stripe container missing, retrying...");
-        this.mountElements(i + 1);
-        return;
-      }
+      if (!this.elements) {
+        this.logService.warning(`Stripe elements are missing, retrying for attempt ${attempt}...`);
+        this.mountElements(attempt + 1);
+      } else {
+        const cardNumber = this.elements.getElement("cardNumber");
+        const cardExpiry = this.elements.getElement("cardExpiry");
+        const cardCVC = this.elements.getElement("cardCvc");
 
-      const cardNumber = this.elements.getElement("cardNumber");
-      const cardExpiry = this.elements.getElement("cardExpiry");
-      const cardCvc = this.elements.getElement("cardCvc");
-      cardNumber.mount(this.elementIds.cardNumber);
-      cardExpiry.mount(this.elementIds.cardExpiry);
-      cardCvc.mount(this.elementIds.cardCvc);
-    }, 50);
+        if ([cardNumber, cardExpiry, cardCVC].some((element) => !element)) {
+          this.logService.warning(
+            `Some Stripe card elements are missing, retrying for attempt ${attempt}...`,
+          );
+          this.mountElements(attempt + 1);
+        } else {
+          cardNumber.mount(this.elementIds.cardNumber);
+          cardExpiry.mount(this.elementIds.cardExpiry);
+          cardCVC.mount(this.elementIds.cardCvc);
+        }
+      }
+    }, 100);
   }
 
   /**
@@ -81,8 +137,9 @@ export class StripeService {
   async setupBankAccountPaymentMethod(
     clientSecret: string,
     { accountHolderName, routingNumber, accountNumber, accountHolderType }: BankAccount,
+    billingDetails?: { country: string; postalCode: string },
   ): Promise<string> {
-    const result = await this.stripe.confirmUsBankAccountSetup(clientSecret, {
+    const request: SetupBankAccountRequest = {
       payment_method: {
         us_bank_account: {
           routing_number: routingNumber,
@@ -93,7 +150,16 @@ export class StripeService {
           name: accountHolderName,
         },
       },
-    });
+    };
+
+    if (billingDetails) {
+      request.payment_method.billing_details.address = {
+        country: billingDetails.country,
+        postal_code: billingDetails.postalCode,
+      };
+    }
+
+    const result = await this.stripe.confirmUsBankAccountSetup(clientSecret, request);
     if (result.error || (result.setupIntent && result.setupIntent.status !== "requires_action")) {
       this.logService.error(result.error);
       throw result.error;
@@ -107,13 +173,25 @@ export class StripeService {
    * thereby creating and storing a Stripe [PaymentMethod]{@link https://docs.stripe.com/api/payment_methods}.
    * @returns The ID of the newly created PaymentMethod.
    */
-  async setupCardPaymentMethod(clientSecret: string): Promise<string> {
+  async setupCardPaymentMethod(
+    clientSecret: string,
+    billingDetails?: { country: string; postalCode: string },
+  ): Promise<string> {
     const cardNumber = this.elements.getElement("cardNumber");
-    const result = await this.stripe.confirmCardSetup(clientSecret, {
+    const request: SetupCardRequest = {
       payment_method: {
         card: cardNumber,
       },
-    });
+    };
+    if (billingDetails) {
+      request.payment_method.billing_details = {
+        address: {
+          country: billingDetails.country,
+          postal_code: billingDetails.postalCode,
+        },
+      };
+    }
+    const result = await this.stripe.confirmCardSetup(clientSecret, request);
     if (result.error || (result.setupIntent && result.setupIntent.status !== "succeeded")) {
       this.logService.error(result.error);
       throw result.error;
diff --git a/apps/web/src/app/billing/services/trial-flow.service.ts b/apps/web/src/app/billing/services/trial-flow.service.ts
index 979fc29aed7..831cc129e60 100644
--- a/apps/web/src/app/billing/services/trial-flow.service.ts
+++ b/apps/web/src/app/billing/services/trial-flow.service.ts
@@ -11,6 +11,8 @@ import { BillingSourceResponse } from "@bitwarden/common/billing/models/response
 import { OrganizationBillingMetadataResponse } from "@bitwarden/common/billing/models/response/organization-billing-metadata.response";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { DialogService } from "@bitwarden/components";
 
@@ -28,6 +30,7 @@ export class TrialFlowService {
     private router: Router,
     protected billingApiService: BillingApiServiceAbstraction,
     private organizationApiService: OrganizationApiServiceAbstraction,
+    private configService: ConfigService,
   ) {}
   checkForOrgsWithUpcomingPaymentIssues(
     organization: Organization,
@@ -131,8 +134,13 @@ export class TrialFlowService {
   }
 
   private async navigateToPaymentMethod(orgId: string) {
-    await this.router.navigate(["organizations", `${orgId}`, "billing", "payment-method"], {
+    const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
+      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
+    );
+    const route = managePaymentDetailsOutsideCheckout ? "payment-details" : "payment-method";
+    await this.router.navigate(["organizations", `${orgId}`, "billing", route], {
       state: { launchPaymentModalAutomatically: true },
+      queryParams: { launchPaymentModalAutomatically: true },
     });
   }
 
diff --git a/apps/web/src/app/billing/shared/billing-free-families-nav-item.component.ts b/apps/web/src/app/billing/shared/billing-free-families-nav-item.component.ts
index ad322645270..60b46c2b64e 100644
--- a/apps/web/src/app/billing/shared/billing-free-families-nav-item.component.ts
+++ b/apps/web/src/app/billing/shared/billing-free-families-nav-item.component.ts
@@ -10,7 +10,6 @@ import { BillingSharedModule } from "./billing-shared.module";
 @Component({
   selector: "billing-free-families-nav-item",
   templateUrl: "./billing-free-families-nav-item.component.html",
-  standalone: true,
   imports: [NavigationModule, BillingSharedModule],
 })
 export class BillingFreeFamiliesNavItemComponent {
diff --git a/apps/web/src/app/billing/shared/payment-method.component.ts b/apps/web/src/app/billing/shared/payment-method.component.ts
index 74793bccc01..0e116b4f39a 100644
--- a/apps/web/src/app/billing/shared/payment-method.component.ts
+++ b/apps/web/src/app/billing/shared/payment-method.component.ts
@@ -18,7 +18,9 @@ import { PaymentMethodType } from "@bitwarden/common/billing/enums";
 import { BillingPaymentResponse } from "@bitwarden/common/billing/models/response/billing-payment.response";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { SubscriptionResponse } from "@bitwarden/common/billing/models/response/subscription.response";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { VerifyBankRequest } from "@bitwarden/common/models/request/verify-bank.request";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
@@ -79,6 +81,7 @@ export class PaymentMethodComponent implements OnInit, OnDestroy {
     private organizationService: OrganizationService,
     private accountService: AccountService,
     protected syncService: SyncService,
+    private configService: ConfigService,
   ) {
     const state = this.router.getCurrentNavigation()?.extras?.state;
     // incase the above state is undefined or null we use redundantState
@@ -107,6 +110,14 @@ export class PaymentMethodComponent implements OnInit, OnDestroy {
         return;
       }
 
+      const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
+        FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
+      );
+
+      if (managePaymentDetailsOutsideCheckout) {
+        await this.router.navigate(["../payment-details"], { relativeTo: this.route });
+      }
+
       await this.load();
       this.firstLoaded = true;
     });
diff --git a/apps/web/src/app/billing/shared/payment/payment-label.component.ts b/apps/web/src/app/billing/shared/payment/payment-label.component.ts
index 80a4087456d..025727d1d1e 100644
--- a/apps/web/src/app/billing/shared/payment/payment-label.component.ts
+++ b/apps/web/src/app/billing/shared/payment/payment-label.component.ts
@@ -14,7 +14,6 @@ import { SharedModule } from "../../../shared";
 @Component({
   selector: "app-payment-label",
   templateUrl: "./payment-label.component.html",
-  standalone: true,
   imports: [FormFieldModule, SharedModule],
 })
 export class PaymentLabelComponent {
diff --git a/apps/web/src/app/billing/shared/payment/payment.component.ts b/apps/web/src/app/billing/shared/payment/payment.component.ts
index 75db7779a04..afb67dec883 100644
--- a/apps/web/src/app/billing/shared/payment/payment.component.ts
+++ b/apps/web/src/app/billing/shared/payment/payment.component.ts
@@ -22,7 +22,6 @@ import { PaymentLabelComponent } from "./payment-label.component";
 @Component({
   selector: "app-payment",
   templateUrl: "./payment.component.html",
-  standalone: true,
   imports: [BillingServicesModule, SharedModule, PaymentLabelComponent],
 })
 export class PaymentComponent implements OnInit, OnDestroy {
diff --git a/apps/web/src/app/billing/shared/tax-info.component.ts b/apps/web/src/app/billing/shared/tax-info.component.ts
index 74e2ab35cb9..35c4a3fcc4e 100644
--- a/apps/web/src/app/billing/shared/tax-info.component.ts
+++ b/apps/web/src/app/billing/shared/tax-info.component.ts
@@ -21,7 +21,6 @@ import { SharedModule } from "../../shared";
 @Component({
   selector: "app-tax-info",
   templateUrl: "tax-info.component.html",
-  standalone: true,
   imports: [SharedModule],
 })
 export class TaxInfoComponent implements OnInit, OnDestroy {
diff --git a/apps/web/src/app/billing/shared/verify-bank-account/verify-bank-account.component.ts b/apps/web/src/app/billing/shared/verify-bank-account/verify-bank-account.component.ts
index d2cd473d3d3..b7cdfbe60a2 100644
--- a/apps/web/src/app/billing/shared/verify-bank-account/verify-bank-account.component.ts
+++ b/apps/web/src/app/billing/shared/verify-bank-account/verify-bank-account.component.ts
@@ -10,7 +10,6 @@ import { SharedModule } from "../../../shared";
 @Component({
   selector: "app-verify-bank-account",
   templateUrl: "./verify-bank-account.component.html",
-  standalone: true,
   imports: [SharedModule],
 })
 export class VerifyBankAccountComponent {
diff --git a/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html
index 7f093842b6a..98fe4032b55 100644
--- a/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html
+++ b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html
@@ -38,13 +38,17 @@
           [loading]="loading && (trialPaymentOptional$ | async)"
           (click)="orgNameEntrySubmit()"
         >
-          {{ (trialPaymentOptional$ | async) ? ("startTrial" | i18n) : ("next" | i18n) }}
+          {{
+            (trialPaymentOptional$ | async) && trialLength > 0
+              ? ("startTrial" | i18n)
+              : ("next" | i18n)
+          }}
         </button>
       </app-vertical-step>
       <app-vertical-step
         label="Billing"
         [subLabel]="billingSubLabel"
-        *ngIf="!(trialPaymentOptional$ | async) && !isSecretsManagerFree"
+        *ngIf="showBillingStep$ | async"
       >
         <app-trial-billing-step
           *ngIf="stepper.selectedIndex === 2"
diff --git a/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts
index 215035a0d16..ce02ee8715a 100644
--- a/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts
+++ b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts
@@ -4,7 +4,7 @@ import { StepperSelectionEvent } from "@angular/cdk/stepper";
 import { Component, OnDestroy, OnInit, ViewChild } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
-import { firstValueFrom, Subject, switchMap, takeUntil } from "rxjs";
+import { combineLatest, firstValueFrom, map, Subject, switchMap, takeUntil } from "rxjs";
 
 import {
   InputPasswordFlow,
@@ -18,6 +18,7 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/mod
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
 import {
   OrganizationBillingServiceAbstraction as OrganizationBillingService,
   OrganizationInformation,
@@ -31,7 +32,6 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { ToastService } from "@bitwarden/components";
 
-import { AcceptOrganizationInviteService } from "../../../auth/organization-invite/accept-organization.service";
 import {
   OrganizationCreatedEvent,
   SubscriptionProduct,
@@ -52,7 +52,7 @@ export type InitiationPath =
 export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
   @ViewChild("stepper", { static: false }) verticalStepper: VerticalStepperComponent;
 
-  inputPasswordFlow = InputPasswordFlow.AccountRegistration;
+  inputPasswordFlow = InputPasswordFlow.SetInitialPasswordAccountRegistration;
   initializing = true;
 
   /** Password Manager or Secrets Manager */
@@ -101,6 +101,9 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
   protected trialPaymentOptional$ = this.configService.getFeatureFlag$(
     FeatureFlag.TrialPaymentOptional,
   );
+  protected allowTrialLengthZero$ = this.configService.getFeatureFlag$(
+    FeatureFlag.AllowTrialLengthZero,
+  );
 
   constructor(
     protected router: Router,
@@ -112,7 +115,7 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
     private i18nService: I18nService,
     private routerService: RouterService,
     private organizationBillingService: OrganizationBillingService,
-    private acceptOrganizationInviteService: AcceptOrganizationInviteService,
+    private organizationInviteService: OrganizationInviteService,
     private toastService: ToastService,
     private registrationFinishService: RegistrationFinishService,
     private validationService: ValidationService,
@@ -171,7 +174,7 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
       this.setupFamilySponsorship(qParams.sponsorshipToken);
     });
 
-    const invite = await this.acceptOrganizationInviteService.getOrganizationInvite();
+    const invite = await this.organizationInviteService.getOrganizationInvite();
     let policies: Policy[] | null = null;
 
     if (invite != null) {
@@ -225,7 +228,8 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
   async orgNameEntrySubmit(): Promise<void> {
     const isTrialPaymentOptional = await firstValueFrom(this.trialPaymentOptional$);
 
-    if (isTrialPaymentOptional) {
+    /** Only skip payment if the flag is on AND trialLength > 0 */
+    if (isTrialPaymentOptional && this.trialLength > 0) {
       await this.createOrganizationOnTrial();
     } else {
       await this.conditionallyCreateOrganization();
@@ -333,6 +337,18 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
     return this.productTier;
   }
 
+  readonly showBillingStep$ = combineLatest([
+    this.trialPaymentOptional$,
+    this.allowTrialLengthZero$,
+  ]).pipe(
+    map(([trialPaymentOptional, allowTrialLengthZero]) => {
+      return (
+        (!trialPaymentOptional && !this.isSecretsManagerFree) ||
+        (trialPaymentOptional && allowTrialLengthZero && this.trialLength === 0)
+      );
+    }),
+  );
+
   /** Create an organization unless the trial is for secrets manager */
   async conditionallyCreateOrganization(): Promise<void> {
     if (!this.isSecretsManagerFree) {
diff --git a/apps/web/src/app/billing/types/billable-entity.ts b/apps/web/src/app/billing/types/billable-entity.ts
new file mode 100644
index 00000000000..79ed12a4161
--- /dev/null
+++ b/apps/web/src/app/billing/types/billable-entity.ts
@@ -0,0 +1,42 @@
+import { map } from "rxjs";
+
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
+import { Account } from "@bitwarden/common/auth/abstractions/account.service";
+
+export type BillableEntity =
+  | { type: "account"; data: Account }
+  | { type: "organization"; data: Organization }
+  | { type: "provider"; data: Provider };
+
+export const accountToBillableEntity = map<Account | null, BillableEntity>((account) => {
+  if (!account) {
+    throw new Error("Account not found");
+  }
+  return {
+    type: "account",
+    data: account,
+  };
+});
+
+export const organizationToBillableEntity = map<Organization | undefined, BillableEntity>(
+  (organization) => {
+    if (!organization) {
+      throw new Error("Organization not found");
+    }
+    return {
+      type: "organization",
+      data: organization,
+    };
+  },
+);
+
+export const providerToBillableEntity = map<Provider | null, BillableEntity>((provider) => {
+  if (!provider) {
+    throw new Error("Organization not found");
+  }
+  return {
+    type: "provider",
+    data: provider,
+  };
+});
diff --git a/apps/web/src/app/billing/types/index.ts b/apps/web/src/app/billing/types/index.ts
new file mode 100644
index 00000000000..1278e0f2e14
--- /dev/null
+++ b/apps/web/src/app/billing/types/index.ts
@@ -0,0 +1,2 @@
+export * from "./billable-entity";
+export * from "./free-trial";
diff --git a/apps/web/src/app/billing/warnings/components/index.ts b/apps/web/src/app/billing/warnings/components/index.ts
new file mode 100644
index 00000000000..1e1e0682e62
--- /dev/null
+++ b/apps/web/src/app/billing/warnings/components/index.ts
@@ -0,0 +1,2 @@
+export * from "./organization-free-trial-warning.component";
+export * from "./organization-reseller-renewal-warning.component";
diff --git a/apps/web/src/app/billing/warnings/free-trial-warning.component.ts b/apps/web/src/app/billing/warnings/components/organization-free-trial-warning.component.ts
similarity index 68%
rename from apps/web/src/app/billing/warnings/free-trial-warning.component.ts
rename to apps/web/src/app/billing/warnings/components/organization-free-trial-warning.component.ts
index e83873e9d6b..074358537b6 100644
--- a/apps/web/src/app/billing/warnings/free-trial-warning.component.ts
+++ b/apps/web/src/app/billing/warnings/components/organization-free-trial-warning.component.ts
@@ -6,15 +6,13 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { AnchorLinkDirective, BannerComponent } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
-import {
-  FreeTrialWarning,
-  OrganizationWarningsService,
-} from "../services/organization-warnings.service";
+import { OrganizationWarningsService } from "../services";
+import { OrganizationFreeTrialWarning } from "../types";
 
 @Component({
-  selector: "app-free-trial-warning",
+  selector: "app-organization-free-trial-warning",
   template: `
-    @let warning = freeTrialWarning$ | async;
+    @let warning = warning$ | async;
 
     @if (warning) {
       <bit-banner
@@ -37,20 +35,21 @@ import {
       </bit-banner>
     }
   `,
-  standalone: true,
   imports: [AnchorLinkDirective, AsyncPipe, BannerComponent, I18nPipe],
 })
-export class FreeTrialWarningComponent implements OnInit {
+export class OrganizationFreeTrialWarningComponent implements OnInit {
   @Input({ required: true }) organization!: Organization;
   @Output() clicked = new EventEmitter<void>();
 
-  freeTrialWarning$!: Observable<FreeTrialWarning>;
+  warning$!: Observable<OrganizationFreeTrialWarning>;
 
   constructor(private organizationWarningsService: OrganizationWarningsService) {}
 
   ngOnInit() {
-    this.freeTrialWarning$ = this.organizationWarningsService.getFreeTrialWarning$(
-      this.organization,
-    );
+    this.warning$ = this.organizationWarningsService.getFreeTrialWarning$(this.organization);
   }
+
+  refresh = () => {
+    this.warning$ = this.organizationWarningsService.getFreeTrialWarning$(this.organization, true);
+  };
 }
diff --git a/apps/web/src/app/billing/warnings/reseller-renewal-warning.component.ts b/apps/web/src/app/billing/warnings/components/organization-reseller-renewal-warning.component.ts
similarity index 62%
rename from apps/web/src/app/billing/warnings/reseller-renewal-warning.component.ts
rename to apps/web/src/app/billing/warnings/components/organization-reseller-renewal-warning.component.ts
index fc94e85e28d..f45dd443dda 100644
--- a/apps/web/src/app/billing/warnings/reseller-renewal-warning.component.ts
+++ b/apps/web/src/app/billing/warnings/components/organization-reseller-renewal-warning.component.ts
@@ -5,15 +5,13 @@ import { Observable } from "rxjs";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { BannerComponent } from "@bitwarden/components";
 
-import {
-  OrganizationWarningsService,
-  ResellerRenewalWarning,
-} from "../services/organization-warnings.service";
+import { OrganizationWarningsService } from "../services";
+import { OrganizationResellerRenewalWarning } from "../types";
 
 @Component({
-  selector: "app-reseller-renewal-warning",
+  selector: "app-organization-reseller-renewal-warning",
   template: `
-    @let warning = resellerRenewalWarning$ | async;
+    @let warning = warning$ | async;
 
     @if (warning) {
       <bit-banner
@@ -27,19 +25,16 @@ import {
       </bit-banner>
     }
   `,
-  standalone: true,
   imports: [AsyncPipe, BannerComponent],
 })
-export class ResellerRenewalWarningComponent implements OnInit {
+export class OrganizationResellerRenewalWarningComponent implements OnInit {
   @Input({ required: true }) organization!: Organization;
 
-  resellerRenewalWarning$!: Observable<ResellerRenewalWarning>;
+  warning$!: Observable<OrganizationResellerRenewalWarning>;
 
   constructor(private organizationWarningsService: OrganizationWarningsService) {}
 
   ngOnInit() {
-    this.resellerRenewalWarning$ = this.organizationWarningsService.getResellerRenewalWarning$(
-      this.organization,
-    );
+    this.warning$ = this.organizationWarningsService.getResellerRenewalWarning$(this.organization);
   }
 }
diff --git a/apps/web/src/app/billing/warnings/services/index.ts b/apps/web/src/app/billing/warnings/services/index.ts
new file mode 100644
index 00000000000..fbd1c56f350
--- /dev/null
+++ b/apps/web/src/app/billing/warnings/services/index.ts
@@ -0,0 +1 @@
+export * from "./organization-warnings.service";
diff --git a/apps/web/src/app/billing/services/organization-warnings.service.spec.ts b/apps/web/src/app/billing/warnings/services/organization-warnings.service.spec.ts
similarity index 97%
rename from apps/web/src/app/billing/services/organization-warnings.service.spec.ts
rename to apps/web/src/app/billing/warnings/services/organization-warnings.service.spec.ts
index 88c571e2d67..c75dde0c9e5 100644
--- a/apps/web/src/app/billing/services/organization-warnings.service.spec.ts
+++ b/apps/web/src/app/billing/warnings/services/organization-warnings.service.spec.ts
@@ -11,7 +11,9 @@ import { DialogService, SimpleDialogOptions } from "@bitwarden/components";
 
 import { OrganizationWarningsService } from "./organization-warnings.service";
 
-describe("OrganizationWarningsService", () => {
+// Skipped since Angular complains about `TypeError: Cannot read properties of undefined (reading 'ngModule')`
+// which is typically a sign of circular dependencies. The problem seems to be originating from `ChangePlanDialogComponent`.
+describe.skip("OrganizationWarningsService", () => {
   let dialogService: MockProxy<DialogService>;
   let i18nService: MockProxy<I18nService>;
   let organizationApiService: MockProxy<OrganizationApiServiceAbstraction>;
diff --git a/apps/web/src/app/billing/services/organization-warnings.service.ts b/apps/web/src/app/billing/warnings/services/organization-warnings.service.ts
similarity index 78%
rename from apps/web/src/app/billing/services/organization-warnings.service.ts
rename to apps/web/src/app/billing/warnings/services/organization-warnings.service.ts
index f75220a7744..fa53992afe0 100644
--- a/apps/web/src/app/billing/services/organization-warnings.service.ts
+++ b/apps/web/src/app/billing/warnings/services/organization-warnings.service.ts
@@ -1,25 +1,20 @@
 import { Injectable } from "@angular/core";
 import { Router } from "@angular/router";
-import {
-  filter,
-  from,
-  lastValueFrom,
-  map,
-  Observable,
-  shareReplay,
-  switchMap,
-  takeWhile,
-} from "rxjs";
+import { filter, from, lastValueFrom, map, Observable, switchMap, takeWhile } from "rxjs";
 import { take } from "rxjs/operators";
 
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { OrganizationBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/organizations/organization-billing-api.service.abstraction";
 import { OrganizationWarningsResponse } from "@bitwarden/common/billing/models/response/organization-warnings.response";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { DialogService } from "@bitwarden/components";
-import { openChangePlanDialog } from "@bitwarden/web-vault/app/billing/organizations/change-plan-dialog.component";
+
+import { openChangePlanDialog } from "../../organizations/change-plan-dialog.component";
+import { OrganizationFreeTrialWarning, OrganizationResellerRenewalWarning } from "../types";
 
 const format = (date: Date) =>
   date.toLocaleDateString("en-US", {
@@ -28,21 +23,12 @@ const format = (date: Date) =>
     year: "numeric",
   });
 
-export type FreeTrialWarning = {
-  organization: Pick<Organization, "id" & "name">;
-  message: string;
-};
-
-export type ResellerRenewalWarning = {
-  type: "info" | "warning";
-  message: string;
-};
-
 @Injectable({ providedIn: "root" })
 export class OrganizationWarningsService {
   private cache$ = new Map<OrganizationId, Observable<OrganizationWarningsResponse>>();
 
   constructor(
+    private configService: ConfigService,
     private dialogService: DialogService,
     private i18nService: I18nService,
     private organizationApiService: OrganizationApiServiceAbstraction,
@@ -50,8 +36,11 @@ export class OrganizationWarningsService {
     private router: Router,
   ) {}
 
-  getFreeTrialWarning$ = (organization: Organization): Observable<FreeTrialWarning> =>
-    this.getWarning$(organization, (response) => response.freeTrial).pipe(
+  getFreeTrialWarning$ = (
+    organization: Organization,
+    bypassCache: boolean = false,
+  ): Observable<OrganizationFreeTrialWarning> =>
+    this.getWarning$(organization, (response) => response.freeTrial, bypassCache).pipe(
       map((warning) => {
         const { remainingTrialDays } = warning;
 
@@ -76,9 +65,12 @@ export class OrganizationWarningsService {
       }),
     );
 
-  getResellerRenewalWarning$ = (organization: Organization): Observable<ResellerRenewalWarning> =>
-    this.getWarning$(organization, (response) => response.resellerRenewal).pipe(
-      map((warning): ResellerRenewalWarning | null => {
+  getResellerRenewalWarning$ = (
+    organization: Organization,
+    bypassCache: boolean = false,
+  ): Observable<OrganizationResellerRenewalWarning> =>
+    this.getWarning$(organization, (response) => response.resellerRenewal, bypassCache).pipe(
+      map((warning): OrganizationResellerRenewalWarning | null => {
         switch (warning.type) {
           case "upcoming": {
             return {
@@ -116,8 +108,11 @@ export class OrganizationWarningsService {
       filter((result): result is NonNullable<typeof result> => result !== null),
     );
 
-  showInactiveSubscriptionDialog$ = (organization: Organization): Observable<void> =>
-    this.getWarning$(organization, (response) => response.inactiveSubscription).pipe(
+  showInactiveSubscriptionDialog$ = (
+    organization: Organization,
+    bypassCache: boolean = false,
+  ): Observable<void> =>
+    this.getWarning$(organization, (response) => response.inactiveSubscription, bypassCache).pipe(
       switchMap(async (warning) => {
         switch (warning.resolution) {
           case "contact_provider": {
@@ -142,8 +137,14 @@ export class OrganizationWarningsService {
               cancelButtonText: this.i18nService.t("close"),
             });
             if (confirmed) {
+              const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
+                FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
+              );
+              const route = managePaymentDetailsOutsideCheckout
+                ? "payment-details"
+                : "payment-method";
               await this.router.navigate(
-                ["organizations", `${organization.id}`, "billing", "payment-method"],
+                ["organizations", `${organization.id}`, "billing", route],
                 {
                   state: { launchPaymentModalAutomatically: true },
                 },
@@ -177,14 +178,15 @@ export class OrganizationWarningsService {
       }),
     );
 
-  private getResponse$ = (organization: Organization): Observable<OrganizationWarningsResponse> => {
+  private getResponse$ = (
+    organization: Organization,
+    bypassCache: boolean = false,
+  ): Observable<OrganizationWarningsResponse> => {
     const existing = this.cache$.get(organization.id as OrganizationId);
-    if (existing) {
+    if (existing && !bypassCache) {
       return existing;
     }
-    const response$ = from(this.organizationBillingApiService.getWarnings(organization.id)).pipe(
-      shareReplay({ bufferSize: 1, refCount: false }),
-    );
+    const response$ = from(this.organizationBillingApiService.getWarnings(organization.id));
     this.cache$.set(organization.id as OrganizationId, response$);
     return response$;
   };
@@ -192,8 +194,9 @@ export class OrganizationWarningsService {
   private getWarning$ = <T>(
     organization: Organization,
     extract: (response: OrganizationWarningsResponse) => T | null | undefined,
+    bypassCache: boolean = false,
   ): Observable<T> =>
-    this.getResponse$(organization).pipe(
+    this.getResponse$(organization, bypassCache).pipe(
       map(extract),
       takeWhile((warning): warning is T => !!warning),
       take(1),
diff --git a/apps/web/src/app/billing/warnings/types/index.ts b/apps/web/src/app/billing/warnings/types/index.ts
new file mode 100644
index 00000000000..fc0c7d278ed
--- /dev/null
+++ b/apps/web/src/app/billing/warnings/types/index.ts
@@ -0,0 +1 @@
+export * from "./organization-warnings";
diff --git a/apps/web/src/app/billing/warnings/types/organization-warnings.ts b/apps/web/src/app/billing/warnings/types/organization-warnings.ts
new file mode 100644
index 00000000000..96bf5aff6f1
--- /dev/null
+++ b/apps/web/src/app/billing/warnings/types/organization-warnings.ts
@@ -0,0 +1,11 @@
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+
+export type OrganizationFreeTrialWarning = {
+  organization: Pick<Organization, "id" & "name">;
+  message: string;
+};
+
+export type OrganizationResellerRenewalWarning = {
+  type: "info" | "warning";
+  message: string;
+};
diff --git a/apps/web/src/app/components/dynamic-avatar.component.ts b/apps/web/src/app/components/dynamic-avatar.component.ts
index 4381524de66..8cd73862151 100644
--- a/apps/web/src/app/components/dynamic-avatar.component.ts
+++ b/apps/web/src/app/components/dynamic-avatar.component.ts
@@ -10,7 +10,6 @@ import { SharedModule } from "../shared";
 type SizeTypes = "xlarge" | "large" | "default" | "small" | "xsmall";
 @Component({
   selector: "dynamic-avatar",
-  standalone: true,
   imports: [SharedModule],
   template: `<span [title]="title">
     <bit-avatar
diff --git a/apps/web/src/app/components/environment-selector/environment-selector.component.ts b/apps/web/src/app/components/environment-selector/environment-selector.component.ts
index ba0f5097b5b..37e5ae0c3d8 100644
--- a/apps/web/src/app/components/environment-selector/environment-selector.component.ts
+++ b/apps/web/src/app/components/environment-selector/environment-selector.component.ts
@@ -15,7 +15,6 @@ import { SharedModule } from "../../shared";
 @Component({
   selector: "environment-selector",
   templateUrl: "environment-selector.component.html",
-  standalone: true,
   imports: [SharedModule],
 })
 export class EnvironmentSelectorComponent implements OnInit {
diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts
index e812edd8f32..9cfe3117d40 100644
--- a/apps/web/src/app/core/core.module.ts
+++ b/apps/web/src/app/core/core.module.ts
@@ -10,6 +10,8 @@ import {
   OrganizationUserApiService,
   CollectionService,
 } from "@bitwarden/admin-console/common";
+import { ChangePasswordService } from "@bitwarden/angular/auth/password-management/change-password";
+import { SetInitialPasswordService } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.service.abstraction";
 import { SafeProvider, safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
 import {
   CLIENT_TYPE,
@@ -32,9 +34,7 @@ import {
   SetPasswordJitService,
   SsoComponentService,
   LoginDecryptionOptionsService,
-  TwoFactorAuthComponentService,
   TwoFactorAuthDuoComponentService,
-  ChangePasswordService,
 } from "@bitwarden/auth/angular";
 import {
   InternalUserDecryptionOptionsServiceAbstraction,
@@ -52,6 +52,7 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
 import { ClientType } from "@bitwarden/common/enums";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
@@ -62,6 +63,7 @@ import {
   VaultTimeoutStringType,
 } from "@bitwarden/common/key-management/vault-timeout";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import {
   EnvironmentService,
   Urls,
@@ -107,6 +109,7 @@ import {
 } from "@bitwarden/key-management";
 import { LockComponentService } from "@bitwarden/key-management-ui";
 import { DefaultSshImportPromptService, SshImportPromptService } from "@bitwarden/vault";
+import { WebOrganizationInviteService } from "@bitwarden/web-vault/app/auth/core/services/organization-invite/web-organization-invite.service";
 
 import { flagEnabled } from "../../utils/flags";
 import { PolicyListService } from "../admin-console/core/policy-list.service";
@@ -116,12 +119,11 @@ import {
   WebRegistrationFinishService,
   WebLoginComponentService,
   WebLoginDecryptionOptionsService,
-  WebTwoFactorAuthComponentService,
   WebTwoFactorAuthDuoComponentService,
   LinkSsoService,
+  WebSetInitialPasswordService,
 } from "../auth";
 import { WebSsoComponentService } from "../auth/core/services/login/web-sso-component.service";
-import { AcceptOrganizationInviteService } from "../auth/organization-invite/accept-organization.service";
 import { HtmlStorageService } from "../core/html-storage.service";
 import { I18nService } from "../core/i18n.service";
 import { WebFileDownloadService } from "../core/web-file-download.service";
@@ -245,17 +247,22 @@ const safeProviders: SafeProvider[] = [
     provide: CLIENT_TYPE,
     useValue: ClientType.Web,
   }),
+  safeProvider({
+    provide: OrganizationInviteService,
+    useClass: WebOrganizationInviteService,
+    deps: [GlobalStateProvider],
+  }),
   safeProvider({
     provide: RegistrationFinishServiceAbstraction,
     useClass: WebRegistrationFinishService,
     deps: [
       KeyServiceAbstraction,
       AccountApiServiceAbstraction,
-      AcceptOrganizationInviteService,
+      OrganizationInviteService,
       PolicyApiServiceAbstraction,
       LogService,
       PolicyService,
-      AccountService,
+      ConfigService,
     ],
   }),
   safeProvider({
@@ -269,28 +276,39 @@ const safeProviders: SafeProvider[] = [
     useClass: WebLockComponentService,
     deps: [],
   }),
-  // TODO: PM-18182 - Refactor component services into lazy loaded modules
-  safeProvider({
-    provide: TwoFactorAuthComponentService,
-    useClass: WebTwoFactorAuthComponentService,
-    deps: [],
-  }),
   safeProvider({
     provide: SetPasswordJitService,
     useClass: WebSetPasswordJitService,
     deps: [
-      ApiService,
-      MasterPasswordApiService,
-      KeyServiceAbstraction,
       EncryptService,
       I18nServiceAbstraction,
       KdfConfigService,
+      KeyServiceAbstraction,
+      MasterPasswordApiService,
       InternalMasterPasswordServiceAbstraction,
       OrganizationApiServiceAbstraction,
       OrganizationUserApiService,
       InternalUserDecryptionOptionsServiceAbstraction,
     ],
   }),
+  safeProvider({
+    provide: SetInitialPasswordService,
+    useClass: WebSetInitialPasswordService,
+    deps: [
+      ApiService,
+      EncryptService,
+      I18nServiceAbstraction,
+      KdfConfigService,
+      KeyServiceAbstraction,
+      MasterPasswordApiService,
+      InternalMasterPasswordServiceAbstraction,
+      OrganizationApiServiceAbstraction,
+      OrganizationUserApiService,
+      InternalUserDecryptionOptionsServiceAbstraction,
+      OrganizationInviteService,
+      RouterService,
+    ],
+  }),
   safeProvider({
     provide: AppIdService,
     useClass: DefaultAppIdService,
@@ -300,7 +318,7 @@ const safeProviders: SafeProvider[] = [
     provide: LoginComponentService,
     useClass: WebLoginComponentService,
     deps: [
-      AcceptOrganizationInviteService,
+      OrganizationInviteService,
       LogService,
       PolicyApiServiceAbstraction,
       InternalPolicyService,
@@ -312,6 +330,7 @@ const safeProviders: SafeProvider[] = [
       SsoLoginServiceAbstraction,
       Router,
       AccountService,
+      ConfigService,
     ],
   }),
   safeProvider({
@@ -364,7 +383,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: LoginDecryptionOptionsService,
     useClass: WebLoginDecryptionOptionsService,
-    deps: [MessagingService, RouterService, AcceptOrganizationInviteService],
+    deps: [MessagingService, RouterService, OrganizationInviteService],
   }),
   safeProvider({
     provide: IpcService,
@@ -384,6 +403,7 @@ const safeProviders: SafeProvider[] = [
       MasterPasswordApiService,
       InternalMasterPasswordServiceAbstraction,
       UserKeyRotationService,
+      RouterService,
     ],
   }),
 ];
diff --git a/apps/web/src/app/core/event.service.ts b/apps/web/src/app/core/event.service.ts
index d6e5c8eba5f..14c87181f62 100644
--- a/apps/web/src/app/core/event.service.ts
+++ b/apps/web/src/app/core/event.service.ts
@@ -467,8 +467,20 @@ export class EventService {
         break;
       // Secrets Manager
       case EventType.Secret_Retrieved:
-        msg = this.i18nService.t("accessedSecret", this.formatSecretId(ev));
-        humanReadableMsg = this.i18nService.t("accessedSecret", this.getShortId(ev.secretId));
+        msg = this.i18nService.t("accessedSecretWithId", this.formatSecretId(ev));
+        humanReadableMsg = this.i18nService.t("accessedSecretWithId", this.getShortId(ev.secretId));
+        break;
+      case EventType.Secret_Created:
+        msg = this.i18nService.t("createdSecretWithId", this.formatSecretId(ev));
+        humanReadableMsg = this.i18nService.t("createdSecretWithId", this.getShortId(ev.secretId));
+        break;
+      case EventType.Secret_Deleted:
+        msg = this.i18nService.t("deletedSecretWithId", this.formatSecretId(ev));
+        humanReadableMsg = this.i18nService.t("deletedSecretWithId", this.getShortId(ev.secretId));
+        break;
+      case EventType.Secret_Edited:
+        msg = this.i18nService.t("editedSecretWithId", this.formatSecretId(ev));
+        humanReadableMsg = this.i18nService.t("editedSecretWithId", this.getShortId(ev.secretId));
         break;
       default:
         break;
diff --git a/apps/web/src/app/core/init.service.ts b/apps/web/src/app/core/init.service.ts
index 43547ff5d57..39dc6e1edd4 100644
--- a/apps/web/src/app/core/init.service.ts
+++ b/apps/web/src/app/core/init.service.ts
@@ -19,6 +19,7 @@ import { NotificationsService } from "@bitwarden/common/platform/notifications";
 import { ContainerService } from "@bitwarden/common/platform/services/container.service";
 import { UserAutoUnlockKeyService } from "@bitwarden/common/platform/services/user-auto-unlock-key.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
+import { TaskService } from "@bitwarden/common/vault/tasks";
 import { KeyService as KeyServiceAbstraction } from "@bitwarden/key-management";
 
 import { VersionService } from "../platform/version.service";
@@ -43,6 +44,7 @@ export class InitService {
     private sdkLoadService: SdkLoadService,
     private configService: ConfigService,
     private bulkEncryptService: BulkEncryptService,
+    private taskService: TaskService,
     @Inject(DOCUMENT) private document: Document,
   ) {}
 
@@ -75,6 +77,7 @@ export class InitService {
       this.themingService.applyThemeChangesTo(this.document);
       this.versionService.applyVersionToWindow();
       void this.ipcService.init();
+      this.taskService.listenForTaskNotifications();
 
       const containerService = new ContainerService(this.keyService, this.encryptService);
       containerService.attachToGlobal(this.win);
diff --git a/apps/web/src/app/core/web-file-download.service.ts b/apps/web/src/app/core/web-file-download.service.ts
index ad034702a55..3421203737a 100644
--- a/apps/web/src/app/core/web-file-download.service.ts
+++ b/apps/web/src/app/core/web-file-download.service.ts
@@ -12,7 +12,7 @@ export class WebFileDownloadService implements FileDownloadService {
   download(request: FileDownloadRequest): void {
     const builder = new FileDownloadBuilder(request);
     const a = window.document.createElement("a");
-    if (!this.platformUtilsService.isSafari()) {
+    if (!this.platformUtilsService.supportsFileDownloads()) {
       a.rel = "noreferrer";
       a.target = "_blank";
     }
diff --git a/apps/web/src/app/core/web-platform-utils.service.spec.ts b/apps/web/src/app/core/web-platform-utils.service.spec.ts
index 3b5cb96b718..6dba3fda782 100644
--- a/apps/web/src/app/core/web-platform-utils.service.spec.ts
+++ b/apps/web/src/app/core/web-platform-utils.service.spec.ts
@@ -1,5 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { DeviceType } from "@bitwarden/common/enums";
+
 import { WebPlatformUtilsService } from "./web-platform-utils.service";
 
 describe("Web Platform Utils Service", () => {
@@ -114,4 +116,91 @@ describe("Web Platform Utils Service", () => {
       expect(result).toBe("2022.10.2");
     });
   });
+  describe("getDevice", () => {
+    const originalUserAgent = navigator.userAgent;
+
+    const setUserAgent = (userAgent: string) => {
+      Object.defineProperty(navigator, "userAgent", {
+        value: userAgent,
+        configurable: true,
+      });
+    };
+
+    const setWindowProperties = (props?: Record<string, any>) => {
+      if (!props) {
+        return;
+      }
+      Object.keys(props).forEach((key) => {
+        Object.defineProperty(window, key, {
+          value: props[key],
+          configurable: true,
+        });
+      });
+    };
+
+    afterEach(() => {
+      // Reset to original after each test
+      setUserAgent(originalUserAgent);
+    });
+
+    const testData: {
+      userAgent: string;
+      expectedDevice: DeviceType;
+      windowProps?: Record<string, any>;
+    }[] = [
+      {
+        // DuckDuckGo macoOS browser v1.13
+        userAgent:
+          "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.3.1 Safari/605.1.15 Ddg/18.3.1",
+        expectedDevice: DeviceType.DuckDuckGoBrowser,
+      },
+      // DuckDuckGo Windows browser v0.109.7, which does not present the Ddg suffix and is therefore detected as Edge
+      {
+        userAgent:
+          "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36 Edg/135.0.0.0",
+        expectedDevice: DeviceType.EdgeBrowser,
+      },
+      {
+        userAgent:
+          "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+        expectedDevice: DeviceType.ChromeBrowser,
+        windowProps: { chrome: {} }, // set window.chrome = {} to simulate Chrome
+      },
+      {
+        userAgent:
+          "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:121.0) Gecko/20100101 Firefox/121.0",
+        expectedDevice: DeviceType.FirefoxBrowser,
+      },
+      {
+        userAgent:
+          "Mozilla/5.0 (Macintosh; Intel Mac OS X 13_0) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Safari/605.1.15",
+        expectedDevice: DeviceType.SafariBrowser,
+      },
+      {
+        userAgent:
+          "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Edg/120.0.0.0 Chrome/120.0.0.0 Safari/537.36",
+        expectedDevice: DeviceType.EdgeBrowser,
+      },
+      {
+        userAgent:
+          "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.5481.65 Safari/537.36 OPR/95.0.4635.46",
+        expectedDevice: DeviceType.OperaBrowser,
+      },
+      {
+        userAgent:
+          "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.6261.57 Safari/537.36 Vivaldi/6.5.3206.48",
+        expectedDevice: DeviceType.VivaldiBrowser,
+      },
+    ];
+
+    test.each(testData)(
+      "returns $expectedDevice for User-Agent: $userAgent",
+      ({ userAgent, expectedDevice, windowProps }) => {
+        setUserAgent(userAgent);
+        setWindowProperties(windowProps);
+        const result = webPlatformUtilsService.getDevice();
+        expect(result).toBe(expectedDevice);
+      },
+    );
+  });
 });
diff --git a/apps/web/src/app/core/web-platform-utils.service.ts b/apps/web/src/app/core/web-platform-utils.service.ts
index 3df2a7d895b..c3d1f5e3c1a 100644
--- a/apps/web/src/app/core/web-platform-utils.service.ts
+++ b/apps/web/src/app/core/web-platform-utils.service.ts
@@ -34,6 +34,13 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
       this.browserCache = DeviceType.EdgeBrowser;
     } else if (navigator.userAgent.indexOf(" Vivaldi/") !== -1) {
       this.browserCache = DeviceType.VivaldiBrowser;
+    } else if (
+      // We are only detecting DuckDuckGo browser on macOS currently, as
+      // it is not presenting the Ddg suffix on Windows. DuckDuckGo users
+      // on Windows will be detected as Edge.
+      navigator.userAgent.indexOf("Ddg") !== -1
+    ) {
+      this.browserCache = DeviceType.DuckDuckGoBrowser;
     } else if (
       navigator.userAgent.indexOf(" Safari/") !== -1 &&
       navigator.userAgent.indexOf("Chrome") === -1
@@ -83,6 +90,10 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
     return this.getDevice() === DeviceType.SafariBrowser;
   }
 
+  isWebKit(): boolean {
+    return true;
+  }
+
   isMacAppStore(): boolean {
     return false;
   }
@@ -120,6 +131,15 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
     return true;
   }
 
+  supportsAutofill(): boolean {
+    return false;
+  }
+
+  // Safari support for blob downloads is inconsistent and requires workarounds
+  supportsFileDownloads(): boolean {
+    return !(this.getDevice() === DeviceType.SafariBrowser);
+  }
+
   showToast(
     type: "error" | "success" | "warning" | "info",
     title: string,
diff --git a/apps/web/src/app/dirt/reports/pages/cipher-report.component.spec.ts b/apps/web/src/app/dirt/reports/pages/cipher-report.component.spec.ts
new file mode 100644
index 00000000000..e29ebcd1cfe
--- /dev/null
+++ b/apps/web/src/app/dirt/reports/pages/cipher-report.component.spec.ts
@@ -0,0 +1,122 @@
+import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
+import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { DialogService } from "@bitwarden/components";
+import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
+
+import { VaultItemDialogResult } from "../../../vault/components/vault-item-dialog/vault-item-dialog.component";
+import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
+
+import { CipherReportComponent } from "./cipher-report.component";
+
+describe("CipherReportComponent", () => {
+  let component: CipherReportComponent;
+  let mockAccountService: MockProxy<AccountService>;
+  let mockAdminConsoleCipherFormConfigService: MockProxy<AdminConsoleCipherFormConfigService>;
+  const mockCipher = {
+    id: "122-333-444",
+    type: CipherType.Login,
+    orgId: "222-444-555",
+    login: {
+      username: "test-username",
+      password: "test-password",
+      totp: "123",
+    },
+    decrypt: jest.fn().mockResolvedValue({ id: "cipher1", name: "Updated" }),
+  } as unknown as Cipher;
+  const mockCipherService = mock<CipherService>();
+  mockCipherService.get.mockResolvedValue(mockCipher as unknown as Cipher);
+  mockCipherService.getKeyForCipherKeyDecryption.mockResolvedValue({});
+  mockCipherService.deleteWithServer.mockResolvedValue(undefined);
+  mockCipherService.softDeleteWithServer.mockResolvedValue(undefined);
+
+  beforeEach(() => {
+    mockAccountService = mock<AccountService>();
+    mockAccountService.activeAccount$ = of({ id: "user1" } as any);
+    mockAdminConsoleCipherFormConfigService = mock<AdminConsoleCipherFormConfigService>();
+
+    component = new CipherReportComponent(
+      mockCipherService,
+      mock<DialogService>(),
+      mock<PasswordRepromptService>(),
+      mock<OrganizationService>(),
+      mockAccountService,
+      mock<I18nService>(),
+      mock<SyncService>(),
+      mock<CipherFormConfigService>(),
+      mockAdminConsoleCipherFormConfigService,
+    );
+    component.ciphers = [];
+    component.allCiphers = [];
+  });
+
+  it("should remove the cipher from the report if it was deleted", async () => {
+    const cipherToDelete = { id: "cipher1" } as any;
+    component.ciphers = [cipherToDelete, { id: "cipher2" } as any];
+
+    jest.spyOn(component, "determinedUpdatedCipherReportStatus").mockResolvedValue(null);
+
+    await component.refresh(VaultItemDialogResult.Deleted, cipherToDelete);
+
+    expect(component.ciphers).toEqual([{ id: "cipher2" }]);
+    expect(component.determinedUpdatedCipherReportStatus).toHaveBeenCalledWith(
+      VaultItemDialogResult.Deleted,
+      cipherToDelete,
+    );
+  });
+
+  it("should update the cipher in the report if it was saved", async () => {
+    const cipherViewToUpdate = { ...mockCipher } as unknown as CipherView;
+    const updatedCipher = { ...mockCipher, name: "Updated" } as unknown as Cipher;
+    const updatedCipherView = { ...updatedCipher } as unknown as CipherView;
+
+    component.ciphers = [cipherViewToUpdate];
+    mockCipherService.get.mockResolvedValue(updatedCipher);
+    mockCipherService.getKeyForCipherKeyDecryption.mockResolvedValue("key");
+
+    jest.spyOn(updatedCipher, "decrypt").mockResolvedValue(updatedCipherView);
+
+    jest
+      .spyOn(component, "determinedUpdatedCipherReportStatus")
+      .mockResolvedValue(updatedCipherView);
+
+    await component.refresh(VaultItemDialogResult.Saved, updatedCipherView);
+
+    expect(component.ciphers).toEqual([updatedCipherView]);
+    expect(component.determinedUpdatedCipherReportStatus).toHaveBeenCalledWith(
+      VaultItemDialogResult.Saved,
+      updatedCipherView,
+    );
+  });
+
+  it("should remove the cipher from the report if it no longer meets the criteria after saving", async () => {
+    const cipherViewToUpdate = { ...mockCipher } as unknown as CipherView;
+    const updatedCipher = { ...mockCipher, name: "Updated" } as unknown as Cipher;
+    const updatedCipherView = { ...updatedCipher } as unknown as CipherView;
+
+    component.ciphers = [cipherViewToUpdate];
+
+    mockCipherService.get.mockResolvedValue(updatedCipher);
+    mockCipherService.getKeyForCipherKeyDecryption.mockResolvedValue("key");
+
+    jest.spyOn(updatedCipher, "decrypt").mockResolvedValue(updatedCipherView);
+
+    jest.spyOn(component, "determinedUpdatedCipherReportStatus").mockResolvedValue(null);
+
+    await component.refresh(VaultItemDialogResult.Saved, updatedCipherView);
+
+    expect(component.ciphers).toEqual([]);
+    expect(component.determinedUpdatedCipherReportStatus).toHaveBeenCalledWith(
+      VaultItemDialogResult.Saved,
+      updatedCipherView,
+    );
+  });
+});
diff --git a/apps/web/src/app/dirt/reports/pages/cipher-report.component.ts b/apps/web/src/app/dirt/reports/pages/cipher-report.component.ts
index d6c96ff232e..69dd360ad31 100644
--- a/apps/web/src/app/dirt/reports/pages/cipher-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/cipher-report.component.ts
@@ -213,8 +213,68 @@ export class CipherReportComponent implements OnDestroy {
     this.allCiphers = [];
   }
 
-  protected async refresh(result: VaultItemDialogResult, cipher: CipherView) {
-    await this.load();
+  async refresh(result: VaultItemDialogResult, cipher: CipherView) {
+    if (result === VaultItemDialogResult.Deleted) {
+      // update downstream report status if the cipher was deleted
+      await this.determinedUpdatedCipherReportStatus(result, cipher);
+
+      // the cipher was deleted, filter it out from the report.
+      this.ciphers = this.ciphers.filter((ciph) => ciph.id !== cipher.id);
+      this.filterCiphersByOrg(this.ciphers);
+      return;
+    }
+
+    if (result == VaultItemDialogResult.Saved) {
+      // Ensure we have the latest cipher data after saving.
+      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+      let updatedCipher = await this.cipherService.get(cipher.id, activeUserId);
+
+      if (this.isAdminConsoleActive) {
+        updatedCipher = await this.adminConsoleCipherFormConfigService.getCipher(
+          cipher.id as CipherId,
+          this.organization,
+        );
+      }
+
+      // convert cipher to cipher view model
+      const updatedCipherView = await updatedCipher.decrypt(
+        await this.cipherService.getKeyForCipherKeyDecryption(updatedCipher, activeUserId),
+      );
+
+      // request downstream report status if the cipher was updated
+      // this will return a null if the updated cipher does not meet the criteria for the report
+      const updatedReportResult = await this.determinedUpdatedCipherReportStatus(
+        result,
+        updatedCipherView,
+      );
+
+      // determine the index of the updated cipher in the report
+      const index = this.ciphers.findIndex((c) => c.id === updatedCipherView.id);
+
+      // the updated cipher does not meet the criteria for the report, it returns a null
+      if (updatedReportResult === null) {
+        this.ciphers.splice(index, 1);
+      }
+
+      // the cipher is already in the report, update it.
+      if (updatedReportResult !== null && index > -1) {
+        this.ciphers[index] = updatedReportResult;
+      }
+
+      // apply filters and set the data source
+      this.filterCiphersByOrg(this.ciphers);
+    }
+  }
+
+  async determinedUpdatedCipherReportStatus(
+    result: VaultItemDialogResult,
+    updatedCipherView: CipherView,
+  ): Promise<CipherView | null> {
+    // Implement the logic to determine if the updated cipher is still in the report.
+    // This could be checking if the password is still weak or exposed, etc.
+    // For now, we will return the updated cipher view as is.
+    // Replace this with your actual logic in the child classes.
+    return updatedCipherView;
   }
 
   protected async repromptCipher(c: CipherView) {
diff --git a/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.ts b/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.ts
index 5710ea1176e..1a4141c4d68 100644
--- a/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.ts
@@ -10,6 +10,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
+import { VaultItemDialogResult } from "@bitwarden/web-vault/app/vault/components/vault-item-dialog/vault-item-dialog.component";
 
 import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
 
@@ -73,10 +74,9 @@ export class ExposedPasswordsReportComponent extends CipherReportComponent imple
         return;
       }
 
-      const promise = this.auditService.passwordLeaked(login.password).then((exposedCount) => {
-        if (exposedCount > 0) {
-          const row = { ...ciph, exposedXTimes: exposedCount } as ReportResult;
-          exposedPasswordCiphers.push(row);
+      const promise = this.isPasswordExposed(ciph).then((result) => {
+        if (result) {
+          exposedPasswordCiphers.push(result);
         }
       });
       promises.push(promise);
@@ -87,8 +87,25 @@ export class ExposedPasswordsReportComponent extends CipherReportComponent imple
     this.dataSource.sort = { column: "exposedXTimes", direction: "desc" };
   }
 
+  private async isPasswordExposed(cv: CipherView): Promise<ReportResult | null> {
+    const { login } = cv;
+    return await this.auditService.passwordLeaked(login.password).then((exposedCount) => {
+      if (exposedCount > 0) {
+        return { ...cv, exposedXTimes: exposedCount } as ReportResult;
+      }
+      return null;
+    });
+  }
+
   protected canManageCipher(c: CipherView): boolean {
     // this will only ever be false from the org view;
     return true;
   }
+
+  async determinedUpdatedCipherReportStatus(
+    result: VaultItemDialogResult,
+    updatedCipherView: CipherView,
+  ): Promise<CipherView | null> {
+    return await this.isPasswordExposed(updatedCipherView);
+  }
 }
diff --git a/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.ts b/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.ts
index 95810625dac..0024af35109 100644
--- a/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/inactive-two-factor-report.component.ts
@@ -13,6 +13,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
+import { VaultItemDialogResult } from "@bitwarden/web-vault/app/vault/components/vault-item-dialog/vault-item-dialog.component";
 
 import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
 
@@ -71,32 +72,12 @@ export class InactiveTwoFactorReportComponent extends CipherReportComponent impl
       this.filterStatus = [0];
 
       allCiphers.forEach((ciph) => {
-        const { type, login, isDeleted, edit, id, viewPassword } = ciph;
-        if (
-          type !== CipherType.Login ||
-          (login.totp != null && login.totp !== "") ||
-          !login.hasUris ||
-          isDeleted ||
-          (!this.organization && !edit) ||
-          !viewPassword
-        ) {
-          return;
-        }
+        const [docFor2fa, isInactive2faCipher] = this.isInactive2faCipher(ciph);
 
-        for (let i = 0; i < login.uris.length; i++) {
-          const u = login.uris[i];
-          if (u.uri != null && u.uri !== "") {
-            const uri = u.uri.replace("www.", "");
-            const domain = Utils.getDomain(uri);
-            if (domain != null && this.services.has(domain)) {
-              if (this.services.get(domain) != null) {
-                docs.set(id, this.services.get(domain));
-              }
-              // If the uri is in the 2fa list. Add the cipher to the inactive
-              // collection. No need to check any additional uris for the cipher.
-              inactive2faCiphers.push(ciph);
-              return;
-            }
+        if (isInactive2faCipher) {
+          inactive2faCiphers.push(ciph);
+          if (docFor2fa !== "") {
+            docs.set(ciph.id, docFor2fa);
           }
         }
       });
@@ -106,6 +87,39 @@ export class InactiveTwoFactorReportComponent extends CipherReportComponent impl
     }
   }
 
+  private isInactive2faCipher(cipher: CipherView): [string, boolean] {
+    let docFor2fa: string = "";
+    let isInactive2faCipher: boolean = false;
+
+    const { type, login, isDeleted, edit, viewPassword } = cipher;
+    if (
+      type !== CipherType.Login ||
+      (login.totp != null && login.totp !== "") ||
+      !login.hasUris ||
+      isDeleted ||
+      (!this.organization && !edit) ||
+      !viewPassword
+    ) {
+      return [docFor2fa, isInactive2faCipher];
+    }
+
+    for (let i = 0; i < login.uris.length; i++) {
+      const u = login.uris[i];
+      if (u.uri != null && u.uri !== "") {
+        const uri = u.uri.replace("www.", "");
+        const domain = Utils.getDomain(uri);
+        if (domain != null && this.services.has(domain)) {
+          if (this.services.get(domain) != null) {
+            docFor2fa = this.services.get(domain) || "";
+          }
+          isInactive2faCipher = true;
+          break;
+        }
+      }
+    }
+    return [docFor2fa, isInactive2faCipher];
+  }
+
   private async load2fa() {
     if (this.services.size > 0) {
       return;
@@ -142,4 +156,22 @@ export class InactiveTwoFactorReportComponent extends CipherReportComponent impl
     // this will only ever be false from the org view;
     return true;
   }
+
+  async determinedUpdatedCipherReportStatus(
+    result: VaultItemDialogResult,
+    updatedCipherView: CipherView,
+  ): Promise<CipherView | null> {
+    if (result === VaultItemDialogResult.Deleted) {
+      return null;
+    }
+
+    const [docFor2fa, isInactive2faCipher] = this.isInactive2faCipher(updatedCipherView);
+
+    if (isInactive2faCipher) {
+      this.cipherDocs.set(updatedCipherView.id, docFor2fa);
+      return updatedCipherView;
+    }
+
+    return null;
+  }
 }
diff --git a/apps/web/src/app/dirt/reports/pages/reused-passwords-report.component.ts b/apps/web/src/app/dirt/reports/pages/reused-passwords-report.component.ts
index 3e9abc779ba..8e1e4fcf0cc 100644
--- a/apps/web/src/app/dirt/reports/pages/reused-passwords-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/reused-passwords-report.component.ts
@@ -11,6 +11,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
+import { VaultItemDialogResult } from "@bitwarden/web-vault/app/vault/components/vault-item-dialog/vault-item-dialog.component";
 
 import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
 
@@ -22,6 +23,7 @@ import { CipherReportComponent } from "./cipher-report.component";
   standalone: false,
 })
 export class ReusedPasswordsReportComponent extends CipherReportComponent implements OnInit {
+  ciphersToCheckForReusedPasswords: CipherView[] = [];
   passwordUseMap: Map<string, number>;
   disabled = true;
 
@@ -54,12 +56,19 @@ export class ReusedPasswordsReportComponent extends CipherReportComponent implem
   }
 
   async setCiphers() {
-    const allCiphers = await this.getAllCiphers();
+    this.ciphersToCheckForReusedPasswords = await this.getAllCiphers();
+    const reusedPasswordCiphers = await this.checkCiphersForReusedPasswords(
+      this.ciphersToCheckForReusedPasswords,
+    );
+    this.filterCiphersByOrg(reusedPasswordCiphers);
+  }
+
+  protected async checkCiphersForReusedPasswords(ciphers: CipherView[]): Promise<CipherView[]> {
     const ciphersWithPasswords: CipherView[] = [];
     this.passwordUseMap = new Map<string, number>();
     this.filterStatus = [0];
 
-    allCiphers.forEach((ciph) => {
+    ciphers.forEach((ciph) => {
       const { type, login, isDeleted, edit, viewPassword } = ciph;
       if (
         type !== CipherType.Login ||
@@ -84,11 +93,46 @@ export class ReusedPasswordsReportComponent extends CipherReportComponent implem
         this.passwordUseMap.has(c.login.password) && this.passwordUseMap.get(c.login.password) > 1,
     );
 
-    this.filterCiphersByOrg(reusedPasswordCiphers);
+    return reusedPasswordCiphers;
   }
 
   protected canManageCipher(c: CipherView): boolean {
     // this will only ever be false from an organization view
     return true;
   }
+
+  async determinedUpdatedCipherReportStatus(
+    result: VaultItemDialogResult,
+    updatedCipherView: CipherView,
+  ): Promise<CipherView | null> {
+    if (result === VaultItemDialogResult.Deleted) {
+      this.ciphersToCheckForReusedPasswords = this.ciphersToCheckForReusedPasswords.filter(
+        (c) => c.id !== updatedCipherView.id,
+      );
+      return null;
+    }
+
+    // recalculate the reused passwords after an update
+    // if a password was changed, it could affect reused counts of other ciphers
+
+    // find the cipher in our list and update it
+    const index = this.ciphersToCheckForReusedPasswords.findIndex(
+      (c) => c.id === updatedCipherView.id,
+    );
+
+    if (index !== -1) {
+      this.ciphersToCheckForReusedPasswords[index] = updatedCipherView;
+    }
+
+    // Re-check the passwords for reused passwords for all ciphers
+    const reusedPasswordCiphers = await this.checkCiphersForReusedPasswords(
+      this.ciphersToCheckForReusedPasswords,
+    );
+
+    // set the updated ciphers list to the filtered reused passwords
+    this.filterCiphersByOrg(reusedPasswordCiphers);
+
+    // return the updated cipher view
+    return updatedCipherView;
+  }
 }
diff --git a/apps/web/src/app/dirt/reports/pages/unsecured-websites-report.component.ts b/apps/web/src/app/dirt/reports/pages/unsecured-websites-report.component.ts
index d2cc792198e..4b9cc3fd789 100644
--- a/apps/web/src/app/dirt/reports/pages/unsecured-websites-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/unsecured-websites-report.component.ts
@@ -10,6 +10,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { CipherFormConfigService, PasswordRepromptService } from "@bitwarden/vault";
+import { VaultItemDialogResult } from "@bitwarden/web-vault/app/vault/components/vault-item-dialog/vault-item-dialog.component";
 
 import { AdminConsoleCipherFormConfigService } from "../../../vault/org-vault/services/admin-console-cipher-form-config.service";
 
@@ -93,4 +94,20 @@ export class UnsecuredWebsitesReportComponent extends CipherReportComponent impl
     // this will only ever be false from the org view;
     return true;
   }
+
+  async determinedUpdatedCipherReportStatus(
+    result: VaultItemDialogResult,
+    updatedCipherView: CipherView,
+  ): Promise<CipherView | null> {
+    if (result === VaultItemDialogResult.Deleted) {
+      return null;
+    }
+
+    // If the cipher still contains unsecured URIs, return it as is
+    if (this.cipherContainsUnsecured(updatedCipherView)) {
+      return updatedCipherView;
+    }
+
+    return null;
+  }
 }
diff --git a/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.ts
index 1716a98190c..0472dbfaa6f 100644
--- a/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.ts
+++ b/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.ts
@@ -1,15 +1,12 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
-import { firstValueFrom } from "rxjs";
 
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
-import { CipherId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { CipherType } from "@bitwarden/common/vault/enums";
@@ -71,46 +68,26 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen
     this.findWeakPasswords(allCiphers);
   }
 
-  protected async refresh(result: VaultItemDialogResult, cipher: CipherView) {
+  async determinedUpdatedCipherReportStatus(
+    result: VaultItemDialogResult,
+    updatedCipherView: CipherView,
+  ): Promise<CipherView | null> {
     if (result === VaultItemDialogResult.Deleted) {
-      // remove the cipher from the list
-      this.weakPasswordCiphers = this.weakPasswordCiphers.filter((c) => c.id !== cipher.id);
-      this.filterCiphersByOrg(this.weakPasswordCiphers);
-      return;
-    }
-
-    if (result == VaultItemDialogResult.Saved) {
-      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      let updatedCipher = await this.cipherService.get(cipher.id, activeUserId);
-
-      if (this.isAdminConsoleActive) {
-        updatedCipher = await this.adminConsoleCipherFormConfigService.getCipher(
-          cipher.id as CipherId,
-          this.organization,
-        );
-      }
-
-      const updatedCipherView = await updatedCipher.decrypt(
-        await this.cipherService.getKeyForCipherKeyDecryption(updatedCipher, activeUserId),
+      this.weakPasswordCiphers = this.weakPasswordCiphers.filter(
+        (c) => c.id !== updatedCipherView.id,
       );
-      // update the cipher views
-      const updatedReportResult = this.determineWeakPasswordScore(updatedCipherView);
-      const index = this.weakPasswordCiphers.findIndex((c) => c.id === updatedCipherView.id);
-
-      if (updatedReportResult == null) {
-        // the password is no longer weak
-        // remove the cipher from the list
-        this.weakPasswordCiphers.splice(index, 1);
-        this.filterCiphersByOrg(this.weakPasswordCiphers);
-        return;
-      }
-
-      if (index > -1) {
-        // update the existing cipher
-        this.weakPasswordCiphers[index] = updatedReportResult;
-        this.filterCiphersByOrg(this.weakPasswordCiphers);
-      }
+      return null;
     }
+
+    const updatedReportStatus = await this.determineWeakPasswordScore(updatedCipherView);
+
+    const index = this.weakPasswordCiphers.findIndex((c) => c.id === updatedCipherView.id);
+
+    if (index !== -1) {
+      this.weakPasswordCiphers[index] = updatedReportStatus;
+    }
+
+    return updatedReportStatus;
   }
 
   protected findWeakPasswords(ciphers: CipherView[]): void {
diff --git a/apps/web/src/app/key-management/key-rotation/request/update-key.request.ts b/apps/web/src/app/key-management/key-rotation/request/update-key.request.ts
deleted file mode 100644
index e8d9f0c4d09..00000000000
--- a/apps/web/src/app/key-management/key-rotation/request/update-key.request.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { OrganizationUserResetPasswordWithIdRequest } from "@bitwarden/admin-console/common";
-import { WebauthnRotateCredentialRequest } from "@bitwarden/common/auth/models/request/webauthn-rotate-credential.request";
-import { SendWithIdRequest } from "@bitwarden/common/tools/send/models/request/send-with-id.request";
-import { CipherWithIdRequest } from "@bitwarden/common/vault/models/request/cipher-with-id.request";
-import { FolderWithIdRequest } from "@bitwarden/common/vault/models/request/folder-with-id.request";
-
-import { EmergencyAccessWithIdRequest } from "../../../auth/emergency-access/request/emergency-access-update.request";
-
-export class UpdateKeyRequest {
-  masterPasswordHash: string;
-  key: string;
-  privateKey: string;
-  ciphers: CipherWithIdRequest[] = [];
-  folders: FolderWithIdRequest[] = [];
-  sends: SendWithIdRequest[] = [];
-  emergencyAccessKeys: EmergencyAccessWithIdRequest[] = [];
-  resetPasswordKeys: OrganizationUserResetPasswordWithIdRequest[] = [];
-  webauthnKeys: WebauthnRotateCredentialRequest[] = [];
-
-  constructor(masterPasswordHash: string, key: string, privateKey: string) {
-    this.masterPasswordHash = masterPasswordHash;
-    this.key = key;
-    this.privateKey = privateKey;
-  }
-}
diff --git a/apps/web/src/app/key-management/key-rotation/user-key-rotation-api.service.ts b/apps/web/src/app/key-management/key-rotation/user-key-rotation-api.service.ts
index 2a947359bcb..bbacdc9bc96 100644
--- a/apps/web/src/app/key-management/key-rotation/user-key-rotation-api.service.ts
+++ b/apps/web/src/app/key-management/key-rotation/user-key-rotation-api.service.ts
@@ -3,17 +3,12 @@ import { inject, Injectable } from "@angular/core";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 
 import { RotateUserAccountKeysRequest } from "./request/rotate-user-account-keys.request";
-import { UpdateKeyRequest } from "./request/update-key.request";
 
 @Injectable()
 export class UserKeyRotationApiService {
   readonly apiService = inject(ApiService);
 
-  postUserKeyUpdate(request: UpdateKeyRequest): Promise<any> {
-    return this.apiService.send("POST", "/accounts/key", request, true, false);
-  }
-
-  postUserKeyUpdateV2(request: RotateUserAccountKeysRequest): Promise<any> {
+  postUserKeyUpdate(request: RotateUserAccountKeysRequest): Promise<any> {
     return this.apiService.send(
       "POST",
       "/accounts/key-management/rotate-user-account-keys",
diff --git a/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts b/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts
index c65c4ac3ea4..4bc3b7b4fea 100644
--- a/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts
+++ b/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.spec.ts
@@ -2,8 +2,9 @@ import { mock, MockProxy } from "jest-mock-extended";
 import { BehaviorSubject } from "rxjs";
 
 import { OrganizationUserResetPasswordWithIdRequest } from "@bitwarden/admin-console/common";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { Account } from "@bitwarden/common/auth/abstractions/account.service";
 import { WebauthnRotateCredentialRequest } from "@bitwarden/common/auth/models/request/webauthn-rotate-credential.request";
+import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
 import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
@@ -11,11 +12,12 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { EncryptedString, EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { SendWithIdRequest } from "@bitwarden/common/tools/send/models/request/send-with-id.request";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 import { UserId } from "@bitwarden/common/types/guid";
-import { UserKey, UserPrivateKey, UserPublicKey } from "@bitwarden/common/types/key";
+import { MasterKey, UserKey, UserPrivateKey, UserPublicKey } from "@bitwarden/common/types/key";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
@@ -23,7 +25,12 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherWithIdRequest } from "@bitwarden/common/vault/models/request/cipher-with-id.request";
 import { FolderWithIdRequest } from "@bitwarden/common/vault/models/request/folder-with-id.request";
 import { DialogService, ToastService } from "@bitwarden/components";
-import { KeyService, DEFAULT_KDF_CONFIG } from "@bitwarden/key-management";
+import {
+  KeyService,
+  PBKDF2KdfConfig,
+  KdfConfigService,
+  KdfConfig,
+} from "@bitwarden/key-management";
 import {
   AccountRecoveryTrustComponent,
   EmergencyAccessTrustComponent,
@@ -38,6 +45,9 @@ import { EmergencyAccessStatusType } from "../../auth/emergency-access/enums/eme
 import { EmergencyAccessType } from "../../auth/emergency-access/enums/emergency-access-type";
 import { EmergencyAccessWithIdRequest } from "../../auth/emergency-access/request/emergency-access-update.request";
 
+import { MasterPasswordUnlockDataRequest } from "./request/master-password-unlock-data.request";
+import { UnlockDataRequest } from "./request/unlock-data.request";
+import { UserDataRequest } from "./request/userdata.request";
 import { UserKeyRotationApiService } from "./user-key-rotation-api.service";
 import { UserKeyRotationService } from "./user-key-rotation.service";
 
@@ -64,414 +74,6 @@ accountRecoveryTrustOpenUntrusted.mockReturnValue({
   closed: new BehaviorSubject(false),
 });
 
-describe("KeyRotationService", () => {
-  let keyRotationService: UserKeyRotationService;
-
-  let mockUserVerificationService: MockProxy<UserVerificationService>;
-  let mockApiService: MockProxy<UserKeyRotationApiService>;
-  let mockCipherService: MockProxy<CipherService>;
-  let mockFolderService: MockProxy<FolderService>;
-  let mockSendService: MockProxy<SendService>;
-  let mockEmergencyAccessService: MockProxy<EmergencyAccessService>;
-  let mockResetPasswordService: MockProxy<OrganizationUserResetPasswordService>;
-  let mockDeviceTrustService: MockProxy<DeviceTrustServiceAbstraction>;
-  let mockKeyService: MockProxy<KeyService>;
-  let mockEncryptService: MockProxy<EncryptService>;
-  let mockConfigService: MockProxy<ConfigService>;
-  let mockSyncService: MockProxy<SyncService>;
-  let mockWebauthnLoginAdminService: MockProxy<WebauthnLoginAdminService>;
-  let mockLogService: MockProxy<LogService>;
-  let mockVaultTimeoutService: MockProxy<VaultTimeoutService>;
-  let mockDialogService: MockProxy<DialogService>;
-  let mockToastService: MockProxy<ToastService>;
-  let mockI18nService: MockProxy<I18nService>;
-
-  const mockUser = {
-    id: "mockUserId" as UserId,
-    email: "mockEmail",
-    emailVerified: true,
-    name: "mockName",
-  };
-
-  const mockTrustedPublicKeys = [Utils.fromUtf8ToArray("test-public-key")];
-
-  beforeAll(() => {
-    jest.spyOn(PureCrypto, "make_user_key_aes256_cbc_hmac").mockReturnValue(new Uint8Array(64));
-    jest.spyOn(PureCrypto, "make_user_key_xchacha20_poly1305").mockReturnValue(new Uint8Array(70));
-    jest
-      .spyOn(PureCrypto, "encrypt_user_key_with_master_password")
-      .mockReturnValue("mockNewUserKey");
-    mockUserVerificationService = mock<UserVerificationService>();
-    mockApiService = mock<UserKeyRotationApiService>();
-    mockCipherService = mock<CipherService>();
-    mockFolderService = mock<FolderService>();
-    mockSendService = mock<SendService>();
-    mockEmergencyAccessService = mock<EmergencyAccessService>();
-    mockEmergencyAccessService.getPublicKeys.mockResolvedValue(
-      mockTrustedPublicKeys.map((key) => {
-        return {
-          publicKey: key,
-          id: "mockId",
-          granteeId: "mockGranteeId",
-          name: "mockName",
-          email: "mockEmail",
-          type: EmergencyAccessType.Takeover,
-          status: EmergencyAccessStatusType.Accepted,
-          waitTimeDays: 5,
-          creationDate: "mockCreationDate",
-          avatarColor: "mockAvatarColor",
-        };
-      }),
-    );
-    mockResetPasswordService = mock<OrganizationUserResetPasswordService>();
-    mockResetPasswordService.getPublicKeys.mockResolvedValue(
-      mockTrustedPublicKeys.map((key) => {
-        return {
-          publicKey: key,
-          orgId: "mockOrgId",
-          orgName: "mockOrgName",
-        };
-      }),
-    );
-    mockDeviceTrustService = mock<DeviceTrustServiceAbstraction>();
-    mockKeyService = mock<KeyService>();
-    mockEncryptService = mock<EncryptService>();
-    mockConfigService = mock<ConfigService>();
-    mockSyncService = mock<SyncService>();
-    mockWebauthnLoginAdminService = mock<WebauthnLoginAdminService>();
-    mockLogService = mock<LogService>();
-    mockVaultTimeoutService = mock<VaultTimeoutService>();
-    mockToastService = mock<ToastService>();
-    mockI18nService = mock<I18nService>();
-    mockDialogService = mock<DialogService>();
-
-    keyRotationService = new UserKeyRotationService(
-      mockUserVerificationService,
-      mockApiService,
-      mockCipherService,
-      mockFolderService,
-      mockSendService,
-      mockEmergencyAccessService,
-      mockResetPasswordService,
-      mockDeviceTrustService,
-      mockKeyService,
-      mockEncryptService,
-      mockSyncService,
-      mockWebauthnLoginAdminService,
-      mockLogService,
-      mockVaultTimeoutService,
-      mockToastService,
-      mockI18nService,
-      mockDialogService,
-      mockConfigService,
-    );
-  });
-
-  beforeEach(() => {
-    jest.mock("@bitwarden/key-management-ui");
-  });
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe("rotateUserKeyAndEncryptedData", () => {
-    let privateKey: BehaviorSubject<UserPrivateKey | null>;
-    let keyPair: BehaviorSubject<{ privateKey: UserPrivateKey; publicKey: UserPublicKey }>;
-
-    beforeEach(() => {
-      mockKeyService.makeUserKey.mockResolvedValue([
-        new SymmetricCryptoKey(new Uint8Array(64)) as UserKey,
-        {
-          encryptedString: "mockNewUserKey",
-        } as any,
-      ]);
-      mockKeyService.hashMasterKey.mockResolvedValue("mockMasterPasswordHash");
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-
-      mockEncryptService.wrapSymmetricKey.mockResolvedValue({
-        encryptedString: "mockEncryptedData",
-      } as any);
-      mockEncryptService.wrapDecapsulationKey.mockResolvedValue({
-        encryptedString: "mockEncryptedData",
-      } as any);
-
-      // Mock user verification
-      mockUserVerificationService.verifyUserByMasterPassword.mockResolvedValue({
-        masterKey: "mockMasterKey" as any,
-        kdfConfig: DEFAULT_KDF_CONFIG,
-        email: "mockEmail",
-        policyOptions: null,
-      });
-
-      // Mock user key
-      mockKeyService.userKey$.mockReturnValue(new BehaviorSubject("mockOriginalUserKey" as any));
-
-      mockKeyService.getFingerprint.mockResolvedValue(["a", "b"]);
-
-      // Mock private key
-      privateKey = new BehaviorSubject("mockPrivateKey" as any);
-      mockKeyService.userPrivateKeyWithLegacySupport$.mockReturnValue(privateKey);
-
-      keyPair = new BehaviorSubject({
-        privateKey: "mockPrivateKey",
-        publicKey: "mockPublicKey",
-      } as any);
-      mockKeyService.userEncryptionKeyPair$.mockReturnValue(keyPair);
-
-      // Mock ciphers
-      const mockCiphers = [createMockCipher("1", "Cipher 1"), createMockCipher("2", "Cipher 2")];
-      mockCipherService.getRotatedData.mockResolvedValue(mockCiphers);
-
-      // Mock folders
-      const mockFolders = [createMockFolder("1", "Folder 1"), createMockFolder("2", "Folder 2")];
-      mockFolderService.getRotatedData.mockResolvedValue(mockFolders);
-
-      // Mock sends
-      const mockSends = [createMockSend("1", "Send 1"), createMockSend("2", "Send 2")];
-      mockSendService.getRotatedData.mockResolvedValue(mockSends);
-
-      // Mock emergency access
-      const emergencyAccess = [createMockEmergencyAccess("13")];
-      mockEmergencyAccessService.getRotatedData.mockResolvedValue(emergencyAccess);
-
-      // Mock reset password
-      const resetPassword = [createMockResetPassword("12")];
-      mockResetPasswordService.getRotatedData.mockResolvedValue(resetPassword);
-
-      // Mock Webauthn
-      const webauthn = [createMockWebauthn("13"), createMockWebauthn("14")];
-      mockWebauthnLoginAdminService.getRotatedData.mockResolvedValue(webauthn);
-    });
-
-    it("rotates the user key and encrypted data legacy", async () => {
-      await keyRotationService.rotateUserKeyAndEncryptedDataLegacy("mockMasterPassword", mockUser);
-
-      expect(mockApiService.postUserKeyUpdate).toHaveBeenCalled();
-      const arg = mockApiService.postUserKeyUpdate.mock.calls[0][0];
-      expect(arg.key).toBe("mockNewUserKey");
-      expect(arg.privateKey).toBe("mockEncryptedData");
-      expect(arg.ciphers.length).toBe(2);
-      expect(arg.folders.length).toBe(2);
-      expect(arg.sends.length).toBe(2);
-      expect(arg.emergencyAccessKeys.length).toBe(1);
-      expect(arg.resetPasswordKeys.length).toBe(1);
-      expect(arg.webauthnKeys.length).toBe(2);
-    });
-
-    it("rotates the userkey and encrypted data and changes master password", async () => {
-      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
-      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
-      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
-      await keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
-        "mockMasterPassword",
-        "newMasterPassword",
-        mockUser,
-      );
-
-      expect(mockApiService.postUserKeyUpdateV2).toHaveBeenCalled();
-      const arg = mockApiService.postUserKeyUpdateV2.mock.calls[0][0];
-      expect(arg.accountUnlockData.masterPasswordUnlockData.masterKeyEncryptedUserKey).toBe(
-        "mockNewUserKey",
-      );
-      expect(arg.oldMasterKeyAuthenticationHash).toBe("mockMasterPasswordHash");
-      expect(arg.accountUnlockData.masterPasswordUnlockData.email).toBe("mockEmail");
-      expect(arg.accountUnlockData.masterPasswordUnlockData.kdfType).toBe(
-        DEFAULT_KDF_CONFIG.kdfType,
-      );
-      expect(arg.accountUnlockData.masterPasswordUnlockData.kdfIterations).toBe(
-        DEFAULT_KDF_CONFIG.iterations,
-      );
-
-      expect(arg.accountKeys.accountPublicKey).toBe(Utils.fromUtf8ToB64("mockPublicKey"));
-      expect(arg.accountKeys.userKeyEncryptedAccountPrivateKey).toBe("mockEncryptedData");
-
-      expect(arg.accountData.ciphers.length).toBe(2);
-      expect(arg.accountData.folders.length).toBe(2);
-      expect(arg.accountData.sends.length).toBe(2);
-      expect(arg.accountUnlockData.emergencyAccessUnlockData.length).toBe(1);
-      expect(arg.accountUnlockData.organizationAccountRecoveryUnlockData.length).toBe(1);
-      expect(arg.accountUnlockData.passkeyUnlockData.length).toBe(2);
-      expect(PureCrypto.make_user_key_aes256_cbc_hmac).toHaveBeenCalled();
-      expect(PureCrypto.encrypt_user_key_with_master_password).toHaveBeenCalledWith(
-        new Uint8Array(64),
-        "newMasterPassword",
-        mockUser.email,
-        DEFAULT_KDF_CONFIG.toSdkConfig(),
-      );
-      expect(PureCrypto.make_user_key_xchacha20_poly1305).not.toHaveBeenCalled();
-    });
-
-    it("rotates the userkey to xchacha20poly1305 and encrypted data and changes master password when featureflag is active", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-
-      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
-      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
-      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
-      await keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
-        "mockMasterPassword",
-        "newMasterPassword",
-        mockUser,
-      );
-
-      expect(mockApiService.postUserKeyUpdateV2).toHaveBeenCalled();
-      const arg = mockApiService.postUserKeyUpdateV2.mock.calls[0][0];
-      expect(arg.accountUnlockData.masterPasswordUnlockData.masterKeyEncryptedUserKey).toBe(
-        "mockNewUserKey",
-      );
-      expect(arg.oldMasterKeyAuthenticationHash).toBe("mockMasterPasswordHash");
-      expect(arg.accountUnlockData.masterPasswordUnlockData.email).toBe("mockEmail");
-      expect(arg.accountUnlockData.masterPasswordUnlockData.kdfType).toBe(
-        DEFAULT_KDF_CONFIG.kdfType,
-      );
-      expect(arg.accountUnlockData.masterPasswordUnlockData.kdfIterations).toBe(
-        DEFAULT_KDF_CONFIG.iterations,
-      );
-
-      expect(arg.accountKeys.accountPublicKey).toBe(Utils.fromUtf8ToB64("mockPublicKey"));
-      expect(arg.accountKeys.userKeyEncryptedAccountPrivateKey).toBe("mockEncryptedData");
-
-      expect(arg.accountData.ciphers.length).toBe(2);
-      expect(arg.accountData.folders.length).toBe(2);
-      expect(arg.accountData.sends.length).toBe(2);
-      expect(arg.accountUnlockData.emergencyAccessUnlockData.length).toBe(1);
-      expect(arg.accountUnlockData.organizationAccountRecoveryUnlockData.length).toBe(1);
-      expect(arg.accountUnlockData.passkeyUnlockData.length).toBe(2);
-      expect(PureCrypto.make_user_key_aes256_cbc_hmac).not.toHaveBeenCalled();
-      expect(PureCrypto.encrypt_user_key_with_master_password).toHaveBeenCalledWith(
-        new Uint8Array(70),
-        "newMasterPassword",
-        mockUser.email,
-        DEFAULT_KDF_CONFIG.toSdkConfig(),
-      );
-      expect(PureCrypto.make_user_key_xchacha20_poly1305).toHaveBeenCalled();
-    });
-
-    it("returns early when first trust warning dialog is declined", async () => {
-      KeyRotationTrustInfoComponent.open = initialPromptedOpenFalse;
-      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
-      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
-      await keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
-        "mockMasterPassword",
-        "newMasterPassword",
-        mockUser,
-      );
-      expect(mockApiService.postUserKeyUpdateV2).not.toHaveBeenCalled();
-    });
-
-    it("returns early when emergency access trust warning dialog is declined", async () => {
-      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
-      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenUntrusted;
-      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
-      await keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
-        "mockMasterPassword",
-        "newMasterPassword",
-        mockUser,
-      );
-      expect(mockApiService.postUserKeyUpdateV2).not.toHaveBeenCalled();
-    });
-
-    it("returns early when account recovery trust warning dialog is declined", async () => {
-      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
-      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
-      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenUntrusted;
-      await keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
-        "mockMasterPassword",
-        "newMasterPassword",
-        mockUser,
-      );
-      expect(mockApiService.postUserKeyUpdateV2).not.toHaveBeenCalled();
-    });
-
-    it("legacy throws if master password provided is falsey", async () => {
-      await expect(
-        keyRotationService.rotateUserKeyAndEncryptedDataLegacy("", mockUser),
-      ).rejects.toThrow();
-    });
-
-    it("throws if master password provided is falsey", async () => {
-      await expect(
-        keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData("", "", mockUser),
-      ).rejects.toThrow();
-    });
-
-    it("legacy throws if user key creation fails", async () => {
-      mockKeyService.makeUserKey.mockResolvedValueOnce([null, null]);
-
-      await expect(
-        keyRotationService.rotateUserKeyAndEncryptedDataLegacy("mockMasterPassword", mockUser),
-      ).rejects.toThrow();
-    });
-
-    it("legacy throws if no private key is found", async () => {
-      privateKey.next(null);
-
-      await expect(
-        keyRotationService.rotateUserKeyAndEncryptedDataLegacy("mockMasterPassword", mockUser),
-      ).rejects.toThrow();
-    });
-
-    it("throws if no private key is found", async () => {
-      keyPair.next(null);
-
-      await expect(
-        keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
-          "mockMasterPassword",
-          "mockMasterPassword1",
-          mockUser,
-        ),
-      ).rejects.toThrow();
-    });
-
-    it("legacy throws if master password is incorrect", async () => {
-      mockUserVerificationService.verifyUserByMasterPassword.mockRejectedValueOnce(
-        new Error("Invalid master password"),
-      );
-
-      await expect(
-        keyRotationService.rotateUserKeyAndEncryptedDataLegacy("mockMasterPassword", mockUser),
-      ).rejects.toThrow();
-    });
-
-    it("throws if master password is incorrect", async () => {
-      mockUserVerificationService.verifyUserByMasterPassword.mockRejectedValueOnce(
-        new Error("Invalid master password"),
-      );
-
-      await expect(
-        keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
-          "mockMasterPassword",
-          "mockMasterPassword1",
-          mockUser,
-        ),
-      ).rejects.toThrow();
-    });
-
-    it("legacy throws if server rotation fails", async () => {
-      mockApiService.postUserKeyUpdate.mockRejectedValueOnce(new Error("mockError"));
-
-      await expect(
-        keyRotationService.rotateUserKeyAndEncryptedDataLegacy("mockMasterPassword", mockUser),
-      ).rejects.toThrow();
-    });
-
-    it("throws if server rotation fails", async () => {
-      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
-      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
-      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
-      mockApiService.postUserKeyUpdateV2.mockRejectedValueOnce(new Error("mockError"));
-
-      await expect(
-        keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
-          "mockMasterPassword",
-          "mockMasterPassword1",
-          mockUser,
-        ),
-      ).rejects.toThrow();
-    });
-  });
-});
-
 function createMockFolder(id: string, name: string): FolderWithIdRequest {
   return {
     id: id,
@@ -514,3 +116,784 @@ function createMockWebauthn(id: string): any {
     id: id,
   } as WebauthnRotateCredentialRequest;
 }
+
+class TestUserKeyRotationService extends UserKeyRotationService {
+  override rotateUserKeyMasterPasswordAndEncryptedData(
+    currentMasterPassword: string,
+    newMasterPassword: string,
+    user: Account,
+    newMasterPasswordHint?: string,
+  ): Promise<void> {
+    return super.rotateUserKeyMasterPasswordAndEncryptedData(
+      currentMasterPassword,
+      newMasterPassword,
+      user,
+      newMasterPasswordHint,
+    );
+  }
+  override ensureIsAllowedToRotateUserKey(): Promise<void> {
+    return super.ensureIsAllowedToRotateUserKey();
+  }
+  override getNewAccountKeysV1(
+    currentUserKey: UserKey,
+    currentUserKeyWrappedPrivateKey: EncString,
+  ): Promise<{
+    userKey: UserKey;
+    asymmetricEncryptionKeys: { wrappedPrivateKey: EncString; publicKey: string };
+  }> {
+    return super.getNewAccountKeysV1(currentUserKey, currentUserKeyWrappedPrivateKey);
+  }
+  override getNewAccountKeysV2(
+    currentUserKey: UserKey,
+    currentUserKeyWrappedPrivateKey: EncString,
+  ): Promise<{
+    userKey: UserKey;
+    asymmetricEncryptionKeys: { wrappedPrivateKey: EncString; publicKey: string };
+  }> {
+    return super.getNewAccountKeysV2(currentUserKey, currentUserKeyWrappedPrivateKey);
+  }
+  override createMasterPasswordUnlockDataRequest(
+    userKey: UserKey,
+    newUnlockData: {
+      masterPassword: string;
+      masterKeySalt: string;
+      masterKeyKdfConfig: KdfConfig;
+      masterPasswordHint: string;
+    },
+  ): Promise<MasterPasswordUnlockDataRequest> {
+    return super.createMasterPasswordUnlockDataRequest(userKey, newUnlockData);
+  }
+  override getAccountUnlockDataRequest(
+    userId: UserId,
+    currentUserKey: UserKey,
+    newUserKey: UserKey,
+    masterPasswordAuthenticationAndUnlockData: {
+      masterPassword: string;
+      masterKeySalt: string;
+      masterKeyKdfConfig: KdfConfig;
+      masterPasswordHint: string;
+    },
+    trustedEmergencyAccessGranteesPublicKeys: Uint8Array[],
+    trustedOrganizationPublicKeys: Uint8Array[],
+  ): Promise<UnlockDataRequest> {
+    return super.getAccountUnlockDataRequest(
+      userId,
+      currentUserKey,
+      newUserKey,
+      masterPasswordAuthenticationAndUnlockData,
+      trustedEmergencyAccessGranteesPublicKeys,
+      trustedOrganizationPublicKeys,
+    );
+  }
+  override verifyTrust(user: Account): Promise<{
+    wasTrustDenied: boolean;
+    trustedOrganizationPublicKeys: Uint8Array[];
+    trustedEmergencyAccessUserPublicKeys: Uint8Array[];
+  }> {
+    return super.verifyTrust(user);
+  }
+  override getAccountDataRequest(
+    originalUserKey: UserKey,
+    newUnencryptedUserKey: UserKey,
+    user: Account,
+  ): Promise<UserDataRequest> {
+    return super.getAccountDataRequest(originalUserKey, newUnencryptedUserKey, user);
+  }
+  override makeNewUserKeyV1(oldUserKey: UserKey): Promise<UserKey> {
+    return super.makeNewUserKeyV1(oldUserKey);
+  }
+  override makeNewUserKeyV2(
+    oldUserKey: UserKey,
+  ): Promise<{ isUpgrading: boolean; newUserKey: UserKey }> {
+    return super.makeNewUserKeyV2(oldUserKey);
+  }
+  override isV1User(userKey: UserKey): boolean {
+    return super.isV1User(userKey);
+  }
+  override isUserWithMasterPassword(id: UserId): boolean {
+    return super.isUserWithMasterPassword(id);
+  }
+  override makeServerMasterKeyAuthenticationHash(
+    masterPassword: string,
+    masterKeyKdfConfig: KdfConfig,
+    masterKeySalt: string,
+  ): Promise<string> {
+    return super.makeServerMasterKeyAuthenticationHash(
+      masterPassword,
+      masterKeyKdfConfig,
+      masterKeySalt,
+    );
+  }
+}
+
+describe("KeyRotationService", () => {
+  let keyRotationService: TestUserKeyRotationService;
+
+  let mockApiService: MockProxy<UserKeyRotationApiService>;
+  let mockCipherService: MockProxy<CipherService>;
+  let mockFolderService: MockProxy<FolderService>;
+  let mockSendService: MockProxy<SendService>;
+  let mockEmergencyAccessService: MockProxy<EmergencyAccessService>;
+  let mockResetPasswordService: MockProxy<OrganizationUserResetPasswordService>;
+  let mockDeviceTrustService: MockProxy<DeviceTrustServiceAbstraction>;
+  let mockKeyService: MockProxy<KeyService>;
+  let mockEncryptService: MockProxy<EncryptService>;
+  let mockConfigService: MockProxy<ConfigService>;
+  let mockSyncService: MockProxy<SyncService>;
+  let mockWebauthnLoginAdminService: MockProxy<WebauthnLoginAdminService>;
+  let mockLogService: MockProxy<LogService>;
+  let mockVaultTimeoutService: MockProxy<VaultTimeoutService>;
+  let mockDialogService: MockProxy<DialogService>;
+  let mockToastService: MockProxy<ToastService>;
+  let mockI18nService: MockProxy<I18nService>;
+  let mockCryptoFunctionService: MockProxy<CryptoFunctionService>;
+  let mockKdfConfigService: MockProxy<KdfConfigService>;
+
+  const mockUser = {
+    id: "mockUserId" as UserId,
+    email: "mockEmail",
+    emailVerified: true,
+    name: "mockName",
+  };
+
+  const mockTrustedPublicKeys = [Utils.fromUtf8ToArray("test-public-key")];
+
+  beforeAll(() => {
+    mockApiService = mock<UserKeyRotationApiService>();
+    mockCipherService = mock<CipherService>();
+    mockFolderService = mock<FolderService>();
+    mockSendService = mock<SendService>();
+    mockEmergencyAccessService = mock<EmergencyAccessService>();
+    mockEmergencyAccessService.getPublicKeys.mockResolvedValue(
+      mockTrustedPublicKeys.map((key) => {
+        return {
+          publicKey: key,
+          id: "mockId",
+          granteeId: "mockGranteeId",
+          name: "mockName",
+          email: "mockEmail",
+          type: EmergencyAccessType.Takeover,
+          status: EmergencyAccessStatusType.Accepted,
+          waitTimeDays: 5,
+          creationDate: "mockCreationDate",
+          avatarColor: "mockAvatarColor",
+        };
+      }),
+    );
+    mockResetPasswordService = mock<OrganizationUserResetPasswordService>();
+    mockResetPasswordService.getPublicKeys.mockResolvedValue(
+      mockTrustedPublicKeys.map((key) => {
+        return {
+          publicKey: key,
+          orgId: "mockOrgId",
+          orgName: "mockOrgName",
+        };
+      }),
+    );
+    mockDeviceTrustService = mock<DeviceTrustServiceAbstraction>();
+    mockKeyService = mock<KeyService>();
+    mockEncryptService = mock<EncryptService>();
+    mockConfigService = mock<ConfigService>();
+    mockSyncService = mock<SyncService>();
+    mockWebauthnLoginAdminService = mock<WebauthnLoginAdminService>();
+    mockLogService = mock<LogService>();
+    mockVaultTimeoutService = mock<VaultTimeoutService>();
+    mockToastService = mock<ToastService>();
+    mockI18nService = mock<I18nService>();
+    mockDialogService = mock<DialogService>();
+    mockCryptoFunctionService = mock<CryptoFunctionService>();
+    mockKdfConfigService = mock<KdfConfigService>();
+
+    keyRotationService = new TestUserKeyRotationService(
+      mockApiService,
+      mockCipherService,
+      mockFolderService,
+      mockSendService,
+      mockEmergencyAccessService,
+      mockResetPasswordService,
+      mockDeviceTrustService,
+      mockKeyService,
+      mockEncryptService,
+      mockSyncService,
+      mockWebauthnLoginAdminService,
+      mockLogService,
+      mockVaultTimeoutService,
+      mockToastService,
+      mockI18nService,
+      mockDialogService,
+      mockConfigService,
+      mockCryptoFunctionService,
+      mockKdfConfigService,
+    );
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.mock("@bitwarden/key-management-ui");
+    jest.spyOn(PureCrypto, "make_user_key_aes256_cbc_hmac").mockReturnValue(new Uint8Array(64));
+    jest.spyOn(PureCrypto, "make_user_key_xchacha20_poly1305").mockReturnValue(new Uint8Array(70));
+    jest
+      .spyOn(PureCrypto, "encrypt_user_key_with_master_password")
+      .mockReturnValue("mockNewUserKey");
+  });
+
+  describe("rotateUserKeyAndEncryptedData", () => {
+    let privateKey: BehaviorSubject<UserPrivateKey | null>;
+    let keyPair: BehaviorSubject<{ privateKey: UserPrivateKey; publicKey: UserPublicKey }>;
+
+    beforeEach(() => {
+      mockSyncService.getLastSync.mockResolvedValue(new Date());
+      mockKeyService.makeUserKey.mockResolvedValue([
+        new SymmetricCryptoKey(new Uint8Array(64)) as UserKey,
+        {
+          encryptedString: "mockNewUserKey",
+        } as any,
+      ]);
+      mockKeyService.hashMasterKey.mockResolvedValue("mockMasterPasswordHash");
+      mockConfigService.getFeatureFlag.mockResolvedValue(false);
+
+      mockEncryptService.wrapSymmetricKey.mockResolvedValue({
+        encryptedString: "mockEncryptedData",
+      } as any);
+      mockEncryptService.wrapDecapsulationKey.mockResolvedValue({
+        encryptedString: "mockEncryptedData",
+      } as any);
+
+      // Mock user key
+      mockKeyService.userKey$.mockReturnValue(new BehaviorSubject("mockOriginalUserKey" as any));
+
+      mockKeyService.getFingerprint.mockResolvedValue(["a", "b"]);
+
+      // Mock private key
+      privateKey = new BehaviorSubject("mockPrivateKey" as any);
+      mockKeyService.userPrivateKeyWithLegacySupport$.mockReturnValue(privateKey);
+
+      keyPair = new BehaviorSubject({
+        privateKey: "mockPrivateKey",
+        publicKey: "mockPublicKey",
+      } as any);
+      mockKeyService.userEncryptionKeyPair$.mockReturnValue(keyPair);
+
+      // Mock ciphers
+      const mockCiphers = [createMockCipher("1", "Cipher 1"), createMockCipher("2", "Cipher 2")];
+      mockCipherService.getRotatedData.mockResolvedValue(mockCiphers);
+
+      // Mock folders
+      const mockFolders = [createMockFolder("1", "Folder 1"), createMockFolder("2", "Folder 2")];
+      mockFolderService.getRotatedData.mockResolvedValue(mockFolders);
+
+      // Mock sends
+      const mockSends = [createMockSend("1", "Send 1"), createMockSend("2", "Send 2")];
+      mockSendService.getRotatedData.mockResolvedValue(mockSends);
+
+      // Mock emergency access
+      const emergencyAccess = [createMockEmergencyAccess("13")];
+      mockEmergencyAccessService.getRotatedData.mockResolvedValue(emergencyAccess);
+
+      // Mock reset password
+      const resetPassword = [createMockResetPassword("12")];
+      mockResetPasswordService.getRotatedData.mockResolvedValue(resetPassword);
+
+      // Mock Webauthn
+      const webauthn = [createMockWebauthn("13"), createMockWebauthn("14")];
+      mockWebauthnLoginAdminService.getRotatedData.mockResolvedValue(webauthn);
+
+      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
+      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
+      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
+    });
+
+    it("rotates the userkey and encrypted data and changes master password", async () => {
+      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
+      AccountRecoveryTrustComponent.open = initialPromptedOpenTrue;
+      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
+      mockKdfConfigService.getKdfConfig$.mockReturnValue(
+        new BehaviorSubject(new PBKDF2KdfConfig(100000)),
+      );
+      mockKeyService.userKey$.mockReturnValue(
+        new BehaviorSubject(new SymmetricCryptoKey(new Uint8Array(64)) as UserKey),
+      );
+      mockKeyService.hashMasterKey.mockResolvedValue("mockMasterPasswordHash");
+      mockKeyService.userEncryptedPrivateKey$.mockReturnValue(
+        new BehaviorSubject(
+          "2.eh465OrUcluL9UpnCOUTAg==|2HXNXwrLwAjUfZ/U75c92rZEltt1eHxjMkp/ADAmx346oT1+GaQvaL1QIV/9Om0T72m8AnlO92iUfWdhbA/ifHZ+lhFoUVeyw1M88CMzktbVcq42rFoK7SGHSAGdTL3ccUWKI8yCCQJhpt2X6a/5+T7ey5k2CqvylKyOtkiCnVeLmYqETn5BM9Rl3tEgJW1yDLuSJ+L+Qh9xnk/Z3zJUV5HAs+YwjKwuSNrd00SXjDyx8rBEstD9MKI+lrk7to/q90vqKqCucAj/dzUpVtHe88al2AAlBVwQ13HUPdNFOyti6niUgCAWx+DzRqlhkFvl/z/rtxtQsyqq/3Eh/EL54ylxKzAya0ev9EaIOm/dD1aBmI58p4Bs0eMOCIKJjtw+Cmdql+RhCtKtumgFShqyXv+LfD/FgUsdTVNExk3YNhgwPR4jOaMa/j9LCrBMCLKxdAhQyBe7T3qoX1fBBirvY6t77ifMu1YEQ6DfmFphVSwDH5C9xGeTSh5IELSf0tGVtlWUe9RffDDzccD0L1lR8U+dqzoSTYCuXvhEhQptdIW6fpH/47u0M5MiI97/d35A7Et2I1gjHp7WF3qsY20ellBueu7ZL5P1BmqPXl58yaBBXJaCutYHDfIucspqdZmfBGEbdRT4wmuZRON0J8zLmUejM0VR/2MOmpfyYQXnJhTfrvnZ1bOg1aMhUxJ2vhDNPXUFm5b+vwsho4GEvcLAKq9WwbvOJ/sK7sEVfTfEO2IG+0X6wkWm7RpR6Wq9FGKSrv2PSjMAYnb+z3ETeWiaaiD+tVFxa2AaqsbOuX092/86GySpHES7cFWhQ/YMOgj6egUi8mEC0CqMXYsx0TTJDsn16oP+XB3a2WoRqzE0YBozp2aMXxhVf/jMZ03BmEmRQu5B+Sq1gMEZwtIfJ+srkZLMYlLjvVw92FRoFy+N6ytPiyf6RMHMUnJ3vEZSBogaElYoQAtFJ5kK811CUzb78zEHH8xWtPrCZn9zZfvf/zaWxo7fpV8VwAwUeHXHcQMraZum5QeO+5tLRUYrLm85JNelGfmUA3BjfNyFbfb32PhkWWd0CbDaPME48uIriVK32pNEtvtR/+I/f3YgA/jP9kSlDvbzG/OAg/AFBIpNwKUzsu4+va8mI+O5FDufw5D74WwdGJ9DeyEb2CHtWMR1VwtFKL0ZZsqltNf8EkBeJ5RtTNtAMM8ie4dDZaKC96ymQHKrdB4hjkAr0F1XFsU4XdOa9Nbkdcm/7KoNc6bE6oJtG9lqE8h+1CysfcbfJ7am+hvDFzT0IPmp3GDSMAk+e6xySgFQw0C/SZ7LQsxPa1s6hc+BOtTn0oClZnU7Mowxv+z+xURJj4Yp3Cy6tAoia1jEQSs6lSMNKPf9bi3xFKtPl4143hwhpvTAzJUcski9OVGd7Du+VyxwIrvLqp5Ct/oNrESVJpf1EDCs9xT1EW+PiSkRmHXoZ1t5MOLFEiMAZL2+bNe3A2661oJeMtps8zrfCVc251OUE1WvqWePlTOs5TDVqdwDH88J6rHLsbaf33Mxh5DP8gMfZQxE44Nsp6H0/Szfkss5UmFwBEpHjl1GJMWDnB3u2d+l1CSkLoB6C+diAUlY6wL/VwJBeMPHZTf6amQIS2B/lo/CnvV/E3k=|uuoY4b7xwMYBNIZi85KBsaHmNqtJl5FrKxZI9ugeNwc=" as EncryptedString,
+        ),
+      );
+      await keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
+        "mockMasterPassword",
+        "mockMasterPassword1",
+        mockUser,
+        "masterPasswordHint",
+      );
+      const arg = mockApiService.postUserKeyUpdate.mock.calls[0][0];
+      expect(arg.oldMasterKeyAuthenticationHash).toBe("mockMasterPasswordHash");
+      expect(arg.accountData.ciphers.length).toBe(2);
+      expect(arg.accountData.folders.length).toBe(2);
+      expect(arg.accountData.sends.length).toBe(2);
+      expect(arg.accountUnlockData.emergencyAccessUnlockData.length).toBe(1);
+      expect(arg.accountUnlockData.organizationAccountRecoveryUnlockData.length).toBe(1);
+      expect(arg.accountUnlockData.passkeyUnlockData.length).toBe(2);
+    });
+
+    it("throws if kdf config is null", async () => {
+      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
+      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
+      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
+      mockKdfConfigService.getKdfConfig$.mockReturnValue(new BehaviorSubject(null));
+      await expect(
+        keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
+          "mockMasterPassword",
+          "mockMasterPassword1",
+          mockUser,
+        ),
+      ).rejects.toThrow();
+    });
+
+    it("returns early when emergency access trust warning dialog is declined", async () => {
+      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
+      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenUntrusted;
+      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
+      await keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
+        "mockMasterPassword",
+        "newMasterPassword",
+        mockUser,
+      );
+      expect(mockApiService.postUserKeyUpdate).not.toHaveBeenCalled();
+    });
+
+    it("returns early when account recovery trust warning dialog is declined", async () => {
+      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
+      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
+      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenUntrusted;
+      await keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
+        "mockMasterPassword",
+        "newMasterPassword",
+        mockUser,
+      );
+      expect(mockApiService.postUserKeyUpdate).not.toHaveBeenCalled();
+    });
+
+    it("throws if master password provided is falsey", async () => {
+      await expect(
+        keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData("", "", mockUser),
+      ).rejects.toThrow();
+    });
+
+    it("throws if no private key is found", async () => {
+      keyPair.next(null);
+
+      await expect(
+        keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
+          "mockMasterPassword",
+          "mockMasterPassword1",
+          mockUser,
+        ),
+      ).rejects.toThrow();
+    });
+
+    it("throws if server rotation fails", async () => {
+      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
+      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
+      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
+      mockApiService.postUserKeyUpdate.mockRejectedValueOnce(new Error("mockError"));
+
+      await expect(
+        keyRotationService.rotateUserKeyMasterPasswordAndEncryptedData(
+          "mockMasterPassword",
+          "mockMasterPassword1",
+          mockUser,
+        ),
+      ).rejects.toThrow();
+    });
+  });
+
+  describe("getNewAccountKeysV1", () => {
+    const currentUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+    const mockEncryptedPrivateKey = new EncString(
+      "2.eh465OrUcluL9UpnCOUTAg==|2HXNXwrLwAjUfZ/U75c92rZEltt1eHxjMkp/ADAmx346oT1+GaQvaL1QIV/9Om0T72m8AnlO92iUfWdhbA/ifHZ+lhFoUVeyw1M88CMzktbVcq42rFoK7SGHSAGdTL3ccUWKI8yCCQJhpt2X6a/5+T7ey5k2CqvylKyOtkiCnVeLmYqETn5BM9Rl3tEgJW1yDLuSJ+L+Qh9xnk/Z3zJUV5HAs+YwjKwuSNrd00SXjDyx8rBEstD9MKI+lrk7to/q90vqKqCucAj/dzUpVtHe88al2AAlBVwQ13HUPdNFOyti6niUgCAWx+DzRqlhkFvl/z/rtxtQsyqq/3Eh/EL54ylxKzAya0ev9EaIOm/dD1aBmI58p4Bs0eMOCIKJjtw+Cmdql+RhCtKtumgFShqyXv+LfD/FgUsdTVNExk3YNhgwPR4jOaMa/j9LCrBMCLKxdAhQyBe7T3qoX1fBBirvY6t77ifMu1YEQ6DfmFphVSwDH5C9xGeTSh5IELSf0tGVtlWUe9RffDDzccD0L1lR8U+dqzoSTYCuXvhEhQptdIW6fpH/47u0M5MiI97/d35A7Et2I1gjHp7WF3qsY20ellBueu7ZL5P1BmqPXl58yaBBXJaCutYHDfIucspqdZmfBGEbdRT4wmuZRON0J8zLmUejM0VR/2MOmpfyYQXnJhTfrvnZ1bOg1aMhUxJ2vhDNPXUFm5b+vwsho4GEvcLAKq9WwbvOJ/sK7sEVfTfEO2IG+0X6wkWm7RpR6Wq9FGKSrv2PSjMAYnb+z3ETeWiaaiD+tVFxa2AaqsbOuX092/86GySpHES7cFWhQ/YMOgj6egUi8mEC0CqMXYsx0TTJDsn16oP+XB3a2WoRqzE0YBozp2aMXxhVf/jMZ03BmEmRQu5B+Sq1gMEZwtIfJ+srkZLMYlLjvVw92FRoFy+N6ytPiyf6RMHMUnJ3vEZSBogaElYoQAtFJ5kK811CUzb78zEHH8xWtPrCZn9zZfvf/zaWxo7fpV8VwAwUeHXHcQMraZum5QeO+5tLRUYrLm85JNelGfmUA3BjfNyFbfb32PhkWWd0CbDaPME48uIriVK32pNEtvtR/+I/f3YgA/jP9kSlDvbzG/OAg/AFBIpNwKUzsu4+va8mI+O5FDufw5D74WwdGJ9DeyEb2CHtWMR1VwtFKL0ZZsqltNf8EkBeJ5RtTNtAMM8ie4dDZaKC96ymQHKrdB4hjkAr0F1XFsU4XdOa9Nbkdcm/7KoNc6bE6oJtG9lqE8h+1CysfcbfJ7am+hvDFzT0IPmp3GDSMAk+e6xySgFQw0C/SZ7LQsxPa1s6hc+BOtTn0oClZnU7Mowxv+z+xURJj4Yp3Cy6tAoia1jEQSs6lSMNKPf9bi3xFKtPl4143hwhpvTAzJUcski9OVGd7Du+VyxwIrvLqp5Ct/oNrESVJpf1EDCs9xT1EW+PiSkRmHXoZ1t5MOLFEiMAZL2+bNe3A2661oJeMtps8zrfCVc251OUE1WvqWePlTOs5TDVqdwDH88J6rHLsbaf33Mxh5DP8gMfZQxE44Nsp6H0/Szfkss5UmFwBEpHjl1GJMWDnB3u2d+l1CSkLoB6C+diAUlY6wL/VwJBeMPHZTf6amQIS2B/lo/CnvV/E3k=|uuoY4b7xwMYBNIZi85KBsaHmNqtJl5FrKxZI9ugeNwc=",
+    );
+    const mockNewEncryptedPrivateKey = new EncString(
+      "2.ab465OrUcluL9UpnCOUTAg==|4HXNXwrLwAjUfZ/U75c92rZEltt1eHxjMkp/ADAmx346oT1+GaQvaL1QIV/9Om0T72m8AnlO92iUfWdhbA/ifHZ+lhFoUVeyw1M88CMzktbVcq42rFoK7SGHSAGdTL3ccUWKI8yCCQJhpt2X6a/5+T7ey5k2CqvylKyOtkiCnVeLmYqETn5BM9Rl3tEgJW1yDLuSJ+L+Qh9xnk/Z3zJUV5HAs+YwjKwuSNrd00SXjDyx8rBEstD9MKI+lrk7to/q90vqKqCucAj/dzUpVtHe88al2AAlBVwQ13HUPdNFOyti6niUgCAWx+DzRqlhkFvl/z/rtxtQsyqq/3Eh/EL54ylxKzAya0ev9EaIOm/dD1aBmI58p4Bs0eMOCIKJjtw+Cmdql+RhCtKtumgFShqyXv+LfD/FgUsdTVNExk3YNhgwPR4jOaMa/j9LCrBMCLKxdAhQyBe7T3qoX1fBBirvY6t77ifMu1YEQ6DfmFphVSwDH5C9xGeTSh5IELSf0tGVtlWUe9RffDDzccD0L1lR8U+dqzoSTYCuXvhEhQptdIW6fpH/47u0M5MiI97/d35A7Et2I1gjHp7WF3qsY20ellBueu7ZL5P1BmqPXl58yaBBXJaCutYHDfIucspqdZmfBGEbdRT4wmuZRON0J8zLmUejM0VR/2MOmpfyYQXnJhTfrvnZ1bOg1aMhUxJ2vhDNPXUFm5b+vwsho4GEvcLAKq9WwbvOJ/sK7sEVfTfEO2IG+0X6wkWm7RpR6Wq9FGKSrv2PSjMAYnb+z3ETeWiaaiD+tVFxa2AaqsbOuX092/86GySpHES7cFWhQ/YMOgj6egUi8mEC0CqMXYsx0TTJDsn16oP+XB3a2WoRqzE0YBozp2aMXxhVf/jMZ03BmEmRQu5B+Sq1gMEZwtIfJ+srkZLMYlLjvVw92FRoFy+N6ytPiyf6RMHMUnJ3vEZSBogaElYoQAtFJ5kK811CUzb78zEHH8xWtPrCZn9zZfvf/zaWxo7fpV8VwAwUeHXHcQMraZum5QeO+5tLRUYrLm85JNelGfmUA3BjfNyFbfb32PhkWWd0CbDaPME48uIriVK32pNEtvtR/+I/f3YgA/jP9kSlDvbzG/OAg/AFBIpNwKUzsu4+va8mI+O5FDufw5D74WwdGJ9DeyEb2CHtWMR1VwtFKL0ZZsqltNf8EkBeJ5RtTNtAMM8ie4dDZaKC96ymQHKrdB4hjkAr0F1XFsU4XdOa9Nbkdcm/7KoNc6bE6oJtG9lqE8h+1CysfcbfJ7am+hvDFzT0IPmp3GDSMAk+e6xySgFQw0C/SZ7LQsxPa1s6hc+BOtTn0oClZnU7Mowxv+z+xURJj4Yp3Cy6tAoia1jEQSs6lSMNKPf9bi3xFKtPl4143hwhpvTAzJUcski9OVGd7Du+VyxwIrvLqp5Ct/oNrESVJpf1EDCs9xT1EW+PiSkRmHXoZ1t5MOLFEiMAZL2+bNe3A2661oJeMtps8zrfCVc251OUE1WvqWePlTOs5TDVqdwDH88J6rHLsbaf33Mxh5DP8gMfZQxE44Nsp6H0/Szfkss5UmFwBEpHjl1GJMWDnB3u2d+l1CSkLoB6C+diAUlY6wL/VwJBeMPHZTf6amQIS2B/lo/CnvV/E3k=|uuoY4b7xwMYBNIZi85KBsaHmNqtJl5FrKxZI9ugeNwc=",
+    );
+    beforeAll(() => {
+      mockEncryptService.unwrapDecapsulationKey.mockResolvedValue(new Uint8Array(200));
+      mockEncryptService.wrapDecapsulationKey.mockResolvedValue(mockNewEncryptedPrivateKey);
+      mockCryptoFunctionService.rsaExtractPublicKey.mockResolvedValue(new Uint8Array(400));
+    });
+
+    afterAll(() => {
+      jest.restoreAllMocks();
+    });
+
+    it("returns new account keys", async () => {
+      const result = await keyRotationService.getNewAccountKeysV1(
+        currentUserKey,
+        mockEncryptedPrivateKey,
+      );
+      expect(result).toEqual({
+        userKey: expect.any(SymmetricCryptoKey),
+        asymmetricEncryptionKeys: {
+          wrappedPrivateKey: mockNewEncryptedPrivateKey,
+          publicKey: Utils.fromBufferToB64(new Uint8Array(400)),
+        },
+      });
+    });
+  });
+
+  describe("getNewAccountKeysV2", () => {
+    it("throws not supported", async () => {
+      await expect(
+        keyRotationService.getNewAccountKeysV2(
+          new SymmetricCryptoKey(new Uint8Array(64)) as UserKey,
+          null,
+        ),
+      ).rejects.toThrow("User encryption v2 upgrade is not supported yet");
+    });
+  });
+
+  describe("createMasterPasswordUnlockData", () => {
+    it("returns the master password unlock data", async () => {
+      mockKeyService.makeMasterKey.mockResolvedValue(
+        new SymmetricCryptoKey(new Uint8Array(32)) as MasterKey,
+      );
+      mockKeyService.hashMasterKey.mockResolvedValue("mockMasterPasswordHash");
+      const newKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const userAccount = mockUser;
+      const masterPasswordUnlockData =
+        await keyRotationService.createMasterPasswordUnlockDataRequest(newKey, {
+          masterPassword: "mockMasterPassword",
+          masterKeySalt: userAccount.email,
+          masterKeyKdfConfig: new PBKDF2KdfConfig(600_000),
+          masterPasswordHint: "mockMasterPasswordHint",
+        });
+      expect(masterPasswordUnlockData).toEqual({
+        masterKeyEncryptedUserKey: "mockNewUserKey",
+        email: "mockEmail",
+        kdfType: 0,
+        kdfIterations: 600_000,
+        masterKeyAuthenticationHash: "mockMasterPasswordHash",
+        masterPasswordHint: "mockMasterPasswordHint",
+      });
+      expect(PureCrypto.encrypt_user_key_with_master_password).toHaveBeenCalledWith(
+        new SymmetricCryptoKey(new Uint8Array(64)).toEncoded(),
+        "mockMasterPassword",
+        userAccount.email,
+        new PBKDF2KdfConfig(600_000).toSdkConfig(),
+      );
+    });
+  });
+
+  describe("getAccountUnlockDataRequest", () => {
+    it("returns the account unlock data request", async () => {
+      mockWebauthnLoginAdminService.getRotatedData.mockResolvedValue([
+        {
+          id: "mockId",
+          encryptedPublicKey: "mockEncryptedPublicKey" as any,
+          encryptedUserKey: "mockEncryptedUserKey" as any,
+        },
+      ]);
+      mockDeviceTrustService.getRotatedData.mockResolvedValue([
+        {
+          deviceId: "mockId",
+          encryptedPublicKey: "mockEncryptedPublicKey",
+          encryptedUserKey: "mockEncryptedUserKey",
+        },
+      ]);
+      mockEmergencyAccessService.getRotatedData.mockResolvedValue([
+        {
+          waitTimeDays: 5,
+          keyEncrypted: "mockEncryptedUserKey",
+          id: "mockId",
+          type: EmergencyAccessType.Takeover,
+        },
+      ]);
+      mockResetPasswordService.getRotatedData.mockResolvedValue([
+        {
+          organizationId: "mockOrgId",
+          resetPasswordKey: "mockEncryptedUserKey",
+          masterPasswordHash: "omitted",
+          otp: undefined,
+          authRequestAccessCode: undefined,
+        },
+      ]);
+      mockKeyService.makeMasterKey.mockResolvedValue(
+        new SymmetricCryptoKey(new Uint8Array(32)) as MasterKey,
+      );
+      mockKeyService.hashMasterKey.mockResolvedValue("mockMasterPasswordHash");
+
+      const initialKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const newKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const userAccount = mockUser;
+      const accountUnlockDataRequest = await keyRotationService.getAccountUnlockDataRequest(
+        userAccount.id,
+        initialKey,
+        newKey,
+        {
+          masterPassword: "mockMasterPassword",
+          masterKeySalt: userAccount.email,
+          masterKeyKdfConfig: new PBKDF2KdfConfig(600_000),
+          masterPasswordHint: "mockMasterPasswordHint",
+        },
+        [new Uint8Array(1)], // emergency access public key
+        [new Uint8Array(2)], // account recovery public key
+      );
+      expect(accountUnlockDataRequest.passkeyUnlockData).toEqual([
+        {
+          encryptedPublicKey: "mockEncryptedPublicKey",
+          encryptedUserKey: "mockEncryptedUserKey",
+          id: "mockId",
+        },
+      ]);
+      expect(accountUnlockDataRequest.deviceKeyUnlockData).toEqual([
+        {
+          encryptedPublicKey: "mockEncryptedPublicKey",
+          encryptedUserKey: "mockEncryptedUserKey",
+          deviceId: "mockId",
+        },
+      ]);
+      expect(accountUnlockDataRequest.masterPasswordUnlockData).toEqual({
+        masterKeyEncryptedUserKey: "mockNewUserKey",
+        email: "mockEmail",
+        kdfType: 0,
+        kdfIterations: 600_000,
+        masterKeyAuthenticationHash: "mockMasterPasswordHash",
+        masterPasswordHint: "mockMasterPasswordHint",
+      });
+      expect(accountUnlockDataRequest.emergencyAccessUnlockData).toEqual([
+        {
+          keyEncrypted: "mockEncryptedUserKey",
+          id: "mockId",
+          type: EmergencyAccessType.Takeover,
+          waitTimeDays: 5,
+        },
+      ]);
+      expect(accountUnlockDataRequest.organizationAccountRecoveryUnlockData).toEqual([
+        {
+          organizationId: "mockOrgId",
+          resetPasswordKey: "mockEncryptedUserKey",
+          masterPasswordHash: "omitted",
+          otp: undefined,
+          authRequestAccessCode: undefined,
+        },
+      ]);
+    });
+  });
+
+  describe("verifyTrust", () => {
+    const mockGranteeEmergencyAccessWithPublicKey = {
+      publicKey: new Uint8Array(123),
+      id: "mockId",
+      granteeId: "mockGranteeId",
+      name: "mockName",
+      email: "mockEmail",
+      type: EmergencyAccessType.Takeover,
+      status: EmergencyAccessStatusType.Accepted,
+      waitTimeDays: 5,
+      creationDate: "mockCreationDate",
+      avatarColor: "mockAvatarColor",
+    };
+    const mockOrganizationUserResetPasswordEntry = {
+      publicKey: new Uint8Array(123),
+      orgId: "mockOrgId",
+      orgName: "mockOrgName",
+    };
+
+    it("returns empty arrays if initial dialog is closed", async () => {
+      KeyRotationTrustInfoComponent.open = initialPromptedOpenFalse;
+      mockEmergencyAccessService.getPublicKeys.mockResolvedValue([
+        mockGranteeEmergencyAccessWithPublicKey,
+      ]);
+      mockResetPasswordService.getPublicKeys.mockResolvedValue([
+        mockOrganizationUserResetPasswordEntry,
+      ]);
+      const {
+        wasTrustDenied,
+        trustedOrganizationPublicKeys: trustedOrgs,
+        trustedEmergencyAccessUserPublicKeys: trustedEmergencyAccessUsers,
+      } = await keyRotationService.verifyTrust(mockUser);
+      expect(trustedEmergencyAccessUsers).toEqual([]);
+      expect(trustedOrgs).toEqual([]);
+      expect(wasTrustDenied).toBe(true);
+    });
+
+    it("returns empty arrays if emergency access dialog is closed", async () => {
+      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
+      AccountRecoveryTrustComponent.open = initialPromptedOpenFalse;
+      mockEmergencyAccessService.getPublicKeys.mockResolvedValue([
+        mockGranteeEmergencyAccessWithPublicKey,
+      ]);
+      mockResetPasswordService.getPublicKeys.mockResolvedValue([
+        mockOrganizationUserResetPasswordEntry,
+      ]);
+      const {
+        wasTrustDenied,
+        trustedOrganizationPublicKeys: trustedOrgs,
+        trustedEmergencyAccessUserPublicKeys: trustedEmergencyAccessUsers,
+      } = await keyRotationService.verifyTrust(mockUser);
+      expect(trustedEmergencyAccessUsers).toEqual([]);
+      expect(trustedOrgs).toEqual([]);
+      expect(wasTrustDenied).toBe(true);
+    });
+
+    it("returns empty arrays if account recovery dialog is closed", async () => {
+      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
+      AccountRecoveryTrustComponent.open = initialPromptedOpenTrue;
+      EmergencyAccessTrustComponent.open = initialPromptedOpenFalse;
+      mockEmergencyAccessService.getPublicKeys.mockResolvedValue([
+        mockGranteeEmergencyAccessWithPublicKey,
+      ]);
+      mockResetPasswordService.getPublicKeys.mockResolvedValue([
+        mockOrganizationUserResetPasswordEntry,
+      ]);
+      const {
+        wasTrustDenied,
+        trustedOrganizationPublicKeys: trustedOrgs,
+        trustedEmergencyAccessUserPublicKeys: trustedEmergencyAccessUsers,
+      } = await keyRotationService.verifyTrust(mockUser);
+      expect(trustedEmergencyAccessUsers).toEqual([]);
+      expect(trustedOrgs).toEqual([]);
+      expect(wasTrustDenied).toBe(true);
+    });
+
+    it("returns trusted keys if all dialogs are accepted", async () => {
+      KeyRotationTrustInfoComponent.open = initialPromptedOpenTrue;
+      EmergencyAccessTrustComponent.open = emergencyAccessTrustOpenTrusted;
+      AccountRecoveryTrustComponent.open = accountRecoveryTrustOpenTrusted;
+      mockEmergencyAccessService.getPublicKeys.mockResolvedValue([
+        mockGranteeEmergencyAccessWithPublicKey,
+      ]);
+      mockResetPasswordService.getPublicKeys.mockResolvedValue([
+        mockOrganizationUserResetPasswordEntry,
+      ]);
+      const {
+        wasTrustDenied,
+        trustedOrganizationPublicKeys: trustedOrgs,
+        trustedEmergencyAccessUserPublicKeys: trustedEmergencyAccessUsers,
+      } = await keyRotationService.verifyTrust(mockUser);
+      expect(wasTrustDenied).toBe(false);
+      expect(trustedEmergencyAccessUsers).toEqual([
+        mockGranteeEmergencyAccessWithPublicKey.publicKey,
+      ]);
+      expect(trustedOrgs).toEqual([mockOrganizationUserResetPasswordEntry.publicKey]);
+    });
+  });
+
+  describe("makeNewUserKeyV1", () => {
+    it("throws if old keys is xchacha20poly1305 key", async () => {
+      await expect(
+        keyRotationService.makeNewUserKeyV1(new SymmetricCryptoKey(new Uint8Array(70)) as UserKey),
+      ).rejects.toThrow(
+        "User account crypto format is v2, but the feature flag is disabled. User key rotation cannot proceed.",
+      );
+    });
+    it("returns new user key", async () => {
+      const oldKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const newKey = await keyRotationService.makeNewUserKeyV1(oldKey);
+      expect(newKey).toEqual(new SymmetricCryptoKey(new Uint8Array(64)));
+    });
+  });
+
+  describe("makeNewUserKeyV2", () => {
+    it("returns xchacha20poly1305 key", async () => {
+      const oldKey = new SymmetricCryptoKey(new Uint8Array(70)) as UserKey;
+      const { newUserKey } = await keyRotationService.makeNewUserKeyV2(oldKey);
+      expect(newUserKey).toEqual(new SymmetricCryptoKey(new Uint8Array(70)));
+    });
+    it("returns isUpgrading true if old key is v1", async () => {
+      const oldKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const newKey = await keyRotationService.makeNewUserKeyV2(oldKey);
+      expect(newKey).toEqual({
+        newUserKey: new SymmetricCryptoKey(new Uint8Array(70)),
+        isUpgrading: true,
+      });
+    });
+    it("returns isUpgrading false if old key is v2", async () => {
+      const oldKey = new SymmetricCryptoKey(new Uint8Array(70)) as UserKey;
+      const newKey = await keyRotationService.makeNewUserKeyV2(oldKey);
+      expect(newKey).toEqual({
+        newUserKey: new SymmetricCryptoKey(new Uint8Array(70)),
+        isUpgrading: false,
+      });
+    });
+  });
+
+  describe("getAccountDataRequest", () => {
+    const mockCiphers = [createMockCipher("1", "Cipher 1"), createMockCipher("2", "Cipher 2")];
+    const mockFolders = [createMockFolder("1", "Folder 1"), createMockFolder("2", "Folder 2")];
+    const mockSends = [createMockSend("1", "Send 1"), createMockSend("2", "Send 2")];
+
+    it("returns the account data request", async () => {
+      const initialKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const newKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const userAccount = mockUser;
+
+      mockCipherService.getRotatedData.mockResolvedValue(mockCiphers);
+      mockFolderService.getRotatedData.mockResolvedValue(mockFolders);
+      mockSendService.getRotatedData.mockResolvedValue(mockSends);
+
+      const accountDataRequest = await keyRotationService.getAccountDataRequest(
+        initialKey,
+        newKey,
+        userAccount,
+      );
+      expect(accountDataRequest).toEqual({
+        ciphers: mockCiphers,
+        folders: mockFolders,
+        sends: mockSends,
+      });
+    });
+
+    it("throws if rotated ciphers are null", async () => {
+      const initialKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const newKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const userAccount = mockUser;
+
+      mockCipherService.getRotatedData.mockResolvedValue(null);
+      mockFolderService.getRotatedData.mockResolvedValue(mockFolders);
+      mockSendService.getRotatedData.mockResolvedValue(mockSends);
+
+      await expect(
+        keyRotationService.getAccountDataRequest(initialKey, newKey, userAccount),
+      ).rejects.toThrow();
+    });
+
+    it("throws if rotated folders are null", async () => {
+      const initialKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const newKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const userAccount = mockUser;
+
+      mockCipherService.getRotatedData.mockResolvedValue(mockCiphers);
+      mockFolderService.getRotatedData.mockResolvedValue(null);
+      mockSendService.getRotatedData.mockResolvedValue(mockSends);
+
+      await expect(
+        keyRotationService.getAccountDataRequest(initialKey, newKey, userAccount),
+      ).rejects.toThrow();
+    });
+
+    it("throws if rotated sends are null", async () => {
+      const initialKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const newKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const userAccount = mockUser;
+
+      mockCipherService.getRotatedData.mockResolvedValue(mockCiphers);
+      mockFolderService.getRotatedData.mockResolvedValue(mockFolders);
+      mockSendService.getRotatedData.mockResolvedValue(null);
+
+      await expect(
+        keyRotationService.getAccountDataRequest(initialKey, newKey, userAccount),
+      ).rejects.toThrow();
+    });
+  });
+
+  describe("isV1UserKey", () => {
+    const v1Key = new SymmetricCryptoKey(new Uint8Array(64));
+    const v2Key = new SymmetricCryptoKey(new Uint8Array(70));
+    it("returns true for v1 key", () => {
+      expect(keyRotationService.isV1User(v1Key as UserKey)).toBe(true);
+    });
+    it("returns false for v2 key", () => {
+      expect(keyRotationService.isV1User(v2Key as UserKey)).toBe(false);
+    });
+  });
+});
diff --git a/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts b/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts
index 129d643f677..051c32d97e4 100644
--- a/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts
+++ b/apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts
@@ -1,20 +1,18 @@
 import { Injectable } from "@angular/core";
-import { firstValueFrom } from "rxjs";
+import { firstValueFrom, Observable } from "rxjs";
 
 import { Account } from "@bitwarden/common/auth/abstractions/account.service";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
-import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
-import { MasterPasswordVerification } from "@bitwarden/common/auth/types/verification";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
 import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { HashPurpose } from "@bitwarden/common/platform/enums";
+import { EncryptionType, HashPurpose } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { EncryptedString, EncString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -23,7 +21,7 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
+import { KdfConfig, KdfConfigService, KeyService } from "@bitwarden/key-management";
 import {
   AccountRecoveryTrustComponent,
   EmergencyAccessTrustComponent,
@@ -39,14 +37,19 @@ import { AccountKeysRequest } from "./request/account-keys.request";
 import { MasterPasswordUnlockDataRequest } from "./request/master-password-unlock-data.request";
 import { RotateUserAccountKeysRequest } from "./request/rotate-user-account-keys.request";
 import { UnlockDataRequest } from "./request/unlock-data.request";
-import { UpdateKeyRequest } from "./request/update-key.request";
 import { UserDataRequest } from "./request/userdata.request";
 import { UserKeyRotationApiService } from "./user-key-rotation-api.service";
 
-@Injectable()
+type MasterPasswordAuthenticationAndUnlockData = {
+  masterPassword: string;
+  masterKeySalt: string;
+  masterKeyKdfConfig: KdfConfig;
+  masterPasswordHint: string;
+};
+
+@Injectable({ providedIn: "root" })
 export class UserKeyRotationService {
   constructor(
-    private userVerificationService: UserVerificationService,
     private apiService: UserKeyRotationApiService,
     private cipherService: CipherService,
     private folderService: FolderService,
@@ -64,118 +67,345 @@ export class UserKeyRotationService {
     private i18nService: I18nService,
     private dialogService: DialogService,
     private configService: ConfigService,
+    private cryptoFunctionService: CryptoFunctionService,
+    private kdfConfigService: KdfConfigService,
   ) {}
 
   /**
    * Creates a new user key and re-encrypts all required data with the it.
-   * @param oldMasterPassword: The current master password
+   * @param currentMasterPassword: The current master password
    * @param newMasterPassword: The new master password
    * @param user: The user account
    * @param newMasterPasswordHint: The hint for the new master password
    */
   async rotateUserKeyMasterPasswordAndEncryptedData(
-    oldMasterPassword: string,
+    currentMasterPassword: string,
     newMasterPassword: string,
     user: Account,
     newMasterPasswordHint?: string,
   ): Promise<void> {
-    this.logService.info("[Userkey rotation] Starting user key rotation...");
-    if (!newMasterPassword) {
-      this.logService.info("[Userkey rotation] Invalid master password provided. Aborting!");
-      throw new Error("Invalid master password");
+    this.logService.info("[UserKey Rotation] Starting user key rotation...");
+
+    const upgradeToV2FeatureFlagEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.EnrollAeadOnKeyRotation,
+    );
+
+    // Make sure all conditions match - e.g. account state is up to date
+    await this.ensureIsAllowedToRotateUserKey();
+
+    // First, the provided organizations and emergency access users need to be verified;
+    // this is currently done by providing the user a manual confirmation dialog.
+    const { wasTrustDenied, trustedOrganizationPublicKeys, trustedEmergencyAccessUserPublicKeys } =
+      await this.verifyTrust(user);
+    if (wasTrustDenied) {
+      this.logService.info("[Userkey rotation] Trust was denied by user. Aborting!");
+      return;
     }
 
+    // Read current cryptographic state / settings
+    const masterKeyKdfConfig: KdfConfig = (await this.firstValueFromOrThrow(
+      this.kdfConfigService.getKdfConfig$(user.id),
+      "KDF config",
+    ))!;
+    // The masterkey salt used for deriving the masterkey always needs to be trimmed and lowercased.
+    const masterKeySalt = user.email.trim().toLowerCase();
+    const currentUserKey: UserKey = (await this.firstValueFromOrThrow(
+      this.keyService.userKey$(user.id),
+      "User key",
+    ))!;
+    const currentUserKeyWrappedPrivateKey = new EncString(
+      (await this.firstValueFromOrThrow(
+        this.keyService.userEncryptedPrivateKey$(user.id),
+        "User encrypted private key",
+      ))!,
+    );
+
+    // Update account keys
+    // This creates at least a new user key, and possibly upgrades user encryption formats
+    let newUserKey: UserKey;
+    let wrappedPrivateKey: EncString;
+    let publicKey: string;
+    if (upgradeToV2FeatureFlagEnabled) {
+      this.logService.info("[Userkey rotation] Using v2 account keys");
+      const { userKey, asymmetricEncryptionKeys } = await this.getNewAccountKeysV2(
+        currentUserKey,
+        currentUserKeyWrappedPrivateKey,
+      );
+      newUserKey = userKey;
+      wrappedPrivateKey = asymmetricEncryptionKeys.wrappedPrivateKey;
+      publicKey = asymmetricEncryptionKeys.publicKey;
+    } else {
+      this.logService.info("[Userkey rotation] Using v1 account keys");
+      const { userKey, asymmetricEncryptionKeys } = await this.getNewAccountKeysV1(
+        currentUserKey,
+        currentUserKeyWrappedPrivateKey,
+      );
+      newUserKey = userKey;
+      wrappedPrivateKey = asymmetricEncryptionKeys.wrappedPrivateKey;
+      publicKey = asymmetricEncryptionKeys.publicKey;
+    }
+
+    // Assemble the key rotation request
+    const request = new RotateUserAccountKeysRequest(
+      await this.getAccountUnlockDataRequest(
+        user.id,
+        currentUserKey,
+        newUserKey,
+        {
+          masterPassword: newMasterPassword,
+          masterKeyKdfConfig,
+          masterKeySalt,
+          masterPasswordHint: newMasterPasswordHint,
+        } as MasterPasswordAuthenticationAndUnlockData,
+        trustedEmergencyAccessUserPublicKeys,
+        trustedOrganizationPublicKeys,
+      ),
+      new AccountKeysRequest(wrappedPrivateKey.encryptedString!, publicKey),
+      await this.getAccountDataRequest(currentUserKey, newUserKey, user),
+      await this.makeServerMasterKeyAuthenticationHash(
+        currentMasterPassword,
+        masterKeyKdfConfig,
+        masterKeySalt,
+      ),
+    );
+
+    this.logService.info("[Userkey rotation] Posting user key rotation request to server");
+    await this.apiService.postUserKeyUpdate(request);
+    this.logService.info("[Userkey rotation] Userkey rotation request posted to server");
+
+    this.toastService.showToast({
+      variant: "success",
+      title: this.i18nService.t("rotationCompletedTitle"),
+      message: this.i18nService.t("rotationCompletedDesc"),
+      timeout: 15000,
+    });
+
+    // temporary until userkey can be better verified
+    await this.vaultTimeoutService.logOut();
+  }
+
+  protected async ensureIsAllowedToRotateUserKey(): Promise<void> {
     if ((await this.syncService.getLastSync()) === null) {
       this.logService.info("[Userkey rotation] Client was never synced. Aborting!");
       throw new Error(
         "The local vault is de-synced and the keys cannot be rotated. Please log out and log back in to resolve this issue.",
       );
     }
+  }
 
+  protected async getNewAccountKeysV1(
+    currentUserKey: UserKey,
+    currentUserKeyWrappedPrivateKey: EncString,
+  ): Promise<{
+    userKey: UserKey;
+    asymmetricEncryptionKeys: {
+      wrappedPrivateKey: EncString;
+      publicKey: string;
+    };
+  }> {
+    // Account key rotation creates a new userkey. All downstream data and keys need to be re-encrypted under this key.
+    // Further, this method is used to create new keys in the event that the key hierarchy changes, such as for the
+    // creation of a new signing key pair.
+    const newUserKey = await this.makeNewUserKeyV1(currentUserKey);
+
+    // Re-encrypt the private key with the new user key
+    // Rotation of the private key is not supported yet
+    const privateKey = await this.encryptService.unwrapDecapsulationKey(
+      currentUserKeyWrappedPrivateKey,
+      currentUserKey,
+    );
+    const newUserKeyWrappedPrivateKey = await this.encryptService.wrapDecapsulationKey(
+      privateKey,
+      newUserKey,
+    );
+    const publicKey = await this.cryptoFunctionService.rsaExtractPublicKey(privateKey);
+
+    return {
+      userKey: newUserKey,
+      asymmetricEncryptionKeys: {
+        wrappedPrivateKey: newUserKeyWrappedPrivateKey,
+        publicKey: Utils.fromBufferToB64(publicKey),
+      },
+    };
+  }
+
+  protected async getNewAccountKeysV2(
+    currentUserKey: UserKey,
+    currentUserKeyWrappedPrivateKey: EncString,
+  ): Promise<{
+    userKey: UserKey;
+    asymmetricEncryptionKeys: {
+      wrappedPrivateKey: EncString;
+      publicKey: string;
+    };
+  }> {
+    throw new Error("User encryption v2 upgrade is not supported yet");
+  }
+
+  protected async createMasterPasswordUnlockDataRequest(
+    userKey: UserKey,
+    newUnlockData: MasterPasswordAuthenticationAndUnlockData,
+  ): Promise<MasterPasswordUnlockDataRequest> {
+    // Decryption via stretched-masterkey-wrapped-userkey
+    const newMasterKeyEncryptedUserKey = new EncString(
+      PureCrypto.encrypt_user_key_with_master_password(
+        userKey.toEncoded(),
+        newUnlockData.masterPassword,
+        newUnlockData.masterKeySalt,
+        newUnlockData.masterKeyKdfConfig.toSdkConfig(),
+      ),
+    );
+
+    const newMasterKeyAuthenticationHash = await this.makeServerMasterKeyAuthenticationHash(
+      newUnlockData.masterPassword,
+      newUnlockData.masterKeyKdfConfig,
+      newUnlockData.masterKeySalt,
+    );
+
+    return new MasterPasswordUnlockDataRequest(
+      newUnlockData.masterKeyKdfConfig,
+      newUnlockData.masterKeySalt,
+      newMasterKeyAuthenticationHash,
+      newMasterKeyEncryptedUserKey.encryptedString!,
+      newUnlockData.masterPasswordHint,
+    );
+  }
+
+  protected async getAccountUnlockDataRequest(
+    userId: UserId,
+    currentUserKey: UserKey,
+    newUserKey: UserKey,
+    masterPasswordAuthenticationAndUnlockData: MasterPasswordAuthenticationAndUnlockData,
+    trustedEmergencyAccessGranteesPublicKeys: Uint8Array[],
+    trustedOrganizationPublicKeys: Uint8Array[],
+  ): Promise<UnlockDataRequest> {
+    // To ensure access; all unlock methods need to be updated and provided the new user key.
+    // User unlock methods
+    let masterPasswordUnlockData: MasterPasswordUnlockDataRequest;
+    if (this.isUserWithMasterPassword(userId)) {
+      masterPasswordUnlockData = await this.createMasterPasswordUnlockDataRequest(
+        newUserKey,
+        masterPasswordAuthenticationAndUnlockData,
+      );
+    }
+    const passkeyUnlockData = await this.webauthnLoginAdminService.getRotatedData(
+      currentUserKey,
+      newUserKey,
+      userId,
+    );
+    const trustedDeviceUnlockData = await this.deviceTrustService.getRotatedData(
+      currentUserKey,
+      newUserKey,
+      userId,
+    );
+
+    // Unlock methods that share to a different user / group
+    const emergencyAccessUnlockData = await this.emergencyAccessService.getRotatedData(
+      newUserKey,
+      trustedEmergencyAccessGranteesPublicKeys,
+      userId,
+    );
+    const organizationAccountRecoveryUnlockData = (await this.resetPasswordService.getRotatedData(
+      newUserKey,
+      trustedOrganizationPublicKeys,
+      userId,
+    ))!;
+
+    return new UnlockDataRequest(
+      masterPasswordUnlockData!,
+      emergencyAccessUnlockData,
+      organizationAccountRecoveryUnlockData,
+      passkeyUnlockData,
+      trustedDeviceUnlockData,
+    );
+  }
+
+  protected async verifyTrust(user: Account): Promise<{
+    wasTrustDenied: boolean;
+    trustedOrganizationPublicKeys: Uint8Array[];
+    trustedEmergencyAccessUserPublicKeys: Uint8Array[];
+  }> {
+    // Since currently the joined organizations and emergency access grantees are
+    // not signed, manual trust prompts are required, to verify that the server
+    // does not inject public keys here.
+    //
+    // Once signing is implemented, this is the place to also sign the keys and
+    // upload the signed trust claims.
+    //
+    // The flow works in 3 steps:
+    // 1. Prepare the user by showing them a dialog telling them they'll be asked
+    //    to verify the trust of their organizations and emergency access users.
+    // 2. Show the user a dialog for each organization and ask them to verify the trust.
+    // 3. Show the user a dialog for each emergency access user and ask them to verify the trust.
+
+    this.logService.info("[Userkey rotation] Verifying trust...");
     const emergencyAccessGrantees = await this.emergencyAccessService.getPublicKeys();
-    const orgs = await this.resetPasswordService.getPublicKeys(user.id);
-    if (orgs.length > 0 || emergencyAccessGrantees.length > 0) {
+    const organizations = await this.resetPasswordService.getPublicKeys(user.id);
+
+    if (organizations.length > 0 || emergencyAccessGrantees.length > 0) {
       const trustInfoDialog = KeyRotationTrustInfoComponent.open(this.dialogService, {
         numberOfEmergencyAccessUsers: emergencyAccessGrantees.length,
-        orgName: orgs.length > 0 ? orgs[0].orgName : undefined,
+        orgName: organizations.length > 0 ? organizations[0].orgName : undefined,
       });
-      const result = await firstValueFrom(trustInfoDialog.closed);
-      if (!result) {
-        this.logService.info("[Userkey rotation] Trust info dialog closed. Aborting!");
-        return;
+      if (!(await firstValueFrom(trustInfoDialog.closed))) {
+        return {
+          wasTrustDenied: true,
+          trustedOrganizationPublicKeys: [],
+          trustedEmergencyAccessUserPublicKeys: [],
+        };
       }
     }
 
-    const {
-      masterKey: oldMasterKey,
-      email,
-      kdfConfig,
-    } = await this.userVerificationService.verifyUserByMasterPassword(
-      {
-        type: VerificationType.MasterPassword,
-        secret: oldMasterPassword,
-      },
-      user.id,
-      user.email,
-    );
-
-    const newMasterKey = await this.keyService.makeMasterKey(newMasterPassword, email, kdfConfig);
-
-    let userKeyBytes: Uint8Array;
-    if (await this.configService.getFeatureFlag(FeatureFlag.EnrollAeadOnKeyRotation)) {
-      userKeyBytes = PureCrypto.make_user_key_xchacha20_poly1305();
-    } else {
-      userKeyBytes = PureCrypto.make_user_key_aes256_cbc_hmac();
+    for (const organization of organizations) {
+      const dialogRef = AccountRecoveryTrustComponent.open(this.dialogService, {
+        name: organization.orgName,
+        orgId: organization.orgId,
+        publicKey: organization.publicKey,
+      });
+      if (!(await firstValueFrom(dialogRef.closed))) {
+        return {
+          wasTrustDenied: true,
+          trustedOrganizationPublicKeys: [],
+          trustedEmergencyAccessUserPublicKeys: [],
+        };
+      }
     }
 
-    const newMasterKeyEncryptedUserKey = new EncString(
-      PureCrypto.encrypt_user_key_with_master_password(
-        userKeyBytes,
-        newMasterPassword,
-        email,
-        kdfConfig.toSdkConfig(),
-      ),
-    );
-    const newUnencryptedUserKey = new SymmetricCryptoKey(userKeyBytes) as UserKey;
-
-    if (!newUnencryptedUserKey || !newMasterKeyEncryptedUserKey) {
-      this.logService.info("[Userkey rotation] User key could not be created. Aborting!");
-      throw new Error("User key could not be created");
+    for (const details of emergencyAccessGrantees) {
+      const dialogRef = EmergencyAccessTrustComponent.open(this.dialogService, {
+        name: details.name,
+        userId: details.granteeId,
+        publicKey: details.publicKey,
+      });
+      if (!(await firstValueFrom(dialogRef.closed))) {
+        return {
+          wasTrustDenied: true,
+          trustedOrganizationPublicKeys: [],
+          trustedEmergencyAccessUserPublicKeys: [],
+        };
+      }
     }
 
-    const newMasterKeyAuthenticationHash = await this.keyService.hashMasterKey(
-      newMasterPassword,
-      newMasterKey,
-      HashPurpose.ServerAuthorization,
-    );
-    const masterPasswordUnlockData = new MasterPasswordUnlockDataRequest(
-      kdfConfig,
-      email,
-      newMasterKeyAuthenticationHash,
-      newMasterKeyEncryptedUserKey.encryptedString!,
-      newMasterPasswordHint,
+    this.logService.info(
+      "[Userkey rotation] Trust verified for all organizations and emergency access users",
     );
+    return {
+      wasTrustDenied: false,
+      trustedOrganizationPublicKeys: organizations.map((d) => d.publicKey),
+      trustedEmergencyAccessUserPublicKeys: emergencyAccessGrantees.map((d) => d.publicKey),
+    };
+  }
 
-    const keyPair = await firstValueFrom(this.keyService.userEncryptionKeyPair$(user.id));
-    if (keyPair == null) {
-      this.logService.info("[Userkey rotation] Key pair is null. Aborting!");
-      throw new Error("Key pair is null");
-    }
-    const { privateKey, publicKey } = keyPair;
-
-    const accountKeysRequest = new AccountKeysRequest(
-      (
-        await this.encryptService.wrapDecapsulationKey(privateKey, newUnencryptedUserKey)
-      ).encryptedString!,
-      Utils.fromBufferToB64(publicKey),
-    );
-
-    const originalUserKey = await firstValueFrom(this.keyService.userKey$(user.id));
-    if (originalUserKey == null) {
-      this.logService.info("[Userkey rotation] Userkey is null. Aborting!");
-      throw new Error("Userkey key is null");
-    }
+  protected async getAccountDataRequest(
+    originalUserKey: UserKey,
+    newUnencryptedUserKey: UserKey,
+    user: Account,
+  ): Promise<UserDataRequest> {
+    // Account data is any data owned by the user; this is folders, ciphers (and their attachments), and sends.
 
+    // Currently, ciphers, folders and sends are directly encrypted with the user key. This means
+    // that they need to be re-encrypted and re-uploaded. In the future, content-encryption keys
+    // (such as cipher keys) will make it so only re-encrypted keys are required.
     const rotatedCiphers = await this.cipherService.getRotatedData(
       originalUserKey,
       newUnencryptedUserKey,
@@ -195,259 +425,102 @@ export class UserKeyRotationService {
       this.logService.info("[Userkey rotation] ciphers, folders, or sends are null. Aborting!");
       throw new Error("ciphers, folders, or sends are null");
     }
-    const accountDataRequest = new UserDataRequest(rotatedCiphers, rotatedFolders, rotatedSends);
+    return new UserDataRequest(rotatedCiphers, rotatedFolders, rotatedSends);
+  }
 
-    for (const details of emergencyAccessGrantees) {
-      this.logService.info("[Userkey rotation] Emergency access grantee: " + details.name);
+  protected async makeNewUserKeyV1(oldUserKey: UserKey): Promise<UserKey> {
+    // The user's account format is determined by the user key.
+    // Being tied to the userkey ensures an all-or-nothing approach. A compromised
+    // server cannot downgrade to a previous format (no signing keys) without
+    // completely making the account unusable.
+    //
+    // V0: AES256-CBC (no userkey, directly using masterkey) (pre-2019 accounts)
+    //     This format is unsupported, and not secure; It is being forced migrated, and being removed
+    // V1: AES256-CBC-HMAC userkey, no signing key (2019-2025)
+    //     This format is still supported, but may be migrated in the future
+    // V2: XChaCha20-Poly1305 userkey, signing key, account security version
+    //     This is the new, modern format.
+    if (this.isV1User(oldUserKey)) {
       this.logService.info(
-        "[Userkey rotation] Emergency access grantee fingerprint: " +
-          (await this.keyService.getFingerprint(details.granteeId, details.publicKey)).join("-"),
+        "[Userkey rotation] Existing userkey key is AES256-CBC-HMAC; not upgrading",
+      );
+      return new SymmetricCryptoKey(PureCrypto.make_user_key_aes256_cbc_hmac()) as UserKey;
+    } else {
+      // If the feature flag is rolled back, we want to block rotation in order to be as safe as possible with the user's account.
+      this.logService.info(
+        "[Userkey rotation] Existing userkey key is XChaCha20-Poly1305, but feature flag is not enabled; aborting..",
+      );
+      throw new Error(
+        "User account crypto format is v2, but the feature flag is disabled. User key rotation cannot proceed.",
       );
-
-      const dialogRef = EmergencyAccessTrustComponent.open(this.dialogService, {
-        name: details.name,
-        userId: details.granteeId,
-        publicKey: details.publicKey,
-      });
-      const result = await firstValueFrom(dialogRef.closed);
-      if (result === true) {
-        this.logService.info("[Userkey rotation] Emergency access grantee confirmed");
-      } else {
-        this.logService.info("[Userkey rotation] Emergency access grantee not confirmed");
-        return;
-      }
     }
-    const trustedUserPublicKeys = emergencyAccessGrantees.map((d) => d.publicKey);
+  }
 
-    const emergencyAccessUnlockData = await this.emergencyAccessService.getRotatedData(
-      newUnencryptedUserKey,
-      trustedUserPublicKeys,
-      user.id,
-    );
-
-    for (const organization of orgs) {
+  protected async makeNewUserKeyV2(
+    oldUserKey: UserKey,
+  ): Promise<{ isUpgrading: boolean; newUserKey: UserKey }> {
+    // The user's account format is determined by the user key.
+    // Being tied to the userkey ensures an all-or-nothing approach. A compromised
+    // server cannot downgrade to a previous format (no signing keys) without
+    // completely making the account unusable.
+    //
+    // V0: AES256-CBC (no userkey, directly using masterkey) (pre-2019 accounts)
+    //     This format is unsupported, and not secure; It is being forced migrated, and being removed
+    // V1: AES256-CBC-HMAC userkey, no signing key (2019-2025)
+    //     This format is still supported, but may be migrated in the future
+    // V2: XChaCha20-Poly1305 userkey, signing key, account security version
+    //     This is the new, modern format.
+    const newUserKey: UserKey = new SymmetricCryptoKey(
+      PureCrypto.make_user_key_xchacha20_poly1305(),
+    ) as UserKey;
+    const isUpgrading = this.isV1User(oldUserKey);
+    if (isUpgrading) {
       this.logService.info(
-        "[Userkey rotation] Reset password organization: " + organization.orgName,
+        "[Userkey rotation] Existing userkey key is AES256-CBC-HMAC; upgrading to XChaCha20-Poly1305",
       );
+    } else {
       this.logService.info(
-        "[Userkey rotation] Trusted organization public key: " + organization.publicKey,
+        "[Userkey rotation] Existing userkey key is XChaCha20-Poly1305; no upgrade needed",
       );
-      const fingerprint = await this.keyService.getFingerprint(
-        organization.orgId,
-        organization.publicKey,
-      );
-      this.logService.info(
-        "[Userkey rotation] Trusted organization fingerprint: " + fingerprint.join("-"),
-      );
-
-      const dialogRef = AccountRecoveryTrustComponent.open(this.dialogService, {
-        name: organization.orgName,
-        orgId: organization.orgId,
-        publicKey: organization.publicKey,
-      });
-      const result = await firstValueFrom(dialogRef.closed);
-      if (result === true) {
-        this.logService.info("[Userkey rotation] Organization trusted");
-      } else {
-        this.logService.info("[Userkey rotation] Organization not trusted");
-        return;
-      }
     }
-    const trustedOrgPublicKeys = orgs.map((d) => d.publicKey);
-    // Note: Reset password keys request model has user verification
-    // properties, but the rotation endpoint uses its own MP hash.
-    const organizationAccountRecoveryUnlockData = (await this.resetPasswordService.getRotatedData(
-      newUnencryptedUserKey,
-      trustedOrgPublicKeys,
-      user.id,
-    ))!;
-    const passkeyUnlockData = await this.webauthnLoginAdminService.getRotatedData(
-      originalUserKey,
-      newUnencryptedUserKey,
-      user.id,
-    );
-
-    const trustedDeviceUnlockData = await this.deviceTrustService.getRotatedData(
-      originalUserKey,
-      newUnencryptedUserKey,
-      user.id,
-    );
-
-    const unlockDataRequest = new UnlockDataRequest(
-      masterPasswordUnlockData,
-      emergencyAccessUnlockData,
-      organizationAccountRecoveryUnlockData,
-      passkeyUnlockData,
-      trustedDeviceUnlockData,
-    );
-
-    const request = new RotateUserAccountKeysRequest(
-      unlockDataRequest,
-      accountKeysRequest,
-      accountDataRequest,
-      await this.keyService.hashMasterKey(oldMasterPassword, oldMasterKey),
-    );
-
-    this.logService.info("[Userkey rotation] Posting user key rotation request to server");
-    await this.apiService.postUserKeyUpdateV2(request);
-    this.logService.info("[Userkey rotation] Userkey rotation request posted to server");
-
-    this.toastService.showToast({
-      variant: "success",
-      title: this.i18nService.t("rotationCompletedTitle"),
-      message: this.i18nService.t("rotationCompletedDesc"),
-      timeout: 15000,
-    });
-
-    // temporary until userkey can be better verified
-    await this.vaultTimeoutService.logOut();
+    return { isUpgrading, newUserKey };
   }
 
   /**
-   * Creates a new user key and re-encrypts all required data with the it.
-   * @param masterPassword current master password (used for validation)
-   * @deprecated
+   * A V1 user has no signing key, and uses AES256-CBC-HMAC.
+   * A V2 user has a signing key, and uses XChaCha20-Poly1305.
    */
-  async rotateUserKeyAndEncryptedDataLegacy(masterPassword: string, user: Account): Promise<void> {
-    this.logService.info("[Userkey rotation] Starting legacy user key rotation...");
-    if (!masterPassword) {
-      this.logService.info("[Userkey rotation] Invalid master password provided. Aborting!");
-      throw new Error("Invalid master password");
-    }
-
-    if ((await this.syncService.getLastSync()) === null) {
-      this.logService.info("[Userkey rotation] Client was never synced. Aborting!");
-      throw new Error(
-        "The local vault is de-synced and the keys cannot be rotated. Please log out and log back in to resolve this issue.",
-      );
-    }
-
-    const emergencyAccessGrantees = await this.emergencyAccessService.getPublicKeys();
-    const orgs = await this.resetPasswordService.getPublicKeys(user.id);
-
-    // Verify master password
-    // UV service sets master key on success since it is stored in memory and can be lost on refresh
-    const verification = {
-      type: VerificationType.MasterPassword,
-      secret: masterPassword,
-    } as MasterPasswordVerification;
-
-    const { masterKey } = await this.userVerificationService.verifyUserByMasterPassword(
-      verification,
-      user.id,
-      user.email,
-    );
-
-    const [newUserKey, newEncUserKey] = await this.keyService.makeUserKey(masterKey);
-
-    if (newUserKey == null || newEncUserKey == null || newEncUserKey.encryptedString == null) {
-      this.logService.info("[Userkey rotation] User key could not be created. Aborting!");
-      throw new Error("User key could not be created");
-    }
-
-    // New user key
-    const key = newEncUserKey.encryptedString;
-
-    // Add master key hash
-    const masterPasswordHash = await this.keyService.hashMasterKey(masterPassword, masterKey);
-
-    // Get original user key
-    // Note: We distribute the legacy key, but not all domains actually use it. If any of those
-    // domains break their legacy support it will break the migration process for legacy users.
-    const originalUserKey = await this.keyService.getUserKeyWithLegacySupport(user.id);
-    const isMasterKey =
-      (await firstValueFrom(this.keyService.userKey$(user.id))) != originalUserKey;
-    this.logService.info("[Userkey rotation] Is legacy user: " + isMasterKey);
-
-    // Add re-encrypted data
-    const privateKey = await this.encryptPrivateKey(newUserKey, user.id);
-    if (privateKey == null) {
-      this.logService.info("[Userkey rotation] Private key could not be encrypted. Aborting!");
-      throw new Error("Private key could not be encrypted");
-    }
-
-    // Create new request
-    const request = new UpdateKeyRequest(masterPasswordHash, key, privateKey);
-
-    const rotatedCiphers = await this.cipherService.getRotatedData(
-      originalUserKey,
-      newUserKey,
-      user.id,
-    );
-    if (rotatedCiphers != null) {
-      request.ciphers = rotatedCiphers;
-    }
-
-    const rotatedFolders = await this.folderService.getRotatedData(
-      originalUserKey,
-      newUserKey,
-      user.id,
-    );
-    if (rotatedFolders != null) {
-      request.folders = rotatedFolders;
-    }
-
-    const rotatedSends = await this.sendService.getRotatedData(
-      originalUserKey,
-      newUserKey,
-      user.id,
-    );
-    if (rotatedSends != null) {
-      request.sends = rotatedSends;
-    }
-
-    const trustedUserPublicKeys = emergencyAccessGrantees.map((d) => d.publicKey);
-    const rotatedEmergencyAccessKeys = await this.emergencyAccessService.getRotatedData(
-      newUserKey,
-      trustedUserPublicKeys,
-      user.id,
-    );
-    if (rotatedEmergencyAccessKeys != null) {
-      request.emergencyAccessKeys = rotatedEmergencyAccessKeys;
-    }
-
-    const trustedOrgPublicKeys = orgs.map((d) => d.publicKey);
-    // Note: Reset password keys request model has user verification
-    // properties, but the rotation endpoint uses its own MP hash.
-    const rotatedResetPasswordKeys = await this.resetPasswordService.getRotatedData(
-      originalUserKey,
-      trustedOrgPublicKeys,
-      user.id,
-    );
-    if (rotatedResetPasswordKeys != null) {
-      request.resetPasswordKeys = rotatedResetPasswordKeys;
-    }
-
-    const rotatedWebauthnKeys = await this.webauthnLoginAdminService.getRotatedData(
-      originalUserKey,
-      newUserKey,
-      user.id,
-    );
-    if (rotatedWebauthnKeys != null) {
-      request.webauthnKeys = rotatedWebauthnKeys;
-    }
-
-    this.logService.info("[Userkey rotation] Posting user key rotation request to server");
-    await this.apiService.postUserKeyUpdate(request);
-    this.logService.info("[Userkey rotation] Userkey rotation request posted to server");
-
-    // TODO PM-2199: Add device trust rotation support to the user key rotation endpoint
-    this.logService.info("[Userkey rotation] Rotating device trust...");
-    await this.deviceTrustService.rotateDevicesTrust(user.id, newUserKey, masterPasswordHash);
-    this.logService.info("[Userkey rotation] Device trust rotation completed");
-    await this.vaultTimeoutService.logOut();
+  protected isV1User(userKey: UserKey): boolean {
+    return userKey.inner().type === EncryptionType.AesCbc256_HmacSha256_B64;
   }
 
-  private async encryptPrivateKey(
-    newUserKey: UserKey,
-    userId: UserId,
-  ): Promise<EncryptedString | undefined> {
-    const privateKey = await firstValueFrom(
-      this.keyService.userPrivateKeyWithLegacySupport$(userId),
+  protected isUserWithMasterPassword(id: UserId): boolean {
+    // Currently, key rotation can only be activated when the user has a master password.
+    return true;
+  }
+
+  protected async makeServerMasterKeyAuthenticationHash(
+    masterPassword: string,
+    masterKeyKdfConfig: KdfConfig,
+    masterKeySalt: string,
+  ): Promise<string> {
+    const masterKey = await this.keyService.makeMasterKey(
+      masterPassword,
+      masterKeySalt,
+      masterKeyKdfConfig,
     );
-    if (privateKey == null) {
-      throw new Error("No private key found for user key rotation");
+    return this.keyService.hashMasterKey(
+      masterPassword,
+      masterKey,
+      HashPurpose.ServerAuthorization,
+    );
+  }
+
+  async firstValueFromOrThrow<T>(value: Observable<T>, name: string): Promise<T> {
+    const result = await firstValueFrom(value);
+    if (result == null) {
+      throw new Error(`Failed to get ${name}`);
     }
-    return (await this.encryptService.wrapDecapsulationKey(privateKey, newUserKey)).encryptedString;
+    return result;
   }
 }
diff --git a/apps/web/src/app/key-management/migrate-encryption/migrate-legacy-encryption.component.html b/apps/web/src/app/key-management/migrate-encryption/migrate-legacy-encryption.component.html
deleted file mode 100644
index 7ed1efeb461..00000000000
--- a/apps/web/src/app/key-management/migrate-encryption/migrate-legacy-encryption.component.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<form [formGroup]="formGroup" [bitSubmit]="submit">
-  <div class="tw-mt-12 tw-flex tw-justify-center">
-    <div class="tw-max-w-xl">
-      <h1 bitTypography="h1" class="tw-mb-4 tw-text-center">{{ "updateEncryptionKey" | i18n }}</h1>
-      <div
-        class="tw-block tw-rounded tw-border tw-border-solid tw-border-secondary-300 tw-bg-background tw-p-8"
-      >
-        <p>
-          {{ "updateEncryptionSchemeDesc" | i18n }}
-          <a
-            href="https://bitwarden.com/help/account-encryption-key/#rotate-your-encryption-key"
-            target="_blank"
-            rel="noreferrer"
-            >{{ "learnMore" | i18n }}</a
-          >
-        </p>
-        <bit-callout type="warning">{{ "updateEncryptionKeyWarning" | i18n }}</bit-callout>
-
-        <bit-form-field>
-          <bit-label>{{ "masterPass" | i18n }}</bit-label>
-          <input
-            id="masterPassword"
-            bitInput
-            type="password"
-            formControlName="masterPassword"
-            appAutofocus
-          />
-          <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
-        </bit-form-field>
-        <button type="submit" bitButton bitFormButton buttonType="primary" block>
-          {{ "updateEncryptionKey" | i18n }}
-        </button>
-      </div>
-    </div>
-  </div>
-</form>
diff --git a/apps/web/src/app/key-management/migrate-encryption/migrate-legacy-encryption.component.ts b/apps/web/src/app/key-management/migrate-encryption/migrate-legacy-encryption.component.ts
deleted file mode 100644
index 62456d96401..00000000000
--- a/apps/web/src/app/key-management/migrate-encryption/migrate-legacy-encryption.component.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { Component } from "@angular/core";
-import { FormControl, FormGroup, Validators } from "@angular/forms";
-import { firstValueFrom } from "rxjs";
-
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
-import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { DialogService, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
-
-import { SharedModule } from "../../shared";
-import { UserKeyRotationModule } from "../key-rotation/user-key-rotation.module";
-import { UserKeyRotationService } from "../key-rotation/user-key-rotation.service";
-
-// The master key was originally used to encrypt user data, before the user key was introduced.
-// This component is used to migrate from the old encryption scheme to the new one.
-@Component({
-  standalone: true,
-  imports: [SharedModule, UserKeyRotationModule],
-  templateUrl: "migrate-legacy-encryption.component.html",
-})
-export class MigrateFromLegacyEncryptionComponent {
-  protected formGroup = new FormGroup({
-    masterPassword: new FormControl("", [Validators.required]),
-  });
-
-  constructor(
-    private accountService: AccountService,
-    private keyRotationService: UserKeyRotationService,
-    private i18nService: I18nService,
-    private keyService: KeyService,
-    private messagingService: MessagingService,
-    private logService: LogService,
-    private syncService: SyncService,
-    private toastService: ToastService,
-    private dialogService: DialogService,
-    private folderApiService: FolderApiServiceAbstraction,
-  ) {}
-
-  submit = async () => {
-    this.formGroup.markAsTouched();
-
-    if (this.formGroup.invalid) {
-      return;
-    }
-
-    const activeUser = await firstValueFrom(this.accountService.activeAccount$);
-    if (activeUser == null) {
-      throw new Error("No active user.");
-    }
-
-    const hasUserKey = await this.keyService.hasUserKey(activeUser.id);
-    if (hasUserKey) {
-      this.messagingService.send("logout");
-      throw new Error("User key already exists, cannot migrate legacy encryption.");
-    }
-
-    const masterPassword = this.formGroup.value.masterPassword!;
-
-    try {
-      await this.syncService.fullSync(false, true);
-
-      await this.keyRotationService.rotateUserKeyAndEncryptedDataLegacy(masterPassword, activeUser);
-
-      this.toastService.showToast({
-        variant: "success",
-        title: this.i18nService.t("keyUpdated"),
-        message: this.i18nService.t("logBackInOthersToo"),
-        timeout: 15000,
-      });
-      this.messagingService.send("logout");
-    } catch (e) {
-      // If the error is due to missing folders, we can delete all folders and try again
-      if (
-        e instanceof ErrorResponse &&
-        e.message === "All existing folders must be included in the rotation."
-      ) {
-        const deleteFolders = await this.dialogService.openSimpleDialog({
-          type: "warning",
-          title: { key: "encryptionKeyUpdateCannotProceed" },
-          content: { key: "keyUpdateFoldersFailed" },
-          acceptButtonText: { key: "ok" },
-          cancelButtonText: { key: "cancel" },
-        });
-
-        if (deleteFolders) {
-          await this.folderApiService.deleteAll(activeUser.id);
-          await this.syncService.fullSync(true, true);
-          await this.submit();
-          return;
-        }
-      }
-      this.logService.error(e);
-      throw e;
-    }
-  };
-}
diff --git a/apps/web/src/app/layouts/frontend-layout.component.ts b/apps/web/src/app/layouts/frontend-layout.component.ts
index 5ccb39b1dc9..a91fc92df61 100644
--- a/apps/web/src/app/layouts/frontend-layout.component.ts
+++ b/apps/web/src/app/layouts/frontend-layout.component.ts
@@ -10,7 +10,6 @@ import { SharedModule } from "../shared";
 @Component({
   selector: "app-frontend-layout",
   templateUrl: "frontend-layout.component.html",
-  standalone: true,
   imports: [SharedModule, EnvironmentSelectorComponent],
 })
 export class FrontendLayoutComponent implements OnInit, OnDestroy {
diff --git a/apps/web/src/app/layouts/header/web-header.stories.ts b/apps/web/src/app/layouts/header/web-header.stories.ts
index 571e78aab59..9715dbf8cd3 100644
--- a/apps/web/src/app/layouts/header/web-header.stories.ts
+++ b/apps/web/src/app/layouts/header/web-header.stories.ts
@@ -49,13 +49,13 @@ class MockStateService {
 @Component({
   selector: "product-switcher",
   template: `<button type="button" bitIconButton="bwi-filter"></button>`,
+  standalone: false,
 })
 class MockProductSwitcher {}
 
 @Component({
   selector: "dynamic-avatar",
   template: `<bit-avatar [text]="name$ | async"></bit-avatar>`,
-  standalone: true,
   imports: [CommonModule, AvatarModule],
 })
 class MockDynamicAvatar implements Partial<DynamicAvatarComponent> {
diff --git a/apps/web/src/app/layouts/org-switcher/org-switcher.component.ts b/apps/web/src/app/layouts/org-switcher/org-switcher.component.ts
index d64e1b817c1..4f2707cd1b2 100644
--- a/apps/web/src/app/layouts/org-switcher/org-switcher.component.ts
+++ b/apps/web/src/app/layouts/org-switcher/org-switcher.component.ts
@@ -17,7 +17,6 @@ import { TrialFlowService } from "./../../billing/services/trial-flow.service";
 @Component({
   selector: "org-switcher",
   templateUrl: "org-switcher.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, NavigationModule],
 })
 export class OrgSwitcherComponent {
diff --git a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.html b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.html
index 08195d95bf9..f8ebfa60451 100644
--- a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.html
+++ b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.html
@@ -16,43 +16,45 @@
     >
       <span class="tw-text-xs !tw-text-alt2 tw-p-2 tw-pb-0">{{ "moreFromBitwarden" | i18n }}</span>
       <ng-container *ngFor="let more of moreProducts">
-        <!-- <a> for when the marketing route is external -->
-        <a
-          *ngIf="more.marketingRoute.external"
-          [href]="more.marketingRoute.route"
-          target="_blank"
-          rel="noreferrer"
-          class="tw-flex tw-py-2 tw-px-4 tw-font-semibold !tw-text-alt2 !tw-no-underline hover:tw-bg-primary-300/60 [&>:not(.bwi)]:hover:tw-underline"
-        >
-          <i class="bwi bwi-fw {{ more.icon }} tw-mt-1 tw-mx-1"></i>
-          <div>
-            {{ more.otherProductOverrides?.name ?? more.name }}
-            <div
-              *ngIf="more.otherProductOverrides?.supportingText"
-              class="tw-text-xs tw-font-normal"
-            >
-              {{ more.otherProductOverrides.supportingText }}
+        <div class="tw-ps-2 tw-pe-2">
+          <!-- <a> for when the marketing route is external -->
+          <a
+            *ngIf="more.marketingRoute.external"
+            [href]="more.marketingRoute.route"
+            target="_blank"
+            rel="noreferrer"
+            class="tw-flex tw-px-3 tw-py-2 tw-rounded-md tw-font-bold !tw-text-alt2 !tw-no-underline hover:tw-bg-hover-contrast [&>:not(.bwi)]:hover:tw-underline"
+          >
+            <i class="bwi bwi-fw {{ more.icon }} tw-mt-1 tw-mx-1"></i>
+            <div>
+              {{ more.otherProductOverrides?.name ?? more.name }}
+              <div
+                *ngIf="more.otherProductOverrides?.supportingText"
+                class="tw-text-xs tw-font-normal"
+              >
+                {{ more.otherProductOverrides.supportingText }}
+              </div>
             </div>
-          </div>
-        </a>
-        <!-- <a> for when the marketing route is internal, it needs to use [routerLink] instead of [href] like the external <a> uses. -->
-        <a
-          *ngIf="!more.marketingRoute.external"
-          [routerLink]="more.marketingRoute.route"
-          rel="noreferrer"
-          class="tw-flex tw-py-2 tw-px-4 tw-font-semibold !tw-text-alt2 !tw-no-underline hover:tw-bg-primary-300/60 [&>:not(.bwi)]:hover:tw-underline"
-        >
-          <i class="bwi bwi-fw {{ more.icon }} tw-mt-1 tw-mx-1"></i>
-          <div>
-            {{ more.otherProductOverrides?.name ?? more.name }}
-            <div
-              *ngIf="more.otherProductOverrides?.supportingText"
-              class="tw-text-xs tw-font-normal"
-            >
-              {{ more.otherProductOverrides.supportingText }}
+          </a>
+          <!-- <a> for when the marketing route is internal, it needs to use [routerLink] instead of [href] like the external <a> uses. -->
+          <a
+            *ngIf="!more.marketingRoute.external"
+            [routerLink]="more.marketingRoute.route"
+            rel="noreferrer"
+            class="tw-flex tw-px-3 tw-py-2 tw-rounded-md tw-font-bold !tw-text-alt2 !tw-no-underline hover:tw-bg-hover-contrast [&>:not(.bwi)]:hover:tw-underline"
+          >
+            <i class="bwi bwi-fw {{ more.icon }} tw-mt-1 tw-mx-1"></i>
+            <div>
+              {{ more.otherProductOverrides?.name ?? more.name }}
+              <div
+                *ngIf="more.otherProductOverrides?.supportingText"
+                class="tw-text-xs tw-font-normal"
+              >
+                {{ more.otherProductOverrides.supportingText }}
+              </div>
             </div>
-          </div>
-        </a>
+          </a>
+        </div>
       </ng-container>
     </section>
   </ng-container>
diff --git a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts
index 0ecec9d8944..f0660f7d655 100644
--- a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts
+++ b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts
@@ -3,7 +3,6 @@ import { RouterModule } from "@angular/router";
 import { applicationConfig, Meta, moduleMetadata, StoryObj } from "@storybook/angular";
 import { BehaviorSubject, firstValueFrom, Observable, of } from "rxjs";
 
-import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
@@ -18,6 +17,7 @@ import { LayoutComponent, NavigationModule } from "@bitwarden/components";
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { I18nMockService } from "@bitwarden/components/src/utils/i18n-mock.service";
+import { I18nPipe } from "@bitwarden/ui-common";
 
 import { ProductSwitcherService } from "../shared/product-switcher.service";
 
@@ -109,9 +109,8 @@ export default {
         MockProviderService,
         StoryLayoutComponent,
         StoryContentComponent,
-        I18nPipe,
       ],
-      imports: [NavigationModule, RouterModule, LayoutComponent],
+      imports: [NavigationModule, RouterModule, LayoutComponent, I18nPipe],
       providers: [
         { provide: OrganizationService, useClass: MockOrganizationService },
         { provide: AccountService, useClass: MockAccountService },
@@ -119,12 +118,6 @@ export default {
         { provide: SyncService, useClass: MockSyncService },
         { provide: PlatformUtilsService, useClass: MockPlatformUtilsService },
         ProductSwitcherService,
-        {
-          provide: I18nPipe,
-          useFactory: () => ({
-            transform: (key: string) => translations[key],
-          }),
-        },
         {
           provide: I18nService,
           useFactory: () => {
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher.module.ts b/apps/web/src/app/layouts/product-switcher/product-switcher.module.ts
index d43bca1c0b9..b78b1ce6b96 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher.module.ts
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher.module.ts
@@ -2,8 +2,8 @@ import { A11yModule } from "@angular/cdk/a11y";
 import { NgModule } from "@angular/core";
 import { RouterModule } from "@angular/router";
 
-import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { NavigationModule } from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
 
 import { SharedModule } from "../../shared";
 
@@ -12,13 +12,12 @@ import { ProductSwitcherContentComponent } from "./product-switcher-content.comp
 import { ProductSwitcherComponent } from "./product-switcher.component";
 
 @NgModule({
-  imports: [SharedModule, A11yModule, RouterModule, NavigationModule],
+  imports: [SharedModule, A11yModule, RouterModule, NavigationModule, I18nPipe],
   declarations: [
     ProductSwitcherComponent,
     ProductSwitcherContentComponent,
     NavigationProductSwitcherComponent,
   ],
   exports: [ProductSwitcherComponent, NavigationProductSwitcherComponent],
-  providers: [I18nPipe],
 })
 export class ProductSwitcherModule {}
diff --git a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts
index 4abd85d7991..f72557ac57f 100644
--- a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts
+++ b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts
@@ -5,13 +5,13 @@ import { ActivatedRoute, Router, convertToParamMap } from "@angular/router";
 import { mock, MockProxy } from "jest-mock-extended";
 import { Observable, firstValueFrom, of } from "rxjs";
 
-import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SyncService } from "@bitwarden/common/platform/sync";
@@ -70,9 +70,9 @@ describe("ProductSwitcherService", () => {
           },
         },
         {
-          provide: I18nPipe,
+          provide: I18nService,
           useValue: {
-            transform: (key: string) => key,
+            t: (id: string, p1?: string | number, p2?: string | number, p3?: string | number) => id,
           },
         },
         {
diff --git a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts
index 53ec3b0840f..2d296ac7d62 100644
--- a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts
+++ b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts
@@ -14,7 +14,6 @@ import {
   switchMap,
 } from "rxjs";
 
-import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import {
   canAccessOrgAdmin,
   OrganizationService,
@@ -25,6 +24,7 @@ import { PolicyType, ProviderType } from "@bitwarden/common/admin-console/enums"
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
 
@@ -103,11 +103,11 @@ export class ProductSwitcherService {
     private providerService: ProviderService,
     private route: ActivatedRoute,
     private router: Router,
-    private i18n: I18nPipe,
     private syncService: SyncService,
     private accountService: AccountService,
     private platformUtilsService: PlatformUtilsService,
     private policyService: PolicyService,
+    private i18nService: I18nService,
   ) {
     this.pollUntilSynced();
   }
@@ -197,7 +197,7 @@ export class ProductSwitcherService {
           },
           isActive: this.router.url.includes("/sm/"),
           otherProductOverrides: {
-            supportingText: this.i18n.transform("secureYourInfrastructure"),
+            supportingText: this.i18nService.t("secureYourInfrastructure"),
           },
         },
         ac: {
@@ -222,7 +222,7 @@ export class ProductSwitcherService {
           marketingRoute: orgsMarketingRoute,
           otherProductOverrides: {
             name: "Share your passwords",
-            supportingText: this.i18n.transform("protectYourFamilyOrBusiness"),
+            supportingText: this.i18nService.t("protectYourFamilyOrBusiness"),
           },
         },
       } satisfies Record<string, ProductSwitcherItem>;
diff --git a/apps/web/src/app/layouts/toggle-width.component.ts b/apps/web/src/app/layouts/toggle-width.component.ts
index 36f33c6accf..411fc73b175 100644
--- a/apps/web/src/app/layouts/toggle-width.component.ts
+++ b/apps/web/src/app/layouts/toggle-width.component.ts
@@ -12,7 +12,6 @@ import { NavigationModule } from "@bitwarden/components";
     *ngIf="isDev"
     (click)="toggleWidth()"
   ></bit-nav-item>`,
-  standalone: true,
   imports: [CommonModule, NavigationModule],
 })
 export class ToggleWidthComponent {
diff --git a/apps/web/src/app/layouts/user-layout.component.ts b/apps/web/src/app/layouts/user-layout.component.ts
index e859993af32..db4c181cd0f 100644
--- a/apps/web/src/app/layouts/user-layout.component.ts
+++ b/apps/web/src/app/layouts/user-layout.component.ts
@@ -9,17 +9,15 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
-import { IconModule } from "@bitwarden/components";
+import { IconModule, PasswordManagerLogo } from "@bitwarden/components";
 
 import { BillingFreeFamiliesNavItemComponent } from "../billing/shared/billing-free-families-nav-item.component";
 
-import { PasswordManagerLogo } from "./password-manager-logo";
 import { WebLayoutModule } from "./web-layout.module";
 
 @Component({
   selector: "app-user-layout",
   templateUrl: "user-layout.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     RouterModule,
diff --git a/apps/web/src/app/layouts/web-layout.component.ts b/apps/web/src/app/layouts/web-layout.component.ts
index aa4de4cfee5..2d2635fd296 100644
--- a/apps/web/src/app/layouts/web-layout.component.ts
+++ b/apps/web/src/app/layouts/web-layout.component.ts
@@ -8,7 +8,6 @@ import { ProductSwitcherModule } from "./product-switcher/product-switcher.modul
 @Component({
   selector: "app-layout",
   templateUrl: "web-layout.component.html",
-  standalone: true,
   imports: [CommonModule, LayoutComponent, ProductSwitcherModule],
 })
 export class WebLayoutComponent {
diff --git a/apps/web/src/app/layouts/web-side-nav.component.ts b/apps/web/src/app/layouts/web-side-nav.component.ts
index 28b04e87461..364b3bedecc 100644
--- a/apps/web/src/app/layouts/web-side-nav.component.ts
+++ b/apps/web/src/app/layouts/web-side-nav.component.ts
@@ -9,7 +9,6 @@ import { ToggleWidthComponent } from "./toggle-width.component";
 @Component({
   selector: "app-side-nav",
   templateUrl: "web-side-nav.component.html",
-  standalone: true,
   imports: [CommonModule, NavigationModule, ProductSwitcherModule, ToggleWidthComponent],
 })
 export class WebSideNavComponent {
diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index 0d6ffb88ad6..d3e7fc495ca 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -10,9 +10,10 @@ import {
   unauthGuardFn,
   activeAuthGuard,
 } from "@bitwarden/angular/auth/guards";
+import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-management/change-password";
+import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.component";
+import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import {
-  AnonLayoutWrapperComponent,
-  AnonLayoutWrapperData,
   PasswordHintComponent,
   RegistrationFinishComponent,
   RegistrationStartComponent,
@@ -22,7 +23,6 @@ import {
   RegistrationLinkExpiredComponent,
   LoginComponent,
   LoginSecondaryContentComponent,
-  LockIcon,
   TwoFactorTimeoutIcon,
   UserLockIcon,
   SsoKeyIcon,
@@ -39,6 +39,8 @@ import {
   NewDeviceVerificationComponent,
   DeviceVerificationIcon,
 } from "@bitwarden/auth/angular";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { AnonLayoutWrapperComponent, AnonLayoutWrapperData, Icons } from "@bitwarden/components";
 import { LockComponent } from "@bitwarden/key-management-ui";
 import { VaultIcons } from "@bitwarden/vault";
 
@@ -80,6 +82,7 @@ import { AccessComponent, SendAccessExplainerComponent } from "./tools/send/send
 import { SendComponent } from "./tools/send/send.component";
 import { BrowserExtensionPromptInstallComponent } from "./vault/components/browser-extension-prompt/browser-extension-prompt-install.component";
 import { BrowserExtensionPromptComponent } from "./vault/components/browser-extension-prompt/browser-extension-prompt.component";
+import { SetupExtensionComponent } from "./vault/components/setup-extension/setup-extension.component";
 import { VaultModule } from "./vault/individual-vault/vault.module";
 
 const routes: Routes = [
@@ -142,21 +145,30 @@ const routes: Routes = [
       {
         path: "update-temp-password",
         component: UpdateTempPasswordComponent,
-        canActivate: [authGuard],
+        canActivate: [
+          canAccessFeature(
+            FeatureFlag.PM16117_ChangeExistingPasswordRefactor,
+            false,
+            "change-password",
+            false,
+          ),
+          authGuard,
+        ],
         data: { titleId: "updateTempPassword" } satisfies RouteDataProperties,
       },
       {
         path: "update-password",
         component: UpdatePasswordComponent,
-        canActivate: [authGuard],
-        data: { titleId: "updatePassword" } satisfies RouteDataProperties,
-      },
-      {
-        path: "migrate-legacy-encryption",
-        loadComponent: () =>
-          import("./key-management/migrate-encryption/migrate-legacy-encryption.component").then(
-            (mod) => mod.MigrateFromLegacyEncryptionComponent,
+        canActivate: [
+          canAccessFeature(
+            FeatureFlag.PM16117_ChangeExistingPasswordRefactor,
+            false,
+            "change-password",
+            false,
           ),
+          authGuard,
+        ],
+        data: { titleId: "updatePassword" } satisfies RouteDataProperties,
       },
     ],
   },
@@ -314,6 +326,14 @@ const routes: Routes = [
           },
         ],
       },
+      {
+        path: "set-initial-password",
+        canActivate: [canAccessFeature(FeatureFlag.PM16117_SetInitialPasswordRefactor), authGuard],
+        component: SetInitialPasswordComponent,
+        data: {
+          maxWidth: "lg",
+        } satisfies AnonLayoutWrapperData,
+      },
       {
         path: "set-password-jit",
         component: SetPasswordJitComponent,
@@ -356,7 +376,6 @@ const routes: Routes = [
           pageSubtitle: {
             key: "singleSignOnEnterOrgIdentifierText",
           },
-          titleAreaMaxWidth: "md",
           pageIcon: SsoKeyIcon,
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
         children: [
@@ -390,7 +409,6 @@ const routes: Routes = [
           pageTitle: {
             key: "verifyYourIdentity",
           },
-          titleAreaMaxWidth: "md",
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
       },
       {
@@ -406,7 +424,7 @@ const routes: Routes = [
           pageTitle: {
             key: "yourVaultIsLockedV2",
           },
-          pageIcon: LockIcon,
+          pageIcon: Icons.LockIcon,
           showReadonlyHostname: true,
         } satisfies AnonLayoutWrapperData,
       },
@@ -579,6 +597,28 @@ const routes: Routes = [
           },
         ],
       },
+      {
+        path: "change-password",
+        component: ChangePasswordComponent,
+        canActivate: [
+          canAccessFeature(FeatureFlag.PM16117_ChangeExistingPasswordRefactor),
+          authGuard,
+        ],
+      },
+      {
+        path: "setup-extension",
+        data: {
+          hideCardWrapper: true,
+          hideIcon: true,
+          maxWidth: "3xl",
+        } satisfies AnonLayoutWrapperData,
+        children: [
+          {
+            path: "",
+            component: SetupExtensionComponent,
+          },
+        ],
+      },
     ],
   },
   {
diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts
index 39d0a9ae202..d5fe718412a 100644
--- a/apps/web/src/app/oss.module.ts
+++ b/apps/web/src/app/oss.module.ts
@@ -8,6 +8,9 @@ import { AccessComponent } from "./tools/send/send-access/access.component";
 import { OrganizationBadgeModule } from "./vault/individual-vault/organization-badge/organization-badge.module";
 import { VaultFilterModule } from "./vault/individual-vault/vault-filter/vault-filter.module";
 
+// Register the locales for the application
+import "./shared/locales";
+
 @NgModule({
   imports: [
     SharedModule,
diff --git a/apps/web/src/app/platform/ipc/web-ipc.service.ts b/apps/web/src/app/platform/ipc/web-ipc.service.ts
index e088de2473b..590c1f36cc4 100644
--- a/apps/web/src/app/platform/ipc/web-ipc.service.ts
+++ b/apps/web/src/app/platform/ipc/web-ipc.service.ts
@@ -1,17 +1,20 @@
 import { inject } from "@angular/core";
 
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { IpcMessage, IpcService, isIpcMessage } from "@bitwarden/common/platform/ipc";
 import {
   IncomingMessage,
   IpcClient,
   IpcCommunicationBackend,
+  ipcRegisterDiscoverHandler,
   OutgoingMessage,
 } from "@bitwarden/sdk-internal";
 
 export class WebIpcService extends IpcService {
   private logService = inject(LogService);
+  private platformUtilsService = inject(PlatformUtilsService);
   private communicationBackend?: IpcCommunicationBackend;
 
   override async init() {
@@ -27,7 +30,7 @@ export class WebIpcService extends IpcService {
                 type: "bitwarden-ipc-message",
                 message: {
                   destination: message.destination,
-                  payload: message.payload,
+                  payload: [...message.payload],
                   topic: message.topic,
                 },
               } satisfies IpcMessage,
@@ -50,9 +53,16 @@ export class WebIpcService extends IpcService {
           return;
         }
 
-        this.communicationBackend?.deliver_message(
+        if (
+          typeof message.message.destination !== "object" ||
+          message.message.destination.Web == undefined
+        ) {
+          return;
+        }
+
+        this.communicationBackend?.receive(
           new IncomingMessage(
-            message.message.payload,
+            new Uint8Array(message.message.payload),
             message.message.destination,
             "BrowserBackground",
             message.message.topic,
@@ -61,6 +71,12 @@ export class WebIpcService extends IpcService {
       });
 
       await super.initWithClient(new IpcClient(this.communicationBackend));
+
+      if (this.platformUtilsService.isDev()) {
+        await ipcRegisterDiscoverHandler(this.client, {
+          version: await this.platformUtilsService.getApplicationVersion(),
+        });
+      }
     } catch (e) {
       this.logService.error("[IPC] Initialization failed", e);
     }
diff --git a/apps/web/src/app/secrets-manager/secrets-manager-landing/request-sm-access.component.ts b/apps/web/src/app/secrets-manager/secrets-manager-landing/request-sm-access.component.ts
index d1ab7689cfe..443b3e03e5f 100644
--- a/apps/web/src/app/secrets-manager/secrets-manager-landing/request-sm-access.component.ts
+++ b/apps/web/src/app/secrets-manager/secrets-manager-landing/request-sm-access.component.ts
@@ -22,7 +22,6 @@ import { SmLandingApiService } from "./sm-landing-api.service";
 
 @Component({
   selector: "app-request-sm-access",
-  standalone: true,
   templateUrl: "request-sm-access.component.html",
   imports: [SharedModule, SearchModule, NoItemsModule, HeaderModule, OssModule],
 })
diff --git a/apps/web/src/app/secrets-manager/secrets-manager-landing/sm-landing.component.ts b/apps/web/src/app/secrets-manager/secrets-manager-landing/sm-landing.component.ts
index 4d9dceab34a..301e6f7dfad 100644
--- a/apps/web/src/app/secrets-manager/secrets-manager-landing/sm-landing.component.ts
+++ b/apps/web/src/app/secrets-manager/secrets-manager-landing/sm-landing.component.ts
@@ -14,7 +14,6 @@ import { SharedModule } from "../../shared/shared.module";
 
 @Component({
   selector: "app-sm-landing",
-  standalone: true,
   imports: [SharedModule, SearchModule, NoItemsModule, HeaderModule],
   templateUrl: "sm-landing.component.html",
 })
diff --git a/apps/web/src/app/settings/domain-rules.component.ts b/apps/web/src/app/settings/domain-rules.component.ts
index 7656222cfd2..6c4cb13d5fa 100644
--- a/apps/web/src/app/settings/domain-rules.component.ts
+++ b/apps/web/src/app/settings/domain-rules.component.ts
@@ -15,7 +15,6 @@ import { SharedModule } from "../shared";
 @Component({
   selector: "app-domain-rules",
   templateUrl: "domain-rules.component.html",
-  standalone: true,
   imports: [SharedModule, HeaderModule],
 })
 export class DomainRulesComponent implements OnInit {
diff --git a/apps/web/src/app/settings/preferences.component.ts b/apps/web/src/app/settings/preferences.component.ts
index c9efd059271..e6cc35903a7 100644
--- a/apps/web/src/app/settings/preferences.component.ts
+++ b/apps/web/src/app/settings/preferences.component.ts
@@ -41,7 +41,6 @@ import { SharedModule } from "../shared";
 @Component({
   selector: "app-preferences",
   templateUrl: "preferences.component.html",
-  standalone: true,
   imports: [SharedModule, HeaderModule, VaultTimeoutInputComponent],
 })
 export class PreferencesComponent implements OnInit, OnDestroy {
diff --git a/apps/web/src/app/shared/components/account-fingerprint/account-fingerprint.component.ts b/apps/web/src/app/shared/components/account-fingerprint/account-fingerprint.component.ts
index 0b79ad6fbb9..256c8d6af34 100644
--- a/apps/web/src/app/shared/components/account-fingerprint/account-fingerprint.component.ts
+++ b/apps/web/src/app/shared/components/account-fingerprint/account-fingerprint.component.ts
@@ -9,7 +9,6 @@ import { SharedModule } from "../../shared.module";
 @Component({
   selector: "app-account-fingerprint",
   templateUrl: "account-fingerprint.component.html",
-  standalone: true,
   imports: [SharedModule],
 })
 export class AccountFingerprintComponent implements OnInit {
diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts
index 44323614f17..63e54c46a8f 100644
--- a/apps/web/src/app/shared/loose-components.module.ts
+++ b/apps/web/src/app/shared/loose-components.module.ts
@@ -26,6 +26,7 @@ import { UpdatePasswordComponent } from "../auth/update-password.component";
 import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
 import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component";
 import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component";
+import { FreeBitwardenFamiliesComponent } from "../billing/members/free-bitwarden-families.component";
 import { SponsoredFamiliesComponent } from "../billing/settings/sponsored-families.component";
 import { SponsoringOrgRowComponent } from "../billing/settings/sponsoring-org-row.component";
 // eslint-disable-next-line no-restricted-imports -- Temporarily disabled until DIRT refactors these out of this module
@@ -46,7 +47,6 @@ import { OrganizationBadgeModule } from "../vault/individual-vault/organization-
 import { PipesModule } from "../vault/individual-vault/pipes/pipes.module";
 import { PurgeVaultComponent } from "../vault/settings/purge-vault.component";
 
-import { FreeBitwardenFamiliesComponent } from "./../billing/members/free-bitwarden-families.component";
 import { AccountFingerprintComponent } from "./components/account-fingerprint/account-fingerprint.component";
 import { SharedModule } from "./shared.module";
 
diff --git a/apps/web/src/app/shared/shared.module.ts b/apps/web/src/app/shared/shared.module.ts
index 1ad17139db8..efb4bb98be6 100644
--- a/apps/web/src/app/shared/shared.module.ts
+++ b/apps/web/src/app/shared/shared.module.ts
@@ -32,9 +32,6 @@ import {
   TypographyModule,
 } from "@bitwarden/components";
 
-// Register the locales for the application
-import "./locales";
-
 /**
  * This NgModule should contain the most basic shared directives, pipes, and components. They
  * should be widely used by other modules to be considered for adding to this module. If in doubt
diff --git a/apps/web/src/app/tools/credential-generator/credential-generator.component.ts b/apps/web/src/app/tools/credential-generator/credential-generator.component.ts
index 8d7b56a09ad..7d62bff0ac1 100644
--- a/apps/web/src/app/tools/credential-generator/credential-generator.component.ts
+++ b/apps/web/src/app/tools/credential-generator/credential-generator.component.ts
@@ -10,7 +10,6 @@ import { HeaderModule } from "../../layouts/header/header.module";
 import { SharedModule } from "../../shared";
 
 @Component({
-  standalone: true,
   selector: "credential-generator",
   templateUrl: "credential-generator.component.html",
   imports: [SharedModule, HeaderModule, GeneratorModule, ButtonModule, LinkModule],
diff --git a/apps/web/src/app/tools/import/import-web.component.ts b/apps/web/src/app/tools/import/import-web.component.ts
index a527b9e71f4..7883769389f 100644
--- a/apps/web/src/app/tools/import/import-web.component.ts
+++ b/apps/web/src/app/tools/import/import-web.component.ts
@@ -8,7 +8,6 @@ import { SharedModule } from "../../shared";
 
 @Component({
   templateUrl: "import-web.component.html",
-  standalone: true,
   imports: [SharedModule, ImportComponent, HeaderModule],
 })
 export class ImportWebComponent {
diff --git a/apps/web/src/app/tools/import/org-import.component.ts b/apps/web/src/app/tools/import/org-import.component.ts
index 90c13833ffc..fd833f3a698 100644
--- a/apps/web/src/app/tools/import/org-import.component.ts
+++ b/apps/web/src/app/tools/import/org-import.component.ts
@@ -20,7 +20,6 @@ import { ImportCollectionAdminService } from "./import-collection-admin.service"
 
 @Component({
   templateUrl: "org-import.component.html",
-  standalone: true,
   imports: [SharedModule, ImportComponent, LooseComponentsModule],
   providers: [
     {
diff --git a/apps/web/src/app/tools/send/new-send/new-send-dropdown.component.ts b/apps/web/src/app/tools/send/new-send/new-send-dropdown.component.ts
index 8cd052aa016..64ada8f75d0 100644
--- a/apps/web/src/app/tools/send/new-send/new-send-dropdown.component.ts
+++ b/apps/web/src/app/tools/send/new-send/new-send-dropdown.component.ts
@@ -13,7 +13,6 @@ import { DefaultSendFormConfigService, SendAddEditDialogComponent } from "@bitwa
 @Component({
   selector: "tools-new-send-dropdown",
   templateUrl: "new-send-dropdown.component.html",
-  standalone: true,
   imports: [JslibModule, CommonModule, ButtonModule, MenuModule, BadgeModule],
   providers: [DefaultSendFormConfigService],
 })
diff --git a/apps/web/src/app/tools/send/send-access/access.component.ts b/apps/web/src/app/tools/send/send-access/access.component.ts
index 7fd66a10c20..bc2851f0df7 100644
--- a/apps/web/src/app/tools/send/send-access/access.component.ts
+++ b/apps/web/src/app/tools/send/send-access/access.component.ts
@@ -4,7 +4,6 @@ import { Component, OnInit } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 
-import { AnonLayoutWrapperDataService } from "@bitwarden/auth/angular";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -17,7 +16,7 @@ import { SendAccessResponse } from "@bitwarden/common/tools/send/models/response
 import { SendAccessView } from "@bitwarden/common/tools/send/models/view/send-access.view";
 import { SEND_KDF_ITERATIONS } from "@bitwarden/common/tools/send/send-kdf";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
-import { NoItemsModule, ToastService } from "@bitwarden/components";
+import { AnonLayoutWrapperDataService, NoItemsModule, ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 import { ExpiredSendIcon } from "@bitwarden/send-ui";
 
@@ -30,7 +29,6 @@ import { SendAccessTextComponent } from "./send-access-text.component";
 @Component({
   selector: "app-send-access",
   templateUrl: "access.component.html",
-  standalone: true,
   imports: [
     SendAccessFileComponent,
     SendAccessTextComponent,
diff --git a/apps/web/src/app/tools/send/send-access/send-access-explainer.component.ts b/apps/web/src/app/tools/send/send-access/send-access-explainer.component.ts
index ec39d970444..d9f35a3d38e 100644
--- a/apps/web/src/app/tools/send/send-access/send-access-explainer.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-access-explainer.component.ts
@@ -5,7 +5,6 @@ import { SharedModule } from "../../../shared";
 @Component({
   selector: "app-send-access-explainer",
   templateUrl: "send-access-explainer.component.html",
-  standalone: true,
   imports: [SharedModule],
 })
 export class SendAccessExplainerComponent {
diff --git a/apps/web/src/app/tools/send/send-access/send-access-file.component.ts b/apps/web/src/app/tools/send/send-access/send-access-file.component.ts
index eec0bfd787b..3b1bf427a0b 100644
--- a/apps/web/src/app/tools/send/send-access/send-access-file.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-access-file.component.ts
@@ -19,7 +19,6 @@ import { SharedModule } from "../../../shared";
   selector: "app-send-access-file",
   templateUrl: "send-access-file.component.html",
   imports: [SharedModule],
-  standalone: true,
 })
 export class SendAccessFileComponent {
   @Input() send: SendAccessView;
diff --git a/apps/web/src/app/tools/send/send-access/send-access-password.component.ts b/apps/web/src/app/tools/send/send-access/send-access-password.component.ts
index 0cfd93fcea0..81e66c8acc4 100644
--- a/apps/web/src/app/tools/send/send-access/send-access-password.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-access-password.component.ts
@@ -10,7 +10,6 @@ import { SharedModule } from "../../../shared";
   selector: "app-send-access-password",
   templateUrl: "send-access-password.component.html",
   imports: [SharedModule],
-  standalone: true,
 })
 export class SendAccessPasswordComponent implements OnInit, OnDestroy {
   private destroy$ = new Subject<void>();
diff --git a/apps/web/src/app/tools/send/send-access/send-access-text.component.ts b/apps/web/src/app/tools/send/send-access/send-access-text.component.ts
index 6f9bc798d4b..2b5405a3f27 100644
--- a/apps/web/src/app/tools/send/send-access/send-access-text.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-access-text.component.ts
@@ -14,7 +14,6 @@ import { SharedModule } from "../../../shared";
   selector: "app-send-access-text",
   templateUrl: "send-access-text.component.html",
   imports: [SharedModule],
-  standalone: true,
 })
 export class SendAccessTextComponent {
   private _send: SendAccessView = null;
diff --git a/apps/web/src/app/tools/send/send.component.html b/apps/web/src/app/tools/send/send.component.html
index e55d5e56f78..042046b85ff 100644
--- a/apps/web/src/app/tools/send/send.component.html
+++ b/apps/web/src/app/tools/send/send.component.html
@@ -3,7 +3,7 @@
     <small #actionSpinner [appApiAction]="actionPromise">
       <ng-container *ngIf="$any(actionSpinner).loading">
         <i
-          class="bwi bwi-spinner bwi-spin text-muted"
+          class="bwi bwi-spinner bwi-spin tw-text-muted"
           title="{{ 'loading' | i18n }}"
           aria-hidden="true"
         ></i>
@@ -183,10 +183,10 @@
         </tr>
       </ng-template>
     </bit-table>
-    <div class="no-items" *ngIf="filteredSends && !filteredSends.length">
+    <div *ngIf="filteredSends && !filteredSends.length">
       <ng-container *ngIf="!loaded">
         <i
-          class="bwi bwi-spinner bwi-spin text-muted"
+          class="bwi bwi-spinner bwi-spin tw-text-muted"
           title="{{ 'loading' | i18n }}"
           aria-hidden="true"
         ></i>
@@ -194,8 +194,8 @@
       </ng-container>
       <ng-container *ngIf="loaded">
         <bit-no-items [icon]="noItemIcon" class="tw-text-main">
-          <ng-container slot="title">{{ "sendsNoItemsTitle" | i18n }}</ng-container>
-          <ng-container slot="description">{{ "sendsNoItemsMessage" | i18n }}</ng-container>
+          <ng-container slot="title">{{ "sendsTitleNoItems" | i18n }}</ng-container>
+          <ng-container slot="description">{{ "sendsBodyNoItems" | i18n }}</ng-container>
           <tools-new-send-dropdown
             [hideIcon]="true"
             *ngIf="!disableSend"
diff --git a/apps/web/src/app/tools/send/send.component.ts b/apps/web/src/app/tools/send/send.component.ts
index c6057c654f5..b74a3b80ee3 100644
--- a/apps/web/src/app/tools/send/send.component.ts
+++ b/apps/web/src/app/tools/send/send.component.ts
@@ -4,7 +4,6 @@ import { Component, NgZone, OnInit, OnDestroy } from "@angular/core";
 import { lastValueFrom } from "rxjs";
 
 import { SendComponent as BaseSendComponent } from "@bitwarden/angular/tools/send/send.component";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
@@ -16,6 +15,7 @@ import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 import { SendId } from "@bitwarden/common/types/guid";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import {
   DialogRef,
   DialogService,
@@ -41,7 +41,6 @@ const BroadcasterSubscriptionId = "SendComponent";
 
 @Component({
   selector: "app-send",
-  standalone: true,
   imports: [SharedModule, SearchModule, NoItemsModule, HeaderModule, NewSendDropdownComponent],
   templateUrl: "send.component.html",
   providers: [DefaultSendFormConfigService],
diff --git a/apps/web/src/app/tools/vault-export/export-web.component.ts b/apps/web/src/app/tools/vault-export/export-web.component.ts
index f2612656cee..bf29e83b893 100644
--- a/apps/web/src/app/tools/vault-export/export-web.component.ts
+++ b/apps/web/src/app/tools/vault-export/export-web.component.ts
@@ -8,7 +8,6 @@ import { SharedModule } from "../../shared";
 
 @Component({
   templateUrl: "export-web.component.html",
-  standalone: true,
   imports: [SharedModule, ExportComponent, HeaderModule],
 })
 export class ExportWebComponent {
diff --git a/apps/web/src/app/tools/vault-export/org-vault-export.component.ts b/apps/web/src/app/tools/vault-export/org-vault-export.component.ts
index d84d2b26a90..94cc9bf18f7 100644
--- a/apps/web/src/app/tools/vault-export/org-vault-export.component.ts
+++ b/apps/web/src/app/tools/vault-export/org-vault-export.component.ts
@@ -9,7 +9,6 @@ import { LooseComponentsModule, SharedModule } from "../../shared";
 
 @Component({
   templateUrl: "org-vault-export.component.html",
-  standalone: true,
   imports: [SharedModule, ExportComponent, LooseComponentsModule],
 })
 export class OrganizationVaultExportComponent implements OnInit {
diff --git a/apps/web/src/app/vault/components/assign-collections/assign-collections-web.component.ts b/apps/web/src/app/vault/components/assign-collections/assign-collections-web.component.ts
index 716d0b5a2bf..753d2708e60 100644
--- a/apps/web/src/app/vault/components/assign-collections/assign-collections-web.component.ts
+++ b/apps/web/src/app/vault/components/assign-collections/assign-collections-web.component.ts
@@ -15,7 +15,6 @@ import { SharedModule } from "../../../shared";
 @Component({
   imports: [SharedModule, AssignCollectionsComponent, PluralizePipe],
   templateUrl: "./assign-collections-web.component.html",
-  standalone: true,
 })
 export class AssignCollectionsWebComponent {
   protected editableItemCount: number;
diff --git a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt-install.component.ts b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt-install.component.ts
index 73f4307d9cc..005fbb1b14d 100644
--- a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt-install.component.ts
+++ b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt-install.component.ts
@@ -28,7 +28,6 @@ const WebStoreUrls: Partial<Record<DeviceType, string>> = {
 @Component({
   selector: "vault-browser-extension-prompt-install",
   templateUrl: "./browser-extension-prompt-install.component.html",
-  standalone: true,
   imports: [CommonModule, I18nPipe, LinkModule],
 })
 export class BrowserExtensionPromptInstallComponent implements OnInit {
diff --git a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.spec.ts b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.spec.ts
index ee81ff5237b..1b5b012ab13 100644
--- a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.spec.ts
+++ b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.spec.ts
@@ -16,7 +16,7 @@ describe("BrowserExtensionPromptComponent", () => {
   let component: BrowserExtensionPromptComponent;
   const start = jest.fn();
   const openExtension = jest.fn();
-  const pageState$ = new BehaviorSubject(BrowserPromptState.Loading);
+  const pageState$ = new BehaviorSubject<BrowserPromptState>(BrowserPromptState.Loading);
   const setAttribute = jest.fn();
   const getAttribute = jest.fn().mockReturnValue("width=1010");
 
diff --git a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.ts b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.ts
index 9800d0c64fe..624275a8297 100644
--- a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.ts
+++ b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.ts
@@ -13,7 +13,6 @@ import {
 @Component({
   selector: "vault-browser-extension-prompt",
   templateUrl: "./browser-extension-prompt.component.html",
-  standalone: true,
   imports: [CommonModule, I18nPipe, ButtonComponent, IconModule],
 })
 export class BrowserExtensionPromptComponent implements OnInit, OnDestroy {
diff --git a/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.html b/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.html
new file mode 100644
index 00000000000..df1786e227e
--- /dev/null
+++ b/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.html
@@ -0,0 +1,25 @@
+<bit-simple-dialog>
+  <div bitDialogIcon>
+    <i class="bwi bwi-info-circle bwi-2x tw-text-info" aria-hidden="true"></i>
+  </div>
+  <ng-container bitDialogContent>
+    <div bitTypography="h3">
+      {{ "cannotAutofillPasswordsWithoutExtensionTitle" | i18n }}
+    </div>
+    <div bitTypography="body1">{{ "cannotAutofillPasswordsWithoutExtensionDesc" | i18n }}</div>
+  </ng-container>
+  <ng-container bitDialogFooter>
+    <a
+      bitButton
+      buttonType="primary"
+      [href]="webStoreUrl"
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      {{ "getTheExtension" | i18n }}
+    </a>
+    <a bitButton buttonType="secondary" routerLink="/vault" bitDialogClose>
+      {{ "skipToWebApp" | i18n }}
+    </a>
+  </ng-container>
+</bit-simple-dialog>
diff --git a/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.spec.ts b/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.spec.ts
new file mode 100644
index 00000000000..d34dba737dd
--- /dev/null
+++ b/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.spec.ts
@@ -0,0 +1,42 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+import { provideNoopAnimations } from "@angular/platform-browser/animations";
+import { RouterModule } from "@angular/router";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+
+import { AddExtensionLaterDialogComponent } from "./add-extension-later-dialog.component";
+
+describe("AddExtensionLaterDialogComponent", () => {
+  let fixture: ComponentFixture<AddExtensionLaterDialogComponent>;
+  const getDevice = jest.fn().mockReturnValue(null);
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [AddExtensionLaterDialogComponent, RouterModule.forRoot([])],
+      providers: [
+        provideNoopAnimations(),
+        { provide: PlatformUtilsService, useValue: { getDevice } },
+        { provide: I18nService, useValue: { t: (key: string) => key } },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(AddExtensionLaterDialogComponent);
+    fixture.detectChanges();
+  });
+
+  it("renders the 'Get the Extension' link with correct href", () => {
+    const link = fixture.debugElement.queryAll(By.css("a[bitButton]"))[0];
+
+    expect(link.nativeElement.getAttribute("href")).toBe(
+      "https://bitwarden.com/download/#downloads-web-browser",
+    );
+  });
+
+  it("renders the 'Skip to Web App' link with correct routerLink", () => {
+    const skipLink = fixture.debugElement.queryAll(By.css("a[bitButton]"))[1];
+
+    expect(skipLink.attributes.href).toBe("/vault");
+  });
+});
diff --git a/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.ts b/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.ts
new file mode 100644
index 00000000000..3324cb8b1b0
--- /dev/null
+++ b/apps/web/src/app/vault/components/setup-extension/add-extension-later-dialog.component.ts
@@ -0,0 +1,23 @@
+import { Component, inject, OnInit } from "@angular/core";
+import { RouterModule } from "@angular/router";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { getWebStoreUrl } from "@bitwarden/common/vault/utils/get-web-store-url";
+import { ButtonComponent, DialogModule, TypographyModule } from "@bitwarden/components";
+
+@Component({
+  selector: "vault-add-extension-later-dialog",
+  templateUrl: "./add-extension-later-dialog.component.html",
+  imports: [DialogModule, JslibModule, TypographyModule, ButtonComponent, RouterModule],
+})
+export class AddExtensionLaterDialogComponent implements OnInit {
+  private platformUtilsService = inject(PlatformUtilsService);
+
+  /** Download Url for the extension based on the browser */
+  protected webStoreUrl: string = "";
+
+  ngOnInit(): void {
+    this.webStoreUrl = getWebStoreUrl(this.platformUtilsService.getDevice());
+  }
+}
diff --git a/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.html b/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.html
new file mode 100644
index 00000000000..3764f7d828f
--- /dev/null
+++ b/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.html
@@ -0,0 +1,82 @@
+<ng-template #newLoginItem>
+  <video
+    #video
+    muted
+    [ngClass]="{ 'tw-opacity-0': !allVideosLoaded }"
+    [attr.aria-hidden]="!allVideosLoaded"
+    class="tw-block tw-max-w-full tw-shadow-md tw-rounded-lg"
+    (loadeddata)="onVideoLoad()"
+    src="https://assets.bitwarden.com/extension-animations/new-login-item.mp4"
+    appDarkImgSrc="https://assets.bitwarden.com/extension-animations/new-login-item-dark.mp4"
+    aria-hidden
+  ></video>
+</ng-template>
+
+<ng-template #browserExtensionEasyAccess>
+  <video
+    #video
+    muted
+    [ngClass]="{ 'tw-opacity-0': !allVideosLoaded }"
+    [attr.aria-hidden]="!allVideosLoaded"
+    class="tw-block tw-max-w-full tw-shadow-md tw-rounded-lg"
+    (loadeddata)="onVideoLoad()"
+    src="https://assets.bitwarden.com/extension-animations/browser-extension-easy-access.mp4"
+    appDarkImgSrc="https://assets.bitwarden.com/extension-animations/browser-extension-easy-access-dark.mp4"
+    aria-hidden
+  ></video>
+</ng-template>
+
+<ng-template #onboardingAutofill>
+  <video
+    #video
+    muted
+    [ngClass]="{ 'tw-opacity-0': !allVideosLoaded }"
+    [attr.aria-hidden]="!allVideosLoaded"
+    class="tw-block tw-max-w-full tw-shadow-md tw-rounded-lg"
+    (loadeddata)="onVideoLoad()"
+    src="https://assets.bitwarden.com/extension-animations/onboarding-autofill.mp4"
+    appDarkImgSrc="https://assets.bitwarden.com/extension-animations/onboarding-autofill-dark.mp4"
+    aria-hidden
+  ></video>
+</ng-template>
+
+<!--
+  On desktop, videos are shown in a 1 row, 3 column grid.
+  Below tablet viewports, videos are shown one at a time. The videos are absolute positioned, except the first.
+  The first video is relatively positioned to force the layout and spacing of the videos.
+-->
+<div
+  class="tw-mx-auto tw-w-[15rem] tw-mb-8 tw-relative md:tw-grid md:tw-gap-10 md:tw-w-auto md:tw-grid-rows-1 md:tw-grid-cols-3 md:tw-justify-center md:tw-justify-items-center"
+  [attr.aria-label]="'setupExtensionContentAlt' | i18n"
+>
+  <div class="tw-relative tw-w-[15rem] tw-max-w-full tw-aspect-[0.807]">
+    <div
+      *ngIf="!allVideosLoaded"
+      class="tw-animate-pulse tw-bg-secondary-300 tw-size-full tw-absolute tw-left-0 tw-top-0 tw-rounded-lg"
+      data-testid="video-pulse"
+    ></div>
+    <ng-container *ngTemplateOutlet="newLoginItem"></ng-container>
+  </div>
+
+  <div
+    class="tw-absolute tw-left-0 tw-top-0 tw-opacity-0 md:tw-opacity-100 md:tw-relative tw-w-[15rem] tw-max-w-full tw-aspect-[0.807]"
+  >
+    <div
+      *ngIf="!allVideosLoaded"
+      class="tw-animate-pulse tw-bg-secondary-300 tw-size-full tw-absolute tw-left-0 tw-top-0 tw-rounded-lg"
+      data-testid="video-pulse"
+    ></div>
+    <ng-container *ngTemplateOutlet="browserExtensionEasyAccess"></ng-container>
+  </div>
+
+  <div
+    class="tw-absolute tw-left-0 tw-top-0 tw-opacity-0 md:tw-opacity-100 md:tw-relative tw-w-[15rem] tw-max-w-full tw-aspect-[0.807]"
+  >
+    <div
+      *ngIf="!allVideosLoaded"
+      class="tw-animate-pulse tw-bg-secondary-300 tw-size-full tw-absolute tw-left-0 tw-top-0 tw-rounded-lg"
+      data-testid="video-pulse"
+    ></div>
+    <ng-container *ngTemplateOutlet="onboardingAutofill"></ng-container>
+  </div>
+</div>
diff --git a/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.spec.ts b/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.spec.ts
new file mode 100644
index 00000000000..9f39a3edcac
--- /dev/null
+++ b/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.spec.ts
@@ -0,0 +1,170 @@
+import { ComponentFixture, fakeAsync, TestBed, tick } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+import { provideNoopAnimations } from "@angular/platform-browser/animations";
+import { RouterModule } from "@angular/router";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
+import { AddExtensionVideosComponent } from "./add-extension-videos.component";
+
+describe("AddExtensionVideosComponent", () => {
+  let fixture: ComponentFixture<AddExtensionVideosComponent>;
+  let component: AddExtensionVideosComponent;
+
+  // Mock HTMLMediaElement load to stop the video file from being loaded
+  Object.defineProperty(HTMLMediaElement.prototype, "load", {
+    value: jest.fn(),
+    writable: true,
+  });
+
+  const play = jest.fn(() => Promise.resolve());
+  HTMLMediaElement.prototype.play = play;
+
+  beforeEach(async () => {
+    window.matchMedia = jest.fn().mockReturnValue(false);
+    play.mockClear();
+
+    await TestBed.configureTestingModule({
+      imports: [AddExtensionVideosComponent, RouterModule.forRoot([])],
+      providers: [
+        provideNoopAnimations(),
+        { provide: I18nService, useValue: { t: (key: string) => key } },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(AddExtensionVideosComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe("loading pulse", () => {
+    it("shows loading spinner when all videos are not loaded", () => {
+      const loadingSpinners = fixture.debugElement.queryAll(By.css("[data-testid='video-pulse']"));
+      expect(loadingSpinners.length).toBe(3);
+    });
+
+    it("shows all pulses until all videos are loaded", () => {
+      let loadingSpinners = fixture.debugElement.queryAll(By.css("[data-testid='video-pulse']"));
+      expect(loadingSpinners.length).toBe(3);
+
+      // Simulate two video loaded
+      component["videoElements"].get(0)?.nativeElement.dispatchEvent(new Event("loadeddata"));
+      component["videoElements"].get(1)?.nativeElement.dispatchEvent(new Event("loadeddata"));
+
+      loadingSpinners = fixture.debugElement.queryAll(By.css("[data-testid='video-pulse']"));
+
+      expect(component["numberOfLoadedVideos"]).toBe(2);
+      expect(loadingSpinners.length).toBe(3);
+    });
+  });
+
+  describe("window resizing", () => {
+    beforeEach(() => {
+      component["numberOfLoadedVideos"] = 3;
+      fixture.detectChanges();
+    });
+
+    it("shows all videos when window is resized to desktop viewport", fakeAsync(() => {
+      component["variant"] = "mobile";
+      Object.defineProperty(component["document"].documentElement, "clientWidth", {
+        configurable: true,
+        value: 1000,
+      });
+
+      window.dispatchEvent(new Event("resize"));
+
+      fixture.detectChanges();
+      tick(50);
+
+      expect(
+        Array.from(component["videoElements"]).every(
+          (video) => video.nativeElement.parentElement?.style.opacity === "1",
+        ),
+      ).toBe(true);
+    }));
+
+    it("shows only the playing video when window is resized to mobile viewport", fakeAsync(() => {
+      component["variant"] = "desktop";
+      // readonly property needs redefining
+      Object.defineProperty(component["document"].documentElement, "clientWidth", {
+        value: 500,
+      });
+
+      const video1 = component["videoElements"].get(1);
+      Object.defineProperty(video1!.nativeElement, "paused", {
+        value: false,
+      });
+
+      window.dispatchEvent(new Event("resize"));
+
+      fixture.detectChanges();
+      tick(50);
+
+      expect(component["videoElements"].get(0)?.nativeElement.parentElement?.style.opacity).toBe(
+        "0",
+      );
+      expect(component["videoElements"].get(1)?.nativeElement.parentElement?.style.opacity).toBe(
+        "1",
+      );
+      expect(component["videoElements"].get(2)?.nativeElement.parentElement?.style.opacity).toBe(
+        "0",
+      );
+    }));
+  });
+
+  describe("video sequence", () => {
+    let firstVideo: HTMLVideoElement;
+    let secondVideo: HTMLVideoElement;
+    let thirdVideo: HTMLVideoElement;
+
+    beforeEach(() => {
+      component["numberOfLoadedVideos"] = 2;
+      component["onVideoLoad"]();
+
+      firstVideo = component["videoElements"].get(0)!.nativeElement;
+      secondVideo = component["videoElements"].get(1)!.nativeElement;
+      thirdVideo = component["videoElements"].get(2)!.nativeElement;
+    });
+
+    it("starts the video sequence when all videos are loaded", fakeAsync(() => {
+      tick();
+
+      expect(firstVideo.play).toHaveBeenCalled();
+    }));
+
+    it("plays videos in sequence", fakeAsync(() => {
+      tick(); // let first video play
+
+      play.mockClear();
+      firstVideo.onended!(new Event("ended")); // trigger next video
+
+      tick();
+
+      expect(secondVideo.play).toHaveBeenCalledTimes(1);
+
+      play.mockClear();
+      secondVideo.onended!(new Event("ended")); // trigger next video
+
+      tick();
+
+      expect(thirdVideo.play).toHaveBeenCalledTimes(1);
+    }));
+
+    it("doesn't play videos again when the user prefers no motion", fakeAsync(() => {
+      component["prefersReducedMotion"] = true;
+
+      tick();
+      firstVideo.onended!(new Event("ended"));
+      tick();
+      secondVideo.onended!(new Event("ended"));
+      tick();
+
+      play.mockClear();
+
+      thirdVideo.onended!(new Event("ended")); // trigger first video again
+
+      tick();
+      expect(play).toHaveBeenCalledTimes(0);
+    }));
+  });
+});
diff --git a/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.ts b/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.ts
new file mode 100644
index 00000000000..2420414fc88
--- /dev/null
+++ b/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.ts
@@ -0,0 +1,146 @@
+import { CommonModule, DOCUMENT } from "@angular/common";
+import { Component, ViewChildren, QueryList, ElementRef, inject } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { debounceTime, fromEvent } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+
+@Component({
+  selector: "vault-add-extension-videos",
+  templateUrl: "./add-extension-videos.component.html",
+  imports: [CommonModule, JslibModule],
+})
+export class AddExtensionVideosComponent {
+  @ViewChildren("video", { read: ElementRef }) protected videoElements!: QueryList<
+    ElementRef<HTMLVideoElement>
+  >;
+
+  private document = inject(DOCUMENT);
+
+  /** Current viewport size */
+  protected variant: "mobile" | "desktop" = "desktop";
+
+  /** Number of videos that have loaded and are ready to play */
+  protected numberOfLoadedVideos = 0;
+
+  /** True when the user prefers reduced motion */
+  protected prefersReducedMotion = window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+
+  /** Returns true when all videos are loaded */
+  get allVideosLoaded(): boolean {
+    return this.numberOfLoadedVideos >= 3;
+  }
+
+  constructor() {
+    fromEvent(window, "resize")
+      .pipe(takeUntilDestroyed(), debounceTime(25))
+      .subscribe(() => this.onResize());
+  }
+
+  /** Resets the video states based on the viewport width changes */
+  onResize(): void {
+    const oldVariant = this.variant;
+    this.variant = this.document.documentElement.clientWidth < 768 ? "mobile" : "desktop";
+
+    // When the viewport changes from desktop to mobile, hide all videos except the one that is playing.
+    if (this.variant !== oldVariant && this.variant === "mobile") {
+      this.videoElements.forEach((video) => {
+        if (video.nativeElement.paused) {
+          this.hideElement(video.nativeElement.parentElement!);
+        } else {
+          this.showElement(video.nativeElement.parentElement!);
+        }
+      });
+    }
+
+    // When the viewport changes from mobile to desktop, show all videos.
+    if (this.variant !== oldVariant && this.variant === "desktop") {
+      this.videoElements.forEach((video) => {
+        this.showElement(video.nativeElement.parentElement!);
+      });
+    }
+  }
+
+  /**
+   * Increment the number of loaded videos.
+   * When all videos are loaded, start the first one.
+   */
+  protected onVideoLoad() {
+    this.numberOfLoadedVideos = this.numberOfLoadedVideos + 1;
+
+    if (this.allVideosLoaded) {
+      void this.startVideoSequence(0);
+    }
+  }
+
+  /** Recursive method to start the video sequence. */
+  private async startVideoSequence(i: number): Promise<void> {
+    let index = i;
+    const endOfVideos = index >= this.videoElements.length;
+
+    // When the user prefers reduced motion, don't play the videos more than once
+    if (endOfVideos && this.prefersReducedMotion) {
+      return;
+    }
+
+    // When the last of the videos has played, loop back to the start
+    if (endOfVideos) {
+      this.videoElements.forEach((video) => {
+        // Reset all videos to the start
+        video.nativeElement.currentTime = 0;
+      });
+
+      // Loop back to the first video
+      index = 0;
+    }
+
+    const video = this.videoElements.toArray()[index].nativeElement;
+    video.onended = () => {
+      void this.startVideoSequence(index + 1);
+    };
+
+    this.mobileTransitionIn(index);
+
+    // Set muted via JavaScript, browsers are respecting autoplay consistently over just the  HTML attribute
+    video.muted = true;
+    await video.play();
+  }
+
+  /** For mobile viewports, fades the current video out and the next video in. */
+  private mobileTransitionIn(index: number): void {
+    // When the viewport is above the tablet breakpoint, all videos are shown at once.
+    // No transition is needed.
+    if (this.isAboveTabletBreakpoint()) {
+      return;
+    }
+
+    const currentParent = this.videoElements.toArray()[index].nativeElement.parentElement!;
+    const previousIndex = index === 0 ? this.videoElements.length - 1 : index - 1;
+
+    const previousParent = this.videoElements.toArray()[previousIndex].nativeElement.parentElement!;
+
+    // Fade out the previous video
+    this.hideElement(previousParent, true);
+
+    // Fade in the current video
+    this.showElement(currentParent, true);
+  }
+
+  /** Returns true when the viewport width is 768px or above. */
+  private isAboveTabletBreakpoint(): boolean {
+    const width = this.document.documentElement.clientWidth;
+    return width >= 768;
+  }
+
+  /** Visually hides the given element. */
+  private hideElement(element: HTMLElement, transition = false): void {
+    element.style.transition = transition ? "opacity 0.5s linear" : "";
+    element.style.opacity = "0";
+  }
+
+  /** Visually shows the given element. */
+  private showElement(element: HTMLElement, transition = false): void {
+    element.style.transition = transition ? "opacity 0.5s linear" : "";
+    element.style.opacity = "1";
+  }
+}
diff --git a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.html b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.html
new file mode 100644
index 00000000000..3b9ec19fd34
--- /dev/null
+++ b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.html
@@ -0,0 +1,56 @@
+<i
+  *ngIf="state === SetupExtensionState.Loading"
+  class="bwi bwi-spinner bwi-spin bwi-3x tw-text-muted"
+  aria-hidden="true"
+  [appA11yTitle]="'loading' | i18n"
+></i>
+
+<section *ngIf="state === SetupExtensionState.NeedsExtension" class="tw-text-center tw-mt-4">
+  <h1 class="tw-text-xl tw-font-semibold tw-text-main sm:tw-text-2xl">
+    {{ "setupExtensionPageTitle" | i18n }}
+  </h1>
+  <h2 class="tw-text-sm tw-text-main tw-mb-6 tw-font-normal sm:tw-text-base">
+    {{ "setupExtensionPageDescription" | i18n }}
+  </h2>
+  <vault-add-extension-videos></vault-add-extension-videos>
+  <div class="tw-flex tw-flex-col tw-gap-4 tw-items-center">
+    <a
+      bitButton
+      buttonType="primary"
+      [href]="webStoreUrl"
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      {{ "getTheExtension" | i18n }}
+    </a>
+    <button type="button" bitLink (click)="addItLater()">
+      {{ "addItLater" | i18n }}
+    </button>
+  </div>
+</section>
+
+<section *ngIf="state === SetupExtensionState.Success" class="tw-flex tw-flex-col tw-items-center">
+  <bit-icon [icon]="PartyIcon"></bit-icon>
+  <h1 bitTypography="h2" class="tw-mb-6 tw-mt-4">{{ "bitwardenExtensionInstalled" | i18n }}</h1>
+  <div
+    class="tw-flex tw-flex-col tw-rounded-2xl tw-bg-background tw-border tw-border-solid tw-border-secondary-300 tw-p-8"
+  >
+    <p>{{ "openExtensionToAutofill" | i18n }}</p>
+    <button type="button" bitButton buttonType="primary" class="tw-mb-2" (click)="openExtension()">
+      {{ "openBitwardenExtension" | i18n }}
+    </button>
+    <a bitButton buttonType="secondary" routerLink="/vault">
+      {{ "skipToWebApp" | i18n }}
+    </a>
+  </div>
+  <p class="tw-mt-10 tw-max-w-96 tw-text-center">
+    {{ "gettingStartedWithBitwardenPart1" | i18n }}
+    <a bitLink href="https://bitwarden.com/help/">
+      {{ "gettingStartedWithBitwardenPart2" | i18n }}
+    </a>
+    {{ "and" | i18n }}
+    <a bitLink href="https://bitwarden.com/help/learning-center/">
+      {{ "gettingStartedWithBitwardenPart3" | i18n }}
+    </a>
+  </p>
+</section>
diff --git a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.spec.ts b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.spec.ts
new file mode 100644
index 00000000000..752e2c8d4a6
--- /dev/null
+++ b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.spec.ts
@@ -0,0 +1,125 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+import { Router, RouterModule } from "@angular/router";
+import { BehaviorSubject } from "rxjs";
+
+import { DeviceType } from "@bitwarden/common/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+
+import { WebBrowserInteractionService } from "../../services/web-browser-interaction.service";
+
+import { SetupExtensionComponent } from "./setup-extension.component";
+
+describe("SetupExtensionComponent", () => {
+  let fixture: ComponentFixture<SetupExtensionComponent>;
+  let component: SetupExtensionComponent;
+
+  const getFeatureFlag = jest.fn().mockResolvedValue(false);
+  const navigate = jest.fn().mockResolvedValue(true);
+  const openExtension = jest.fn().mockResolvedValue(true);
+  const extensionInstalled$ = new BehaviorSubject<boolean | null>(null);
+
+  beforeEach(async () => {
+    navigate.mockClear();
+    openExtension.mockClear();
+    getFeatureFlag.mockClear().mockResolvedValue(true);
+    window.matchMedia = jest.fn().mockReturnValue(false);
+
+    await TestBed.configureTestingModule({
+      imports: [SetupExtensionComponent, RouterModule.forRoot([])],
+      providers: [
+        { provide: I18nService, useValue: { t: (key: string) => key } },
+        { provide: ConfigService, useValue: { getFeatureFlag } },
+        { provide: WebBrowserInteractionService, useValue: { extensionInstalled$, openExtension } },
+        { provide: PlatformUtilsService, useValue: { getDevice: () => DeviceType.UnknownBrowser } },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(SetupExtensionComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    const router = TestBed.inject(Router);
+    router.navigate = navigate;
+  });
+
+  it("initially shows the loading spinner", () => {
+    const spinner = fixture.debugElement.query(By.css("i"));
+
+    expect(spinner.nativeElement.title).toBe("loading");
+  });
+
+  it("sets webStoreUrl", () => {
+    expect(component["webStoreUrl"]).toBe("https://bitwarden.com/download/#downloads-web-browser");
+  });
+
+  describe("initialization", () => {
+    it("redirects to the vault if the feature flag is disabled", async () => {
+      Utils.isMobileBrowser = false;
+      getFeatureFlag.mockResolvedValue(false);
+      navigate.mockClear();
+
+      await component.ngOnInit();
+
+      expect(navigate).toHaveBeenCalledWith(["/vault"]);
+    });
+
+    it("redirects to the vault if the user is on a mobile browser", async () => {
+      Utils.isMobileBrowser = true;
+      getFeatureFlag.mockResolvedValue(true);
+      navigate.mockClear();
+
+      await component.ngOnInit();
+
+      expect(navigate).toHaveBeenCalledWith(["/vault"]);
+    });
+
+    it("does not redirect the user", async () => {
+      Utils.isMobileBrowser = false;
+      getFeatureFlag.mockResolvedValue(true);
+      navigate.mockClear();
+
+      await component.ngOnInit();
+
+      expect(getFeatureFlag).toHaveBeenCalledWith(FeatureFlag.PM19315EndUserActivationMvp);
+      expect(navigate).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("extensionInstalled$", () => {
+    it("redirects the user to the vault when the first emitted value is true", () => {
+      extensionInstalled$.next(true);
+
+      expect(navigate).toHaveBeenCalledWith(["/vault"]);
+    });
+
+    describe("success state", () => {
+      beforeEach(() => {
+        // avoid initial redirect
+        extensionInstalled$.next(false);
+
+        fixture.detectChanges();
+
+        extensionInstalled$.next(true);
+        fixture.detectChanges();
+      });
+
+      it("shows link to the vault", () => {
+        const successLink = fixture.debugElement.query(By.css("a"));
+
+        expect(successLink.nativeElement.href).toContain("/vault");
+      });
+
+      it("shows open extension button", () => {
+        const openExtensionButton = fixture.debugElement.query(By.css("button"));
+
+        openExtensionButton.triggerEventHandler("click");
+
+        expect(openExtension).toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts
new file mode 100644
index 00000000000..9ee8e189627
--- /dev/null
+++ b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts
@@ -0,0 +1,141 @@
+import { DOCUMENT, NgIf } from "@angular/common";
+import { Component, DestroyRef, inject, OnDestroy, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { Router, RouterModule } from "@angular/router";
+import { pairwise, startWith } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
+import { getWebStoreUrl } from "@bitwarden/common/vault/utils/get-web-store-url";
+import {
+  ButtonComponent,
+  DialogRef,
+  DialogService,
+  IconModule,
+  LinkModule,
+} from "@bitwarden/components";
+import { VaultIcons } from "@bitwarden/vault";
+
+import { WebBrowserInteractionService } from "../../services/web-browser-interaction.service";
+
+import { AddExtensionLaterDialogComponent } from "./add-extension-later-dialog.component";
+import { AddExtensionVideosComponent } from "./add-extension-videos.component";
+
+const SetupExtensionState = {
+  Loading: "loading",
+  NeedsExtension: "needs-extension",
+  Success: "success",
+} as const;
+
+type SetupExtensionState = UnionOfValues<typeof SetupExtensionState>;
+
+@Component({
+  selector: "vault-setup-extension",
+  templateUrl: "./setup-extension.component.html",
+  imports: [
+    NgIf,
+    JslibModule,
+    ButtonComponent,
+    LinkModule,
+    IconModule,
+    RouterModule,
+    AddExtensionVideosComponent,
+  ],
+})
+export class SetupExtensionComponent implements OnInit, OnDestroy {
+  private webBrowserExtensionInteractionService = inject(WebBrowserInteractionService);
+  private configService = inject(ConfigService);
+  private router = inject(Router);
+  private destroyRef = inject(DestroyRef);
+  private platformUtilsService = inject(PlatformUtilsService);
+  private dialogService = inject(DialogService);
+  private document = inject(DOCUMENT);
+
+  protected SetupExtensionState = SetupExtensionState;
+  protected PartyIcon = VaultIcons.Party;
+
+  /** The current state of the setup extension component. */
+  protected state: SetupExtensionState = SetupExtensionState.Loading;
+
+  /** Download Url for the extension based on the browser */
+  protected webStoreUrl: string = "";
+
+  /** Reference to the add it later dialog */
+  protected dialogRef: DialogRef | null = null;
+  private viewportContent: string | null = null;
+
+  async ngOnInit() {
+    // It is not be uncommon for users to hit this page from smaller viewports.
+    // There are global styles that set a min-width for the page which cause it to render poorly.
+    // Remove them here.
+    // https://github.com/bitwarden/clients/blob/main/apps/web/src/scss/base.scss#L6
+    this.document.body.style.minWidth = "auto";
+
+    const viewportMeta = this.document.querySelector('meta[name="viewport"]');
+
+    // Save the current viewport content to reset it when the component is destroyed
+    this.viewportContent = viewportMeta?.getAttribute("content") ?? null;
+    viewportMeta?.setAttribute("content", "width=device-width, initial-scale=1.0");
+
+    await this.conditionallyRedirectUser();
+
+    this.webStoreUrl = getWebStoreUrl(this.platformUtilsService.getDevice());
+
+    this.webBrowserExtensionInteractionService.extensionInstalled$
+      .pipe(takeUntilDestroyed(this.destroyRef), startWith(null), pairwise())
+      .subscribe(([previousState, currentState]) => {
+        // Initial state transitioned to extension installed, redirect the user
+        if (previousState === null && currentState) {
+          void this.router.navigate(["/vault"]);
+        }
+
+        // Extension was not installed and now it is, show success state
+        if (previousState === false && currentState) {
+          this.dialogRef?.close();
+          this.state = SetupExtensionState.Success;
+        }
+
+        // Extension is not installed
+        if (currentState === false) {
+          this.state = SetupExtensionState.NeedsExtension;
+        }
+      });
+  }
+
+  ngOnDestroy(): void {
+    // Reset the body min-width when the component is destroyed
+    this.document.body.style.minWidth = "";
+
+    if (this.viewportContent !== null) {
+      this.document
+        .querySelector('meta[name="viewport"]')
+        ?.setAttribute("content", this.viewportContent);
+    }
+  }
+
+  /** Conditionally redirects the user to the vault upon landing on the page. */
+  async conditionallyRedirectUser() {
+    const isFeatureEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.PM19315EndUserActivationMvp,
+    );
+    const isMobile = Utils.isMobileBrowser;
+
+    if (!isFeatureEnabled || isMobile) {
+      await this.router.navigate(["/vault"]);
+    }
+  }
+
+  /** Opens the add extension later dialog */
+  addItLater() {
+    this.dialogRef = this.dialogService.open(AddExtensionLaterDialogComponent);
+  }
+
+  /** Opens the browser extension */
+  openExtension() {
+    void this.webBrowserExtensionInteractionService.openExtension();
+  }
+}
diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
index aa457e97093..d79c1c4a8b4 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
@@ -15,8 +15,6 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
 import { EventType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -29,6 +27,7 @@ import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   DIALOG_DATA,
   DialogRef,
@@ -95,34 +94,33 @@ export interface VaultItemDialogParams {
   restore?: (c: CipherView) => Promise<boolean>;
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum VaultItemDialogResult {
+export const VaultItemDialogResult = {
   /**
    * A cipher was saved (created or updated).
    */
-  Saved = "saved",
+  Saved: "saved",
 
   /**
    * A cipher was deleted.
    */
-  Deleted = "deleted",
+  Deleted: "deleted",
 
   /**
    * The dialog was closed to navigate the user the premium upgrade page.
    */
-  PremiumUpgrade = "premiumUpgrade",
+  PremiumUpgrade: "premiumUpgrade",
 
   /**
    * A cipher was restored
    */
-  Restored = "restored",
-}
+  Restored: "restored",
+} as const;
+
+export type VaultItemDialogResult = UnionOfValues<typeof VaultItemDialogResult>;
 
 @Component({
   selector: "app-vault-item-dialog",
   templateUrl: "vault-item-dialog.component.html",
-  standalone: true,
   imports: [
     ButtonModule,
     CipherViewComponent,
@@ -228,10 +226,7 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
    * A user may restore items if they have delete permissions and the item is in the trash.
    */
   protected async canUserRestore() {
-    if (await firstValueFrom(this.limitItemDeletion$)) {
-      return this.isTrashFilter && this.cipher?.isDeleted && this.cipher?.permissions.restore;
-    }
-    return this.isTrashFilter && this.cipher?.isDeleted && this.canDelete;
+    return this.isTrashFilter && this.cipher?.isDeleted && this.cipher?.permissions.restore;
   }
 
   protected showRestore: boolean;
@@ -277,8 +272,6 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
 
   protected canDelete = false;
 
-  protected limitItemDeletion$ = this.configService.getFeatureFlag$(FeatureFlag.LimitItemDeletion);
-
   constructor(
     @Inject(DIALOG_DATA) protected params: VaultItemDialogParams,
     private dialogRef: DialogRef<VaultItemDialogResult>,
@@ -296,7 +289,6 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
     private apiService: ApiService,
     private eventCollectionService: EventCollectionService,
     private routedVaultFilterService: RoutedVaultFilterService,
-    private configService: ConfigService,
   ) {
     this.updateTitle();
   }
@@ -323,7 +315,6 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
       this.canDelete = await firstValueFrom(
         this.cipherAuthorizationService.canDeleteCipher$(
           this.cipher,
-          [this.params.activeCollectionId],
           this.params.isAdminConsoleAction,
         ),
       );
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
index 2860532fce0..227108ec25d 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
@@ -86,12 +86,7 @@
     appStopProp
   ></button>
   <bit-menu #corruptedCipherOptions>
-    <button
-      bitMenuItem
-      *ngIf="(limitItemDeletion$ | async) ? canDeleteCipher : canManageCollection"
-      (click)="deleteCipher()"
-      type="button"
-    >
+    <button bitMenuItem *ngIf="canDeleteCipher" (click)="deleteCipher()" type="button">
       <span class="tw-text-danger">
         <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
         {{ (cipher.isDeleted ? "permanentlyDelete" : "delete") | i18n }}
@@ -110,11 +105,11 @@
   ></button>
   <bit-menu #cipherOptions>
     <ng-container *ngIf="isNotDeletedLoginCipher">
-      <button bitMenuItem type="button" (click)="copy('username')">
+      <button bitMenuItem type="button" (click)="copy('username')" *ngIf="cipher.login.username">
         <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
         {{ "copyUsername" | i18n }}
       </button>
-      <button bitMenuItem type="button" (click)="copy('password')" *ngIf="cipher.viewPassword">
+      <button bitMenuItem type="button" (click)="copy('password')" *ngIf="cipher.login.password">
         <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
         {{ "copyPassword" | i18n }}
       </button>
@@ -160,17 +155,12 @@
       bitMenuItem
       (click)="restore()"
       type="button"
-      *ngIf="(limitItemDeletion$ | async) ? cipher.isDeleted && canRestoreCipher : cipher.isDeleted"
+      *ngIf="cipher.isDeleted && canRestoreCipher"
     >
       <i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i>
       {{ "restore" | i18n }}
     </button>
-    <button
-      bitMenuItem
-      *ngIf="(limitItemDeletion$ | async) ? canDeleteCipher : canManageCollection"
-      (click)="deleteCipher()"
-      type="button"
-    >
+    <button bitMenuItem *ngIf="canDeleteCipher" (click)="deleteCipher()" type="button">
       <span class="tw-text-danger">
         <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
         {{ (cipher.isDeleted ? "permanentlyDelete" : "delete") | i18n }}
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
index ac1774cd244..6078324a059 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
@@ -4,8 +4,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
 
 import { CollectionView } from "@bitwarden/admin-console/common";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -53,7 +51,6 @@ export class VaultCipherRowComponent implements OnInit {
   @Input() checked: boolean;
   @Output() checkedToggled = new EventEmitter<void>();
 
-  protected limitItemDeletion$ = this.configService.getFeatureFlag$(FeatureFlag.LimitItemDeletion);
   protected CipherType = CipherType;
   private permissionList = getPermissionList();
   private permissionPriority = [
@@ -65,10 +62,7 @@ export class VaultCipherRowComponent implements OnInit {
   ];
   protected organization?: Organization;
 
-  constructor(
-    private i18nService: I18nService,
-    private configService: ConfigService,
-  ) {}
+  constructor(private i18nService: I18nService) {}
 
   /**
    * Lifecycle hook for component initialization.
@@ -172,7 +166,7 @@ export class VaultCipherRowComponent implements OnInit {
       this.showAttachments ||
       this.showClone ||
       this.canEditCipher ||
-      this.cipher.isDeleted
+      (this.cipher.isDeleted && this.canRestoreCipher)
     );
   }
 
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.html b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
index f1f50beb582..ef928903a72 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
@@ -1,4 +1,4 @@
-<cdk-virtual-scroll-viewport [itemSize]="RowHeight" scrollWindow class="tw-pb-8">
+<cdk-virtual-scroll-viewport [itemSize]="RowHeight" bitScrollLayout class="tw-pb-8">
   <bit-table [dataSource]="dataSource" layout="fixed">
     <ng-container header>
       <tr>
@@ -22,16 +22,12 @@
           bitCell
           bitSortable="name"
           [fn]="sortByName"
-          [class]="showExtraColumn ? 'lg:tw-w-3/5' : 'tw-w-full'"
+          [class]="showExtraColumn ? 'tw-w-3/5' : 'tw-w-full'"
         >
           {{ "name" | i18n }}
         </th>
         <!-- Individual vault -->
-        <th
-          *ngIf="!showAdminActions"
-          bitCell
-          [class]="showExtraColumn ? 'lg:tw-w-3/5' : 'tw-w-full'"
-        >
+        <th *ngIf="!showAdminActions" bitCell [class]="showExtraColumn ? 'tw-w-3/5' : 'tw-w-full'">
           {{ "name" | i18n }}
         </th>
         <th bitCell *ngIf="showOwner" class="tw-hidden tw-w-2/5 lg:tw-table-cell">
@@ -52,12 +48,11 @@
           {{ "permission" | i18n }}
         </th>
         <th bitCell class="tw-w-12 tw-text-right">
-          @let featureFlaggedDisable =
-            (limitItemDeletion$ | async) ? (disableMenu$ | async) : disableMenu;
+          @let menuDisabled = disableMenu$ | async;
           <button
-            [disabled]="disabled || isEmpty || featureFlaggedDisable"
+            [disabled]="disabled || isEmpty || menuDisabled"
             [bitMenuTriggerFor]="headerMenu"
-            [attr.title]="featureFlaggedDisable ? ('missingPermissions' | i18n) : ''"
+            [attr.title]="menuDisabled ? ('missingPermissions' | i18n) : ''"
             bitIconButton="bwi-ellipsis-v"
             size="small"
             type="button"
@@ -89,9 +84,7 @@
               {{ "assignToCollections" | i18n }}
             </button>
             <button
-              *ngIf="
-                (limitItemDeletion$ | async) ? (canRestoreSelected$ | async) : showBulkTrashOptions
-              "
+              *ngIf="canRestoreSelected$ | async"
               type="button"
               bitMenuItem
               (click)="bulkRestore()"
@@ -100,7 +93,7 @@
               {{ "restoreSelected" | i18n }}
             </button>
             <button
-              *ngIf="(limitItemDeletion$ | async) ? (canDeleteSelected$ | async) : showDelete"
+              *ngIf="canDeleteSelected$ | async"
               type="button"
               bitMenuItem
               (click)="bulkDelete()"
@@ -161,11 +154,7 @@
           [canAssignCollections]="canAssignCollections(item.cipher)"
           [canManageCollection]="canManageCollection(item.cipher)"
           [canDeleteCipher]="
-            cipherAuthorizationService.canDeleteCipher$(
-              item.cipher,
-              [item.cipher.collectionId],
-              showAdminActions
-            ) | async
+            cipherAuthorizationService.canDeleteCipher$(item.cipher, showAdminActions) | async
           "
           [canRestoreCipher]="
             cipherAuthorizationService.canRestoreCipher$(item.cipher, showAdminActions) | async
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
index 1c63ac85d34..3793db6f76a 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
@@ -6,8 +6,6 @@ import { Observable, combineLatest, map, of, startWith, switchMap } from "rxjs";
 
 import { CollectionView, Unassigned, CollectionAdminView } from "@bitwarden/admin-console/common";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
 import { SortDirection, TableDataSource } from "@bitwarden/components";
@@ -78,7 +76,6 @@ export class VaultItemsComponent {
 
   @Output() onEvent = new EventEmitter<VaultItemEvent>();
 
-  protected limitItemDeletion$ = this.configService.getFeatureFlag$(FeatureFlag.LimitItemDeletion);
   protected editableItems: VaultItem[] = [];
   protected dataSource = new TableDataSource<VaultItem>();
   protected selection = new SelectionModel<VaultItem>(true, [], true);
@@ -86,10 +83,7 @@ export class VaultItemsComponent {
   protected canRestoreSelected$: Observable<boolean>;
   protected disableMenu$: Observable<boolean>;
 
-  constructor(
-    protected cipherAuthorizationService: CipherAuthorizationService,
-    private configService: ConfigService,
-  ) {
+  constructor(protected cipherAuthorizationService: CipherAuthorizationService) {
     this.canDeleteSelected$ = this.selection.changed.pipe(
       startWith(null),
       switchMap(() => {
@@ -102,7 +96,7 @@ export class VaultItemsComponent {
         }
 
         const canDeleteCiphers$ = ciphers.map((c) =>
-          cipherAuthorizationService.canDeleteCipher$(c, [], this.showAdminActions),
+          cipherAuthorizationService.canDeleteCipher$(c, this.showAdminActions),
         );
 
         const canDeleteCollections = this.selection.selected
@@ -141,17 +135,14 @@ export class VaultItemsComponent {
       map((canRestore) => canRestore && this.showBulkTrashOptions),
     );
 
-    this.disableMenu$ = combineLatest([this.limitItemDeletion$, this.canDeleteSelected$]).pipe(
-      map(([enabled, canDelete]) => {
-        if (enabled) {
-          return (
-            !this.bulkMoveAllowed &&
-            !this.showAssignToCollections() &&
-            !canDelete &&
-            !this.showBulkEditCollectionAccess
-          );
-        }
-        return false;
+    this.disableMenu$ = this.canDeleteSelected$.pipe(
+      map((canDelete) => {
+        return (
+          !this.bulkMoveAllowed &&
+          !this.showAssignToCollections() &&
+          !canDelete &&
+          !this.showBulkEditCollectionAccess
+        );
       }),
     );
   }
@@ -205,15 +196,6 @@ export class VaultItemsComponent {
     return false;
   }
 
-  get disableMenu() {
-    return (
-      !this.bulkMoveAllowed &&
-      !this.showAssignToCollections() &&
-      !this.showDelete &&
-      !this.showBulkEditCollectionAccess
-    );
-  }
-
   get bulkAssignToCollectionsAllowed() {
     return this.showBulkAddToCollections && this.ciphers.length > 0;
   }
@@ -316,8 +298,11 @@ export class VaultItemsComponent {
 
   protected canAssignCollections(cipher: CipherView) {
     const organization = this.allOrganizations.find((o) => o.id === cipher.organizationId);
+    const editableCollections = this.allCollections.filter((c) => !c.readOnly);
+
     return (
-      (organization?.canEditAllCiphers && this.viewingOrgVault) || cipher.canAssignToCollections
+      (organization?.canEditAllCiphers && this.viewingOrgVault) ||
+      (cipher.canAssignToCollections && editableCollections.length > 0)
     );
   }
 
@@ -357,8 +342,6 @@ export class VaultItemsComponent {
     const ciphers: VaultItem[] = this.ciphers.map((cipher) => ({ cipher }));
     const items: VaultItem[] = [].concat(collections).concat(ciphers);
 
-    this.selection.clear();
-
     // All ciphers are selectable, collections only if they can be edited or deleted
     this.editableItems = items.filter(
       (item) =>
@@ -399,19 +382,22 @@ export class VaultItemsComponent {
     }
 
     if (this.selection.selected.length === 0) {
-      return true;
+      return false;
     }
 
     const hasPersonalItems = this.hasPersonalItems();
     const uniqueCipherOrgIds = this.getUniqueOrganizationIds();
+    const hasEditableCollections = this.allCollections.some((collection) => {
+      return !collection.readOnly;
+    });
 
     // Return false if items are from different organizations
     if (uniqueCipherOrgIds.size > 1) {
       return false;
     }
 
-    // If all items are personal, return based on personal items
-    if (uniqueCipherOrgIds.size === 0) {
+    // If all selected items are personal, return based on personal items
+    if (uniqueCipherOrgIds.size === 0 && hasEditableCollections) {
       return hasPersonalItems;
     }
 
@@ -423,7 +409,11 @@ export class VaultItemsComponent {
     const collectionNotSelected =
       this.selection.selected.filter((item) => item.collection).length === 0;
 
-    return (canEditOrManageAllCiphers || this.allCiphersHaveEditAccess()) && collectionNotSelected;
+    return (
+      (canEditOrManageAllCiphers || this.allCiphersHaveEditAccess()) &&
+      collectionNotSelected &&
+      hasEditableCollections
+    );
   }
 
   /**
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.module.ts b/apps/web/src/app/vault/components/vault-items/vault-items.module.ts
index e54a9c1141f..ab4f8bddb16 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.module.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
 import { RouterModule } from "@angular/router";
 
-import { TableModule } from "@bitwarden/components";
+import { ScrollLayoutDirective, TableModule } from "@bitwarden/components";
 
 import { CollectionNameBadgeComponent } from "../../../admin-console/organizations/collections";
 import { GroupBadgeModule } from "../../../admin-console/organizations/collections/group-badge/group-badge.module";
@@ -26,6 +26,7 @@ import { VaultItemsComponent } from "./vault-items.component";
     CollectionNameBadgeComponent,
     GroupBadgeModule,
     PipesModule,
+    ScrollLayoutDirective,
   ],
   declarations: [VaultItemsComponent, VaultCipherRowComponent, VaultCollectionRowComponent],
   exports: [VaultItemsComponent],
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts b/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts
index 55807ed855f..e65d423a57b 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts
@@ -2,7 +2,13 @@
 // @ts-strict-ignore
 import { importProvidersFrom } from "@angular/core";
 import { RouterModule } from "@angular/router";
-import { applicationConfig, Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+import {
+  applicationConfig,
+  componentWrapperDecorator,
+  Meta,
+  moduleMetadata,
+  StoryObj,
+} from "@storybook/angular";
 import { BehaviorSubject, of } from "rxjs";
 
 import {
@@ -29,6 +35,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { LayoutComponent } from "@bitwarden/components";
 
 import { GroupView } from "../../../admin-console/organizations/core";
 import { PreloadedEnglishI18nModule } from "../../../core/tests";
@@ -48,8 +56,9 @@ export default {
   title: "Web/Vault/Items",
   component: VaultItemsComponent,
   decorators: [
+    componentWrapperDecorator((story) => `<bit-layout>${story}</bit-layout>`),
     moduleMetadata({
-      imports: [VaultItemsModule, RouterModule],
+      imports: [VaultItemsModule, RouterModule, LayoutComponent],
       providers: [
         {
           provide: EnvironmentService,
@@ -125,6 +134,12 @@ export default {
             },
           },
         },
+        {
+          provide: RestrictedItemTypesService,
+          useValue: {
+            restricted$: of([]), // No restricted item types for this story
+          },
+        },
       ],
     }),
     applicationConfig({
diff --git a/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.spec.ts b/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.spec.ts
index 806cb51bfce..afb32738901 100644
--- a/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.spec.ts
+++ b/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.spec.ts
@@ -19,7 +19,6 @@ import {
 @Component({
   selector: "vault-cipher-form-generator",
   template: "",
-  standalone: true,
 })
 class MockCipherFormGenerator {
   @Input() type: "password" | "username" = "password";
@@ -71,10 +70,8 @@ describe("WebVaultGeneratorDialogComponent", () => {
     generator.valueGenerated.emit("test-password");
     fixture.detectChanges();
 
-    const button = fixture.debugElement.query(
-      By.css("[data-testid='select-button']"),
-    ).nativeElement;
-    expect(button.disabled).toBe(false);
+    const button = fixture.debugElement.query(By.css("[data-testid='select-button']"));
+    expect(button.attributes["aria-disabled"]).toBe(undefined);
   });
 
   it("should disable the button if no value has been generated", () => {
@@ -85,10 +82,8 @@ describe("WebVaultGeneratorDialogComponent", () => {
     generator.algorithmSelected.emit({ useGeneratedValue: "Use Password" } as any);
     fixture.detectChanges();
 
-    const button = fixture.debugElement.query(
-      By.css("[data-testid='select-button']"),
-    ).nativeElement;
-    expect(button.disabled).toBe(true);
+    const button = fixture.debugElement.query(By.css("[data-testid='select-button']"));
+    expect(button.attributes["aria-disabled"]).toBe("true");
   });
 
   it("should disable the button if no algorithm is selected", () => {
@@ -99,10 +94,8 @@ describe("WebVaultGeneratorDialogComponent", () => {
     generator.valueGenerated.emit("test-password");
     fixture.detectChanges();
 
-    const button = fixture.debugElement.query(
-      By.css("[data-testid='select-button']"),
-    ).nativeElement;
-    expect(button.disabled).toBe(true);
+    const button = fixture.debugElement.query(By.css("[data-testid='select-button']"));
+    expect(button.attributes["aria-disabled"]).toBe("true");
   });
 
   it("should close with selected value when confirmed", () => {
diff --git a/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.ts b/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.ts
index e20efa9dbb8..7454b4d10f0 100644
--- a/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.ts
+++ b/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.ts
@@ -4,6 +4,7 @@ import { CommonModule } from "@angular/common";
 import { Component, Inject } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   DIALOG_DATA,
   DialogConfig,
@@ -26,17 +27,16 @@ export interface WebVaultGeneratorDialogResult {
   generatedValue?: string;
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum WebVaultGeneratorDialogAction {
-  Selected = "selected",
-  Canceled = "canceled",
-}
+export const WebVaultGeneratorDialogAction = {
+  Selected: "selected",
+  Canceled: "canceled",
+} as const;
+
+type WebVaultGeneratorDialogAction = UnionOfValues<typeof WebVaultGeneratorDialogAction>;
 
 @Component({
   selector: "web-vault-generator-dialog",
   templateUrl: "./web-generator-dialog.component.html",
-  standalone: true,
   imports: [CommonModule, CipherFormGeneratorComponent, ButtonModule, DialogModule, I18nPipe],
 })
 export class WebVaultGeneratorDialogComponent {
diff --git a/apps/web/src/app/vault/individual-vault/add-edit-v2.component.ts b/apps/web/src/app/vault/individual-vault/add-edit-v2.component.ts
index 621e0ec88c5..bfad71aca4b 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit-v2.component.ts
+++ b/apps/web/src/app/vault/individual-vault/add-edit-v2.component.ts
@@ -11,6 +11,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   DIALOG_DATA,
   DialogConfig,
@@ -35,13 +36,13 @@ import { WebCipherFormGenerationService } from "../services/web-cipher-form-gene
 /**
  * The result of the AddEditCipherDialogV2 component.
  */
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum AddEditCipherDialogResult {
-  Edited = "edited",
-  Added = "added",
-  Canceled = "canceled",
-}
+export const AddEditCipherDialogResult = {
+  Edited: "edited",
+  Added: "added",
+  Canceled: "canceled",
+} as const;
+
+type AddEditCipherDialogResult = UnionOfValues<typeof AddEditCipherDialogResult>;
 
 /**
  * The close result of the AddEditCipherDialogV2 component.
@@ -64,7 +65,6 @@ export interface AddEditCipherDialogCloseResult {
 @Component({
   selector: "app-vault-add-edit-v2",
   templateUrl: "add-edit-v2.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     AsyncActionsModule,
diff --git a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
index 43a44cf5066..128afdcccfc 100644
--- a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
+++ b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
@@ -12,6 +12,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherBulkDeleteRequest } from "@bitwarden/common/vault/models/request/cipher-bulk-delete.request";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   DIALOG_DATA,
   DialogConfig,
@@ -29,12 +30,12 @@ export interface BulkDeleteDialogParams {
   unassignedCiphers?: string[];
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum BulkDeleteDialogResult {
-  Deleted = "deleted",
-  Canceled = "canceled",
-}
+export const BulkDeleteDialogResult = {
+  Deleted: "deleted",
+  Canceled: "canceled",
+} as const;
+
+type BulkDeleteDialogResult = UnionOfValues<typeof BulkDeleteDialogResult>;
 
 /**
  * Strongly typed helper to open a BulkDeleteDialog
diff --git a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts
index dc262b01334..ef43a3ead81 100644
--- a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts
+++ b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts
@@ -11,6 +11,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   DialogConfig,
   DialogRef,
@@ -23,12 +24,12 @@ export interface BulkMoveDialogParams {
   cipherIds?: string[];
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum BulkMoveDialogResult {
-  Moved = "moved",
-  Canceled = "canceled",
-}
+export const BulkMoveDialogResult = {
+  Moved: "moved",
+  Canceled: "canceled",
+} as const;
+
+type BulkMoveDialogResult = UnionOfValues<typeof BulkMoveDialogResult>;
 
 /**
  * Strongly typed helper to open a BulkMoveDialog
diff --git a/apps/web/src/app/vault/individual-vault/folder-add-edit.component.ts b/apps/web/src/app/vault/individual-vault/folder-add-edit.component.ts
index 3050c00dd6c..15c3e18544c 100644
--- a/apps/web/src/app/vault/individual-vault/folder-add-edit.component.ts
+++ b/apps/web/src/app/vault/individual-vault/folder-add-edit.component.ts
@@ -11,6 +11,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   DIALOG_DATA,
   DialogConfig,
@@ -114,13 +115,13 @@ export interface FolderAddEditDialogParams {
   folderId: string;
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum FolderAddEditDialogResult {
-  Deleted = "deleted",
-  Canceled = "canceled",
-  Saved = "saved",
-}
+export const FolderAddEditDialogResult = {
+  Deleted: "deleted",
+  Canceled: "canceled",
+  Saved: "saved",
+} as const;
+
+export type FolderAddEditDialogResult = UnionOfValues<typeof FolderAddEditDialogResult>;
 
 /**
  * Strongly typed helper to open a FolderAddEdit dialog
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.spec.ts b/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.spec.ts
index 4ce65b9f771..c97b23b1456 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.spec.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.spec.ts
@@ -1,16 +1,19 @@
 import { TestBed } from "@angular/core/testing";
-import { BehaviorSubject, firstValueFrom, take, timeout } from "rxjs";
+import { mock, MockProxy } from "jest-mock-extended";
+import { BehaviorSubject, firstValueFrom, of, take, timeout } from "rxjs";
 
 import {
+  AuthRequestServiceAbstraction,
   UserDecryptionOptions,
   UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
 import { AccountInfo, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
-import { DeviceResponse } from "@bitwarden/common/auth/abstractions/devices/responses/device.response";
 import { DeviceView } from "@bitwarden/common/auth/abstractions/devices/views/device.view";
+import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { DeviceType } from "@bitwarden/common/enums";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { StateProvider } from "@bitwarden/common/platform/state";
@@ -41,11 +44,15 @@ describe("VaultBannersService", () => {
     [userId]: { email: "test@bitwarden.com", emailVerified: true, name: "name" } as AccountInfo,
   });
   const devices$ = new BehaviorSubject<DeviceView[]>([]);
+  const pendingAuthRequests$ = new BehaviorSubject<Array<AuthRequestResponse>>([]);
+  let configService: MockProxy<ConfigService>;
 
   beforeEach(() => {
     lastSync$.next(new Date("2024-05-14"));
     isSelfHost.mockClear();
     getEmailVerified.mockClear().mockResolvedValue(true);
+    configService = mock<ConfigService>();
+    configService.getFeatureFlag$.mockImplementation(() => of(true));
 
     TestBed.configureTestingModule({
       providers: [
@@ -88,6 +95,14 @@ describe("VaultBannersService", () => {
           provide: DevicesServiceAbstraction,
           useValue: { getDevices$: () => devices$ },
         },
+        {
+          provide: AuthRequestServiceAbstraction,
+          useValue: { getPendingAuthRequests$: () => pendingAuthRequests$ },
+        },
+        {
+          provide: ConfigService,
+          useValue: configService,
+        },
       ],
     });
   });
@@ -286,31 +301,25 @@ describe("VaultBannersService", () => {
 
   describe("PendingAuthRequest", () => {
     const now = new Date();
-    let deviceResponse: DeviceResponse;
+    let authRequestResponse: AuthRequestResponse;
 
     beforeEach(() => {
-      deviceResponse = new DeviceResponse({
-        Id: "device1",
-        UserId: userId,
-        Name: "Test Device",
-        Identifier: "test-device",
-        Type: DeviceType.Android,
-        CreationDate: now.toISOString(),
-        RevisionDate: now.toISOString(),
-        IsTrusted: false,
+      authRequestResponse = new AuthRequestResponse({
+        id: "authRequest1",
+        deviceId: "device1",
+        deviceName: "Test Device",
+        deviceType: DeviceType.Android,
+        creationDate: now.toISOString(),
+        requestApproved: null,
       });
       // Reset devices list, single user state, and active user state before each test
-      devices$.next([]);
+      pendingAuthRequests$.next([]);
       fakeStateProvider.singleUser.states.clear();
       fakeStateProvider.activeUser.states.clear();
     });
 
     it("shows pending auth request banner when there is a pending request", async () => {
-      deviceResponse.devicePendingAuthRequest = {
-        id: "123",
-        creationDate: now.toISOString(),
-      };
-      devices$.next([new DeviceView(deviceResponse)]);
+      pendingAuthRequests$.next([new AuthRequestResponse(authRequestResponse)]);
 
       service = TestBed.inject(VaultBannersService);
 
@@ -318,8 +327,7 @@ describe("VaultBannersService", () => {
     });
 
     it("does not show pending auth request banner when there are no pending requests", async () => {
-      deviceResponse.devicePendingAuthRequest = null;
-      devices$.next([new DeviceView(deviceResponse)]);
+      pendingAuthRequests$.next([]);
 
       service = TestBed.inject(VaultBannersService);
 
@@ -327,11 +335,7 @@ describe("VaultBannersService", () => {
     });
 
     it("dismisses pending auth request banner", async () => {
-      deviceResponse.devicePendingAuthRequest = {
-        id: "123",
-        creationDate: now.toISOString(),
-      };
-      devices$.next([new DeviceView(deviceResponse)]);
+      pendingAuthRequests$.next([new AuthRequestResponse(authRequestResponse)]);
 
       service = TestBed.inject(VaultBannersService);
 
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts b/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts
index ca16541f88f..dd50c832cc6 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts
@@ -1,10 +1,15 @@
 import { Injectable } from "@angular/core";
 import { Observable, combineLatest, firstValueFrom, map, filter, mergeMap, take } from "rxjs";
 
-import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
+import {
+  AuthRequestServiceAbstraction,
+  UserDecryptionOptionsServiceAbstraction,
+} from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import {
   StateProvider,
@@ -15,17 +20,18 @@ import {
 } from "@bitwarden/common/platform/state";
 import { UserId } from "@bitwarden/common/types/guid";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import { PBKDF2KdfConfig, KdfConfigService, KdfType } from "@bitwarden/key-management";
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum VisibleVaultBanner {
-  KDFSettings = "kdf-settings",
-  OutdatedBrowser = "outdated-browser",
-  Premium = "premium",
-  VerifyEmail = "verify-email",
-  PendingAuthRequest = "pending-auth-request",
-}
+export const VisibleVaultBanner = {
+  KDFSettings: "kdf-settings",
+  OutdatedBrowser: "outdated-browser",
+  Premium: "premium",
+  VerifyEmail: "verify-email",
+  PendingAuthRequest: "pending-auth-request",
+} as const;
+
+export type VisibleVaultBanner = UnionOfValues<typeof VisibleVaultBanner>;
 
 type PremiumBannerReprompt = {
   numberOfDismissals: number;
@@ -34,7 +40,7 @@ type PremiumBannerReprompt = {
 };
 
 /** Banners that will be re-shown on a new session */
-type SessionBanners = Omit<VisibleVaultBanner, VisibleVaultBanner.Premium>;
+type SessionBanners = Omit<VisibleVaultBanner, typeof VisibleVaultBanner.Premium>;
 
 export const PREMIUM_BANNER_REPROMPT_KEY = new UserKeyDefinition<PremiumBannerReprompt>(
   PREMIUM_BANNER_DISK_LOCAL,
@@ -65,20 +71,33 @@ export class VaultBannersService {
     private syncService: SyncService,
     private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
     private devicesService: DevicesServiceAbstraction,
+    private authRequestService: AuthRequestServiceAbstraction,
+    private configService: ConfigService,
   ) {}
 
   /** Returns true when the pending auth request banner should be shown */
   async shouldShowPendingAuthRequestBanner(userId: UserId): Promise<boolean> {
-    const devices = await firstValueFrom(this.devicesService.getDevices$());
-    const hasPendingRequest = devices.some(
-      (device) => device.response?.devicePendingAuthRequest != null,
-    );
-
     const alreadyDismissed = (await this.getBannerDismissedState(userId)).includes(
       VisibleVaultBanner.PendingAuthRequest,
     );
+    // TODO: PM-20439 remove feature flag
+    const browserLoginApprovalFeatureFlag = await firstValueFrom(
+      this.configService.getFeatureFlag$(FeatureFlag.PM14938_BrowserExtensionLoginApproval),
+    );
+    if (browserLoginApprovalFeatureFlag === true) {
+      const pendingAuthRequests = await firstValueFrom(
+        this.authRequestService.getPendingAuthRequests$(),
+      );
 
-    return hasPendingRequest && !alreadyDismissed;
+      return pendingAuthRequests.length > 0 && !alreadyDismissed;
+    } else {
+      const devices = await firstValueFrom(this.devicesService.getDevices$());
+      const hasPendingRequest = devices.some(
+        (device) => device.response?.devicePendingAuthRequest != null,
+      );
+
+      return hasPendingRequest && !alreadyDismissed;
+    }
   }
 
   shouldShowPremiumBanner$(userId: UserId): Observable<boolean> {
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.spec.ts b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.spec.ts
index 997d9bc3fe3..197b6426468 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.spec.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.spec.ts
@@ -8,6 +8,7 @@ import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { MessageListener } from "@bitwarden/common/platform/messaging";
@@ -87,6 +88,10 @@ describe("VaultBannersComponent", () => {
             allMessages$: messageSubject.asObservable(),
           }),
         },
+        {
+          provide: ConfigService,
+          useValue: mock<ConfigService>(),
+        },
       ],
     })
       .overrideProvider(VaultBannersService, { useValue: bannerService })
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts
index 5f5fc1e218d..4dd5bb7ff2d 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts
@@ -1,9 +1,11 @@
 import { Component, Input, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { Router } from "@angular/router";
-import { firstValueFrom, map, Observable, switchMap, filter } from "rxjs";
+import { filter, firstValueFrom, map, Observable, switchMap } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessageListener } from "@bitwarden/common/platform/messaging";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -16,7 +18,6 @@ import { SharedModule } from "../../../shared";
 import { VaultBannersService, VisibleVaultBanner } from "./services/vault-banners.service";
 
 @Component({
-  standalone: true,
   selector: "app-vault-banners",
   templateUrl: "./vault-banners.component.html",
   imports: [VerifyEmailComponent, SharedModule, BannerModule],
@@ -36,6 +37,7 @@ export class VaultBannersComponent implements OnInit {
     private i18nService: I18nService,
     private accountService: AccountService,
     private messageListener: MessageListener,
+    private configService: ConfigService,
   ) {
     this.premiumBannerVisible$ = this.activeUserId$.pipe(
       filter((userId): userId is UserId => userId != null),
@@ -69,12 +71,16 @@ export class VaultBannersComponent implements OnInit {
   }
 
   async navigateToPaymentMethod(organizationId: string): Promise<void> {
+    const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
+      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
+    );
+    const route = managePaymentDetailsOutsideCheckout ? "payment-details" : "payment-method";
     const navigationExtras = {
       state: { launchPaymentModalAutomatically: true },
     };
 
     await this.router.navigate(
-      ["organizations", organizationId, "billing", "payment-method"],
+      ["organizations", organizationId, "billing", route],
       navigationExtras,
     );
   }
@@ -99,7 +105,7 @@ export class VaultBannersComponent implements OnInit {
       showVerifyEmail ? VisibleVaultBanner.VerifyEmail : null,
       showLowKdf ? VisibleVaultBanner.KDFSettings : null,
       showPendingAuthRequest ? VisibleVaultBanner.PendingAuthRequest : null,
-    ].filter((banner): banner is VisibleVaultBanner => banner !== null); // ensures the filtered array contains only VisibleVaultBanner values
+    ].filter((banner) => banner !== null);
   }
 
   freeTrialMessage(organization: FreeTrial) {
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
index 6b974296f21..61dd3e9ca80 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
@@ -1,8 +1,15 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component, EventEmitter, inject, Input, OnDestroy, OnInit, Output } from "@angular/core";
 import { Router } from "@angular/router";
-import { firstValueFrom, merge, Subject, switchMap, takeUntil } from "rxjs";
+import {
+  distinctUntilChanged,
+  firstValueFrom,
+  map,
+  merge,
+  shareReplay,
+  Subject,
+  switchMap,
+  takeUntil,
+} from "rxjs";
 
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
@@ -15,6 +22,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
 import { TrialFlowService } from "../../../../billing/services/trial-flow.service";
@@ -56,6 +64,45 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     return this.filters ? Object.values(this.filters) : [];
   }
 
+  allTypeFilters: CipherTypeFilter[] = [
+    {
+      id: "favorites",
+      name: this.i18nService.t("favorites"),
+      type: "favorites",
+      icon: "bwi-star",
+    },
+    {
+      id: "login",
+      name: this.i18nService.t("typeLogin"),
+      type: CipherType.Login,
+      icon: "bwi-globe",
+    },
+    {
+      id: "card",
+      name: this.i18nService.t("typeCard"),
+      type: CipherType.Card,
+      icon: "bwi-credit-card",
+    },
+    {
+      id: "identity",
+      name: this.i18nService.t("typeIdentity"),
+      type: CipherType.Identity,
+      icon: "bwi-id-card",
+    },
+    {
+      id: "note",
+      name: this.i18nService.t("note"),
+      type: CipherType.SecureNote,
+      icon: "bwi-sticky-note",
+    },
+    {
+      id: "sshKey",
+      name: this.i18nService.t("typeSshKey"),
+      type: CipherType.SshKey,
+      icon: "bwi-key",
+    },
+  ];
+
   get searchPlaceholder() {
     if (this.activeFilter.isFavorites) {
       return "searchFavorites";
@@ -107,12 +154,17 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     protected dialogService: DialogService,
     protected configService: ConfigService,
     protected accountService: AccountService,
+    protected restrictedItemTypesService: RestrictedItemTypesService,
   ) {}
 
   async ngOnInit(): Promise<void> {
     this.filters = await this.buildAllFilters();
-    this.activeFilter.selectedCipherTypeNode =
-      (await this.getDefaultFilter()) as TreeNode<CipherTypeFilter>;
+    if (this.filters?.typeFilter?.data$) {
+      this.activeFilter.selectedCipherTypeNode = (await firstValueFrom(
+        this.filters?.typeFilter.data$,
+      )) as TreeNode<CipherTypeFilter>;
+    }
+
     this.isLoaded = true;
 
     // Without refactoring the entire component, we need to manually update the organization filter whenever the policies update
@@ -123,7 +175,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
           merge(
             this.policyService.policiesByType$(PolicyType.SingleOrg, userId).pipe(getFirstPolicy),
             this.policyService
-              .policiesByType$(PolicyType.PersonalOwnership, userId)
+              .policiesByType$(PolicyType.OrganizationDataOwnership, userId)
               .pipe(getFirstPolicy),
           ),
         ),
@@ -133,6 +185,9 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
         takeUntil(this.destroy$),
       )
       .subscribe((orgFilters) => {
+        if (!this.filters) {
+          return;
+        }
         this.filters.organizationFilter = orgFilters;
       });
   }
@@ -151,7 +206,6 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     if (!orgNode?.node.enabled) {
       this.toastService.showToast({
         variant: "error",
-        title: null,
         message: this.i18nService.t("disabledOrganizationFilterError"),
       });
       const metadata = await this.billingApiService.getOrganizationBillingMetadata(orgNode.node.id);
@@ -190,10 +244,6 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     this.onEditFolder.emit(folder);
   };
 
-  async getDefaultFilter(): Promise<TreeNode<VaultFilterType>> {
-    return await firstValueFrom(this.filters?.typeFilter.data$);
-  }
-
   async buildAllFilters(): Promise<VaultFilterList> {
     const builderFilter = {} as VaultFilterList;
     builderFilter.organizationFilter = await this.addOrganizationFilter();
@@ -218,14 +268,14 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
       this.accountService.activeAccount$.pipe(
         getUserId,
         switchMap((userId) =>
-          this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
+          this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
         ),
       ),
     );
 
     const addAction = !singleOrgPolicy
       ? { text: "newOrganization", route: "/create-organization" }
-      : null;
+      : undefined;
 
     const orgFilterSection: VaultFilterSection = {
       data$: this.vaultFilterService.organizationTree$,
@@ -233,7 +283,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
         showHeader: !(singleOrgPolicy && personalVaultPolicy),
         isSelectable: true,
       },
-      action: this.applyOrganizationFilter,
+      action: this.applyOrganizationFilter as (orgNode: TreeNode<VaultFilterType>) => Promise<void>,
       options: { component: OrganizationOptionsComponent },
       add: addAction,
       divider: true,
@@ -243,55 +293,31 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
   }
 
   protected async addTypeFilter(excludeTypes: CipherStatus[] = []): Promise<VaultFilterSection> {
-    const allTypeFilters: CipherTypeFilter[] = [
-      {
-        id: "favorites",
-        name: this.i18nService.t("favorites"),
-        type: "favorites",
-        icon: "bwi-star",
-      },
-      {
-        id: "login",
-        name: this.i18nService.t("typeLogin"),
-        type: CipherType.Login,
-        icon: "bwi-globe",
-      },
-      {
-        id: "card",
-        name: this.i18nService.t("typeCard"),
-        type: CipherType.Card,
-        icon: "bwi-credit-card",
-      },
-      {
-        id: "identity",
-        name: this.i18nService.t("typeIdentity"),
-        type: CipherType.Identity,
-        icon: "bwi-id-card",
-      },
-      {
-        id: "note",
-        name: this.i18nService.t("note"),
-        type: CipherType.SecureNote,
-        icon: "bwi-sticky-note",
-      },
-      {
-        id: "sshKey",
-        name: this.i18nService.t("typeSshKey"),
-        type: CipherType.SshKey,
-        icon: "bwi-key",
-      },
-    ];
+    const allFilter: CipherTypeFilter = { id: "AllItems", name: "allItems", type: "all", icon: "" };
+
+    const data$ = this.restrictedItemTypesService.restricted$.pipe(
+      map((restricted) => {
+        // List of types restricted by all orgs
+        const restrictedByAll = restricted
+          .filter((r) => r.allowViewOrgIds.length === 0)
+          .map((r) => r.cipherType);
+        const toExclude = [...excludeTypes, ...restrictedByAll];
+        return this.allTypeFilters.filter(
+          (f) => typeof f.type === "string" || !toExclude.includes(f.type),
+        );
+      }),
+      switchMap((allowed) => this.vaultFilterService.buildTypeTree(allFilter, allowed)),
+      distinctUntilChanged(),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
 
     const typeFilterSection: VaultFilterSection = {
-      data$: this.vaultFilterService.buildTypeTree(
-        { id: "AllItems", name: "allItems", type: "all", icon: "" },
-        allTypeFilters.filter((f) => !excludeTypes.includes(f.type)),
-      ),
+      data$,
       header: {
         showHeader: true,
         isSelectable: true,
       },
-      action: this.applyTypeFilter,
+      action: this.applyTypeFilter as (filterNode: TreeNode<VaultFilterType>) => Promise<void>,
     };
     return typeFilterSection;
   }
@@ -303,10 +329,10 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
         showHeader: true,
         isSelectable: false,
       },
-      action: this.applyFolderFilter,
+      action: this.applyFolderFilter as (filterNode: TreeNode<VaultFilterType>) => Promise<void>,
       edit: {
         filterName: this.i18nService.t("folder"),
-        action: this.editFolder,
+        action: this.editFolder as (filter: VaultFilterType) => void,
       },
     };
     return folderFilterSection;
@@ -319,7 +345,9 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
         showHeader: true,
         isSelectable: true,
       },
-      action: this.applyCollectionFilter,
+      action: this.applyCollectionFilter as (
+        filterNode: TreeNode<VaultFilterType>,
+      ) => Promise<void>,
     };
     return collectionFilterSection;
   }
@@ -346,7 +374,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
         showHeader: false,
         isSelectable: true,
       },
-      action: this.applyTypeFilter,
+      action: this.applyTypeFilter as (filterNode: TreeNode<VaultFilterType>) => Promise<void>,
     };
     return trashFilterSection;
   }
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts
index 559d0cc60c5..2154ecff1b7 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts
@@ -5,13 +5,20 @@ import {
 import { FakeSingleUserState } from "@bitwarden/common/../spec/fake-state";
 import { FakeStateProvider } from "@bitwarden/common/../spec/fake-state-provider";
 import { mock, MockProxy } from "jest-mock-extended";
-import { firstValueFrom, ReplaySubject } from "rxjs";
+import { firstValueFrom, of, ReplaySubject } from "rxjs";
 
-import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
+import {
+  CollectionService,
+  CollectionType,
+  CollectionTypes,
+  CollectionView,
+} from "@bitwarden/admin-console/common";
+import * as vaultFilterSvc from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -23,6 +30,10 @@ import { COLLAPSED_GROUPINGS } from "@bitwarden/common/vault/services/key-state/
 
 import { VaultFilterService } from "./vault-filter.service";
 
+jest.mock("@bitwarden/angular/vault/vault-filter/services/vault-filter.service", () => ({
+  sortDefaultCollections: jest.fn(() => []),
+}));
+
 describe("vault filter service", () => {
   let vaultFilterService: VaultFilterService;
 
@@ -36,9 +47,10 @@ describe("vault filter service", () => {
   let folderViews: ReplaySubject<FolderView[]>;
   let collectionViews: ReplaySubject<CollectionView[]>;
   let cipherViews: ReplaySubject<CipherView[]>;
-  let personalOwnershipPolicy: ReplaySubject<boolean>;
+  let organizationDataOwnershipPolicy: ReplaySubject<boolean>;
   let singleOrgPolicy: ReplaySubject<boolean>;
   let stateProvider: FakeStateProvider;
+  let configService: MockProxy<ConfigService>;
 
   const mockUserId = Utils.newGuid() as UserId;
   let accountService: FakeAccountService;
@@ -54,20 +66,22 @@ describe("vault filter service", () => {
     stateProvider = new FakeStateProvider(accountService);
     i18nService.collator = new Intl.Collator("en-US");
     collectionService = mock<CollectionService>();
+    configService = mock<ConfigService>();
 
     organizations = new ReplaySubject<Organization[]>(1);
     folderViews = new ReplaySubject<FolderView[]>(1);
     collectionViews = new ReplaySubject<CollectionView[]>(1);
     cipherViews = new ReplaySubject<CipherView[]>(1);
-    personalOwnershipPolicy = new ReplaySubject<boolean>(1);
+    organizationDataOwnershipPolicy = new ReplaySubject<boolean>(1);
     singleOrgPolicy = new ReplaySubject<boolean>(1);
 
+    configService.getFeatureFlag$.mockReturnValue(of(true));
     organizationService.memberOrganizations$.mockReturnValue(organizations);
     folderService.folderViews$.mockReturnValue(folderViews);
     collectionService.decryptedCollections$ = collectionViews;
     policyService.policyAppliesToUser$
-      .calledWith(PolicyType.PersonalOwnership, mockUserId)
-      .mockReturnValue(personalOwnershipPolicy);
+      .calledWith(PolicyType.OrganizationDataOwnership, mockUserId)
+      .mockReturnValue(organizationDataOwnershipPolicy);
     policyService.policyAppliesToUser$
       .calledWith(PolicyType.SingleOrg, mockUserId)
       .mockReturnValue(singleOrgPolicy);
@@ -82,8 +96,10 @@ describe("vault filter service", () => {
       stateProvider,
       collectionService,
       accountService,
+      configService,
     );
     collapsedGroupingsState = stateProvider.singleUser.getFake(mockUserId, COLLAPSED_GROUPINGS);
+    organizations.next([]);
   });
 
   describe("collapsed filter nodes", () => {
@@ -113,7 +129,7 @@ describe("vault filter service", () => {
     beforeEach(() => {
       const storedOrgs = [createOrganization("1", "org1"), createOrganization("2", "org2")];
       organizations.next(storedOrgs);
-      personalOwnershipPolicy.next(false);
+      organizationDataOwnershipPolicy.next(false);
       singleOrgPolicy.next(false);
     });
 
@@ -125,8 +141,8 @@ describe("vault filter service", () => {
       expect(tree.children.find((o) => o.node.name === "org2"));
     });
 
-    it("hides My Vault if personal ownership policy is enabled", async () => {
-      personalOwnershipPolicy.next(true);
+    it("hides My Vault if organization data ownership policy is enabled", async () => {
+      organizationDataOwnershipPolicy.next(true);
 
       const tree = await firstValueFrom(vaultFilterService.organizationTree$);
 
@@ -144,9 +160,9 @@ describe("vault filter service", () => {
       expect(tree.children.find((o) => o.node.id === "MyVault"));
     });
 
-    it("returns 1 organization if both single organization and personal ownership policies are enabled", async () => {
+    it("returns 1 organization if both single organization and organization data ownership policies are enabled", async () => {
       singleOrgPolicy.next(true);
-      personalOwnershipPolicy.next(true);
+      organizationDataOwnershipPolicy.next(true);
 
       const tree = await firstValueFrom(vaultFilterService.organizationTree$);
 
@@ -285,6 +301,40 @@ describe("vault filter service", () => {
         const c3 = c1.children[0];
         expect(c3.parent.node.id).toEqual("id-1");
       });
+
+      it.only("calls sortDefaultCollections with the correct args", async () => {
+        const storedOrgs = [
+          createOrganization("id-defaultOrg1", "org1"),
+          createOrganization("id-defaultOrg2", "org2"),
+        ];
+        organizations.next(storedOrgs);
+
+        const storedCollections = [
+          createCollectionView("id-2", "Collection 2", "org test id"),
+          createCollectionView("id-1", "Collection 1", "org test id"),
+          createCollectionView(
+            "id-3",
+            "Default User Collection - Org 2",
+            "id-defaultOrg2",
+            CollectionTypes.DefaultUserCollection,
+          ),
+          createCollectionView(
+            "id-4",
+            "Default User Collection - Org 1",
+            "id-defaultOrg1",
+            CollectionTypes.DefaultUserCollection,
+          ),
+        ];
+        collectionViews.next(storedCollections);
+
+        await firstValueFrom(vaultFilterService.collectionTree$);
+
+        expect(vaultFilterSvc.sortDefaultCollections).toHaveBeenCalledWith(
+          storedCollections,
+          storedOrgs,
+          i18nService.collator,
+        );
+      });
     });
   });
 
@@ -312,11 +362,17 @@ describe("vault filter service", () => {
     return folder;
   }
 
-  function createCollectionView(id: string, name: string, orgId: string): CollectionView {
+  function createCollectionView(
+    id: string,
+    name: string,
+    orgId: string,
+    type?: CollectionType,
+  ): CollectionView {
     const collection = new CollectionView();
     collection.id = id;
     collection.name = name;
     collection.organizationId = orgId;
+    collection.type = type || CollectionTypes.SharedCollection;
     return collection;
   }
 });
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
index 1749cc00ae3..f326034e806 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
@@ -18,12 +18,15 @@ import {
   CollectionService,
   CollectionView,
 } from "@bitwarden/admin-console/common";
+import { sortDefaultCollections } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SingleUserState, StateProvider } from "@bitwarden/common/platform/state";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -67,12 +70,12 @@ export class VaultFilterService implements VaultFilterServiceAbstraction {
     ),
     this.activeUserId$.pipe(
       switchMap((userId) =>
-        this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
+        this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
       ),
     ),
   ]).pipe(
-    switchMap(([orgs, singleOrgPolicy, personalOwnershipPolicy]) =>
-      this.buildOrganizationTree(orgs, singleOrgPolicy, personalOwnershipPolicy),
+    switchMap(([orgs, singleOrgPolicy, organizationDataOwnershipPolicy]) =>
+      this.buildOrganizationTree(orgs, singleOrgPolicy, organizationDataOwnershipPolicy),
     ),
   );
 
@@ -104,8 +107,14 @@ export class VaultFilterService implements VaultFilterServiceAbstraction {
       }),
     );
 
-  collectionTree$: Observable<TreeNode<CollectionFilter>> = this.filteredCollections$.pipe(
-    map((collections) => this.buildCollectionTree(collections)),
+  collectionTree$: Observable<TreeNode<CollectionFilter>> = combineLatest([
+    this.filteredCollections$,
+    this.memberOrganizations$,
+    this.configService.getFeatureFlag$(FeatureFlag.CreateDefaultLocation),
+  ]).pipe(
+    map(([collections, organizations, defaultCollectionsFlagEnabled]) =>
+      this.buildCollectionTree(collections, organizations, defaultCollectionsFlagEnabled),
+    ),
   );
 
   cipherTypeTree$: Observable<TreeNode<CipherTypeFilter>> = this.buildCipherTypeTree();
@@ -123,6 +132,7 @@ export class VaultFilterService implements VaultFilterServiceAbstraction {
     protected stateProvider: StateProvider,
     protected collectionService: CollectionService,
     protected accountService: AccountService,
+    protected configService: ConfigService,
   ) {}
 
   async getCollectionNodeFromTree(id: string) {
@@ -166,10 +176,10 @@ export class VaultFilterService implements VaultFilterServiceAbstraction {
   protected async buildOrganizationTree(
     orgs: Organization[],
     singleOrgPolicy: boolean,
-    personalOwnershipPolicy: boolean,
+    organizationDataOwnershipPolicy: boolean,
   ): Promise<TreeNode<OrganizationFilter>> {
     const headNode = this.getOrganizationFilterHead();
-    if (!personalOwnershipPolicy) {
+    if (!organizationDataOwnershipPolicy) {
       const myVaultNode = this.getOrganizationFilterMyVault();
       headNode.children.push(myVaultNode);
     }
@@ -227,31 +237,39 @@ export class VaultFilterService implements VaultFilterServiceAbstraction {
       : storedCollections;
   }
 
-  protected buildCollectionTree(collections?: CollectionView[]): TreeNode<CollectionFilter> {
+  protected buildCollectionTree(
+    collections?: CollectionView[],
+    orgs?: Organization[],
+    defaultCollectionsFlagEnabled?: boolean,
+  ): TreeNode<CollectionFilter> {
     const headNode = this.getCollectionFilterHead();
     if (!collections) {
       return headNode;
     }
     const nodes: TreeNode<CollectionFilter>[] = [];
-    collections
-      .sort((a, b) => this.i18nService.collator.compare(a.name, b.name))
-      .forEach((c) => {
-        const collectionCopy = new CollectionView() as CollectionFilter;
-        collectionCopy.id = c.id;
-        collectionCopy.organizationId = c.organizationId;
-        collectionCopy.icon = "bwi-collection-shared";
-        if (c instanceof CollectionAdminView) {
-          collectionCopy.groups = c.groups;
-          collectionCopy.assigned = c.assigned;
-        }
-        const parts =
-          c.name != null ? c.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter) : [];
-        ServiceUtils.nestedTraverse(nodes, 0, parts, collectionCopy, null, NestingDelimiter);
-      });
+
+    if (defaultCollectionsFlagEnabled) {
+      collections = sortDefaultCollections(collections, orgs, this.i18nService.collator);
+    }
+
+    collections.forEach((c) => {
+      const collectionCopy = new CollectionView() as CollectionFilter;
+      collectionCopy.id = c.id;
+      collectionCopy.organizationId = c.organizationId;
+      collectionCopy.icon = "bwi-collection-shared";
+      if (c instanceof CollectionAdminView) {
+        collectionCopy.groups = c.groups;
+        collectionCopy.assigned = c.assigned;
+      }
+      const parts = c.name != null ? c.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter) : [];
+      ServiceUtils.nestedTraverse(nodes, 0, parts, collectionCopy, null, NestingDelimiter);
+    });
+
     nodes.forEach((n) => {
       n.parent = headNode;
       headNode.children.push(n);
     });
+
     return headNode;
   }
 
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts
index 7566dbdc507..4210a6c8129 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts
@@ -1,6 +1,7 @@
 import { Observable } from "rxjs";
 
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 
 import {
   CipherTypeFilter,
@@ -15,15 +16,15 @@ export type VaultFilterType =
   | FolderFilter
   | CollectionFilter;
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum VaultFilterLabel {
-  OrganizationFilter = "organizationFilter",
-  TypeFilter = "typeFilter",
-  FolderFilter = "folderFilter",
-  CollectionFilter = "collectionFilter",
-  TrashFilter = "trashFilter",
-}
+export const VaultFilterLabel = {
+  OrganizationFilter: "organizationFilter",
+  TypeFilter: "typeFilter",
+  FolderFilter: "folderFilter",
+  CollectionFilter: "collectionFilter",
+  TrashFilter: "trashFilter",
+} as const;
+
+type VaultFilterLabel = UnionOfValues<typeof VaultFilterLabel>;
 
 export type VaultFilterSection = {
   data$: Observable<TreeNode<VaultFilterType>>;
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts
index c486ad800ab..7f001f3aab2 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherType, isCipherType } from "@bitwarden/common/vault/enums";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
@@ -77,8 +77,8 @@ export class VaultFilter {
   }
 
   get cipherType(): CipherType {
-    return this.selectedCipherTypeNode?.node.type in CipherType
-      ? (this.selectedCipherTypeNode?.node.type as CipherType)
+    return isCipherType(this.selectedCipherTypeNode?.node.type)
+      ? this.selectedCipherTypeNode?.node.type
       : null;
   }
 
diff --git a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html
index af95a71ba8d..4ef8204cdfc 100644
--- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html
@@ -81,26 +81,12 @@
         {{ "new" | i18n }}<i class="bwi tw-ml-2" aria-hidden="true"></i>
       </button>
       <bit-menu #addOptions aria-labelledby="newItemDropdown">
-        <button type="button" bitMenuItem (click)="addCipher(CipherType.Login)">
-          <i class="bwi bwi-globe" slot="start" aria-hidden="true"></i>
-          {{ "typeLogin" | i18n }}
-        </button>
-        <button type="button" bitMenuItem (click)="addCipher(CipherType.Card)">
-          <i class="bwi bwi-credit-card" slot="start" aria-hidden="true"></i>
-          {{ "typeCard" | i18n }}
-        </button>
-        <button type="button" bitMenuItem (click)="addCipher(CipherType.Identity)">
-          <i class="bwi bwi-id-card" slot="start" aria-hidden="true"></i>
-          {{ "typeIdentity" | i18n }}
-        </button>
-        <button type="button" bitMenuItem (click)="addCipher(CipherType.SecureNote)">
-          <i class="bwi bwi-sticky-note" slot="start" aria-hidden="true"></i>
-          {{ "note" | i18n }}
-        </button>
-        <button type="button" bitMenuItem (click)="addCipher(CipherType.SshKey)">
-          <i class="bwi bwi-key" slot="start" aria-hidden="true"></i>
-          {{ "typeSshKey" | i18n }}
-        </button>
+        @for (item of cipherMenuItems$ | async; track item.type) {
+          <button type="button" bitMenuItem (click)="addCipher(item.type)">
+            <i class="bwi {{ item.icon }}" slot="start" aria-hidden="true"></i>
+            {{ item.labelKey | i18n }}
+          </button>
+        }
         <bit-menu-divider />
         <button type="button" bitMenuItem (click)="addFolder()">
           <i class="bwi bwi-fw bwi-folder" aria-hidden="true"></i>
diff --git a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
index 1049ee17faf..49e159143dd 100644
--- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
@@ -1,16 +1,9 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { CommonModule } from "@angular/common";
-import {
-  ChangeDetectionStrategy,
-  Component,
-  EventEmitter,
-  Input,
-  OnInit,
-  Output,
-} from "@angular/core";
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from "@angular/core";
 import { Router } from "@angular/router";
-import { firstValueFrom } from "rxjs";
+import { firstValueFrom, map, shareReplay } from "rxjs";
 
 import {
   Unassigned,
@@ -25,6 +18,7 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import {
   BreadcrumbsModule,
   DialogService,
@@ -42,7 +36,6 @@ import {
 } from "../vault-filter/shared/models/routed-vault-filter.model";
 
 @Component({
-  standalone: true,
   selector: "app-vault-header",
   templateUrl: "./vault-header.component.html",
   imports: [
@@ -56,11 +49,26 @@ import {
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class VaultHeaderComponent implements OnInit {
+export class VaultHeaderComponent {
   protected Unassigned = Unassigned;
   protected All = All;
   protected CollectionDialogTabType = CollectionDialogTabType;
   protected CipherType = CipherType;
+  protected allCipherMenuItems = [
+    { type: CipherType.Login, icon: "bwi-globe", labelKey: "typeLogin" },
+    { type: CipherType.Card, icon: "bwi-credit-card", labelKey: "typeCard" },
+    { type: CipherType.Identity, icon: "bwi-id-card", labelKey: "typeIdentity" },
+    { type: CipherType.SecureNote, icon: "bwi-sticky-note", labelKey: "note" },
+    { type: CipherType.SshKey, icon: "bwi-key", labelKey: "typeSshKey" },
+  ];
+  protected cipherMenuItems$ = this.restrictedItemTypesService.restricted$.pipe(
+    map((restrictedTypes) => {
+      return this.allCipherMenuItems.filter((item) => {
+        return !restrictedTypes.some((restrictedType) => restrictedType.cipherType === item.type);
+      });
+    }),
+    shareReplay({ bufferSize: 1, refCount: true }),
+  );
 
   /**
    * Boolean to determine the loading state of the header.
@@ -101,10 +109,9 @@ export class VaultHeaderComponent implements OnInit {
     private dialogService: DialogService,
     private router: Router,
     private configService: ConfigService,
+    private restrictedItemTypesService: RestrictedItemTypesService,
   ) {}
 
-  async ngOnInit() {}
-
   /**
    * The id of the organization that is currently being filtered on.
    * This can come from a collection filter or organization filter, if applied.
diff --git a/apps/web/src/app/vault/individual-vault/vault-onboarding/vault-onboarding.component.ts b/apps/web/src/app/vault/individual-vault/vault-onboarding/vault-onboarding.component.ts
index b3a4b324d30..b4eda51435f 100644
--- a/apps/web/src/app/vault/individual-vault/vault-onboarding/vault-onboarding.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-onboarding/vault-onboarding.component.ts
@@ -33,7 +33,6 @@ import { VaultOnboardingService as VaultOnboardingServiceAbstraction } from "./s
 import { VaultOnboardingService, VaultOnboardingTasks } from "./services/vault-onboarding.service";
 
 @Component({
-  standalone: true,
   imports: [OnboardingModule, CommonModule, JslibModule, LinkModule],
   providers: [
     {
@@ -167,7 +166,7 @@ export class VaultOnboardingComponent implements OnInit, OnChanges, OnDestroy {
       .pipe(
         getUserId,
         switchMap((userId) =>
-          this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
+          this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
         ),
         takeUntil(this.destroy$),
       )
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 6e751f600dc..db77a2be8ea 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -36,7 +36,6 @@ import {
 import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import {
   getOrganizationById,
@@ -50,6 +49,7 @@ import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abs
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { EventType } from "@bitwarden/common/enums";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -58,12 +58,14 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { CipherId, CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { filterOutNullish } from "@bitwarden/common/vault/utils/observable-utilities";
 import { DialogRef, DialogService, Icons, ToastService } from "@bitwarden/components";
 import {
@@ -130,7 +132,6 @@ const BroadcasterSubscriptionId = "VaultComponent";
 const SearchTextDebounceInterval = 200;
 
 @Component({
-  standalone: true,
   selector: "app-vault",
   templateUrl: "vault.component.html",
   imports: [
@@ -270,6 +271,8 @@ export class VaultComponent implements OnInit, OnDestroy {
     private trialFlowService: TrialFlowService,
     private organizationBillingService: OrganizationBillingServiceAbstraction,
     private billingNotificationService: BillingNotificationService,
+    private configService: ConfigService,
+    private restrictedItemTypesService: RestrictedItemTypesService,
   ) {}
 
   async ngOnInit() {
@@ -342,11 +345,21 @@ export class VaultComponent implements OnInit, OnDestroy {
 
     this.currentSearchText$ = this.route.queryParams.pipe(map((queryParams) => queryParams.search));
 
-    const ciphers$ = combineLatest([
+    /**
+     * This observable filters the ciphers based on the active user ID and the restricted item types.
+     */
+    const allowedCiphers$ = combineLatest([
       this.cipherService.cipherViews$(activeUserId).pipe(filter((c) => c !== null)),
-      filter$,
-      this.currentSearchText$,
+      this.restrictedItemTypesService.restricted$,
     ]).pipe(
+      map(([ciphers, restrictedTypes]) =>
+        ciphers.filter(
+          (cipher) => !this.restrictedItemTypesService.isCipherRestricted(cipher, restrictedTypes),
+        ),
+      ),
+    );
+
+    const ciphers$ = combineLatest([allowedCiphers$, filter$, this.currentSearchText$]).pipe(
       filter(([ciphers, filter]) => ciphers != undefined && filter != undefined),
       concatMap(async ([ciphers, filter, searchText]) => {
         const failedCiphers =
@@ -1016,7 +1029,8 @@ export class VaultComponent implements OnInit, OnDestroy {
       return;
     }
 
-    await this.cipherService.restoreManyWithServer(selectedCipherIds);
+    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    await this.cipherService.restoreManyWithServer(selectedCipherIds, activeUserId);
     this.toastService.showToast({
       variant: "success",
       title: null,
diff --git a/apps/web/src/app/vault/individual-vault/view.component.ts b/apps/web/src/app/vault/individual-vault/view.component.ts
index f52a4da3ffb..97f3037407c 100644
--- a/apps/web/src/app/vault/individual-vault/view.component.ts
+++ b/apps/web/src/app/vault/individual-vault/view.component.ts
@@ -20,6 +20,7 @@ import { ViewPasswordHistoryService } from "@bitwarden/common/vault/abstractions
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   DIALOG_DATA,
   DialogRef,
@@ -54,13 +55,13 @@ export interface ViewCipherDialogParams {
   disableEdit?: boolean;
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum ViewCipherDialogResult {
-  Edited = "edited",
-  Deleted = "deleted",
-  PremiumUpgrade = "premiumUpgrade",
-}
+export const ViewCipherDialogResult = {
+  Edited: "edited",
+  Deleted: "deleted",
+  PremiumUpgrade: "premiumUpgrade",
+} as const;
+
+type ViewCipherDialogResult = UnionOfValues<typeof ViewCipherDialogResult>;
 
 export interface ViewCipherDialogCloseResult {
   action: ViewCipherDialogResult;
@@ -73,7 +74,6 @@ export interface ViewCipherDialogCloseResult {
 @Component({
   selector: "app-vault-view",
   templateUrl: "view.component.html",
-  standalone: true,
   imports: [CipherViewComponent, CommonModule, AsyncActionsModule, DialogModule, SharedModule],
   providers: [
     { provide: ViewPasswordHistoryService, useClass: VaultViewPasswordHistoryService },
@@ -123,9 +123,7 @@ export class ViewComponent implements OnInit {
       );
     }
 
-    this.canDeleteCipher$ = this.cipherAuthorizationService.canDeleteCipher$(this.cipher, [
-      this.params.activeCollectionId,
-    ]);
+    this.canDeleteCipher$ = this.cipherAuthorizationService.canDeleteCipher$(this.cipher);
   }
 
   /**
diff --git a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts
index 0934a6deb95..11a984c4d52 100644
--- a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts
+++ b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts
@@ -128,18 +128,18 @@ describe("AdminConsoleCipherFormConfigService", () => {
       expect(result.admin).toBe(true);
     });
 
-    it("sets `allowPersonalOwnership`", async () => {
+    it("sets `organizationDataOwnershipDisabled`", async () => {
       policyAppliesToUser$.next(true);
 
       let result = await adminConsoleConfigService.buildConfig("clone", cipherId);
 
-      expect(result.allowPersonalOwnership).toBe(false);
+      expect(result.organizationDataOwnershipDisabled).toBe(false);
 
       policyAppliesToUser$.next(false);
 
       result = await adminConsoleConfigService.buildConfig("clone", cipherId);
 
-      expect(result.allowPersonalOwnership).toBe(true);
+      expect(result.organizationDataOwnershipDisabled).toBe(true);
     });
 
     it("disables personal ownership when not cloning", async () => {
@@ -147,15 +147,15 @@ describe("AdminConsoleCipherFormConfigService", () => {
 
       let result = await adminConsoleConfigService.buildConfig("add", cipherId);
 
-      expect(result.allowPersonalOwnership).toBe(false);
+      expect(result.organizationDataOwnershipDisabled).toBe(false);
 
       result = await adminConsoleConfigService.buildConfig("edit", cipherId);
 
-      expect(result.allowPersonalOwnership).toBe(false);
+      expect(result.organizationDataOwnershipDisabled).toBe(false);
 
       result = await adminConsoleConfigService.buildConfig("clone", cipherId);
 
-      expect(result.allowPersonalOwnership).toBe(true);
+      expect(result.organizationDataOwnershipDisabled).toBe(true);
     });
 
     it("returns all ciphers when cloning a cipher", async () => {
diff --git a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts
index 15af27ba8d0..5d23f89c822 100644
--- a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts
+++ b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts
@@ -31,10 +31,10 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ
   private apiService: ApiService = inject(ApiService);
   private accountService: AccountService = inject(AccountService);
 
-  private allowPersonalOwnership$ = this.accountService.activeAccount$.pipe(
+  private organizationDataOwnershipDisabled$ = this.accountService.activeAccount$.pipe(
     getUserId,
     switchMap((userId) =>
-      this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
+      this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
     ),
     map((p) => !p),
   );
@@ -69,11 +69,11 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ
     cipherId?: CipherId,
     cipherType?: CipherType,
   ): Promise<CipherFormConfig> {
-    const [organization, allowPersonalOwnership, allOrganizations, allCollections] =
+    const [organization, organizationDataOwnershipDisabled, allOrganizations, allCollections] =
       await firstValueFrom(
         combineLatest([
           this.organization$,
-          this.allowPersonalOwnership$,
+          this.organizationDataOwnershipDisabled$,
           this.allOrganizations$,
           this.allCollections$,
         ]),
@@ -84,13 +84,14 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ
     const organizations = mode === "clone" ? allOrganizations : [organization];
     // Only allow the user to assign to their personal vault when cloning and
     // the policies are enabled for it.
-    const allowPersonalOwnershipOnlyForClone = mode === "clone" ? allowPersonalOwnership : false;
+    const disableOrganizationDataOwnershipOnlyForClone =
+      mode === "clone" ? organizationDataOwnershipDisabled : false;
     const cipher = await this.getCipher(cipherId, organization);
     return {
       mode,
       cipherType: cipher?.type ?? cipherType ?? CipherType.Login,
       admin: organization.canEditAllCiphers ?? false,
-      allowPersonalOwnership: allowPersonalOwnershipOnlyForClone,
+      organizationDataOwnershipDisabled: disableOrganizationDataOwnershipOnlyForClone,
       originalCipher: cipher,
       collections: allCollections,
       organizations,
diff --git a/apps/web/src/app/vault/services/browser-extension-prompt.service.spec.ts b/apps/web/src/app/vault/services/browser-extension-prompt.service.spec.ts
index f6f4ec4fdb4..5b4c6665aa0 100644
--- a/apps/web/src/app/vault/services/browser-extension-prompt.service.spec.ts
+++ b/apps/web/src/app/vault/services/browser-extension-prompt.service.spec.ts
@@ -1,9 +1,9 @@
 import { TestBed } from "@angular/core/testing";
 
-import { AnonLayoutWrapperDataService } from "@bitwarden/auth/angular";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { VaultMessages } from "@bitwarden/common/vault/enums/vault-messages.enum";
+import { AnonLayoutWrapperDataService } from "@bitwarden/components";
 
 import {
   BrowserExtensionPromptService,
diff --git a/apps/web/src/app/vault/services/browser-extension-prompt.service.ts b/apps/web/src/app/vault/services/browser-extension-prompt.service.ts
index f928404a2a9..a164a106917 100644
--- a/apps/web/src/app/vault/services/browser-extension-prompt.service.ts
+++ b/apps/web/src/app/vault/services/browser-extension-prompt.service.ts
@@ -2,22 +2,23 @@ import { DestroyRef, Injectable } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { BehaviorSubject, fromEvent } from "rxjs";
 
-import { AnonLayoutWrapperDataService } from "@bitwarden/auth/angular";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { VaultMessages } from "@bitwarden/common/vault/enums/vault-messages.enum";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
+import { AnonLayoutWrapperDataService } from "@bitwarden/components";
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum BrowserPromptState {
-  Loading = "loading",
-  Error = "error",
-  Success = "success",
-  ManualOpen = "manualOpen",
-  MobileBrowser = "mobileBrowser",
-}
+export const BrowserPromptState = {
+  Loading: "loading",
+  Error: "error",
+  Success: "success",
+  ManualOpen: "manualOpen",
+  MobileBrowser: "mobileBrowser",
+} as const;
 
-type PromptErrorStates = BrowserPromptState.Error | BrowserPromptState.ManualOpen;
+export type BrowserPromptState = UnionOfValues<typeof BrowserPromptState>;
+
+type PromptErrorStates = typeof BrowserPromptState.Error | typeof BrowserPromptState.ManualOpen;
 
 @Injectable({
   providedIn: "root",
diff --git a/apps/web/src/app/vault/services/web-browser-interaction.service.spec.ts b/apps/web/src/app/vault/services/web-browser-interaction.service.spec.ts
new file mode 100644
index 00000000000..fef5d45e8c3
--- /dev/null
+++ b/apps/web/src/app/vault/services/web-browser-interaction.service.spec.ts
@@ -0,0 +1,112 @@
+import { fakeAsync, TestBed, tick } from "@angular/core/testing";
+
+import { ExtensionPageUrls } from "@bitwarden/common/vault/enums";
+import { VaultMessages } from "@bitwarden/common/vault/enums/vault-messages.enum";
+
+import { WebBrowserInteractionService } from "./web-browser-interaction.service";
+
+describe("WebBrowserInteractionService", () => {
+  let service: WebBrowserInteractionService;
+  const postMessage = jest.fn();
+  window.postMessage = postMessage;
+
+  const dispatchEvent = (command: string) => {
+    window.dispatchEvent(new MessageEvent("message", { data: { command } }));
+  };
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [WebBrowserInteractionService],
+    });
+
+    postMessage.mockClear();
+
+    service = TestBed.inject(WebBrowserInteractionService);
+  });
+
+  describe("extensionInstalled$", () => {
+    it("posts a message to check for the extension", () => {
+      service.extensionInstalled$.subscribe();
+
+      expect(postMessage).toHaveBeenCalledWith({
+        command: VaultMessages.checkBwInstalled,
+      });
+    });
+
+    it("returns false after the timeout", fakeAsync(() => {
+      service.extensionInstalled$.subscribe((installed) => {
+        expect(installed).toBe(false);
+      });
+
+      tick(1500);
+    }));
+
+    it("returns true when the extension is installed", (done) => {
+      service.extensionInstalled$.subscribe((installed) => {
+        expect(installed).toBe(true);
+        done();
+      });
+
+      dispatchEvent(VaultMessages.HasBwInstalled);
+    });
+
+    it("continues to listen for extension state changes after the first response", fakeAsync(() => {
+      const results: boolean[] = [];
+
+      service.extensionInstalled$.subscribe((installed) => {
+        results.push(installed);
+      });
+
+      // initial timeout, should emit false
+      tick(1500);
+      expect(results[0]).toBe(false);
+
+      tick(2500);
+      // then emit `HasBwInstalled`
+      dispatchEvent(VaultMessages.HasBwInstalled);
+      tick();
+      expect(results[1]).toBe(true);
+    }));
+  });
+
+  describe("openExtension", () => {
+    it("posts a message to open the extension", fakeAsync(() => {
+      service.openExtension().catch(() => {});
+
+      expect(postMessage).toHaveBeenCalledWith({
+        command: VaultMessages.OpenBrowserExtensionToUrl,
+      });
+
+      tick(1500);
+    }));
+
+    it("posts a message with the passed page", fakeAsync(() => {
+      service.openExtension(ExtensionPageUrls.Index).catch(() => {});
+
+      expect(postMessage).toHaveBeenCalledWith({
+        command: VaultMessages.OpenBrowserExtensionToUrl,
+        url: ExtensionPageUrls.Index,
+      });
+
+      tick(1500);
+    }));
+
+    it("resolves when the extension opens", async () => {
+      const openExtensionPromise = service.openExtension().catch(() => {
+        fail();
+      });
+
+      dispatchEvent(VaultMessages.PopupOpened);
+
+      await openExtensionPromise;
+    });
+
+    it("rejects if the extension does not open within the timeout", fakeAsync(() => {
+      service.openExtension().catch((error) => {
+        expect(error).toBe("Failed to open the extension");
+      });
+
+      tick(1500);
+    }));
+  });
+});
diff --git a/apps/web/src/app/vault/services/web-browser-interaction.service.ts b/apps/web/src/app/vault/services/web-browser-interaction.service.ts
new file mode 100644
index 00000000000..f1005ef6dc9
--- /dev/null
+++ b/apps/web/src/app/vault/services/web-browser-interaction.service.ts
@@ -0,0 +1,100 @@
+import { DestroyRef, inject, Injectable } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import {
+  concat,
+  filter,
+  fromEvent,
+  interval,
+  map,
+  Observable,
+  of,
+  race,
+  shareReplay,
+  switchMap,
+  take,
+  takeWhile,
+  tap,
+  timer,
+} from "rxjs";
+
+import { ExtensionPageUrls } from "@bitwarden/common/vault/enums";
+import { VaultMessages } from "@bitwarden/common/vault/enums/vault-messages.enum";
+
+/**
+ * The amount of time in milliseconds to wait for a response from the browser extension.
+ * NOTE: This value isn't computed by any means, it is just a reasonable timeout for the extension to respond.
+ */
+const MESSAGE_RESPONSE_TIMEOUT_MS = 1500;
+
+@Injectable({
+  providedIn: "root",
+})
+export class WebBrowserInteractionService {
+  destroyRef = inject(DestroyRef);
+
+  private messages$ = fromEvent<MessageEvent>(window, "message").pipe(
+    takeUntilDestroyed(this.destroyRef),
+  );
+
+  /** Emits the installation status of the extension. */
+  extensionInstalled$: Observable<boolean> = this.checkForExtension().pipe(
+    switchMap((installed) => {
+      if (installed) {
+        return of(true);
+      }
+
+      return concat(
+        of(false),
+        interval(2500).pipe(
+          switchMap(() => this.checkForExtension()),
+          takeWhile((installed) => !installed, true),
+          filter((installed) => installed),
+        ),
+      );
+    }),
+    shareReplay({ bufferSize: 1, refCount: true }),
+  );
+
+  /** Attempts to open the extension, rejects if the extension is not installed or it fails to open.  */
+  openExtension = (url?: ExtensionPageUrls) => {
+    return new Promise<void>((resolve, reject) => {
+      race(
+        this.messages$.pipe(
+          filter((event) => event.data.command === VaultMessages.PopupOpened),
+          map(() => true),
+        ),
+        timer(MESSAGE_RESPONSE_TIMEOUT_MS).pipe(map(() => false)),
+      )
+        .pipe(take(1))
+        .subscribe((didOpen) => {
+          if (!didOpen) {
+            return reject("Failed to open the extension");
+          }
+
+          resolve();
+        });
+
+      window.postMessage({ command: VaultMessages.OpenBrowserExtensionToUrl, url });
+    });
+  };
+
+  /** Sends a message via the window object to check if the extension is installed */
+  private checkForExtension(): Observable<boolean> {
+    const checkForExtension$ = race(
+      this.messages$.pipe(
+        filter((event) => event.data.command === VaultMessages.HasBwInstalled),
+        map(() => true),
+      ),
+      timer(MESSAGE_RESPONSE_TIMEOUT_MS).pipe(map(() => false)),
+    ).pipe(
+      tap({
+        subscribe: () => {
+          window.postMessage({ command: VaultMessages.checkBwInstalled });
+        },
+      }),
+      take(1),
+    );
+
+    return checkForExtension$;
+  }
+}
diff --git a/apps/web/src/connectors/webauthn-mobile.html b/apps/web/src/connectors/webauthn-mobile.html
index 94662711333..06df8b012ab 100644
--- a/apps/web/src/connectors/webauthn-mobile.html
+++ b/apps/web/src/connectors/webauthn-mobile.html
@@ -11,19 +11,21 @@
     <title>Bitwarden WebAuthn Connector</title>
   </head>
 
-  <body style="background: transparent">
-    <div class="row justify-content-md-center mt-5">
-      <div>
-        <img src="../images/logo-dark@2x.png" class="logo mb-2" alt="Bitwarden" />
-        <p id="webauthn-header" class="lead text-center mx-4 mb-4"></p>
-        <picture>
-          <source srcset="../images/u2fkey-mobile.avif" type="image/avif" />
-          <source srcset="../images/u2fkey-mobile.webp" type="image/webp" />
-          <img src="../images/u2fkey-mobile.jpg" class="rounded img-fluid" />
-        </picture>
-        <div class="text-center mt-4">
-          <button type="button" id="webauthn-button" class="btn btn-primary btn-lg"></button>
-        </div>
+  <body class="tw-bg-transparent">
+    <div class="tw-flex tw-mt-5 tw-flex-col tw-items-center">
+      <img src="../images/logo-dark@2x.png" class="logo tw-mb-2" alt="Bitwarden" />
+      <p id="webauthn-header" class="tw-text-center tw-mx-4 tw-mb-4 tw-text-xl"></p>
+      <picture>
+        <source srcset="../images/u2fkey-mobile.avif" type="image/avif" />
+        <source srcset="../images/u2fkey-mobile.webp" type="image/webp" />
+        <img src="../images/u2fkey-mobile.jpg" class="tw-rounded tw-max-w-full tw-h-auto" />
+      </picture>
+      <div class="tw-text-center tw-mt-4">
+        <button
+          type="button"
+          id="webauthn-button"
+          class="tw-cursor-pointer tw-bg-primary-600 tw-border-transparent tw-px-4 tw-py-2 tw-rounded-md hover:tw-bg-primary-700 tw-transition-colors tw-font-semibold tw-text-contrast tw-text-lg"
+        ></button>
       </div>
     </div>
   </body>
diff --git a/apps/web/src/images/search.svg b/apps/web/src/images/search.svg
index 36e0ea4bd23..7f1521fdd04 100644
--- a/apps/web/src/images/search.svg
+++ b/apps/web/src/images/search.svg
@@ -9,4 +9,4 @@
 <path d="M95.5038 77.5474L79 61.9604L77 63.9604L92.587 80.4643C93.3607 81.2836 94.6583 81.3021 95.4552 80.5053L95.5448 80.4156C96.3417 79.6188 96.3231 78.3212 95.5038 77.5474Z" fill="#0E3781"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M28.5 5.46045C29.0523 5.46045 29.5 5.90816 29.5 6.46045V21.4604H14.5C13.9477 21.4604 13.5 21.0127 13.5 20.4604C13.5 19.9082 13.9477 19.4604 14.5 19.4604H27.5V6.46045C27.5 5.90816 27.9477 5.46045 28.5 5.46045Z" fill="#0E3781"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M20.5 28.4604C19.9477 28.4604 19.5 28.9082 19.5 29.4604C19.5 30.0127 19.9477 30.4604 20.5 30.4604H30.5C31.0523 30.4604 31.5 30.0127 31.5 29.4604C31.5 28.9082 31.0523 28.4604 30.5 28.4604H20.5ZM34.5 28.4604C33.9477 28.4604 33.5 28.9082 33.5 29.4604C33.5 30.0127 33.9477 30.4604 34.5 30.4604H44.5C45.0523 30.4604 45.5 30.0127 45.5 29.4604C45.5 28.9082 45.0523 28.4604 44.5 28.4604H34.5ZM51.483 33.2759C51.3964 32.8118 50.9892 32.4604 50.5 32.4604H40.5C39.9477 32.4604 39.5 32.9082 39.5 33.4604C39.5 34.0127 39.9477 34.4604 40.5 34.4604H50.2171C50.6218 34.0477 51.0441 33.6524 51.483 33.2759ZM44.5246 49.4604C44.5579 50.1365 44.6247 50.8037 44.7235 51.4604H40.5C39.9477 51.4604 39.5 51.0127 39.5 50.4604C39.5 49.9082 39.9477 49.4604 40.5 49.4604H44.5246ZM44.7235 45.4605C44.6247 46.1172 44.5579 46.7844 44.5246 47.4605L37.5 47.4604C36.9477 47.4604 36.5 47.0127 36.5 46.4604C36.5 45.9082 36.9477 45.4604 37.5 45.4604L44.7235 45.4605ZM48.4985 36.4604C48.0192 37.0986 47.5772 37.7663 47.1756 38.4604L38.5 38.4604C37.9477 38.4604 37.5 38.0127 37.5 37.4604C37.5 36.9082 37.9477 36.4604 38.5 36.4604L48.4985 36.4604ZM64.5 28.4604C61.3707 28.4604 58.4093 29.1791 55.7717 30.4604L54.5 30.4604C53.9477 30.4604 53.5 30.0127 53.5 29.4604C53.5 28.9082 53.9477 28.4604 54.5 28.4604H64.5ZM48.5 28.4604C47.9477 28.4604 47.5 28.9082 47.5 29.4604C47.5 30.0127 47.9477 30.4604 48.5 30.4604H50.5C51.0523 30.4604 51.5 30.0127 51.5 29.4604C51.5 28.9082 51.0523 28.4604 50.5 28.4604H48.5ZM37.5 33.4604C37.5 32.9082 37.0523 32.4604 36.5 32.4604H34.5C33.9477 32.4604 33.5 32.9082 33.5 33.4604C33.5 34.0127 33.9477 34.4604 34.5 34.4604H36.5C37.0523 34.4604 37.5 34.0127 37.5 33.4604ZM34.5 38.4604C35.0523 38.4604 35.5 38.0127 35.5 37.4604C35.5 36.9082 35.0523 36.4604 34.5 36.4604H30.5C29.9477 36.4604 29.5 36.9082 29.5 37.4604C29.5 38.0127 29.9477 38.4604 30.5 38.4604H34.5ZM34.5 46.4604C34.5 47.0127 34.0523 47.4604 33.5 47.4604H27.5C26.9477 47.4604 26.5 47.0127 26.5 46.4604C26.5 45.9082 26.9477 45.4604 27.5 45.4604H33.5C34.0523 45.4604 34.5 45.9082 34.5 46.4604ZM36.5 51.4604C37.0523 51.4604 37.5 51.0127 37.5 50.4604C37.5 49.9082 37.0523 49.4604 36.5 49.4604H20.5C19.9477 49.4604 19.5 49.9082 19.5 50.4604C19.5 51.0127 19.9477 51.4604 20.5 51.4604H36.5ZM31.5 33.4604C31.5 32.9082 31.0523 32.4604 30.5 32.4604L20.5 32.4605C19.9477 32.4605 19.5 32.9082 19.5 33.4605C19.5 34.0127 19.9477 34.4605 20.5 34.4605L30.5 34.4604C31.0523 34.4604 31.5 34.0127 31.5 33.4604ZM26.5 38.4604C27.0523 38.4604 27.5 38.0127 27.5 37.4604C27.5 36.9082 27.0523 36.4604 26.5 36.4604H20.5C19.9477 36.4604 19.5 36.9082 19.5 37.4604C19.5 38.0127 19.9477 38.4604 20.5 38.4604H26.5ZM24.5 46.4604C24.5 47.0127 24.0523 47.4604 23.5 47.4604H20.5C19.9477 47.4604 19.5 47.0127 19.5 46.4604C19.5 45.9082 19.9477 45.4604 20.5 45.4604H23.5C24.0523 45.4604 24.5 45.9082 24.5 46.4604Z" fill="#FFBF00"/>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/apps/web/src/locales/af/messages.json b/apps/web/src/locales/af/messages.json
index 3d2c04f6673..75c9275b288 100644
--- a/apps/web/src/locales/af/messages.json
+++ b/apps/web/src/locales/af/messages.json
@@ -547,12 +547,6 @@
     "message": "Tokkel invou",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Genereer Wagwoord"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Gaan na of wagwoord blootgestel is."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Ek"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "My kluis"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "E-pos is verander"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Deaktiveer"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Sleutel bygewerk"
-  },
-  "updateEncryptionKey": {
-    "message": "Werk enkripsiesleutel by"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Intekening"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Noodtoegang afgekeur"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Persoonlike eienaarskap"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "hierdie gebruiker"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Een of meer organisasiebeleide stel die volgende eise aan die hoofwagwoord:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Voeg toe"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Hoofwagwoord bygewerk"
   },
   "updateMasterPassword": {
     "message": "Werk hoofwagwoord by"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "U hoofwagwoord is onlangs deur ’n administrateur in u organisasie verander. Om toegang tot u kluis te verkry moet u u hoofwagwoord nóú bywerk. Deur voort te gaan word u uit u huidige sessie geteken, waarna u weer sal moet aanteken. Aktiewe sessies op ander toestelle kan vir tot ’n uur steeds aktief bly."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Genereer Wagwoord"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Diensrekening bygewerk",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Tik of kies projekte of geheime",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Tik om te filter",
@@ -7692,8 +7743,8 @@
     "message": "Toegangstekens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Nuwe toegangsteken",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Daar was a 'n fout tydens die lees van die invoerlêer"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Algemene formate",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ar/messages.json b/apps/web/src/locales/ar/messages.json
index 82907ed4df0..1c103219fa1 100644
--- a/apps/web/src/locales/ar/messages.json
+++ b/apps/web/src/locales/ar/messages.json
@@ -3,28 +3,28 @@
     "message": "كل التطبيقات"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "شعار بيتواردن"
   },
   "criticalApplications": {
-    "message": "Critical applications"
+    "message": "التطبيقات الحرجة"
   },
   "noCriticalAppsAtRisk": {
-    "message": "No critical applications at risk"
+    "message": "لا توجد تطبيقات حرجة في خطر"
   },
   "accessIntelligence": {
-    "message": "Access Intelligence"
+    "message": "الوصول إلى الذكاء"
   },
   "riskInsights": {
-    "message": "Risk Insights"
+    "message": "رؤى المخاطر"
   },
   "passwordRisk": {
-    "message": "Password Risk"
+    "message": "مخاطر كلمة المرور"
   },
   "reviewAtRiskPasswords": {
-    "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
+    "message": "راجع كلمات المرور المعرضة للخطر (الضعيفة، المكشوفة، أو المعاد استخدامها) عبر التطبيقات. اختر تطبيقاتك الحرجة لتحديد أولويات إجراءات الأمان لمستخدميك لمعالجة كلمات المرور المعرضة للخطر."
   },
   "dataLastUpdated": {
-    "message": "Data last updated: $DATE$",
+    "message": "آخر تحديث للبيانات: $DATE$",
     "placeholders": {
       "date": {
         "content": "$1",
@@ -33,19 +33,19 @@
     }
   },
   "notifiedMembers": {
-    "message": "Notified members"
+    "message": "الأعضاء الذين تم إشعارهم"
   },
   "revokeMembers": {
-    "message": "Revoke members"
+    "message": "إلغاء الأعضاء"
   },
   "restoreMembers": {
-    "message": "Restore members"
+    "message": "استعادة الأعضاء"
   },
   "cannotRestoreAccessError": {
-    "message": "Cannot restore organization access"
+    "message": "لا يمكن استعادة وصول المنظمة"
   },
   "allApplicationsWithCount": {
-    "message": "All applications ($COUNT$)",
+    "message": "جميع التطبيقات ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -54,10 +54,10 @@
     }
   },
   "createNewLoginItem": {
-    "message": "Create new login item"
+    "message": "إنشاء عنصر تسجيل دخول جديد"
   },
   "criticalApplicationsWithCount": {
-    "message": "Critical applications ($COUNT$)",
+    "message": "التطبيقات الحساسة ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -66,7 +66,7 @@
     }
   },
   "notifiedMembersWithCount": {
-    "message": "Notified members ($COUNT$)",
+    "message": "الأعضاء المبلّغون ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -93,34 +93,34 @@
     "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
   },
   "markCriticalApps": {
-    "message": "Mark critical apps"
+    "message": "وضع علامة على التطبيقات الحساسة"
   },
   "markAppAsCritical": {
-    "message": "Mark app as critical"
+    "message": "تعيين كتطبيق حساس"
   },
   "applicationsMarkedAsCriticalSuccess": {
-    "message": "Applications marked as critical"
+    "message": "التطبيقات المعلَّمة كتطبيقات حرجة"
   },
   "application": {
     "message": "تطبيق"
   },
   "atRiskPasswords": {
-    "message": "At-risk passwords"
+    "message": "كلمات المرور المعرضة للخطر"
   },
   "requestPasswordChange": {
     "message": "طلب تغيير كلمة المرور"
   },
   "totalPasswords": {
-    "message": "Total passwords"
+    "message": "إجمالي كلمات المرور"
   },
   "searchApps": {
     "message": "البحث في التطبيقات"
   },
   "atRiskMembers": {
-    "message": "At-risk members"
+    "message": "الأعضاء المعرضون للخطر"
   },
   "atRiskMembersWithCount": {
-    "message": "At-risk members ($COUNT$)",
+    "message": "الأعضاء المعرضون للخطر ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -129,7 +129,7 @@
     }
   },
   "atRiskApplicationsWithCount": {
-    "message": "At-risk applications ($COUNT$)",
+    "message": "التطبيقات المعرضة للخطر ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -138,13 +138,13 @@
     }
   },
   "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+    "message": "يقوم هؤلاء الأعضاء بتسجيل الدخول إلى التطبيقات باستخدام كلمات مرور ضعيفة أو مكشوفة أو مُعادة الاستخدام."
   },
   "atRiskMembersDescriptionNone": {
-    "message": "These are no members logging into applications with weak, exposed, or reused passwords."
+    "message": "يقوم هؤلاء الأعضاء بتسجيل الدخول إلى التطبيقات باستخدام كلمات مرور ضعيفة أو مكشوفة أو مُعادة الاستخدام."
   },
   "atRiskApplicationsDescription": {
-    "message": "These applications have weak, exposed, or reused passwords."
+    "message": "هذه التطبيقات ضعيفة أو مكشوفة أو أعيد استخدامها."
   },
   "atRiskApplicationsDescriptionNone": {
     "message": "These are no applications with weak, exposed, or reused passwords."
@@ -171,16 +171,16 @@
     "message": "إجمالي الأعضاء"
   },
   "atRiskApplications": {
-    "message": "At-risk applications"
+    "message": "التطبيقات المعرضة للخطر"
   },
   "totalApplications": {
-    "message": "Total applications"
+    "message": "كل التطبيقات"
   },
   "unmarkAsCriticalApp": {
-    "message": "Unmark as critical app"
+    "message": "إلغاء التحديد كتطبيق حرج"
   },
   "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+    "message": "تم إلغاء تصنيف التطبيق الحرج بنجاح"
   },
   "whatTypeOfItem": {
     "message": "ما هو نوع العنصر؟"
@@ -220,7 +220,7 @@
     "message": "ملاحظات"
   },
   "privateNote": {
-    "message": "Private note"
+    "message": "ملاحظة سرية"
   },
   "note": {
     "message": "ملاحظة"
@@ -247,7 +247,7 @@
     "message": "بيانات البطاقة"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "تفاصيل $BRAND$",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -265,10 +265,10 @@
     "message": "خيارات الملء التلقائي"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "الموقع (URI)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "الموقع (URI) $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -278,16 +278,16 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "تمت إضافة الموقع"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "إضافة موقع"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "حذف الموقع"
   },
   "defaultLabel": {
-    "message": "Default ($VALUE$)",
+    "message": "الافتراضي ($VALUE$)",
     "description": "A label that indicates the default value for a field with the current default value in parentheses.",
     "placeholders": {
       "value": {
@@ -297,7 +297,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "Show match detection $WEBSITE$",
+    "message": "عرض الكشف عن التطابق $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -306,7 +306,7 @@
     }
   },
   "hideMatchDetection": {
-    "message": "Hide match detection $WEBSITE$",
+    "message": "إخفاء الكشف عن المطابقة $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -315,7 +315,7 @@
     }
   },
   "autoFillOnPageLoad": {
-    "message": "Autofill on page load?"
+    "message": "الملء التلقائي عند تحميل الصفحة؟"
   },
   "number": {
     "message": "الرقم"
@@ -330,7 +330,7 @@
     "message": "رمز الأمان (CVV)"
   },
   "securityCodeSlashCVV": {
-    "message": "Security code / CVV"
+    "message": "رمز الأمان / CVV"
   },
   "identityName": {
     "message": "اسم الهوية"
@@ -408,7 +408,7 @@
     "message": "د"
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "بطاقة منتهية الصلاحية"
   },
   "cardExpiredMessage": {
     "message": "If you've renewed it, update the card's information"
@@ -547,12 +547,6 @@
     "message": "تبديل الطي",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "توليد كلمة مرور"
-  },
-  "generatePassphrase": {
-    "message": "توليد عبارة مرور"
-  },
   "checkPassword": {
     "message": "تحقق مما إذا تم الكشف عن كلمة المرور."
   },
@@ -732,7 +726,7 @@
     "message": "عرض العنصر"
   },
   "newItemHeader": {
-    "message": "New $TYPE$",
+    "message": "جديد $TYPE$",
     "placeholders": {
       "type": {
         "content": "$1",
@@ -741,7 +735,7 @@
     }
   },
   "editItemHeader": {
-    "message": "Edit $TYPE$",
+    "message": "تحرير $TYPE$",
     "placeholders": {
       "type": {
         "content": "$1",
@@ -750,7 +744,7 @@
     }
   },
   "viewItemType": {
-    "message": "View $ITEMTYPE$",
+    "message": "عرض $ITEMTYPE$",
     "placeholders": {
       "itemtype": {
         "content": "$1",
@@ -847,7 +841,7 @@
     "message": "نسخ العنوان"
   },
   "copyPhone": {
-    "message": "Copy phone"
+    "message": "نسخ الهاتف"
   },
   "copyEmail": {
     "message": "نسخ البريد الإلكتروني"
@@ -870,6 +864,9 @@
   "me": {
     "message": "أنا"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "خزانتي"
   },
@@ -944,7 +941,7 @@
     }
   },
   "itemsMovedToOrg": {
-    "message": "Items moved to $ORGNAME$",
+    "message": "تم نقل العناصر إلى $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -953,7 +950,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Item moved to $ORGNAME$",
+    "message": "تم نقل العناصر إلى $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -1007,7 +1004,7 @@
     "message": "مستوى الوصول"
   },
   "accessing": {
-    "message": "Accessing"
+    "message": "الوصول"
   },
   "loggedOut": {
     "message": "تم تسجيل الخروج"
@@ -1046,7 +1043,7 @@
     "message": "لا"
   },
   "location": {
-    "message": "Location"
+    "message": "الموقع"
   },
   "loginOrCreateNewAccount": {
     "message": "قم بتسجيل الدخول أو أنشئ حساباً جديداً لتتمكن من الوصول إلى خزانتك السرية."
@@ -1076,7 +1073,7 @@
     "message": "تسجيل الدخول باستخدام مفتاح المرور"
   },
   "useSingleSignOn": {
-    "message": "Use single sign-on"
+    "message": "استخدام تسجيل الدخول الأحادي"
   },
   "welcomeBack": {
     "message": "مرحباً بعودتك"
@@ -1100,43 +1097,43 @@
     "message": "إنشاء مفتاح المرور..."
   },
   "creatingPasskeyLoadingInfo": {
-    "message": "Keep this window open and follow prompts from your browser."
+    "message": "ابق هذه النافذة مفتوحة واتبع الطلبات من المتصفح الخاص بك."
   },
   "errorCreatingPasskey": {
     "message": "خطأ في إنشاء مفتاح المرور"
   },
   "errorCreatingPasskeyInfo": {
-    "message": "There was a problem creating your passkey."
+    "message": "حدثت مشكلة أثناء إنشاء مفتاح المرور الخاص بك."
   },
   "passkeySuccessfullyCreated": {
     "message": "تم إنشاء مفتاح المرور بنجاح!"
   },
   "customPasskeyNameInfo": {
-    "message": "Name your passkey to help you identify it."
+    "message": "قم بتسمية مفتاح المرور الخاص بك لتسهيل التعرف عليه."
   },
   "useForVaultEncryption": {
-    "message": "Use for vault encryption"
+    "message": "استخدم للتشفير الخاص بالخزنة"
   },
   "useForVaultEncryptionInfo": {
-    "message": "Log in and unlock on supported devices without your master password. Follow the prompts from your browser to finalize setup."
+    "message": "سجّل الدخول وافتح القفل على الأجهزة المدعومة بدون كلمة المرور الرئيسية. اتبع التعليمات من متصفحك لإكمال الإعداد."
   },
   "useForVaultEncryptionErrorReadingPasskey": {
-    "message": "Error reading passkey. Try again or uncheck this option."
+    "message": "خطأ في قراءة مفتاح المرور. حاول مرة أخرى أو ألغِ تحديد هذا الخيار."
   },
   "encryptionNotSupported": {
-    "message": "Encryption not supported"
+    "message": "التشفير غير مدعوم"
   },
   "enablePasskeyEncryption": {
-    "message": "Set up encryption"
+    "message": "إعداد التشفير"
   },
   "usedForEncryption": {
-    "message": "Used for encryption"
+    "message": "مُستخدم للتشفير"
   },
   "loginWithPasskeyEnabled": {
-    "message": "Log in with passkey turned on"
+    "message": "تسجيل الدخول باستخدام مفتاح المرور مفعّل"
   },
   "passkeySaved": {
-    "message": "$NAME$ saved",
+    "message": "تم حفظ $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -1145,16 +1142,16 @@
     }
   },
   "passkeyRemoved": {
-    "message": "Passkey removed"
+    "message": "تمت إزالة كلمة المرور"
   },
   "removePasskey": {
-    "message": "Remove passkey"
+    "message": "إزالة مفتاح المرور"
   },
   "removePasskeyInfo": {
-    "message": "If all passkeys are removed, you will be unable to log into new devices without your master password."
+    "message": "إذا تم إزالة جميع مفاتيح المرور، فلن تتمكن من تسجيل الدخول إلى الأجهزة الجديدة بدون كلمة المرور الرئيسية الخاصة بك."
   },
   "passkeyLimitReachedInfo": {
-    "message": "Passkey limit reached. Remove a passkey to add another."
+    "message": "تم الوصول إلى الحد الأقصى لمفاتيح المرور. قم بإزالة مفتاح مرور لإضافة آخر."
   },
   "tryAgain": {
     "message": "حاول مرة أخرى"
@@ -1169,7 +1166,7 @@
     "message": "تعيين كلمة مرور قوية"
   },
   "finishCreatingYourAccountBySettingAPassword": {
-    "message": "Finish creating your account by setting a password"
+    "message": "أكمل إنشاء حسابك عن طريق تعيين كلمة مرور"
   },
   "newAroundHere": {
     "message": "هل أنت جديد هنا؟"
@@ -1184,34 +1181,34 @@
     "message": "تسجيل الدخول إلى بيتواردن"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Enter the code sent to your email"
+    "message": "أدخل الرمز المرسل إلى بريدك الإلكتروني"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "أدخل الرمز من تطبيق المصادقة الخاص بك"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Press your YubiKey to authenticate"
+    "message": "اضغط على YubiKey الخاص بك للمصادقة"
   },
   "authenticationTimeout": {
     "message": "مهلة المصادقة"
   },
   "authenticationSessionTimedOut": {
-    "message": "The authentication session timed out. Please restart the login process."
+    "message": "انتهت مهلة جلسة المصادقة. الرجاء إعادة تشغيل عملية تسجيل الدخول."
   },
   "verifyYourIdentity": {
-    "message": "Verify your Identity"
+    "message": "قم بتأكيد هويتك"
   },
   "weDontRecognizeThisDevice": {
-    "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
+    "message": "لم نتعرف على هذا الجهاز. أدخل الرمز المرسل إلى بريدك الإلكتروني للتحقق من هويتك."
   },
   "continueLoggingIn": {
-    "message": "Continue logging in"
+    "message": "متابعة تسجيل الدخول"
   },
   "whatIsADevice": {
-    "message": "What is a device?"
+    "message": "ما هو الجهاز؟"
   },
   "aDeviceIs": {
-    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+    "message": "الجهاز هو تثبيت فريد لتطبيق بيتواردن حيث قمت بتسجيل الدخول. إعادة التثبيت، مسح بيانات التطبيق، أو مسح الكوكيز قد يؤدي إلى ظهور الجهاز عدة مرات."
   },
   "logInInitiated": {
     "message": "بَدْء تسجيل الدخول"
@@ -1250,13 +1247,13 @@
     "message": "تلميح كلمة المرور الرئيسية (اختياري)"
   },
   "newMasterPassHint": {
-    "message": "New master password hint (optional)"
+    "message": "تلميح كلمة المرور الرئيسية الجديدة (اختياري)"
   },
   "masterPassHintLabel": {
     "message": "تلميح كلمة المرور الرئيسية"
   },
   "masterPassHintText": {
-    "message": "If you forget your password, the password hint can be sent to your email. $CURRENT$/$MAXIMUM$ character maximum.",
+    "message": "إذا نسيت كلمة المرور الخاصة بك، يمكن إرسال تلميح كلمة المرور إلى بريدك الإلكتروني. الحد الأقصى لعدد الأحرف هو $CURRENT$/$MAXIMUM$.",
     "placeholders": {
       "current": {
         "content": "$1",
@@ -1275,13 +1272,13 @@
     "message": "البريد الإلكتروني للحساب"
   },
   "requestHint": {
-    "message": "Request hint"
+    "message": "طلب تلميح"
   },
   "requestPasswordHint": {
-    "message": "Request password hint"
+    "message": "طلب تلميح كلمة المرور"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Enter your account email address and your password hint will be sent to you"
+    "message": "أدخل عنوان البريد الإلكتروني لحسابك وسيُرسل تلميح كلمة المرور الخاصة بك إليك"
   },
   "getMasterPasswordHint": {
     "message": "احصل على تلميح لكلمة المرور الرئيسية"
@@ -1315,7 +1312,7 @@
     "message": "تم إنشاء حساب جديد لك! بإمكانك الآن تسجيل الدخول."
   },
   "newAccountCreated2": {
-    "message": "Your new account has been created!"
+    "message": "تم إنشاء حسابك الجديد!"
   },
   "youHaveBeenLoggedIn": {
     "message": "لقد قمت بتسجيل الدخول!"
@@ -1336,10 +1333,10 @@
     "message": "عنوان البريد الإلكتروني"
   },
   "yourVaultIsLockedV2": {
-    "message": "Your vault is locked"
+    "message": "المخزن الخاص بك مقفل"
   },
   "yourAccountIsLocked": {
-    "message": "Your account is locked"
+    "message": "حسابك مقفل"
   },
   "uuid": {
     "message": "معرف المستخدم الحالي"
@@ -1376,7 +1373,7 @@
     "message": "ليس لديك الصلاحية لعرض جميع العناصر في هذه المجموعة."
   },
   "youDoNotHavePermissions": {
-    "message": "You do not have permissions to this collection"
+    "message": "ليس لديك صلاحيات لهذه المجموعة"
   },
   "noCollectionsInList": {
     "message": "لا توجد مجموعات لعرضها."
@@ -1403,7 +1400,7 @@
     "message": "تم إرسال إشعار إلى جهازك."
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the "
+    "message": "افتح بيتواردن على جهازك أو على الـ "
   },
   "areYouTryingToAccessYourAccount": {
     "message": "هل تحاول الوصول إلى حسابك؟"
@@ -1421,13 +1418,13 @@
     "message": "تأكيد الوصول"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "رفض الوصول"
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "تطبيق الويب"
   },
   "notificationSentDevicePart2": {
-    "message": "Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "تأكد من أن عبارة بصمة الإصبع تطابق العبارة أدناه قبل الموافقة."
   },
   "notificationSentDeviceComplete": {
     "message": "Unlock Bitwarden on your device. Make sure the Fingerprint phrase matches the one below before approving."
@@ -1659,16 +1656,16 @@
     "message": "تم تقييد الحساب"
   },
   "passwordProtected": {
-    "message": "Password protected"
+    "message": "كلمة المرور محمية"
   },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
-    "message": "“File password”  and “Confirm file password“ do not match."
+    "message": "\"كلمة مرور الملف\" و \"تأكيد كلمة مرور الملف\" غير متطابقين."
   },
   "confirmVaultImport": {
-    "message": "Confirm vault import"
+    "message": "تأكيد تصدير الخزانة"
   },
   "confirmVaultImportDesc": {
-    "message": "This file is password-protected. Please enter the file password to import data."
+    "message": "هذا الملف محمي بكلمة مرور. الرجاء إدخال كلمة مرور الملف لاستيراد البيانات."
   },
   "exportSuccess": {
     "message": "تم تصدير بيانات الخزانة الخاصة بك"
@@ -1677,7 +1674,7 @@
     "message": "مولّد كلمات المرور"
   },
   "minComplexityScore": {
-    "message": "Minimum complexity score"
+    "message": "الحد الأدنى لدرجة التعقيد {0}"
   },
   "minNumbers": {
     "message": "الحد الأدنى للأرقام"
@@ -1691,7 +1688,7 @@
     "description": "deprecated. Use avoidAmbiguous instead."
   },
   "avoidAmbiguous": {
-    "message": "Avoid ambiguous characters",
+    "message": "تجنب الأحرف المبهمة",
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "length": {
@@ -1739,7 +1736,7 @@
     "message": "سجل المولد"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "مسح سجل المولدات"
   },
   "cleargGeneratorHistoryDescription": {
     "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
@@ -1776,7 +1773,7 @@
     "message": "الكود"
   },
   "changeEmailDesc": {
-    "message": "We have emailed a verification code to $EMAIL$. Please check your email for this code and enter it below to finalize the email address change.",
+    "message": "لقد أرسلنا رمز التحقق بالبريد الإلكتروني إلى $EMAIL$. الرجاء التحقق من بريدك الإلكتروني لهذا الرمز وإدخاله أدناه لاستكمال تغيير عنوان البريد الإلكتروني.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1785,7 +1782,10 @@
     }
   },
   "loggedOutWarning": {
-    "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "سيتم تسجيل خروجك من الجلسة الحالية، مما يتطلب منك تسجيل الدخول مرة أخرى. وقد تظل الجلسات النشطة على أجهزة أخرى نشطة لمدة تصل إلى ساعة واحدة."
+  },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
   },
   "emailChanged": {
     "message": "تم تغيير البريد الإلكتروني"
@@ -1800,7 +1800,7 @@
     "message": "الطلب معلًق"
   },
   "logBackInOthersToo": {
-    "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
+    "message": "يرجى تسجيل الدخول مرة أخرى. إذا كنت تستخدم تطبيقات بيتواردن الأخرى قم بتسجيل الخروج والعودة إلى تلك التطبيقات أيضا."
   },
   "changeMasterPassword": {
     "message": "تغيير كلمة المرور الرئيسية"
@@ -1824,7 +1824,7 @@
     "message": "خوارزمية KDF"
   },
   "kdfIterations": {
-    "message": "KDF iterations"
+    "message": "تكرار KDF"
   },
   "kdfIterationsDesc": {
     "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker. We recommend a value of $VALUE$ or more.",
@@ -1867,7 +1867,7 @@
     "message": "منطقة خطرة"
   },
   "deauthorizeSessions": {
-    "message": "Deauthorize sessions"
+    "message": "إلغاء الإذن بالجلسات"
   },
   "deauthorizeSessionsDesc": {
     "message": "Concerned your account is logged in on another device? Proceed below to deauthorize all computers or devices that you have previously used. This security step is recommended if you previously used a public computer or accidentally saved your password on a device that isn't yours. This step will also clear all previously remembered two-step login sessions."
@@ -1897,7 +1897,7 @@
     "message": "New device login protection changes saved"
   },
   "sessionsDeauthorized": {
-    "message": "All sessions deauthorized"
+    "message": "تم إلغاء الإذن لجميع الجلسات"
   },
   "accountIsOwnedMessage": {
     "message": "This account is owned by $ORGANIZATIONNAME$",
@@ -1945,7 +1945,7 @@
     "message": "لقد تم إغلاق حسابك وتم حذف جميع البيانات المرتبطة به."
   },
   "deleteOrganizationWarning": {
-    "message": "Deleting your organization is permanent. It cannot be undone."
+    "message": "حذف حساب مؤسستك دائم. لا يمكن التراجع عنه."
   },
   "myAccount": {
     "message": "حسابي"
@@ -1969,24 +1969,24 @@
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new login instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsPartTwoNoOrgs": {
-    "message": " instead.",
+    "message": " بدلاً من ذلك.",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead."
   },
   "onboardingImportDataDetailsPartTwoWithOrgs": {
-    "message": " instead. You may need to wait until your administrator confirms your organization membership.",
+    "message": " بدلاً من ذلك. قد تحتاج إلى الانتظار حتى يؤكد المسؤول الخاص بك عضوية مؤسستك.",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. You may need to wait until your administrator confirms your organization membership."
   },
   "importError": {
     "message": "خطأ في الإستيراد"
   },
   "importErrorDesc": {
-    "message": "There was a problem with the data you tried to import. Please resolve the errors listed below in your source file and try again."
+    "message": "حدثت مشكلة في البيانات التي حاولت استيرادها. الرجاء حل الأخطاء المدرجة أدناه في الملف المصدر الخاص بك وحاول مرة أخرى."
   },
   "importSuccess": {
-    "message": "Data successfully imported"
+    "message": "تم استيراد البيانات بنجاح"
   },
   "importSuccessNumberOfItems": {
-    "message": "A total of $AMOUNT$ items were imported.",
+    "message": "تم استيراد مجموع العناصر $AMOUNT$.",
     "placeholders": {
       "amount": {
         "content": "$1",
@@ -1995,7 +1995,7 @@
     }
   },
   "dataExportSuccess": {
-    "message": "Data successfully exported"
+    "message": "تم استيراد البيانات بنجاح"
   },
   "importWarning": {
     "message": "You are importing data to $ORGANIZATION$. Your data may be shared with members of this organization. Do you want to proceed?",
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2183,7 +2195,7 @@
     "description": "Premium membership"
   },
   "premiumMembership": {
-    "message": "Premium membership"
+    "message": "عضوية بريميوم"
   },
   "premiumRequired": {
     "message": "مطلوب اشتراك بريميوم"
@@ -2192,40 +2204,43 @@
     "message": "هذه المِيزة متاحة فقط للعضوية المميزة."
   },
   "youHavePremiumAccess": {
-    "message": "You have Premium access"
+    "message": "لديك وصول بريميوم"
   },
   "alreadyPremiumFromOrg": {
-    "message": "You already have access to Premium features because of an organization you are a member of."
+    "message": "لديك بالفعل وصول إلى ميزات البريميوم بسبب منظمة أنت عضو فيها."
   },
   "manage": {
     "message": "إدارة"
   },
   "manageCollection": {
-    "message": "Manage collection"
+    "message": "إدارة القوائم"
   },
   "viewItems": {
     "message": "عرض العناصر"
   },
   "viewItemsHidePass": {
-    "message": "View items, hidden passwords"
+    "message": "عرض العناصر، كلمات المرور المخفية"
   },
   "editItems": {
     "message": "تعديل العناصر"
   },
   "editItemsHidePass": {
-    "message": "Edit items, hidden passwords"
+    "message": "تعديل العناصر، كلمات المرور المخفية"
   },
   "disable": {
     "message": "إيقاف"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "إلغاء الوصول"
   },
   "revoke": {
-    "message": "Revoke"
+    "message": "إلغاء"
   },
   "twoStepLoginProviderEnabled": {
-    "message": "This two-step login provider is active on your account."
+    "message": "مزود تسجيل الدخول بخطوتين هذا نشط على حسابك."
   },
   "twoStepLoginAuthDesc": {
     "message": "Enter your master password to modify two-step login settings."
@@ -2921,7 +2936,7 @@
     "message": "طريقة الدفع"
   },
   "noPaymentMethod": {
-    "message": "No payment method on file."
+    "message": "لا توجد طريقة دفع في الملف."
   },
   "addPaymentMethod": {
     "message": "إضافة طريقة دفع"
@@ -3429,22 +3444,22 @@
     "message": "Access and add items to assigned collections"
   },
   "all": {
-    "message": "All"
+    "message": "الكل"
   },
   "addAccess": {
-    "message": "Add Access"
+    "message": "إضافة الوصول"
   },
   "addAccessFilter": {
-    "message": "Add Access Filter"
+    "message": "إضافة فلتر الوصول"
   },
   "refresh": {
     "message": "إنعاش"
   },
   "timestamp": {
-    "message": "Timestamp"
+    "message": "التوقيت الزمني"
   },
   "event": {
-    "message": "Event"
+    "message": "حدث"
   },
   "unknown": {
     "message": "مجهول"
@@ -3453,19 +3468,19 @@
     "message": "تحميل المزيد"
   },
   "mobile": {
-    "message": "Mobile",
+    "message": "جوّال",
     "description": "Mobile app"
   },
   "extension": {
-    "message": "Extension",
+    "message": "الإضافة",
     "description": "Browser extension/addon"
   },
   "desktop": {
-    "message": "Desktop",
+    "message": "سطح المكتب",
     "description": "Desktop app"
   },
   "webVault": {
-    "message": "Web vault"
+    "message": "قبو الويب"
   },
   "cli": {
     "message": "CLI"
@@ -3477,7 +3492,7 @@
     "message": "Bitwarden Secrets Manager"
   },
   "loggedIn": {
-    "message": "Logged in"
+    "message": "تم تسجيل الدخول"
   },
   "changedPassword": {
     "message": "Changed account password"
@@ -3501,10 +3516,10 @@
     "message": "Incorrect password"
   },
   "incorrectCode": {
-    "message": "Incorrect code"
+    "message": "رمز غير صحيح"
   },
   "incorrectPin": {
-    "message": "Incorrect PIN"
+    "message": "رمز المرور غير صحيح"
   },
   "pin": {
     "message": "رقم التعريف الشخصي",
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -4597,13 +4600,13 @@
     "message": "By checking this box you agree to the following:"
   },
   "acceptPoliciesRequired": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "لم يتم الموافقة على شروط الخدمة وسياسة الخصوصية."
   },
   "termsOfService": {
     "message": "شروط الخدمة"
   },
   "privacyPolicy": {
-    "message": "Privacy Policy"
+    "message": "سياسة الخصوصية"
   },
   "filters": {
     "message": "عوامل التصفية"
@@ -4612,13 +4615,13 @@
     "message": "مهلة الخزانة"
   },
   "vaultTimeout1": {
-    "message": "Timeout"
+    "message": "المهلة"
   },
   "vaultTimeoutDesc": {
-    "message": "Choose when your vault will take the vault timeout action."
+    "message": "اختر متى يقوم الخزنة بتنفيذ إجراء انتهاء مهلة الخزنة."
   },
   "vaultTimeoutLogoutDesc": {
-    "message": "Choose when your vault will be logged out."
+    "message": "اختر متى سيتم تسجيل خروج الخزنة الخاصة بك."
   },
   "oneMinute": {
     "message": "دقيقة واحدة"
@@ -4639,22 +4642,22 @@
     "message": "4 ساعات"
   },
   "onRefresh": {
-    "message": "On browser refresh"
+    "message": "عند تحديث المتصفح"
   },
   "dateUpdated": {
-    "message": "Updated",
+    "message": "تم التحديث",
     "description": "ex. Date this item was updated"
   },
   "dateCreated": {
-    "message": "Created",
+    "message": "تم الإنشاء",
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
-    "message": "Password updated",
+    "message": "تم تحديث كلمة المرور",
     "description": "ex. Date this password was updated"
   },
   "organizationIsDisabled": {
-    "message": "Organization suspended"
+    "message": "تم تعليق المؤسسة"
   },
   "secretsAccessSuspended": {
     "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
@@ -4678,16 +4681,16 @@
     "message": "Updated users"
   },
   "selected": {
-    "message": "Selected"
+    "message": "تحديد"
   },
   "recommended": {
-    "message": "Recommended"
+    "message": "موصى بها"
   },
   "ownership": {
-    "message": "Ownership"
+    "message": "المالك"
   },
   "whoOwnsThisItem": {
-    "message": "Who owns this item?"
+    "message": "من يملك هذا العنصر؟"
   },
   "strong": {
     "message": "قوية",
@@ -4727,7 +4730,7 @@
     "message": "This attachment uses outdated encryption. Select 'Fix' to download, re-encrypt, and re-upload the attachment."
   },
   "fix": {
-    "message": "Fix",
+    "message": "اصلاح",
     "description": "This is a verb. ex. 'Fix The Car'"
   },
   "oldAttachmentsNeedFixDesc": {
@@ -4755,11 +4758,11 @@
     "message": "You will be notified once the request is approved"
   },
   "free": {
-    "message": "Free",
+    "message": "مجاني",
     "description": "Free, as in 'Free beer'"
   },
   "apiKey": {
-    "message": "API Key"
+    "message": "مفتاح الـ API"
   },
   "apiKeyDesc": {
     "message": "Your API key can be used to authenticate to the Bitwarden public API."
@@ -4781,13 +4784,13 @@
     "description": "'OAuth 2.0' is a programming protocol. It should probably not be translated."
   },
   "viewApiKey": {
-    "message": "View API key"
+    "message": "عرض مفتاح API"
   },
   "rotateApiKey": {
-    "message": "Rotate API key"
+    "message": "تدوير مفتاح API"
   },
   "selectOneCollection": {
-    "message": "You must select at least one collection."
+    "message": "يجب عليك تحديد مجموعة واحدة على الأقل."
   },
   "couldNotChargeCardPayInvoice": {
     "message": "We were not able to charge your card. Please view and pay the unpaid invoice listed below."
@@ -5133,19 +5136,19 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
-    "message": "Send saved",
+    "message": "إرسال محفوظ",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
-    "message": "Send saved",
+    "message": "إرسال محفوظ",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletedSend": {
-    "message": "Send deleted",
+    "message": "تم حذف الإرسال",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSend": {
-    "message": "Delete Send",
+    "message": "حذف إرسال",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
@@ -5170,65 +5173,65 @@
     "message": "Maximum access count"
   },
   "disabled": {
-    "message": "Disabled"
+    "message": "معطل"
   },
   "revoked": {
-    "message": "Revoked"
+    "message": "ملغاة"
   },
   "sendLink": {
-    "message": "Send link",
+    "message": "إرسال رابط",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copyLink": {
-    "message": "Copy link"
+    "message": "نسخ الرابط"
   },
   "copySendLink": {
-    "message": "Copy Send link",
+    "message": "نسخ رابط الإرسال",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "removePassword": {
-    "message": "Remove password"
+    "message": "إزالة كلمة المرور"
   },
   "removedPassword": {
-    "message": "Password removed"
+    "message": "تمت إزالة كلمة المرور"
   },
   "removePasswordConfirmation": {
-    "message": "Are you sure you want to remove the password?"
+    "message": "هل أنت متأكد من أنك تريد إزالة كلمة المرور؟"
   },
   "allSends": {
-    "message": "All Sends"
+    "message": "كل الإرسالات"
   },
   "maxAccessCountReached": {
-    "message": "Max access count reached",
+    "message": "تم بلوغ الحد الأقصى لعدد الدخول",
     "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "pendingDeletion": {
-    "message": "Pending deletion"
+    "message": "في انتظار الحذف"
   },
   "hideTextByDefault": {
-    "message": "Hide text by default"
+    "message": "إخفاء النص بشكل افتراضي"
   },
   "expired": {
-    "message": "Expired"
+    "message": "منتهية الصلاحية"
   },
   "searchSends": {
-    "message": "Search Sends",
+    "message": "بحث عن الإرسالات",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendProtectedPassword": {
-    "message": "This Send is protected with a password. Please type the password below to continue.",
+    "message": "هذا الإرسال محمي بكلمة مرور. الرجاء كتابة كلمة المرور أدناه للمتابعة.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendProtectedPasswordDontKnow": {
-    "message": "Don't know the password? Ask the sender for the password needed to access this Send.",
+    "message": "لا تعرف كلمة المرور؟ اطلب من المرسل كلمة المرور المطلوبة للوصول إلى هذا الإرسال.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendHiddenByDefault": {
-    "message": "This Send is hidden by default. You can toggle its visibility using the button below.",
+    "message": "هذا الإرسال مخفي بشكل افتراضي. يمكنك تبديل الرؤية باستخدام الزر أدناه.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "downloadAttachments": {
-    "message": "Download attachments"
+    "message": "تحميل المرفقات"
   },
   "sendAccessUnavailable": {
     "message": "The Send you are trying to access does not exist or is no longer available.",
@@ -5309,10 +5312,10 @@
     }
   },
   "invitedUser": {
-    "message": "Invited user."
+    "message": "المستخدم المدعو."
   },
   "acceptEmergencyAccess": {
-    "message": "You've been invited to become an emergency contact for the user listed above. To accept the invitation, you need to log in or create a new Bitwarden account."
+    "message": "لقد تمت دعوتك لتصبح جهة اتصال طوارئ للمستخدم المذكور أعلاه. للموافقة على الدعوة، تحتاج إلى تسجيل الدخول أو إنشاء حساب بيتواردن جديد."
   },
   "emergencyInviteAcceptFailed": {
     "message": "Unable to accept invitation. Ask the user to send a new invitation."
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5439,13 +5448,13 @@
     }
   },
   "planPrice": {
-    "message": "Plan price"
+    "message": "سعر الخطة"
   },
   "estimatedTax": {
     "message": "الضريبة المقدرة"
   },
   "custom": {
-    "message": "Custom"
+    "message": "مُخصّص"
   },
   "customDesc": {
     "message": "Grant customized permissions to members"
@@ -5466,13 +5475,13 @@
     "message": "To enable custom permissions the organization must be on an Enterprise 2020 plan."
   },
   "permissions": {
-    "message": "Permissions"
+    "message": "الصلاحيات"
   },
   "permission": {
-    "message": "Permission"
+    "message": "الصلاحية"
   },
   "accessEventLogs": {
-    "message": "Access event logs"
+    "message": "الوصول إلى سجلات الأحداث"
   },
   "accessImportExport": {
     "message": "Access import/export"
@@ -5611,10 +5620,10 @@
     "message": "Access request for secrets manager email sent to admins."
   },
   "requestAccessSMDefaultEmailContent": {
-    "message": "Hi,\n\nI am requesting a subscription to Bitwarden Secrets Manager for our team. Your support would mean a great deal!\n\nBitwarden Secrets Manager is an end-to-end encrypted secrets management solution for securely storing, sharing, and deploying machine credentials like API keys, database passwords, and authentication certificates.\n\nSecrets Manager will help us to:\n\n- Improve security\n- Streamline operations\n- Prevent costly secret leaks\n\nTo request a free trial for our team, please reach out to Bitwarden.\n\nThank you for your help!"
+    "message": "مرحباً،\n\nأنا أطلب اشتراكاً في Bitwarden Secrets Manager لفريقنا. دعمكم سيكون ذا قيمة كبيرة بالنسبة لنا!\n\nBitwarden Secrets Manager هو حل لإدارة الأسرار مشفر من الطرف إلى الطرف لتخزين ومشاركة ونشر بيانات الاعتماد الخاصة بالآلات بأمان مثل مفاتيح API، وكلمات مرور قواعد البيانات، وشهادات المصادقة.\n\nسيساعدنا Secrets Manager على:\n\n- تحسين الأمان \n- تبسيط العمليات \n- منع تسرب الأسرار المكلف \n\nلطلب نسخة تجريبية مجانية لفريقنا، يرجى التواصل مع Bitwarden.\n\nشكراً لمساعدتكم!"
   },
   "giveMembersAccess": {
-    "message": "Give members access:"
+    "message": "إعطاء الأعضاء حق الوصول:"
   },
   "viewAndSelectTheMembers": {
     "message": "view and select the members you want to give access to Secrets Manager."
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "هذا المستخدم"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "تمت إعادة تعيين كلمة المرور بنجاح!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "إضافة"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "توليد كلمة مرور"
+  },
+  "generatePassphrase": {
+    "message": "توليد عبارة مرور"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/az/messages.json b/apps/web/src/locales/az/messages.json
index 121f50f0e00..a455efa3230 100644
--- a/apps/web/src/locales/az/messages.json
+++ b/apps/web/src/locales/az/messages.json
@@ -547,12 +547,6 @@
     "message": "Yığcamlaşdırmanı aç/bağla",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Parol yarat"
-  },
-  "generatePassphrase": {
-    "message": "Keçid ifadələri yarat"
-  },
   "checkPassword": {
     "message": "Parolun ifşalanıb ifşalanmadığını yoxlayın."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Mən"
   },
+  "myItems": {
+    "message": "Elementlərim"
+  },
   "myVault": {
     "message": "Seyfim"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Davam etsəniz, hazırkı seansınız bitəcək, təkrar giriş etməyiniz tələb olunacaq. Digər cihazlardakı aktiv seanslar, bir saata qədər aktiv qalmağa davam edə bilər."
   },
+  "changePasswordWarning": {
+    "message": "Parolunuzu dəyişdirdikdən sonra yeni parolunuzla giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saat ərzində çıxış sonlandırılacaq."
+  },
   "emailChanged": {
     "message": "E-poçt dəyişdirildi"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "İki addımlı girişi qurmaq, Bitwarden hesabınızı birdəfəlik kilidləyə bilər. Geri qaytarma kodu, normal iki addımlı giriş provayderinizi artıq istifadə edə bilmədiyiniz hallarda (məs. cihazınızı itirəndə) hesabınıza müraciət etməyinizə imkan verir. Hesabınıza müraciəti itirsəniz, Bitwarden dəstəyi sizə kömək edə bilməyəcək. Geri qaytarma kodunuzu bir yerə yazmağınızı və ya çap etməyinizi və onu etibarlı bir yerdə saxlamağınızı məsləhət görürük."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Kart element növünü sil"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Üzvlərin kart element növlərini yaratmasına icazə verməyin. Mövcud kartlar avtomatik silinəcək."
+  },
+  "restrictCardTypeImport": {
+    "message": "Kart element növləri daxilə köçürülə bilmir"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "1 və ya daha çox təşkilat tərəfindən təyin edilən bir siyasət, kartların seyfinizə köçürülməsini əngəlləyir."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "İki addımlı giriş provayderinizə müraciəti itirdiyiniz halda, iki addımlı girişi söndürmək üçün təkistifadəlik geri qaytarma kodunu istifadə edə bilərsiniz. Bitwarden tövsiyə edir ki, geri qaytarma kodunuzu bir yerə yazıb güvənli bir yerdə saxlayın."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Sıradan çıxart"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Üzv təfsilatları tapılmadı."
+  },
   "revokeAccess": {
     "message": "Müraciəti ləğv et"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Şifrələmə açarı güncəlləməsi davam edə bilmir"
-  },
   "editFieldLabel": {
     "message": "$LABEL$ - düzəliş et",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Şifrələmə açarınızı güncəlləyərkən qovluqlarınızın şifrəsi açıla bilmədi. Güncəlləmənin davam etməsi üçün qovluqlarınız silinməlidir. Davam etsəniz, heç bir seyf elementi silinməyəcək."
-  },
-  "keyUpdated": {
-    "message": "Açar güncəlləndi"
-  },
-  "updateEncryptionKey": {
-    "message": "Şifrələmə açarını güncəllə"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Daha yaxşı güvənlik təqdim etmək üçün şifrələmə sxemini dəyişdirdik. Ana parolunuzu aşağıda daxil edərək şifrələmə açarınızı güncəlləyin."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Şifrələmə açarını güncəllədikdən sonra, hazırda istifadə etdiyiniz (mobil tətbiq və ya brauzer uzantıları kimi) bütün Bitwarden tətbiqlərində çıxış edib yenidən giriş etməlisiniz. Çıxış edib təkrar giriş etməmək (yeni şifrələmə açarının endirilməsi prosesi) dataların zədələnməsi ilə nəticələnə bilər. Avtomatik olaraq çıxış etməyə çalışacağıq, bu gecikə bilər."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Məhdudiyyətli hesablara aid saxladığınız xaricə köçürmələr yararsız olacaq."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Köhnə şifrələmə artıq dəstəklənmir. Hesabınızı geri qaytarmaq üçün lütfən dəstəklə əlaqə saxlayın."
+  },
   "subscription": {
     "message": "Abunəlik"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Fövqəladə hal müraciəti rədd edildi"
   },
+  "grantorDetailsNotFound": {
+    "message": "Qrant verən təfsilatları tapılmadı"
+  },
   "passwordResetFor": {
     "message": "$USER$ üçün parol sıfırlandı. Artıq yeni parol ilə giriş edə bilərsiniz.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Təşkilata data üzərində məcburi sahiblik ver"
+  },
   "personalOwnership": {
     "message": "Fərdi sahiblik"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Davam etsəniz, $NAME$ üçün hazırkı seans bitəcək, təkrar giriş etməsi tələb olunacaq. Digər cihazlardakı aktiv seanslar, bir saata qədər aktiv qalmağa davam edə bilər.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "bu istifadəçi"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Bir və ya daha çox təşkilat siyasəti, aşağıdakı tələbləri qarşılamaq üçün ana parolu tələb edir:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Bir və ya daha çox təşkilat siyasəti, aşağıdakı tələbləri qarşılamaq üçün ana parolu tələb edir:"
+  },
   "resetPasswordSuccess": {
     "message": "Parol sıfırlama uğurludur!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Əlavə et"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Ana parol uğurla təyin edildi"
+  },
   "updatedMasterPassword": {
     "message": "Güncəllənmiş ana parol"
   },
   "updateMasterPassword": {
     "message": "Ana parolu güncəllə"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Hesabın geri qaytarılması prosesini tamamlamaq üçün ana parolunuzu dəyişdirin."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Ana parolunuz bu təşkilatın tələblərinə cavab vermir. Davam etmək üçün ana parolunuzu dəyişdirin."
+  },
   "updateMasterPasswordWarning": {
     "message": "Ana parolunuz təzəlikcə təşkilatınızdakı bir administrator tərəfindən dəyişdirildi. Seyfə müraciət üçün Ana parolunuzu indi güncəlləməlisiniz. Davam etsəniz, hazırkı seansdan çıxış etmiş və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saata qədər aktiv qalmağa davam edə bilər."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "E-poçt yarat"
   },
+  "generatePassword": {
+    "message": "Parol yarat"
+  },
+  "generatePassphrase": {
+    "message": "Keçid ifadələri yarat"
+  },
+  "passwordGenerated": {
+    "message": "Parol yaradıldı"
+  },
+  "passphraseGenerated": {
+    "message": "Keçid ifadəsi yaradıldı"
+  },
+  "usernameGenerated": {
+    "message": "İstifadəçi adı yaradıldı"
+  },
+  "emailGenerated": {
+    "message": "E-poçt yaradıldı"
+  },
   "spinboxBoundariesHint": {
     "message": "Dəyər, $MIN$-$MAX$ arasında olmalıdır.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Bu parolu istifadə et"
   },
+  "useThisPassphrase": {
+    "message": "Bu keçid ifadəsini istifadə et"
+  },
   "useThisUsername": {
     "message": "Bu istifadəçi adını istifadə et"
   },
@@ -7605,9 +7656,9 @@
     "message": "Xidmət hesabı güncəlləndi",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Layihələri və ya sirləri yazın və ya seçin",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Layihələri yaz və ya seç",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Filtrləmək üçün yazın",
@@ -7692,8 +7743,8 @@
     "message": "Müraciət tokenləri",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Yeni müraciət tokeni",
+  "createAccessToken": {
+    "message": "Müraciət tokeni yarat",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Daxilə köçürmə faylını oxumağa çalışarkən xəta baş verdi"
   },
+  "accessedSecretWithId": {
+    "message": "$SECRET_ID$ identifikatoruna sahib bir sirrə müraciət edildi.",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "$SECRET_ID$ sirrinə müraciət edildi.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "$SECRET_ID$ identifikatoruna sahib bir sirrə düzəliş edildi.",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "$SECRET_ID$ identifikatoruna sahib bir sirr silindi.",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "$SECRET_ID$ identifikatoruna sahib yeni bir sirr yaradıldı.",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Admin təsdiqini tələb et"
   },
+  "unableToCompleteLogin": {
+    "message": "Giriş prosesi tamamlana bilmir"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Güvəndiyiniz bir cihazda giriş etməli və ya inzibatçınızdan sizə bir parol təyin etməsini xahiş etməlisiniz."
+  },
   "trustedDeviceEncryption": {
     "message": "Güvənli cihaz şifrələməsi"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Cihaz güvənlidir"
   },
-  "sendsNoItemsTitle": {
-    "message": "Aktiv \"Send\" yoxdur",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Şifrələnmiş məlumatları hər kəslə güvənli şəkildə paylaşmaq üçün \"Send\"i istifadə edin.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "İstifadəçiləri dəvət et"
   },
@@ -8837,6 +8922,30 @@
     "message": "Ortaq formatlar",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI uyuşma aşkarlaması, Bitwarden-in avto-doldurma təkliflərini necə müəyyən etdiyini göstərir.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Müntəzəm ifadə\", kimlik məlumatlarının ifşa olunma riskini artıran qabaqcıl bir seçimdir.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"İlə başlayır\", kimlik məlumatlarının ifşa olunma riskini artıran qabaqcıl bir seçimdir.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Uyuşma aşkarlaması barədə daha çox",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "$ORG$ abunəliyinizi davam etdirmək üçün, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10270,7 +10379,7 @@
     }
   },
   "updatedRevokeSponsorshipConfirmationForSentSponsorship": {
-    "message": "$EMAIL$ silinsə, bu Ailələr planı üçün sponsorluq istifadə edilə bilməz. Davam etmək istədiyinizə əminsiniz?",
+    "message": "$EMAIL$ silsəniz, bu Ailələr planı üçün sponsorluq istifadə edilə bilməz. Davam etmək istədiyinizə əminsiniz?",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10279,7 +10388,7 @@
     }
   },
   "updatedRevokeSponsorshipConfirmationForAcceptedSponsorship": {
-    "message": "$EMAIL$ silinsə, bu Ailə planı üçün sponsorluq bitəcək və saxlanılmış ödəniş üsulundan $DATE$ tarixində $40 + müvafiq vergi tutulacaq. $DATE$ tarixinə qədər yeni bir sponsorluq istifadə edə bilməyəcəksiniz. Davam etmək istədiyinizə əminsiniz?",
+    "message": "$EMAIL$ silsəniz, bu Ailə planı üçün sponsorluq bitəcək və saxlanılmış ödəniş üsulundan $DATE$ tarixində $40 + müvafiq vergi tutulacaq. $DATE$ tarixinə qədər yeni bir sponsorluq istifadə edə bilməyəcəksiniz. Davam etmək istədiyinizə əminsiniz?",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Yeni biznes vahidi"
   },
+  "sendsTitleNoItems": {
+    "message": "Send, həssas məlumatlar təhlükəsizdir",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "İstənilən platformada faylları və dataları hər kəslə paylaşın. İfşa olunmağı məhdudlaşdıraraq məlumatlarınız ucdan-uca şifrələnmiş qalacaq.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Cəld parol yaradın"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Klikləyərək güclü və unikal parolları asanlıqla yaradın",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "və girişlərinizi güvənli şəkildə saxlayın.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Girişlərinizi güvənli şəkildə saxlamağınıza kömək etməsi üçün Parol yarat düyməsinə klikləyərək güclü və unikal parolları asanlıqla yaradın.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Avto-doldurma ilə vaxta qənaət edin"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Parollarınızı tək bir kliklə güvənli şəkildə avto-doldurun"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Bitwarden brauzer uzantısını əldə edin və bugün avto-doldurmağa başlayın"
+  },
+  "getTheExtension": {
+    "message": "Uzantını əldə et"
+  },
+  "addItLater": {
+    "message": "Daha sonra əlavə et"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Brauzer uzantısı olmadan parolları avto-doldura bilməzsiniz"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Uzantını indi əlavə etmək istəmədiyinizə əminsiniz?"
+  },
+  "skipToWebApp": {
+    "message": "Veb tətbiqinə keç"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden uzantısı quraşdırıldı!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Giriş etmək üçün uzantını aç və avto-doldurmağa başla."
+  },
+  "openBitwardenExtension": {
+    "message": "Bitwarden uzantısını aç"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "Bitwarden-i öyrənmək üçün ziyarət edin:",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Öyrənmə Mərkəzi",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Kömək Mərkəzi",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "Bitwarden brauzer uzantısı ilə, asanlıqla yeni giriş məlumatlarını yarada, saxlanılmış giriş məlumatlarınıza birbaşa brauzerin alət çubuğundan müraciət edə və Bitwarden avto-doldurmanı istifadə edərək hesablarınıza cəld şəkildə daxil ola bilərsiniz."
+  },
   "restart": {
     "message": "Yenidən başlat"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Ödəniş üsulunuzu əlavə etmək üçün lütfən Paypal ilə ödəniş et düyməsinə klikləyin."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "$EMAIL$ silsəniz, bu Ailə planı üçün sponsorluq bitəcək. Təşkilatınızın daxilindəki bir yer $DATE$ tarixində sponsorlu təşkilatın yenilənmə tarixindən sonra üzvlər və sponsorluqlar üçün əlçatan olacaq.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Kredit əlavə etmək üçün faktura ünvanı tələb olunur.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Faktura ünvanı"
+  },
+  "addBillingAddress": {
+    "message": "Faktura ünvanı əlavə et"
+  },
+  "editBillingAddress": {
+    "message": "Faktura ünvanına düzəliş et"
+  },
+  "noBillingAddress": {
+    "message": "Faylda faktura ünvanı yoxdur."
+  },
+  "billingAddressUpdated": {
+    "message": "Faktura ünvanınız güncəllənib."
+  },
+  "paymentDetails": {
+    "message": "Ödəniş detalları"
+  },
+  "paymentMethodUpdated": {
+    "message": "Ödəniş üsulunuz güncəllənib."
+  },
+  "bankAccountVerified": {
+    "message": "Bank hesabınız doğrulanıb."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Mövcud olan bütün kredit, avtomatik olaraq bu hesab üçün yaradılmış fakturalara tətbiq olunacaq."
+  },
+  "mustBePositiveNumber": {
+    "message": "Müsbət bir ədəd olmalıdır"
+  },
+  "cardSecurityCode": {
+    "message": "Kart təhlükəsizlik kodu"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Kart təhlükəsizlik kodu, CVV və ya CVC kimi bilinən və adətən kredit kartınızın arxasına yazılmış 3 rəqəmli bir ədəd və ya ön tərəfdə kart nömrəsinin üzərində yazılan 4 rəqəmli ədəddir."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Bank hesabı ilə ödəniş, yalnız Amerika Birləşmiş Ştatlarındakı müştərilər üçün əlçatandır. Bank hesabınızı doğrulamağınız tələb olunacaq. Növbəti 1-2 iş günü ərzində mikro depozit qoyacağıq. Bank hesabını doğrulamaq üçün bu depozitdəki çıxarış deskriptor kodunu Ödəniş Detalları səhifəsində daxil edin. Bank hesabı doğrulanmadıqda ödəniş buraxılacaq və abunəliyiniz dayandırılacaq."
+  },
+  "taxId": {
+    "message": "Vergi kimliyi: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/be/messages.json b/apps/web/src/locales/be/messages.json
index 7409df6baff..40875670107 100644
--- a/apps/web/src/locales/be/messages.json
+++ b/apps/web/src/locales/be/messages.json
@@ -547,12 +547,6 @@
     "message": "Згарнуць/Разгарнуць",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Генерыраваць пароль"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Праверце, ці не скампраметаваны пароль."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Я"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Маё сховішча"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Працягваючы, вы выйдзіце з бягучага сеанса і вам неабходна будзе ўвайсці паўторна. Сеансы на іншых прыладах могуць заставацца актыўнымі на працягу адной гадзіны."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Электронная пошта зменена"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Уключэнне двухэтапнага ўваходу можа цалкам заблакіраваць доступ да ўліковага запісу Bitwarden. Код аднаўлення дае магчымасць атрымаць доступ да вашага ўліковага запісу ў выпадку, калі вы не можаце скарыстацца звычайным спосабам пастаўшчыка двухэтапнага ўваходу (напрыклад, вы згубілі сваю прыладу). Падтрымка Bitwarden не зможа вам дапамагчы, калі вы згубіце доступ да свайго ўліковага запісу. Мы рэкамендуем вам запісаць або раздрукаваць код аднаўлення і захоўваць яго ў надзейным месцы."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Адключыць"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Адклікаць доступ"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Ключ абноўлены"
-  },
-  "updateEncryptionKey": {
-    "message": "Абнавіць ключ шыфравання"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Мы змянілі схему шыфравання каб надаць найлепшы ўзровень бяспекі. Каб абнавіць ваш ключ шыфравання, увядзіце ваш асноўны пароль ніжэй."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Пасля абнаўлення вашага ключа шыфравання вам неабходна выйсці з сістэмы, а потым выканаць паўторны ўваход ва ўсе праграмы Bitwarden, якія вы зараз выкарыстоўваеце (напрыклад, мабільныя праграмы або пашырэнні для браўзераў). Збой пры выхадзе і паўторным уваходзе (пры гэтым спампоўваецца ваш новы ключ шыфравання) можа стаць прычынай пашкоджання даных. Мы паспрабуем аўтаматычна ажыццявіць завяршэнне ўсіх вашых сеансаў, але гэта можа адбывацца з затрымкай."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Падпіска"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Экстранны доступ адхілены"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Пароль скінуты для $USER$. Цяпер вы можаце ўвайсці з дапамогай новага пароля.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Выдаліць асабістае сховішча"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "гэты карыстальнік"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Адна або больш палітык арганізацыі патрабуе, каб асноўны пароль адпавядаў наступным патрабаванням:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Пароль паспяхова скінуты!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Дадаць"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Асноўны пароль абноўлены"
   },
   "updateMasterPassword": {
     "message": "Абнавіць асноўны пароль"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Ваш асноўны пароль быў нядаўна зменены адміністратарам вашай арганізацыі. Для атрымання доступу да сховішча, вы павінны абнавіць яго. Працягваючы, вы выйдзіце з бягучага сеанса і вам неабходна будзе ўвайсці паўторна. Сеансы на іншых прыладах могуць заставацца актыўнымі на працягу адной гадзіны."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Генерыраваць пароль"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Сэрвісны ўліковы запіс абноўлены",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Увядзіце або выберыце праекты (сакрэты)",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Увядзіце, каб адфільтраваць",
@@ -7692,8 +7743,8 @@
     "message": "Токены доступу",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Новы токен доступу",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Адбылася памылка падчас спробы прачытаць імпартаваны файл"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Атрыманы доступ да сакрэту $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Запытаць ухваленне адміністратара"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Шыфраванне даверанай прылады"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Давераная прылада"
   },
-  "sendsNoItemsTitle": {
-    "message": "Няма актыўных Send'аў",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Выкарыстоўвайце Send'ы, каб бяспечна абагуляць зашыфраваную інфармацыю з іншымі.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Запрасіць карыстальнікаў"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/bg/messages.json b/apps/web/src/locales/bg/messages.json
index a8bd9d51e8f..77ea169bb2b 100644
--- a/apps/web/src/locales/bg/messages.json
+++ b/apps/web/src/locales/bg/messages.json
@@ -547,12 +547,6 @@
     "message": "Превключване на свиването",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Нова парола"
-  },
-  "generatePassphrase": {
-    "message": "Генериране на парола-фраза"
-  },
   "checkPassword": {
     "message": "Проверка дали паролата е разкрита."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Аз"
   },
+  "myItems": {
+    "message": "Моите елементи"
+  },
   "myVault": {
     "message": "Моят трезор"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Действието ще прекрати и текущата ви сесия, след което ще се наложи отново да се впишете. Активните сесии на другите устройства може да останат такива до един час."
   },
+  "changePasswordWarning": {
+    "message": "След като промените паролата си, ще трябва да се впишете отново с новата си парола. Сесиите на други устройства също ще бъдат прекратени в рамките на един час."
+  },
   "emailChanged": {
     "message": "Електронната поща е сменена"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Включването на двустепенна идентификация може завинаги да предотврати вписването ви в абонамента към Битуорден. Кодът за възстановяване ще ви позволи да достъпите абонамента дори и да имате проблем с доставчика на двустепенна идентификация (напр. ако изгубите устройството си). Дори и екипът по поддръжката към няма да ви помогне в такъв случай. Силно препоръчваме да отпечатате или запишете кодовете и да ги пазете на надеждно място."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Премахване на елемента за карти"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Да не се разрешава на членовете да създават картови елементи. Съществуващите карти ще бъдат премахнати автоматично."
+  },
+  "restrictCardTypeImport": {
+    "message": "Картовите елементи не могат да бъдат внесени"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Политика, зададена от 1 или повече организации, не позволява да внасяте карти в трезорите си."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Вашият еднократен код за възстановяване може да бъде използван, за да изключите двустепенното удостоверяване, в случай че нямате достъп до доставчика си за двустепенно вписване. Битуорден препоръчва да запишете кода си за възстановяване и да го пазите на сигурно място."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Изключване"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Няма намерени подробности за члена."
+  },
   "revokeAccess": {
     "message": "Отнемане на достъпа"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Актуализирането на шифриращия ключ не може да продължи"
-  },
   "editFieldLabel": {
     "message": "Редактиране на $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Ако актуализирате шифроващия ключ, папките Ви няма да могат да бъдат дешифрирани. За да продължите с промяната, папките трябва да бъдат изтрити. Елементите в трезора няма да бъдат изтрити, ако продължите."
-  },
-  "keyUpdated": {
-    "message": "Ключът е обновен"
-  },
-  "updateEncryptionKey": {
-    "message": "Обновяване на ключа за шифриране"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Променихме схемата на шифроване, за да подобрим сигурността. Обновете шифриращия си ключ сега, като въведете главната си парола по-долу."
-  },
   "updateEncryptionKeyWarning": {
     "message": "След смяната на ключа за шифриране ще трябва да се отпишете и след това да се впишете в регистрацията си във всички приложения на Битуорден, които ползвате (като мобилното приложение и разширенията за браузъри). Ако не се отпишете и впишете повторно (за да получите достъп до новия ключ), рискувате да повредите записите си. Сега ще се пробва да бъдете отписани автоматично, това обаче може да се забави."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Всички изнасяния ограничени от акаунта, които сте запазили, ще станат невалидни."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Остарелият метод на шифроване вече не се поддържа. Моля, свържете се с поддръжката, за да възстановите акаунта си."
+  },
   "subscription": {
     "message": "Абонамент"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Извънредният достъп е отказан."
   },
+  "grantorDetailsNotFound": {
+    "message": "Няма намерени подробности за Gantor"
+  },
   "passwordResetFor": {
     "message": "Паролата на потребителя $USER$ е сменена и той може вече да влезе с новата.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Задължителна собственост на организационните данни"
+  },
   "personalOwnership": {
     "message": "Индивидуално притежание"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Действието ще прекрати текущата сесия на $NAME$, след което ще се наложи той/тя отново да се впише. Активните сесии на другите устройства може да останат такива до един час.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "този потребител"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Поне една политика на организация има следните изисквания към главната парола:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Поне една политика на организация има следните изисквания към главната парола:"
+  },
   "resetPasswordSuccess": {
     "message": "Успешна смяна на паролата!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Добавяне"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Главната парола е зададена успешно"
+  },
   "updatedMasterPassword": {
     "message": "Главната парола е променена"
   },
   "updateMasterPassword": {
     "message": "Промяна на главната парола"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Променете главната си парола, за да завършите възстановяването на акаунта."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Главната парола не отговаря на изискванията на тази организация. Променете главната си парола, за да продължите."
+  },
   "updateMasterPasswordWarning": {
     "message": "Вашата главна парола наскоро е била сменена от администратор в организацията Ви. За да получите достъп до трезора, трябва да промените главната си парола сега. Това означава, че ще бъдете отписан(а) от текущата си сесия и ще трябва да се впишете отново. Активните сесии на други устройства може да продължат да бъдат активни още един час."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Генериране на електронна поща"
   },
+  "generatePassword": {
+    "message": "Нова парола"
+  },
+  "generatePassphrase": {
+    "message": "Генериране на парола-фраза"
+  },
+  "passwordGenerated": {
+    "message": "Паролата е генерирана"
+  },
+  "passphraseGenerated": {
+    "message": "Паролата-фраза е генерирана"
+  },
+  "usernameGenerated": {
+    "message": "Потребителското име е генерирано"
+  },
+  "emailGenerated": {
+    "message": "Е-пощата е генерирана"
+  },
   "spinboxBoundariesHint": {
     "message": "Стойността трябва да бъде между $MIN$ и $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Използване на тази парола"
   },
+  "useThisPassphrase": {
+    "message": "Използване на тази парола-фраза"
+  },
   "useThisUsername": {
     "message": "Използване на това потребителско име"
   },
@@ -7605,9 +7656,9 @@
     "message": "Сервизният акаунт е обновен",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Пишете тук или изберете проекти или тайни",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Пишете тук или изберете проекти",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Пишете тук за филтриране",
@@ -7692,8 +7743,8 @@
     "message": "Идентификатори за достъп",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Нов идентификатор за достъп",
+  "createAccessToken": {
+    "message": "Създаване на идентификатор за достъп",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Възникна грешка при опита за четене на файла за внасяне"
   },
+  "accessedSecretWithId": {
+    "message": "Осъществен е достъп до тайна с идентификатор: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Достъпена е тайната $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Редактирана е тайна с идентификатор: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Изтрита е тайна с идентификатор: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Създадена е нова тайна с идентификатор: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Подаване на заявка за одобрение от администратор"
   },
+  "unableToCompleteLogin": {
+    "message": "Вписването не може да бъде завършено"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Трябва да се впишете на доверено устройство или да помолите администратора си да Ви зададе парола."
+  },
   "trustedDeviceEncryption": {
     "message": "Шифроване чрез доверено устройство"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Устройството е доверено"
   },
-  "sendsNoItemsTitle": {
-    "message": "Няма активни Изпращания",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Използвайте Изпращане, за да споделите безопасно шифрована информация с някого.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Канене на потребители"
   },
@@ -8837,6 +8922,30 @@
     "message": "Често използвани формати",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Разпознаването на съвпадения чрез адреса е начинът, по който Битуорден определя кои елементи да предложи за автоматично попълване.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "„Регулярен израз“ е по-сложен метод, който е и по-рисков, тъй като може да застраши сигурността на данните за вписване.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "„Започва с“ е по-сложен метод, който е и по-рисков, тъй като може да застраши сигурността на данните за вписване.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Повече относно разпознаването на съвпадения",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Разширени настройки",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Внимание",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "За да продължите абонамента си за $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Нова бизнес единица"
   },
+  "sendsTitleNoItems": {
+    "message": "Изпращайте чувствителна информация сигурно",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Споделяйте сигурно файлове и данни с всекиго, през всяка система. Информацията Ви ще бъде защитена с шифроване от край до край, а видимостта ѝ ще бъде ограничена.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Създавайте пароли бързо"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Създавайте лесно сложни и уникални пароли като щракнете върху",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "за да защитите данните си за вписване.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Създавайте лесно сложни и уникални пароли като щракнете върху бутона за генериране на парола, за да защитите данните си за вписване.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Спестете време с автоматично попълване"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Попълвайте автоматично и сигурно паролите си с едно щракване на мишката"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Вземете добавката за браузър на Битуорден и се възползвайте от автоматичното попълване още днес"
+  },
+  "getTheExtension": {
+    "message": "Вземете добавката"
+  },
+  "addItLater": {
+    "message": "Добавяне по-късно"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Не можете да попълвате автоматично пароли в браузъра без добавката"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Наистина ли не искате да свалите добавката сега?"
+  },
+  "skipToWebApp": {
+    "message": "Пропускане и преминаване към приложението по уеб"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Добавката на Битуорден е инсталирана!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Отворете добавката, за да се впишете и да можете да използвате автоматичното попълване."
+  },
+  "openBitwardenExtension": {
+    "message": "Отваряне на добавката на Битуорден"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "За съвети как да се възползвате от Битуорден, посетете",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Центъра за обучения",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Помощния център",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "С добавката за браузър на Битуорден можете лесно да създавате нови елементи за вписване, както и да имате достъп до тях направо от лентата с инструменти на браузъра си. Също така, можете да се вписвате лесно и бързо, чрез функцията за автоматично попълване."
+  },
   "restart": {
     "message": "Повторно пускане"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Моля, натиснете бутона за плащане с PayPal, за да добавите платежния си метод."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Ако премахнете $EMAIL$, спонсорирането на този семеен план ще бъде прекратено. Едно място в организацията ще стане налично за членове или спонсори след датата за подновяване на спонсорирането на организацията – $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Адресът за таксуване е задължителен за добавянето на средства.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Адрес за фактуриране"
+  },
+  "addBillingAddress": {
+    "message": "Добавяне на адрес за фактуриране"
+  },
+  "editBillingAddress": {
+    "message": "Редактиране на адреса за фактуриране"
+  },
+  "noBillingAddress": {
+    "message": "Няма записан адрес."
+  },
+  "billingAddressUpdated": {
+    "message": "Вашият адрес за фактуриране беше променен."
+  },
+  "paymentDetails": {
+    "message": "Подробности за плащанията"
+  },
+  "paymentMethodUpdated": {
+    "message": "Вашият разплащателен метод е променен."
+  },
+  "bankAccountVerified": {
+    "message": "Вашата банкова сметка е потвърдена."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Наличните средства ще бъдат използвани автоматично за заплащане на фактурите издадени за този акаунт."
+  },
+  "mustBePositiveNumber": {
+    "message": "Трябва да бъде положително число"
+  },
+  "cardSecurityCode": {
+    "message": "Код за сигурност на картата"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Кодът за сигурност на картата, познат още като CVV или CVC, обикновено е 3-цифрено число, което се намира на гърба на картата, или 4-цифрено число, което се намира на предната част на картата, над номера ѝ."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Плащането чрез банкова сметка е налично само за клиенти от САЩ. Ще трябва да потвърдите банковата си сметка. В следващите 1-2 работни дни ще направим малък депозит. Въведете кода от описанието на трансакцията в страницата за подробности за разплащанията, за да потвърдите банковата сметка. Ако не потвърдите банковата сметка, може да пропуснете плащането и абонаментът Ви да бъде спрян."
+  },
+  "taxId": {
+    "message": "Данъчен идентификатор: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/bn/messages.json b/apps/web/src/locales/bn/messages.json
index 1419d580837..66aa1b9a62e 100644
--- a/apps/web/src/locales/bn/messages.json
+++ b/apps/web/src/locales/bn/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "পাসওয়ার্ড তৈরি করুন"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "আমার ভল্ট"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "পাসওয়ার্ড তৈরি করুন"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/bs/messages.json b/apps/web/src/locales/bs/messages.json
index 31174ebbe5a..9d9bece2b6e 100644
--- a/apps/web/src/locales/bs/messages.json
+++ b/apps/web/src/locales/bs/messages.json
@@ -547,12 +547,6 @@
     "message": "Sažmi/Proširi",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Ja"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Moj trezor"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ca/messages.json b/apps/web/src/locales/ca/messages.json
index 49aadd7951a..118af8c66fb 100644
--- a/apps/web/src/locales/ca/messages.json
+++ b/apps/web/src/locales/ca/messages.json
@@ -502,7 +502,7 @@
     "message": "Nom de la carpeta"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Imbriqueu una carpeta afegint el nom de la carpeta principal seguit d'una \"/\". Exemple: Social/Fòrums"
   },
   "deleteFolderPermanently": {
     "message": "Are you sure you want to permanently delete this folder?"
@@ -547,12 +547,6 @@
     "message": "Redueix/Amplia",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Genera contrasenya"
-  },
-  "generatePassphrase": {
-    "message": "Genera frase de pas"
-  },
   "checkPassword": {
     "message": "Comprova si la contrasenya ha estat exposada."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Jo"
   },
+  "myItems": {
+    "message": "Els meus elements"
+  },
   "myVault": {
     "message": "Caixa forta"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Si es procedeix, es tancarà la vostra sessió actual i l'haureu de tornar a iniciar. Les sessions d'altres dispositius poden mantenir-se actives fins a una hora."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "El correu electrònic s'ha guardat"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Si habiliteu l'inici de sessió en dues passes, pot bloquejar-vos de manera definitiva el compte de Bitwarden. Un codi de recuperació us permet accedir al vostre compte en cas que no pugueu utilitzar el proveïdor d'inici de sessió en dues passes (p. Ex. Perdre el dispositiu). El suport de Bitwarden no podrà ajudar-vos si perdeu l'accés al vostre compte. Us recomanem que escriviu o imprimiu el codi de recuperació i el mantingueu en un lloc segur."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Inhabilita"
   },
+  "orgUserDetailsNotFound": {
+    "message": "No s'han trobat les dades del membre."
+  },
   "revokeAccess": {
     "message": "Revoca l'accés"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Clau actualitzada"
-  },
-  "updateEncryptionKey": {
-    "message": "Actualitza la clau de xifratge"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Hem canviat l'esquema de xifratge per oferir una millor seguretat. Actualitzeu ara la vostra clau de xifratge introduint la vostra contrasenya mestra a continuació."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Després d'actualitzar la vostra clau de xifratge, heu de tancar la sessió i tornar a entrar a totes les aplicacions de Bitwarden que esteu utilitzant actualment (com ara l'aplicació mòbil o les extensions del navegador). Si no es tanca i torna a iniciar la sessió (la qual descarrega la vostra nova clau de xifratge) pot provocar corrupció en les dades. Intentarem registrar-vos automàticament, però, es pot retardar."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscripció"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Accés d’emergència rebutjat"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Restabliment de la contrasenya per a $USER$. Ara podeu iniciar la sessió amb la nova contrasenya.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Suprimeix la caixa forta individual"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "aquest usuari"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Una o més polítiques d’organització requereixen que la vostra contrasenya principal complisca els requisits següents:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "S'ha restablert la contrasenya correctament!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Afig"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "La contrasenya mestra s'ha configurat correctament"
+  },
   "updatedMasterPassword": {
     "message": "Contrasenya mestra guardada"
   },
   "updateMasterPassword": {
     "message": "Actualitza contrasenya mestra"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Un administrador de l'organització ha canviat recentment la contrasenya principal. Per accedir a la caixa forta, heu d'actualitzar-la ara. Si continueu, es tancarà la sessió actual i heu de tornar a iniciar-la. És possible que les sessions obertes en altres dispositius continuen actives fins a una hora."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Genera contrasenya"
+  },
+  "generatePassphrase": {
+    "message": "Genera frase de pas"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Compte de servei actualitzat",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Escriu o selecciona projectes o secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Escriu o selecciona projectes",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Escriu per a filtrar",
@@ -7692,8 +7743,8 @@
     "message": "Tokens d'accès",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Token nou d'accés",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "S'ha produït un error en intentar llegir el fitxer d'importació"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "S'ha accedit al secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Sol·liciteu l'aprovació de l'administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Encriptació de dispositius de confiança"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Dispositiu de confiança"
   },
-  "sendsNoItemsTitle": {
-    "message": "No hi ha Sends actius",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Utilitzeu Send per compartir informació xifrada de manera segura amb qualsevol persona.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Convida usuaris"
   },
@@ -8837,6 +8922,30 @@
     "message": "Formats comuns",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Per mantenir la teua subscripció per $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Unitat de negoci nova"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/cs/messages.json b/apps/web/src/locales/cs/messages.json
index 615bfa4f09b..51c04fd9260 100644
--- a/apps/web/src/locales/cs/messages.json
+++ b/apps/web/src/locales/cs/messages.json
@@ -21,7 +21,7 @@
     "message": "Rizikové heslo"
   },
   "reviewAtRiskPasswords": {
-    "message": "Zkontrolujte riziková hesla (slabá, odhalená nebo opakovaně používaná) ve všech aplikacích. Vyberte nejkritičtější aplikace a stanovte priority bezpečnostních opatření pro uživatele, abyste se vypořádali s rizikovými hesly."
+    "message": "Zkontrolujte ohrožená hesla (slabá, odhalená nebo opakovaně používaná) ve všech aplikacích. Vyberte nejkritičtější aplikace a stanovte priority bezpečnostních opatření pro uživatele, abyste se vypořádali s ohroženými hesly."
   },
   "dataLastUpdated": {
     "message": "Data naposledy aktualizována: $DATE$",
@@ -90,7 +90,7 @@
     "message": "Neoznačili jste žádné aplikace jako kritické"
   },
   "noCriticalAppsDescription": {
-    "message": "Vyberte své nejkritičtější aplikace, abyste objevili riziková hesla a upozorněte uživatele na změnu těchto hesel."
+    "message": "Vyberte své nejkritičtější aplikace, abyste objevili ohrožená hesla a upozorněte uživatele na změnu těchto hesel."
   },
   "markCriticalApps": {
     "message": "Označit kritické aplikace"
@@ -120,7 +120,7 @@
     "message": "Ohrožení členové"
   },
   "atRiskMembersWithCount": {
-    "message": "Rizikoví členové ($COUNT$)",
+    "message": "Ohrožení členové ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -129,7 +129,7 @@
     }
   },
   "atRiskApplicationsWithCount": {
-    "message": "Rizikové aplikace ($COUNT$)",
+    "message": "Ohrožené aplikace ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -171,7 +171,7 @@
     "message": "Celkem členů"
   },
   "atRiskApplications": {
-    "message": "Rizikové aplikace"
+    "message": "Ohrožené aplikace"
   },
   "totalApplications": {
     "message": "Celkem aplikací"
@@ -547,12 +547,6 @@
     "message": "Přepnout sbalení",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Vygenerovat heslo"
-  },
-  "generatePassphrase": {
-    "message": "Vygenerovat heslovou frázi"
-  },
   "checkPassword": {
     "message": "Zkontrolujte, zda nedošlo k úniku hesla."
   },
@@ -593,7 +587,7 @@
     "message": "Upravit"
   },
   "searchCollection": {
-    "message": "Prohledat kolekci"
+    "message": "Prohledat sbírku"
   },
   "searchFolder": {
     "message": "Prohledat složku"
@@ -672,7 +666,7 @@
     "message": "Složky"
   },
   "collections": {
-    "message": "Kolekce"
+    "message": "Sbírky"
   },
   "firstName": {
     "message": "Křestní jméno"
@@ -870,6 +864,9 @@
   "me": {
     "message": "Já"
   },
+  "myItems": {
+    "message": "Moje položky"
+  },
   "myVault": {
     "message": "Můj trezor"
   },
@@ -1373,13 +1370,13 @@
     "message": "Žádné položky k zobrazení."
   },
   "noPermissionToViewAllCollectionItems": {
-    "message": "Nemáte oprávnění k zobrazení všech položek v této kolekci."
+    "message": "Nemáte oprávnění k zobrazení všech položek v této sbírce."
   },
   "youDoNotHavePermissions": {
-    "message": "Nemáte oprávnění k této kolekci"
+    "message": "Nemáte oprávnění k této sbírce"
   },
   "noCollectionsInList": {
-    "message": "Žádné kolekce k zobrazení."
+    "message": "Žádné sbírky k zobrazení."
   },
   "noGroupsInList": {
     "message": "Žádné skupiny k zobrazení."
@@ -1545,7 +1542,7 @@
     "message": "Vyberte organizaci, do které chcete tuto položku přesunout. Přesun do organizace převede vlastnictví položky této organizaci. Po přesunutí této položky již nebudete přímým vlastníkem této položky."
   },
   "collectionsDesc": {
-    "message": "Upravte kolekce, ve kterých je tato položka sdílená. Pouze uživatelé organizace, kteří mají přístup k těmto kolekcím, budou moci tuto položku vidět."
+    "message": "Upravte sbírky, ve kterých je tato položka sdílená. Pouze uživatelé organizace, kteří mají přístup k těmto sbírkám, budou moci tuto položku vidět."
   },
   "deleteSelectedItemsDesc": {
     "message": "$COUNT$ položek bude přesunuto do koše.",
@@ -1557,7 +1554,7 @@
     }
   },
   "deleteSelectedCollectionsDesc": {
-    "message": "$COUNT$ kolekcí bude trvale smazáno.",
+    "message": "$COUNT$ sbírek bude trvale smazáno.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Pokud chcete pokračovat, budete odhlášeni z aktuální relace a bude nutné se znovu přihlásit. Aktivní relace na jiných zařízeních mohou nadále zůstat aktivní po dobu až jedné hodiny."
   },
+  "changePasswordWarning": {
+    "message": "Po změně hesla se budete muset přihlásit pomocí svého nového hesla. Aktivní relace na jiných zařízeních budou odhlášeny do jedné hodiny."
+  },
   "emailChanged": {
     "message": "E-mail byl změněn"
   },
@@ -2025,7 +2025,7 @@
     "message": "Zvolte složku"
   },
   "selectImportCollection": {
-    "message": "Zvolte kolekci"
+    "message": "Zvolte sbírku"
   },
   "importTargetHint": {
     "message": "Pokud chcete obsah importovaného souboru přesunout do složky $DESTINATION$, vyberte tuto volbu",
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Nastavením dvoufázového přihlášení můžete sami sobě znemožnit přihlášení k Vašemu účtu. Obnovovací kód umožňuje přístup do Vašeho účtu i v případě, pokud již nemůžete použít svůj normální způsob dvoufázového přihlášení (např. ztráta zařízení). Pokud ztratíte přístup ke svému účtu, nebude Vám schopna pomoci ani zákaznická podpora Bitwardenu. Doporučujeme si proto kód pro obnovení zapsat nebo vytisknout a uložit jej na bezpečném místě."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Odebrat typ položky karty"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Nepovolovat členům vytvářet typy položek karty. Existující karty budou automaticky odebrány."
+  },
+  "restrictCardTypeImport": {
+    "message": "Nelze importovat typy položek karty"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Zásady nastavené 1 nebo více organizací Vám brání v importu karet do Vašeho trezoru."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Jednorázový kód pro obnovení lze použít k vypnutí dvoufázového přihlašování v případě, že ztratíte přístup ke svému poskytovateli dvoufázového přihlašování. Bitwarden doporučuje, abyste si kód pro obnovení zapsali a uložili na bezpečném místě."
   },
@@ -2201,7 +2213,7 @@
     "message": "Spravovat"
   },
   "manageCollection": {
-    "message": "Spravovat kolekci"
+    "message": "Spravovat sbírku"
   },
   "viewItems": {
     "message": "Zobrazit položky"
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Vypnout"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Podrobnosti o členovi nebyly nalezeny"
+  },
   "revokeAccess": {
     "message": "Zrušit přístup"
   },
@@ -3141,7 +3156,7 @@
     }
   },
   "limitedCollections": {
-    "message": "Omezeno na $COUNT$ kolekcí",
+    "message": "Omezeno na $COUNT$ sbírek",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3162,7 +3177,7 @@
     "message": "Neomezený počet uživatelů"
   },
   "createUnlimitedCollections": {
-    "message": "Neomezený počet kolekcí"
+    "message": "Neomezený počet sbírek"
   },
   "gbEncryptedFileStorage": {
     "message": "$SIZE$ šifrovaného úložiště",
@@ -3264,7 +3279,7 @@
     "message": "Opustili jste organizaci"
   },
   "defaultCollection": {
-    "message": "Výchozí kolekce"
+    "message": "Výchozí sbírka"
   },
   "getHelp": {
     "message": "Získat nápovědu"
@@ -3339,7 +3354,7 @@
     "message": "Externí SSO ID je nešifrovaná reference mezi Bitwardenem a Vaším nastaveným poskytovatelem SSO."
   },
   "nestCollectionUnder": {
-    "message": "Vnořit kolekci pod"
+    "message": "Vnořit sbírku pod"
   },
   "accessControl": {
     "message": "Správa přístupů"
@@ -3348,19 +3363,19 @@
     "message": "Jen ke čtení"
   },
   "newCollection": {
-    "message": "Nová kolekce"
+    "message": "Nová sbírka"
   },
   "addCollection": {
-    "message": "Přidat kolekci"
+    "message": "Přidat sbírku"
   },
   "editCollection": {
-    "message": "Upravit kolekci"
+    "message": "Upravit sbírku"
   },
   "collectionInfo": {
-    "message": "Informace o kolekci"
+    "message": "Informace o sbírce"
   },
   "deleteCollectionConfirmation": {
-    "message": "Opravdu chcete smazat tuto kolekci?"
+    "message": "Opravdu chcete smazat tuto sbírku?"
   },
   "editMember": {
     "message": "Upravit člena"
@@ -3420,13 +3435,13 @@
     "message": "Administrátor"
   },
   "adminDesc": {
-    "message": "Spravuje přístup v organizaci, všechny kolekce, členy, hlášení a nastavení zabezpečení."
+    "message": "Spravuje přístup v organizaci, všechny sbírky, členy, hlášení a nastavení zabezpečení."
   },
   "user": {
     "message": "Uživatel"
   },
   "userDesc": {
-    "message": "Přistupuje k přiřazeným kolekcím a přidává je."
+    "message": "Přistupuje k přiřazeným sbírkám a přidává položky."
   },
   "all": {
     "message": "Vše"
@@ -3607,7 +3622,7 @@
     }
   },
   "viewCollectionWithName": {
-    "message": "Byla zobrazena kolekce $NAME$.",
+    "message": "Zobrazit sbírku - $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -3661,7 +3676,7 @@
     }
   },
   "createdCollectionId": {
-    "message": "Byla vytvořena kolekce $ID$.",
+    "message": "Byla vytvořena sbírka $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3670,7 +3685,7 @@
     }
   },
   "editedCollectionId": {
-    "message": "Byla upravena kolekce $ID$.",
+    "message": "Byla upravena sbírka $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3679,10 +3694,10 @@
     }
   },
   "deletedCollections": {
-    "message": "Byly smazány kolekce."
+    "message": "Byly smazány sbírky."
   },
   "deletedCollectionId": {
-    "message": "Byla smazána kolekce $ID$.",
+    "message": "Byla smazána sbírka $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3799,7 +3814,7 @@
     }
   },
   "editedCollectionsForItem": {
-    "message": "Byly upraveny kolekce pro položku $ID$.",
+    "message": "Byly upraveny sbírky pro položku $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4004,7 +4019,7 @@
     "message": "Přístup skupiny"
   },
   "groupAccessUserDesc": {
-    "message": "Udělí členům přístup ke kolekcím přidáním do 1 nebo více skupin."
+    "message": "Udělí členům přístup ke sbírkám přidáním do 1 nebo více skupin."
   },
   "invitedUsers": {
     "message": "Uživatelé byli pozváni"
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Aktualizace šifrovacího klíče nemůže pokračovat"
-  },
   "editFieldLabel": {
     "message": "Upravit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Při aktualizaci šifrovacího klíče se nepodařilo dešifrovat Vaše složky. Chcete-li pokračovat v aktualizaci, musí být Vaše složky smazány. Pokud budete pokračovat, nebudou smazány žádné položky trezoru."
-  },
-  "keyUpdated": {
-    "message": "Klíč byl aktualizován"
-  },
-  "updateEncryptionKey": {
-    "message": "Aktualizovat šifrovací klíč"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Změnili jsme šifrovací schéma pro zajištění větší bezpečnosti. Aktualizujte Váš šifrovací klíč nyní zadáním hlavního hesla níže."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Po aktualizace šifrovacího klíče dojde k odhlášení a budete se muset opětovně přihlásit do všech aplikací Bitwardenu, které aktuálně používáte (např. mobilní aplikace či rozšíření pro prohlížeč). Nezdaří-li se odhlášení a opětovné přihlášení (během něhož bude stažen nový šifrovací klíč), může dojít k poškození dat. Pokusíme se Vás automaticky odhlásit, nicméně, může to chvíli trvat."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Všechny uložené exporty s omezením účtu se stanou neplatnými."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Staré šifrování již není podporováno. Kontaktujte podporu pro obnovení Vašeho účtu."
+  },
   "subscription": {
     "message": "Předplatné"
   },
@@ -4787,7 +4790,7 @@
     "message": "Měnit klíč API"
   },
   "selectOneCollection": {
-    "message": "Musíte vybrat alespoň jednu kolekci."
+    "message": "Musíte vybrat alespoň jednu sbírku."
   },
   "couldNotChargeCardPayInvoice": {
     "message": "Nepodařilo se nám strhnout platbu z Vaší karty. Prohlédněte si a zaplaťte nezaplacenou fakturu uvedenou níže."
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Nouzový přístup byl odmítnut"
   },
+  "grantorDetailsNotFound": {
+    "message": "Údaje o zadavateli nebyly nalezeny"
+  },
   "passwordResetFor": {
     "message": "Pro $USER$ bylo obnoveno heslo. Nyní se můžete přihlásit pomocí nového hesla.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Vynutit vlastnictví dat organizace"
+  },
   "personalOwnership": {
     "message": "Odebrat osobní trezor"
   },
@@ -5394,7 +5403,7 @@
     "message": "Majitelé a správci organizací jsou od prosazování těchto zásad osvobozeni."
   },
   "personalOwnershipSubmitError": {
-    "message": "Z důvodu podnikových zásad nemůžete ukládat položky do svého osobního trezoru. Změňte vlastnictví položky na organizaci a poté si vyberte z dostupných kolekcí."
+    "message": "Z důvodu podnikových zásad nemůžete ukládat položky do svého osobního trezoru. Změňte vlastnictví položky na organizaci a poté si vyberte z dostupných sbírek."
   },
   "disableSend": {
     "message": "Odebrat Send"
@@ -5484,16 +5493,16 @@
     "message": "K provedení této akce nemáte potřebná oprávnění."
   },
   "manageAllCollections": {
-    "message": "Správa všech kolekcí"
+    "message": "Správa všech sbírek"
   },
   "createNewCollections": {
-    "message": "Vytváření nových kolekcí"
+    "message": "Vytváření nových sbírek"
   },
   "editAnyCollection": {
-    "message": "Úprava jakékoli kolekce"
+    "message": "Úprava jakékoli sbírky"
   },
   "deleteAnyCollection": {
-    "message": "Smazání jakékoli kolekce"
+    "message": "Smazání jakékoli sbírky"
   },
   "manageGroups": {
     "message": "Správa skupin"
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Pokračováním odhlásíte $NAME$ z aktuální relace, což znamená, že se bude muset znovu přihlásit. Aktivní relace na jiných zařízeních mohou zůstat aktivní až po dobu jedné hodiny.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "tento uživatel"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Jedna nebo více zásad organizace vyžaduje, aby hlavní heslo splňovalo následující požadavky:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Jedna nebo více zásad organizace vyžaduje, aby hlavní heslo splňovalo následující požadavky:"
+  },
   "resetPasswordSuccess": {
     "message": "Heslo bylo úspěšně resetováno!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Přidat"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Hlavní heslo bylo úspěšně nastaveno"
+  },
   "updatedMasterPassword": {
     "message": "Hlavní heslo bylo aktualizováno"
   },
   "updateMasterPassword": {
     "message": "Aktualizovat hlavní heslo"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Pro dokončení obnovy účtu změňte hlavní heslo."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Hlavní heslo nesplňuje požadavky této organizace. Chcete-li pokračovat, změňte hlavní heslo."
+  },
   "updateMasterPasswordWarning": {
     "message": "Správce v organizaci nedávno změnil Vaše hlavní heslo. Pro přístup k trezoru jej nyní musíte změnit. Pokračování Vás odhlásí z Vaší aktuální relace a bude nutné se znovu přihlásit. Aktivní relace na jiných zařízeních mohou zůstat aktivní až po dobu jedné hodiny."
   },
@@ -6330,7 +6360,7 @@
     "message": "Prémiový přístup až pro 6 uživatelů"
   },
   "sponsoredFamiliesSharedCollectionsForFamilyMembers": {
-    "message": "Sdílené kolekce pro členy rodiny"
+    "message": "Sdílené sbírky pro členy rodiny"
   },
   "memberFamilies": {
     "message": "Rodiny členů"
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Vygenerovat e-mail"
   },
+  "generatePassword": {
+    "message": "Vygenerovat heslo"
+  },
+  "generatePassphrase": {
+    "message": "Vygenerovat heslovou frázi"
+  },
+  "passwordGenerated": {
+    "message": "Heslo bylo vygenerováno"
+  },
+  "passphraseGenerated": {
+    "message": "Heslová fráze byla vygenerována"
+  },
+  "usernameGenerated": {
+    "message": "Uživatelské jméno bylo vygenerováno"
+  },
+  "emailGenerated": {
+    "message": "E-mail byl vygenerován"
+  },
   "spinboxBoundariesHint": {
     "message": "Hodnota musí být mezi $MIN$ a $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Použít toto heslo"
   },
+  "useThisPassphrase": {
+    "message": "Použít tuto heslovou frázi"
+  },
   "useThisUsername": {
     "message": "Použít toto uživatelské jméno"
   },
@@ -7605,9 +7656,9 @@
     "message": "Účet služby byl aktualizován",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Napište nebo vyberte projekty nebo tajné klíče",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Napište nebo vyberte projekty",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Pište pro filtrování",
@@ -7692,8 +7743,8 @@
     "message": "Přístupové tokeny",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Nový přístupový token",
+  "createAccessToken": {
+    "message": "Vytvořit přístupový token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -7786,19 +7837,19 @@
     "message": "Informace o skupině"
   },
   "editGroupMembersDesc": {
-    "message": "Udělí členům přístup k přiřazeným kolekcím skupiny."
+    "message": "Udělí členům přístup k přiřazeným sbírkám skupiny."
   },
   "editGroupCollectionsDesc": {
-    "message": "Udělí členům přístup ke kolekcím přidáním do této skupiny."
+    "message": "Udělí členům přístup ke sbírkám přidáním do této skupiny."
   },
   "restrictedCollectionAssignmentDesc": {
-    "message": "Můžete přiřadit jen Vámi spravované kolekce."
+    "message": "Můžete přiřadit jen Vámi spravované sbírky."
   },
   "selectMembers": {
     "message": "Vybrat členy"
   },
   "selectCollections": {
-    "message": "Vybrat kolekce"
+    "message": "Vybrat sbírku"
   },
   "role": {
     "message": "Role"
@@ -7807,13 +7858,13 @@
     "message": "Odebrat člena"
   },
   "collection": {
-    "message": "Kolekce"
+    "message": "Sbírka"
   },
   "noCollection": {
-    "message": "Žádná kolekce"
+    "message": "Žádná sbírka"
   },
   "noCollectionsAdded": {
-    "message": "Nebyly přidány žádné kolekce"
+    "message": "Nebyly přidány žádné sbírky"
   },
   "noMembersAdded": {
     "message": "Nebyli přidáni žádní členové"
@@ -8014,7 +8065,7 @@
     }
   },
   "freeOrgMaxCollectionReachedManageBilling": {
-    "message": "Bezplatné organizace mohou mít až $COLLECTIONCOUNT$ kolekcí. Chcete-li přidat více kolekcí, přejděte na placený tarif.",
+    "message": "Bezplatné organizace mohou mít až $COLLECTIONCOUNT$ sbírek. Chcete-li přidat více sbírek, přejděte na placený tarif.",
     "placeholders": {
       "COLLECTIONCOUNT": {
         "content": "$1",
@@ -8023,7 +8074,7 @@
     }
   },
   "freeOrgMaxCollectionReachedNoManageBilling": {
-    "message": "Bezplatné organizace mohou mít až $COLLECTIONCOUNT$ kolekcí. Pro aktualizaci kontaktujte majitele organizace.",
+    "message": "Bezplatné organizace mohou mít až $COLLECTIONCOUNT$ sbírek. Pro aktualizaci kontaktujte majitele organizace.",
     "placeholders": {
       "COLLECTIONCOUNT": {
         "content": "$1",
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "V průběhu pokusu o přečtení souboru s importem se vyskytla chyba"
   },
+  "accessedSecretWithId": {
+    "message": "Přístup k tajnému klíči s identifikátorem: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Přistoupeno k tajnému klíči $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Úprava tajného klíče s identifikátorem: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Smazání tajného klíče s identifikátorem: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Vytvoření nového tajného klíče s identifikátorem: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Žádost o schválení správcem"
   },
+  "unableToCompleteLogin": {
+    "message": "Nelze dokončit přihlášení"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Musíte se přihlásit na důvěryhodném zařízení nebo požádat správce, aby Vám přiřadil heslo."
+  },
   "trustedDeviceEncryption": {
     "message": "Šifrování důvěryhodného zařízení"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Zařízení zařazeno mezi důvěryhodné"
   },
-  "sendsNoItemsTitle": {
-    "message": "Žádná aktivní Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Použijte Send pro bezpečné sdílení šifrovaných informací s kýmkoliv.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Pozvat uživatele"
   },
@@ -8691,25 +8776,25 @@
     }
   },
   "collectionManagement": {
-    "message": "Správa kolekce"
+    "message": "Správa sbírky"
   },
   "collectionManagementDesc": {
-    "message": "Spravuje chování kolekce pro organizaci"
+    "message": "Spravuje chování sbírky pro organizaci"
   },
   "limitCollectionCreationDesc": {
-    "message": "Omezí vytváření kolekce na vlastníky a správce"
+    "message": "Omezí vytváření sbírky na vlastníky a správce"
   },
   "limitCollectionDeletionDesc": {
-    "message": "Omezí mazání kolekce na vlastníky a správce"
+    "message": "Omezí mazání sbírky na vlastníky a správce"
   },
   "limitItemDeletionDescription": {
-    "message": "Omezit smazání položky na členy s oprávněním Spravovat kolekci"
+    "message": "Omezit smazání položky na členy s oprávněním Spravovat sbírku"
   },
   "allowAdminAccessToAllCollectionItemsDesc": {
-    "message": "Vlastníci a správci mohou spravovat všechny kolekce a předměty"
+    "message": "Vlastníci a správci mohou spravovat všechny sbírky a položky"
   },
   "updatedCollectionManagement": {
-    "message": "Aktualizované nastavení správy kolekce"
+    "message": "Aktualizované nastavení správy sbírky"
   },
   "passwordManagerPlanPrice": {
     "message": "Cena předplatného Správce hesel"
@@ -8742,10 +8827,10 @@
     "message": "Beta"
   },
   "assignCollectionAccess": {
-    "message": "Přiřadit přístup ke kolekci"
+    "message": "Přiřadit přístup ke sbírce"
   },
   "editedCollections": {
-    "message": "Upravené kolekce"
+    "message": "Upravené sbírky"
   },
   "baseUrl": {
     "message": "URL serveru"
@@ -8776,7 +8861,7 @@
     "message": "Přístupový klíč nebude zkopírován do duplikované položky. Chete pokračovat v duplikování této položky?"
   },
   "modifiedCollectionManagement": {
-    "message": "Upraveno nastavení správy kolekce $ID$.",
+    "message": "Upraveno nastavení správy sbírky $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -8810,25 +8895,25 @@
     "message": "Byl dosažen limit počtu uživatelů. Kontaktujte svého poskytovatele pro zakoupení dalších uživatelů."
   },
   "collectionAccessRestricted": {
-    "message": "Přístup ke kolekci je omezen"
+    "message": "Přístup ke sbírce je omezen"
   },
   "readOnlyCollectionAccess": {
-    "message": "Nemáte přístup ke správě této kolekce."
+    "message": "Nemáte přístup ke správě této sbírky."
   },
   "grantManageCollectionWarningTitle": {
-    "message": "Chybějící oprávnění pro správu kolekcí"
+    "message": "Chybějící oprávnění pro správu sbírky"
   },
   "grantManageCollectionWarning": {
-    "message": "Udělte oprávnění \"Spravovat kolekci\" pro úplnou správu kolekce, včetně jejího smazání."
+    "message": "Udělte oprávnění \"Spravovat sbírku\" pro úplnou správu sbírky, včetně jejího smazání."
   },
   "grantCollectionAccess": {
-    "message": "Udělí skupinám nebo členům přístup k této kolekci."
+    "message": "Udělí skupinám nebo členům přístup k této sbírce."
   },
   "grantCollectionAccessMembersOnly": {
-    "message": "Udělí členům přístup k této kolekci."
+    "message": "Udělí členům přístup k této sbírce."
   },
   "adminCollectionAccess": {
-    "message": "Správci mohou přistupovat ke kolekcím a spravovat je."
+    "message": "Správci mohou přistupovat ke sbírkám a spravovat je."
   },
   "serviceAccountAccessUpdated": {
     "message": "Přístup účtu služby byl aktualizován"
@@ -8837,6 +8922,30 @@
     "message": "Společné formáty",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Detekce shody URI je způsob, jakým Bitwarden identifikuje návrhy automatického vyplňování.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regulární výraz\" je pokročilá volba se zvýšeným rizikem odhalení přihlašovacích údajů.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Začíná na\" je pokročilá volba se zvýšeným rizikem odhalení přihlašovacích údajů.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Další informace o detekci shody",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Rozšířené volby",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Varování",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Pro správu předplatného pro $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -8917,31 +9026,31 @@
     "message": "Do skupin nemůžete přidat sami sebe."
   },
   "cannotAddYourselfToCollections": {
-    "message": "Do kolekcí nemůžete přidat sami sebe."
+    "message": "Do sbírek nemůžete přidat sami sebe."
   },
   "assign": {
     "message": "Přiřadit"
   },
   "assignToCollections": {
-    "message": "Přiřadit ke kolekcím"
+    "message": "Přiřadit ke sbírkám"
   },
   "assignToTheseCollections": {
-    "message": "Přiřadit k těmto kolekcím"
+    "message": "Přiřadit k těmto sbírkám"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Jen členové organizace s přístupem k těmto kolekcím budou moci vidět položku."
+    "message": "Jen členové organizace s přístupem k těmto sbírkám budou moci vidět položku."
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Jen členové organizace s přístupem k těmto kolekcím budou moci vidět položky."
+    "message": "Jen členové organizace s přístupem k těmto sbírkám budou moci vidět položky."
   },
   "selectCollectionsToAssign": {
-    "message": "Vyberte kolekce pro přiřazení"
+    "message": "Vyberte sbírky pro přiřazení"
   },
   "noCollectionsAssigned": {
-    "message": "Nebyly přiřazeny žádné kolekce"
+    "message": "Nebyly přiřazeny žádné sbírky"
   },
   "successfullyAssignedCollections": {
-    "message": "Kolekce byly úspěšně přiřazeny"
+    "message": "Sbírky byly úspěšně přiřazeny"
   },
   "bulkCollectionAssignmentWarning": {
     "message": "Vybrali jste $TOTAL_COUNT$ položek. Nemůžete aktualizovat $READONLY_COUNT$ položek, protože nemáte oprávnění k úpravám.",
@@ -9253,7 +9362,7 @@
     "message": "Smazání poskytovatele je trvalé. Tuto akci nelze vrátit zpět."
   },
   "errorAssigningTargetCollection": {
-    "message": "Chyba při přiřazování cílové kolekce."
+    "message": "Chyba při přiřazování do cílové sbírky."
   },
   "errorAssigningTargetFolder": {
     "message": "Chyba při přiřazování cílové složky."
@@ -9411,7 +9520,7 @@
     "message": "Žádný přístup"
   },
   "collectionAdminConsoleManaged": {
-    "message": "Tato kolekce je přístupná pouze z konzole správce"
+    "message": "Tato sbírka je přístupná pouze z konzole správce"
   },
   "organizationOptionsMenu": {
     "message": "Přepnout menu organizace"
@@ -9420,7 +9529,7 @@
     "message": "Vybrat položku trezoru"
   },
   "collectionItemSelect": {
-    "message": "Vybrat položku kolekce"
+    "message": "Vybrat položku sbírky"
   },
   "manageBillingFromProviderPortalMessage": {
     "message": "Spravovat fakturaci z portálu poskytovatele"
@@ -9493,7 +9602,7 @@
     "message": "Zobrazit přístup"
   },
   "noCollectionsSelected": {
-    "message": "Nevybrali jste žádné kolekce."
+    "message": "Nevybrali jste žádné sbírky."
   },
   "updateName": {
     "message": "Aktualizovat název"
@@ -9602,13 +9711,13 @@
     "message": "Ujistěte se, že členové mají přístup k správným údajům a jejich účty jsou bezpečné. Použijte tuto zprávu k získání CSV přístupu členů a konfigurací účtu."
   },
   "memberAccessReportPageDesc": {
-    "message": "Audit přístupu členů organizace ke skupinám, kolekcím a položkám kolekcí. Export CSV poskytuje podrobný rozpis pro jednotlivé členy, včetně informací o oprávněních ke kolekcím a konfiguracích účtů."
+    "message": "Audit přístupu členů organizace ke skupinám, sbírkám a položkám kolekcí. Export CSV poskytuje podrobný rozpis pro jednotlivé členy, včetně informací o oprávněních ke sbírkám a konfiguracích účtů."
   },
   "memberAccessReportNoCollection": {
-    "message": "(Žádná kolekce)"
+    "message": "(Žádná sbírka)"
   },
   "memberAccessReportNoCollectionPermission": {
-    "message": "(Žádné oprávnění ke kolekci)"
+    "message": "(Žádné oprávnění ke sbírce)"
   },
   "memberAccessReportNoGroup": {
     "message": "(Žádná skupina)"
@@ -9970,7 +10079,7 @@
     "message": "Neomezené sdílení"
   },
   "unlimitedCollections": {
-    "message": "Neomezené kolekce"
+    "message": "Neomezené sbírky"
   },
   "secureDataSharing": {
     "message": "Zabezpečené sdílení dat"
@@ -10109,7 +10218,7 @@
     }
   },
   "deleteOrganizationUserWarningDesc": {
-    "message": "Tímto trvale smažete všechny položky vlastněné $NAME$. Položky kolekcí nejsou ovlivněny.",
+    "message": "Tímto trvale smažete všechny položky vlastněné $NAME$. Položky sbírky nejsou ovlivněny.",
     "description": "Warning description for the delete organization user dialog",
     "placeholders": {
       "name": {
@@ -10119,7 +10228,7 @@
     }
   },
   "deleteManyOrganizationUsersWarningDesc": {
-    "message": "Tímto trvale smažete všechny položky vlastněné následujícími členy. Položky kolekcí nejsou ovlivněny.",
+    "message": "Tímto trvale smažete všechny položky vlastněné následujícími členy. Položky sbírky nejsou ovlivněny.",
     "description": "Warning description for the bulk delete organization users dialog"
   },
   "organizationUserDeleted": {
@@ -10192,7 +10301,7 @@
     "message": "Kód z popisu"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "Nemůžete odebrat kolekce s oprávněními jen pro zobrazení: $COLLECTIONS$",
+    "message": "Nemůžete odebrat sbírky s oprávněními jen pro zobrazení: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -10382,7 +10491,7 @@
     "message": "Otevřeno rozšíření prohlížeče"
   },
   "openedExtensionViewAtRiskPasswords": {
-    "message": "Rozšíření Bitwarden pro prohlížeč bylo úspěšně otevřeno. Nyní můžete zkontrolovat Vaše riziková hesla."
+    "message": "Rozšíření Bitwarden pro prohlížeč bylo úspěšně otevřeno. Nyní můžete zkontrolovat Vaše ohrožená hesla."
   },
   "openExtensionManuallyPart1": {
     "message": "Měli jsme potíže s otevřením rozšíření Bitwarden pro pohlížeč. Klepněte na ikonu Bitwarden",
@@ -10542,7 +10651,7 @@
     "message": "Tyto události jsou jen příklady a neodrážejí skutečné události v rámci Vaší organizace Bitwarden."
   },
   "cannotCreateCollection": {
-    "message": "Bezplatné organizace mohou mít až 2 kolekce. Chcete-li přidat více kolekcí, přejděte na placený tarif."
+    "message": "Bezplatné organizace mohou mít až 2 sbírky. Chcete-li přidat více sbírek, přejděte na placený tarif."
   },
   "businessUnit": {
     "message": "Obchodní jednotka"
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Nová obchodní jednotka"
   },
+  "sendsTitleNoItems": {
+    "message": "Posílejte citlivé informace bezpečně",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Sdílejte bezpečně soubory a data s kýmkoli na libovolné platformě. Vaše informace zůstanou šifrovány a zároveň omezují expozici.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Rychlé vytvoření hesla"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Jednoduše vytvořte silná a unikátní hesla klepnutím na",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "aby Vám pomohlo udržet Vaše přihlašovací údaje v bezpečí.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Jednoduše vytvořte silná a unikátní hesla klepnutím na tlačítko Generovat heslo, které Vám pomůže udržet Vaše přihlašovací údaje v bezpečí.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Ušetřete čas s automatickým vyplňováním"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Bezpečné automatické vyplňování hesel jedním klepnutím"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Získejte rozšíření Bitwarden pro prohlížeč a začněte s automatickým vyplňováním ještě dnes"
+  },
+  "getTheExtension": {
+    "message": "Získat rozšíření"
+  },
+  "addItLater": {
+    "message": "Přidat později"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Bez rozšíření prohlížeče nelze automaticky vyplňovat hesla"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Opravdu nechcete nyní přidat rozšíření?"
+  },
+  "skipToWebApp": {
+    "message": "Přeskočit na webovou aplikaci"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Rozšíření Bitwarden nainstalováno!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Otevřete rozšíření pro příhlášení a spuštění automatického vyplňování."
+  },
+  "openBitwardenExtension": {
+    "message": "Otevřít rozšíření Bitwarden"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "Pro tipy, jak začít používat Bitwarden, navštivte",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Centrum výuky",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Centrum nápovědy",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "Pomocí rozšíření Bitwarden pro prohlížeč můžete snadno vytvářet nová přihlašovací jména, přistupovat k uloženým přihlašovacím jménům přímo z panelu nástrojů prohlížeče a rychle se přihlašovat k účtům pomocí automatického vyplňování."
+  },
   "restart": {
     "message": "Restartovat"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Pro přidání způsobu platby klepněte na tlačítko \"Pay with PayPal\"."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Pokud odeberete $EMAIL$, sponzorství pro tento plán rodiny skončí. Volné místo ve Vaší organizaci bude k dispozici pro členy nebo sponzory po datu obnovení sponzorované organizace na $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Pro přidání kreditu je vyžadována fakturační adresa.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Fakturační adresa"
+  },
+  "addBillingAddress": {
+    "message": "Přidat fakturační adresu"
+  },
+  "editBillingAddress": {
+    "message": "Upravit fakturační adresu"
+  },
+  "noBillingAddress": {
+    "message": "Žádná adresa."
+  },
+  "billingAddressUpdated": {
+    "message": "Vaše fakturační adresa byla aktualizována."
+  },
+  "paymentDetails": {
+    "message": "Platební údaje"
+  },
+  "paymentMethodUpdated": {
+    "message": "Vaše platební metoda byla aktualizována."
+  },
+  "bankAccountVerified": {
+    "message": "Váš bankovní účet byl ověřen."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Jakýkoli dostupný kredit bude automaticky použit na faktury generované pro tento účet."
+  },
+  "mustBePositiveNumber": {
+    "message": "Musí být kladné číslo"
+  },
+  "cardSecurityCode": {
+    "message": "Kód CVC/CVV"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Bezpečnostní kód karty, známý také jako CVV nebo CVC, je obvykle třímístné číslo vytištěné na zadní straně platební karty nebo čtyřmístné číslo vytištěné na přední straně nad číslem karty."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Platba bankovním účtem je dostupná jen pro zákazníky ve Spojených státech. Budete požádáni o ověření svého bankovního účtu. Mikrovklad provedeme během následujících 1-2 pracovních dnů. Pro ověření bankovního účtu zadejte kód popisu výpisu z tohoto vkladu na stránce s podrobnostmi o platbě. Pokud bankovní účet neověříte, bude to mít za následek zmeškání platby a pozastavení Vašeho předplatného."
+  },
+  "taxId": {
+    "message": "DIČ: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/cy/messages.json b/apps/web/src/locales/cy/messages.json
index 87c852a8869..012dcac1fc9 100644
--- a/apps/web/src/locales/cy/messages.json
+++ b/apps/web/src/locales/cy/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "My vault"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/da/messages.json b/apps/web/src/locales/da/messages.json
index ee2dc4d570c..3dfde9ee756 100644
--- a/apps/web/src/locales/da/messages.json
+++ b/apps/web/src/locales/da/messages.json
@@ -547,12 +547,6 @@
     "message": "Fold sammen/ud",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generér adgangskode"
-  },
-  "generatePassphrase": {
-    "message": "Generér adgangssætning"
-  },
   "checkPassword": {
     "message": "Tjek, om adgangskode er blevet kompromitteret."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Mig"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Min boks"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Fortsættes, logges du ud af denne session og vil skulle logge ind igen. Aktive sessioner på andre enheder kan forblive aktive i op til én time."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "E-mail gemt"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Opsætning af totrins-login kan permanent låse en bruger ude af sin Bitwarden-konto. En gendannelseskode muliggør kontoadgang, såfremt den normale totrins-loginudbyder ikke længere kan bruges (f.eks. ved tab af en enhed). Bitwarden-supporten kan ikke hjælpe ved mistet kontoadgang. Det anbefales at nedskrive/udskrive gendannelseskoden samt gemme denne et sikkert sted."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Deaktivér"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Ophæv adgang"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Krypteringsnøgleopdatering kan ikke fortsætte"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Under opdatering af krypteringsnøglen kunne de relevante mapper ikke dekrypteres. For at fortsætte opdateringen skal mapperne slettes. Ingen boks-emner slettes, hvis der fortsættes."
-  },
-  "keyUpdated": {
-    "message": "Nøgle opdateret"
-  },
-  "updateEncryptionKey": {
-    "message": "Opdatér krypteringsnøgle"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Vi har ændret krypteringsmetoden mhp. bedre sikkerhed. Opdatér krypteringsnøglen nu ved at angive din hovedadgangskode nedenfor."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Efter opdatering af din krypteringsnøgle skal du logge ud og ind igen i alle Bitwarden-programmer, du bruger i øjeblikket (f.eks. mobilapp eller browserudvidelser). Hvis du ikke logger ud og ind (som downloader din nye krypteringsnøgle), kan det resultere i data korruption. Vi vil forsøge at logge dig ud automatisk, men det kan blive forsinket."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Abonnement"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Nødadgang nægtet"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Adgangskode nulstillet for $USER$. Du kan nu logge ind med den nye adgangskode.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Fjern individuel boks"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "denne bruger"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Én eller flere organisationspolitikker kræver, at hovedadgangskoden opfylder flg. krav:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Adgangskode nulstillet!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Tilføj"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Hovedadgangskode gemt"
   },
   "updateMasterPassword": {
     "message": "Opdatér hovedadgangskode"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Din hovedadgangskode blev for nylig ændret af en admin i din organisation. Opdatér hovedadgangskoden nu for at tilgå boksen. Fortsættes, logges der ud af den nuværende session, og du vil skulle logge ind igen. Aktive sessioner på andre enheder kan forblive aktive i op til én time."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generér e-mail"
   },
+  "generatePassword": {
+    "message": "Generér adgangskode"
+  },
+  "generatePassphrase": {
+    "message": "Generér adgangssætning"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Værdi skal være mellem $MIN$ og $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Anvend denne adgangskode"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Anvend dette brugernavn"
   },
@@ -7605,9 +7656,9 @@
     "message": "Tjenestekonto opdateret",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Angiv/vælg projekter eller hemmeligheder",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Skriv for at filtrere",
@@ -7692,8 +7743,8 @@
     "message": "Adgangstokener",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Nyt adgangstoken",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "En fejl opstod under forsøget på at læse importfilen"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Tilgået hemmelighed $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Anmod om admin-godkendelse"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Betroet enhedskryptering"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Enhed betroet"
   },
-  "sendsNoItemsTitle": {
-    "message": "Ingen aktive Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Brug Send til at dele krypterede oplysninger sikkert med nogen.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invitér bruger"
   },
@@ -8837,6 +8922,30 @@
     "message": "Almindelige formater",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "For at bibeholde abonnementet på $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/de/messages.json b/apps/web/src/locales/de/messages.json
index 58b4c568c61..5ce3b6883bb 100644
--- a/apps/web/src/locales/de/messages.json
+++ b/apps/web/src/locales/de/messages.json
@@ -547,12 +547,6 @@
     "message": "Ein-/ausklappen",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Passwort generieren"
-  },
-  "generatePassphrase": {
-    "message": "Passphrase generieren"
-  },
   "checkPassword": {
     "message": "Überprüfen ob ihr Kennwort kompromittiert ist."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Ich"
   },
+  "myItems": {
+    "message": "Meine Einträge"
+  },
   "myVault": {
     "message": "Mein Tresor"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Wenn du fortfährst, wirst du aus deiner aktuellen Sitzung ausgeloggt. Aktive Sitzungen auf anderen Geräten können bis zu einer Stunde weiterhin aktiv bleiben."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "E-Mail-Adresse gespeichert"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Durch die Aktivierung der Zwei-Faktor-Authentifizierung kannst du dich dauerhaft aus deinem Bitwarden-Konto aussperren. Ein Wiederherstellungscode ermöglicht es dir, auf dein Konto zuzugreifen, falls du deinen normalen Zwei-Faktor-Anbieter nicht mehr verwenden kannst (z.B. wenn du dein Gerät verlierst). Der Bitwarden-Support kann dir nicht helfen, wenn du den Zugang zu deinem Konto verlierst. Wir empfehlen dir, den Wiederherstellungscode aufzuschreiben oder auszudrucken und an einem sicheren Ort aufzubewahren."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Karten-Eintragstyp entfernen"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Mitgliedern nicht erlauben, Karten-Eintragstypen zu erstellen. Vorhandene Karten werden automatisch entfernt."
+  },
+  "restrictCardTypeImport": {
+    "message": "Karten-Eintragstypen können nicht importiert werden"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Eine von einer oder mehreren Organisationen festgelegte Richtlinie verhindert, dass du Karten in deinen Tresor importieren kannst."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Dein einmal benutzbarer Wiederherstellungscode kann benutzt werden, um die Zwei-Faktor-Authentifizierung auszuschalten, wenn du Zugang zu deinen Zwei-Faktor-Anbietern verlierst. Bitwarden empfiehlt dir, den Wiederherstellungscode aufzuschreiben und an einem sicheren Ort aufzubewahren."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Deaktivieren"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Mitgliederdetails nicht gefunden."
+  },
   "revokeAccess": {
     "message": "Zugriff widerrufen"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Aktualisierung des Verschlüsselungsschlüssels kann nicht fortgesetzt werden"
-  },
   "editFieldLabel": {
     "message": "$LABEL$ bearbeiten",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Beim Aktualisieren deines Verschlüsselungsschlüssels konnten deine Ordner nicht entschlüsselt werden. Um mit der Aktualisierung fortzufahren, müssen deine Ordner gelöscht werden. Es werden keine Tresor-Einträge gelöscht, wenn du fortfährst."
-  },
-  "keyUpdated": {
-    "message": "Schlüssel aktualisiert"
-  },
-  "updateEncryptionKey": {
-    "message": "Verschlüsselungsschlüssel aktualisieren"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Wir haben das Verschlüsselungsschema geändert, um die Sicherheit zu verbessern. Aktualisieren Sie jetzt Ihren Verschlüsselungsschlüssel, indem Sie Ihr Master-Passwort unten eingeben."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Nach der Aktualisierung Ihres Verschlüsselungsschlüssels musst du dich bei allen Bitwarden-Anwendungen, die du momentan benutzt, erneut anmelden (wie z.B. die mobile App oder die Browser-Erweiterungen). Fehler bei Ab- und Anmeldung (die deinen neuen Verschlüsselungsschlüssel herunterlädt) könnte zu einer Beschädigung der Daten führen. Wir werden versuchen dich automatisch abzumelden, was jedoch verzögert geschehen kann."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Alle von dir gespeicherten Exporte mit Konto-Beschränkungen werden ungültig."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Die veraltete Verschlüsselung wird nicht mehr unterstützt. Bitte kontaktiere den Support, um dein Konto wiederherzustellen."
+  },
   "subscription": {
     "message": "Abo"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Notfallzugriff abgelehnt"
   },
+  "grantorDetailsNotFound": {
+    "message": "Angaben zur gewährenden Person nicht gefunden"
+  },
   "passwordResetFor": {
     "message": "Passwort für $USER$ zurückgesetzt. Du kannst dich jetzt mit dem neuen Passwort anmelden.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Eigentumsrechte an Unternehmensdaten erzwingen"
+  },
   "personalOwnership": {
     "message": "Persönlichen Tresor entfernen"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Wenn du fortfährst, wird $NAME$ aus seiner aktuellen Sitzung abgemeldet und muss sich erneut anmelden. Aktive Sitzungen auf anderen Geräten können bis zu einer Stunde weiterhin aktiv bleiben.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "dieser Benutzer"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Eine oder mehrere Organisationsrichtlinien erfordern, dass dein Master-Passwort die folgenden Anforderungen erfüllt:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Eine oder mehrere Organisationsrichtlinien erfordern, dass dein Master-Passwort die folgenden Anforderungen erfüllt:"
+  },
   "resetPasswordSuccess": {
     "message": "Passwort erfolgreich zurückgesetzt!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Hinzufügen"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master-Passwort erfolgreich eingerichtet"
+  },
   "updatedMasterPassword": {
     "message": "Master-Passwort gespeichert"
   },
   "updateMasterPassword": {
     "message": "Master-Passwort aktualisieren"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Dein Master-Passwort wurde kürzlich von einem Administrator deiner Organisation geändert. Um auf den Tresor zuzugreifen, musst du dein Master-Passwort jetzt aktualisieren. Wenn Du fortfährst, wirst du aus der aktuellen Sitzung abgemeldet und eine erneute Anmeldung ist erforderlich. Aktive Sitzungen auf anderen Geräten können bis zu einer Stunde weiterhin aktiv bleiben."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "E-Mail generieren"
   },
+  "generatePassword": {
+    "message": "Passwort generieren"
+  },
+  "generatePassphrase": {
+    "message": "Passphrase generieren"
+  },
+  "passwordGenerated": {
+    "message": "Passwort generiert"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generiert"
+  },
+  "usernameGenerated": {
+    "message": "Benutzername generiert"
+  },
+  "emailGenerated": {
+    "message": "E-Mail-Adresse generiert"
+  },
   "spinboxBoundariesHint": {
     "message": "Wert muss zwischen $MIN$ und $MAX$ liegen.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Dieses Passwort verwenden"
   },
+  "useThisPassphrase": {
+    "message": "Diese Passphrase verwenden"
+  },
   "useThisUsername": {
     "message": "Diesen Benutzernamen verwenden"
   },
@@ -7605,9 +7656,9 @@
     "message": "Dienstkonto aktualisiert",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Projektnamen oder Geheimnisse eingeben oder auswählen",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Projektnamen eingeben oder auswählen",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Schreiben, um zu filtern",
@@ -7692,8 +7743,8 @@
     "message": "Zugriffstoken",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Neuer Zugriffstoken",
+  "createAccessToken": {
+    "message": "Zugriffstoken erstellen",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Beim Lesen der Importdatei ist ein Fehler aufgetreten"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Auf Geheimnis $SECRET_ID$ zugegriffen.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Admin-Genehmigung anfragen"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Vertrauenswürdige Geräteverschlüsselung"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Gerät wird vertraut"
   },
-  "sendsNoItemsTitle": {
-    "message": "Keine aktiven Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Verwende Send, um verschlüsselte Informationen sicher mit anderen zu teilen.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Benutzer einladen"
   },
@@ -8837,6 +8922,30 @@
     "message": "Gängigste Formate",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Um dein Abonnement für $ORG$ zu erhalten, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Neuer Geschäftsbereich"
   },
+  "sendsTitleNoItems": {
+    "message": "Sensible Informationen sicher versenden",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Teile Dateien und Daten sicher mit jedem auf jeder Plattform. Deine Informationen bleiben Ende-zu-Ende-verschlüsselt, während die Verbreitung begrenzt wird.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Passwörter schnell erstellen"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Generiere ganz einfach starke und einzigartige Passwörter, indem du auf den",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": ", um dir zu helfen, deine Zugangsdaten sicher zu halten.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Generiere ganz einfach starke und einzigartige Passwörter, indem du auf den \"Passwort generieren\"-Button klickst, um dir zu helfen, deine Zugangsdaten sicher zu halten.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Spare Zeit mit Auto-Ausfüllen"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Neustarten"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Bitte klicke auf den Mit PayPal bezahlen Button, um deine Zahlungsmethode hinzuzufügen."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Wenn du $EMAIL$ entfernst, wird das Sponsoring für diesen Families-Tarif beendet. Ein Benutzerplatz in deiner Organisation steht Mitgliedern oder Sponsoren nach dem Verlängerungsdatum der gesponserten Organisation am $DATE$ zur Verfügung.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Rechnungsadresse erforderlich, um Guthaben hinzuzufügen.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/el/messages.json b/apps/web/src/locales/el/messages.json
index 3790920f883..b3e8d6d91d2 100644
--- a/apps/web/src/locales/el/messages.json
+++ b/apps/web/src/locales/el/messages.json
@@ -3,7 +3,7 @@
     "message": "Όλες οι εφαρμογές"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Λογότυπο του Bitwarden"
   },
   "criticalApplications": {
     "message": "Κρίσιμες εφαρμογές"
@@ -33,13 +33,13 @@
     }
   },
   "notifiedMembers": {
-    "message": "Notified members"
+    "message": "Ειδοποιημένα μέλη"
   },
   "revokeMembers": {
-    "message": "Revoke members"
+    "message": "Ανάκληση μελών"
   },
   "restoreMembers": {
-    "message": "Restore members"
+    "message": "Επαναφορά μελών"
   },
   "cannotRestoreAccessError": {
     "message": "Cannot restore organization access"
@@ -57,7 +57,7 @@
     "message": "Create new login item"
   },
   "criticalApplicationsWithCount": {
-    "message": "Critical applications ($COUNT$)",
+    "message": "Κρίσιμες εφαρμογές ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -66,7 +66,7 @@
     }
   },
   "notifiedMembersWithCount": {
-    "message": "Notified members ($COUNT$)",
+    "message": "Ειδοποιημένα μέλη ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -93,7 +93,7 @@
     "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
   },
   "markCriticalApps": {
-    "message": "Mark critical apps"
+    "message": "Επισήμανση κρίσιμων εφαρμογών"
   },
   "markAppAsCritical": {
     "message": "Mark app as critical"
@@ -105,16 +105,16 @@
     "message": "Εφαρμογή"
   },
   "atRiskPasswords": {
-    "message": "At-risk passwords"
+    "message": "Κωδικοί πρόσβασης σε κίνδυνο"
   },
   "requestPasswordChange": {
-    "message": "Request password change"
+    "message": "Αίτημα αλλαγής κωδικού πρόσβασης"
   },
   "totalPasswords": {
     "message": "Σύνολο κωδικών πρόσβασης"
   },
   "searchApps": {
-    "message": "Search applications"
+    "message": "Αναζήτηση εφαρμογών"
   },
   "atRiskMembers": {
     "message": "At-risk members"
@@ -171,7 +171,7 @@
     "message": "Σύνολο μελών"
   },
   "atRiskApplications": {
-    "message": "At-risk applications"
+    "message": "Εφαρμογές σε κίνδυνο"
   },
   "totalApplications": {
     "message": "Σύνολο εφαρμογών"
@@ -220,7 +220,7 @@
     "message": "Σημειώσεις"
   },
   "privateNote": {
-    "message": "Private note"
+    "message": "Ιδιωτική σημείωση"
   },
   "note": {
     "message": "Σημείωση"
@@ -496,10 +496,10 @@
     }
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Νέος φάκελος"
   },
   "folderName": {
-    "message": "Folder name"
+    "message": "Όνομα φακέλου"
   },
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
@@ -547,12 +547,6 @@
     "message": "Εναλλαγή Σύμπτυξης",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Δημιουργία Κωδικού"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Ελέγξτε εάν ο κωδικός έχει εκτεθεί."
   },
@@ -654,7 +648,7 @@
     "message": "Ασφαλής σημείωση"
   },
   "typeSshKey": {
-    "message": "SSH key"
+    "message": "Κλειδί SSH"
   },
   "typeLoginPlural": {
     "message": "Συνδέσεις"
@@ -810,7 +804,7 @@
     "description": "Copy passphrase to clipboard"
   },
   "passwordCopied": {
-    "message": "Password copied"
+    "message": "Ο κωδικός πρόσβασης αντιγράφηκε"
   },
   "copyUsername": {
     "message": "Αντιγραφή ονόματος χρήστη",
@@ -870,6 +864,9 @@
   "me": {
     "message": "Εγώ"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Το Vault μου"
   },
@@ -1046,7 +1043,7 @@
     "message": "Όχι"
   },
   "location": {
-    "message": "Location"
+    "message": "Τοποθεσία"
   },
   "loginOrCreateNewAccount": {
     "message": "Συνδεθείτε ή δημιουργήστε νέο λογαριασμό για να αποκτήσετε πρόσβαση στο vault σας."
@@ -1058,7 +1055,7 @@
     "message": "Η σύνδεση με τη χρήση συσκευής πρέπει να οριστεί στις ρυθμίσεις της εφαρμογής Bitwarden. Χρειάζεστε κάποια άλλη επιλογή;"
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "Χρειάζεστε κάποια άλλη επιλογή;"
   },
   "loginWithMasterPassword": {
     "message": "Συνδεθείτε με τον κύριο κωδικό πρόσβασης"
@@ -1073,13 +1070,13 @@
     "message": "Χρήση διαφορετικής μεθόδου σύνδεσης"
   },
   "logInWithPasskey": {
-    "message": "Log in with passkey"
+    "message": "Σύνδεση με κλειδί πρόσβασης"
   },
   "useSingleSignOn": {
-    "message": "Use single sign-on"
+    "message": "Χρήση καθολικής σύνδεσης"
   },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "Καλώς ορίσατε και πάλι"
   },
   "invalidPasskeyPleaseTryAgain": {
     "message": "Μη έγκυρο κλειδί πρόσβασης. Παρακαλώ προσπαθήστε ξανά."
@@ -1163,7 +1160,7 @@
     "message": "Δημιουργία Λογαριασμού"
   },
   "newToBitwarden": {
-    "message": "New to Bitwarden?"
+    "message": "Νέος χρήστης του Bitwarden;"
   },
   "setAStrongPassword": {
     "message": "Ορίστε έναν ισχυρό κωδικό πρόσβασης"
@@ -1181,7 +1178,7 @@
     "message": "Είσοδος"
   },
   "logInToBitwarden": {
-    "message": "Log in to Bitwarden"
+    "message": "Σύνδεση στο Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
     "message": "Enter the code sent to your email"
@@ -1199,7 +1196,7 @@
     "message": "The authentication session timed out. Please restart the login process."
   },
   "verifyYourIdentity": {
-    "message": "Verify your Identity"
+    "message": "Επαληθεύστε την ταυτότητά σας"
   },
   "weDontRecognizeThisDevice": {
     "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
@@ -1208,7 +1205,7 @@
     "message": "Continue logging in"
   },
   "whatIsADevice": {
-    "message": "What is a device?"
+    "message": "Τι είναι μια συσκευή;"
   },
   "aDeviceIs": {
     "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
@@ -1418,10 +1415,10 @@
     }
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "Επιβεβαίωση πρόσβασης"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "Άρνηση πρόσβασης"
   },
   "notificationSentDeviceAnchor": {
     "message": "web app"
@@ -1524,7 +1521,7 @@
     "message": "(Μετεγκατάσταση από το FIDO)"
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "Άνοιγμα σε νέα καρτέλα"
   },
   "emailTitle": {
     "message": "Email"
@@ -1736,7 +1733,7 @@
     "message": "Ιστορικό Κωδικού"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "Ιστορικό γεννήτριας"
   },
   "clearGeneratorHistoryTitle": {
     "message": "Clear generator history"
@@ -1748,7 +1745,7 @@
     "message": "Δεν υπάρχουν κωδικοί στη λίστα."
   },
   "clearHistory": {
-    "message": "Clear history"
+    "message": "Διαγραφή ιστορικού"
   },
   "nothingToShow": {
     "message": "Nothing to show"
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Η διαδικασία θα σας αποσυνδέσει από την τρέχουσα συνεδρία και θα σας ζητήσει να συνδεθείτε ξανά. Οι ενεργές συνεδρίες σε άλλες συσκευές ενδέχεται να παραμείνουν ενεργοποιημένες για έως και μία ώρα."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Το email άλλαξε"
   },
@@ -1794,7 +1794,7 @@
     "message": "Παρακαλούμε συνδεθείτε ξανά."
   },
   "currentSession": {
-    "message": "Current session"
+    "message": "Τρέχουσα συνεδρία"
   },
   "requestPending": {
     "message": "Request pending"
@@ -1876,7 +1876,7 @@
     "message": "Η διαδικασία θα σας αποσυνδέσει από την τρέχουσα συνεδρία και θα σας ζητήσει να συνδεθείτε ξανά. Οι ενεργές συνεδρίες σε άλλες συσκευές ενδέχεται να παραμείνουν ενεργοποιημένες για έως και μία ώρα."
   },
   "newDeviceLoginProtection": {
-    "message": "New device login"
+    "message": "Νέα σύνδεση συσκευής"
   },
   "turnOffNewDeviceLoginProtection": {
     "message": "Turn off new device login protection"
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Η ενεργοποίηση σύνδεσης δύο βημάτων μπορεί να κλειδώσει οριστικά το λογαριασμό σας από το Bitwarden. Ένας κωδικός ανάκτησης σάς επιτρέπει να έχετε πρόσβαση στον λογαριασμό σας σε περίπτωση που δεν μπορείτε πλέον να χρησιμοποιήσετε τη σύνδεση δύο βημάτων (π. χ. χάνετε τη συσκευή σας). Η υποστήριξη πελατών του Bitwarden δεν θα είναι σε θέση να σας βοηθήσει αν χάσετε την πρόσβαση στο λογαριασμό σας. Συνιστούμε να γράψετε ή να εκτυπώσετε τον κωδικό ανάκτησης και να τον φυλάξετε σε ασφαλές μέρος."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2201,16 +2213,16 @@
     "message": "Διαχείριση"
   },
   "manageCollection": {
-    "message": "Manage collection"
+    "message": "Διαχείριση συλλογής"
   },
   "viewItems": {
-    "message": "View items"
+    "message": "Προβολή στοιχείων"
   },
   "viewItemsHidePass": {
     "message": "View items, hidden passwords"
   },
   "editItems": {
-    "message": "Edit items"
+    "message": "Επεξεργασία στοιχείων"
   },
   "editItemsHidePass": {
     "message": "Edit items, hidden passwords"
@@ -2218,11 +2230,14 @@
   "disable": {
     "message": "Απενεργοποίηση"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Ανάκληση πρόσβασης"
   },
   "revoke": {
-    "message": "Revoke"
+    "message": "Ανάκληση"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Ο πάροχος σύνδεσης δύο βημάτων του λογαριασμού σας, είναι ενεργοποιημένος."
@@ -3387,10 +3402,10 @@
     }
   },
   "inviteSingleEmailDesc": {
-    "message": "You have 1 invite remaining."
+    "message": "Σας απομένει 1 πρόσκληση."
   },
   "inviteZeroEmailDesc": {
-    "message": "You have 0 invites remaining."
+    "message": "Σας απομένουν 0 προσκλήσεις."
   },
   "userUsingTwoStep": {
     "message": "Αυτός ο χρήστης χρησιμοποιεί τρόπο σύνδεσης δύο βημάτων για να προστατεύσει το λογαριασμό του."
@@ -3895,10 +3910,10 @@
     "message": "Συσκευή"
   },
   "loginStatus": {
-    "message": "Login status"
+    "message": "Κατάσταση σύνδεσης"
   },
   "firstLogin": {
-    "message": "First login"
+    "message": "Πρώτη σύνδεση"
   },
   "trusted": {
     "message": "Trusted"
@@ -3919,16 +3934,16 @@
     }
   },
   "deviceType": {
-    "message": "Device Type"
+    "message": "Τύπος συσκευής"
   },
   "ipAddress": {
-    "message": "IP Address"
+    "message": "Διεύθυνση IP"
   },
   "confirmLogIn": {
-    "message": "Confirm login"
+    "message": "Επιβεβαίωση σύνδεσης"
   },
   "denyLogIn": {
-    "message": "Deny login"
+    "message": "Άρνηση σύνδεσης"
   },
   "thisRequestIsNoLongerValid": {
     "message": "This request is no longer valid."
@@ -3953,7 +3968,7 @@
     "message": "Login request has already expired."
   },
   "justNow": {
-    "message": "Just now"
+    "message": "Μόλις τώρα"
   },
   "requestedXMinutesAgo": {
     "message": "Requested $MINUTES$ minutes ago",
@@ -4140,7 +4155,7 @@
     "message": "Your free trial ends today."
   },
   "clickHereToAddPaymentMethod": {
-    "message": "Click here to add a payment method."
+    "message": "Κάντε κλικ εδώ για να προσθέσετε μια μέθοδο πληρωμής."
   },
   "joinOrganization": {
     "message": "Εγγραφή στον οργανισμό"
@@ -4478,11 +4493,8 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Δεν είναι δυνατή η συνέχιση της ενημέρωσης του κλειδιού κρυπτογράφησης"
-  },
   "editFieldLabel": {
-    "message": "Edit $LABEL$",
+    "message": "Επεξεργασία $LABEL$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Το Κλειδί Ενημερώθηκε"
-  },
-  "updateEncryptionKey": {
-    "message": "Ενημέρωση Κλειδιού Κρυπτογράφησης"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Μετά την ενημέρωση του κλειδιού κρυπτογράφησης, πρέπει να αποσυνδεθείτε και να επιστρέψετε σε όλες τις εφαρμογές Bitwarden που χρησιμοποιείτε αυτήν τη στιγμή (όπως η εφαρμογή για κινητά ή οι επεκτάσεις του προγράμματος περιήγησης). Η αποτυχία αποσύνδεσης και επαναφοράς (στην οποία γίνεται λήψη του νέου κλειδιού κρυπτογράφησης) ενδέχεται να προκαλέσει καταστροφή δεδομένων. Θα προσπαθήσουμε να αποσυνδεθείτε αυτόματα, ωστόσο αυτό μπορεί να καθυστερήσει."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Συνδρομή"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Η πρόσβαση έκτακτης ανάγκης απορρίφθηκε"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Επαναφορά κωδικού πρόσβασης για το $USER$. Τώρα μπορείτε να συνδεθείτε χρησιμοποιώντας το νέο κωδικό πρόσβασης.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Προσωπική Ιδιοκτησία"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "αυτός ο χρήστης"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Σε μία ή περισσότερες πολιτικές του οργανισμού απαιτείται ο κύριος κωδικός να πληρεί τις ακόλουθες απαιτήσεις:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Επιτυχία επαναφοράς κωδικού!"
   },
@@ -5902,7 +5923,7 @@
     "message": "Σφάλμα"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Σφάλμα αποκρυπτογράφησης"
   },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Προσθήκη"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Ενημερώθηκε ο κύριος κωδικός πρόσβασης"
   },
   "updateMasterPassword": {
     "message": "Ενημερώστε τον κύριο κωδικό πρόσβασης"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Ο Κύριος Κωδικός Πρόσβασης σας άλλαξε πρόσφατα από διαχειριστή στον οργανισμό σας. Για να αποκτήσετε πρόσβαση στο vault, πρέπει να ενημερώσετε το κύριο κωδικό τώρα. Η διαδικασία θα σας αποσυνδέσει από την τρέχουσα συνεδρία σας, απαιτώντας από εσάς να συνδεθείτε ξανά. Οι ενεργές συνεδρίες σε άλλες συσκευές ενδέχεται να συνεχίσουν να είναι ενεργές για μία ώρα."
   },
@@ -6333,7 +6363,7 @@
     "message": "Shared collections for family members"
   },
   "memberFamilies": {
-    "message": "Member families"
+    "message": "Οικογένειες μελών"
   },
   "noMemberFamilies": {
     "message": "No member families"
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Δημιουργία Κωδικού"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Χρήση αυτού του κωδικού πρόσβασης"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Χρήση αυτού του ονόματος χρήστη"
   },
@@ -7605,9 +7656,9 @@
     "message": "Ο λογαριασμός υπηρεσίας ενημερώθηκε",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Πληκτρολογήστε ή επιλέξτε έργα ή μυστικά",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Πληκτρολογήστε για φιλτράρισμα",
@@ -7692,8 +7743,8 @@
     "message": "Διακριτικά πρόσβασης",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Νέο διακριτικό πρόσβασης",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -7963,7 +8014,7 @@
     "message": "Πρόσκληση μέλους"
   },
   "addSponsorship": {
-    "message": "Add sponsorship"
+    "message": "Προσθήκη χορηγίας"
   },
   "needsConfirmation": {
     "message": "Χρειάζεται επιβεβαίωση"
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Αίτημα έγκρισης διαχειριστή"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Κρυπτογράφηση έμπιστης συσκευής"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "Κανένα ενεργό Send",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Χρησιμοποιήστε το Send για ασφαλή κοινοποίηση κρυπτογραφημένων πληροφοριών με οποιονδήποτε.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Πρόσκληση χρηστών"
   },
@@ -8837,6 +8922,30 @@
     "message": "Κοινές μορφές",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Για να διατηρήσετε τη συνδρομή σας στο $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -9275,7 +9384,7 @@
     "message": "Χρησιμοποιήστε το SDK του Bitwarden Secrets Manager στις ακόλουθες γλώσσες προγραμματισμού για να αναπτύξετε τις δικές σας εφαρμογές."
   },
   "ssoDescStart": {
-    "message": "Configure",
+    "message": "Διαμόρφωση",
     "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
   },
   "ssoDescEnd": {
@@ -9289,7 +9398,7 @@
     "message": "SCIM"
   },
   "scimIntegrationDescStart": {
-    "message": "Configure ",
+    "message": "Διαμόρφωση ",
     "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
   },
   "scimIntegrationDescEnd": {
@@ -9303,13 +9412,13 @@
     "message": "Configure Bitwarden Directory Connector to automatically provision users and groups using the implementation guide for your Identity Provider."
   },
   "eventManagement": {
-    "message": "Event management"
+    "message": "Διαχείριση συμβάντων"
   },
   "eventManagementDesc": {
     "message": "Integrate Bitwarden event logs with your SIEM (system information and event management) system by using the implementation guide for your platform."
   },
   "deviceManagement": {
-    "message": "Device management"
+    "message": "Διαχείριση συσκευών"
   },
   "deviceManagementDesc": {
     "message": "Configure device management for Bitwarden using the implementation guide for your platform."
@@ -9934,22 +10043,22 @@
     "message": "Key algorithm"
   },
   "sshPrivateKey": {
-    "message": "Private key"
+    "message": "Ιδιωτικό κλειδί"
   },
   "sshPublicKey": {
-    "message": "Public key"
+    "message": "Δημόσιο κλειδί"
   },
   "sshFingerprint": {
-    "message": "Fingerprint"
+    "message": "Αποτύπωμα"
   },
   "sshKeyFingerprint": {
-    "message": "Fingerprint"
+    "message": "Αποτύπωμα"
   },
   "sshKeyPrivateKey": {
-    "message": "Private key"
+    "message": "Ιδιωτικό κλειδί"
   },
   "sshKeyPublicKey": {
-    "message": "Public key"
+    "message": "Δημόσιο κλειδί"
   },
   "sshKeyAlgorithmED25519": {
     "message": "ED25519"
@@ -10090,7 +10199,7 @@
     "message": "To host Bitwarden on your own server, you will need to upload your license file. To support Free Families plans and advanced billing capabilities for your self-hosted organization, you will need to set up automatic sync in your self-hosted organization."
   },
   "selfHostingTitleProper": {
-    "message": "Self-Hosting"
+    "message": "Αυτοφιλοξενία"
   },
   "claim-domain-single-org-warning": {
     "message": "Claiming a domain will turn on the single organization policy."
@@ -10204,7 +10313,7 @@
     "message": "Remove members"
   },
   "devices": {
-    "message": "Devices"
+    "message": "Συσκευές"
   },
   "deviceListDescription": {
     "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
@@ -10334,10 +10443,10 @@
     "message": "The password you entered is incorrect."
   },
   "importSshKey": {
-    "message": "Import"
+    "message": "Εισαγωγή"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirm password"
+    "message": "Επιβεβαίωση κωδικού πρόσβασης"
   },
   "enterSshKeyPasswordDesc": {
     "message": "Enter the password for the SSH key."
@@ -10346,7 +10455,7 @@
     "message": "Enter password"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "Το κλειδί SSH δεν είναι έγκυρο"
   },
   "sshKeyTypeUnsupported": {
     "message": "The SSH key type is not supported"
@@ -10358,13 +10467,13 @@
     "message": "SSH key imported successfully"
   },
   "copySSHPrivateKey": {
-    "message": "Copy private key"
+    "message": "Αντιγραφή ιδιωτικού κλειδιού"
   },
   "openingExtension": {
     "message": "Opening the Bitwarden browser extension"
   },
   "somethingWentWrong": {
-    "message": "Something went wrong..."
+    "message": "Κάτι πήγε στραβά..."
   },
   "openingExtensionError": {
     "message": "We had trouble opening the Bitwarden browser extension. Click the button to open it now."
@@ -10376,7 +10485,7 @@
     "message": "Don't have the Bitwarden browser extension?"
   },
   "installExtension": {
-    "message": "Install extension"
+    "message": "Εγκατάσταση επέκτασης"
   },
   "openedExtension": {
     "message": "Opened the browser extension"
@@ -10527,7 +10636,7 @@
     "message": "Change at-risk password"
   },
   "removeUnlockWithPinPolicyTitle": {
-    "message": "Remove Unlock with PIN"
+    "message": "Κατάργηση ξεκλειδώματος με PIN"
   },
   "removeUnlockWithPinPolicyDesc": {
     "message": "Do not allow members to unlock their account with a PIN."
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10562,7 +10696,7 @@
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Ιστότοπος",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
@@ -10602,13 +10736,123 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
-    "message": "Restart"
+    "message": "Επανεκκίνηση"
   },
   "verifyProviderBankAccountWithStatementDescriptorWarning": {
     "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the provider's subscription page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index a170612fab2..b272dc32e3b 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -864,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My items"
+  },
   "myVault": {
     "message": "My vault"
   },
@@ -1782,6 +1785,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2154,6 +2160,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2213,6 +2231,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -3261,6 +3282,9 @@
   "defaultCollection": {
     "message": "Default collection"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "getHelp": {
     "message": "Get help"
   },
@@ -4473,9 +4497,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4528,24 +4549,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5370,6 +5382,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5379,6 +5394,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5770,12 +5788,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6041,12 +6071,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -7621,9 +7660,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7708,8 +7747,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8210,8 +8249,44 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
-    "message": "Accessed secret $SECRET_ID$.",
+  "message": "Accessed secret $SECRET_ID$.",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+   "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+   "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+   "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8391,6 +8466,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8620,14 +8701,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8852,6 +8925,30 @@
   "commonImportFormats": {
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
+  },
+     "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."  
+  },
+   "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+   "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+   "uriAdvancedOption":{
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+   "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
   },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
@@ -10643,6 +10740,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10651,5 +10793,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/en_GB/messages.json b/apps/web/src/locales/en_GB/messages.json
index ab7bf3a1197..7993308c44a 100644
--- a/apps/web/src/locales/en_GB/messages.json
+++ b/apps/web/src/locales/en_GB/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "My vault"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organisations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, although this may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organisation data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organisation policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organisation policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organisation’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organisation. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Centre",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Centre",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organisation will become available for members or sponsorships after the sponsored organisation renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/en_IN/messages.json b/apps/web/src/locales/en_IN/messages.json
index 736cece1de3..1608845dca0 100644
--- a/apps/web/src/locales/en_IN/messages.json
+++ b/apps/web/src/locales/en_IN/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "My vault"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email changed"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Enabling two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (e.g. you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organisations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Disable"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, although this may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organisation data ownership"
+  },
   "personalOwnership": {
     "message": "Personal Ownership"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organisation policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organisation policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organisation’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organisation. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Centre",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Centre",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organisation will become available for members or sponsorships after the sponsored organisation renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/eo/messages.json b/apps/web/src/locales/eo/messages.json
index 0a4acdc5739..86ed31ac4a4 100644
--- a/apps/web/src/locales/eo/messages.json
+++ b/apps/web/src/locales/eo/messages.json
@@ -534,7 +534,7 @@
     "description": "URI match detection for auto-fill."
   },
   "defaultMatchDetection": {
-    "message": "Implicita eltrovo en akordo",
+    "message": "Implicita eltrovado en akordo",
     "description": "Default URI match detection for auto-fill."
   },
   "never": {
@@ -547,12 +547,6 @@
     "message": "Baskuli Fali",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generi pasvorton"
-  },
-  "generatePassphrase": {
-    "message": "Generi pasfrazon"
-  },
   "checkPassword": {
     "message": "Kontrolu ĉu pasvorto estis elmontrita."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Mi"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Mia Trezorejo"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Prilabori vian adiaŭadon de la nuna seanco, necesigos vin saluti denove. La seancoj aktivaj sur aliaj aparatoj povas resti aktivaj ankoraŭ unu horon."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "La retpoŝto konserviĝis"
   },
@@ -1873,7 +1873,7 @@
     "message": "Ĉu vi zorgas pri tio, ke via konto estas ensalutinta sur alia aparato? Sekvu sube por senrajtigi ĉiujn komputilojn aŭ aparatojn, kiujn vi antaŭe uzis. Ĉi tiu sekureca paŝo rekomendas se vi antaŭe uzis publikan komputilon aŭ hazarde konservis vian pasvorton sur aparato, kiu ne estas via. Ĉi tiu paŝo ankaŭ malplenigos ĉiujn antaŭe memoritajn du-paŝajn ensalutajn sesiojn. "
   },
   "deauthorizeSessionsWarning": {
-    "message": "Se vi daŭrigos vian adiaŭadon de la nuna seanco, necesos vin saluti denove. Oni ankaŭ demandos de vi du-faktoran aŭtentigon, se tiu elekteblo estas ebligita. La seancoj aktivaj sur aliaj aparatoj povas resti daŭre aktivaj ankoraŭ unu horon."
+    "message": "La daŭrigo ankaŭ elsalutos vin de via nuna sesio, postulante vin denove ensaluti. Oni ankaŭ petos vin du-ŝtupa ensaluto, se ĝi estas ebligita. Aktivaj sesioj sur aliaj aparatoj povas daŭre resti aktivaj ĝis ĝis unu horo. "
   },
   "newDeviceLoginProtection": {
     "message": "Saluto per nova aparato"
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Ebligi du-paŝan ensaluton povas konstante elŝlosi vin el via Bitwarden-konto. Rekuperiga kodo permesas vin aliri vian konton, se vi ne plu povas uzi vian normalan du-paŝan ensalutan provizanton (ekz. vi perdas Bitwarden-subteno ne povos helpi vin se vi perdos aliron al via konto. Ni rekomendas al vi skribi aŭ presi la reakiran kodon kaj konservi ĝin en sekura loko. "
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Malŝalti"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Ŝlosilo ĝisdatiĝis"
-  },
-  "updateEncryptionKey": {
-    "message": "Ĝisdatigi Ĉifran Ŝlosilon"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Post ĝisdatigi vian ĉifradan ŝlosilon, vi devas elsaluti kaj reeniri al ĉiuj Bitwarden-aplikaĵoj, kiujn vi nun uzas (kiel la poŝtelefona programo aŭ retumila etendaĵoj). Malsukceso elsaluti kaj reeniri (kiu elŝutas via nova ĉifra ŝlosilo) povas rezultigi korupton de datumoj. Ni provos elsaluti vin aŭtomate, tamen ĝi eble prokrastos. "
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Abono"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Krizaliro malakceptita"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Pravaloriziĝis la pasvorto de $USER$. Vi nun povas saluti per la nova pasvorto.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Persona Posedo"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "ĉi tiu uzanto"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Aldoni"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Ĉefpasvorto Estas Aktualigita"
   },
   "updateMasterPassword": {
     "message": "Ĝisdatigi la ĉefan pasvorton"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generi pasvorton"
+  },
+  "generatePassphrase": {
+    "message": "Generi pasfrazon"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Entajpu aŭ elektu projektojn aŭ sekretojn",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Entajpu por filtri",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Nova alirilo",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Aliĝis al sekreto $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Relanĉi"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/es/messages.json b/apps/web/src/locales/es/messages.json
index 1660429f7f4..1daee236d86 100644
--- a/apps/web/src/locales/es/messages.json
+++ b/apps/web/src/locales/es/messages.json
@@ -3,13 +3,13 @@
     "message": "Todas las aplicaciones"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Logo de Bitwarden"
   },
   "criticalApplications": {
     "message": "Aplicaciones críticas"
   },
   "noCriticalAppsAtRisk": {
-    "message": "No critical applications at risk"
+    "message": "No hay aplicaciones críticas en riesgo"
   },
   "accessIntelligence": {
     "message": "Inteligencia de Acceso"
@@ -54,7 +54,7 @@
     }
   },
   "createNewLoginItem": {
-    "message": "Create new login item"
+    "message": "Crear nuevo elemento de inicio de sesión"
   },
   "criticalApplicationsWithCount": {
     "message": "Aplicaciones críticas ($COUNT$)",
@@ -75,7 +75,7 @@
     }
   },
   "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
+    "message": "No se encontraron aplicaciones en $ORG NAME$",
     "placeholders": {
       "org name": {
         "content": "$1",
@@ -108,13 +108,13 @@
     "message": "At-risk passwords"
   },
   "requestPasswordChange": {
-    "message": "Request password change"
+    "message": "Solicitar cambio de contraseña"
   },
   "totalPasswords": {
-    "message": "Total passwords"
+    "message": "Total de contraseñas"
   },
   "searchApps": {
-    "message": "Search applications"
+    "message": "Buscar aplicaciones"
   },
   "atRiskMembers": {
     "message": "At-risk members"
@@ -168,16 +168,16 @@
     }
   },
   "totalMembers": {
-    "message": "Total members"
+    "message": "Total de miembros"
   },
   "atRiskApplications": {
     "message": "At-risk applications"
   },
   "totalApplications": {
-    "message": "Total applications"
+    "message": "Total de aplicaciones"
   },
   "unmarkAsCriticalApp": {
-    "message": "Unmark as critical app"
+    "message": "Desmarcar como aplicación crítica"
   },
   "criticalApplicationSuccessfullyUnmarked": {
     "message": "Critical application successfully unmarked"
@@ -220,7 +220,7 @@
     "message": "Notas"
   },
   "privateNote": {
-    "message": "Private note"
+    "message": "Nota privada"
   },
   "note": {
     "message": "Nota"
@@ -259,7 +259,7 @@
     "message": "Historial del elemento"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "Clave de autenticador"
   },
   "autofillOptions": {
     "message": "Opciones de autocompletar"
@@ -483,7 +483,7 @@
     "message": "Editar carpeta"
   },
   "editWithName": {
-    "message": "Edit $ITEM$: $NAME$",
+    "message": "Editar $ITEM$: $NAME$",
     "placeholders": {
       "item": {
         "content": "$1",
@@ -496,16 +496,16 @@
     }
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Nueva carpeta"
   },
   "folderName": {
-    "message": "Folder name"
+    "message": "Nombre de la carpeta"
   },
   "folderHintText": {
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
   "deleteFolderPermanently": {
-    "message": "Are you sure you want to permanently delete this folder?"
+    "message": "¿Estás seguro de que quieres eliminar permanentemente esta carpeta?"
   },
   "baseDomain": {
     "message": "Dominio base",
@@ -547,12 +547,6 @@
     "message": "Colapsar/Expandir",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generar contraseña"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Comprobar si la contraseña está comprometida."
   },
@@ -654,7 +648,7 @@
     "message": "Nota segura"
   },
   "typeSshKey": {
-    "message": "SSH key"
+    "message": "Clave SSH"
   },
   "typeLoginPlural": {
     "message": "Inicios de sesión"
@@ -795,7 +789,7 @@
     }
   },
   "copySuccessful": {
-    "message": "Copy Successful"
+    "message": "Copia Exitosa"
   },
   "copyValue": {
     "message": "Copiar valor",
@@ -806,11 +800,11 @@
     "description": "Copy password to clipboard"
   },
   "copyPassphrase": {
-    "message": "Copy passphrase",
+    "message": "Copiar frase de contraseña",
     "description": "Copy passphrase to clipboard"
   },
   "passwordCopied": {
-    "message": "Password copied"
+    "message": "Contraseña copiada"
   },
   "copyUsername": {
     "message": "Copiar usuario",
@@ -829,7 +823,7 @@
     "description": "Copy URI to clipboard"
   },
   "copyCustomField": {
-    "message": "Copy $FIELD$",
+    "message": "Copiar $FIELD$",
     "placeholders": {
       "field": {
         "content": "$1",
@@ -838,7 +832,7 @@
     }
   },
   "copyWebsite": {
-    "message": "Copy website"
+    "message": "Copiar sitio web"
   },
   "copyNotes": {
     "message": "Copiar notas"
@@ -853,7 +847,7 @@
     "message": "Copiar correo electrónico"
   },
   "copyCompany": {
-    "message": "Copy company"
+    "message": "Copiar empresa"
   },
   "copySSN": {
     "message": "Copiar número de seguro social"
@@ -870,6 +864,9 @@
   "me": {
     "message": "Yo"
   },
+  "myItems": {
+    "message": "Mis Elementos"
+  },
   "myVault": {
     "message": "Mi caja fuerte"
   },
@@ -944,7 +941,7 @@
     }
   },
   "itemsMovedToOrg": {
-    "message": "Items moved to $ORGNAME$",
+    "message": "Elementos movidos a $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -953,7 +950,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Item moved to $ORGNAME$",
+    "message": "Elemento movido a $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -1019,16 +1016,16 @@
     "message": "Tu sesión ha expirado."
   },
   "restartRegistration": {
-    "message": "Restart registration"
+    "message": "Reiniciar registro"
   },
   "expiredLink": {
     "message": "Enlace expirado"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "Please restart registration or try logging in."
+    "message": "Por favor, reinicia el registro o intenta iniciar sesión."
   },
   "youMayAlreadyHaveAnAccount": {
-    "message": "You may already have an account"
+    "message": "Puede que ya tengas una cuenta"
   },
   "logOutConfirmation": {
     "message": "¿Estás seguro de querer cerrar la sesión?"
@@ -1046,7 +1043,7 @@
     "message": "No"
   },
   "location": {
-    "message": "Location"
+    "message": "Ubicación"
   },
   "loginOrCreateNewAccount": {
     "message": "Identifícate o crea una nueva cuenta para acceder a tu caja fuerte."
@@ -1058,7 +1055,7 @@
     "message": "Iniciar sesión con el dispositivo debe configurarse en los ajustes de la aplicación Bitwarden. ¿Necesitas otra opción?"
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "¿Necesitas otra opción?"
   },
   "loginWithMasterPassword": {
     "message": "Iniciar sesión con contraseña maestra"
@@ -1073,13 +1070,13 @@
     "message": "Utilizar otro método de inicio de sesión"
   },
   "logInWithPasskey": {
-    "message": "Log in with passkey"
+    "message": "Iniciar sesión con clave de acceso"
   },
   "useSingleSignOn": {
-    "message": "Use single sign-on"
+    "message": "Usar inicio de sesión único"
   },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "Bienvenido de nuevo"
   },
   "invalidPasskeyPleaseTryAgain": {
     "message": "Clave inválida. Por favor, inténtelo de nuevo."
@@ -1163,7 +1160,7 @@
     "message": "Crear cuenta"
   },
   "newToBitwarden": {
-    "message": "New to Bitwarden?"
+    "message": "¿Nuevo en Bitwarden?"
   },
   "setAStrongPassword": {
     "message": "Establece una contraseña fuerte"
@@ -1181,43 +1178,43 @@
     "message": "Identificarse"
   },
   "logInToBitwarden": {
-    "message": "Log in to Bitwarden"
+    "message": "Iniciar sesión en Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Enter the code sent to your email"
+    "message": "Introduce el código enviado a tu correo electrónico"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "Introduce el código de tu aplicación de autenticación"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Press your YubiKey to authenticate"
+    "message": "Pulsa tu YubiKey para autenticarte"
   },
   "authenticationTimeout": {
-    "message": "Authentication timeout"
+    "message": "Tiempo de autenticación agotado"
   },
   "authenticationSessionTimedOut": {
     "message": "The authentication session timed out. Please restart the login process."
   },
   "verifyYourIdentity": {
-    "message": "Verify your Identity"
+    "message": "Verifica tu Identidad"
   },
   "weDontRecognizeThisDevice": {
-    "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
+    "message": "No reconocemos este dispositivo. Introduce el código enviado a tu correo electrónico para verificar tu identidad."
   },
   "continueLoggingIn": {
-    "message": "Continue logging in"
+    "message": "Continuar el inicio de sesión"
   },
   "whatIsADevice": {
-    "message": "What is a device?"
+    "message": "¿Qué es un dispositivo?"
   },
   "aDeviceIs": {
-    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+    "message": "Un dispositivo es una instalación única de la aplicación Bitwarden donde has iniciado sesión. La reinstalación, la eliminación de datos de la aplicación o la eliminación de tus cookies podrían resultar en la aparición de un dispositivo múltiples veces."
   },
   "logInInitiated": {
     "message": "Inicio de sesión en proceso"
   },
   "logInRequestSent": {
-    "message": "Request sent"
+    "message": "Solicitud enviada"
   },
   "submit": {
     "message": "Enviar"
@@ -1250,7 +1247,7 @@
     "message": "Pista de contraseña maestra (opcional)"
   },
   "newMasterPassHint": {
-    "message": "New master password hint (optional)"
+    "message": "Nueva pista para la contraseña maestra (opcional)"
   },
   "masterPassHintLabel": {
     "message": "Pista de contraseña maestra"
@@ -1278,7 +1275,7 @@
     "message": "Solicitar pista"
   },
   "requestPasswordHint": {
-    "message": "Request password hint"
+    "message": "Solicitar pista de la contraseña"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
     "message": "Enter your account email address and your password hint will be sent to you"
@@ -1315,7 +1312,7 @@
     "message": "¡Tu nueva cuenta ha sido creada! Ahora puedes acceder."
   },
   "newAccountCreated2": {
-    "message": "Your new account has been created!"
+    "message": "¡Tu nueva cuenta ha sido creada!"
   },
   "youHaveBeenLoggedIn": {
     "message": "¡Has iniciado sesión!"
@@ -1336,10 +1333,10 @@
     "message": "Correo electrónico"
   },
   "yourVaultIsLockedV2": {
-    "message": "Your vault is locked"
+    "message": "Tu caja fuerte está bloqueada"
   },
   "yourAccountIsLocked": {
-    "message": "Your account is locked"
+    "message": "Tu cuenta está bloqueada"
   },
   "uuid": {
     "message": "UUID"
@@ -1376,7 +1373,7 @@
     "message": "No tiene los permisos para ver todos los elementos de esta colección."
   },
   "youDoNotHavePermissions": {
-    "message": "You do not have permissions to this collection"
+    "message": "No tienes permisos para esta colección"
   },
   "noCollectionsInList": {
     "message": "No hay colecciones que listar."
@@ -1403,13 +1400,13 @@
     "message": "Se ha enviado una notificación a tu dispositivo."
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the "
+    "message": "Desbloquea Bitwarden en tu dispositivo o en la "
   },
   "areYouTryingToAccessYourAccount": {
-    "message": "Are you trying to access your account?"
+    "message": "¿Estás intentando acceder a tu cuenta?"
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "Intento de acceso de $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1418,13 +1415,13 @@
     }
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "Confirmar acceso"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "Denegar acceso"
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "aplicación web"
   },
   "notificationSentDevicePart2": {
     "message": "Make sure the Fingerprint phrase matches the one below before approving."
@@ -1433,7 +1430,7 @@
     "message": "Unlock Bitwarden on your device. Make sure the Fingerprint phrase matches the one below before approving."
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "A notification was sent to your device"
+    "message": "Se ha enviado una notificación a tu dispositivo"
   },
   "versionNumber": {
     "message": "Versión $VERSION_NUMBER$",
@@ -1454,14 +1451,14 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "No volver a preguntar en este dispositivo durante 30 días"
   },
   "selectAnotherMethod": {
-    "message": "Select another method",
+    "message": "Selecciona otro método",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use your recovery code"
+    "message": "Usa tu código de recuperación"
   },
   "insertU2f": {
     "message": "Inserta tu llave de seguridad en el puerto USB de tu equipo. Si tiene un botón, púlsalo."
@@ -1479,7 +1476,7 @@
     "message": "Opciones de la autenticación en dos pasos"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "Selecciona un método de inicio de sesión en dos pasos"
   },
   "recoveryCodeDesc": {
     "message": "¿Has perdido el acceso a todos tus métodos de autenticación en dos pasos? Utiliza tu código de recuperación para deshabilitar todos los métodos de autenticación en dos pasos de tu cuenta."
@@ -1491,7 +1488,7 @@
     "message": "Aplicación de autenticación"
   },
   "authenticatorAppDescV2": {
-    "message": "Enter a code generated by an authenticator app like Bitwarden Authenticator.",
+    "message": "Introduce un código generado por una aplicación de autenticación como Bitwarden Authenticator.",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
@@ -1501,7 +1498,7 @@
     "message": "Usa un Yubikey para acceder a tu cuenta. Funciona con YubiKey 4, 4 Nano, 4C y dispositivos NEO."
   },
   "duoDescV2": {
-    "message": "Enter a code generated by Duo Security.",
+    "message": "Introduce un código generado por Duo Security.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
@@ -1524,13 +1521,13 @@
     "message": "(Migrado desde FIDO)"
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "Abrir en una nueva pestaña"
   },
   "emailTitle": {
     "message": "Correo electrónico"
   },
   "emailDescV2": {
-    "message": "Enter a code sent to your email."
+    "message": "Introduce un código enviado a tu correo electrónico."
   },
   "continue": {
     "message": "Continuar"
@@ -1569,7 +1566,7 @@
     "message": "¿Está seguro de que desea continuar?"
   },
   "moveSelectedItemsDesc": {
-    "message": "Choose a folder that you would like to add the $COUNT$ selected item(s) to.",
+    "message": "Selecciona una carpeta a la que quieras mover los $COUNT$ elementos seleccionados.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1691,7 +1688,7 @@
     "description": "deprecated. Use avoidAmbiguous instead."
   },
   "avoidAmbiguous": {
-    "message": "Avoid ambiguous characters",
+    "message": "Evita caracteres ambiguos",
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "length": {
@@ -1729,17 +1726,17 @@
     "message": "Incluir número"
   },
   "generatorPolicyInEffect": {
-    "message": "Enterprise policy requirements have been applied to your generator options.",
+    "message": "Los requisitos de política empresarial se han aplicado a las opciones de tu generador.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "passwordHistory": {
     "message": "Historial de contraseñas"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "Historial del generador"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "Borrar historial del generador"
   },
   "cleargGeneratorHistoryDescription": {
     "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
@@ -1748,13 +1745,13 @@
     "message": "No hay contraseñas que listar."
   },
   "clearHistory": {
-    "message": "Clear history"
+    "message": "Limpiar historial"
   },
   "nothingToShow": {
-    "message": "Nothing to show"
+    "message": "Nada que mostrar"
   },
   "nothingGeneratedRecently": {
-    "message": "You haven't generated anything recently"
+    "message": "No has generado nada recientemente"
   },
   "clear": {
     "message": "Limpiar",
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceder cerrará tu sesión actual, requiriendo que vuelvas a acceder. Las sesiones activas en otros dispositivos pueden seguir activas hasta dentro de una hora."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Correo electrónico cambiado"
   },
@@ -1794,10 +1794,10 @@
     "message": "Por favor, vuelve a acceder."
   },
   "currentSession": {
-    "message": "Current session"
+    "message": "Sesión actual"
   },
   "requestPending": {
-    "message": "Request pending"
+    "message": "Solicitud pendiente"
   },
   "logBackInOthersToo": {
     "message": "Por favor, vuelve a acceder. Si estás utilizando otras aplicaciones de Bitwarden, cierra sesión y vuelva a acceder en ellas también."
@@ -1900,7 +1900,7 @@
     "message": "Desautorizadas todas las sesiones"
   },
   "accountIsOwnedMessage": {
-    "message": "This account is owned by $ORGANIZATIONNAME$",
+    "message": "Esta cuenta es propiedad de $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -1945,7 +1945,7 @@
     "message": "Tu cuenta de Bitwarden y los datos de tu caja fuerte fueron eliminados permanentemente."
   },
   "deleteOrganizationWarning": {
-    "message": "Deleting your organization is permanent. It cannot be undone."
+    "message": "Eliminar tu organización es permanente. No se puede deshacer."
   },
   "myAccount": {
     "message": "Mi cuenta"
@@ -2016,7 +2016,7 @@
     "message": "Error al descifrar el archivo exportado. Su clave de cifrado no coincide con la clave de cifrado utilizada para exporta los datos."
   },
   "destination": {
-    "message": "Destination"
+    "message": "Destino"
   },
   "learnAboutImportOptions": {
     "message": "Conozca sus opciones de importación"
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Habilitar la autenticación en dos pasos puede impedirte acceder permanentemente a tu cuenta de Bitwarden. Un código de recuperación te permite acceder a la cuenta en caso de que no puedas usar más tu proveedor de autenticación en dos pasos (ej. si pierdes tu dispositivo). El soporte de Bitwarden no será capaz de asistirte si pierdes acceso a tu cuenta. Te recomendamos que escribas o imprimas este código y lo guardes en un lugar seguro."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2201,16 +2213,16 @@
     "message": "Gestionar"
   },
   "manageCollection": {
-    "message": "Manage collection"
+    "message": "Gestionar colección"
   },
   "viewItems": {
-    "message": "View items"
+    "message": "Ver elementos"
   },
   "viewItemsHidePass": {
     "message": "View items, hidden passwords"
   },
   "editItems": {
-    "message": "Edit items"
+    "message": "Editar elementos"
   },
   "editItemsHidePass": {
     "message": "Edit items, hidden passwords"
@@ -2218,11 +2230,14 @@
   "disable": {
     "message": "Desactivar"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Detalles del miembro no encontrados."
+  },
   "revokeAccess": {
     "message": "Revocar el acceso"
   },
   "revoke": {
-    "message": "Revoke"
+    "message": "Revocar"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Este proveedor de autenticación en dos pasos está habilitado para tu cuenta."
@@ -2243,7 +2258,7 @@
     "message": "."
   },
   "continueToExternalUrlTitle": {
-    "message": "Continue to $URL$?",
+    "message": "¿Continuar a $URL$?",
     "placeholders": {
       "url": {
         "content": "$1",
@@ -2252,10 +2267,10 @@
     }
   },
   "continueToExternalUrlDesc": {
-    "message": "You are leaving Bitwarden and launching an external website in a new window."
+    "message": "Estás saliendo de Bitwarden y lanzando un sitio web externo en una nueva ventana."
   },
   "twoStepContinueToBitwardenUrlTitle": {
-    "message": "Continue to bitwarden.com?"
+    "message": "¿Continuar a bitwarden.com?"
   },
   "twoStepContinueToBitwardenUrlDesc": {
     "message": "Bitwarden Authenticator allows you to store authenticator keys and generate TOTP codes for 2-step verification flows. Learn more on the bitwarden.com website."
@@ -2270,7 +2285,7 @@
     "message": "Clave"
   },
   "twoStepAuthenticatorEnterCodeV2": {
-    "message": "Verification code"
+    "message": "Código de verificación"
   },
   "twoStepAuthenticatorReaddDesc": {
     "message": "En caso de que necesite agregarlo a otro dispositivo, a continuación se indica el código QR (o clave) requerido por su aplicación autenticadora."
@@ -2519,7 +2534,7 @@
     "message": "Compruebe las contraseñas comprometidas"
   },
   "timesExposed": {
-    "message": "Times exposed"
+    "message": "Veces expuesta"
   },
   "exposedXTimes": {
     "message": "Comprometida $COUNT$ veces",
@@ -2556,7 +2571,7 @@
     "message": "No hay elementos en su caja fuerte que tengan contraseñas débiles."
   },
   "weakness": {
-    "message": "Weakness"
+    "message": "Debilidad"
   },
   "reusedPasswordsReport": {
     "message": "Contraseñas reutilizadas"
@@ -2584,7 +2599,7 @@
     "message": "No hay inicios de sesión en su caja fuerte que tengan contraseñas que esten siendo reutilizadas."
   },
   "timesReused": {
-    "message": "Times reused"
+    "message": "Veces reutilizada"
   },
   "reusedXTimes": {
     "message": "Reutilizada $COUNT$ veces",
@@ -2933,10 +2948,10 @@
     "message": "Facturas"
   },
   "noUnpaidInvoices": {
-    "message": "No unpaid invoices."
+    "message": "No hay facturas pendientes."
   },
   "noPaidInvoices": {
-    "message": "No paid invoices."
+    "message": "No hay facturas pagadas."
   },
   "paid": {
     "message": "Pagado",
@@ -3387,10 +3402,10 @@
     }
   },
   "inviteSingleEmailDesc": {
-    "message": "You have 1 invite remaining."
+    "message": "Tienes 1 invitación restante."
   },
   "inviteZeroEmailDesc": {
-    "message": "You have 0 invites remaining."
+    "message": "Tienes 0 invitaciones restantes."
   },
   "userUsingTwoStep": {
     "message": "Este usuario está usando autenticación de dos pasos para proteger su cuenta."
@@ -3556,7 +3571,7 @@
     }
   },
   "viewAllLogInOptions": {
-    "message": "View all log in options"
+    "message": "Ver todas las opciones de inicio de sesión"
   },
   "viewAllLoginOptions": {
     "message": "Ver todas las opciones de inicio de sesión"
@@ -3895,22 +3910,22 @@
     "message": "Dispositivo"
   },
   "loginStatus": {
-    "message": "Login status"
+    "message": "Estado del inicio de sesión"
   },
   "firstLogin": {
-    "message": "First login"
+    "message": "Primer inicio de sesión"
   },
   "trusted": {
     "message": "Trusted"
   },
   "needsApproval": {
-    "message": "Needs approval"
+    "message": "Necesita aprobación"
   },
   "areYouTryingtoLogin": {
-    "message": "Are you trying to log in?"
+    "message": "¿Estás intentando iniciar sesión?"
   },
   "logInAttemptBy": {
-    "message": "Login attempt by $EMAIL$",
+    "message": "Intento de inicio de sesión de $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3919,22 +3934,22 @@
     }
   },
   "deviceType": {
-    "message": "Device Type"
+    "message": "Tipo de Dispositivo"
   },
   "ipAddress": {
-    "message": "IP Address"
+    "message": "Dirección IP"
   },
   "confirmLogIn": {
-    "message": "Confirm login"
+    "message": "Confirmar inicio de sesión"
   },
   "denyLogIn": {
-    "message": "Deny login"
+    "message": "Denegar inicio de sesión"
   },
   "thisRequestIsNoLongerValid": {
-    "message": "This request is no longer valid."
+    "message": "Esta solicitud ya no es válida."
   },
   "logInConfirmedForEmailOnDevice": {
-    "message": "Login confirmed for $EMAIL$ on $DEVICE$",
+    "message": "Inicio de sesión confirmado para $EMAIL$ en $DEVICE$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3953,10 +3968,10 @@
     "message": "Login request has already expired."
   },
   "justNow": {
-    "message": "Just now"
+    "message": "Justo ahora"
   },
   "requestedXMinutesAgo": {
-    "message": "Requested $MINUTES$ minutes ago",
+    "message": "Solicitado hace $MINUTES$ minutos",
     "placeholders": {
       "minutes": {
         "content": "$1",
@@ -4067,7 +4082,7 @@
     "message": "Tu cuenta de correo ha sido verificada."
   },
   "emailVerifiedV2": {
-    "message": "Email verified"
+    "message": "Correo electrónico verificado"
   },
   "emailVerifiedFailed": {
     "message": "No se ha podido verificar tu cuenta de correo electrónico. Prueba a enviar un nuevo correo de verificación."
@@ -4088,13 +4103,13 @@
     "message": "Está utilizando un navegador web no compatible. Es posible que la caja fuerte web no funcione correctamente."
   },
   "youHaveAPendingLoginRequest": {
-    "message": "You have a pending login request from another device."
+    "message": "Tienes una solicitud de inicio de sesión desde otro dispositivo."
   },
   "reviewLoginRequest": {
     "message": "Review login request"
   },
   "freeTrialEndPromptCount": {
-    "message": "Your free trial ends in $COUNT$ days.",
+    "message": "Tu prueba gratuita termina en $COUNT$ días.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4103,7 +4118,7 @@
     }
   },
   "freeTrialEndPromptMultipleDays": {
-    "message": "$ORGANIZATION$, your free trial ends in $COUNT$ days.",
+    "message": "$ORGANIZATION$, tu prueba gratuita termina en $COUNT$ días.",
     "placeholders": {
       "count": {
         "content": "$2",
@@ -4116,7 +4131,7 @@
     }
   },
   "freeTrialEndPromptTomorrow": {
-    "message": "$ORGANIZATION$, your free trial ends tomorrow.",
+    "message": "$ORGANIZATION$, tu prueba gratuita termina mañana.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4125,7 +4140,7 @@
     }
   },
   "freeTrialEndPromptTomorrowNoOrgName": {
-    "message": "Your free trial ends tomorrow."
+    "message": "Tu prueba gratuita termina mañana."
   },
   "freeTrialEndPromptToday": {
     "message": "$ORGANIZATION$, your free trial ends today.",
@@ -4137,16 +4152,16 @@
     }
   },
   "freeTrialEndingTodayWithoutOrgName": {
-    "message": "Your free trial ends today."
+    "message": "Tu prueba gratuita termina hoy."
   },
   "clickHereToAddPaymentMethod": {
-    "message": "Click here to add a payment method."
+    "message": "Pulsa aquí para añadir un método de pago."
   },
   "joinOrganization": {
     "message": "Únete a la organización"
   },
   "joinOrganizationName": {
-    "message": "Join $ORGANIZATIONNAME$",
+    "message": "Unirse a $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -4158,7 +4173,7 @@
     "message": "Usted ha sido invitado a unirse a la organización mencionada anteriormente. Para aceptar la invitación, debe iniciar sesión o crear una nueva cuenta de Bitwarden."
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Finish joining this organization by setting a master password."
+    "message": "Termina de unirte a esta organización estableciendo una contraseña maestra."
   },
   "inviteAccepted": {
     "message": "Invitación Aceptada"
@@ -4478,11 +4493,8 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
-    "message": "Edit $LABEL$",
+    "message": "Editar $LABEL$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Clave actualizada"
-  },
-  "updateEncryptionKey": {
-    "message": "Actualizar clave de cifrado"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Hemos cambiado el esquema de cifrado para proporcionar una mayor seguridad. Actualice su clave de cifrado ahora introduciendo su contraseña maestra a continuación."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Una vez actualices tu clave de cifrado, será necesario que cierres sesión y vuelvas a identificarte en todas las aplicaciones de Bitwarden que estés utilizando (como la aplicación móvil o la extensión de navegador). Si la reautenticación falla (la cual descargaría la nueva clave de cifrad) puede producirse corrupción de datos. Intentaremos cerrar tu sesión automáticamente, pero puede tardar un tiempo."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Suscripción"
   },
@@ -4681,7 +4684,7 @@
     "message": "Seleccionado"
   },
   "recommended": {
-    "message": "Recommended"
+    "message": "Recomendado"
   },
   "ownership": {
     "message": "Propiedad"
@@ -4752,7 +4755,7 @@
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "You will be notified once the request is approved"
+    "message": "Serás notificado una vez que la solicitud sea aprobada"
   },
   "free": {
     "message": "Gratis",
@@ -4874,7 +4877,7 @@
     "message": "Número mínimo de palabras"
   },
   "overridePasswordTypePolicy": {
-    "message": "Password Type",
+    "message": "Tipo de Contraseña",
     "description": "Name of the password generator policy that overrides the user's password/passphrase selection."
   },
   "userPreference": {
@@ -4991,10 +4994,10 @@
     "message": "Inicie sesión utilizando el portal de inicio de sesión único de su organización. Introduzca el identificador de su organización para comenzar."
   },
   "singleSignOnEnterOrgIdentifier": {
-    "message": "Enter your organization's SSO identifier to begin"
+    "message": "Introduce el identificador SSO de tu organización para comenzar"
   },
   "singleSignOnEnterOrgIdentifierText": {
-    "message": "To log in with your SSO provider, enter your organization's SSO identifier to begin. You may need to enter this SSO identifier when you log in from a new device."
+    "message": "Para iniciar sesión con tu proveedor de SSO, introduce el SSO de tu organización para comenzar. Puede que necesites introducir este identificador SSO cuando inicies sesión en un nuevo dispositivo."
   },
   "enterpriseSingleSignOn": {
     "message": "Inicio de sesión único empresarial"
@@ -5009,7 +5012,7 @@
     "message": "Esta ventana se cerrará automáticamente en 5 segundos"
   },
   "youMayCloseThisWindow": {
-    "message": "You may close this window"
+    "message": "Puedes cerrar esta ventana"
   },
   "includeAllTeamsFeatures": {
     "message": "Todas las características de Equipos y además:"
@@ -5094,7 +5097,7 @@
     "message": "Limit views"
   },
   "limitSendViewsHint": {
-    "message": "No one can view this Send after the limit is reached.",
+    "message": "Nadie puede ver este Send tras alcanzar el límite.",
     "description": "Displayed under the limit views field on Send"
   },
   "limitSendViewsCount": {
@@ -5108,11 +5111,11 @@
     }
   },
   "sendDetails": {
-    "message": "Send details",
+    "message": "Detalles del Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeTextToShare": {
-    "message": "Text to share"
+    "message": "Texto a compartir"
   },
   "sendTypeFile": {
     "message": "Archivo"
@@ -5156,7 +5159,7 @@
     "message": "Fecha de eliminación"
   },
   "deletionDateDescV2": {
-    "message": "The Send will be permanently deleted on this date.",
+    "message": "El Send se borrará permanentemente en esta fecha.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
@@ -5180,7 +5183,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copyLink": {
-    "message": "Copy link"
+    "message": "Copiar enlace"
   },
   "copySendLink": {
     "message": "Copiar enlace Send",
@@ -5206,7 +5209,7 @@
     "message": "Borrado pendiente"
   },
   "hideTextByDefault": {
-    "message": "Hide text by default"
+    "message": "Ocultar texto por defecto"
   },
   "expired": {
     "message": "Caducado"
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Acceso de emergencia rechazado"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Restablecimiento de contraseña para $USER$. Ahora puede iniciar sesión usando la nueva contraseña.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Propiedad personal"
   },
@@ -5529,7 +5538,7 @@
     "message": "Desactivar la propiedad personal para los usuarios de la organización"
   },
   "send": {
-    "message": "Enviar",
+    "message": "Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendAccessTaglineProductDesc": {
@@ -5563,19 +5572,19 @@
     "message": "Development, DevOps, and IT teams choose Bitwarden Secrets Manager to securely manage and deploy their infrastructure and machine secrets."
   },
   "centralizeSecretsManagement": {
-    "message": "Centralize secrets management."
+    "message": "Centralizar gestión de secretos."
   },
   "centralizeSecretsManagementDescription": {
     "message": "Securely store and manage secrets in one location to prevent secret sprawl across your organization."
   },
   "preventSecretLeaks": {
-    "message": "Prevent secret leaks."
+    "message": "Evitar fugas de secretos."
   },
   "preventSecretLeaksDescription": {
     "message": "Protect secrets with end-to-end encryption. No more hard coding secrets or sharing through .env files."
   },
   "enhanceDeveloperProductivity": {
-    "message": "Enhance developer productivity."
+    "message": "Mejorar la productividad de los desarrolladores."
   },
   "enhanceDeveloperProductivityDescription": {
     "message": "Programmatically retrieve and deploy secrets at runtime so developers can focus on what matters most, like improving code quality."
@@ -5587,19 +5596,19 @@
     "message": "Maintain tight control over machine and human access to secrets with SSO integrations, event logs, and access rotation."
   },
   "tryItNow": {
-    "message": "Try it now"
+    "message": "Pruébalo ahora"
   },
   "sendRequest": {
-    "message": "Send request"
+    "message": "Enviar solicitud"
   },
   "addANote": {
-    "message": "Add a note"
+    "message": "Añadir una nota"
   },
   "bitwardenSecretsManager": {
     "message": "Bitwarden Secrets Manager"
   },
   "moreProductsFromBitwarden": {
-    "message": "More products from Bitwarden"
+    "message": "Más productos de Bitwarden"
   },
   "requestAccessToSecretsManager": {
     "message": "Request access to Secrets Manager"
@@ -5654,7 +5663,7 @@
     }
   },
   "viewSend": {
-    "message": "View Send",
+    "message": "Ver Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "viewSendHiddenEmailWarning": {
@@ -5686,7 +5695,7 @@
     "message": "Autenticar WebAuthn"
   },
   "readSecurityKey": {
-    "message": "Read security key"
+    "message": "Leer clave de seguridad"
   },
   "awaitingSecurityKeyInteraction": {
     "message": "Awaiting security key interaction..."
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "este usuario"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Una o más políticas de organización requieren la contraseña maestra para cumplir con los siguientes requisitos:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "¡Contraseña restablecida!"
   },
@@ -5902,17 +5923,17 @@
     "message": "Error"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Error de descifrado"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "Bitwarden no pudo descifrar el/los elemento(s) de la caja fuerte listados a continuación."
   },
   "contactCSToAvoidDataLossPart1": {
     "message": "Contact customer success",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "para evitar pérdida de datos adicionales.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "accountRecoveryManageUsers": {
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Añadir"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Contraseña maestra establecida correctamente"
+  },
   "updatedMasterPassword": {
     "message": "Contraseña maestra actualizada"
   },
   "updateMasterPassword": {
     "message": "Actualizar contraseña maestra"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Su contraseña maestra ha sido cambiada recientemente por un administrador de su organización. Para acceder a la caja fuerte, debe actualizar su contraseña maestra ahora. Proceder le desconectará de su sesión actual, requiriendo que vuelva a iniciar sesión. Las sesiones activas en otros dispositivos pueden seguir estando activas durante hasta una hora."
   },
@@ -6330,7 +6360,7 @@
     "message": "Acceso Premium para hasta 6 usuarios"
   },
   "sponsoredFamiliesSharedCollectionsForFamilyMembers": {
-    "message": "Shared collections for family members"
+    "message": "Colecciones compartidas para miembros familiares"
   },
   "memberFamilies": {
     "message": "Member families"
@@ -6405,7 +6435,7 @@
     "message": "Cuenta canjeada"
   },
   "revokeAccountMessage": {
-    "message": "Revoke account $NAME$",
+    "message": "Revocar cuenta $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -6471,7 +6501,7 @@
     "message": "El código de verificación es requerido."
   },
   "webauthnCancelOrTimeout": {
-    "message": "The authentication was cancelled or took too long. Please try again."
+    "message": "La autenticación fue cancelada o tardó demasiado. Por favor, inténtalo de nuevo."
   },
   "invalidVerificationCode": {
     "message": "Código de verificación no válido"
@@ -6705,7 +6735,7 @@
     "message": "requerido"
   },
   "charactersCurrentAndMaximum": {
-    "message": "$CURRENT$/$MAX$ character maximum",
+    "message": "Máximo $CURRENT$/$MAX$ caracteres",
     "placeholders": {
       "current": {
         "content": "$1",
@@ -6730,7 +6760,7 @@
     "message": "Requerido si el ID de la entidad no es una URL."
   },
   "offerNoLongerValid": {
-    "message": "This offer is no longer valid. Contact your organization administrators for more information."
+    "message": "Esta oferta ya no es válida. Ponte en contacto con los administradores de tu organización para obtener más información."
   },
   "openIdOptionalCustomizations": {
     "message": "Personalizaciones opcionales"
@@ -6822,10 +6852,28 @@
     "message": "Generar nombre de usuario"
   },
   "generateEmail": {
-    "message": "Generate email"
+    "message": "Generar correo electrónico"
+  },
+  "generatePassword": {
+    "message": "Generar contraseña"
+  },
+  "generatePassphrase": {
+    "message": "Generar frase de contraseña"
+  },
+  "passwordGenerated": {
+    "message": "Contraseña generada"
+  },
+  "passphraseGenerated": {
+    "message": "Frase de contraseña generada"
+  },
+  "usernameGenerated": {
+    "message": "Nombre de usuario generado"
+  },
+  "emailGenerated": {
+    "message": "Correo electrónico generado"
   },
   "spinboxBoundariesHint": {
-    "message": "Value must be between $MIN$ and $MAX$.",
+    "message": "El valor debe estar entre $MIN$ y $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
     "placeholders": {
       "min": {
@@ -6872,7 +6920,7 @@
     "message": "Utiliza la bandeja de entrada global configurada de tu dominio."
   },
   "useThisEmail": {
-    "message": "Use this email"
+    "message": "Usar este correo electrónico"
   },
   "random": {
     "message": "Aleatorio",
@@ -6882,23 +6930,26 @@
     "message": "Palabra aleatoria"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Generador de nombre de usuario"
   },
   "useThisPassword": {
-    "message": "Use this password"
+    "message": "Usar esta contraseña"
+  },
+  "useThisPassphrase": {
+    "message": "Usar esta frase de contraseña"
   },
   "useThisUsername": {
-    "message": "Use this username"
+    "message": "Usar este nombre de usuario"
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "¡Contraseña segura generada! No olvides actualizar tu contraseña en el sitio web."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Usa el generador",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "para crear una contraseña única y segura",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "service": {
@@ -6968,7 +7019,7 @@
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Choose a domain that is supported by the selected service",
+    "message": "Elige un dominio que esté soportado por el servicio seleccionado",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
@@ -6990,7 +7041,7 @@
     "description": "Displayed with the address on the forwarding service's configuration screen."
   },
   "forwarderGeneratedByWithWebsite": {
-    "message": "Website: $WEBSITE$. Generated by Bitwarden.",
+    "message": "Sitio web: $WEBSITE$. Generado por Bitwarden.",
     "description": "Displayed with the address on the forwarding service's configuration screen.",
     "placeholders": {
       "WEBSITE": {
@@ -7256,10 +7307,10 @@
     }
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "1 campo necesita tu atención."
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "$COUNT$ campos necesitan tu atención.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7605,9 +7656,9 @@
     "message": "Cuenta de servicio actualizada",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Escriba o seleccione proyectos o secretos",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Escriba para filtrar",
@@ -7692,8 +7743,8 @@
     "message": "Tokens de acceso",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Nuevo token de acceso",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Ocurrió un error al intentar leer el archivo importado"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Acceso secreto $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8358,10 +8445,10 @@
     "message": "Se requiere aprobación en el dispositivo. Seleccione una opción de aprobación a continuación:"
   },
   "deviceApprovalRequiredV2": {
-    "message": "Device approval required"
+    "message": "Aprobación del dispositivo requerida"
   },
   "selectAnApprovalOptionBelow": {
-    "message": "Select an approval option below"
+    "message": "Selecciona una opción de aprobación abajo"
   },
   "rememberThisDevice": {
     "message": "Recordar en este dispositivo"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Solicitar aprobación del administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Cifrado de dispositivo de confianza"
   },
@@ -8418,7 +8511,7 @@
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
-    "message": "out of $TOTAL$",
+    "message": "de $TOTAL$",
     "placeholders": {
       "total": {
         "content": "$1",
@@ -8485,16 +8578,16 @@
     "message": "Aprobar solicitud"
   },
   "deviceApproved": {
-    "message": "Device approved"
+    "message": "Dispositivo aprobado"
   },
   "deviceRemoved": {
-    "message": "Device removed"
+    "message": "Dispositivo eliminado"
   },
   "removeDevice": {
-    "message": "Remove device"
+    "message": "Eliminar dispositivo"
   },
   "removeDeviceConfirmation": {
-    "message": "Are you sure you want to remove this device?"
+    "message": "¿Estás seguro de que quieres eliminar este dispositivo?"
   },
   "noDeviceRequests": {
     "message": "No hay solicitudes de dispositivo"
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Dispositivo de confianza"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invitar usuarios"
   },
@@ -8761,7 +8846,7 @@
     "message": "Alternar navegación lateral"
   },
   "skipToContent": {
-    "message": "Skip to content"
+    "message": "Saltar al contenido"
   },
   "managePermissionRequired": {
     "message": "At least one member or group must have can manage permission."
@@ -8813,7 +8898,7 @@
     "message": "Collection access is restricted"
   },
   "readOnlyCollectionAccess": {
-    "message": "You do not have access to manage this collection."
+    "message": "No tienes acceso para administrar esta colección."
   },
   "grantManageCollectionWarningTitle": {
     "message": "Missing Manage Collection Permissions"
@@ -8837,8 +8922,32 @@
     "message": "Formatos comunes",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Más sobre la detección de coincidencias",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
-    "message": "To maintain your subscription for $ORG$, ",
+    "message": "Para mantener tu suscripción a $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
     "placeholders": {
       "org": {
@@ -8848,7 +8957,7 @@
     }
   },
   "addAPaymentMethod": {
-    "message": "add a payment method",
+    "message": "añade un método de pago",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method'"
   },
   "organizationInformation": {
@@ -8861,34 +8970,34 @@
     "message": "Thank you for signing up for Bitwarden Secrets Manager!"
   },
   "smFreeTrialConfirmationEmail": {
-    "message": "We've sent a confirmation email to your email at "
+    "message": "Hemos enviado un correo electrónico de confirmación a tu correo electrónico "
   },
   "sorryToSeeYouGo": {
-    "message": "Sorry to see you go! Help improve Bitwarden by sharing why you're canceling.",
+    "message": "¡Lamento que te vayas! Ayuda a mejorar Bitwarden compartiendo el motivo de tu cancelación.",
     "description": "A message shown to users as part of an offboarding survey asking them to provide more information on their subscription cancelation."
   },
   "selectCancellationReason": {
-    "message": "Select a reason for canceling",
+    "message": "Selecciona un motivo de cancelación",
     "description": "Used as a form field label for a select input on the offboarding survey."
   },
   "anyOtherFeedback": {
-    "message": "Is there any other feedback you'd like to share?",
+    "message": "¿Hay algún otro comentario que quieras compartir?",
     "description": "Used as a form field label for a textarea input on the offboarding survey."
   },
   "missingFeatures": {
-    "message": "Missing features",
+    "message": "Faltan características",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "movingToAnotherTool": {
-    "message": "Moving to another tool",
+    "message": "Me muevo a otra herramienta",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "tooDifficultToUse": {
-    "message": "Too difficult to use",
+    "message": "Muy difícil de usar",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "notUsingEnough": {
-    "message": "Not using enough",
+    "message": "No lo uso suficiente",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "tooExpensive": {
@@ -8896,16 +9005,16 @@
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "freeForOneYear": {
-    "message": "Free for 1 year"
+    "message": "Gratis durante 1 año"
   },
   "newWebApp": {
-    "message": "Welcome to the new and improved web app. Learn more about what’s changed."
+    "message": "Bienvenido a la nueva y mejorada aplicación web. Aprende más sobre lo que ha cambiado."
   },
   "releaseBlog": {
-    "message": "Read release blog"
+    "message": "Leer blog de lanzamientos"
   },
   "adminConsole": {
-    "message": "Admin Console"
+    "message": "Consola de Administración"
   },
   "providerPortal": {
     "message": "Provider Portal"
@@ -8938,7 +9047,7 @@
     "message": "Seleccionar colecciones para asignar"
   },
   "noCollectionsAssigned": {
-    "message": "No collections have been assigned"
+    "message": "No se han asignado colecciones"
   },
   "successfullyAssignedCollections": {
     "message": "Successfully assigned collections"
@@ -9007,7 +9116,7 @@
     "description": "A subscription status label"
   },
   "subscriptionExpired": {
-    "message": "Subscription expired",
+    "message": "Suscripción expirada",
     "description": "The date header used when a subscription is past due."
   },
   "pastDueWarningForChargeAutomatically": {
@@ -9039,7 +9148,7 @@
     "description": "A warning shown to the user when their subscription is past due and they pay via invoice."
   },
   "unpaidInvoice": {
-    "message": "Unpaid invoice",
+    "message": "Factura no pagada",
     "description": "The header of a warning box shown to a user whose subscription is unpaid."
   },
   "toReactivateYourSubscription": {
@@ -9070,7 +9179,7 @@
     "description": "Message to encourage the user to start creating machine accounts."
   },
   "machineAccountsNoItemsTitle": {
-    "message": "Nothing to show yet",
+    "message": "Nada que mostrar aún",
     "description": "Title to indicate that there are no machine accounts to display."
   },
   "deleteMachineAccounts": {
@@ -9241,13 +9350,13 @@
     }
   },
   "providerDeleted": {
-    "message": "Provider deleted"
+    "message": "Proveedor eliminado"
   },
   "providerDeletedDesc": {
-    "message": "The Provider and all associated data has been deleted."
+    "message": "El Proveedor y todos los datos asociados han sido eliminados."
   },
   "deleteProviderRecoverConfirmDesc": {
-    "message": "You have requested to delete this Provider. Use the button below to confirm."
+    "message": "Has solicitado eliminar este Proveedor. Usa el botón de abajo para confirmar."
   },
   "deleteProviderWarning": {
     "message": "Deleting your provider is permanent. It cannot be undone."
@@ -9283,7 +9392,7 @@
     "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
   },
   "userProvisioning": {
-    "message": "User provisioning"
+    "message": "Aprovisionamiento de usuarios"
   },
   "scimIntegration": {
     "message": "SCIM"
@@ -9303,25 +9412,25 @@
     "message": "Configure Bitwarden Directory Connector to automatically provision users and groups using the implementation guide for your Identity Provider."
   },
   "eventManagement": {
-    "message": "Event management"
+    "message": "Gestión de eventos"
   },
   "eventManagementDesc": {
     "message": "Integrate Bitwarden event logs with your SIEM (system information and event management) system by using the implementation guide for your platform."
   },
   "deviceManagement": {
-    "message": "Device management"
+    "message": "Gestión de dispositivos"
   },
   "deviceManagementDesc": {
     "message": "Configure device management for Bitwarden using the implementation guide for your platform."
   },
   "deviceIdMissing": {
-    "message": "Device ID is missing"
+    "message": "Falta el ID del dispositivo"
   },
   "deviceTypeMissing": {
-    "message": "Device type is missing"
+    "message": "Falta el tipo de dispositivo"
   },
   "deviceCreationDateMissing": {
-    "message": "Device creation date is missing"
+    "message": "Falta la fecha de creación del dispositivo"
   },
   "desktopRequired": {
     "message": "Desktop required"
@@ -9387,7 +9496,7 @@
     "message": "Create a new client organization to manage as a Provider. Additional seats will be reflected in the next billing cycle."
   },
   "selectAPlan": {
-    "message": "Select a plan"
+    "message": "Selecciona un plan"
   },
   "thirtyFivePercentDiscount": {
     "message": "Descuento del 35%"
@@ -9402,16 +9511,16 @@
     "message": "Seats"
   },
   "addOrganization": {
-    "message": "Add organization"
+    "message": "Añadir organización"
   },
   "createdNewClient": {
-    "message": "Successfully created new client"
+    "message": "Nuevo cliente creado con éxito"
   },
   "noAccess": {
-    "message": "No access"
+    "message": "Sin acceso"
   },
   "collectionAdminConsoleManaged": {
-    "message": "This collection is only accessible from the admin console"
+    "message": "Esta colección solo es accesible desde la consola de administración"
   },
   "organizationOptionsMenu": {
     "message": "Toggle Organization Menu"
@@ -9453,7 +9562,7 @@
     "message": "Enter your Enterprise organization information"
   },
   "viewItemsIn": {
-    "message": "View items in $NAME$",
+    "message": "Ver elementos en $NAME$",
     "description": "Button to view the contents of a folder or collection",
     "placeholders": {
       "name": {
@@ -9463,7 +9572,7 @@
     }
   },
   "backTo": {
-    "message": "Back to $NAME$",
+    "message": "Volver a $NAME$",
     "description": "Navigate back to a previous folder or collection",
     "placeholders": {
       "name": {
@@ -9477,7 +9586,7 @@
     "description": "Button text to navigate back"
   },
   "removeItem": {
-    "message": "Remove $NAME$",
+    "message": "Eliminar $NAME$",
     "description": "Remove a selected option, such as a folder or collection",
     "placeholders": {
       "name": {
@@ -9487,19 +9596,19 @@
     }
   },
   "viewInfo": {
-    "message": "View info"
+    "message": "Ver información"
   },
   "viewAccess": {
-    "message": "View access"
+    "message": "Ver acceso"
   },
   "noCollectionsSelected": {
-    "message": "You have not selected any collections."
+    "message": "No has seleccionado ninguna colección."
   },
   "updateName": {
-    "message": "Update name"
+    "message": "Actualizar nombre"
   },
   "updatedOrganizationName": {
-    "message": "Updated organization name"
+    "message": "Nombre de la organización actualizado"
   },
   "providerPlan": {
     "message": "Managed Service Provider"
@@ -9568,13 +9677,13 @@
     "message": "An error occurred while previewing the invoice. Please try again later."
   },
   "unverified": {
-    "message": "Unverified"
+    "message": "No Verificado"
   },
   "verified": {
-    "message": "Verified"
+    "message": "Verificado"
   },
   "viewSecret": {
-    "message": "View secret"
+    "message": "Ver secreto"
   },
   "noClients": {
     "message": "There are no clients to list"
@@ -9590,7 +9699,7 @@
     "message": "Quickly view member access across the organization by upgrading to an Enterprise plan."
   },
   "date": {
-    "message": "Date"
+    "message": "Fecha"
   },
   "exportClientReport": {
     "message": "Export client report"
@@ -9629,13 +9738,13 @@
     "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
   },
   "incrementsOf100,000": {
-    "message": "increments of 100,000"
+    "message": "incrementos de 100.000"
   },
   "smallIncrements": {
-    "message": "small increments"
+    "message": "pequeños incrementos"
   },
   "kdfIterationRecommends": {
-    "message": "We recommend 600,000 or more"
+    "message": "Recomendamos 600.000 o más"
   },
   "kdfToHighWarningIncreaseInIncrements": {
     "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
@@ -9653,7 +9762,7 @@
     "message": "Grant groups or people access to this secret. Permissions set for people will override permissions set by groups."
   },
   "secretPeopleEmptyMessage": {
-    "message": "Add people or groups to share access to this secret"
+    "message": "Añade personas o grupos para compartir el acceso a este secreto"
   },
   "secretMachineAccountsDescription": {
     "message": "Grant machine accounts access to this secret."
@@ -9668,7 +9777,7 @@
     "message": "This action will remove your access to this secret."
   },
   "invoice": {
-    "message": "Invoice"
+    "message": "Factura"
   },
   "unassignedSeatsAvailable": {
     "message": "You have $SEATS$ unassigned seats available.",
@@ -9726,16 +9835,16 @@
     "message": "After making updates in the Bitwarden cloud server, upload your license file to apply the most recent changes."
   },
   "addToFolder": {
-    "message": "Add to folder"
+    "message": "Añadir a carpeta"
   },
   "selectFolder": {
-    "message": "Select folder"
+    "message": "Seleccionar carpeta"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+    "message": "1 elemento será transferido permanentemente a la organización seleccionada. Ya no serás el propietario de este elemento."
   },
   "personalItemsTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ elementos serán transferidos permanentemente a la organización seleccionada. Ya no serás el propietario de estos elementos.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -9744,7 +9853,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "message": "1 elemento será transferido permanentemente a $ORG$. Ya no serás el propietario de este elemento.",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -9753,7 +9862,7 @@
     }
   },
   "personalItemsWithOrgTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ elementos serán transferidos permanentemente a $ORG$. Ya no serás el propietario de estos elementos.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -9946,10 +10055,10 @@
     "message": "Fingerprint"
   },
   "sshKeyPrivateKey": {
-    "message": "Private key"
+    "message": "Clave privada"
   },
   "sshKeyPublicKey": {
-    "message": "Public key"
+    "message": "Clave pública"
   },
   "sshKeyAlgorithmED25519": {
     "message": "ED25519"
@@ -9964,7 +10073,7 @@
     "message": "RSA 4096-Bit"
   },
   "premiumAccounts": {
-    "message": "6 premium accounts"
+    "message": "6 cuentas premium"
   },
   "unlimitedSharing": {
     "message": "Unlimited sharing"
@@ -9988,13 +10097,13 @@
     "message": "Account recovery"
   },
   "customRoles": {
-    "message": "Custom roles"
+    "message": "Roles personalizados"
   },
   "unlimitedSecretsStorage": {
     "message": "Unlimited secrets storage"
   },
   "unlimitedUsers": {
-    "message": "Unlimited users"
+    "message": "Usuario ilimitados"
   },
   "UpTo50MachineAccounts": {
     "message": "Up to 50 machine accounts"
@@ -10018,7 +10127,7 @@
     "message": "File saved to device. Manage from your device downloads."
   },
   "publicApi": {
-    "message": "Public API",
+    "message": "API Pública",
     "description": "The text, 'API', is an acronym and should not be translated."
   },
   "showCharacterCount": {
@@ -10028,7 +10137,7 @@
     "message": "Hide character count"
   },
   "editAccess": {
-    "message": "Edit access"
+    "message": "Editar acceso"
   },
   "textHelpText": {
     "message": "Use text fields for data like security questions"
@@ -10074,7 +10183,7 @@
     "description": "Full description for the password generator special characters checkbox"
   },
   "addAttachment": {
-    "message": "Add attachment"
+    "message": "Añadir adjunto"
   },
   "maxFileSizeSansPunctuation": {
     "message": "Maximum file size is 500 MB"
@@ -10099,7 +10208,7 @@
     "message": "Non-compliant members will be revoked. Administrators can restore members once they leave all other organizations."
   },
   "deleteOrganizationUser": {
-    "message": "Delete $NAME$",
+    "message": "Eliminar $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -10123,7 +10232,7 @@
     "description": "Warning description for the bulk delete organization users dialog"
   },
   "organizationUserDeleted": {
-    "message": "Deleted $NAME$",
+    "message": "$NAME$ eliminado",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -10144,7 +10253,7 @@
     }
   },
   "userLeftOrganization": {
-    "message": "User $ID$ left organization",
+    "message": "El usuario $ID$ abandonó la organización",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -10168,10 +10277,10 @@
     "message": "To regain access to your organization, add a payment method."
   },
   "deleteMembers": {
-    "message": "Delete members"
+    "message": "Eliminar miembros"
   },
   "noSelectedMembersApplicable": {
-    "message": "This action is not applicable to any of the selected members."
+    "message": "Esta acción no es aplicable a ninguno de los miembros seleccionados."
   },
   "deletedSuccessfully": {
     "message": "Deleted successfully"
@@ -10204,7 +10313,7 @@
     "message": "Remove members"
   },
   "devices": {
-    "message": "Devices"
+    "message": "Dispositivos"
   },
   "deviceListDescription": {
     "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
@@ -10334,10 +10443,10 @@
     "message": "The password you entered is incorrect."
   },
   "importSshKey": {
-    "message": "Import"
+    "message": "Importar"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirm password"
+    "message": "Confirmar contraseña"
   },
   "enterSshKeyPasswordDesc": {
     "message": "Enter the password for the SSH key."
@@ -10346,7 +10455,7 @@
     "message": "Enter password"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "La clave SSH no es válida"
   },
   "sshKeyTypeUnsupported": {
     "message": "The SSH key type is not supported"
@@ -10485,7 +10594,7 @@
     "message": "Your provider subscription will receive a credit for any remaining time in the organization's subscription."
   },
   "doYouWantToAddThisOrg": {
-    "message": "Do you want to add this organization to $PROVIDER$?",
+    "message": "¿Quieres añadir esta organización a $PROVIDER$?",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Comparte archivos y datos de forma segura con cualquiera, en cualquier plataforma. Tu información permanecerá encriptada de extremo a extremo, limitando su exposición.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,13 +10736,123 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
-    "message": "Restart"
+    "message": "Reiniciar"
   },
   "verifyProviderBankAccountWithStatementDescriptorWarning": {
     "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the provider's subscription page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/et/messages.json b/apps/web/src/locales/et/messages.json
index 19608e1fd82..d95ff17edb8 100644
--- a/apps/web/src/locales/et/messages.json
+++ b/apps/web/src/locales/et/messages.json
@@ -420,7 +420,7 @@
     "message": "Aegumise aasta"
   },
   "authenticatorKeyTotp": {
-    "message": "Autentiseerimise võti (TOTP)"
+    "message": "Autentimise võti (TOTP)"
   },
   "totpHelperTitle": {
     "message": "Muuda 2-astmeline kinnitamine sujuvaks"
@@ -547,12 +547,6 @@
     "message": "Näita vähem",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Loo parool"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Kontrolli, kas parool on lekkinud."
   },
@@ -838,13 +832,13 @@
     }
   },
   "copyWebsite": {
-    "message": "Copy website"
+    "message": "Kopeeri veebilehe aadress"
   },
   "copyNotes": {
-    "message": "Copy notes"
+    "message": "Kopeeri märkused"
   },
   "copyAddress": {
-    "message": "Copy address"
+    "message": "Kopeeri aadress"
   },
   "copyPhone": {
     "message": "Kopeeri telefoninumber"
@@ -870,6 +864,9 @@
   "me": {
     "message": "Mina"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Minu hoidla"
   },
@@ -1058,7 +1055,7 @@
     "message": "Bitwardeni rakenduse seadistuses peab olema konfigureeritud sisselogimine läbi seadme. Soovid teist valikut?"
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "Soovid teist valikut kasutada?"
   },
   "loginWithMasterPassword": {
     "message": "Logi sisse ülemparooliga"
@@ -1193,10 +1190,10 @@
     "message": "Autentimiseks vajuta nuppu oma YubiKey'l"
   },
   "authenticationTimeout": {
-    "message": "Authentication timeout"
+    "message": "Sisselogimise ajalõpp"
   },
   "authenticationSessionTimedOut": {
-    "message": "The authentication session timed out. Please restart the login process."
+    "message": "Sisselogimise sessioon on aegunud. Palun alusta uuesti sisse logimist."
   },
   "verifyYourIdentity": {
     "message": "Kinnitage oma Identiteet"
@@ -1376,7 +1373,7 @@
     "message": "Sul ei ole õigust vaadata kõiki asju selles kogus."
   },
   "youDoNotHavePermissions": {
-    "message": "You do not have permissions to this collection"
+    "message": "Sul ei ole õigusi sellele kogumikule"
   },
   "noCollectionsInList": {
     "message": "Puuduvad kollektsioonid, mida kuvada."
@@ -1403,13 +1400,13 @@
     "message": "Sinu seadmesse saadeti teavitus."
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the "
+    "message": "Ava Bitwarden oma seadmes või avades "
   },
   "areYouTryingToAccessYourAccount": {
     "message": "Kas sa püüad praegu oma kontole sisse logida?"
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "$EMAIL$ proovis juurdepääsu saada",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1427,10 +1424,10 @@
     "message": "veebirakendus"
   },
   "notificationSentDevicePart2": {
-    "message": "Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Enne kinnitamist kontrolli, et unikaalne sõnajada ühtib allolevaga."
   },
   "notificationSentDeviceComplete": {
-    "message": "Unlock Bitwarden on your device. Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Ava Bitwarden oma seadmes. Enne kinnitamist kontrolli, et unikaalne sõnajada vastab allolevaga."
   },
   "aNotificationWasSentToYourDevice": {
     "message": "Sinu seadmele saadeti teavitus"
@@ -1736,25 +1733,25 @@
     "message": "Paroolide ajalugu"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "Genereerija ajalugu"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "Tühjenda genereerija ajalugu"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "Jätkates kustutatakse kõik kirjed genereerija ajaloost. Kas sa oled kindel, et soovid jätkata?"
   },
   "noPasswordsInList": {
     "message": "Puuduvad paroolid, mida kuvada."
   },
   "clearHistory": {
-    "message": "Clear history"
+    "message": "Tühjenda ajalugu"
   },
   "nothingToShow": {
-    "message": "Nothing to show"
+    "message": "Siin ei ole midagi näidata"
   },
   "nothingGeneratedRecently": {
-    "message": "You haven't generated anything recently"
+    "message": "Sa ei ole midagi viimat genereerinud"
   },
   "clear": {
     "message": "Tühjenda",
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Jätkates logitakse sind praegusest sessioonis välja, mistõttu pead kontosse uuesti sisse logima. Teised kontoga ühendatud seadmed võivad jääda sisselogituks kuni üheks tunniks."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "E-post on muudetud"
   },
@@ -1794,10 +1794,10 @@
     "message": "Palun logi uuesti sisse."
   },
   "currentSession": {
-    "message": "Current session"
+    "message": "Praegune sessioon"
   },
   "requestPending": {
-    "message": "Request pending"
+    "message": "Taotlus on ootel"
   },
   "logBackInOthersToo": {
     "message": "Palun logi uuesti sisse. Kui kasutad teisi Bitwardeni rakendusi, pead ka nendes uuesti sisse logima."
@@ -1876,31 +1876,31 @@
     "message": "Jätkatest logitakse sind ka käimasolevast sessioonist välja, mistõttu pead kontosse uuesti sisse logima. Lisaks võidakse küsida kaheastmelist kinnitust, kui see on sisse lülitatud. Teised kontoga ühendatud seadmed võivad jääda sisselogituks kuni üheks tunniks."
   },
   "newDeviceLoginProtection": {
-    "message": "New device login"
+    "message": "Uuest seadmest logiti sisse"
   },
   "turnOffNewDeviceLoginProtection": {
-    "message": "Turn off new device login protection"
+    "message": "Lülita välja uuest seadmest sisse logimise kaitse"
   },
   "turnOnNewDeviceLoginProtection": {
-    "message": "Turn on new device login protection"
+    "message": "Lülita sisse uuest seadmest sisse logimise kaitse"
   },
   "turnOffNewDeviceLoginProtectionModalDesc": {
-    "message": "Proceed below to turn off the verification emails bitwarden sends when you login from a new device."
+    "message": "Jätka allpool, et lülitada välja kinnituskirjad, mis Bitwarden saadab iga kord, kui sa logid uue seadme kaudu."
   },
   "turnOnNewDeviceLoginProtectionModalDesc": {
-    "message": "Proceed below to have bitwarden send you verification emails when you login from a new device."
+    "message": "Jätka allpool, et lülitada sisse kinnituskirjad, mis Bitwarden saadab iga kord, kui sa logid sisse uuest seadmest."
   },
   "turnOffNewDeviceLoginProtectionWarning": {
-    "message": "With new device login protection turned off, anyone with your master password can access your account from any device. To protect your account without verification emails, set up two-step login."
+    "message": "Ilma uue seadme logimise kaitseta saab igaüks igast seadmest sinu ülemparooliga sisse logida. Oma konto kaitsmiseks ilma kinnituskirjadeta, sea sisse kahe-astmeline kinnitamine."
   },
   "accountNewDeviceLoginProtectionSaved": {
-    "message": "New device login protection changes saved"
+    "message": "Uue seadme sisselogimise kaitse muudatused salvestatud"
   },
   "sessionsDeauthorized": {
     "message": "Kõikidest seadmetest on välja logitud"
   },
   "accountIsOwnedMessage": {
-    "message": "This account is owned by $ORGANIZATIONNAME$",
+    "message": "Selle konto omanik on $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -2159,8 +2159,20 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Kaheastmelise kinnitamine aktiveerimine võib luua olukorra, kus sul on võimatu oma Bitwardeni kontosse sisse logida. Näiteks kui kaotad oma nutiseadme. Taastamise kood võimaldab aga kontole ligi pääseda ka olukorras, kus kaheastmelist kinnitamist ei ole võimalik läbi viia. Sellistel juhtudel ei saa ka Bitwardeni klienditugi sinu kontole ligipääsu taastada. Selle tõttu soovitame taastekoodi välja printida ja seda turvalises kohas hoida."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
-    "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
+    "message": "Sinu ühekordseid taastamise koode saab kasutada selleks, et lülitada kahe-astmeline sisselogimine välja juhul, kui sa oled kaotanud juurdepääsu oma kahe-astmelise sisselogimise viisidele. Bitwarden soovitab sul kirjutada üles taastamise koodid ja hoiustada neid ohutus kohas."
   },
   "viewRecoveryCode": {
     "message": "Vaata taastamise koodi"
@@ -2201,16 +2213,16 @@
     "message": "Haldus"
   },
   "manageCollection": {
-    "message": "Manage collection"
+    "message": "Halda kogumikku"
   },
   "viewItems": {
-    "message": "View items"
+    "message": "Vaata kirjeid"
   },
   "viewItemsHidePass": {
     "message": "View items, hidden passwords"
   },
   "editItems": {
-    "message": "Edit items"
+    "message": "Muuda kirjeid"
   },
   "editItemsHidePass": {
     "message": "Edit items, hidden passwords"
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Keela"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Tühistada ligipääsu luba"
   },
@@ -2414,7 +2429,7 @@
     "message": "Turvavõtme lugemisel tekkis tõrge. Proovi uuesti."
   },
   "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
+    "message": "Platvormide piirangute tõttu ei saa WebAuthn'i kõikide Bitwardeni rakendustega kasutada. Võiksid seada sisse teise kahe-astmelise kinnitamise meetodi juhuks, kui WebAuthn'i ei saa kasutada."
   },
   "twoFactorRecoveryYourCode": {
     "message": "Bitwardeni kaheastmelise logimise varukood"
@@ -2540,7 +2555,7 @@
     "message": "Avastatud on nõrgad paroolid"
   },
   "weakPasswordsFoundReportDesc": {
-    "message": "Me leidsime $COUNT$ eset sinu $VAULT$ nõrkade paroolidega. Sa peaksid vahetama need tugevamate vastu.",
+    "message": "Me leidsime $COUNT$ eset sinu $VAULT$st nõrkade paroolidega. Sa peaksid vahetama need tugevamate vastu.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2556,7 +2571,7 @@
     "message": "Hoidlas olevatest kirjetest ei leitud nõrku paroole."
   },
   "weakness": {
-    "message": "Weakness"
+    "message": "Nõrkusaste"
   },
   "reusedPasswordsReport": {
     "message": "Korduvate paroolide raport"
@@ -4094,7 +4109,7 @@
     "message": "Review login request"
   },
   "freeTrialEndPromptCount": {
-    "message": "Your free trial ends in $COUNT$ days.",
+    "message": "Sinu tasuta prooviaeg lõppeb $COUNT$ päeva pärast.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4103,7 +4118,7 @@
     }
   },
   "freeTrialEndPromptMultipleDays": {
-    "message": "$ORGANIZATION$, your free trial ends in $COUNT$ days.",
+    "message": "$ORGANIZATION$, sinu tasuta prooviaeg lõppeb $COUNT$ päeva pärast.",
     "placeholders": {
       "count": {
         "content": "$2",
@@ -4116,7 +4131,7 @@
     }
   },
   "freeTrialEndPromptTomorrow": {
-    "message": "$ORGANIZATION$, your free trial ends tomorrow.",
+    "message": "$ORGANIZATION$, sinu tasuta prooviaeg lõppeb homme.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4125,10 +4140,10 @@
     }
   },
   "freeTrialEndPromptTomorrowNoOrgName": {
-    "message": "Your free trial ends tomorrow."
+    "message": "Sinu tasuta prooviaeg lõppeb homme."
   },
   "freeTrialEndPromptToday": {
-    "message": "$ORGANIZATION$, your free trial ends today.",
+    "message": "$ORGANIZATION$, sinu tasuta prooviaeg lõppeb homme.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4137,16 +4152,16 @@
     }
   },
   "freeTrialEndingTodayWithoutOrgName": {
-    "message": "Your free trial ends today."
+    "message": "Sinu tasuta prooviaeg lõppeb täna."
   },
   "clickHereToAddPaymentMethod": {
-    "message": "Click here to add a payment method."
+    "message": "Maksemeetodi lisamiseks vajuta siia."
   },
   "joinOrganization": {
     "message": "Liitu organisatsiooniga"
   },
   "joinOrganizationName": {
-    "message": "Join $ORGANIZATIONNAME$",
+    "message": "Liitu $ORGANIZATIONNAME$ organisatsiooniga",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -4188,7 +4203,7 @@
     "message": "Kui sa ei pääse oma kontole ühegi kaheastmeliste kinnitamise meetodi abiga ligi, saad selle välja lülitada. Selleks kasuta kaheastmelise kinnitamise tühistamise koodi."
   },
   "logInBelowUsingYourSingleUseRecoveryCode": {
-    "message": "Log in below using your single-use recovery code. This will turn off all two-step providers on your account."
+    "message": "Logi allpool sisse kasutades ühekordset taastamise koodi. See lülitab sinu kontol välja kõik kahe-astmelise kinnitamise meetodid."
   },
   "recoverAccountTwoStep": {
     "message": "Taasta kaheastmelise kinnitamise ligipääs"
@@ -4478,11 +4493,8 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
-    "message": "Edit $LABEL$",
+    "message": "Muuda $LABEL$ lahtrit",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4491,7 +4503,7 @@
     }
   },
   "reorderToggleButton": {
-    "message": "Reorder $LABEL$. Use arrow key to move item up or down.",
+    "message": "Paiguta $LABEL$ ümber. Kasuta nooli, et liigutada lahtrit üles või alla.",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4500,7 +4512,7 @@
     }
   },
   "reorderFieldUp": {
-    "message": "$LABEL$ moved up, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ üles liigutatud, $INDEX$. kohale $LENGTH$-st",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4517,7 +4529,7 @@
     }
   },
   "reorderFieldDown": {
-    "message": "$LABEL$ moved down, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ alla liigutatud, $INDEX$. kohale $LENGTH$-st",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Võti on uuendatud"
-  },
-  "updateEncryptionKey": {
-    "message": "Uuenda krüpteerimisvõtit"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Me muutsime krüpteerimise meetodit, et tagada parem turvalisus. Uuenda oma krüpteerimisvõtit sisestades enda ülemparool."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Pärast krüpteerimisvõtme uuendamist pead kõikides seadmetes, kus Bitwardeni rakendust kasutad, oma kontosse uuesti sisse logima (nt nutitelefonis ja brauseris). Välja- ja sisselogimise (mis ühtlasi laadib ka uue krüpteerimisvõtme) nurjumine võib tingida andmete riknemise. Üritame sinu seadmetest ise välja logida, aga see võib võtta natukene aega."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Tellimus"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Hädaolukorra ligipääsust keelduti"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "$USER$ parool on lähtestatud. Saad nüüd uue parooliga sisse logida.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Personaalne salvestamine"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "see kasutaja"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Üks või enam organisatsiooni eeskirja nõuavad, et ülemparool vastaks nendele nõudmistele:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Parool on edukalt lähtestatud!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Lisa"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Uuendas ülemparooli"
   },
   "updateMasterPassword": {
     "message": "Ülemparooli uuendamine"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Organisatsiooni administraator muutis hiljuti sinu ülemparooli. Hoidlale ligi pääsemiseks pead ülemparooli uuendama. Jätkates logitakse sind käimasolevast sessioonist välja, misjärel nõutakse uuesti sisselogimist. Teistes seadmetes olevad aktiivsed sessioonid jäävad aktiivseks kuni üheks tunniks."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Loo parool"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7286,16 +7337,16 @@
     "message": "Launch Duo"
   },
   "turnOn": {
-    "message": "Turn on"
+    "message": "Lülita sisse"
   },
   "on": {
-    "message": "On"
+    "message": "Sees"
   },
   "off": {
-    "message": "Off"
+    "message": "Väljas"
   },
   "members": {
-    "message": "Members"
+    "message": "Liikmed"
   },
   "reporting": {
     "message": "Reporting"
@@ -7316,46 +7367,46 @@
     "message": "Bright Blue"
   },
   "green": {
-    "message": "Green"
+    "message": "Roheline"
   },
   "orange": {
-    "message": "Orange"
+    "message": "Oranž"
   },
   "lavender": {
-    "message": "Lavender"
+    "message": "Lavendel"
   },
   "yellow": {
-    "message": "Yellow"
+    "message": "Kollane"
   },
   "indigo": {
     "message": "Indigo"
   },
   "teal": {
-    "message": "Teal"
+    "message": "Sinakasroheline"
   },
   "salmon": {
-    "message": "Salmon"
+    "message": "Lõhe"
   },
   "pink": {
-    "message": "Pink"
+    "message": "Roosa"
   },
   "customColor": {
-    "message": "Custom Color"
+    "message": "Kohandatud Värv"
   },
   "selectPlaceholder": {
-    "message": "-- Select --"
+    "message": "-- Vali --"
   },
   "multiSelectPlaceholder": {
-    "message": "-- Type to filter --"
+    "message": "-- Filtreerimiseks trüki siia --"
   },
   "multiSelectLoading": {
-    "message": "Retrieving options..."
+    "message": "Valikute hankimine..."
   },
   "multiSelectNotFound": {
-    "message": "No items found"
+    "message": "Ühtki kirjet ei leitud"
   },
   "multiSelectClearAll": {
-    "message": "Clear all"
+    "message": "Tühjenda kõik"
   },
   "toggleCharacterCount": {
     "message": "Toggle character count",
@@ -7366,14 +7417,14 @@
     "description": "'Character count' describes a feature that displays a number next to each character of the password."
   },
   "hide": {
-    "message": "Hide"
+    "message": "Peida"
   },
   "projects": {
-    "message": "Projects",
+    "message": "Projektid",
     "description": "Description for the Projects field."
   },
   "lastEdited": {
-    "message": "Last edited",
+    "message": "Viimati muudetud",
     "description": "The label for the date and time when a item was last edited."
   },
   "editSecret": {
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Trüki või vali mõni projekt või saladus",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -7870,7 +7921,7 @@
     }
   },
   "domainNameTh": {
-    "message": "Name"
+    "message": "Nimi"
   },
   "domainStatusTh": {
     "message": "Status"
@@ -7978,7 +8029,7 @@
     "message": "Switch products"
   },
   "freeOrgInvLimitReachedManageBilling": {
-    "message": "Free organizations may have up to $SEATCOUNT$ members. Upgrade to a paid plan to invite more members.",
+    "message": "Tasuta organisatsioonidel võib olla kuni $SEATCOUNT$ liiget. Hangi tasuline plaan, et kutsuda rohkem liikmeid.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -7987,7 +8038,7 @@
     }
   },
   "freeOrgInvLimitReachedNoManageBilling": {
-    "message": "Free organizations may have up to $SEATCOUNT$ members. Contact your organization owner to upgrade.",
+    "message": "Tasuta organisatsioonidel võib olla kuni $SEATCOUNT$ liiget. Selle arvu tõstmiseks kontakteeru selle organisatsiooni omanikuga.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/eu/messages.json b/apps/web/src/locales/eu/messages.json
index b587e7f1611..546ffae4aea 100644
--- a/apps/web/src/locales/eu/messages.json
+++ b/apps/web/src/locales/eu/messages.json
@@ -547,12 +547,6 @@
     "message": "Hondoa jo",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Sortu pasahitza"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Egiaztatu pasahitza konprometituta dagoen."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Ni"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Kutxa Gotorra"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Jarraitzeak uneko saioa itxiko du eta berriro saioa hasteko eskatuko zaizu. Beste gailu batzuetako saio aktiboek ordubete iraun dezakete aktibo."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Emaila aldatua"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Bi urratseko saio hasiera gaitzeak betirako blokea dezake Bitwarden kontura sartzea. Berreskuratze-kode baten bidez, zure kontura sar zaitezke, bi urratseko saio hasierako hornitzailea erabili ezin baduzu (adb. gailua galtzen baduzu). Bitwarden-ek ezingo dizu lagundu zure konturako sarbidea galtzen baduzu. Berreskuratze-kodea idatzi edo inprimatzea eta leku seguruan edukitzea gomendatzen dugu."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Desgaitu"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Sarbidea ezeztatu"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Gakoa eguneratua"
-  },
-  "updateEncryptionKey": {
-    "message": "Eguneratu zifratze-gakoa"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Zifratze-gakoa eguneratu ondoren, saioa hasi eta erabiltzen ari zaren Bitwarden aplikazio guztietara itzuli behar duzu (adibidez, aplikazio mugikorra edo nabigatzailearen gehigarriak). Saioa berriro hasteak huts egiten badu (zifratze-gako berria deskargatzea dakar) datuen korrupzioa ekar lezake. Automatikoki saioa ixten saiatuko gara, baina atzeratu egin daiteke."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Harpidetza"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Larrialdiko sarbidea ukatua"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "$USER$-(r)entzat pasahitza berrezartzea. Orain, saioa abiaraz dezakezu pasahitz berria erabiliz.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Ezabatu kutxa gotor pertsonala"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "erabiltzaile hau"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Erakundeko politika batek edo gehiagok pasahitz nagusia behar dute baldintza hauek betetzeko:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Pasahitza berrezarria!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Gehitu"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Pasahitz nagusia eguneratuta"
   },
   "updateMasterPassword": {
     "message": "Pasahitz nagusia eguneratu"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Zure erakundeko administratzaile batek pasahitz nagusia aldatu berri du. Kutxa gotorrera sartzeko, pasahitz nagusia orain eguneratu behar duzu. Beraz, oraingo saiotik atera eta saioa hasteko eskatuko zaizu. Beste gailu batzuetako saio aktiboek ordubete iraun dezakete aktibo."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Sortu pasahitza"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Idatzi edo aukeratu proiektu edo sekretuak",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/fa/messages.json b/apps/web/src/locales/fa/messages.json
index a7c07192acc..a4072ddca87 100644
--- a/apps/web/src/locales/fa/messages.json
+++ b/apps/web/src/locales/fa/messages.json
@@ -24,7 +24,7 @@
     "message": "کلمات عبور در معرض خطر (ضعیف، افشا شده یا تکراری) را در برنامه‌ها بررسی کنید. برنامه‌های حیاتی خود را انتخاب کنید تا اقدامات امنیتی را برای کاربران‌تان اولویت‌بندی کنید و به کلمات عبور در معرض خطر رسیدگی کنید."
   },
   "dataLastUpdated": {
-    "message": "آخرین به‌روزرسانی داده‌ها: \\$DATE\\$",
+    "message": "آخرین به‌روزرسانی داده‌ها: $DATE$",
     "placeholders": {
       "date": {
         "content": "$1",
@@ -66,7 +66,7 @@
     }
   },
   "notifiedMembersWithCount": {
-    "message": "Notified members ($COUNT$)",
+    "message": "اعضا مطلع شدند ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -75,7 +75,7 @@
     }
   },
   "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
+    "message": "هیچ برنامه‌ای در $ORG NAME$ یافت نشد",
     "placeholders": {
       "org name": {
         "content": "$1",
@@ -84,25 +84,25 @@
     }
   },
   "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+    "message": "با ذخیره‌ی اطلاعات ورود توسط کاربران، برنامه‌ها در اینجا نمایش داده می‌شوند و کلمات عبور در معرض خطر مشخص می‌گردند. برنامه‌های حیاتی را علامت‌گذاری کرده و کاربران را برای به‌روزرسانی کلمات عبور مطلع کنید."
   },
   "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+    "message": "شما هیچ برنامه‌ای را به عنوان حیاتی علامت‌گذاری نکرده‌اید"
   },
   "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+    "message": "مهم‌ترین برنامه‌های خود را انتخاب کنید تا کلمات عبور در معرض خطر شناسایی شوند و کاربران برای تغییر آن‌ها مطلع شوند."
   },
   "markCriticalApps": {
-    "message": "Mark critical apps"
+    "message": "برنامه‌های حیاتی را علامت‌گذاری کنید"
   },
   "markAppAsCritical": {
-    "message": "Mark app as critical"
+    "message": "برنامه را به عنوان حیاتی علامت‌گذاری کنید"
   },
   "applicationsMarkedAsCriticalSuccess": {
-    "message": "Applications marked as critical"
+    "message": "برنامه‌های علامت گذاری شده به عنوان حیاتی"
   },
   "application": {
-    "message": "اپلیکیشن"
+    "message": "برنامه"
   },
   "atRiskPasswords": {
     "message": "کلمات عبور در معرض خطر"
@@ -111,16 +111,16 @@
     "message": "درخواست تغییر کلمه عبور"
   },
   "totalPasswords": {
-    "message": "Total passwords"
+    "message": "تمام کلمات عبور"
   },
   "searchApps": {
-    "message": "Search applications"
+    "message": "برنامه‌ها را جستجو کنید"
   },
   "atRiskMembers": {
-    "message": "At-risk members"
+    "message": "اعضای در معرض خطر"
   },
   "atRiskMembersWithCount": {
-    "message": "At-risk members ($COUNT$)",
+    "message": "اعضای در معرض خطر ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -129,7 +129,7 @@
     }
   },
   "atRiskApplicationsWithCount": {
-    "message": "At-risk applications ($COUNT$)",
+    "message": "برنامه‌های در معرض خطر ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -138,19 +138,19 @@
     }
   },
   "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+    "message": "این اعضا با کلمات عبور ضعیف، افشا شده یا تکراری وارد برنامه‌ها می‌شوند."
   },
   "atRiskMembersDescriptionNone": {
-    "message": "These are no members logging into applications with weak, exposed, or reused passwords."
+    "message": "هیچ عضوی با کلمات عبور ضعیف، افشا شده یا تکراری وارد برنامه‌ها نمی‌شود."
   },
   "atRiskApplicationsDescription": {
-    "message": "These applications have weak, exposed, or reused passwords."
+    "message": "این برنامه‌ها دارای کلمات عبور ضعیف، افشا شده یا تکراری هستند."
   },
   "atRiskApplicationsDescriptionNone": {
-    "message": "These are no applications with weak, exposed, or reused passwords."
+    "message": "هیچ برنامه‌ای با کلمات عبور ضعیف، افشا شده یا تکراری وجود ندارد."
   },
   "atRiskMembersDescriptionWithApp": {
-    "message": "These members are logging into $APPNAME$ with weak, exposed, or reused passwords.",
+    "message": "این اعضا با کلمات عبور ضعیف، افشا شده یا تکراری وارد برنامه‌ی $APPNAME$ می‌شوند.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -159,7 +159,7 @@
     }
   },
   "atRiskMembersDescriptionWithAppNone": {
-    "message": "There are no at risk members for $APPNAME$.",
+    "message": "هیچ عضو در معرض خطری برای $APPNAME$ وجود ندارد.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -168,19 +168,19 @@
     }
   },
   "totalMembers": {
-    "message": "Total members"
+    "message": "کل اعضا"
   },
   "atRiskApplications": {
-    "message": "At-risk applications"
+    "message": "برنامه‌های در معرض خطر"
   },
   "totalApplications": {
-    "message": "Total applications"
+    "message": "کل برنامه‌ها"
   },
   "unmarkAsCriticalApp": {
-    "message": "Unmark as critical app"
+    "message": "لغو علامت حیاتی بودن برنامه"
   },
   "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+    "message": "برنامه حیاتی با موفقیت لغو علامت شد"
   },
   "whatTypeOfItem": {
     "message": "این چه نوع موردی است؟"
@@ -247,7 +247,7 @@
     "message": "جزئیات کارت"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "$BRAND$ جزئیات",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -256,19 +256,19 @@
     }
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "تاریخچه مورد"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "کلید احراز هویت"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "گزینه‌های پر کردن خودکار"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "وب‌سایت (نشانی اینترنتی)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "وب‌سایت (نشانی اینترنتی) $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -278,16 +278,16 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "وب‌سایت اضافه شد"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "افزودن وب‌سایت"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "حذف وب‌سایت"
   },
   "defaultLabel": {
-    "message": "Default ($VALUE$)",
+    "message": "پیش‌فرض ($VALUE$)",
     "description": "A label that indicates the default value for a field with the current default value in parentheses.",
     "placeholders": {
       "value": {
@@ -297,7 +297,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "Show match detection $WEBSITE$",
+    "message": "نمایش تطبیق سایت $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -306,7 +306,7 @@
     }
   },
   "hideMatchDetection": {
-    "message": "Hide match detection $WEBSITE$",
+    "message": "مخفی کردن تطبیق سایت $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -315,7 +315,7 @@
     }
   },
   "autoFillOnPageLoad": {
-    "message": "Autofill on page load?"
+    "message": "پر کردن خودکار هنگام بارگذاری صفحه؟"
   },
   "number": {
     "message": "شماره"
@@ -330,7 +330,7 @@
     "message": "کد امنیتی (cvv)"
   },
   "securityCodeSlashCVV": {
-    "message": "Security code / CVV"
+    "message": "کد امنیتی / CVV"
   },
   "identityName": {
     "message": "نام هویت"
@@ -408,10 +408,10 @@
     "message": "دکتر"
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "تاریخ کارت منقضی شده است"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "اگر تمدید کرده‌اید، اطلاعات کارت را به‌روزرسانی کنید"
   },
   "expirationMonth": {
     "message": "ماه انقضاء"
@@ -423,16 +423,16 @@
     "message": "کلید احراز هویت (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "تأیید دو مرحله‌ای را بدون دردسر کنید"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden می‌تواند کدهای تأیید دو مرحله‌ای را ذخیره و پر کند. کلید را کپی کرده و در این فیلد قرار دهید."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden می‌تواند کدهای تأیید دو مرحله‌ای را ذخیره و پر کند. برای اسکن کد QR احراز هویت کننده این وب‌سایت، روی آیکون دوربین کلیک کنید یا کلید را کپی کرده و در این فیلد قرار دهید."
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "درباره احراز هویت کننده‌ها بیشتر بدانید"
   },
   "folder": {
     "message": "پوشه"
@@ -483,7 +483,7 @@
     "message": "ويرايش پوشه"
   },
   "editWithName": {
-    "message": "Edit $ITEM$: $NAME$",
+    "message": "ویرایش $ITEM$: $NAME$",
     "placeholders": {
       "item": {
         "content": "$1",
@@ -499,13 +499,13 @@
     "message": "پوشه جدید"
   },
   "folderName": {
-    "message": "Folder name"
+    "message": "نام پوشه"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "برای تو در تو کردن یک پوشه، نام پوشه والد را وارد کرده و سپس یک “/” اضافه کنید. مثال: Social/Forums"
   },
   "deleteFolderPermanently": {
-    "message": "Are you sure you want to permanently delete this folder?"
+    "message": "مطمئنید می‌خواهید این پوشه را برای همیشه پاک کنید؟"
   },
   "baseDomain": {
     "message": "دامنه پایه",
@@ -547,12 +547,6 @@
     "message": "باز و بسته کردن",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "تولید کلمه عبور"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "بررسی کنید که آیا کلمه عبور افشا شده است."
   },
@@ -654,7 +648,7 @@
     "message": "یادداشت امن"
   },
   "typeSshKey": {
-    "message": "SSH key"
+    "message": "کلید SSH"
   },
   "typeLoginPlural": {
     "message": "ورودها"
@@ -870,6 +864,9 @@
   "me": {
     "message": "من"
   },
+  "myItems": {
+    "message": "موارد من"
+  },
   "myVault": {
     "message": "گاوصندوق من"
   },
@@ -1013,7 +1010,7 @@
     "message": "خارج شد"
   },
   "loggedOutDesc": {
-    "message": "شما از اکانت خود خارج شده‌اید."
+    "message": "شما از حساب خود خارج شده‌اید."
   },
   "loginExpired": {
     "message": "نشست ورود شما منقضی شده است."
@@ -1064,13 +1061,13 @@
     "message": "با کلمه عبور اصلی وارد شوید"
   },
   "readingPasskeyLoading": {
-    "message": "خواندن کلید عبور..."
+    "message": "در حال خواندن کلید عبور..."
   },
   "readingPasskeyLoadingInfo": {
     "message": "این پنجره را باز نگه دارید و دستورهای مرورگر خود را دنبال کنید."
   },
   "useADifferentLogInMethod": {
-    "message": "Use a different log in method"
+    "message": "از روش ورود متفاوتی استفاده کنید"
   },
   "logInWithPasskey": {
     "message": "با کلید عبور وارد شوید"
@@ -1082,10 +1079,10 @@
     "message": "خوش آمدید"
   },
   "invalidPasskeyPleaseTryAgain": {
-    "message": "Invalid Passkey. Please try again."
+    "message": "کلید عبور نامعتبر است. لطفاً دوباره تلاش کنید."
   },
   "twoFactorForPasskeysNotSupportedOnClientUpdateToLogIn": {
-    "message": "2FA for passkeys is not supported. Update the app to log in."
+    "message": "احراز هویت دو مرحله‌ای برای کلیدهای عبور پشتیبانی نمی‌شود. برای ورود، برنامه را به‌روزرسانی کنید."
   },
   "loginWithPasskeyInfo": {
     "message": "از یک کلمه عبور ایجاد شده استفاده کنید که به طور خودکار بدون کلمه عبور شما را وارد می‌کند. بیومتریک‌ها، مانند تشخیص چهره یا اثر انگشت، یا سایر روش‌های امنیتی FIDO2 هویت شما را تأیید می‌کنند."
@@ -1115,22 +1112,22 @@
     "message": "کلید عبور خود را برای کمک به شناسایی آن نام ببرید."
   },
   "useForVaultEncryption": {
-    "message": "Use for vault encryption"
+    "message": "برای رمزگذاری گاوصندوق استفاده شود"
   },
   "useForVaultEncryptionInfo": {
-    "message": "Log in and unlock on supported devices without your master password. Follow the prompts from your browser to finalize setup."
+    "message": "بدون نیاز به کلمه عبور اصلی، در دستگاه‌های پشتیبانی‌شده وارد شوید و قفل را باز کنید. برای تکمیل تنظیمات، دستورالعمل‌های مرورگر خود را دنبال کنید."
   },
   "useForVaultEncryptionErrorReadingPasskey": {
-    "message": "Error reading passkey. Try again or uncheck this option."
+    "message": "خطا در خواندن کلید عبور. دوباره تلاش کنید یا این گزینه را غیرفعال کنید."
   },
   "encryptionNotSupported": {
     "message": "رمزگذاری پشتیبانی نمی‌شود"
   },
   "enablePasskeyEncryption": {
-    "message": "Set up encryption"
+    "message": "راه‌اندازی رمزگذاری"
   },
   "usedForEncryption": {
-    "message": "Used for encryption"
+    "message": "برای رمزنگاری استفاده شد"
   },
   "loginWithPasskeyEnabled": {
     "message": "با فعال بودن کلید ورود وارد شوید"
@@ -1187,7 +1184,7 @@
     "message": "کدی را که به ایمیل شما ارسال شده وارد کنید"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "کد سامانه تأیید کننده را وارد نمایید"
+    "message": "کد را از برنامه احراز هویت خود وارد کنید"
   },
   "pressYourYubiKeyToAuthenticate": {
     "message": "برای احراز هویت، کلید YubiKey خود را فشار دهید"
@@ -1199,25 +1196,25 @@
     "message": "نشست احراز هویت منقضی شد. لطفاً فرایند ورود را دوباره شروع کنید."
   },
   "verifyYourIdentity": {
-    "message": "Verify your Identity"
+    "message": "هویت خود را تأیید کنید"
   },
   "weDontRecognizeThisDevice": {
-    "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
+    "message": "ما این دستگاه را نمی‌شناسیم. برای تأیید هویت خود، کدی را که به ایمیلتان ارسال شده وارد کنید."
   },
   "continueLoggingIn": {
-    "message": "Continue logging in"
+    "message": "ادامه ورود"
   },
   "whatIsADevice": {
-    "message": "What is a device?"
+    "message": "دستگاه چیست؟"
   },
   "aDeviceIs": {
-    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+    "message": "دستگاه، یک نصب منحصربه‌فرد از اپلیکیشن Bitwarden است که در آن وارد حساب کاربری خود شده‌اید. نصب مجدد، پاک کردن داده‌های برنامه یا پاک کردن کوکی‌ها ممکن است باعث شود یک دستگاه چند بار ظاهر شود."
   },
   "logInInitiated": {
     "message": "ورود به سیستم آغاز شد"
   },
   "logInRequestSent": {
-    "message": "Request sent"
+    "message": "درخواست ارسال شد"
   },
   "submit": {
     "message": "ثبت"
@@ -1250,13 +1247,13 @@
     "message": "یادآور کلمه عبور اصلی (اختیاری)"
   },
   "newMasterPassHint": {
-    "message": "New master password hint (optional)"
+    "message": "راهنمای کلمه عبور اصلی جدید (اختیاری)"
   },
   "masterPassHintLabel": {
     "message": "یادآور کلمه عبور اصلی"
   },
   "masterPassHintText": {
-    "message": "If you forget your password, the password hint can be sent to your email. $CURRENT$/$MAXIMUM$ character maximum.",
+    "message": "اگر کلمه عبور خود را فراموش کنید، یادآور کلمه عبور می‌تواند به ایمیل شما ارسال شود. حداکثر $CURRENT$/$MAXIMUM$ کاراکتر.",
     "placeholders": {
       "current": {
         "content": "$1",
@@ -1272,16 +1269,16 @@
     "message": "تنظیمات"
   },
   "accountEmail": {
-    "message": "Account email"
+    "message": "حساب ایمیل"
   },
   "requestHint": {
-    "message": "Request hint"
+    "message": "درخواست راهنمایی"
   },
   "requestPasswordHint": {
-    "message": "Request password hint"
+    "message": "درخواست یادآور کلمه عبور"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Enter your account email address and your password hint will be sent to you"
+    "message": "نشانی ایمیل حساب کاربری خود را وارد کنید تا راهنمای کلمه عبور برای شما ارسال شود"
   },
   "getMasterPasswordHint": {
     "message": "دریافت یادآور کلمه عبور اصلی"
@@ -1315,10 +1312,10 @@
     "message": "حساب کاربری جدید شما ساخته شد! حالا می‌توانید وارد شوید."
   },
   "newAccountCreated2": {
-    "message": "Your new account has been created!"
+    "message": "حساب کاربری جدید شما ایجاد شده است!"
   },
   "youHaveBeenLoggedIn": {
-    "message": "You have been logged in!"
+    "message": "شما با موفقیت وارد شدید!"
   },
   "trialAccountCreated": {
     "message": "حساب کاربری با موفقیت ساخته شد."
@@ -1336,10 +1333,10 @@
     "message": "نشانی ایمیل"
   },
   "yourVaultIsLockedV2": {
-    "message": "Your vault is locked"
+    "message": "گاوصندوق‌تان قفل شد"
   },
   "yourAccountIsLocked": {
-    "message": "Your account is locked"
+    "message": "حساب کاربری شما قفل شده است"
   },
   "uuid": {
     "message": "UUID"
@@ -1376,7 +1373,7 @@
     "message": "شما اجازه مشاهده همه موارد در این مجموعه را ندارید."
   },
   "youDoNotHavePermissions": {
-    "message": "You do not have permissions to this collection"
+    "message": "شما اجازه دسترسی به این مجموعه را ندارید"
   },
   "noCollectionsInList": {
     "message": "هیچ مجموعه ای برای لیست کردن وجود ندارد."
@@ -1403,13 +1400,13 @@
     "message": "یک اعلان به دستگاه شما ارسال شده است."
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the "
+    "message": "قفل Bitwarden را روی دستگاه خود باز کنید یا روی "
   },
   "areYouTryingToAccessYourAccount": {
-    "message": "Are you trying to access your account?"
+    "message": "آیا در تلاش برای دسترسی به حساب کاربری خود هستید؟"
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "تلاش برای دسترسی به سیستم توسط $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1418,22 +1415,22 @@
     }
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "تأیید دسترسی"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "دسترسی را رد کن"
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "برنامه وب"
   },
   "notificationSentDevicePart2": {
-    "message": "Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "اطمینان حاصل کنید که عبارت اثر انگشت با عبارت زیر مطابقت دارد قبل از تأیید."
   },
   "notificationSentDeviceComplete": {
-    "message": "Unlock Bitwarden on your device. Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Bitwarden را در دستگاه خود باز کنید. پیش از تأیید، اطمینان حاصل کنید که عبارت اثر انگشت با عبارت زیر مطابقت دارد."
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "A notification was sent to your device"
+    "message": "یک اعلان به دستگاه شما ارسال شده است"
   },
   "versionNumber": {
     "message": "نسخه $VERSION_NUMBER$",
@@ -1454,14 +1451,14 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "در این دستگاه به مدت ۳۰ روز دوباره نپرس"
   },
   "selectAnotherMethod": {
-    "message": "Select another method",
+    "message": "انتخاب روش دیگر",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use your recovery code"
+    "message": "از کد بازیابی‌تان استفاده کنید"
   },
   "insertU2f": {
     "message": "کلید امنیتی خود را وارد پورت USB رایانه کنید، اگر دکمه ای دارد آن را بفشارید."
@@ -1479,7 +1476,7 @@
     "message": "گزینه‌های ورود دو مرحله‌ای"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "انتخاب ورود دو مرحله‌ای"
   },
   "recoveryCodeDesc": {
     "message": "دسترسی به تمامی ارائه‌دهندگان دو مرحله‌ای را از دست داده‌اید؟ از کد بازیابی خود برای غیرفعال‌سازی ارائه‌دهندگان دو مرحله‌ای از حسابتان استفاده کنید."
@@ -1491,17 +1488,17 @@
     "message": "برنامه احراز هویت"
   },
   "authenticatorAppDescV2": {
-    "message": "Enter a code generated by an authenticator app like Bitwarden Authenticator.",
+    "message": "کدی را وارد کنید که توسط یک برنامه احراز هویت مانند Bitwarden Authenticator تولید شده است.",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
-    "message": "Yubico OTP security key"
+    "message": "کلید امنیت Yubico OTP"
   },
   "yubiKeyDesc": {
     "message": "از یک YubiKey برای دسترسی به حسابتان استفاده کنید. با دستگاه های YubiKey سری 4، سری 5 و NEO کار می‌کند."
   },
   "duoDescV2": {
-    "message": "Enter a code generated by Duo Security.",
+    "message": "کدی را وارد کنید که توسط Duo Security تولید شده است.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
@@ -1515,22 +1512,22 @@
     "message": "کلید امنیتی FIDO U2F"
   },
   "webAuthnTitle": {
-    "message": "FIDO2 WebAuthn"
+    "message": "کلید عبور"
   },
   "webAuthnDesc": {
-    "message": "برای دسترسی به حساب خود از هر کلید امنیتی فعال شده WebAuthn استفاده کنید."
+    "message": "برای دسترسی به حساب کاربری خود از هر کلید امنیتی فعال شده WebAuthn استفاده کنید."
   },
   "webAuthnMigrated": {
     "message": "(مهاجرت از FIDO)"
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "گشودن در زبانهٔ جدید"
   },
   "emailTitle": {
     "message": "ایمیل"
   },
   "emailDescV2": {
-    "message": "Enter a code sent to your email."
+    "message": "کدی را که به ایمیل شما ارسال شده وارد کنید."
   },
   "continue": {
     "message": "ادامه"
@@ -1569,7 +1566,7 @@
     "message": "آیا اطمینان دارید که می‌خواهید ادامه دهید؟"
   },
   "moveSelectedItemsDesc": {
-    "message": "Choose a folder that you would like to add the $COUNT$ selected item(s) to.",
+    "message": "پوشه ای را انتخاب کنید که می‌خواهید $COUNT$ مورد انتخاب شده را به آن اضافه کنید.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1587,10 +1584,10 @@
     "message": "کپی UUID"
   },
   "errorRefreshingAccessToken": {
-    "message": "Access Token Refresh Error"
+    "message": "خطای به‌روزرسانی توکن دسترسی"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "No refresh token or API keys found. Please try logging out and logging back in."
+    "message": "هیچ توکن به‌روزرسانی یا کلید API یافت نشد. لطفاً از حساب کاربری خود خارج شده و دوباره وارد شوید."
   },
   "warning": {
     "message": "هشدار"
@@ -1617,7 +1614,7 @@
     "message": "برون ریزی"
   },
   "exportFrom": {
-    "message": "Export from"
+    "message": "برون ریزی از"
   },
   "exportVault": {
     "message": "برون ریزی گاوصندوق"
@@ -1691,14 +1688,14 @@
     "description": "deprecated. Use avoidAmbiguous instead."
   },
   "avoidAmbiguous": {
-    "message": "Avoid ambiguous characters",
+    "message": "از کاراکترهای مبهم خودداری کن",
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "length": {
     "message": "طول"
   },
   "passwordMinLength": {
-    "message": "Minimum password length"
+    "message": "حداقل طول کلمه عبور"
   },
   "uppercase": {
     "message": "حروف بزرگ (A-Z)",
@@ -1729,7 +1726,7 @@
     "message": "شامل عدد"
   },
   "generatorPolicyInEffect": {
-    "message": "Enterprise policy requirements have been applied to your generator options.",
+    "message": "نیازمندی‌های سیاست سازمانی بر گزینه‌های تولید کننده شما اعمال شده‌اند.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "passwordHistory": {
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "ادامه دادن، شما را از نشست فعلی خود خارج می‌کند و باید دوباره وارد سیستم شوید. جلسات فعال در دستگاه‌های دیگر ممکن است تا یک ساعت فعال بمانند."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "ایمیل ذخیره شد"
   },
@@ -1876,31 +1876,31 @@
     "message": "ادامه دادن همچنین شما را از نشست فعلی خود خارج می‌کند و باید دوباره وارد سیستم شوید. در صورت راه اندازی مجدداً از شما خواسته می‌شود تا دوباره به سیستم دو مرحله ای بپردازید. جلسات فعال در دستگاه‌های دیگر ممکن است تا یک ساعت فعال بمانند."
   },
   "newDeviceLoginProtection": {
-    "message": "New device login"
+    "message": "ورود از دستگاه جدید"
   },
   "turnOffNewDeviceLoginProtection": {
-    "message": "Turn off new device login protection"
+    "message": "محافظت از ورود دستگاه جدید را غیرفعال کنید"
   },
   "turnOnNewDeviceLoginProtection": {
-    "message": "Turn on new device login protection"
+    "message": "محافظت از ورود دستگاه جدید را فعال کنید"
   },
   "turnOffNewDeviceLoginProtectionModalDesc": {
-    "message": "Proceed below to turn off the verification emails bitwarden sends when you login from a new device."
+    "message": "برای غیرفعال‌سازی ایمیل‌های تأییدیه‌ای که Bitwarden هنگام ورود از دستگاه جدید ارسال می‌کند، از بخش زیر ادامه دهید."
   },
   "turnOnNewDeviceLoginProtectionModalDesc": {
-    "message": "Proceed below to have bitwarden send you verification emails when you login from a new device."
+    "message": "برای فعال‌سازی ارسال ایمیل‌های تأیید هنگام ورود از دستگاه جدید توسط Bitwarden، از بخش زیر ادامه دهید."
   },
   "turnOffNewDeviceLoginProtectionWarning": {
-    "message": "With new device login protection turned off, anyone with your master password can access your account from any device. To protect your account without verification emails, set up two-step login."
+    "message": "با غیرفعال بودن محافظت از ورود دستگاه جدید، هر کسی که کلمه عبور اصلی شما را داشته باشد می‌تواند از هر دستگاهی به حسابتان دسترسی پیدا کند. برای محافظت از حساب کاربری بدون استفاده از ایمیل‌های تأیید، ورود دو مرحله‌ای را فعال کنید."
   },
   "accountNewDeviceLoginProtectionSaved": {
-    "message": "New device login protection changes saved"
+    "message": "تغییرات مربوط به محافظت ورود دستگاه جدید ذخیره شد"
   },
   "sessionsDeauthorized": {
     "message": "همه نشست‌ها غیرمجاز است"
   },
   "accountIsOwnedMessage": {
-    "message": "This account is owned by $ORGANIZATIONNAME$",
+    "message": "این حساب کاربری متعلق به $ORGANIZATIONNAME$ است",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -1945,7 +1945,7 @@
     "message": "حساب شما بسته شد و تمام داده های مرتبط حذف شده است."
   },
   "deleteOrganizationWarning": {
-    "message": "Deleting your organization is permanent. It cannot be undone."
+    "message": "حذف سازمان شما دائمی است و قابل بازگشت نیست."
   },
   "myAccount": {
     "message": "حساب من"
@@ -1957,7 +1957,7 @@
     "message": "درون ریزی داده"
   },
   "onboardingImportDataDetailsPartOne": {
-    "message": "If you don't have any data to import, you can create a ",
+    "message": "اگر داده‌ای برای وارد کردن ندارید، می‌توانید یک ",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsLink": {
@@ -1969,11 +1969,11 @@
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new login instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsPartTwoNoOrgs": {
-    "message": " instead.",
+    "message": " به جای آن ایجاد کنید.",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead."
   },
   "onboardingImportDataDetailsPartTwoWithOrgs": {
-    "message": " instead. You may need to wait until your administrator confirms your organization membership.",
+    "message": " به جای آن. ممکن است لازم باشد تا مدیر شما عضویت‌تان در سازمان را تأیید کند.",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. You may need to wait until your administrator confirms your organization membership."
   },
   "importError": {
@@ -2019,7 +2019,7 @@
     "message": "مقصد"
   },
   "learnAboutImportOptions": {
-    "message": "درباره گزینه‌های برون ریزی خود بیاموزید"
+    "message": "درباره گزینه‌های درون ریزی خود بیاموزید"
   },
   "selectImportFolder": {
     "message": "یک پوشه انتخاب کنید"
@@ -2159,8 +2159,20 @@
   "twoStepLoginRecoveryWarning": {
     "message": "راه‌اندازی ورود دو مرحله‌ای می‌تواند برای همیشه حساب Bitwarden شما را قفل کند. یک کد بازیابی به شما امکان می‌دهد در صورتی که دیگر نمی‌توانید از ارائه‌دهنده‌ی ورود دو مرحله‌ای معمولی خود استفاده کنید (به عنوان مثال: دستگاه خود را گم می‌کنید) به حساب خود دسترسی پیدا کنید. اگر دسترسی به حساب خود را از دست بدهید، پشتیبانی Bitwarden نمی‌تواند به شما کمک کند. توصیه می‌کنیم کد بازیابی را یادداشت یا چاپ کنید و آن را در مکانی امن نگهداری کنید."
   },
+  "restrictedItemTypePolicy": {
+    "message": "حذف نوع مورد کارت"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "اجازه ندهید اعضا انواع مورد کارت ایجاد کنند. کارت‌های موجود به‌صورت خودکار حذف خواهند شد."
+  },
+  "restrictCardTypeImport": {
+    "message": "نمی‌توان انواع مورد کارت را درون ریزی کرد"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "یک سیاست تعیین شده توسط یک یا چند سازمان، مانع از درون ریزی کارت‌ها به گاوصندوق‌های شما شده است."
+  },
   "yourSingleUseRecoveryCode": {
-    "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
+    "message": "کد بازیابی یک‌بار مصرف شما می‌تواند در صورت از دست دادن دسترسی به سرویس ورود دو مرحله‌ای، برای غیرفعال کردن آن استفاده شود. Bitwarden توصیه می‌کند این کد را یادداشت کرده و در جای امنی نگهداری کنید."
   },
   "viewRecoveryCode": {
     "message": "نمایش کد بازیابی"
@@ -2207,17 +2219,20 @@
     "message": "مشاهده موارد"
   },
   "viewItemsHidePass": {
-    "message": "View items, hidden passwords"
+    "message": "مشاهده موارد، کلمه عبور مخفی"
   },
   "editItems": {
     "message": "ویرایش موارد"
   },
   "editItemsHidePass": {
-    "message": "Edit items, hidden passwords"
+    "message": "ویرایش موارد، کلمه عبور مخفی"
   },
   "disable": {
     "message": "خاموش کردن"
   },
+  "orgUserDetailsNotFound": {
+    "message": "جزئیات عضو پیدا نشد."
+  },
   "revokeAccess": {
     "message": "لغو دسترسی"
   },
@@ -2231,10 +2246,10 @@
     "message": "کلمه عبور اصلی خود را برای تغییر تنظیمات ورود به سیستم دو مرحله ای وارد کنید."
   },
   "twoStepAuthenticatorInstructionPrefix": {
-    "message": "Download an authenticator app such as"
+    "message": "یک برنامه احراز هویت بارگیری کنید مانند"
   },
   "twoStepAuthenticatorInstructionInfix1": {
-    "message": ","
+    "message": "،"
   },
   "twoStepAuthenticatorInstructionInfix2": {
     "message": "یا"
@@ -2243,7 +2258,7 @@
     "message": "."
   },
   "continueToExternalUrlTitle": {
-    "message": "Continue to $URL$?",
+    "message": "ادامه به $URL$؟",
     "placeholders": {
       "url": {
         "content": "$1",
@@ -2252,7 +2267,7 @@
     }
   },
   "continueToExternalUrlDesc": {
-    "message": "You are leaving Bitwarden and launching an external website in a new window."
+    "message": "شما در حال ترک Bitwarden و باز کردن یک وب‌سایت خارجی در پنجره جدید هستید."
   },
   "twoStepContinueToBitwardenUrlTitle": {
     "message": "به bitwarden.com ادامه می‌دهید؟"
@@ -2261,10 +2276,10 @@
     "message": "احراز هویت کننده Bitwarden به شما امکان می‌دهد کلیدهای احراز هویت را ذخیره کرده و کدهای TOTP را برای فرآیندهای تأیید دومرحله‌ای تولید کنید. برای اطلاعات بیشتر به وب‌سایت bitwarden.com مراجعه کنید."
   },
   "twoStepAuthenticatorScanCodeV2": {
-    "message": "Scan the QR code below with your authenticator app or enter the key."
+    "message": "کد QR زیر را با برنامه احراز هویت خود اسکن کنید یا کلید را وارد کنید."
   },
   "twoStepAuthenticatorQRCanvasError": {
-    "message": "Could not load QR code. Try again or use the key below."
+    "message": "بارگذاری کد QR امکان‌پذیر نیست. دوباره تلاش کنید یا از کلید زیر استفاده کنید."
   },
   "key": {
     "message": "کلید"
@@ -2354,7 +2369,7 @@
     "message": "شناسه کاربر"
   },
   "twoFactorDuoClientSecret": {
-    "message": "Client Secret"
+    "message": "رمز مخفی مشتری"
   },
   "twoFactorDuoApiHostname": {
     "message": "نام میزبان API"
@@ -2414,7 +2429,7 @@
     "message": "مشکلی در خواندن کلید امنیتی وجود داشت. دوباره امتحان کنید."
   },
   "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
+    "message": "به‌دلیل محدودیت‌های پلتفرم، WebAuthn در تمام برنامه‌های Bitwarden قابل استفاده نیست. بهتر است یک روش ورود دو مرحله‌ای دیگر نیز تنظیم کنید تا در مواقعی که WebAuthn قابل استفاده نیست، بتوانید به حساب کاربرب خود دسترسی داشته باشید."
   },
   "twoFactorRecoveryYourCode": {
     "message": "کد بازیابی ورود دو مرحله ای Bitwarden شما"
@@ -2447,7 +2462,7 @@
     "message": "وب‌سایت های نا امن پیدا شد"
   },
   "unsecuredWebsitesFoundReportDesc": {
-    "message": "We found $COUNT$ items in your $VAULT$ with unsecured URIs. You should change their URI scheme to https:// if the website allows it.",
+    "message": "ما $COUNT$ مورد در $VAULT$ شما یافتیم که نشانی اینترنتی آن‌ها نا امن است. در صورت امکان، باید طرح نشانی اینترنتی آن‌ها را به https:// تغییر دهید.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2472,7 +2487,7 @@
     "message": "ورود‌های بدون ورود دو مرحله ای یافت شد"
   },
   "inactive2faFoundReportDesc": {
-    "message": "We found $COUNT$ website(s) in your $VAULT$ that may not be configured with two-step login (according to 2fa.directory). To further protect these accounts, you should set up two-step login.",
+    "message": "ما $COUNT$ وب‌سایت در $VAULT$ شما یافتیم که ممکن است ورود دو مرحله‌ای برای آن‌ها فعال نباشد (بر اساس اطلاعات 2fa.directory). برای محافظت بیشتر از این حساب‌ها، بهتر است ورود دو مرحله‌ای را فعال کنید.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2500,7 +2515,7 @@
     "message": "کلمه‌های عبور افشا شده یافت شد"
   },
   "exposedPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ items in your $VAULT$ that have passwords that were exposed in known data breaches. You should change them to use a new password.",
+    "message": "ما $COUNT$ مورد در $VAULT$ شما یافتیم که کلمات عبور آن‌ها در رخنه‌های داده‌ای شناخته‌شده افشا شده‌اند. شما باید این کلمات عبور را به کلمات عبور جدیدی تغییر دهید.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2519,7 +2534,7 @@
     "message": "کلمه‌های عبور افشا شده را بررسی کنید"
   },
   "timesExposed": {
-    "message": "Times exposed"
+    "message": "تعداد دفعات افشا"
   },
   "exposedXTimes": {
     "message": "$COUNT$ بار در معرض نمایش قرار گرفت",
@@ -2540,7 +2555,7 @@
     "message": "کلمه‌های عبور ضعیف پیدا شد"
   },
   "weakPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ items in your $VAULT$ with passwords that are not strong. You should update them to use stronger passwords.",
+    "message": "ما $COUNT$ مورد در $VAULT$ شما یافتیم که کلمات عبور آن‌ها قوی نیستند. بهتر است آن‌ها را با کلمات عبور قوی‌تری به‌روزرسانی کنید.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2556,7 +2571,7 @@
     "message": "هیچ موردی در گاوصندوق شما کلمه‌ی عبور ضعیفی ندارد."
   },
   "weakness": {
-    "message": "Weakness"
+    "message": "ضعف"
   },
   "reusedPasswordsReport": {
     "message": "کلمه‌های عبور مجدد استفاده شده"
@@ -2568,7 +2583,7 @@
     "message": "کلمه‌های عبور مجدد استفاده شده یافت شد"
   },
   "reusedPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ passwords that are being reused in your $VAULT$. You should change them to a unique value.",
+    "message": "ما $COUNT$ کلمه عبور در $VAULT$ شما یافتیم که به‌صورت تکراری استفاده شده‌اند. بهتر است آن‌ها را به مقادیر منحصربه‌فردی تغییر دهید.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2584,7 +2599,7 @@
     "message": "هیچ ورودی در گاوصندوق شما کلمه عبوری ندارد که مجدداً مورد استفاده قرار می‌گیرد."
   },
   "timesReused": {
-    "message": "Times reused"
+    "message": "تعداد دفعات استفاده مجدد"
   },
   "reusedXTimes": {
     "message": "$COUNT$ بار دوباره استفاده شد",
@@ -2745,7 +2760,7 @@
     "message": "طرح خانواده Bitwarden."
   },
   "addons": {
-    "message": "افزودنی ها"
+    "message": "افزونه‌ها"
   },
   "premiumAccess": {
     "message": "دسترسی پرمیوم"
@@ -2884,7 +2899,7 @@
     "message": "دانلود مجوز"
   },
   "viewBillingToken": {
-    "message": "View Billing Token"
+    "message": "مشاهده توکن صورتحساب"
   },
   "updateLicense": {
     "message": "به‌روزرسانی مجوز"
@@ -2933,10 +2948,10 @@
     "message": "صورت حساب‌ها"
   },
   "noUnpaidInvoices": {
-    "message": "No unpaid invoices."
+    "message": "هیچ صورتحساب پرداخت‌نشده‌ای وجود ندارد."
   },
   "noPaidInvoices": {
-    "message": "No paid invoices."
+    "message": "هیچ صورتحساب پرداخت‌شده‌ای وجود ندارد."
   },
   "paid": {
     "message": "پرداخت شد",
@@ -2995,7 +3010,7 @@
     "message": "با پشتیبانی مشتری تماس بگیرید"
   },
   "contactSupportShort": {
-    "message": "Contact Support"
+    "message": "تماس با پشتیبانی"
   },
   "updatedPaymentMethod": {
     "message": "روش پرداخت به‌روز شده."
@@ -3099,7 +3114,7 @@
     "message": "برای مشاغل و سایر سازمان های تیمی."
   },
   "planNameTeamsStarter": {
-    "message": "Teams Starter"
+    "message": "طرح ابتدایی تیم‌ها"
   },
   "planNameEnterprise": {
     "message": "سازمانی"
@@ -3174,7 +3189,7 @@
     }
   },
   "onPremHostingOptional": {
-    "message": "میزبانی داخلی (اختیاری)"
+    "message": "میزبانی در محل (اختیاری)"
   },
   "usersGetPremium": {
     "message": "کاربران به ویژگی‌های پرمیوم دسترسی پیدا می‌کنند"
@@ -3213,7 +3228,7 @@
     }
   },
   "trialSecretsManagerThankYou": {
-    "message": "Thanks for signing up for Bitwarden Secrets Manager for $PLAN$!",
+    "message": "از ثبت‌نام شما برای بتا مدیر اسرار Bitwarden در طرح $PLAN$ سپاسگزاریم!",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -3333,10 +3348,10 @@
     "message": "شناسه خارجی می‌تواند به عنوان یک مرجع یا برای پیوند دادن این منبع به یک سیستم خارجی مانند فهرست کاربری استفاده شود."
   },
   "ssoExternalId": {
-    "message": "SSO External ID"
+    "message": "شناسه خارجی SSO"
   },
   "ssoExternalIdDesc": {
-    "message": "SSO External ID is an unencrypted reference between Bitwarden and your configured SSO provider."
+    "message": "شناسه خارجی SSO یک مرجع بدون رمزگذاری بین Bitwarden و ارائه‌دهنده SSO تنظیم‌شده شما است."
   },
   "nestCollectionUnder": {
     "message": "مجموعه لانه زیر"
@@ -3387,10 +3402,10 @@
     }
   },
   "inviteSingleEmailDesc": {
-    "message": "You have 1 invite remaining."
+    "message": "شما یک دعوت‌نامه باقی‌مانده دارید."
   },
   "inviteZeroEmailDesc": {
-    "message": "You have 0 invites remaining."
+    "message": "شما هیچ دعوت‌نامه باقی‌مانده‌ای ندارید."
   },
   "userUsingTwoStep": {
     "message": "این کاربر از ورود دو مرحله ای برای محافظت از حساب خود استفاده می‌کند."
@@ -3432,10 +3447,10 @@
     "message": "همه"
   },
   "addAccess": {
-    "message": "Add Access"
+    "message": "افزودن دسترسی"
   },
   "addAccessFilter": {
-    "message": "Add Access Filter"
+    "message": "افزودن فیلتر دسترسی"
   },
   "refresh": {
     "message": "تازه کردن"
@@ -3504,10 +3519,10 @@
     "message": "کد اشتباه"
   },
   "incorrectPin": {
-    "message": "Incorrect PIN"
+    "message": "کد پین نادرست است"
   },
   "pin": {
-    "message": "PIN",
+    "message": "پین",
     "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
   },
   "exportedVault": {
@@ -3556,7 +3571,7 @@
     }
   },
   "viewAllLogInOptions": {
-    "message": "View all log in options"
+    "message": "مشاهده همه گزینه‌های ورود به سیستم"
   },
   "viewAllLoginOptions": {
     "message": "مشاهده همه گزینه‌های ورود به سیستم"
@@ -3844,7 +3859,7 @@
     }
   },
   "unlinkedSso": {
-    "message": "Unlinked SSO."
+    "message": "SSO جدا شده است."
   },
   "unlinkedSsoUser": {
     "message": "SSO برای کاربر $ID$ پیوند نخورده است.",
@@ -3895,22 +3910,22 @@
     "message": "دستگاه"
   },
   "loginStatus": {
-    "message": "Login status"
+    "message": "وضیعت ورود"
   },
   "firstLogin": {
-    "message": "First login"
+    "message": "اولین ورود"
   },
   "trusted": {
-    "message": "Trusted"
+    "message": "مورد اعتماد"
   },
   "needsApproval": {
-    "message": "Needs approval"
+    "message": "نیاز به تأیید دارد"
   },
   "areYouTryingtoLogin": {
-    "message": "Are you trying to log in?"
+    "message": "آیا در تلاش برای ورود به سیستم هستید؟"
   },
   "logInAttemptBy": {
-    "message": "Login attempt by $EMAIL$",
+    "message": "تلاش برای ورود به سیستم توسط $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3919,22 +3934,22 @@
     }
   },
   "deviceType": {
-    "message": "Device Type"
+    "message": "نوع دستگاه"
   },
   "ipAddress": {
-    "message": "IP Address"
+    "message": "نشانی IP"
   },
   "confirmLogIn": {
-    "message": "Confirm login"
+    "message": "تأیید ورود"
   },
   "denyLogIn": {
-    "message": "Deny login"
+    "message": "رد ورود"
   },
   "thisRequestIsNoLongerValid": {
-    "message": "This request is no longer valid."
+    "message": "این درخواست دیگر معتبر نیست."
   },
   "logInConfirmedForEmailOnDevice": {
-    "message": "Login confirmed for $EMAIL$ on $DEVICE$",
+    "message": "ورود به سیستم برای $EMAIL$ در $DEVICE$ تأیید شد",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3947,16 +3962,16 @@
     }
   },
   "youDeniedALogInAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this really was you, try to log in with the device again."
+    "message": "شما تلاش برای ورود به سیستم از دستگاه دیگری را رد کردید. اگر واقعاً این شما بودید، سعی کنید دوباره با دستگاه وارد شوید."
   },
   "loginRequestHasAlreadyExpired": {
-    "message": "Login request has already expired."
+    "message": "درخواست ورود قبلاً منقضی شده است."
   },
   "justNow": {
-    "message": "Just now"
+    "message": "همین الان"
   },
   "requestedXMinutesAgo": {
-    "message": "Requested $MINUTES$ minutes ago",
+    "message": "$MINUTES$ دقیقه قبل درخواست شد",
     "placeholders": {
       "minutes": {
         "content": "$1",
@@ -3965,25 +3980,25 @@
     }
   },
   "creatingAccountOn": {
-    "message": "Creating account on"
+    "message": "در حال ساخت حساب کاربری روی"
   },
   "checkYourEmail": {
-    "message": "Check your email"
+    "message": "ایمیل خود را چک کنید"
   },
   "followTheLinkInTheEmailSentTo": {
-    "message": "Follow the link in the email sent to"
+    "message": "دنبال کنید لینکی را که در ایمیل فرستاده شده به"
   },
   "andContinueCreatingYourAccount": {
-    "message": "and continue creating your account."
+    "message": "و به ساختن حساب‌تان ادامه دهید."
   },
   "noEmail": {
-    "message": "No email?"
+    "message": "ایمیلی دریافت نکردید؟"
   },
   "goBack": {
-    "message": "Go back"
+    "message": "بازگشت به عقب"
   },
   "toEditYourEmailAddress": {
-    "message": "to edit your email address."
+    "message": "برای ویرایش آدرس ایمیل خود."
   },
   "view": {
     "message": "مشاهده"
@@ -4067,7 +4082,7 @@
     "message": "ایمیل حساب تأیید شد"
   },
   "emailVerifiedV2": {
-    "message": "Email verified"
+    "message": "ایمیل تأیید شد"
   },
   "emailVerifiedFailed": {
     "message": "تأیید ایمیل شما امکان پذیر نیست. سعی کنید یک ایمیل تأیید جدید ارسال کنید."
@@ -4082,19 +4097,19 @@
     "message": "به‌روزرسانی مرورگر"
   },
   "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+    "message": "در حال تولید تحلیل‌های ریسک شما..."
   },
   "updateBrowserDesc": {
     "message": "شما از یک مرورگر وب پشتیبانی نشده استفاده می‌کنید. گاوصندوق وب ممکن است به درستی کار نکند."
   },
   "youHaveAPendingLoginRequest": {
-    "message": "You have a pending login request from another device."
+    "message": "شما یک درخواست ورود در انتظار از دستگاه دیگری دارید."
   },
   "reviewLoginRequest": {
-    "message": "Review login request"
+    "message": "بررسی درخواست ورود"
   },
   "freeTrialEndPromptCount": {
-    "message": "Your free trial ends in $COUNT$ days.",
+    "message": "دوره آزمایشی رایگان شما در $COUNT$ روز به پایان می‌رسد.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4103,7 +4118,7 @@
     }
   },
   "freeTrialEndPromptMultipleDays": {
-    "message": "$ORGANIZATION$, your free trial ends in $COUNT$ days.",
+    "message": "$ORGANIZATION$، دوره آزمایشی رایگان شما در $COUNT$ روز به پایان می‌رسد.",
     "placeholders": {
       "count": {
         "content": "$2",
@@ -4116,7 +4131,7 @@
     }
   },
   "freeTrialEndPromptTomorrow": {
-    "message": "$ORGANIZATION$, your free trial ends tomorrow.",
+    "message": "$ORGANIZATION$، دوره آزمایشی رایگان شما فردا به پایان می‌رسد.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4125,10 +4140,10 @@
     }
   },
   "freeTrialEndPromptTomorrowNoOrgName": {
-    "message": "Your free trial ends tomorrow."
+    "message": "دوره آزمایشی رایگان شما فردا به پایان می‌رسد."
   },
   "freeTrialEndPromptToday": {
-    "message": "$ORGANIZATION$, your free trial ends today.",
+    "message": "$ORGANIZATION$، دوره آزمایشی رایگان شما امروز به پایان می‌رسد.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4137,16 +4152,16 @@
     }
   },
   "freeTrialEndingTodayWithoutOrgName": {
-    "message": "Your free trial ends today."
+    "message": "دوره آزمایشی رایگان شما امروز به پایان می‌رسد."
   },
   "clickHereToAddPaymentMethod": {
-    "message": "Click here to add a payment method."
+    "message": "برای افزودن روش پرداخت، اینجا کلیک کنید."
   },
   "joinOrganization": {
     "message": "به سازمان بپیوندید"
   },
   "joinOrganizationName": {
-    "message": "Join $ORGANIZATIONNAME$",
+    "message": "به $ORGANIZATIONNAME$ بپیوندید",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -4158,7 +4173,7 @@
     "message": "شما برای پیوستن به سازمان فهرست شده در بالا دعوت شده اید. برای پذیرش دعوت، باید وارد شوید یا یک حساب کاربری جدید در Bitwarden ایجاد کنید."
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Finish joining this organization by setting a master password."
+    "message": "با تعیین یک کلمه عبور اصلی، عضویت خود در این سازمان را کامل کنید."
   },
   "inviteAccepted": {
     "message": "دعوتنامه پذیرفته شد"
@@ -4188,7 +4203,7 @@
     "message": "اگر نمی‌توانید از طریق روش‌های ورود دو مرحله‌ای معمولی به حساب خود دسترسی پیدا کنید، می‌توانید از کد بازیابی ورود به سیستم دو مرحله‌ای خود برای خاموش کردن همه ارائه‌دهندگان دو مرحله‌ای در حساب خود استفاده کنید."
   },
   "logInBelowUsingYourSingleUseRecoveryCode": {
-    "message": "Log in below using your single-use recovery code. This will turn off all two-step providers on your account."
+    "message": "برای ورود، از کد بازیابی یک‌بار مصرف خود استفاده کنید. این کار تمام روش‌های ورود دو مرحله‌ای حساب کاربری شما را غیرفعال می‌کند."
   },
   "recoverAccountTwoStep": {
     "message": "بازیابی حساب ورود دو مرحله ای"
@@ -4209,7 +4224,7 @@
     "message": "شما درخواست کرده اید که حساب Bitwarden خود را حذف کنید. برای تأیید از دکمه زیر استفاده کنید."
   },
   "deleteRecoverOrgConfirmDesc": {
-    "message": "You have requested to delete your Bitwarden organization."
+    "message": "شما درخواست حذف سازمان Bitwarden خود را داده‌اید."
   },
   "myOrganization": {
     "message": "سازمان من"
@@ -4338,7 +4353,7 @@
     "message": "برای اشتراک خود محدودیت جایگاه تعیین کنید. پس از رسیدن به این محدودیت، نمی‌توانید اعضای جدید را دعوت کنید."
   },
   "limitSmSubscriptionDesc": {
-    "message": "برای اشتراک خود مدیر اسرار محدودیت جایگاه تعیین کنید. پس از رسیدن به این محدودیت، نمی‌توانید اعضای جدید را دعوت کنید."
+    "message": "برای اشتراک مدیر اسرار خود، محدودیت تعداد تعیین کنید. پس از رسیدن به این حد، قادر به دعوت اعضای جدید نخواهید بود."
   },
   "maxSeatLimit": {
     "message": "محدودیت جایگاه (اختیاری)",
@@ -4377,7 +4392,7 @@
     "message": "اشتراک به‌روز شد"
   },
   "subscribedToSecretsManager": {
-    "message": "Subscription updated. You now have access to Secrets Manager."
+    "message": "اشتراک به‌روزرسانی شد. اکنون به مدیر اسرار دسترسی دارید."
   },
   "additionalOptions": {
     "message": "گزینه‌های اضافی"
@@ -4389,10 +4404,10 @@
     "message": "تنظیمات اشتراک شما منجر به تغییرات نسبتاً زیادی در مجموع صورتحساب شما می‌شود. اگر عضو‌هایی که به تازگی دعوت شده‌اند بیشتر از جایگاه‌های اشتراک شما باشند، بلافاصله هزینه‌ای متناسب برای عضو‌هایی اضافی دریافت خواهید کرد."
   },
   "smStandaloneTrialSeatCountUpdateMessageFragment1": {
-    "message": "If you want to add additional"
+    "message": "اگر می‌خواهید موارد بیشتری اضافه کنید"
   },
   "smStandaloneTrialSeatCountUpdateMessageFragment2": {
-    "message": "seats without the bundled offer, please contact"
+    "message": "برای صندلی‌های بدون پیشنهاد بسته‌ای، لطفا تماس بگیرید"
   },
   "subscriptionUserSeatsLimitedAutoscale": {
     "message": "تنظیمات اشتراک شما منجر به تغییرات نسبتاً زیادی در مجموع صورتحساب شما می‌شود. اگر اعضای تازه دعوت شده از جایگاه‌های اشتراک شما بیشتر شوند، بلافاصله هزینه‌ای متناسب برای اعضای اضافی دریافت می‌کنید تا زمانی که به محدودیت جایگاه $MAX$ شما برسند.",
@@ -4404,7 +4419,7 @@
     }
   },
   "subscriptionUserSeatsWithoutAdditionalSeatsOption": {
-    "message": "You can invite up to $COUNT$ members for no additional charge. Contact Customer Support to upgrade your plan and invite more members.",
+    "message": "شما می‌توانید تا سقف $COUNT$ عضو را بدون هزینه اضافی دعوت کنید. برای ارتقاء طرح خود و دعوت از اعضای بیشتر، با پشتیبانی مشتریان تماس بگیرید.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4422,7 +4437,7 @@
     }
   },
   "subscriptionUpgrade": {
-    "message": "You cannot invite more than $COUNT$ members without upgrading your plan.",
+    "message": "بدون ارتقای طرح خود نمی‌توانید بیش از $COUNT$ عضو دعوت کنید.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4449,7 +4464,7 @@
     }
   },
   "subscriptionSeatMaxReached": {
-    "message": "You cannot invite more than $COUNT$ members without increasing your subscription seats.",
+    "message": "شما نمی‌توانید بیش از $COUNT$ عضو دعوت کنید مگر اینکه تعداد صندلی‌های اشتراک خود را افزایش دهید.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4478,11 +4493,8 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
-    "message": "Edit $LABEL$",
+    "message": "ویرایش $LABEL$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4491,7 +4503,7 @@
     }
   },
   "reorderToggleButton": {
-    "message": "Reorder $LABEL$. Use arrow key to move item up or down.",
+    "message": "مرتب‌سازی مجدد $LABEL$. برای جابجایی مورد به بالا یا پایین از کلیدهای جهت‌نما استفاده کنید.",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4500,7 +4512,7 @@
     }
   },
   "reorderFieldUp": {
-    "message": "$LABEL$ moved up, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ به بالا منتقل شد، موقعیت $INDEX$ از $LENGTH$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4517,7 +4529,7 @@
     }
   },
   "reorderFieldDown": {
-    "message": "$LABEL$ moved down, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ به پایین منتقل شد، موقعیت $INDEX$ از $LENGTH$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4533,23 +4545,14 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "کلیدها به‌روز شد"
-  },
-  "updateEncryptionKey": {
-    "message": "کلید رمزگذاری را به‌روز کنید"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "ما طرح رمزگذاری را برای ارائه امنیت بهتر تغییر داده‌ایم. کلید رمزگذاری خود را اکنون با وارد کردن کلمه اصلی خود در زیر به روز کنید."
-  },
   "updateEncryptionKeyWarning": {
     "message": "پس از به‌روزرسانی کلید رمزگذاری، باید از سیستم خارج شوید و دوباره به همه برنامه‌های Bitwarden که در حال حاضر استفاده می‌کنید (مانند برنامه تلفن همراه یا برنامه‌های افزودنی مرورگر) وارد شوید. عدم خروج و ورود مجدد (که کلید رمزگذاری جدید شما را دانلود می‌کند) ممکن است منجر به خراب شدن داده‌ها شود. ما سعی خواهیم کرد شما را به طور خودکار از سیستم خارج کنیم، اما ممکن است با تأخیر انجام شود."
   },
   "updateEncryptionKeyAccountExportWarning": {
-    "message": "Any account restricted exports you have saved will become invalid."
+    "message": "هرگونه برون ریزی حساب کاربری با دسترسی محدود که ذخیره کرده‌اید، نامعتبر خواهد شد."
+  },
+  "legacyEncryptionUnsupported": {
+    "message": "رمزنگاری قدیمی دیگر پشتیبانی نمی‌شود. لطفاً برای بازیابی حساب کاربری خود با پشتیبانی تماس بگیرید."
   },
   "subscription": {
     "message": "اشتراک"
@@ -4579,19 +4582,19 @@
     "message": "شما چیزی را انتخاب نکرده اید."
   },
   "receiveMarketingEmailsV2": {
-    "message": "Get advice, announcements, and research opportunities from Bitwarden in your inbox."
+    "message": "پیشنهادها، اعلان‌ها و فرصت‌های تحقیقاتی Bitwarden را در صندوق ورودی خود دریافت کنید."
   },
   "unsubscribe": {
-    "message": "Unsubscribe"
+    "message": "لغو اشتراک"
   },
   "atAnyTime": {
-    "message": "at any time."
+    "message": "در هر زمان."
   },
   "byContinuingYouAgreeToThe": {
-    "message": "By continuing, you agree to the"
+    "message": "با ادامه دادن، شما موافقت می‌کنید که"
   },
   "and": {
-    "message": "and"
+    "message": "و"
   },
   "acceptPolicies": {
     "message": "با علامت زدن این کادر با موارد زیر موافقت می‌کنید:"
@@ -4612,7 +4615,7 @@
     "message": "متوقف شدن گاو‌صندوق"
   },
   "vaultTimeout1": {
-    "message": "Timeout"
+    "message": "پایان زمان"
   },
   "vaultTimeoutDesc": {
     "message": "انتخاب کنید که گاو‌صندوق شما چه زمانی عمل توقف زمانی گاوصندوق را انجام دهد."
@@ -4681,7 +4684,7 @@
     "message": "انتخاب شده"
   },
   "recommended": {
-    "message": "Recommended"
+    "message": "توصیه می‌شود"
   },
   "ownership": {
     "message": "مالکیت"
@@ -4752,7 +4755,7 @@
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "You will be notified once the request is approved"
+    "message": "به‌محض تأیید درخواست، به شما اطلاع داده خواهد شد"
   },
   "free": {
     "message": "رايگان",
@@ -4805,7 +4808,7 @@
     "message": "الزامات را برای قدرت کلمه عبور اصلی تنظیم کنید."
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "امتیاز قدرت کلمه عبور $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -4874,7 +4877,7 @@
     "message": "حداقل تعداد کلمات"
   },
   "overridePasswordTypePolicy": {
-    "message": "Password Type",
+    "message": "نوع کلمه عبور",
     "description": "Name of the password generator policy that overrides the user's password/passphrase selection."
   },
   "userPreference": {
@@ -4991,10 +4994,10 @@
     "message": "با استفاده از پورتال ورود واحد سازمان خود وارد شوید. لطفاً برای شروع، شناسه SSO سازمان خود را وارد کنید."
   },
   "singleSignOnEnterOrgIdentifier": {
-    "message": "Enter your organization's SSO identifier to begin"
+    "message": "برای شروع، شناسه SSO سازمان خود را وارد کنید"
   },
   "singleSignOnEnterOrgIdentifierText": {
-    "message": "To log in with your SSO provider, enter your organization's SSO identifier to begin. You may need to enter this SSO identifier when you log in from a new device."
+    "message": "برای ورود با استفاده از ارائه‌دهنده SSO خود، ابتدا شناسه SSO سازمانتان را وارد کنید. ممکن است هنگام ورود از یک دستگاه جدید نیز نیاز به وارد کردن این شناسه داشته باشید."
   },
   "enterpriseSingleSignOn": {
     "message": "ورود به سیستم پروژه"
@@ -5003,25 +5006,25 @@
     "message": "اکنون می‌توانید این برگه را ببندید و در افزونه ادامه دهید."
   },
   "youSuccessfullyLoggedIn": {
-    "message": "You successfully logged in"
+    "message": "شما با موفقیت وارد شدید"
   },
   "thisWindowWillCloseIn5Seconds": {
-    "message": "This window will automatically close in 5 seconds"
+    "message": "این پنجره به‌صورت خودکار طی ۵ ثانیه بسته خواهد شد"
   },
   "youMayCloseThisWindow": {
-    "message": "You may close this window"
+    "message": "می‌توانید این پنجره را ببندید"
   },
   "includeAllTeamsFeatures": {
     "message": "همه ویژگی های تیم، به علاوه:"
   },
   "includeAllTeamsStarterFeatures": {
-    "message": "All Teams Starter features, plus:"
+    "message": "تمام ویژگی‌های طرح ابتدایی تیم‌ها، به‌علاوه:"
   },
   "chooseMonthlyOrAnnualBilling": {
-    "message": "Choose monthly or annual billing"
+    "message": "انتخاب صورتحساب ماهانه یا سالانه"
   },
   "abilityToAddMoreThanNMembers": {
-    "message": "Ability to add more than $COUNT$ members",
+    "message": "امکان افزودن بیش از $COUNT$ عضو",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -5064,13 +5067,13 @@
     "message": "اعضا را از پیوستن به سازمان‌های دیگر محدود کنید."
   },
   "singleOrgPolicyDesc": {
-    "message": "Restrict members from joining other organizations. This policy is required for organizations that have enabled domain verification."
+    "message": "محدود کردن اعضا از پیوستن به سازمان‌های دیگر. این سیاست برای سازمان‌هایی که اعتبارسنجی دامنه را فعال کرده‌اند، الزامی است."
   },
   "singleOrgBlockCreateMessage": {
     "message": "سازمان فعلی شما سیاستی دارد که به شما اجازه نمی‌دهد به بیش از یک سازمان بپیوندید. لطفاً با مدیران سازمان خود تماس بگیرید یا از یک حساب Bitwarden دیگر ثبت نام کنید."
   },
   "singleOrgPolicyMemberWarning": {
-    "message": "Non-compliant members will be placed in revoked status until they leave all other organizations. Administrators are exempt and can restore members once compliance is met."
+    "message": "اعضای غیر مطابق در وضعیت لغو شده قرار می‌گیرند تا زمانی که از تمام سازمان‌های دیگر خارج شوند. مدیران مستثنی بوده و می‌توانند پس از برقراری انطباق، اعضا را بازیابی کنند."
   },
   "requireSso": {
     "message": "نیاز به احراز هویت یکبار ورود به سیستم"
@@ -5091,14 +5094,14 @@
     "message": "مالکان و سرپرستان سازمان از اجرای این سیاست مستثنی هستند."
   },
   "limitSendViews": {
-    "message": "Limit views"
+    "message": "محدود کردن نمایش‌ها"
   },
   "limitSendViewsHint": {
-    "message": "No one can view this Send after the limit is reached.",
+    "message": "هیچ‌کس نمی‌تواند این را پس از رسیدن به محدودیت مشاهده کند.",
     "description": "Displayed under the limit views field on Send"
   },
   "limitSendViewsCount": {
-    "message": "$ACCESSCOUNT$ views left",
+    "message": "$ACCESSCOUNT$ بازدید باقی مانده",
     "description": "Displayed under the limit views field on Send",
     "placeholders": {
       "accessCount": {
@@ -5108,11 +5111,11 @@
     }
   },
   "sendDetails": {
-    "message": "Send details",
+    "message": "جزئیات ارسال",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeTextToShare": {
-    "message": "Text to share"
+    "message": "متن برای اشتراک گذاری"
   },
   "sendTypeFile": {
     "message": "پرونده"
@@ -5121,7 +5124,7 @@
     "message": "متن"
   },
   "sendPasswordDescV3": {
-    "message": "Add an optional password for recipients to access this Send.",
+    "message": "یک کلمه عبور اختیاری برای دریافت‌کنندگان اضافه کنید تا بتوانند به این ارسال دسترسی داشته باشند.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
@@ -5149,14 +5152,14 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
-    "message": "Are you sure you want to permanently delete this Send?",
+    "message": "مطمئن هستید می‌خواهید این ارسال را برای همیشه پاک کنید؟",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletionDate": {
     "message": "تاریخ حذف"
   },
   "deletionDateDescV2": {
-    "message": "The Send will be permanently deleted on this date.",
+    "message": "ارسال در این تاریخ به‌طور دائمی حذف خواهد شد.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
@@ -5180,7 +5183,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copyLink": {
-    "message": "Copy link"
+    "message": "کپی پیوند"
   },
   "copySendLink": {
     "message": "پیوند ارسال را کپی کن",
@@ -5206,7 +5209,7 @@
     "message": "در انتظار حذف"
   },
   "hideTextByDefault": {
-    "message": "Hide text by default"
+    "message": "متن را به‌صورت پیش‌فرض مخفی کن"
   },
   "expired": {
     "message": "منقضی شده"
@@ -5228,7 +5231,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "downloadAttachments": {
-    "message": "Download attachments"
+    "message": "بارگیری پیوست‌ها"
   },
   "sendAccessUnavailable": {
     "message": "ارسالی که می‌خواهید به آن دسترسی پیدا کنید وجود ندارد یا دیگر در دسترس نیست.",
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "دسترسی اضطراری رد شد"
   },
+  "grantorDetailsNotFound": {
+    "message": "جزئیات اعطا‌کننده پیدا نشد"
+  },
   "passwordResetFor": {
     "message": "کلمه عبور برای $USER$ بازنشانی شد. اکنون می‌توانید با استفاده از کلمه عبور جدید وارد شوید.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "اجرای مالکیت داده‌های سازمانی"
+  },
   "personalOwnership": {
     "message": "حذف گاوصندوق شخصی"
   },
@@ -5560,73 +5569,73 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more, see how it works, **or** try it now.'"
   },
   "developmentDevOpsAndITTeamsChooseBWSecret": {
-    "message": "Development, DevOps, and IT teams choose Bitwarden Secrets Manager to securely manage and deploy their infrastructure and machine secrets."
+    "message": "تیم‌های توسعه، DevOps و فناوری اطلاعات مدیر اسرار Bitwarden را برای مدیریت و استقرار امن زیرساخت‌ها و اسرار ماشین خود انتخاب می‌کنند."
   },
   "centralizeSecretsManagement": {
-    "message": "Centralize secrets management."
+    "message": "مدیریت متمرکز اسرار."
   },
   "centralizeSecretsManagementDescription": {
-    "message": "Securely store and manage secrets in one location to prevent secret sprawl across your organization."
+    "message": "اسرار خود را به‌صورت ایمن در یک مکان ذخیره و مدیریت کنید تا از پراکندگی اسرار در سراسر سازمان جلوگیری شود."
   },
   "preventSecretLeaks": {
-    "message": "Prevent secret leaks."
+    "message": "جلوگیری از نشت اسرار."
   },
   "preventSecretLeaksDescription": {
-    "message": "Protect secrets with end-to-end encryption. No more hard coding secrets or sharing through .env files."
+    "message": "حفاظت از اسرار با رمزگذاری سرتاسری. دیگر نیازی به کدنویسی مستقیم اسرار یا به اشتراک‌گذاری آن‌ها از طریق فایل‌های .env نیست."
   },
   "enhanceDeveloperProductivity": {
-    "message": "Enhance developer productivity."
+    "message": "افزایش بهره‌وری توسعه‌دهندگان."
   },
   "enhanceDeveloperProductivityDescription": {
-    "message": "Programmatically retrieve and deploy secrets at runtime so developers can focus on what matters most, like improving code quality."
+    "message": "به‌صورت برنامه‌نویسی شده اسرار را در زمان اجرا دریافت و استقرار دهید تا توسعه‌دهندگان بتوانند روی موارد مهم‌تر مانند بهبود کیفیت کد تمرکز کنند."
   },
   "strengthenBusinessSecurity": {
-    "message": "Strengthen business security."
+    "message": "تقویت امنیت کسب‌وکار."
   },
   "strengthenBusinessSecurityDescription": {
-    "message": "Maintain tight control over machine and human access to secrets with SSO integrations, event logs, and access rotation."
+    "message": "کنترل دقیق بر دسترسی ماشین‌ها و افراد به اسرار را با ادغام SSO، گزارش رویدادها و چرخش دسترسی حفظ کنید."
   },
   "tryItNow": {
-    "message": "Try it now"
+    "message": "امتحان کنید"
   },
   "sendRequest": {
-    "message": "Send request"
+    "message": "ارسال درخواست"
   },
   "addANote": {
-    "message": "Add a note"
+    "message": "افزودن يادداشت"
   },
   "bitwardenSecretsManager": {
-    "message": "Bitwarden Secrets Manager"
+    "message": "مدیر اسرار Bitwarden"
   },
   "moreProductsFromBitwarden": {
-    "message": "More products from Bitwarden"
+    "message": "محصولات بیشتر از Bitwarden"
   },
   "requestAccessToSecretsManager": {
-    "message": "Request access to Secrets Manager"
+    "message": "درخواست دسترسی به مدیر اسرار"
   },
   "youNeedApprovalFromYourAdminToTrySecretsManager": {
-    "message": "You need approval from your administrator to try Secrets Manager."
+    "message": "برای استفاده از مدیر اسرار، به تأیید مدیر خود نیاز دارید."
   },
   "smAccessRequestEmailSent": {
-    "message": "Access request for secrets manager email sent to admins."
+    "message": "درخواست دسترسی به مدیر اسرار از طریق ایمیل برای مدیران ارسال شد."
   },
   "requestAccessSMDefaultEmailContent": {
-    "message": "Hi,\n\nI am requesting a subscription to Bitwarden Secrets Manager for our team. Your support would mean a great deal!\n\nBitwarden Secrets Manager is an end-to-end encrypted secrets management solution for securely storing, sharing, and deploying machine credentials like API keys, database passwords, and authentication certificates.\n\nSecrets Manager will help us to:\n\n- Improve security\n- Streamline operations\n- Prevent costly secret leaks\n\nTo request a free trial for our team, please reach out to Bitwarden.\n\nThank you for your help!"
+    "message": "سلام،\n\nمن درخواست اشتراک مدیر اسرار Bitwarden را برای تیم‌مان دارم. حمایت شما واقعاً برای ما ارزشمند خواهد بود!\n\nمدیر اسرار Bitwarden یک راه حل مدیریت اسرار با رمزگذاری سرتاسری است که برای ذخیره‌سازی، به اشتراک‌گذاری و استقرار ایمن اطلاعات حساس ماشین مانند کلیدهای API، کلمات عبور پایگاه داده و گواهی‌های احراز هویت طراحی شده است.\n\nمدیر اسرار به ما کمک خواهد کرد تا:\n\n- امنیت را افزایش دهیم\n- عملیات را ساده‌سازی کنیم\n- از نشت‌های پرهزینه اسرار جلوگیری کنیم\n\nبرای درخواست یک دوره آزمایشی رایگان برای تیم‌مان، لطفاً با Bitwarden تماس بگیرید.\n\nاز همکاری شما سپاسگزارم!"
   },
   "giveMembersAccess": {
-    "message": "Give members access:"
+    "message": "اعطا کردن دسترسی به اعضا:"
   },
   "viewAndSelectTheMembers": {
-    "message": "view and select the members you want to give access to Secrets Manager."
+    "message": "مشاهده و انتخاب اعضایی که می‌خواهید به مدیر اسرار دسترسی داشته باشند."
   },
   "openYourOrganizations": {
-    "message": "Open your organization's"
+    "message": "سازمان خود را باز کنید"
   },
   "usingTheMenuSelect": {
-    "message": "Using the menu, select"
+    "message": "از منو، انتخاب کنید"
   },
   "toGrantAccessToSelectedMembers": {
-    "message": "to grant access to selected members."
+    "message": "برای اعطای دسترسی به اعضای انتخاب شده."
   },
   "sendVaultCardTryItNow": {
     "message": "الان امتحان کنید",
@@ -5645,7 +5654,7 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send or sign up to **try it today.**'"
   },
   "sendAccessCreatorIdentifier": {
-    "message": "Bitwarden member $USER_IDENTIFIER$ shared the following with you",
+    "message": "عضو Bitwarden $USER_IDENTIFIER$ موارد زیر را با شما به اشتراک گذاشت",
     "placeholders": {
       "user_identifier": {
         "content": "$1",
@@ -5654,7 +5663,7 @@
     }
   },
   "viewSend": {
-    "message": "View Send",
+    "message": "مشاهده ارسال",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "viewSendHiddenEmailWarning": {
@@ -5677,7 +5686,7 @@
     "message": "هنگام ذخیره حذف و تاریخ انقضاء شما خطایی روی داد."
   },
   "hideYourEmail": {
-    "message": "Hide your email address from viewers."
+    "message": "آدرس ایمیل خود را از بینندگان مخفی کنید."
   },
   "webAuthnFallbackMsg": {
     "message": "برای تأیید 2FA خود لطفاً روی دکمه زیر کلیک کنید."
@@ -5686,10 +5695,10 @@
     "message": "تأیید اعتبار در WebAuthn"
   },
   "readSecurityKey": {
-    "message": "Read security key"
+    "message": "خواندن کلید امنیتی"
   },
   "awaitingSecurityKeyInteraction": {
-    "message": "Awaiting security key interaction..."
+    "message": "در انتظار تعامل با کلید امنیتی..."
   },
   "webAuthnNotSupported": {
     "message": "WebAuthn در این مرورگر پشتیبانی نمی‌شود."
@@ -5698,7 +5707,7 @@
     "message": "WebAuthn با موفقیت تأیید شد! می‌توانید این برگه را ببندید."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "کلمه عبور جدید شما نمی‌تواند با کلمه عبور فعلی‌تان یکسان باشد."
   },
   "hintEqualsPassword": {
     "message": "اشاره به کلمه عبور شما نمی‌تواند همان کلمه عبور شما باشد."
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "ادامه دادن، $NAME$ را از نشست فعلی اش خارج می‌کند و باید دوباره وارد سیستم شود. نشست فعال در دستگاه‌های دیگر ممکن است تا یک ساعت فعال بمانند.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "این کاربر"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "یک یا چند سیاست سازمانی برای تأمین شرایط زیر به کلمه عبور اصلی احتیاج دارد:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "یک یا چند سیاست سازمانی برای تأمین شرایط زیر به کلمه عبور اصلی احتیاج دارد:"
+  },
   "resetPasswordSuccess": {
     "message": "بازیابی رمزعبور با موفقیت انجام شد!"
   },
@@ -5887,32 +5908,32 @@
     "message": "مستثنی شده، برای این اقدام قابل اجرا نیست"
   },
   "nonCompliantMembersTitle": {
-    "message": "Non-compliant members"
+    "message": "اعضای غیر مطابق"
   },
   "nonCompliantMembersError": {
-    "message": "Members that are non-compliant with the Single organization or Two-step login policy cannot be restored until they adhere to the policy requirements"
+    "message": "اعضایی که با سیاست تک سازمانی یا ورود دومرحله‌ای مطابقت ندارند، تا زمانی که الزامات این سیاست‌ها را رعایت نکنند، قابل بازیابی نیستند"
   },
   "fingerprint": {
     "message": "اثر انگشت"
   },
   "fingerprintPhrase": {
-    "message": "Fingerprint phrase:"
+    "message": "عبارت اثر انگشت:"
   },
   "error": {
     "message": "خطا"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "خطای رمزگشایی"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "Bitwarden نتوانست مورد(های) گاوصندوق فهرست شده زیر را رمزگشایی کند."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "با بخش پشتیبانی مشتریان تماس بگیرید",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "برای جلوگیری از، از دست دادن داده‌های بیشتر.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "accountRecoveryManageUsers": {
@@ -5980,13 +6001,13 @@
     "message": "یک سازمان مشتری جدید ایجاد کنید که با شما به عنوان ارائه دهنده مرتبط باشد. شما می توانید به این سازمان دسترسی داشته باشید و آن را مدیریت کنید."
   },
   "newClient": {
-    "message": "New client"
+    "message": "مشتری جدید"
   },
   "addExistingOrganization": {
     "message": "سازمان موجود را اضافه کنید"
   },
   "addNewOrganization": {
-    "message": "Add new organization"
+    "message": "افزودن سازمان جدید"
   },
   "myProvider": {
     "message": "ارائه دهنده‌ی من"
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "افزودن"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "کلمه عبور اصلی با موفقیت تنظیم شد"
+  },
   "updatedMasterPassword": {
     "message": "کلمه عبور اصلی ذخیره شد"
   },
   "updateMasterPassword": {
     "message": "به‌روزرسانی کلمه عبور اصلی"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "کلمه عبور اصلی شما اخیراً توسط سرپرست سازمان‌تان تغییر کرده است. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روز کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
   },
@@ -6062,19 +6092,19 @@
     "message": "کلمه عبور اصلی شما با یک یا چند سیاست سازمان‌تان مطابقت ندارد. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روز کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
   },
   "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+    "message": "ورود خودکار کاربران به برنامه‌های مجاز"
   },
   "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+    "message": "فرم‌های ورود به‌صورت خودکار پر شده و برای برنامه‌هایی که از ارائه‌دهنده هویت پیکربندی شده شما اجرا می‌شوند، ارسال خواهند شد."
   },
   "automaticAppLoginIdpHostLabel": {
-    "message": "Identity provider host"
+    "message": "میزبان ارائه دهنده هویت"
   },
   "automaticAppLoginIdpHostDesc": {
-    "message": "Enter your identity provider host URL. Enter multiple URLs by separating with a comma."
+    "message": "نشانی اینترنتی میزبان ارائه دهنده هویت خود را وارد کنید. برای وارد کردن چند نشانی، آن‌ها را با کاما از هم جدا کنید."
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
+    "message": "سازمان شما گزینه‌های رمزگشایی را به‌روزرسانی کرده است. لطفاً برای دسترسی به گاوصندوق خود، یک کلمه عبور اصلی تنظیم کنید."
   },
   "maximumVaultTimeout": {
     "message": "متوقف شدن گاو‌صندوق"
@@ -6108,7 +6138,7 @@
     }
   },
   "vaultTimeoutPolicyInEffect1": {
-    "message": "$HOURS$ hour(s) and $MINUTES$ minute(s) maximum.",
+    "message": "حداکثر $HOURS$ ساعت و $MINUTES$ دقیقه.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -6264,10 +6294,10 @@
     "message": "اعتبارسنجی گواهینامه‌ها"
   },
   "spUniqueEntityId": {
-    "message": "Set a unique SP entity ID"
+    "message": "یک شناسه موجودیت SP منحصربه‌فرد تنظیم کنید"
   },
   "spUniqueEntityIdDesc": {
-    "message": "Generate an identifier that is unique to your organization"
+    "message": "یک شناسه تولید کنید که منحصربه‌فرد برای سازمان شما باشد"
   },
   "idpEntityId": {
     "message": "شناسه موجودیت"
@@ -6303,19 +6333,19 @@
     "message": "خانواده‌های Bitwarden رایگان"
   },
   "sponsoredBitwardenFamilies": {
-    "message": "Sponsored families"
+    "message": "خانواده‌های تحت حمایت"
   },
   "noSponsoredFamiliesMessage": {
-    "message": "No sponsored families"
+    "message": "خانواده‌های تحت حمایت وجود ندارند"
   },
   "nosponsoredFamiliesDetails": {
-    "message": "Sponsored non-member families plans will display here"
+    "message": "طرح‌های خانواده‌های غیر عضو تحت حمایت در اینجا نمایش داده خواهند شد"
   },
   "sponsorshipFreeBitwardenFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. You can sponsor Free Bitwarden Families for employees who are not a member of your Bitwarden organization. Sponsoring a non-member requires an available seat within your organization."
+    "message": "اعضای سازمان شما واجد شرایط استفاده از نسخه رایگان خانواده‌های Bitwarden هستند. شما می‌توانید نسخه رایگان خانواده‌های Bitwarden را برای کارمندانی که عضو سازمان Bitwarden شما نیستند، حمایت کنید. حمایت از یک فرد غیر عضو مستلزم وجود صندلی آزاد در سازمان شما است."
   },
   "sponsoredFamiliesRemoveActiveSponsorship": {
-    "message": "When you remove an active sponsorship, a seat within your organization will be available after the renewal date of the sponsored organization."
+    "message": "زمانی که حمایت فعالی را حذف می‌کنید، پس از تاریخ تمدید سازمان تحت حمایت، یک صندلی در سازمان شما آزاد خواهد شد."
   },
   "sponsoredFamiliesEligible": {
     "message": "شما و خانواده‌تان واجد شرایط دریافت خانواده‌های Bitwarden رایگان هستید. با ایمیل شخصی خود بازخرید کنید تا اطلاعات خود را حتی زمانی که در محل کار نیستید ایمن نگه دارید."
@@ -6324,28 +6354,28 @@
     "message": "امروز برنامه رایگان Bitwarden برای خانواده‌های خود را بازخرید کنید تا اطلاعات خود را حتی زمانی که در محل کار نیستید ایمن نگه دارید."
   },
   "sponsoredFamiliesIncludeMessage": {
-    "message": "The Bitwarden for Families plan includes"
+    "message": "طرح Bitwarden برای خانواده‌ها شامل"
   },
   "sponsoredFamiliesPremiumAccess": {
     "message": "دسترسی پرمیوم برای حداکثر 6 کاربر"
   },
   "sponsoredFamiliesSharedCollectionsForFamilyMembers": {
-    "message": "Shared collections for family members"
+    "message": "مجموعه‌های مشترک برای اعضای خانواده"
   },
   "memberFamilies": {
-    "message": "Member families"
+    "message": "خانواده‌های اعضا"
   },
   "noMemberFamilies": {
-    "message": "No member families"
+    "message": "خانواده‌های اعضا وجود ندارد"
   },
   "noMemberFamiliesDescription": {
-    "message": "Members who have redeemed family plans will display here"
+    "message": "اعضایی که طرح‌های خانوادگی را فعال کرده‌اند، در اینجا نمایش داده خواهند شد"
   },
   "membersWithSponsoredFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. Here you can see members who have sponsored a Families organization."
+    "message": "اعضای سازمان شما واجد شرایط استفاده از نسخه رایگان خانواده‌های Bitwarden هستند. در اینجا می‌توانید اعضایی را ببینید که سازمان خانوادگی را حمایت کرده‌اند."
   },
   "organizationHasMemberMessage": {
-    "message": "A sponsorship cannot be sent to $EMAIL$ because they are a member of your organization.",
+    "message": "حمایت مالی نمی‌تواند به $EMAIL$ ارسال شود زیرا او عضو سازمان شما است.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6405,7 +6435,7 @@
     "message": "حساب بازخرید شد"
   },
   "revokeAccountMessage": {
-    "message": "Revoke account $NAME$",
+    "message": "حساب $NAME$ را لغو کنید",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -6471,16 +6501,16 @@
     "message": "کد تأیید مورد نیاز است."
   },
   "webauthnCancelOrTimeout": {
-    "message": "The authentication was cancelled or took too long. Please try again."
+    "message": "احراز هویت لغو شد یا بیش از حد طول کشید. لطفاً دوباره تلاش کنید."
   },
   "invalidVerificationCode": {
     "message": "کد تأیید نامعتبر است"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "برای اعضای سازمان زیر، کلمه عبور اصلی دیگر لازم نیست. لطفاً دامنه زیر را با مدیر سازمان خود تأیید کنید."
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "دامنه رابط کلید"
   },
   "leaveOrganization": {
     "message": "ترک سازمان"
@@ -6585,7 +6615,7 @@
     "message": "توکن همگام‌سازی صورتحساب را مشاهده کنید"
   },
   "generateBillingToken": {
-    "message": "Generate billing token"
+    "message": "تولید توکن پرداخت"
   },
   "copyPasteBillingSync": {
     "message": "این توکن را کپی کرده و در تنظیمات همگام‌سازی صورتحساب سازمان خود میزبان جای‌گذاری کنید."
@@ -6594,7 +6624,7 @@
     "message": "توکن همگام‌سازی صورتحساب شما می‌تواند به تنظیمات اشتراک این سازمان دسترسی داشته باشد و آن را ویرایش کند."
   },
   "manageBillingTokenSync": {
-    "message": "Manage Billing Token"
+    "message": "مدیریت توکن پرداخت"
   },
   "setUpBillingSync": {
     "message": "همگام‌سازی صورتحساب را تنظیم کنید"
@@ -6612,37 +6642,37 @@
     "message": "چرخاندن توکن همگام‌سازی صورتحساب، توکن قبلی را باطل می‌کند."
   },
   "selfHostedServer": {
-    "message": "self-hosted"
+    "message": "خود میزبان"
   },
   "customEnvironment": {
-    "message": "Custom environment"
+    "message": "محیط سفارشی"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com"
+    "message": "نشانی اینترنتی پایه نصب Bitwarden خود را که به‌صورت داخلی میزبانی شده مشخص کنید.\nمثال: https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
-    "message": "For advanced configuration, you can specify the base URL of each service independently."
+    "message": "برای پیکربندی پیشرفته، می‌توانید نشانی اینترنتی پایه هر سرویس را به‌صورت مستقل مشخص کنید."
   },
   "selfHostedEnvFormInvalid": {
-    "message": "You must add either the base Server URL or at least one custom environment."
+    "message": "شما باید یا نشانی اینترنتی پایه سرور را اضافه کنید، یا حداقل یک محیط سفارشی تعریف کنید."
   },
   "apiUrl": {
-    "message": "API server URL"
+    "message": "نشانی API سرور"
   },
   "webVaultUrl": {
-    "message": "Web vault server URL"
+    "message": "نشانی اینترنتی سرور گاوصندوق وب"
   },
   "identityUrl": {
-    "message": "Identity server URL"
+    "message": "نشانی سرور شناسایی"
   },
   "notificationsUrl": {
-    "message": "Notifications server URL"
+    "message": "نشانی سرور اعلان‌ها"
   },
   "iconsUrl": {
-    "message": "Icons server URL"
+    "message": "نشانی سرور آیکون ها"
   },
   "environmentSaved": {
-    "message": "Environment URLs saved"
+    "message": "نشانی‌های اینترنتی محیط ذخیره شد"
   },
   "selfHostingTitle": {
     "message": "خود میزبانی"
@@ -6660,7 +6690,7 @@
     "message": "توکن همگام‌سازی صورتحساب"
   },
   "automaticBillingSyncDesc": {
-    "message": "Automatic sync unlocks Families sponsorships and allows you to sync your license without uploading a file. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
+    "message": "همگام‌سازی خودکار، حمایت‌های خانواده‌ها را فعال می‌کند و به شما امکان می‌دهد بدون بارگذاری پرونده، مجوز خود را همگام‌سازی کنید. پس از انجام تغییرات در سرور ابری Bitwarden، گزینه «همگام‌سازی مجوز» را انتخاب کنید تا تغییرات اعمال شود."
   },
   "active": {
     "message": "فعال"
@@ -6730,7 +6760,7 @@
     "message": "اگر شناسه موجودیت یک نشانی اینترنتی نباشد، الزامی است."
   },
   "offerNoLongerValid": {
-    "message": "This offer is no longer valid. Contact your organization administrators for more information."
+    "message": "این پیشنهاد دیگر معتبر نیست. برای کسب اطلاعات بیشتر با مدیران سازمان خود تماس بگیرید."
   },
   "openIdOptionalCustomizations": {
     "message": "سفارشی سازی اختیاری"
@@ -6760,7 +6790,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "فقط موردهای فردی گاوصندوق شامل پیوست‌ها که به $EMAIL$ مرتبط هستند برون ریزی خواهند شد. موردهای گاوصندوق سازمانی شامل نمی‌شوند",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6822,10 +6852,28 @@
     "message": "ایجاد نام کاربری"
   },
   "generateEmail": {
-    "message": "Generate email"
+    "message": "تولید ایمیل"
+  },
+  "generatePassword": {
+    "message": "تولید کلمه عبور"
+  },
+  "generatePassphrase": {
+    "message": "تولید عبارت عبور"
+  },
+  "passwordGenerated": {
+    "message": "کلمه عبور تولید شد"
+  },
+  "passphraseGenerated": {
+    "message": "عبارت عبور تولید شد"
+  },
+  "usernameGenerated": {
+    "message": "نام کاربری تولید شد"
+  },
+  "emailGenerated": {
+    "message": "ایمیل تولید شد"
   },
   "spinboxBoundariesHint": {
-    "message": "Value must be between $MIN$ and $MAX$.",
+    "message": "مقدار باید بین $MIN$ و $MAX$ باشد.",
     "description": "Explains spin box minimum and maximum values to the user",
     "placeholders": {
       "min": {
@@ -6839,7 +6887,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " Use $RECOMMENDED$ characters or more to generate a strong password.",
+    "message": " برای تولید یک کلمه عبور قوی، از $RECOMMENDED$ کاراکتر یا بیشتر استفاده کنید.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -6849,7 +6897,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " Use $RECOMMENDED$ words or more to generate a strong passphrase.",
+    "message": " برای تولید یک عبارت عبور قوی، از $RECOMMENDED$ واژه یا بیشتر استفاده کنید.",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -6872,7 +6920,7 @@
     "message": "از صندوق ورودی پیکربندی شده دامنه خود استفاده کنید."
   },
   "useThisEmail": {
-    "message": "Use this email"
+    "message": "از این ایمیل استفاده شود"
   },
   "random": {
     "message": "تصادفی",
@@ -6882,23 +6930,26 @@
     "message": "کلمه تصادفی"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "تولید کننده نام کاربری"
   },
   "useThisPassword": {
-    "message": "Use this password"
+    "message": "از این کلمه عبور استفاده کن"
+  },
+  "useThisPassphrase": {
+    "message": "از این عبارت عبور استفاده کن"
   },
   "useThisUsername": {
-    "message": "Use this username"
+    "message": "از این نام کاربری استفاده کن"
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "کلمه عبور ایمن ساخته شد! فراموش نکنید کلمه عبور خود را در وب‌سایت نیز به‌روزرسانی کنید."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "از تولید کننده استفاده کنید",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "برای ایجاد یک کلمه عبور قوی و منحصر به فرد",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "service": {
@@ -6964,15 +7015,15 @@
     "message": "یک نام مستعار ایمیل با یک سرویس ارسال خارجی ایجاد کنید."
   },
   "forwarderDomainName": {
-    "message": "Email domain",
+    "message": "دامنه ایمیل",
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Choose a domain that is supported by the selected service",
+    "message": "دامنه‌ای را انتخاب کنید که توسط سرویس انتخاب شده پشتیبانی می‌شود",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
-    "message": "$SERVICENAME$ error: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ خطا: $ERRORMESSAGE$",
     "description": "Reports an error returned by a forwarding service to the user.",
     "placeholders": {
       "servicename": {
@@ -6986,11 +7037,11 @@
     }
   },
   "forwarderGeneratedBy": {
-    "message": "Generated by Bitwarden.",
+    "message": "تولید شده توسط Bitwarden.",
     "description": "Displayed with the address on the forwarding service's configuration screen."
   },
   "forwarderGeneratedByWithWebsite": {
-    "message": "Website: $WEBSITE$. Generated by Bitwarden.",
+    "message": "وب‌سایت: $WEBSITE$. تولید شده توسط Bitwarden.",
     "description": "Displayed with the address on the forwarding service's configuration screen.",
     "placeholders": {
       "WEBSITE": {
@@ -7000,7 +7051,7 @@
     }
   },
   "forwaderInvalidToken": {
-    "message": "Invalid $SERVICENAME$ API token",
+    "message": "توکن API نامعتبر برای $SERVICENAME$",
     "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -7010,7 +7061,7 @@
     }
   },
   "forwaderInvalidTokenWithMessage": {
-    "message": "Invalid $SERVICENAME$ API token: $ERRORMESSAGE$",
+    "message": "توکن API نامعتبر برای $SERVICENAME$: $ERRORMESSAGE$",
     "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -7024,7 +7075,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "message": "$SERVICENAME$ درخواست شما را رد کرد. لطفاً برای دریافت کمک با ارائه‌دهنده سرویس خود تماس بگیرید.",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -7034,7 +7085,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ درخواست شما را رد کرد: $ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -7048,7 +7099,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Unable to obtain $SERVICENAME$ masked email account ID.",
+    "message": "دریافت شناسه حساب ایمیل ماسک شده از $SERVICENAME$ امکان‌پذیر نیست.",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -7058,7 +7109,7 @@
     }
   },
   "forwarderNoDomain": {
-    "message": "Invalid $SERVICENAME$ domain.",
+    "message": "دامنه $SERVICENAME$ نامعتبر.",
     "description": "Displayed when the domain is empty or domain authorization failed at the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -7068,7 +7119,7 @@
     }
   },
   "forwarderNoUrl": {
-    "message": "Invalid $SERVICENAME$ url.",
+    "message": "نشانی $SERVICENAME$ نامعتبر.",
     "description": "Displayed when the url of the forwarding service wasn't supplied.",
     "placeholders": {
       "servicename": {
@@ -7078,7 +7129,7 @@
     }
   },
   "forwarderUnknownError": {
-    "message": "Unknown $SERVICENAME$ error occurred.",
+    "message": "خطای $SERVICENAME$ نامعلومی رخ داد.",
     "description": "Displayed when the forwarding service failed due to an unknown error.",
     "placeholders": {
       "servicename": {
@@ -7088,7 +7139,7 @@
     }
   },
   "forwarderUnknownForwarder": {
-    "message": "Unknown forwarder: '$SERVICENAME$'.",
+    "message": "فرواردکننده ناشناخته: $SERVICENAME$.",
     "description": "Displayed when the forwarding service is not supported.",
     "placeholders": {
       "servicename": {
@@ -7134,7 +7185,7 @@
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimIntegrationDescription": {
-    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning. Find supported integrations",
+    "message": "کاربران و گروه‌ها را به‌طور خودکار از طریق ارائه‌دهنده هویت مورد نظر خود با استفاده از تأمین‌کننده SCIM ایجاد کنید. ادغام‌های پشتیبانی‌شده را بیابید",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimEnabledCheckboxDesc": {
@@ -7256,10 +7307,10 @@
     }
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "۱ فیلد به توجه شما نیاز دارد."
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "فیلدهای $COUNT$ به توجه شما نیاز دارند.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7268,22 +7319,22 @@
     }
   },
   "duoHealthCheckResultsInNullAuthUrlError": {
-    "message": "Error connecting with the Duo service. Use a different two-step login method or contact Duo for assistance."
+    "message": "خطا در اتصال به سرویس Duo. از روش ورود دو مرحله‌ای دیگری استفاده کنید یا برای دریافت کمک با Duo تماس بگیرید."
   },
   "duoRequiredByOrgForAccount": {
-    "message": "Duo two-step login is required for your account."
+    "message": "ورود دو مرحله ای Duo برای حساب کاربری شما لازم است."
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "برای حساب کاربری شما ورود دو مرحله‌ای Duo لازم است. مراحل زیر را دنبال کنید تا ورود خود را کامل کنید."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "مراحل زیر را دنبال کنید تا وارد سیستم شوید."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "مراحل زیر را برای کامل کردن ورود با کلید امنیتی خود دنبال کنید."
   },
   "launchDuo": {
-    "message": "Launch Duo"
+    "message": "اجرای Duo"
   },
   "turnOn": {
     "message": "روشن"
@@ -7605,9 +7656,9 @@
     "message": "سرویس حساب به‌روز شد",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "پروژه‌ها یا اسرار را تایپ یا انتخاب کنید",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "پروژه ها را تایپ یا انتخاب کنید",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "برای فیلتر تایپ کنید",
@@ -7692,8 +7743,8 @@
     "message": "دسترسی به توکن‌ها",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "توکن دسترسی جدید",
+  "createAccessToken": {
+    "message": "توکن دسترسی ایجاد کنید",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -7792,7 +7843,7 @@
     "message": "با افزودن مجموعه‌ها به این گروه، اجازه دسترسی به مجموعه‌ها را بدهید."
   },
   "restrictedCollectionAssignmentDesc": {
-    "message": "You can only assign collections you manage."
+    "message": "شما فقط می‌توانید مجموعه‌هایی را اختصاص دهید که مدیریت آن‌ها بر عهده شماست."
   },
   "selectMembers": {
     "message": "انتخاب اعضا"
@@ -7903,43 +7954,43 @@
     }
   },
   "verificationRequiredForActionSetPinToContinue": {
-    "message": "Verification required for this action. Set a PIN to continue."
+    "message": "برای این اقدام تأیید لازم است. یک کد پین تعیین کنید تا ادامه دهید."
   },
   "setPin": {
-    "message": "Set PIN"
+    "message": "تنظیم کد پین"
   },
   "verifyWithBiometrics": {
-    "message": "Verify with biometrics"
+    "message": "تأیید با استفاده از بیومتریک"
   },
   "awaitingConfirmation": {
-    "message": "Awaiting confirmation"
+    "message": "در انتظار تأیید"
   },
   "couldNotCompleteBiometrics": {
-    "message": "Could not complete biometrics."
+    "message": "تکمیل بیومتریک ممکن نشد."
   },
   "needADifferentMethod": {
-    "message": "Need a different method?"
+    "message": "نیازمند روش دیگری هستید؟"
   },
   "useMasterPassword": {
-    "message": "Use master password"
+    "message": "استفاده از کلمه عبور اصلی"
   },
   "usePin": {
-    "message": "Use PIN"
+    "message": "استفاده از کد پین"
   },
   "useBiometrics": {
-    "message": "Use biometrics"
+    "message": "استفاده از بیومتریک"
   },
   "enterVerificationCodeSentToEmail": {
-    "message": "Enter the verification code that was sent to your email."
+    "message": "کد تأییدی را که به ایمیل شما ارسال شده است وارد کنید."
   },
   "resendCode": {
-    "message": "Resend code"
+    "message": "ارسال دوباره کد"
   },
   "memberColumnHeader": {
-    "message": "Member"
+    "message": "عضو"
   },
   "groupSlashMemberColumnHeader": {
-    "message": "Group/Member"
+    "message": "گروه/عضو"
   },
   "selectGroupsAndMembers": {
     "message": "گروه‌ها و اعضا را انتخاب کنید"
@@ -7948,7 +7999,7 @@
     "message": "انتخاب گروه‌ها"
   },
   "userPermissionOverrideHelperDesc": {
-    "message": "Permissions set for a member will replace permissions set by that member's group."
+    "message": "مجوزهای تنظیم شده برای یک عضو، جایگزین مجوزهای تعیین شده توسط گروه آن عضو می‌شود."
   },
   "noMembersOrGroupsAdded": {
     "message": "عضو یا گروهی اضافه نشد"
@@ -7963,7 +8014,7 @@
     "message": "دعوت از عضو"
   },
   "addSponsorship": {
-    "message": "Add sponsorship"
+    "message": "افزودن حمایت مالی"
   },
   "needsConfirmation": {
     "message": "نیاز به تأیید دارد"
@@ -7996,7 +8047,7 @@
     }
   },
   "teamsStarterPlanInvLimitReachedManageBilling": {
-    "message": "Teams Starter plans may have up to $SEATCOUNT$ members. Upgrade to your plan to invite more members.",
+    "message": "طرح‌های شروع تیم‌ها ممکن است تا $SEATCOUNT$ عضو داشته باشند. برای دعوت اعضای بیشتر، طرح‌ خود را ارتقا دهید.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8005,7 +8056,7 @@
     }
   },
   "teamsStarterPlanInvLimitReachedNoManageBilling": {
-    "message": "Teams Starter plans may have up to $SEATCOUNT$ members. Contact your organization owner to upgrade your plan and invite more members.",
+    "message": "طرح‌های شروع تیم‌ها ممکن است تا $SEATCOUNT$ عضو داشته باشند. برای ارتقا طرح و دعوت اعضای بیشتر با مالک سازمان خود تماس بگیرید.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8053,7 +8104,7 @@
     "message": "بارگذاری فایل"
   },
   "upload": {
-    "message": "Upload"
+    "message": "بارگذاری"
   },
   "acceptedFormats": {
     "message": "فرمت های پذیرفته شده:"
@@ -8065,13 +8116,13 @@
     "message": "یا"
   },
   "unlockWithBiometrics": {
-    "message": "Unlock with biometrics"
+    "message": "با استفاده از بیومتریک باز کنید"
   },
   "unlockWithPin": {
-    "message": "Unlock with PIN"
+    "message": "باز کردن با کد پین"
   },
   "unlockWithMasterPassword": {
-    "message": "Unlock with master password"
+    "message": "باز کردن قفل با کلمه عبور اصلی"
   },
   "licenseAndBillingManagement": {
     "message": "مدیریت مجوز و صورتحساب"
@@ -8083,7 +8134,7 @@
     "message": "آپلود دستی"
   },
   "manualBillingTokenUploadDesc": {
-    "message": "If you do not want to opt into billing sync, manually upload your license here. This will not automatically unlock Families sponsorships."
+    "message": "اگر نمی‌خواهید همگام‌سازی صورتحساب را فعال کنید، می‌توانید مجوز خود را به‌صورت دستی در اینجا بارگذاری کنید. این کار به‌صورت خودکار حمایت‌های خانواده را فعال نخواهد کرد."
   },
   "syncLicense": {
     "message": "مجوز همگام‌سازی"
@@ -8155,7 +8206,7 @@
     "message": "تنظیمات رمزگذاری خود را برای رعایت توصیه‌های امنیتی جدید و بهبود حفاظت از حساب به‌روزرسانی کنید."
   },
   "kdfSettingsChangeLogoutWarning": {
-    "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
+    "message": "ادامه دادن باعث خروج شما از تمام نشست‌های فعال خواهد شد. برای ادامه باید دوباره وارد شوید و در صورت فعال بودن، ورود دو مرحله‌ای را کامل کنید. توصیه می‌کنیم قبل از تغییر تنظیمات رمزنگاری، از گاوصندوق خود خروجی بگیرید تا از دست رفتن داده‌ها جلوگیری شود."
   },
   "secretsManager": {
     "message": "مدیر رازها"
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "هنگام تلاش برای خواندن فایل درون ریزی شده خطایی رخ داد"
   },
+  "accessedSecretWithId": {
+    "message": "به یک راز با شناسه‌ی $SECRET_ID$ دسترسی پیدا شد",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "به $SECRET_ID$ مخفی دسترسی پیدا کرد.",
     "placeholders": {
@@ -8203,12 +8263,39 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "یک راز با شناسه‌ی $SECRET_ID$ دسترسی ویرایش شد",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "یک راز با شناسه‌ی $SECRET_ID$ دسترسی حذف شد",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "یک راز با شناسه‌ی $SECRET_ID$ دسترسی ساخته شد",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
   },
   "createAnAccount": {
-    "message": "Create an account"
+    "message": "ایجاد حساب کاربری"
   },
   "createSecret": {
     "message": "ساختن یک راز"
@@ -8352,16 +8439,16 @@
     "message": "ورود به سیستم آغاز شد"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Remember this device to make future logins seamless"
+    "message": "این دستگاه را به خاطر بسپار تا ورودهای بعدی بدون مشکل انجام شود"
   },
   "deviceApprovalRequired": {
     "message": "تأیید دستگاه لازم است. یک روش تأیید انتخاب کنید:"
   },
   "deviceApprovalRequiredV2": {
-    "message": "Device approval required"
+    "message": "تأیید دستگاه لازم است"
   },
   "selectAnApprovalOptionBelow": {
-    "message": "Select an approval option below"
+    "message": "یکی از گزینه‌های تأیید زیر را انتخاب کنید"
   },
   "rememberThisDevice": {
     "message": "این دستگاه را به خاطر بسپار"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "درخواست تأیید مدیر"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "رمزگذاری دستگاه مورد اعتماد"
   },
@@ -8382,43 +8475,43 @@
     "message": "دستگاه‌های مورد اعتماد"
   },
   "memberDecryptionOptionTdeDescPart1": {
-    "message": "Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The",
+    "message": "اعضا هنگام ورود با SSO نیازی به وارد کردن کلمه عبور اصلی نخواهند داشت. کلمه عبور اصلی با یک کلید رمزنگاری ذخیره شده در دستگاه جایگزین می‌شود که باعث می‌شود آن دستگاه مورد اعتماد باشد. اولین دستگاهی که عضو با آن حساب کاربری خود را ایجاد کرده و وارد می‌شود، به عنوان دستگاه مورد اعتماد شناخته می‌شود. دستگاه‌های جدید باید توسط یک دستگاه مورد اعتماد موجود یا توسط مدیر تایید شوند. ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescLink1": {
-    "message": "single organization",
+    "message": "سازمان واحد",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescPart2": {
-    "message": "policy,",
+    "message": "سیاست‌ها",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescLink2": {
-    "message": "SSO required",
+    "message": "SSO الزامی است",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescPart3": {
-    "message": "policy, and",
+    "message": "سیاست‌ها و",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescLink3": {
-    "message": "account recovery administration",
+    "message": "مدیریت بازیابی حساب کاربری",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescPart4": {
-    "message": "policy will turn on when this option is used.",
+    "message": "این سیاست زمانی فعال می‌شود که این گزینه استفاده شود.",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "orgPermissionsUpdatedMustSetPassword": {
-    "message": "Your organization permissions were updated, requiring you to set a master password.",
+    "message": "مجوزهای سازمان شما به‌روزرسانی شد، باید یک کلمه عبور اصلی تنظیم کنید.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "orgRequiresYouToSetPassword": {
-    "message": "Your organization requires you to set a master password.",
+    "message": "سازمانتان از شما می‌خواهد که یک کلمه عبور اصلی تنظیم کنید.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
-    "message": "out of $TOTAL$",
+    "message": "از میان $TOTAL$",
     "placeholders": {
       "total": {
         "content": "$1",
@@ -8436,7 +8529,7 @@
     }
   },
   "verificationRequired": {
-    "message": "Verification required",
+    "message": "تأیید لازم است",
     "description": "Default title for the user verification dialog."
   },
   "recoverAccount": {
@@ -8485,16 +8578,16 @@
     "message": "درخواست تأیید"
   },
   "deviceApproved": {
-    "message": "Device approved"
+    "message": "دستگاه تایید شد"
   },
   "deviceRemoved": {
-    "message": "Device removed"
+    "message": "دستگاه حذف شد"
   },
   "removeDevice": {
-    "message": "Remove device"
+    "message": "حذف دستگاه"
   },
   "removeDeviceConfirmation": {
-    "message": "Are you sure you want to remove this device?"
+    "message": "آیا مطمئن هستید که می‌خواهید این دستگاه را حذف کنید؟"
   },
   "noDeviceRequests": {
     "message": "بدون درخواست دستگاه"
@@ -8551,7 +8644,7 @@
     "message": "تأیید دستگاه درخواست."
   },
   "tdeOffboardingPasswordSet": {
-    "message": "User set a master password during TDE offboarding."
+    "message": "کاربر در هنگام خروج از TDE، یک کلمه عبور اصلی تنظیم کرده است."
   },
   "startYour7DayFreeTrialOfBitwardenFor": {
     "message": "نسخه آزمایشی رایگان ۷ روزه Bitwarden را با $ORG$ شروع کنید",
@@ -8563,7 +8656,7 @@
     }
   },
   "startYour7DayFreeTrialOfBitwardenSecretsManagerFor": {
-    "message": "Start your 7-Day free trial of Bitwarden Secrets Manager for $ORG$",
+    "message": "شروع دوره آزمایشی رایگان ۷ روزه مدیر اسرار Bitwarden برای $ORG$",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -8575,7 +8668,7 @@
     "message": "بعدی"
   },
   "ssoLoginIsRequired": {
-    "message": "SSO login is required"
+    "message": "ورود از طریق SSO الزامی است"
   },
   "selectedRegionFlag": {
     "message": "پرچم منطقه انتخاب شد"
@@ -8599,19 +8692,11 @@
     "message": "ایمیل کاربر وجود ندارد"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "ایمیل کاربر فعال پیدا نشد. در حال خارج کردن شما از سیستم هستیم."
   },
   "deviceTrusted": {
     "message": "دستگاه مورد اعتماد است"
   },
-  "sendsNoItemsTitle": {
-    "message": "ارسال‌های فعالی نیست",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "از ارسال برای اشتراک‌گذاری امن اطلاعات رمزگذاری شده با هر کسی استفاده کنید.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "دعوت کاربران"
   },
@@ -8691,25 +8776,25 @@
     }
   },
   "collectionManagement": {
-    "message": "Collection management"
+    "message": "مدیریت مجموعه"
   },
   "collectionManagementDesc": {
-    "message": "Manage the collection behavior for the organization"
+    "message": "مدیریت رفتار مجموعه برای سازمان"
   },
   "limitCollectionCreationDesc": {
-    "message": "Limit collection creation to owners and admins"
+    "message": "محدود کردن ایجاد مجموعه فقط به مالکان و مدیران"
   },
   "limitCollectionDeletionDesc": {
-    "message": "Limit collection deletion to owners and admins"
+    "message": "محدود کردن حذف مجموعه فقط به مالکان و مدیران"
   },
   "limitItemDeletionDescription": {
-    "message": "Limit item deletion to members with the Manage collection permissions"
+    "message": "حذف موارد را فقط به اعضایی که دارای مجوز مدیریت مجموعه هستند محدود کنید"
   },
   "allowAdminAccessToAllCollectionItemsDesc": {
-    "message": "Owners and admins can manage all collections and items"
+    "message": "مالکان و مدیران می‌توانند تمام مجموعه‌ها و موارد را مدیریت کنند"
   },
   "updatedCollectionManagement": {
-    "message": "Updated collection management setting"
+    "message": "تنظیم مدیریت مجموعه به‌روزرسانی شد"
   },
   "passwordManagerPlanPrice": {
     "message": "قیمت طرح مدیریت کلمه عبور"
@@ -8742,29 +8827,29 @@
     "message": "آزمایشی"
   },
   "assignCollectionAccess": {
-    "message": "Assign collection access"
+    "message": "اختصاص دسترسی به مجموعه"
   },
   "editedCollections": {
-    "message": "Edited collections"
+    "message": "مجموعه‌های ویرایش شده"
   },
   "baseUrl": {
     "message": "نشانی اینترنتی سرور"
   },
   "selfHostBaseUrl": {
-    "message": "Self-host server URL",
+    "message": "نشانی اینترنتی سرور خود میزبان",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "alreadyHaveAccount": {
     "message": "پیشتر حساب کاربری داشته اید؟"
   },
   "toggleSideNavigation": {
-    "message": "Toggle side navigation"
+    "message": "تغییر وضعیت ناوبری کناری"
   },
   "skipToContent": {
-    "message": "Skip to content"
+    "message": "پرش به محتوا"
   },
   "managePermissionRequired": {
-    "message": "At least one member or group must have can manage permission."
+    "message": "حداقل یک عضو یا گروه باید دارای مجوز مدیریت کردن باشد."
   },
   "typePasskey": {
     "message": "کلید عبور"
@@ -8776,7 +8861,7 @@
     "message": "کلید عبور در مورد شبیه سازی شده کپی نمی‌شود. آیا می‌خواهید به شبیه سازی این مورد ادامه دهید؟"
   },
   "modifiedCollectionManagement": {
-    "message": "Modified collection management setting $ID$.",
+    "message": "تنظیم مدیریت مجموعه با شناسه $ID$ تغییر یافت.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -8785,60 +8870,84 @@
     }
   },
   "seeDetailedInstructions": {
-    "message": "See detailed instructions on our help site at",
+    "message": "دستورالعمل‌های کامل را در سایت راهنمای ما مشاهده کنید در",
     "description": "This is followed a by a hyperlink to the help website."
   },
   "installBrowserExtension": {
-    "message": "Install browser extension"
+    "message": "نصب افزونه مرورگر"
   },
   "installBrowserExtensionDetails": {
-    "message": "Use the extension to quickly save logins and auto-fill forms without opening the web app."
+    "message": "برای ذخیره سریع ورودها و پر کردن خودکار فرم‌ها بدون باز کردن برنامه وب، از افزونه استفاده کنید."
   },
   "projectAccessUpdated": {
-    "message": "Project access updated"
+    "message": "دسترسی پروژه به‌روزرسانی شد"
   },
   "unexpectedErrorSend": {
-    "message": "An unexpected error has occurred while loading this Send. Try again later."
+    "message": "هنگام بارگذاری این ارسال، خطای غیرمنتظره‌ای رخ داده است. لطفاً بعداً دوباره تلاش کنید."
   },
   "seatLimitReached": {
-    "message": "Seat limit has been reached"
+    "message": "حداکثر ظرفیت صندلی‌ها پر شده است"
   },
   "contactYourProvider": {
-    "message": "Contact your provider to purchase additional seats."
+    "message": "برای خرید صندلی‌های بیشتر با ارائه‌دهنده خود تماس بگیرید."
   },
   "seatLimitReachedContactYourProvider": {
-    "message": "Seat limit has been reached. Contact your provider to purchase additional seats."
+    "message": "حداکثر ظرفیت صندلی‌ها پر شده است. برای خرید صندلی‌های بیشتر با ارائه‌دهنده خود تماس بگیرید."
   },
   "collectionAccessRestricted": {
-    "message": "Collection access is restricted"
+    "message": "دسترسی به مجموعه محدود شده است"
   },
   "readOnlyCollectionAccess": {
-    "message": "You do not have access to manage this collection."
+    "message": "شما دسترسی مدیریت این مجموعه را ندارید."
   },
   "grantManageCollectionWarningTitle": {
-    "message": "Missing Manage Collection Permissions"
+    "message": "مجوزهای مدیریت مجموعه وجود ندارد"
   },
   "grantManageCollectionWarning": {
-    "message": "Grant Manage collection permissions to allow full collection management including deletion of collection."
+    "message": "برای اجازه مدیریت کامل مجموعه، از جمله حذف مجموعه، مجوزهای مدیریت مجموعه را اعطا کنید."
   },
   "grantCollectionAccess": {
-    "message": "Grant groups or members access to this collection."
+    "message": "دسترسی گروه‌ها یا اعضا را به این مجموعه اعطا کنید."
   },
   "grantCollectionAccessMembersOnly": {
-    "message": "Grant members access to this collection."
+    "message": "به اعضا دسترسی به این مجموعه بدهید."
   },
   "adminCollectionAccess": {
-    "message": "Administrators can access and manage collections."
+    "message": "مدیران می‌توانند به مجموعه‌ها دسترسی داشته و آن‌ها را مدیریت کنند."
   },
   "serviceAccountAccessUpdated": {
-    "message": "Service account access updated"
+    "message": "دسترسی حساب کاربری سرویس به‌روزرسانی شد"
   },
   "commonImportFormats": {
-    "message": "Common formats",
+    "message": "فرمت‌های رایج",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "تشخیص تطابق نشانی اینترنتی روشی است که Bitwarden برای شناسایی پیشنهادهای پر کردن خودکار استفاده می‌کند.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"عبارت منظم\" یک گزینه پیشرفته است که خطر افشای اطلاعات ورود را افزایش می‌دهد.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"شروع با\" یک گزینه پیشرفته است که خطر افشای اطلاعات ورود را افزایش می‌دهد.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "اطلاعات بیشتر درباره‌ی تشخیص تطابق",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
-    "message": "To maintain your subscription for $ORG$, ",
+    "message": "برای حفظ اشتراک خود در $ORG$، ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
     "placeholders": {
       "org": {
@@ -8848,103 +8957,103 @@
     }
   },
   "addAPaymentMethod": {
-    "message": "add a payment method",
+    "message": "یک روش پرداخت اضافه کنید",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method'"
   },
   "organizationInformation": {
-    "message": "Organization information"
+    "message": "اطلاعات سازمان"
   },
   "confirmationDetails": {
-    "message": "Confirmation details"
+    "message": "تأیید جزئیات"
   },
   "smFreeTrialThankYou": {
-    "message": "Thank you for signing up for Bitwarden Secrets Manager!"
+    "message": "متشکریم که در مدیر اسرار Bitwarden ثبت‌نام کردید!"
   },
   "smFreeTrialConfirmationEmail": {
-    "message": "We've sent a confirmation email to your email at "
+    "message": "ما یک ایمیل تأیید به نشانی ایمیل شما ارسال کرده‌ایم در "
   },
   "sorryToSeeYouGo": {
-    "message": "Sorry to see you go! Help improve Bitwarden by sharing why you're canceling.",
+    "message": "متأسفیم که می‌روید! با به اشتراک‌گذاری دلیل لغو اشتراک، به بهبود Bitwarden کمک کنید.",
     "description": "A message shown to users as part of an offboarding survey asking them to provide more information on their subscription cancelation."
   },
   "selectCancellationReason": {
-    "message": "Select a reason for canceling",
+    "message": "لطفاً دلیل لغو اشتراک را انتخاب کنید",
     "description": "Used as a form field label for a select input on the offboarding survey."
   },
   "anyOtherFeedback": {
-    "message": "Is there any other feedback you'd like to share?",
+    "message": "آیا بازخورد دیگری هست که مایل باشید با ما در میان بگذارید؟",
     "description": "Used as a form field label for a textarea input on the offboarding survey."
   },
   "missingFeatures": {
-    "message": "Missing features",
+    "message": "ویژگی‌ها وجود ندارد",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "movingToAnotherTool": {
-    "message": "Moving to another tool",
+    "message": "در حال انتقال به ابزار دیگری هستم",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "tooDifficultToUse": {
-    "message": "Too difficult to use",
+    "message": "استفاده از آن خیلی دشوار است",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "notUsingEnough": {
-    "message": "Not using enough",
+    "message": "به اندازه کافی از آن استفاده نمی‌کنم",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "tooExpensive": {
-    "message": "Too expensive",
+    "message": "خیلی گران است",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "freeForOneYear": {
-    "message": "Free for 1 year"
+    "message": "رایگان برای یک سال"
   },
   "newWebApp": {
-    "message": "Welcome to the new and improved web app. Learn more about what’s changed."
+    "message": "به برنامه وب جدید و بهبود یافته خوش آمدید. برای آشنایی با تغییرات انجام شده بیشتر بدانید."
   },
   "releaseBlog": {
-    "message": "Read release blog"
+    "message": "مطالعه‌ی بلاگ انتشار نسخه"
   },
   "adminConsole": {
-    "message": "Admin Console"
+    "message": "کنسول مدیر"
   },
   "providerPortal": {
-    "message": "Provider Portal"
+    "message": "درگاه ارائه‌دهنده"
   },
   "success": {
-    "message": "Success"
+    "message": "موفقیت آمیز بود"
   },
   "restrictedGroupAccess": {
-    "message": "You cannot add yourself to groups."
+    "message": "شما نمی‌توانید خودتان را به گروه‌ها اضافه کنید."
   },
   "cannotAddYourselfToCollections": {
-    "message": "You cannot add yourself to collections."
+    "message": "شما نمی‌توانید خودتان را به مجموعه‌ها اضافه کنید."
   },
   "assign": {
-    "message": "Assign"
+    "message": "اختصاص بدهید"
   },
   "assignToCollections": {
-    "message": "Assign to collections"
+    "message": "اختصاص به مجموعه‌ها"
   },
   "assignToTheseCollections": {
-    "message": "Assign to these collections"
+    "message": "اختصاص به این مجموعه‌ها"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Only organization members with access to these collections will be able to see the item."
+    "message": "فقط اعضای سازمانی که به این مجموعه‌ها دسترسی دارند قادر به مشاهده این مورد خواهند بود."
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Only organization members with access to these collections will be able to see the items."
+    "message": "فقط اعضای سازمانی که به این مجموعه‌ها دسترسی دارند قادر به مشاهده این موارد خواهند بود."
   },
   "selectCollectionsToAssign": {
-    "message": "Select collections to assign"
+    "message": "مجموعه‌ها را برای اختصاص انتخاب کنید"
   },
   "noCollectionsAssigned": {
-    "message": "No collections have been assigned"
+    "message": "هیچ مجموعه‌ای اختصاص داده نشده است"
   },
   "successfullyAssignedCollections": {
-    "message": "Successfully assigned collections"
+    "message": "مجموعه‌ها با موفقیت اختصاص داده شدند"
   },
   "bulkCollectionAssignmentWarning": {
-    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "message": "شما $TOTAL_COUNT$ مورد را انتخاب کرده‌اید. نمی‌توانید $READONLY_COUNT$ مورد را به‌روزرسانی کنید زیرا دسترسی ویرایش ندارید.",
     "placeholders": {
       "total_count": {
         "content": "$1",
@@ -8957,61 +9066,61 @@
     }
   },
   "addField": {
-    "message": "Add field"
+    "message": "افزودن فیلد"
   },
   "editField": {
-    "message": "Edit field"
+    "message": "ویرایش فیلد"
   },
   "items": {
-    "message": "Items"
+    "message": "موارد"
   },
   "assignedSeats": {
-    "message": "Assigned seats"
+    "message": "صندلی‌های اختصاص داده شده"
   },
   "assigned": {
-    "message": "Assigned"
+    "message": "اختصاص یافته"
   },
   "used": {
-    "message": "Used"
+    "message": "استفاده شده"
   },
   "remaining": {
-    "message": "Remaining"
+    "message": "باقی مانده"
   },
   "unlinkOrganization": {
-    "message": "Unlink organization"
+    "message": "قطع ارتباط با سازمان"
   },
   "manageSeats": {
-    "message": "MANAGE SEATS"
+    "message": "مدیریت صندلی‌ها"
   },
   "manageSeatsDescription": {
-    "message": "Adjustments to seats will be reflected in the next billing cycle."
+    "message": "تغییرات در تعداد صندلی‌ها در دوره صورتحساب بعدی اعمال خواهد شد."
   },
   "unassignedSeatsDescription": {
-    "message": "Unassigned seats"
+    "message": "صندلی‌های تخصیص داده نشده"
   },
   "purchaseSeatDescription": {
-    "message": "Additional seats purchased"
+    "message": "صندلی‌های اضافی خریداری شده"
   },
   "assignedSeatCannotUpdate": {
-    "message": "Assigned Seats can not be updated. Please contact your organization owner for assistance."
+    "message": "صندلی‌های اختصاص داده شده قابل به‌روزرسانی نیستند. لطفاً برای دریافت کمک با مدیر سازمان خود تماس بگیرید."
   },
   "subscriptionUpdateFailed": {
-    "message": "Subscription update failed"
+    "message": "به‌روزرسانی اشتراک ناموفق بود"
   },
   "trial": {
-    "message": "Trial",
+    "message": "نسخه آزمایشی",
     "description": "A subscription status label."
   },
   "pastDue": {
-    "message": "Past due",
+    "message": "بدهی معوق",
     "description": "A subscription status label"
   },
   "subscriptionExpired": {
-    "message": "Subscription expired",
+    "message": "اشتراک به پایان رسیده است",
     "description": "The date header used when a subscription is past due."
   },
   "pastDueWarningForChargeAutomatically": {
-    "message": "You have a grace period of $DAYS$ days from your subscription expiration date to maintain your subscription. Please resolve the past due invoices by $SUSPENSION_DATE$.",
+    "message": "شما یک دوره مهلت به مدت $DAYS$ روز از تاریخ انقضای اشتراک خود دارید تا اشتراک خود را حفظ کنید. لطفاً فاکتورهای معوق را تا تاریخ $SUSPENSION_DATE$ تسویه کنید.",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -9025,7 +9134,7 @@
     "description": "A warning shown to the user when their subscription is past due and they are charged automatically."
   },
   "pastDueWarningForSendInvoice": {
-    "message": "You have a grace period of $DAYS$ days from the date your first unpaid invoice is due to maintain your subscription. Please resolve the past due invoices by $SUSPENSION_DATE$.",
+    "message": "شما یک دوره مهلت به مدت $DAYS$ روز از تاریخ سررسید اولین فاکتور پرداخت نشده دارید تا اشتراک خود را حفظ کنید. لطفاً فاکتورهای معوق را تا تاریخ $SUSPENSION_DATE$ تسویه کنید.",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -9039,54 +9148,54 @@
     "description": "A warning shown to the user when their subscription is past due and they pay via invoice."
   },
   "unpaidInvoice": {
-    "message": "Unpaid invoice",
+    "message": "صورت حساب پرداخت نشده",
     "description": "The header of a warning box shown to a user whose subscription is unpaid."
   },
   "toReactivateYourSubscription": {
-    "message": "To reactivate your subscription, please resolve the past due invoices.",
+    "message": "برای فعال‌سازی مجدد اشتراک خود، لطفاً فاکتورهای معوق را تسویه کنید.",
     "description": "The body of a warning box shown to a user whose subscription is unpaid."
   },
   "cancellationDate": {
-    "message": "Cancellation date",
+    "message": "تاریخ لغو",
     "description": "The date header used when a subscription is cancelled."
   },
   "machineAccountsCannotCreate": {
-    "message": "Machine accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
+    "message": "حساب‌های ماشین را نمی‌توان در سازمان‌های معلق ایجاد کرد. لطفاً برای کمک با مالک سازمان خود تماس بگیرید."
   },
   "machineAccount": {
-    "message": "Machine account",
+    "message": "حساب کاربری دستگاه",
     "description": "A machine user which can be used to automate processes and access secrets in the system."
   },
   "machineAccounts": {
-    "message": "Machine accounts",
+    "message": "حساب‌های کاربری دستگاه",
     "description": "The title for the section that deals with machine accounts."
   },
   "newMachineAccount": {
-    "message": "New machine account",
+    "message": "حساب کاربری دستگاه جدید",
     "description": "Title for creating a new machine account."
   },
   "machineAccountsNoItemsMessage": {
-    "message": "Create a new machine account to get started automating secret access.",
+    "message": "برای شروع خودکارسازی دسترسی مخفی، یک حساب دستگاه جدید ایجاد کنید.",
     "description": "Message to encourage the user to start creating machine accounts."
   },
   "machineAccountsNoItemsTitle": {
-    "message": "Nothing to show yet",
+    "message": "هنوز چیزی برای نشان دادن موجود نیست",
     "description": "Title to indicate that there are no machine accounts to display."
   },
   "deleteMachineAccounts": {
-    "message": "Delete machine accounts",
+    "message": "حذف حساب‌های دستگاه",
     "description": "Title for the action to delete one or multiple machine accounts."
   },
   "deleteMachineAccount": {
-    "message": "Delete machine account",
+    "message": "حذف حساب دستگاه",
     "description": "Title for the action to delete a single machine account."
   },
   "viewMachineAccount": {
-    "message": "View machine account",
+    "message": "مشاهده حساب دستگاه",
     "description": "Action to view the details of a machine account."
   },
   "deleteMachineAccountDialogMessage": {
-    "message": "Deleting machine account $MACHINE_ACCOUNT$ is permanent and irreversible.",
+    "message": "حذف حساب دستگاه $MACHINE_ACCOUNT$ دائمی و غیرقابل بازگشت است.",
     "placeholders": {
       "machine_account": {
         "content": "$1",
@@ -9095,10 +9204,10 @@
     }
   },
   "deleteMachineAccountsDialogMessage": {
-    "message": "Deleting machine accounts is permanent and irreversible."
+    "message": "حذف حساب‌های ماشین، دائمی و غیرقابل برگشت است."
   },
   "deleteMachineAccountsConfirmMessage": {
-    "message": "Delete $COUNT$ machine accounts",
+    "message": "حذف $COUNT$ حساب دستگاه",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9107,60 +9216,60 @@
     }
   },
   "deleteMachineAccountToast": {
-    "message": "Machine account deleted"
+    "message": "حساب دستگاه حذف شد"
   },
   "deleteMachineAccountsToast": {
-    "message": "Machine accounts deleted"
+    "message": "حساب‌های دستگاه حذف شد"
   },
   "searchMachineAccounts": {
-    "message": "Search machine accounts",
+    "message": "جستجوی حساب‌های دستگاه",
     "description": "Placeholder text for searching machine accounts."
   },
   "editMachineAccount": {
-    "message": "Edit machine account",
+    "message": "ویرایش حساب دستگاه",
     "description": "Title for editing a machine account."
   },
   "machineAccountName": {
-    "message": "Machine account name",
+    "message": "نام حساب دستگاه",
     "description": "Label for the name of a machine account"
   },
   "machineAccountCreated": {
-    "message": "Machine account created",
+    "message": "حساب دستگاه ایجاد شد",
     "description": "Notifies that a new machine account has been created"
   },
   "machineAccountUpdated": {
-    "message": "Machine account updated",
+    "message": "حساب دستگاه به‌روزرسانی شد",
     "description": "Notifies that a machine account has been updated"
   },
   "projectMachineAccountsDescription": {
-    "message": "Grant machine accounts access to this project."
+    "message": "دسترسی حساب‌های دستگاه به این پروژه را اعطا کنید."
   },
   "projectMachineAccountsSelectHint": {
-    "message": "Type or select machine accounts"
+    "message": "حساب‌های دستگاه را وارد کنید یا انتخاب کنید"
   },
   "projectEmptyMachineAccountAccessPolicies": {
-    "message": "Add machine accounts to grant access"
+    "message": "برای اعطای دسترسی، حساب‌های دستگاه را اضافه کنید"
   },
   "machineAccountPeopleDescription": {
-    "message": "Grant groups or people access to this machine account."
+    "message": "به گروه‌ها یا افراد اجازه دسترسی به این حساب ماشین را بدهید."
   },
   "machineAccountProjectsDescription": {
-    "message": "Assign projects to this machine account. "
+    "message": "پروژه‌ها را به این حساب دستگاه اختصاص دهید. "
   },
   "createMachineAccount": {
-    "message": "Create a machine account"
+    "message": "ایجاد حساب دستگاه"
   },
   "maPeopleWarningMessage": {
-    "message": "Removing people from a machine account does not remove the access tokens they created. For security best practice, it is recommended to revoke access tokens created by people removed from a machine account."
+    "message": "حذف افراد از حساب دستگاه، توکن‌های دسترسی ایجاد شده توسط آن‌ها را حذف نمی‌کند. برای بهترین عملکرد امنیتی، توصیه می‌شود توکن‌های دسترسی ایجاد شده توسط افرادی که از حساب دستگاه حذف شده‌اند لغو شود."
   },
   "smAccessRemovalWarningMaTitle": {
-    "message": "Remove access to this machine account"
+    "message": "دسترسی به این حساب دستگاه را حذف کنید"
   },
   "smAccessRemovalWarningMaMessage": {
-    "message": "This action will remove your access to the machine account."
+    "message": "این عمل دسترسی شما به حساب دستگاه را حذف می‌کند."
   },
   "machineAccountsIncluded": {
-    "message": "$COUNT$ machine accounts included",
+    "message": "تعداد $COUNT$ حساب ماشین شامل شده است",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9169,7 +9278,7 @@
     }
   },
   "additionalMachineAccountCost": {
-    "message": "$COST$ per month for additional machine accounts",
+    "message": "$COST$ در ماه برای هر حساب ماشین اضافی",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -9178,10 +9287,10 @@
     }
   },
   "additionalMachineAccounts": {
-    "message": "Additional machine accounts"
+    "message": "حساب‌های ماشین اضافی"
   },
   "includedMachineAccounts": {
-    "message": "Your plan comes with $COUNT$ machine accounts.",
+    "message": "طرح شما شامل $COUNT$ حساب ماشین است.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9190,7 +9299,7 @@
     }
   },
   "addAdditionalMachineAccounts": {
-    "message": "You can add additional machine accounts for $COST$ per month.",
+    "message": "می‌توانید دستگاه اضافی حساب‌ها را با $COST$ در ماه اضافه کنید.",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -9199,31 +9308,31 @@
     }
   },
   "limitMachineAccounts": {
-    "message": "Limit machine accounts (optional)"
+    "message": "محدود کردن حساب‌های دستگاه (اختیاری)"
   },
   "limitMachineAccountsDesc": {
-    "message": "Set a limit for your machine accounts. Once this limit is reached, you will not be able to create new machine accounts."
+    "message": "برای حساب‌های دستگاه خود محدودیتی تعیین کنید. پس از رسیدن به این محدودیت، نمی‌توانید حساب‌های دستگاه جدید ایجاد کنید."
   },
   "machineAccountLimit": {
-    "message": "Machine account limit (optional)"
+    "message": "حداکثر تعداد حساب‌های ماشین (اختیاری)"
   },
   "maxMachineAccountCost": {
-    "message": "Max potential machine account cost"
+    "message": "حداکثر هزینه ممکن برای حساب‌های دستگاه"
   },
   "machineAccountAccessUpdated": {
-    "message": "Machine account access updated"
+    "message": "دسترسی حساب‌های دستگاه به‌روزرسانی شد"
   },
   "restrictedGroupAccessDesc": {
-    "message": "You cannot add yourself to a group."
+    "message": "شما نمی‌توانید خودتان را به یک گروه اضافه کنید."
   },
   "deleteProvider": {
-    "message": "Delete provider"
+    "message": "حذف ارائه‌دهنده"
   },
   "deleteProviderConfirmation": {
-    "message": "Deleting a provider is permanent and irreversible. Enter your master password to confirm the deletion of the provider and all associated data."
+    "message": "حذف یک ارائه‌دهنده دائمی و غیرقابل بازگشت است. برای تأیید حذف ارائه‌دهنده و تمام داده‌های مرتبط، کلمه عبور اصلی خود را وارد کنید."
   },
   "deleteProviderName": {
-    "message": "Cannot delete $ID$",
+    "message": "امکان حذف $ID$ وجود ندارد",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9232,7 +9341,7 @@
     }
   },
   "deleteProviderWarningDescription": {
-    "message": "You must unlink all clients before you can delete $ID$.",
+    "message": "قبل از حذف $ID$ باید تمام مشتری‌ها را جدا کنید.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9241,96 +9350,96 @@
     }
   },
   "providerDeleted": {
-    "message": "Provider deleted"
+    "message": "ارائه‌دهنده حذف شد"
   },
   "providerDeletedDesc": {
-    "message": "The Provider and all associated data has been deleted."
+    "message": "ارائه‌دهنده و تمام داده‌های مرتبط حذف شدند."
   },
   "deleteProviderRecoverConfirmDesc": {
-    "message": "You have requested to delete this Provider. Use the button below to confirm."
+    "message": "شما درخواست حذف این ارائه‌دهنده را داده‌اید. برای تأیید، از دکمه زیر استفاده کنید."
   },
   "deleteProviderWarning": {
-    "message": "Deleting your provider is permanent. It cannot be undone."
+    "message": "حذف ارائه‌دهنده شما دائمی است و قابل بازگشت نیست."
   },
   "errorAssigningTargetCollection": {
-    "message": "Error assigning target collection."
+    "message": "خطا در اختصاص مجموعه هدف."
   },
   "errorAssigningTargetFolder": {
-    "message": "Error assigning target folder."
+    "message": "خطا در اختصاص پوشه هدف."
   },
   "integrationsAndSdks": {
-    "message": "Integrations & SDKs",
+    "message": "ادغام‌ها و کیت‌های توسعه نرم‌افزار (SDK)",
     "description": "The title for the section that deals with integrations and SDKs."
   },
   "integrations": {
-    "message": "Integrations"
+    "message": "یکپارچه سازی‌ها"
   },
   "integrationsDesc": {
-    "message": "Automatically sync secrets from Bitwarden Secrets Manager to a third-party service."
+    "message": "همگام‌سازی خودکار رمزها از مدیر اسرار Bitwarden به سرویس‌های ثالث."
   },
   "sdks": {
-    "message": "SDKs"
+    "message": "SDK ها"
   },
   "sdksDesc": {
-    "message": "Use Bitwarden Secrets Manager SDK in the following programming languages to build your own applications."
+    "message": "برای ساخت برنامه‌های خود، از کیت توسعه مدیر اسرار (SDK) Bitwarden در زبان‌های برنامه‌نویسی زیر استفاده کنید."
   },
   "ssoDescStart": {
-    "message": "Configure",
+    "message": "پیکربندی",
     "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
   },
   "ssoDescEnd": {
-    "message": "for Bitwarden using the implementation guide for your Identity Provider.",
+    "message": "برای Bitwarden با استفاده از راهنمای پیاده‌سازی ارائه‌دهنده هویت خود.",
     "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
   },
   "userProvisioning": {
-    "message": "User provisioning"
+    "message": "تأمین کاربران"
   },
   "scimIntegration": {
     "message": "SCIM"
   },
   "scimIntegrationDescStart": {
-    "message": "Configure ",
+    "message": "پیکربندی ",
     "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
   },
   "scimIntegrationDescEnd": {
-    "message": "(System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider.",
+    "message": "سامانه مدیریت هویت بین‌دامنه (Scim) برای تأمین خودکار کاربران و گروه‌ها در Bitwarden با استفاده از راهنمای پیاده‌سازی ارائه‌دهنده هویت شما.",
     "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
   },
   "bwdc": {
-    "message": "Bitwarden Directory Connector"
+    "message": "کانکتور دایرکتوری Bitwarden"
   },
   "bwdcDesc": {
-    "message": "Configure Bitwarden Directory Connector to automatically provision users and groups using the implementation guide for your Identity Provider."
+    "message": "کانکتور دایرکتوری Bitwarden را برای تأمین خودکار کاربران و گروه‌ها با استفاده از راهنمای پیاده‌سازی ارائه‌دهنده هویت خود تنظیم کنید."
   },
   "eventManagement": {
-    "message": "Event management"
+    "message": "مدیریت رویدادها"
   },
   "eventManagementDesc": {
-    "message": "Integrate Bitwarden event logs with your SIEM (system information and event management) system by using the implementation guide for your platform."
+    "message": "گزارش‌های رویداد Bitwarden را با سیستم SIEM (مدیریت اطلاعات و رویدادهای امنیتی) خود با استفاده از راهنمای پیاده‌سازی مخصوص پلتفرم خود ادغام کنید."
   },
   "deviceManagement": {
-    "message": "Device management"
+    "message": "مدیریت دستگاه"
   },
   "deviceManagementDesc": {
-    "message": "Configure device management for Bitwarden using the implementation guide for your platform."
+    "message": "مدیریت دستگاه‌ها را برای Bitwarden با استفاده از راهنمای پیاده‌سازی مربوط به پلتفرم خود پیکربندی کنید."
   },
   "deviceIdMissing": {
-    "message": "Device ID is missing"
+    "message": "شناسه دستگاه موجود نیست"
   },
   "deviceTypeMissing": {
-    "message": "Device type is missing"
+    "message": "نوع دستگاه مشخص نیست"
   },
   "deviceCreationDateMissing": {
-    "message": "Device creation date is missing"
+    "message": "تاریخ ایجاد دستگاه مشخص نیست"
   },
   "desktopRequired": {
-    "message": "Desktop required"
+    "message": "دسکتاپ مورد نیاز است"
   },
   "reopenLinkOnDesktop": {
-    "message": "Reopen this link from your email on a desktop."
+    "message": "این لینک را از ایمیل خود روی دسکتاپ باز کنید."
   },
   "integrationCardTooltip": {
-    "message": "Launch $INTEGRATION$ implementation guide.",
+    "message": "راهنمای پیاده‌سازی $INTEGRATION$ را اجرا کنید.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9339,7 +9448,7 @@
     }
   },
   "smIntegrationTooltip": {
-    "message": "Set up $INTEGRATION$.",
+    "message": "راه‌اندازی $INTEGRATION$.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9348,7 +9457,7 @@
     }
   },
   "smSdkTooltip": {
-    "message": "View $SDK$ repository",
+    "message": "مشاهده مخزن $SDK$",
     "placeholders": {
       "sdk": {
         "content": "$1",
@@ -9357,7 +9466,7 @@
     }
   },
   "integrationCardAriaLabel": {
-    "message": "open $INTEGRATION$ implementation guide in a new tab.",
+    "message": "راهنمای پیاده‌سازی $INTEGRATION$ را در یک تب جدید باز کنید.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9366,7 +9475,7 @@
     }
   },
   "smSdkAriaLabel": {
-    "message": "view $SDK$ repository in a new tab.",
+    "message": "مخزن $SDK$ را در یک تب جدید مشاهده کنید.",
     "placeholders": {
       "sdk": {
         "content": "$1",
@@ -9375,7 +9484,7 @@
     }
   },
   "smIntegrationCardAriaLabel": {
-    "message": "set up $INTEGRATION$ implementation guide in a new tab.",
+    "message": "راهنمای پیاده‌سازی $INTEGRATION$ را در یک تب جدید راه‌اندازی کنید.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9384,76 +9493,76 @@
     }
   },
   "createNewClientToManageAsProvider": {
-    "message": "Create a new client organization to manage as a Provider. Additional seats will be reflected in the next billing cycle."
+    "message": "یک سازمان مشتری جدید به‌عنوان ارائه‌دهنده ایجاد کنید. صندلی‌های اضافی در دوره صورتحساب بعدی اعمال خواهند شد."
   },
   "selectAPlan": {
-    "message": "Select a plan"
+    "message": "یک طرح انتخاب کنید"
   },
   "thirtyFivePercentDiscount": {
-    "message": "35% Discount"
+    "message": "۳۵٪ تخفیف"
   },
   "monthPerMember": {
-    "message": "month per member"
+    "message": "ماهانه به ازای هر عضو"
   },
   "monthPerMemberBilledAnnually": {
-    "message": "month per member billed annually"
+    "message": "ماهانه به ازای هر عضو، پرداخت به صورت سالانه"
   },
   "seats": {
-    "message": "Seats"
+    "message": "صندلی‌ها"
   },
   "addOrganization": {
-    "message": "Add organization"
+    "message": "افزودن سازمان"
   },
   "createdNewClient": {
-    "message": "Successfully created new client"
+    "message": "ایجاد مشتری جدید با موفقیت انجام شد"
   },
   "noAccess": {
-    "message": "No access"
+    "message": "بدون دسترسی"
   },
   "collectionAdminConsoleManaged": {
-    "message": "This collection is only accessible from the admin console"
+    "message": "این مجموعه فقط از طریق کنسول مدیریت قابل دسترسی است"
   },
   "organizationOptionsMenu": {
-    "message": "Toggle Organization Menu"
+    "message": "تغییر وضعیت منوی سازمان"
   },
   "vaultItemSelect": {
-    "message": "Select vault item"
+    "message": "مورد گاوصندوق را انتخاب کنید"
   },
   "collectionItemSelect": {
-    "message": "Select collection item"
+    "message": "مورد مجموعه را انتخاب کنید"
   },
   "manageBillingFromProviderPortalMessage": {
-    "message": "Manage billing from the Provider Portal"
+    "message": "مدیریت صورتحساب از طریق درگاه ارائه‌دهنده"
   },
   "continueSettingUp": {
-    "message": "Continue setting up Bitwarden"
+    "message": "ادامه راه‌اندازی Bitwarden"
   },
   "continueSettingUpFreeTrial": {
-    "message": "Continue setting up your free trial of Bitwarden"
+    "message": "ادامه تنظیم دوره آزمایشی رایگان Bitwarden خود را انجام دهید"
   },
   "continueSettingUpPasswordManager": {
-    "message": "Continue setting up Bitwarden Password Manager"
+    "message": "ادامه راه‌اندازی مدیر کلمه عبور Bitwarden را انجام دهید"
   },
   "continueSettingUpFreeTrialPasswordManager": {
-    "message": "Continue setting up your free trial of Bitwarden Password Manager"
+    "message": "ادامه راه‌اندازی دوره آزمایشی رایگان مدیر کلمه عبور Bitwarden را انجام دهید"
   },
   "continueSettingUpSecretsManager": {
-    "message": "Continue setting up Bitwarden Secrets Manager"
+    "message": "ادامه راه‌اندازی مدیر اسرار Bitwarden را انجام دهید"
   },
   "continueSettingUpFreeTrialSecretsManager": {
-    "message": "Continue setting up your free trial of Bitwarden Secrets Manager"
+    "message": "ادامه راه‌اندازی دوره آزمایشی رایگان مدیر اسرار Bitwarden را انجام دهید"
   },
   "enterTeamsOrgInfo": {
-    "message": "Enter your Teams organization information"
+    "message": "اطلاعات سازمان تیم خود را وارد کنید"
   },
   "enterFamiliesOrgInfo": {
-    "message": "Enter your Families organization information"
+    "message": "اطلاعات سازمان خانواده خود را وارد کنید"
   },
   "enterEnterpriseOrgInfo": {
-    "message": "Enter your Enterprise organization information"
+    "message": "اطلاعات سازمان تجاری خود را وارد کنید"
   },
   "viewItemsIn": {
-    "message": "View items in $NAME$",
+    "message": "مشاهده موارد در $NAME$",
     "description": "Button to view the contents of a folder or collection",
     "placeholders": {
       "name": {
@@ -9463,7 +9572,7 @@
     }
   },
   "backTo": {
-    "message": "Back to $NAME$",
+    "message": "بازگشت به $NAME$",
     "description": "Navigate back to a previous folder or collection",
     "placeholders": {
       "name": {
@@ -9473,11 +9582,11 @@
     }
   },
   "back": {
-    "message": "Back",
+    "message": "بازگشت",
     "description": "Button text to navigate back"
   },
   "removeItem": {
-    "message": "Remove $NAME$",
+    "message": "حذف $NAME$",
     "description": "Remove a selected option, such as a folder or collection",
     "placeholders": {
       "name": {
@@ -9487,34 +9596,34 @@
     }
   },
   "viewInfo": {
-    "message": "View info"
+    "message": "نمایش اطلاعات"
   },
   "viewAccess": {
-    "message": "View access"
+    "message": "مشاهده دسترسی"
   },
   "noCollectionsSelected": {
-    "message": "You have not selected any collections."
+    "message": "شما هیچ مجموعه‌ای را انتخاب نکرده‌اید."
   },
   "updateName": {
-    "message": "Update name"
+    "message": "به‌روزرسانی نام"
   },
   "updatedOrganizationName": {
-    "message": "Updated organization name"
+    "message": "نام سازمان به‌روزرسانی شد"
   },
   "providerPlan": {
-    "message": "Managed Service Provider"
+    "message": "ارائه‌دهنده خدمات مدیریت شده"
   },
   "managedServiceProvider": {
-    "message": "Managed service provider"
+    "message": "ارائه‌دهنده خدمات مدیریت شده"
   },
   "multiOrganizationEnterprise": {
-    "message": "Multi-organization enterprise"
+    "message": "سازمان تجاری چندسازمانی"
   },
   "orgSeats": {
-    "message": "Organization Seats"
+    "message": "صندلی‌های سازمان"
   },
   "providerDiscount": {
-    "message": "$AMOUNT$% Discount",
+    "message": "$AMOUNT$٪ تخفیف",
     "placeholders": {
       "amount": {
         "content": "$1",
@@ -9523,122 +9632,122 @@
     }
   },
   "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
+    "message": "تعداد تکرارهای KDF پایین است. برای افزایش امنیت حساب کاربری خود، تعداد تکرارها را افزایش دهید."
   },
   "changeKDFSettings": {
-    "message": "Change KDF settings"
+    "message": "تغییر تنظیمات KDF"
   },
   "secureYourInfrastructure": {
-    "message": "Secure your infrastructure"
+    "message": "زیرساخت خود را ایمن کنید"
   },
   "protectYourFamilyOrBusiness": {
-    "message": "Protect your family or business"
+    "message": "از خانواده یا کسب‌وکار خود را محافظت کنید"
   },
   "upgradeOrganizationCloseSecurityGaps": {
-    "message": "Close security gaps with monitoring reports"
+    "message": "شکاف‌های امنیتی را با گزارش‌های نظارتی ببندید"
   },
   "upgradeOrganizationCloseSecurityGapsDesc": {
-    "message": "Stay ahead of security vulnerabilities by upgrading to a paid plan for enhanced monitoring."
+    "message": "با ارتقا به طرح پرداختی برای نظارت پیشرفته، از آسیب‌پذیری‌های امنیتی جلوتر باشید."
   },
   "approveAllRequests": {
-    "message": "Approve all requests"
+    "message": "تمام درخواست‌ها را تأیید کن"
   },
   "allLoginRequestsApproved": {
-    "message": "All login requests approved"
+    "message": "تمام درخواست‌های ورود تأیید شدند"
   },
   "payPal": {
-    "message": "PayPal"
+    "message": "پی پال"
   },
   "bitcoin": {
-    "message": "Bitcoin"
+    "message": "بیت کوین"
   },
   "updatedTaxInformation": {
-    "message": "Updated tax information"
+    "message": "اطلاعات مالیاتی به‌روزرسانی شد"
   },
   "billingInvalidTaxIdError": {
-    "message": "Invalid tax ID, if you believe this is an error please contact support."
+    "message": "شناسه مالیاتی نامعتبر است. اگر فکر می‌کنید این یک اشتباه است، لطفاً با پشتیبانی تماس بگیرید."
   },
   "billingTaxIdTypeInferenceError": {
-    "message": "We were unable to validate your tax ID, if you believe this is an error please contact support."
+    "message": "ما نتوانستیم شناسه مالیاتی شما را تأیید کنیم. اگر فکر می‌کنید این یک اشتباه است، لطفاً با پشتیبانی تماس بگیرید."
   },
   "billingPreviewInvalidTaxIdError": {
-    "message": "Invalid tax ID, if you believe this is an error please contact support."
+    "message": "شناسه مالیاتی نامعتبر است. اگر فکر می‌کنید این یک اشتباه است، لطفاً با پشتیبانی تماس بگیرید."
   },
   "billingPreviewInvoiceError": {
-    "message": "An error occurred while previewing the invoice. Please try again later."
+    "message": "هنگام پیش‌نمایش فاکتور خطا رخ داد. لطفاً بعداً دوباره تلاش کنید."
   },
   "unverified": {
-    "message": "Unverified"
+    "message": "تأیید نشده"
   },
   "verified": {
-    "message": "Verified"
+    "message": "تأیید شده"
   },
   "viewSecret": {
-    "message": "View secret"
+    "message": "مشاهده راز"
   },
   "noClients": {
-    "message": "There are no clients to list"
+    "message": "هیچ مشتری برای نمایش وجود ندارد"
   },
   "providerBillingEmailHint": {
-    "message": "This email address will receive all invoices pertaining to this provider",
+    "message": "این آدرس ایمیل همه فاکتورهای مربوط به این ارائه‌دهنده را دریافت خواهد کرد",
     "description": "A hint that shows up on the Provider setup page to inform the admin the billing email will receive the provider's invoices."
   },
   "upgradeOrganizationEnterprise": {
-    "message": "Identify security risks by auditing member access"
+    "message": "شناسایی خطرات امنیتی با بررسی دسترسی اعضا"
   },
   "onlyAvailableForEnterpriseOrganization": {
-    "message": "Quickly view member access across the organization by upgrading to an Enterprise plan."
+    "message": "با ارتقا به طرح سازمانی، به‌سرعت دسترسی اعضا در سراسر سازمان را مشاهده کنید."
   },
   "date": {
-    "message": "Date"
+    "message": "تاریخ"
   },
   "exportClientReport": {
-    "message": "Export client report"
+    "message": "گزارشات برون ریزی مشتری"
   },
   "memberAccessReport": {
-    "message": "Member access"
+    "message": "دسترسی اعضا"
   },
   "memberAccessReportDesc": {
-    "message": "Ensure members have access to the right credentials and their accounts are secure. Use this report to obtain a CSV of member access and account configurations."
+    "message": "اطمینان حاصل کنید که اعضا به اطلاعات ورود مناسب دسترسی دارند و حساب‌هایشان امن است. از این گزارش برای دریافت پرونده CSV شامل دسترسی اعضا و تنظیمات حساب‌های کاربری استفاده کنید."
   },
   "memberAccessReportPageDesc": {
-    "message": "Audit organization member access across groups, collections, and collection items. The CSV export provides a detailed breakdown per member, including information on collection permissions and account configurations."
+    "message": "دسترسی اعضای سازمان را در گروه‌ها، مجموعه‌ها و موارد مجموعه بررسی کنید. خروجی CSV شامل جزئیات کامل برای هر عضو است، از جمله اطلاعات مربوط به مجوزهای مجموعه و تنظیمات حساب کاربری."
   },
   "memberAccessReportNoCollection": {
-    "message": "(No Collection)"
+    "message": "(بدون مجموعه)"
   },
   "memberAccessReportNoCollectionPermission": {
-    "message": "(No Collection Permission)"
+    "message": "(بدون مجوز مجموعه)"
   },
   "memberAccessReportNoGroup": {
-    "message": "(No Group)"
+    "message": "(بدون گروه)"
   },
   "memberAccessReportTwoFactorEnabledTrue": {
-    "message": "On"
+    "message": "روشن"
   },
   "memberAccessReportTwoFactorEnabledFalse": {
-    "message": "Off"
+    "message": "خاموش"
   },
   "memberAccessReportAuthenticationEnabledTrue": {
-    "message": "On"
+    "message": "روشن"
   },
   "memberAccessReportAuthenticationEnabledFalse": {
-    "message": "Off"
+    "message": "خاموش"
   },
   "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
+    "message": "افزایش تعداد تکرارهای KDF می‌تواند به محافظت از کلمه عبور اصلی شما در برابر حملات بروت‌فورس کمک کند."
   },
   "incrementsOf100,000": {
-    "message": "increments of 100,000"
+    "message": "افزایش‌ها به صورت ۱۰۰,۰۰۰ تایی"
   },
   "smallIncrements": {
-    "message": "small increments"
+    "message": "افزایش‌های کوچک"
   },
   "kdfIterationRecommends": {
-    "message": "We recommend 600,000 or more"
+    "message": "ما توصیه می‌کنیم ۶۰۰,۰۰۰ یا بیشتر باشد"
   },
   "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
+    "message": "برای دستگاه‌های قدیمی‌تر، تنظیم KDF خیلی بالا ممکن است باعث مشکلات عملکردی شود. مقدار را در $VALUE$ افزایش دهید و دستگاه‌های خود را تست کنید.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -9647,31 +9756,31 @@
     }
   },
   "providerReinstate": {
-    "message": " Contact Customer Support to reinstate your subscription."
+    "message": " برای بازیابی اشتراک خود با پشتیبانی مشتری تماس بگیرید."
   },
   "secretPeopleDescription": {
-    "message": "Grant groups or people access to this secret. Permissions set for people will override permissions set by groups."
+    "message": "به گروه‌ها یا افراد برای دسترسی به این راز اجازه دهید. مجوزهایی که برای افراد تنظیم می‌شود، بر مجوزهای تنظیم‌شده توسط گروه‌ها اولویت خواهد داشت."
   },
   "secretPeopleEmptyMessage": {
-    "message": "Add people or groups to share access to this secret"
+    "message": "برای اشتراک‌گذاری دسترسی به این راز، افراد یا گروه‌ها را اضافه کنید"
   },
   "secretMachineAccountsDescription": {
-    "message": "Grant machine accounts access to this secret."
+    "message": "به حساب‌های دستگاه اجازه دسترسی به این راز را بدهید."
   },
   "secretMachineAccountsEmptyMessage": {
-    "message": "Add machine accounts to grant access to this secret"
+    "message": "برای اعطای دسترسی به این راز، حساب‌های دستگاه را اضافه کنید"
   },
   "smAccessRemovalWarningSecretTitle": {
-    "message": "Remove access to this secret"
+    "message": "دسترسی به این راز را حذف کنید"
   },
   "smAccessRemovalSecretMessage": {
-    "message": "This action will remove your access to this secret."
+    "message": "این اقدام دسترسی شما به این راز را حذف خواهد کرد."
   },
   "invoice": {
-    "message": "Invoice"
+    "message": "صورت‌حساب"
   },
   "unassignedSeatsAvailable": {
-    "message": "You have $SEATS$ unassigned seats available.",
+    "message": "شما $SEATS$ صندلی اختصاص نیافته در دسترس دارید.",
     "placeholders": {
       "seats": {
         "content": "$1",
@@ -9681,61 +9790,61 @@
     "description": "A message showing how many unassigned seats are available for a provider."
   },
   "contactYourProviderForAdditionalSeats": {
-    "message": "Contact your provider admin to purchase additional seats."
+    "message": "برای خرید صندلی‌های اضافی با مدیر ارائه‌دهنده خود تماس بگیرید."
   },
   "open": {
-    "message": "Open",
+    "message": "باز کن",
     "description": "The status of an invoice."
   },
   "uncollectible": {
-    "message": "Uncollectible",
+    "message": "غیرقابل وصول",
     "description": "The status of an invoice."
   },
   "clientDetails": {
-    "message": "Client details"
+    "message": "جزئیات مشتری"
   },
   "downloadCSV": {
-    "message": "Download CSV"
+    "message": "بارگیری CSV"
   },
   "monthlySubscriptionUserSeatsMessage": {
-    "message": "Adjustments to your subscription will result in prorated charges to your billing totals on your next billing period. "
+    "message": "تغییرات در اشتراک شما منجر به اعمال هزینه‌های نسبت‌ داده شده در مجموع صورتحساب دوره بعدی خواهد شد. "
   },
   "annualSubscriptionUserSeatsMessage": {
-    "message": "Adjustments to your subscription will result in prorated charges on a monthly billing cycle. "
+    "message": "تغییرات در اشتراک شما منجر به اعمال هزینه‌های نسبت‌داده شده در دوره صورتحساب ماهانه خواهد شد. "
   },
   "billingHistoryDescription": {
-    "message": "Download a CSV to obtain client details for each billing date. Prorated charges are not included in the CSV and may vary from the linked invoice. For the most accurate billing details, refer to your monthly invoices.",
+    "message": "یک پرونده CSV بارگیری کنید تا جزئیات مشتری‌ها را برای هر تاریخ صورتحساب دریافت کنید. هزینه‌های نسبت‌داده شده در CSV گنجانده نشده‌اند و ممکن است با فاکتور مربوطه متفاوت باشند. برای دقیق‌ترین اطلاعات صورتحساب، به فاکتورهای ماهانه خود مراجعه کنید.",
     "description": "A paragraph on the Billing History page of the Provider Portal letting users know they can download a CSV report for their invoices that does not include prorations."
   },
   "noInvoicesToList": {
-    "message": "There are no invoices to list",
+    "message": "هیچ فاکتوری برای نمایش وجود ندارد",
     "description": "A paragraph on the Billing History page of the Provider Portal letting users know they can download a CSV report for their invoices that does not include prorations."
   },
   "providerClientVaultPrivacyNotification": {
-    "message": "Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions,",
+    "message": "اطلاعیه: اواخر این ماه، حریم خصوصی گاوصندوق‌های مشتری بهبود می‌یابد و اعضای ارائه‌دهنده دیگر به طور مستقیم به موارد گاوصندوق مشتری دسترسی نخواهند داشت. برای سوالات،",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions, please contact Bitwarden support'."
   },
   "contactBitwardenSupport": {
-    "message": "contact Bitwarden support.",
+    "message": "پیام به پشتیبانی Bitwarden.",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions, please contact Bitwarden support'. 'Bitwarden' should not be translated"
   },
   "sponsored": {
-    "message": "Sponsored"
+    "message": "حمایت شده"
   },
   "licenseAndBillingManagementDesc": {
-    "message": "After making updates in the Bitwarden cloud server, upload your license file to apply the most recent changes."
+    "message": "پس از انجام به‌روزرسانی‌ها در سرور ابری Bitwarden، برای اعمال آخرین تغییرات، فایل لایسنس خود را بارگذاری کنید."
   },
   "addToFolder": {
-    "message": "Add to folder"
+    "message": "افزودن به پوشه"
   },
   "selectFolder": {
-    "message": "Select folder"
+    "message": "انتخاب پوشه"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+    "message": "۱ مورد به طور دائمی به سازمان انتخاب شده منتقل خواهد شد. شما دیگر مالک این مورد نخواهید بود."
   },
   "personalItemsTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ مورد به طور دائمی به سازمان انتخاب شده منتقل خواهند شد. شما دیگر مالک این موارد نخواهید بود.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -9744,7 +9853,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "message": "۱ مورد به طور دائمی به $ORG$ منتقل خواهد شد. شما دیگر مالک این مورد نخواهید بود.",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -9753,7 +9862,7 @@
     }
   },
   "personalItemsWithOrgTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ مورد به طور دائمی به $ORG$ منتقل خواهند شد. شما دیگر مالک این موارد نخواهید بود.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -9766,85 +9875,85 @@
     }
   },
   "data": {
-    "message": "Data"
+    "message": "داده‌"
   },
   "purchasedSeatsRemoved": {
-    "message": "purchased seats removed"
+    "message": "صندلی‌های خریداری‌شده حذف شدند"
   },
   "environmentVariables": {
-    "message": "Environment variables"
+    "message": "متغیرهای محیطی"
   },
   "organizationId": {
-    "message": "Organization ID"
+    "message": "شناسه سازمان"
   },
   "projectIds": {
-    "message": "Project IDs"
+    "message": "شناسه‌های پروژه"
   },
   "projectId": {
-    "message": "Project ID"
+    "message": "شناسه پروژه"
   },
   "projectsAccessedByMachineAccount": {
-    "message": "The following projects can be accessed by this machine account."
+    "message": "این حساب دستگاه می‌تواند به پروژه‌های زیر دسترسی داشته باشد."
   },
   "config": {
-    "message": "Config"
+    "message": "پیکربندی"
   },
   "learnMoreAboutEmergencyAccess": {
-    "message": "Learn more about emergency access"
+    "message": "بیشتر درباره دسترسی اضطراری بیاموزید"
   },
   "learnMoreAboutMatchDetection": {
-    "message": "Learn more about match detection"
+    "message": "بیشتر درباره تشخیص تطابق بیاموزید"
   },
   "learnMoreAboutMasterPasswordReprompt": {
-    "message": "Learn more about master password re-prompt"
+    "message": "بیشتر درباره درخواست مجدد کلمه عبور اصلی بیاموزید"
   },
   "learnMoreAboutSearchingYourVault": {
-    "message": "Learn more about searching your vault"
+    "message": "بیشتر درباره جستجو در گاوصندوق خود بیاموزید"
   },
   "learnMoreAboutYourAccountFingerprintPhrase": {
-    "message": "Learn about your account fingerprint phrase"
+    "message": "درباره عبارت اثر انگشت حساب خود اطلاعات کسب کنید"
   },
   "impactOfRotatingYourEncryptionKey": {
-    "message": "Impact of rotating your encryption key"
+    "message": "تأثیر تغییر دوره‌ای کلید رمزگذاری شما"
   },
   "learnMoreAboutEncryptionAlgorithms": {
-    "message": "Learn more about encryption algorithms"
+    "message": "بیشتر درباره الگوریتم‌های رمزگذاری بیاموزید"
   },
   "learnMoreAboutKDFIterations": {
-    "message": "Learn more about KDF iterations"
+    "message": "بیشتر درباره تکرارهای KDF بیاموزید"
   },
   "learnMoreAboutLocalization": {
-    "message": "Learn more about localization"
+    "message": "بیشتر درباره بومی‌سازی بیاموزید"
   },
   "learnMoreAboutWebsiteIcons": {
-    "message": "Learn more about using website icons"
+    "message": "بیشتر درباره استفاده از آیکون‌های وب‌سایت بیاموزید"
   },
   "learnMoreAboutUserAccess": {
-    "message": "Learn more about user access"
+    "message": "بیشتر درباره دسترسی کاربران بیاموزید"
   },
   "learnMoreAboutMemberRoles": {
-    "message": "Learn more about member roles and permissions"
+    "message": "بیشتر درباره نقش‌ها و مجوزهای اعضا بیاموزید"
   },
   "whatIsACvvNumber": {
-    "message": "What is a CVV number?"
+    "message": "عدد CVV چیست؟"
   },
   "learnMoreAboutApi": {
-    "message": "Learn more about Bitwarden's API"
+    "message": "بیشتر درباره Bitwarden API بیاموزید"
   },
   "fileSend": {
-    "message": "File Send"
+    "message": "پرونده ارسال"
   },
   "fileSends": {
-    "message": "File Sends"
+    "message": "پرونده ارسال‌ها"
   },
   "textSend": {
-    "message": "Text Send"
+    "message": "ارسال متن"
   },
   "textSends": {
-    "message": "Text Sends"
+    "message": "ارسال‌های متن"
   },
   "includesXMembers": {
-    "message": "for $COUNT$ member",
+    "message": "برای $COUNT$ عضو",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9862,10 +9971,10 @@
     }
   },
   "optionalOnPremHosting": {
-    "message": "Optional on-premises hosting"
+    "message": "میزبانی اختیاری در محل"
   },
   "upgradeFreeOrganization": {
-    "message": "Upgrade your $NAME$ organization ",
+    "message": "سازمان $NAME$ خود را ارتقا دهید ",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -9874,10 +9983,10 @@
     }
   },
   "includeSsoAuthenticationMessage": {
-    "message": "SSO Authentication"
+    "message": "احراز هویت SSO"
   },
   "familiesPlanInvLimitReachedManageBilling": {
-    "message": "Families organizations may have up to $SEATCOUNT$ members. Upgrade to a paid plan to invite more members.",
+    "message": "سازمان‌های خانواده ممکن است تا $SEATCOUNT$ عضو داشته باشند. برای دعوت از اعضای بیشتر، به یک طرح پولی ارتقا دهید.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -9886,7 +9995,7 @@
     }
   },
   "familiesPlanInvLimitReachedNoManageBilling": {
-    "message": "Families organizations may have up to $SEATCOUNT$ members. Contact your organization owner to upgrade.",
+    "message": "سازمان‌های خانواده ممکن است تا $SEATCOUNT$ عضو داشته باشند. برای ارتقا با مالک سازمان خود تماس بگیرید.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -9895,10 +10004,10 @@
     }
   },
   "upgradePlans": {
-    "message": "Upgrade your plan to invite members and experience powerful security features."
+    "message": "طرح خود را ارتقا دهید تا اعضا را دعوت کرده و از ویژگی‌های امنیتی قدرتمند بهره‌مند شوید."
   },
   "upgradeDiscount": {
-    "message": "Save $AMOUNT$%",
+    "message": "$AMOUNT$٪ صرفه‌جویی کنید",
     "placeholders": {
       "amount": {
         "content": "$1",
@@ -9907,49 +10016,49 @@
     }
   },
   "enterprisePlanUpgradeMessage": {
-    "message": "Advanced capabilities for larger organizations"
+    "message": "قابلیت‌های پیشرفته برای سازمان‌های بزرگ‌تر"
   },
   "teamsPlanUpgradeMessage": {
-    "message": "Resilient protection for growing teams"
+    "message": "محافظت مقاوم برای تیم‌های در حال رشد"
   },
   "teamsInviteMessage": {
-    "message": "Invite unlimited members"
+    "message": "دعوت از اعضا بدون محدودیت"
   },
   "accessToCreateGroups": {
-    "message": "Access to create groups"
+    "message": "دسترسی برای ایجاد گروه‌ها"
   },
   "syncGroupsAndUsersFromDirectory": {
-    "message": "Sync groups and users from a directory"
+    "message": "همگام‌سازی گروه‌ها و کاربران از یک دایرکتوری"
   },
   "familyPlanUpgradeMessage": {
-    "message": "Secure your family logins"
+    "message": "ورودهای خانواده خود را ایمن کنید"
   },
   "accessToPremiumFeatures": {
-    "message": "Access to Premium features"
+    "message": "دسترسی به ویژگی‌های پرمیوم"
   },
   "additionalStorageGbMessage": {
-    "message": "GB additional storage"
+    "message": "گیگابایت فضای ذخیره‌سازی اضافی"
   },
   "sshKeyAlgorithm": {
-    "message": "Key algorithm"
+    "message": "الگوریتم کلید"
   },
   "sshPrivateKey": {
-    "message": "Private key"
+    "message": "کلید خصوصی"
   },
   "sshPublicKey": {
-    "message": "Public key"
+    "message": "کلید عمومی"
   },
   "sshFingerprint": {
-    "message": "Fingerprint"
+    "message": "اثر انگشت"
   },
   "sshKeyFingerprint": {
-    "message": "Fingerprint"
+    "message": "اثر انگشت"
   },
   "sshKeyPrivateKey": {
-    "message": "Private key"
+    "message": "کلید خصوصی"
   },
   "sshKeyPublicKey": {
-    "message": "Public key"
+    "message": "کلید عمومی"
   },
   "sshKeyAlgorithmED25519": {
     "message": "ED25519"
@@ -9964,89 +10073,89 @@
     "message": "RSA 4096-Bit"
   },
   "premiumAccounts": {
-    "message": "6 premium accounts"
+    "message": "۶ حساب پرمیوم"
   },
   "unlimitedSharing": {
-    "message": "Unlimited sharing"
+    "message": "اشتراک‌گذاری نامحدود"
   },
   "unlimitedCollections": {
-    "message": "Unlimited collections"
+    "message": "مجموعه‌های نامحدود"
   },
   "secureDataSharing": {
-    "message": "Secure data sharing"
+    "message": "اشتراک‌گذاری امن داده‌ها"
   },
   "eventLogMonitoring": {
-    "message": "Event log monitoring"
+    "message": "نظارت بر گزارش رویدادها"
   },
   "directoryIntegration": {
-    "message": "Directory integration"
+    "message": "ادغام دایرکتوری"
   },
   "passwordLessSso": {
-    "message": "Passwordless SSO"
+    "message": "ورود یک مرحله‌ای بدون کلمه عبور"
   },
   "accountRecovery": {
-    "message": "Account recovery"
+    "message": "بازیابی حساب کاربری"
   },
   "customRoles": {
-    "message": "Custom roles"
+    "message": "نقش‌های سفارشی"
   },
   "unlimitedSecretsStorage": {
-    "message": "Unlimited secrets storage"
+    "message": "ذخیره‌سازی نامحدود رازها"
   },
   "unlimitedUsers": {
-    "message": "Unlimited users"
+    "message": "کاربران نامحدود"
   },
   "UpTo50MachineAccounts": {
-    "message": "Up to 50 machine accounts"
+    "message": "تا ۵۰ حساب ماشین"
   },
   "UpTo20MachineAccounts": {
-    "message": "Up to 20 machine accounts"
+    "message": "تا ۲۰ حساب ماشین"
   },
   "current": {
-    "message": "Current"
+    "message": "فعلی"
   },
   "secretsManagerSubscriptionInfo": {
-    "message": "Your Secrets Manager subscription will upgrade based on the plan selected"
+    "message": "اشتراک مدیر اسرار شما بر اساس طرح انتخاب شده ارتقا خواهد یافت"
   },
   "bitwardenPasswordManager": {
-    "message": "Bitwarden Password Manager"
+    "message": "مدیر کلمه عبور Bitwarden"
   },
   "secretsManagerComplimentaryPasswordManager": {
-    "message": "Your complimentary one year Password Manager subscription will upgrade to the selected plan. You will not be charged until the complimentary period is over."
+    "message": "اشتراک رایگان یک‌ساله مدیر کلمه عبور شما به طرح انتخاب شده ارتقا خواهد یافت. تا پایان دوره رایگان هیچ هزینه‌ای از شما دریافت نخواهد شد."
   },
   "fileSavedToDevice": {
-    "message": "File saved to device. Manage from your device downloads."
+    "message": "پرونده در دستگاه ذخیره شد. از بخش بارگیری‌های دستگاه خود مدیریت کنید."
   },
   "publicApi": {
-    "message": "Public API",
+    "message": "API عمومی",
     "description": "The text, 'API', is an acronym and should not be translated."
   },
   "showCharacterCount": {
-    "message": "Show character count"
+    "message": "نمایش تعداد کاراکترها"
   },
   "hideCharacterCount": {
-    "message": "Hide character count"
+    "message": "مخفی کردن تعداد کاراکترها"
   },
   "editAccess": {
-    "message": "Edit access"
+    "message": "ویرایش دسترسی"
   },
   "textHelpText": {
-    "message": "Use text fields for data like security questions"
+    "message": "برای داده‌هایی مانند سوالات امنیتی از فیلدهای متنی استفاده کنید"
   },
   "hiddenHelpText": {
-    "message": "Use hidden fields for sensitive data like a password"
+    "message": "برای داده‌های حساس مانند کلمه عبور از فیلدهای مخفی استفاده کنید"
   },
   "checkBoxHelpText": {
-    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+    "message": "اگر می‌خواهید فیلدهای تیک‌دار فرم را به‌صورت خودکار پر کنید، مانند گزینه به یاد سپردن ایمیل، از کادرهای انتخاب استفاده کنید"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "وقتی در پر کردن خودکار برای یک وب‌سایت خاص به مشکل برخوردید، از فیلد مرتبط استفاده کنید."
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "شناسه Html، نام، aria-label یا محل نگهدار فیلد را وارد کنید."
   },
   "uppercaseDescription": {
-    "message": "Include uppercase characters",
+    "message": "شامل حروف بزرگ باشد",
     "description": "Tooltip for the password generator uppercase character checkbox"
   },
   "uppercaseLabel": {
@@ -10054,7 +10163,7 @@
     "description": "Label for the password generator uppercase character checkbox"
   },
   "lowercaseDescription": {
-    "message": "Include lowercase characters",
+    "message": "شامل حروف کوچک باشد",
     "description": "Full description for the password generator lowercase character checkbox"
   },
   "lowercaseLabel": {
@@ -10062,7 +10171,7 @@
     "description": "Label for the password generator lowercase character checkbox"
   },
   "numbersDescription": {
-    "message": "Include numbers",
+    "message": "شامل اعداد",
     "description": "Full description for the password generator numbers checkbox"
   },
   "numbersLabel": {
@@ -10070,36 +10179,36 @@
     "description": "Label for the password generator numbers checkbox"
   },
   "specialCharactersDescription": {
-    "message": "Include special characters",
+    "message": "افزودن کاراکترهای خاص",
     "description": "Full description for the password generator special characters checkbox"
   },
   "addAttachment": {
-    "message": "Add attachment"
+    "message": "افزودن پیوست"
   },
   "maxFileSizeSansPunctuation": {
-    "message": "Maximum file size is 500 MB"
+    "message": "بیشترین حجم پرونده ۵۰۰ مگابایت است"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "آیا مطمئن هستید که می‌خواهید این پرونده پیوست را به‌طور دائمی حذف کنید؟"
   },
   "manageSubscriptionFromThe": {
-    "message": "Manage subscription from the",
+    "message": "مدیریت اشتراک از طریق",
     "description": "This represents the beginning of a sentence. The full sentence will be 'Manage subscription from the Provider Portal', but 'Provider Portal' will be a link and thus cannot be included in the translation file."
   },
   "toHostBitwardenOnYourOwnServer": {
-    "message": "To host Bitwarden on your own server, you will need to upload your license file. To support Free Families plans and advanced billing capabilities for your self-hosted organization, you will need to set up automatic sync in your self-hosted organization."
+    "message": "برای میزبانی Bitwarden روی سرور خود، باید پرونده لایسنس خود را بارگذاری کنید. برای پشتیبانی از طرح‌های رایگان خانواده‌ها و قابلیت‌های پیشرفته صورتحساب برای سازمان خودمیزبان، لازم است همگام‌سازی خودکار را در سازمان خودمیزبان خود راه‌اندازی کنید."
   },
   "selfHostingTitleProper": {
-    "message": "Self-Hosting"
+    "message": "خود میزبانی"
   },
   "claim-domain-single-org-warning": {
-    "message": "Claiming a domain will turn on the single organization policy."
+    "message": "ثبت دامنه، سیاست سازمان واحد را فعال می‌کند."
   },
   "single-org-revoked-user-warning": {
-    "message": "Non-compliant members will be revoked. Administrators can restore members once they leave all other organizations."
+    "message": "اعضای غیرمنطبق دسترسی‌شان لغو خواهد شد. مدیران می‌توانند پس از خروج اعضا از سایر سازمان‌ها، آنها را مجدداً فعال کنند."
   },
   "deleteOrganizationUser": {
-    "message": "Delete $NAME$",
+    "message": "حذف $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -10109,7 +10218,7 @@
     }
   },
   "deleteOrganizationUserWarningDesc": {
-    "message": "This will permanently delete all items owned by $NAME$. Collection items are not impacted.",
+    "message": "این عمل تمام موارد متعلق به $NAME$ را به‌صورت دائمی حذف می‌کند. موارد مجموعه تحت تأثیر قرار نمی‌گیرند.",
     "description": "Warning description for the delete organization user dialog",
     "placeholders": {
       "name": {
@@ -10119,11 +10228,11 @@
     }
   },
   "deleteManyOrganizationUsersWarningDesc": {
-    "message": "This will permanently delete all items owned by the following members. Collection items are not impacted.",
+    "message": "این عمل تمام موارد متعلق به اعضای زیر را به‌صورت دائمی حذف می‌کند. موارد مجموعه تحت تأثیر قرار نمی‌گیرند.",
     "description": "Warning description for the bulk delete organization users dialog"
   },
   "organizationUserDeleted": {
-    "message": "Deleted $NAME$",
+    "message": "$NAME$ حذف شد",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -10132,10 +10241,10 @@
     }
   },
   "organizationUserDeletedDesc": {
-    "message": "The user was removed from the organization and all associated user data has been deleted."
+    "message": "کاربر از سازمان حذف شده و تمامی داده‌های مربوط به کاربر نیز پاک شده‌اند."
   },
   "deletedUserId": {
-    "message": "Deleted user $ID$ - an owner / admin deleted the user account",
+    "message": "کاربر $ID$ حذف شد - یک مالک یا مدیر حساب کاربری را حذف کرده است",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -10144,7 +10253,7 @@
     }
   },
   "userLeftOrganization": {
-    "message": "User $ID$ left organization",
+    "message": "کاربر $ID$ سازمان را ترک کرد",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -10153,7 +10262,7 @@
     }
   },
   "suspendedOrganizationTitle": {
-    "message": "The $ORGANIZATION$ is suspended",
+    "message": "سازمان $ORGANIZATION$ تعلیق شده است",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -10162,37 +10271,37 @@
     }
   },
   "suspendedUserOrgMessage": {
-    "message": "Contact your organization owner for assistance."
+    "message": "برای دریافت کمک با مالک سازمان خود تماس بگیرید."
   },
   "suspendedOwnerOrgMessage": {
-    "message": "To regain access to your organization, add a payment method."
+    "message": "برای بازیابی دسترسی به سازمان خود، یک روش پرداخت اضافه کنید."
   },
   "deleteMembers": {
-    "message": "Delete members"
+    "message": "حذف اعضا"
   },
   "noSelectedMembersApplicable": {
-    "message": "This action is not applicable to any of the selected members."
+    "message": "این عمل برای هیچ یک از اعضا انتخاب شده قابل اجرا نیست."
   },
   "deletedSuccessfully": {
-    "message": "Deleted successfully"
+    "message": "با موفقیت حذف شد"
   },
   "freeFamiliesSponsorship": {
-    "message": "Remove Free Bitwarden Families sponsorship"
+    "message": "حذف حمایت مالی خانواده‌های رایگان Bitwarden"
   },
   "freeFamiliesSponsorshipPolicyDesc": {
-    "message": "Do not allow members to redeem a Families plan through this organization."
+    "message": "اجازه ندهید اعضا از طریق این سازمان طرح خانواده‌ها را دریافت کنند."
   },
   "verifyBankAccountWithStatementDescriptorWarning": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the organization's billing page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "پرداخت با حساب بانکی فقط برای مشتریان در ایالات متحده در دسترس است. شما باید حساب بانکی خود را تأیید کنید. ما در ۱ تا ۲ روز کاری آینده یک واریز کوچک انجام خواهیم داد. کد توضیح صورت‌حساب مربوط به این واریز را در صفحه صورتحساب سازمان وارد کنید تا حساب بانکی تأیید شود. عدم تأیید حساب بانکی منجر به پرداخت ناموفق و تعلیق اشتراک شما خواهد شد."
   },
   "verifyBankAccountWithStatementDescriptorInstructions": {
-    "message": "We have made a micro-deposit to your bank account (this may take 1-2 business days). Enter the six-digit code starting with 'SM' found on the deposit description. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "ما یک واریز کوچک به حساب بانکی شما انجام داده‌ایم (این ممکن است ۱ تا ۲ روز کاری طول بکشد). کد شش‌رقمی که با 'SM' شروع می‌شود و در توضیحات واریز آمده است را وارد کنید. عدم تأیید حساب بانکی منجر به پرداخت ناموفق و تعلیق اشتراک شما خواهد شد."
   },
   "descriptorCode": {
-    "message": "Descriptor code"
+    "message": "کد توضیح دهنده"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "نمی‌توانید مجموعه‌هایی را که فقط دسترسی مشاهده دارند حذف کنید: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -10201,37 +10310,37 @@
     }
   },
   "removeMembers": {
-    "message": "Remove members"
+    "message": "حذف اعضا"
   },
   "devices": {
-    "message": "Devices"
+    "message": "دستگاه‌ها"
   },
   "deviceListDescription": {
-    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+    "message": "حساب شما در هر یک از دستگاه‌های زیر وارد شده است. اگر دستگاهی را نمی‌شناسید، هم‌اکنون آن را حذف کنید."
   },
   "deviceListDescriptionTemp": {
-    "message": "Your account was logged in to each of the devices below."
+    "message": "حساب شما در هر یک از دستگاه‌های زیر وارد شده است."
   },
   "claimedDomains": {
-    "message": "Claimed domains"
+    "message": "دامنه‌های ثبت شده"
   },
   "claimDomain": {
-    "message": "Claim domain"
+    "message": "ثبت دامنه"
   },
   "reclaimDomain": {
-    "message": "Reclaim domain"
+    "message": "ثبت مجدد دامنه"
   },
   "claimDomainNameInputHint": {
-    "message": "Example: mydomain.com. Subdomains require separate entries to be claimed."
+    "message": "مثال:.mydomain.com زیر دامنه‌ها برای ثبت نیاز به ورودی‌های جداگانه دارند."
   },
   "automaticClaimedDomains": {
-    "message": "Automatic Claimed Domains"
+    "message": "دامنه‌های ثبت شده خودکار"
   },
   "automaticDomainClaimProcess": {
-    "message": "Bitwarden will attempt to claim the domain 3 times during the first 72 hours. If the domain can’t be claimed, check the DNS record in your host and manually claim. The domain will be removed from your organization in 7 days if it is not claimed."
+    "message": "Bitwarden در ۷۲ ساعت اول سه بار تلاش خواهد کرد دامنه را ثبت کند. اگر دامنه ثبت نشد، رکورد DNS در میزبان خود را بررسی کرده و به‌صورت دستی ثبت کنید. اگر دامنه ثبت نشود، پس از ۷ روز از سازمان شما حذف خواهد شد."
   },
   "domainNotClaimed": {
-    "message": "$DOMAIN$ not claimed. Check your DNS records.",
+    "message": "دامنه $DOMAIN$ ثبت نشده است. رکوردهای DNS خود را بررسی کنید.",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10240,19 +10349,19 @@
     }
   },
   "domainStatusClaimed": {
-    "message": "Claimed"
+    "message": "ثبت شده"
   },
   "domainStatusUnderVerification": {
-    "message": "Under verification"
+    "message": "در حال تأیید"
   },
   "claimedDomainsDesc": {
-    "message": "Claim a domain to own all member accounts whose email address matches the domain. Members will be able to skip the SSO identifier when logging in. Administrators will also be able to delete member accounts."
+    "message": "یک دامنه را ثبت کنید تا مالک تمام حساب‌های کاربری اعضایی باشید که آدرس ایمیل آنها با آن دامنه مطابقت دارد. اعضا می‌توانند هنگام ورود، مرحله شناسایی SSO را رد کنند. همچنین مدیران قادر خواهند بود حساب‌های کاربری اعضا را حذف کنند."
   },
   "invalidDomainNameClaimMessage": {
-    "message": "Input is not a valid format. Format: mydomain.com. Subdomains require separate entries to be claimed."
+    "message": "ورودی یک قالب معتبر نیست. فرمت: .mydomain.com زیر دامنه ها برای ثبت نیاز به ورودی‌های جداگانه دارند."
   },
   "domainClaimedEvent": {
-    "message": "$DOMAIN$ claimed",
+    "message": "$DOMAIN$ ثبت شد",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10261,7 +10370,7 @@
     }
   },
   "domainNotClaimedEvent": {
-    "message": "$DOMAIN$ not claimed",
+    "message": "$DOMAIN$ ثبت نشد",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10270,7 +10379,7 @@
     }
   },
   "updatedRevokeSponsorshipConfirmationForSentSponsorship": {
-    "message": "If you remove $EMAIL$, the sponsorship for this Family plan cannot be redeemed. Are you sure you want to continue?",
+    "message": "اگر $EMAIL$ را حذف کنید، امکان دریافت حمایت مالی برای این طرح خانواده وجود نخواهد داشت. آیا مطمئن هستید که می‌خواهید ادامه دهید؟",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10279,7 +10388,7 @@
     }
   },
   "updatedRevokeSponsorshipConfirmationForAcceptedSponsorship": {
-    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end and the saved payment method will be charged $40 + applicable tax on $DATE$. You will not be able to redeem a new sponsorship until $DATE$. Are you sure you want to continue?",
+    "message": "اگر $EMAIL$ را حذف کنید، حمایت مالی این طرح خانواده پایان می‌یابد و روش پرداخت ذخیره شده در تاریخ $DATE$ مبلغ ۴۰ دلار به‌علاوه مالیات مربوطه را از شما کسر خواهد کرد. تا تاریخ $DATE$ قادر به دریافت حمایت مالی جدید نخواهید بود. آیا مطمئن هستید که می‌خواهید ادامه دهید؟",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10292,108 +10401,108 @@
     }
   },
   "domainClaimed": {
-    "message": "Domain claimed"
+    "message": "دامنه ثبت شده است"
   },
   "organizationNameMaxLength": {
-    "message": "Organization name cannot exceed 50 characters."
+    "message": "نام سازمان نمی‌تواند بیش از ۵۰ کاراکتر باشد."
   },
   "rotationCompletedTitle": {
-    "message": "Key rotation successful"
+    "message": "چرخش کلید با موفقیت انجام شد"
   },
   "rotationCompletedDesc": {
-    "message": "Your master password and encryption keys have been updated. Your other devices have been logged out."
+    "message": "کلمه عبور اصلی و کلیدهای رمزگذاری شما به‌روزرسانی شده‌اند. سایر دستگاه‌های شما از حساب کاربری خارج شده‌اند."
   },
   "trustUserEmergencyAccess": {
-    "message": "Trust and confirm user"
+    "message": "اعتماد و تأیید کاربر"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "اعتماد به سازمان"
   },
   "trust": {
-    "message": "Trust"
+    "message": "اعتماد"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "اعتماد نکنید"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "سازمان مورد اعتماد نیست"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "برای امنیت حساب کاربری شما، فقط در صورتی تأیید کنید که دسترسی اضطراری به این کاربر داده‌اید و اثر انگشت او با آنچه در حسابش نمایش داده شده، مطابقت دارد"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "برای امنیت حساب کاربری شما، فقط در صورتی ادامه دهید که عضو این سازمان باشید، بازیابی حساب کاربری را فعال کرده باشید و اثر انگشت نمایش داده شده در زیر با اثر انگشت سازمان مطابقت داشته باشد."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "این سازمان دارای سیاست سازمانی است که شما را در بازیابی حساب کاربری ثبت‌نام می‌کند. ثبت‌نام به مدیران سازمان اجازه می‌دهد کلمه عبور شما را تغییر دهند. فقط در صورتی ادامه دهید که این سازمان را می‌شناسید و عبارت اثر انگشت نمایش داده شده در زیر با اثر انگشت سازمان مطابقت دارد."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "به کاربر اعتماد کنید"
   },
   "sshKeyWrongPassword": {
-    "message": "The password you entered is incorrect."
+    "message": "کلمه عبور وارد شده اشتباه است."
   },
   "importSshKey": {
-    "message": "Import"
+    "message": "درون ریزی"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirm password"
+    "message": "تأیید کلمه عبور"
   },
   "enterSshKeyPasswordDesc": {
-    "message": "Enter the password for the SSH key."
+    "message": "کلمه عبور کلید SSH را وارد کنید."
   },
   "enterSshKeyPassword": {
-    "message": "Enter password"
+    "message": "کلمه عبور را وارد کنید"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "کلید SSH نامعتبر است"
   },
   "sshKeyTypeUnsupported": {
-    "message": "The SSH key type is not supported"
+    "message": "نوع کلید SSH پشتیبانی نمی‌شود"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "وارد کردن کلید از حافظه موقت"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "کلید SSH با موفقیت وارد شد"
   },
   "copySSHPrivateKey": {
-    "message": "Copy private key"
+    "message": "کپی کلید خصوصی"
   },
   "openingExtension": {
-    "message": "Opening the Bitwarden browser extension"
+    "message": "باز کردن افزونه مرورگر Bitwarden"
   },
   "somethingWentWrong": {
-    "message": "Something went wrong..."
+    "message": "مشکلی پیش آمد..."
   },
   "openingExtensionError": {
-    "message": "We had trouble opening the Bitwarden browser extension. Click the button to open it now."
+    "message": "در باز کردن افزونه مرورگر Bitwarden مشکلی پیش آمد. برای باز کردن آن اکنون روی دکمه کلیک کنید."
   },
   "openExtension": {
-    "message": "Open extension"
+    "message": "باز کردن افزونه"
   },
   "doNotHaveExtension": {
-    "message": "Don't have the Bitwarden browser extension?"
+    "message": "افزونه مرورگر Bitwarden را ندارید؟"
   },
   "installExtension": {
-    "message": "Install extension"
+    "message": "نصب افزونه"
   },
   "openedExtension": {
-    "message": "Opened the browser extension"
+    "message": "افزونه مرورگر باز شد"
   },
   "openedExtensionViewAtRiskPasswords": {
-    "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
+    "message": "افزونه مرورگر Bitwarden با موفقیت باز شد. اکنون می‌توانید کلمات عبور در معرض خطر خود را بررسی کنید."
   },
   "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
+    "message": "در باز کردن افزونه مرورگر Bitwarden مشکل داشتیم. آیکون Bitwarden را باز کنید",
     "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
   },
   "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
+    "message": "از نوار ابزار.",
     "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
   },
   "resellerRenewalWarningMsg": {
-    "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
+    "message": "اشتراک شما به‌زودی تمدید می‌شود. برای تضمین ادامه‌ی بدون وقفه‌ی خدمات، قبل از تاریخ $RENEWAL_DATE$ با $RESELLER$ تماس بگیرید و تمدید خود را تأیید کنید.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10406,7 +10515,7 @@
     }
   },
   "resellerOpenInvoiceWarningMgs": {
-    "message": "An invoice for your subscription was issued on $ISSUED_DATE$. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $DUE_DATE$.",
+    "message": "فاکتوری برای اشتراک شما در تاریخ $ISSUED_DATE$ صادر شده است. برای تضمین ادامه‌ی بدون وقفه‌ی خدمات، قبل از تاریخ $DUE_DATE$ با $RESELLER$ تماس بگیرید و تمدید خود را تأیید کنید.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10423,7 +10532,7 @@
     }
   },
   "resellerPastDueWarningMsg": {
-    "message": "The invoice for your subscription has not been paid. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $GRACE_PERIOD_END$.",
+    "message": "فاکتور اشتراک شما پرداخت نشده است. برای تضمین ادامه‌ی بدون وقفه‌ی خدمات، قبل از پایان مهلت $GRACE_PERIOD_END$ با $RESELLER$ تماس بگیرید و تمدید خود را تأیید کنید.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10436,13 +10545,13 @@
     }
   },
   "restartOrganizationSubscription": {
-    "message": "Organization subscription restarted"
+    "message": "اشتراک سازمان مجدداً راه‌اندازی شد"
   },
   "restartSubscription": {
-    "message": "Restart your subscription"
+    "message": "اشتراک خود را مجدداً راه‌اندازی کنید"
   },
   "suspendedManagedOrgMessage": {
-    "message": "Contact $PROVIDER$ for assistance.",
+    "message": "برای دریافت کمک با $PROVIDER$ تماس بگیرید.",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -10451,16 +10560,16 @@
     }
   },
   "accountDeprovisioningNotification": {
-    "message": "Administrators now have the ability to delete member accounts that belong to a claimed domain."
+    "message": "اکنون مدیران قادر به حذف حساب‌های کاربری اعضایی هستند که به دامنه ثبت شده تعلق دارند."
   },
   "deleteManagedUserWarningDesc": {
-    "message": "This action will delete the member account including all items in their vault. This replaces the previous Remove action."
+    "message": "این اقدام حساب کاربری عضو را به همراه تمام موارد داخل گاوصندوق او حذف خواهد کرد. این جایگزین عملیات حذف قبلی است."
   },
   "deleteManagedUserWarning": {
-    "message": "Delete is a new action!"
+    "message": "حذف یک اقدام جدید است!"
   },
   "seatsRemaining": {
-    "message": "You have $REMAINING$ seats remaining out of $TOTAL$ seats assigned to this organization. Contact your provider to manage your subscription.",
+    "message": "شما $REMAINING$ صندلی باقی‌مانده از مجموع $TOTAL$ صندلی اختصاص یافته به این سازمان دارید. برای مدیریت اشتراک خود با ارائه‌دهنده‌تان تماس بگیرید.",
     "placeholders": {
       "remaining": {
         "content": "$1",
@@ -10473,19 +10582,19 @@
     }
   },
   "existingOrganization": {
-    "message": "Existing organization"
+    "message": "سازمان موجود"
   },
   "selectOrganizationProviderPortal": {
-    "message": "Select an organization to add to your Provider Portal."
+    "message": "یک سازمان برای افزودن به پورتال ارائه‌دهنده خود انتخاب کنید."
   },
   "noOrganizations": {
-    "message": "There are no organizations to list"
+    "message": "هیچ سازمانی برای نمایش وجود ندارد"
   },
   "yourProviderSubscriptionCredit": {
-    "message": "Your provider subscription will receive a credit for any remaining time in the organization's subscription."
+    "message": "اشتراک ارائه‌دهنده شما برای هر زمان باقی‌مانده در اشتراک سازمان اعتبار دریافت خواهد کرد."
   },
   "doYouWantToAddThisOrg": {
-    "message": "Do you want to add this organization to $PROVIDER$?",
+    "message": "آیا می‌خواهید این سازمان را به $PROVIDER$ اضافه کنید؟",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -10494,13 +10603,13 @@
     }
   },
   "addedExistingOrganization": {
-    "message": "Added existing organization"
+    "message": "سازمان موجود اضافه شد"
   },
   "assignedExceedsAvailable": {
-    "message": "Assigned seats exceed available seats."
+    "message": "تعداد صندلی‌های اختصاص داده شده بیشتر از صندلی‌های موجود است."
   },
   "userkeyRotationDisclaimerEmergencyAccessText": {
-    "message": "Fingerprint phrase for $NUM_USERS$ contacts for which you have enabled emergency access.",
+    "message": "عبارت اثرانگشت برای $NUM_USERS$ مخاطبی که دسترسی اضطراری به آن‌ها فعال کرده‌اید.",
     "placeholders": {
       "num_users": {
         "content": "$1",
@@ -10509,7 +10618,7 @@
     }
   },
   "userkeyRotationDisclaimerAccountRecoveryOrgsText": {
-    "message": "Fingerprint phrase for the organization $ORG_NAME$ for which you have enabled account recovery.",
+    "message": "عبارت اثرانگشت برای سازمان $ORG_NAME$ که بازیابی حساب کاربری را برای آن فعال کرده‌اید.",
     "placeholders": {
       "org_name": {
         "content": "$1",
@@ -10518,97 +10627,232 @@
     }
   },
   "userkeyRotationDisclaimerDescription": {
-    "message": "Rotating your encryption keys will require you to trust keys of any organizations that can recover your account, and any contacts that you have enabled emergency access for. To continue, make sure you can verify the following:"
+    "message": "تغییر کلیدهای رمزنگاری شما نیازمند اعتماد به کلیدهای هر سازمانی است که می‌تواند حساب کاربری شما را بازیابی کند، و همچنین هر مخاطبی که دسترسی اضطراری برای او فعال کرده‌اید. برای ادامه، مطمئن شوید که می‌توانید موارد زیر را تأیید کنید:"
   },
   "userkeyRotationDisclaimerTitle": {
-    "message": "Untrusted encryption keys"
+    "message": "کلیدهای رمزنگاری غیرقابل اعتماد"
   },
   "changeAtRiskPassword": {
-    "message": "Change at-risk password"
+    "message": "تغییر کلمه عبور در معرض خطر"
   },
   "removeUnlockWithPinPolicyTitle": {
-    "message": "Remove Unlock with PIN"
+    "message": "حذف گزینه‌ی بازکردن با کد پین"
   },
   "removeUnlockWithPinPolicyDesc": {
-    "message": "Do not allow members to unlock their account with a PIN."
+    "message": "به اعضا اجازه ندهید با کد پین حساب کاربری خود را باز کنند."
   },
   "upgradeForFullEventsMessage": {
-    "message": "Event logs are not stored for your organization. Upgrade to a Teams or Enterprise plan to get full access to organization event logs."
+    "message": "گزارش‌های رویداد برای سازمان شما ذخیره نمی‌شوند. برای دسترسی کامل به گزارش‌های رویداد سازمان، به طرح تیم‌ها یا سازمان‌های بزرگ ارتقا دهید."
   },
   "upgradeEventLogTitleMessage": {
-    "message": "Upgrade to see event logs from your organization."
+    "message": "برای مشاهده گزارش‌های رویدادهای سازمان خود، ارتقا دهید."
   },
   "upgradeEventLogMessage": {
-    "message": "These events are examples only and do not reflect real events within your Bitwarden organization."
+    "message": "این رویدادها تنها مثال هستند و رویدادهای واقعی درون سازمان Bitwarden شما را نشان نمی‌دهند."
   },
   "cannotCreateCollection": {
-    "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
+    "message": "سازمان‌های رایگان می‌توانند حداکثر تا ۲ مجموعه داشته باشند. برای اضافه کردن مجموعه‌های بیشتر، به طرح پولی ارتقا دهید."
   },
   "businessUnit": {
-    "message": "Business Unit"
+    "message": "واحد کسب و کار"
   },
   "businessUnits": {
-    "message": "Business Units"
+    "message": "واحدهای کسب و کار"
   },
   "newBusinessUnit": {
-    "message": "New business unit"
+    "message": "واحد کسب و کار جدید"
+  },
+  "sendsTitleNoItems": {
+    "message": "اطلاعات حساس را به‌صورت ایمن ارسال کنید",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "پرونده‌ها و داده‌های خود را به‌صورت امن با هر کسی، در هر پلتفرمی به اشتراک بگذارید. اطلاعات شما در حین اشتراک‌گذاری به‌طور کامل رمزگذاری انتها به انتها باقی خواهد ماند و میزان افشا محدود می‌شود.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "ساخت سریع کلمات عبور"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "به‌راحتی کلمات عبور قوی و منحصر به فرد ایجاد کنید با کلیک روی",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "برای کمک به حفظ امنیت ورودهای شما.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "با کلیک روی دکمه تولید رمز عبور، به‌راحتی کلمات عبور قوی و منحصر به‌ فرد ایجاد کنید تا ورودهای شما ایمن باقی بمانند.",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "با پر کردن خودکار در وقت خود صرفه جویی کنید"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "شامل یک",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "وب‌سایت",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "تا این ورود به عنوان پیشنهاد پر کردن خودکار ظاهر شود.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "پرداخت آنلاین بدون وقفه"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "با کارت‌ها، فرم‌های پرداخت را به‌راحتی و با امنیت و دقت پر کنید."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "ساخت حساب‌های کاربری را ساده کنید"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "با هویت‌ها، به سرعت فرم‌های طولانی ثبت‌نام یا تماس را پر کنید."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "اطلاعات حساس خود را ایمن نگه دارید"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "با یادداشت‌ها، اطلاعات حساسی مانند جزئیات بانکی یا بیمه را به‌صورت ایمن ذخیره کنید."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "دسترسی SSH مناسب برای توسعه‌دهندگان"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "کلیدهای خود را ذخیره کنید و با عامل SSH برای احراز هویت سریع و رمزگذاری‌شده متصل شوید.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "اطلاعات بیشتر درباره عامل SSH را بیاموزید",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "کلمات عبور خود را با یک کلیک به‌صورت ایمن به‌صورت خودکار وارد کنید"
+  },
+  "setupExtensionPageDescription": {
+    "message": "افزونه مرورگر Bitwarden را دریافت کنید و از امروز وارد کردن خودکار اطلاعات را آغاز کنید"
+  },
+  "getTheExtension": {
+    "message": "افزونه را دریافت کنید"
+  },
+  "addItLater": {
+    "message": "بعداً اضافه کن"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "بدون افزونه مرورگر نمی‌توانید کلمات عبور را به‌صورت خودکار وارد کنید"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "آیا مطمئن هستید که نمی‌خواهید افزونه را همین حالا اضافه کنید؟"
+  },
+  "skipToWebApp": {
+    "message": "رفتن به نسخه وب برنامه"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "افزونه Bitwarden نصب شد!"
+  },
+  "openExtensionToAutofill": {
+    "message": "افزونه را باز کنید تا وارد شوید و پر کردن خودکار را آغاز کنید."
+  },
+  "openBitwardenExtension": {
+    "message": "افزونه Bitwarden را باز کنید"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "برای دریافت نکات شروع به کار با Bitwarden به صفحه مراجعه کنید",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "مرکز آموزش",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "مرکز راهنمایی",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "با افزونه مرورگر Bitwarden می‌توانید به‌راحتی ورودهای جدید ایجاد کنید، به ورودهای ذخیره‌شده خود مستقیماً از نوار ابزار مرورگر دسترسی داشته باشید و با استفاده از قابلیت پر کردن خودکار Bitwarden، سریع‌تر وارد حساب‌ها شوید."
+  },
   "restart": {
-    "message": "Restart"
+    "message": "راه اندازی مجدد"
   },
   "verifyProviderBankAccountWithStatementDescriptorWarning": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the provider's subscription page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "پرداخت با حساب بانکی تنها برای مشتریان در ایالات متحده در دسترس است. شما باید حساب بانکی خود را تأیید کنید. ما ظرف ۱ تا ۲ روز کاری آینده یک واریز کوچک انجام خواهیم داد. کد توضیح صورت‌حساب این واریز را در صفحه اشتراک ارائه‌دهنده وارد کنید تا حساب بانکی تأیید شود. عدم تأیید حساب بانکی منجر به عدم پرداخت و تعلیق اشتراک شما خواهد شد."
   },
   "clickPayWithPayPal": {
-    "message": "Please click the Pay with PayPal button to add your payment method."
+    "message": "لطفاً برای افزودن روش پرداخت خود، روی دکمه پرداخت با پی‌پال کلیک کنید."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "اگر $EMAIL$ را حذف کنید، حمایت مالی از این طرح خانوادگی به پایان می‌رسد. یک جایگاه در سازمان شما پس از تاریخ تمدید سازمان تحت حمایت در $DATE$ برای اعضا یا حمایت‌های مالی دیگر در دسترس خواهد بود.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "نشانی صورتحساب برای افزودن اعتبار الزامی است.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/fi/messages.json b/apps/web/src/locales/fi/messages.json
index ccbcf4f7cc3..deb06c4c2b7 100644
--- a/apps/web/src/locales/fi/messages.json
+++ b/apps/web/src/locales/fi/messages.json
@@ -547,12 +547,6 @@
     "message": "Laajenna tai supista",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Luo salasana"
-  },
-  "generatePassphrase": {
-    "message": "Luo salalause"
-  },
   "checkPassword": {
     "message": "Tarkasta, onko salasana paljastunut."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Minä"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Oma holvi"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Jatkamalla kirjaudut ulos nykyisestä istunnostasi ja joudut kirjautumaan uudelleen. Muiden laitteiden istunnot saattavat pysyä aktiivisina vielä tunnin ajan."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Sähköpostiosoite tallennettiin"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Kaksivaiheisen kirjautumisen käyttöönotto voi lukita sinut ulos Bitwarden-tililtäsi pysyvästi. Palautuskoodi mahdollistaa pääsyn tilillesi myös silloin, kun et voi käyttää normaaleja kaksivaiheisen tunnistautumisen vahvistustapoja (esim. kadotat suojausavaimesi tai se varastetaan). Bitwardenin asiakaspalvelukaan ei voi auttaa sinua, jos menetät pääsyn tillesi. Suosittelemme, että kirjoitat palautuskoodin muistiin tai tulostat sen ja säilytät turvallisessa paikassa (esim. kassakaapissa tai pankin tallelokerossa)."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Kertakäyttöisellä palautuskoodillasi voit poistaa kaksivaiheisen kirjautumisen käytöstä, mikäli et voi käyttää kaksivaiheista todennustapaasi. Bitwarden suosittelee kirjoittamaan palautuskoodin ylös ja säilyttämään sen turvallisessa paikassa."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Poista käytöstä"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Mitätöi käyttöoikeudet"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Salausavaimen päivitystä ei voida jatkaa"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Kansioidesi salausta ei voitu purkaa salausavaimesi päivityksen aikana. Jatkaaksesi päivitystä kansiosi on poistettava. Holvin kohteita ei poisteta, jos jatkat."
-  },
-  "keyUpdated": {
-    "message": "Avain päivitettiin"
-  },
-  "updateEncryptionKey": {
-    "message": "Päivitä salausavain"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Olemme muuttaneet salausmallia tietoturvan tehostamiseksi. Päivitä salausavaimesi syöttämällä pääsalasanasi alle."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Salausavaimesi päivityksen jälkeen, sinun tulee kirjautua ulos ja sitten takaisin sisään kaikissa Bitwarden-sovelluksissa, jotka ovat käytössäsi (esim. mobiilisovellus ja selainlaajennukset). Uudelleenkirjautumisen (joka lataa uuden salausavaimen) suorittamatta jättäminen saattaa johtaa tietojen vaurioitumiseen. Yritämme kirjata sinut ulos autmaattisesti, mutta tämä voi tapahtua vasta jonkin ajan kuluttua."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Tilaus"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Varmuuskäyttö hylätty."
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Käyttäjän $USER$ salasana on palautettu. Voit nyt kirjautua sisään käyttäen uutta salasanaa.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Poista yksityinen holvi"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "tämä käyttäjä"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Yksi tai useampi organisaatiokäytäntö edellyttää, että pääsalasanasi täyttää seuraavat vaatimukset:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Salasanan palautus onnistui!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Lisää"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Pääsalasana on päivitetty"
   },
   "updateMasterPassword": {
     "message": "Päivitä pääsalasana"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Organisaatiosi ylläpito on hiljattain vaihtanut pääsalasanasi ja käyttääksesi holvia sinun on päivitettävä se nyt. Tämä uloskirjaa kaikki nykyiset istunnot pakottaen uudelleenkirjautumisen. Muiden laitteiden aktiiviset istunnot saattavat toimia vielä tunnin ajan."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Luo sähköpostiosoite"
   },
+  "generatePassword": {
+    "message": "Luo salasana"
+  },
+  "generatePassphrase": {
+    "message": "Luo salalause"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Arvon tulee olla väliltä $MIN$—$MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Käytä tätä salasanaa"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Käytä tätä käyttäjätunnusta"
   },
@@ -7605,9 +7656,9 @@
     "message": "Palvelutili päivitettiin",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Syötä tai valitse projekteja tai salaisuuksia",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Suodata kirjoittamalla",
@@ -7692,8 +7743,8 @@
     "message": "Käyttötunnisteet",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Uusi käyttötunniste",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Tuontitiedostoa luettaessa tapahtui virhe."
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Avasi salaisuuden $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Pyydä hyväksyntää ylläpidolta"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Luotettu laitesalaus"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Laitteeseen luotettu"
   },
-  "sendsNoItemsTitle": {
-    "message": "Aktiivisia Sendejä ei ole",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Sendillä voit jakaa salattuja tietoja turvallisesti kenelle tahansa.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Kutsu käyttäjiä"
   },
@@ -8837,6 +8922,30 @@
     "message": "Yleiset muodot",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Ylläpitääksesi organisaation $ORG$ tilausta, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/fil/messages.json b/apps/web/src/locales/fil/messages.json
index 97e22e18045..9925074ad18 100644
--- a/apps/web/src/locales/fil/messages.json
+++ b/apps/web/src/locales/fil/messages.json
@@ -547,12 +547,6 @@
     "message": "Palakihin/paliitin",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Gumawa ng password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Tingnan kung nakompromiso na ba ang password."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Ako"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Vault ko"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Mala-log out ka sa kasalukuyan mong sesyon kung tutuloy ka, at kakailanganin mong mag-log in ulit. Maaaring manatiling aktibo ang mga sesyon sa iba pang device nang hanggang isang oras."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Na-save ang email"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Maaaring permanente kang ma-lock out sa account mo dahil sa dalawang-hakbang na pag-log in. Pwede kang gumamit ng code pang-recover sakaling hindi mo na magamit ang normal mong provider ng dalawang-hakbang na pag-log in (halimbawa: nawala ang device mo). Hindi ka matutulungan ng Bitwarden support kung mawalan ka ng access sa account mo. Mainam na isulat o i-print mo ang mga code pang-recover at itago ito sa ligtas na lugar."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Isara"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Tanggalin ang access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Na update ang Key"
-  },
-  "updateEncryptionKey": {
-    "message": "Na update ang encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Matapos i update ang iyong key sa pag encrypt, kinakailangan kang mag log out at bumalik sa lahat ng mga application ng Bitwarden na kasalukuyang ginagamit mo (tulad ng mobile app o mga extension ng browser). Ang kabiguan na mag log out at bumalik sa (na nag download ng iyong bagong key ng pag encrypt) ay maaaring magresulta sa pagkasira ng data. Susubukan naming awtomatikong mag log out sa iyo, gayunpaman, maaari itong maantala."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subskripsyon"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Hindi tinanggap ang emergency access"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Pag-reset ng password para sa $USER$. Maaari ka na ngayong mag login gamit ang bagong password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Alisin ang indibidwal na vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "ang user na ito"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Ang isa o higit pang mga patakaran sa organisasyon ay nangangailangan ng master password upang matugunan ang mga sumusunod na kinakailangan:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Tagumpay sa pag-reset ng password!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Magdagdag"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password na save"
   },
   "updateMasterPassword": {
     "message": "I-update ang master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Ang iyong master password ay kamakailan lamang na binago ng isang administrator sa iyong organisasyon. Upang makapunta sa vault, kailangan mong i-update ito ngayon. Ang pagpapatuloy ay maglilipat ka sa iyong kasalukuyang sesyon, na nangangailangan sa iyo na mag-log in muli. Ang mga aktibong sesyon sa iba pang mga device ay maaaring magpatuloy na aktibo hanggang sa isang oras."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Gumawa ng password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Na-update na ang serbisyo account",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Mag type o pumili ng mga proyekto o lihim",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Mag-type para i-filter",
@@ -7692,8 +7743,8 @@
     "message": "Mga token ng access",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "May nangyaring error kapag sinusubukang basahin ang import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Naka-access sa secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/fr/messages.json b/apps/web/src/locales/fr/messages.json
index d881ecfefd3..5ca186d843c 100644
--- a/apps/web/src/locales/fr/messages.json
+++ b/apps/web/src/locales/fr/messages.json
@@ -547,12 +547,6 @@
     "message": "Déplier / replier",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Générer un mot de passe"
-  },
-  "generatePassphrase": {
-    "message": "Générer une phrase de passe"
-  },
   "checkPassword": {
     "message": "Vérifier si le mot de passe a été exposé."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Moi"
   },
+  "myItems": {
+    "message": "Mes éléments"
+  },
   "myVault": {
     "message": "Mon coffre"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "En poursuivant, vous serez déconnecté de votre session en cours, ce qui vous obligera à vous reconnecter. Les sessions actives sur d'autres appareils peuvent rester actives pendant encore une heure."
   },
+  "changePasswordWarning": {
+    "message": "Après avoir changé votre mot de passe, vous devrez vous connecter avec votre nouveau mot de passe. Les sessions actives sur d'autres appareils seront déconnectées dans un délai d'une heure."
+  },
   "emailChanged": {
     "message": "Courriel sauvegardé"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "La configuration d'un système d'authentification à deux facteurs peut définitivement vous verrouiller l'accès à votre compte Bitwarden. Un code de récupération vous permet d'accéder à votre compte dans le cas où vous ne pourriez plus utiliser votre fournisseur normal d'authentification à deux facteurs (exemple : vous perdez votre appareil). L'assistance de Bitwarden ne pourra pas vous aider si vous perdez l'accès à votre compte. Nous vous recommandons de noter ou d'imprimer le code de récupération et de le conserver en lieu sûr."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Supprimer le type d'élément de la carte"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Ne pas autoriser les membres à créer des types d'éléments de carte. Les cartes existantes seront automatiquement supprimées."
+  },
+  "restrictCardTypeImport": {
+    "message": "Impossible d'importer les types de l'élément de la carte"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Une politique de sécurité définie par une organisation ou plus vous empêche d'importer des cartes dans vos coffres."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Votre code de récupération à usage unique peut être utilisé pour désactiver la connexion en deux étapes si vous perdez l'accès à votre fournisseur de connexion en deux étapes. Bitwarden vous recommande d'écrire le code de récupération et de le conserver dans un endroit sûr."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Désactiver"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Informations sur le membre non trouvés."
+  },
   "revokeAccess": {
     "message": "Révoquer l'Accès"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "La mise à jour de la clé de chiffrement ne peut pas continuer"
-  },
   "editFieldLabel": {
     "message": "Modifier $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Lors de la mise à jour de votre clé de chiffrement, vos dossiers n'ont pas pu être déchiffrés. Pour continuer avec la mise à jour, vos dossiers doivent être supprimés. Aucun élément du coffre ne sera supprimé si vous continuez."
-  },
-  "keyUpdated": {
-    "message": "Clé mise à jour"
-  },
-  "updateEncryptionKey": {
-    "message": "Mettre à jour la clé de chiffrement"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Nous avons modifié le schéma de chiffrement pour améliorer la sécurité. Mettez à jour votre clé de chiffrement maintenant en entrant votre mot de passe principal ci-dessous."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Après avoir mis à jour votre clé de chiffrement, vous devez vous déconnecter et vous reconnecter à toutes les applications Bitwarden que vous utilisez actuellement (comme l'application mobile ou les extensions de navigateur). Si vous ne vous déconnectez pas et ne vous reconnectez pas (ce qui télécharge votre nouvelle clé de chiffrement), cela peut entraîner une corruption des données. Nous tenterons de vous déconnecter automatiquement, mais cela peut être retardé."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Toutes les exportations restreintes du compte que vous avez enregistrées seront invalides."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "L'ancien chiffrement n'est plus pris en charge. Veuillez contacter le support pour récupérer votre compte."
+  },
   "subscription": {
     "message": "Abonnement"
   },
@@ -5085,7 +5088,7 @@
     "message": "La politique d'organisation unique Entreprise doit être activée avant d'activer cette politique."
   },
   "requireSsoPolicyReqError": {
-    "message": "La politique \"Organisation Unique\" n'est pas activée."
+    "message": "La politique « Organisation Unique » n'est pas activée."
   },
   "requireSsoExemption": {
     "message": "Les propriétaires et les administrateurs de l'organisation sont exonérés de l'application de cette politique."
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Accès d'urgence refusé."
   },
+  "grantorDetailsNotFound": {
+    "message": "Détails de la source non trouvés"
+  },
   "passwordResetFor": {
     "message": "Mot de passe réinitialisé pour $USER$. Vous pouvez maintenant vous connecter en utilisant le nouveau mot de passe.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Forcer la propriété des données de l'organisation"
+  },
   "personalOwnership": {
     "message": "Supprimer le coffre individuel"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "En poursuivant, $NAME$ sera déconnecté de sa session actuelle, ce qui l'obligera à se reconnecter. Les sessions actives sur d'autres appareils peuvent rester actives pendant encore une heure.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "cet utilisateur"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Une ou plusieurs politiques de sécurité de l'organisation exigent que votre mot de passe principal réponde aux exigences suivantes :"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Une ou plusieurs politiques de sécurité de l'organisation exigent que votre mot de passe principal réponde aux exigences suivantes :"
+  },
   "resetPasswordSuccess": {
     "message": "Mot de passe réinitialisé avec succès !"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Ajouter"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Mot de passe principal défini avec succès"
+  },
   "updatedMasterPassword": {
     "message": "Mot de passe principal enregistré"
   },
   "updateMasterPassword": {
     "message": "Mettre à jour le mot de passe principal"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Changez votre mot de passe principal pour terminer la récupération du compte."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Votre mot de passe principal ne répond pas aux exigences de cette organisation. Changez votre mot de passe principal pour continuer."
+  },
   "updateMasterPasswordWarning": {
     "message": "Votre mot de passe principal a été récemment changé par un administrateur de votre organisation. Pour pouvoir accéder au coffre, vous devez mettre à jour votre mot de passe principal maintenant. En poursuivant, vous serez déconnecté de votre session actuelle et vous devrez vous reconnecter. Les sessions actives sur d'autres appareils peuvent rester actives pendant encore une heure."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Générer un courriel"
   },
+  "generatePassword": {
+    "message": "Générer un mot de passe"
+  },
+  "generatePassphrase": {
+    "message": "Générer une phrase de passe"
+  },
+  "passwordGenerated": {
+    "message": "Mot de passe généré"
+  },
+  "passphraseGenerated": {
+    "message": "Phrase de passe générée"
+  },
+  "usernameGenerated": {
+    "message": "Nom d'utilisateur généré"
+  },
+  "emailGenerated": {
+    "message": "Courriel généré"
+  },
   "spinboxBoundariesHint": {
     "message": "La valeur doit être comprise entre $MIN$ et $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Utiliser ce mot de passe"
   },
+  "useThisPassphrase": {
+    "message": "Utiliser cette phrase de passe"
+  },
   "useThisUsername": {
     "message": "Utiliser ce nom d'utilisateur"
   },
@@ -7605,9 +7656,9 @@
     "message": "Compte de service mis à jour",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Saisir ou sélectionner des projets ou des secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Saisissez ou sélectionnez des projets",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Saisir pour filtrer",
@@ -7692,8 +7743,8 @@
     "message": "Jetons d'accès",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Nouveau jeton d'accès",
+  "createAccessToken": {
+    "message": "Créer un jeton d'accès",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Une erreur est survenue lors de la lecture du fichier importé"
   },
+  "accessedSecretWithId": {
+    "message": "A accédé un secret avec identifiant : $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accès au secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "A modifié un secret avec identifiant : $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "A supprimé un secret avec identifiant : $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "A créé un secret avec identifiant : $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Demander l'approbation de l'administrateur"
   },
+  "unableToCompleteLogin": {
+    "message": "Impossible de compléter la connexion"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Vous devez vous connecter sur un appareil de confiance ou demander à votre administrateur de vous assigner un mot de passe."
+  },
   "trustedDeviceEncryption": {
     "message": "Chiffrement de l'appareil de confiance"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Appareil de confiance"
   },
-  "sendsNoItemsTitle": {
-    "message": "Aucun Send actif",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Utilisez Send pour partager en toute sécurité des informations chiffrées avec tout le monde.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Inviter des utilisateurs"
   },
@@ -8837,6 +8922,30 @@
     "message": "Formats communs",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "La détection de correspondance d'URI est la façon dont Bitwarden identifie les suggestions de remplissage automatique.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "« Expression régulière » est une option avancée avec un risque accru d'exposer les identifiants.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "« Commence par » est une option avancée avec un risque accru d'exposer les identifiants.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "En savoir plus sur la détection de correspondance",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Options avancées",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Avertissement",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Afin de maintenir votre abonnement pour $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Nouvelle unité d'affaires"
   },
+  "sendsTitleNoItems": {
+    "message": "Envoyez des informations sensibles, en toute sécurité",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Partagez des fichiers et des données en toute sécurité avec n'importe qui, sur n'importe quelle plateforme. Vos informations resteront chiffrées de bout en bout tout en limitant l'exposition.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Créer rapidement des mots de passe"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Créez facilement des mots de passe forts et uniques en cliquant sur",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "pour vous aider à garder vos identifiants sécuritaires.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Créez facilement des mots de passe forts et uniques en cliquant sur le bouton Générer un mot de passe pour vous aider à garder vos identifiants sécuritaires.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Gagnez du temps avec le remplissage automatique"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Remplissez automatiquement vos mots de passe en un clic"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Obtenez l'extension de navigateur Bitwarden et commencez à remplir automatiquement dès aujourd'hui"
+  },
+  "getTheExtension": {
+    "message": "Obtenez l'extension"
+  },
+  "addItLater": {
+    "message": "Ajoutez la plus tard"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Vous ne pouvez pas saisir automatiquement les mots de passe sans l'extension de navigateur"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Êtes-vous sûr de ne pas vouloir ajouter l'extension maintenant ?"
+  },
+  "skipToWebApp": {
+    "message": "Passer à l'application web"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "L'extension Bitwarden est installée !"
+  },
+  "openExtensionToAutofill": {
+    "message": "Ouvrez l'extension pour vous connecter et démarrer le remplissage automatique."
+  },
+  "openBitwardenExtension": {
+    "message": "Ouvrir l'extension Bitwarden"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "Pour des conseils sur les débuts avec Bitwarden, visitez le",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Centre d'apprentissage",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Centre d’aide",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "Avec l'extension de navigateur Bitwarden, vous pouvez facilement créer de nouveaux identifiants, accéder à vos identifiants enregistrés directement à partir de la barre d'outils de votre navigateur, et vous connecter rapidement aux comptes en utilisant le remplissage automatique de Bitwarden."
+  },
   "restart": {
     "message": "Redémarrer"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Veuillez cliquer sur le bouton Payer avec PayPal pour ajouter votre mode de paiement."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Si vous supprimez $EMAIL$, le parrainage pour ce plan Familles prendra fin. Un siège au sein de votre organisation sera disponible pour les membres ou les parrainages après la date de renouvellement de l'organisation parrainée le $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "L'adresse de facturation est requise pour ajouter du crédit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Adresse de facturation"
+  },
+  "addBillingAddress": {
+    "message": "Ajouter une adresse de facturation"
+  },
+  "editBillingAddress": {
+    "message": "Modifier l'adresse de facturation"
+  },
+  "noBillingAddress": {
+    "message": "Aucune adresse sur le fichier."
+  },
+  "billingAddressUpdated": {
+    "message": "Votre adresse de facturation a été mise à jour."
+  },
+  "paymentDetails": {
+    "message": "Informations de paiement"
+  },
+  "paymentMethodUpdated": {
+    "message": "Votre méthode de paiement a bien été mise à jour."
+  },
+  "bankAccountVerified": {
+    "message": "Votre compte bancaire a été vérifié."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Tout crédit disponible sera automatiquement appliqué aux factures générées pour ce compte."
+  },
+  "mustBePositiveNumber": {
+    "message": "Doit être un nombre positif"
+  },
+  "cardSecurityCode": {
+    "message": "Code de sécurité de la carte"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Code de sécurité de la carte, également connu sous le nom de CVV ou CVC, est généralement un numéro à 3 chiffres imprimé au dos de votre carte de crédit ou un numéro à 4 chiffres imprimé au recto au-dessus du numéro de votre carte."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Le paiement avec un compte bancaire est seulement disponible pour les clients aux États-Unis. Vous devrez procéder à la vérification de votre compte bancaire. Nous effectuerons un micro-dépôt dans les 1-2 prochains jours ouvrables. Entrez le code de la transaction de ce dépôt sur la page d'Informations de Paiement pour compléter la vérification du compte bancaire. Si vous ne complétez pas la vérification de votre compte bancaire résultera en un paiement manqué et votre abonnement sera suspendu."
+  },
+  "taxId": {
+    "message": "ID de la taxe : $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/gl/messages.json b/apps/web/src/locales/gl/messages.json
index 707f9752ab6..d22f7a2278c 100644
--- a/apps/web/src/locales/gl/messages.json
+++ b/apps/web/src/locales/gl/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "My vault"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/he/messages.json b/apps/web/src/locales/he/messages.json
index 6dd2d9243b1..476f2603b68 100644
--- a/apps/web/src/locales/he/messages.json
+++ b/apps/web/src/locales/he/messages.json
@@ -547,12 +547,6 @@
     "message": "שנה מצב כיווץ",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "צור סיסמה"
-  },
-  "generatePassphrase": {
-    "message": "צור ביטוי סיסמה"
-  },
   "checkPassword": {
     "message": "בדוק אם הסיסמה נחשפה."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "אני"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "הכספת שלי"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "בכדי להמשיך הסשן הנוכחי ינותק, ותדרש להזין את פרטי הכניסה החדשים. כל הסשנים הפעילים במכשירים אחרים ישארו פעילים עד שעה ממועד הכניסה החדשה."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "דוא\"ל נשמר"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "הגדרת כניסה דו־שלבית יכולה לנעול אותך לצמיתות מחוץ לחשבון Bitwarden שלך. קוד שחזור מאפשר לך לגשת לחשבון שלך במקרה שאתה לא יכול להשתמש בספק הכניסה הד־שלבית הרגיל שלך (דוגמה: איבדת את המכשיר שלך). התמיכה של Bitwarden לא תוכל לסייע לך אם תאבד גישה לחשבון שלך. אנו ממליצים שתכתוב או תדפיס את קוד השחזור ותשמור אותו במקום בטוח."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "ניתן להשתמש בקוד השחזור החד־פעמי שלך כדי לכבות כניסה דו־שלבית במקרה שאתה מאבד גישה לספק הכניסה הדו־שלבית שלך. Bitwarden ממליץ לך לרשום את קוד השחזור ולשמור אותו במקום בטוח."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "כבה"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "בטל גישה"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "עדכון מפתח הצפנה לא יכול להמשיך"
-  },
   "editFieldLabel": {
     "message": "ערוך $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "בעת עדכון מפתח ההצפנה שלך, התיקיות שלך לא היה ניתנות לפענוח. כדי להמשיך עם העדכון, התיקיות שלך מוכרחות להימחק. לא יימחקו פריטי כספת אם תמשיך."
-  },
-  "keyUpdated": {
-    "message": "המפתח עודכן"
-  },
-  "updateEncryptionKey": {
-    "message": "עדכן מפתח הצפנה"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "שינינו את סכמת ההצפנה כדי לספק אבטחה טובה יותר. עדכן את מפתח ההצפנה שלך כעת על ידי הזנת הסיסמה הראשית שלך למטה."
-  },
   "updateEncryptionKeyWarning": {
     "message": "לאחר עדכון מפתחות ההצפנה שלך, תתבקש לצאת ולהכנס שוב בכל אפליקציות Bitwarden שאתה משתמש בהן (האפליקציה לפלאפון או ההרחבה לדפדפן). אם לא תצא ותכנס שוב (פעולת הכניסה מורידה את המפתח החדש), יתכן שתתקל במידע שגוי. אנו ננסה לגרום ליציאה אוטומטית, אך יתכן שהדבר לא יקרה מיידית."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "מנוי"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "גישת חירום נדחתה"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "הסיסמה אופסה עבור $USER$. אתה יכול כעת להיכנס באמצעות הסיסמה החדשה.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "הסר כספת אישית"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "משתמש זה"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "מדיניות ארגון אחת או יותר דורשת שהסיסמה הראשית תעמוד בדרישות הבאות:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "הצלחת איפוס סיסמה!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "הוסף"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "הסיסמה הראשית נשמרה"
   },
   "updateMasterPassword": {
     "message": "עדכן סיסמה ראשית"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "הסיסמה הראשית שלך שונתה לאחרונה על ידי מנהל בארגון שלך. כדי לגשת אל הכספת, אתה מוכרח לעדכן את הסיסמה הראשית שלך עכשיו. המשך התהליך יוציא אותך מההפעלה הנוכחית שלך ותידרש להיכנס חזרה. הפעלות פעילות במכשירים אחרים עלולות להישאר פעילות למשך עד שעה אחת."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "צור דוא\"ל"
   },
+  "generatePassword": {
+    "message": "צור סיסמה"
+  },
+  "generatePassphrase": {
+    "message": "צור ביטוי סיסמה"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "הערך חייב להיות בין $MIN$ ל־$MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "השתמש בסיסמה זו"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "השתמש בשם משתמש זה"
   },
@@ -7605,9 +7656,9 @@
     "message": "חשבון השירות עודכן",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "הקלד או בחר פרויקטים או סודות",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "הקלד כדי לסנן",
@@ -7692,8 +7743,8 @@
     "message": "אסימוני גישה",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "אסימון גישה חדש",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "אירעה שגיאה בעת ניסיון לקרוא את קובץ הייבוא"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "ניגש אל סוד $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "בקש אישור מנהל"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "הצפנת מכשיר מהימן"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "מכשיר מהימן"
   },
-  "sendsNoItemsTitle": {
-    "message": "אין סֵנְדים פעילים",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "השתמש בסֵנְד כדי לשתף באופן מאובטח מידע מוצפן עם כל אחד.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "הזמן משתמשים"
   },
@@ -8837,6 +8922,30 @@
     "message": "פורמטים נפוצים",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "כדי לשמור על המנוי שלך עבור$ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/hi/messages.json b/apps/web/src/locales/hi/messages.json
index 22a31e5df70..ebb408a90e1 100644
--- a/apps/web/src/locales/hi/messages.json
+++ b/apps/web/src/locales/hi/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "मैं"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "मेरी तिजोरी"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/hr/messages.json b/apps/web/src/locales/hr/messages.json
index 3c37dc9cedf..2f706a33e7f 100644
--- a/apps/web/src/locales/hr/messages.json
+++ b/apps/web/src/locales/hr/messages.json
@@ -99,7 +99,7 @@
     "message": "Označi aplikacije kao kritične"
   },
   "applicationsMarkedAsCriticalSuccess": {
-    "message": "Applications marked as critical"
+    "message": "Aplikacije označene kao kritične"
   },
   "application": {
     "message": "Aplikacija"
@@ -141,13 +141,13 @@
     "message": "Ovi članovi se prijavljuju u aplikacije slabim, izloženim ili ponovno korištenim lozinkama."
   },
   "atRiskMembersDescriptionNone": {
-    "message": "These are no members logging into applications with weak, exposed, or reused passwords."
+    "message": "Nema članova koji se prijavljuju slabim, izloženim ili ponovno korištenim lozinkama."
   },
   "atRiskApplicationsDescription": {
     "message": "Ove aplikacije imaju slabe, izložene ili ponovno korištene lozinke."
   },
   "atRiskApplicationsDescriptionNone": {
-    "message": "These are no applications with weak, exposed, or reused passwords."
+    "message": "Nema aplikacija sa slabim, izloženim ili ponovno korištenim lozinkama."
   },
   "atRiskMembersDescriptionWithApp": {
     "message": "Ovi članovi se u $APPNAME$ prijavljuju slabim, izloženim ili ponovno korištenim lozinkama.",
@@ -159,7 +159,7 @@
     }
   },
   "atRiskMembersDescriptionWithAppNone": {
-    "message": "There are no at risk members for $APPNAME$.",
+    "message": "Nema izloženih članova za $APPNAME$.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -547,12 +547,6 @@
     "message": "Sažmi/Proširi",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generiraj lozinku"
-  },
-  "generatePassphrase": {
-    "message": "Generiraj fraznu lozinku"
-  },
   "checkPassword": {
     "message": "Provjeri je li lozinka bila ukradena."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Ja"
   },
+  "myItems": {
+    "message": "Moje stavke"
+  },
   "myVault": {
     "message": "Moj trezor"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Ako nastaviš, biti će zatvorena trenutna sesija, što će zahtijevati ponovnu prijavu uklljučujući i dvostruku autentifikaciju, ako je aktivna. Aktivne sesije na drugim uređajima ostati će aktivne još jedan sat."
   },
+  "changePasswordWarning": {
+    "message": "Nakon promjene lozinke, moraš se prijaviti s novom lozinkom. Aktivne sesije na drugim uređajima bit će odjavljene u roku od jednog sata."
+  },
   "emailChanged": {
     "message": "Adresa e-pošte spremljena"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Uključivanje prijave dvostrukom autentifikacijom može ti trajno onemogućiti pristup Bitwarden računu. Kôd za oporavak ti omogućuje pristup računu u slučaju kada više ne možeš koristiti redovnog pružatelja prijave dvostrukom autentifikacijom (npr. izgubiš svoj uređaj). Bitwarden podrška neće ti moći pomoći ako izgubiš pristup svojem računu. Savjetujemo da zapišeš ili ispišeš kôd za oporavak i spremiš ga na sigurno mjesto."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Ukloni stavku Platna kartica"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Nemoj dozvoliti članovima stvaranje stavaka vrste Platna kartica. Postojeće stavke ove vrste biti će automatski uklonjenje."
+  },
+  "restrictCardTypeImport": {
+    "message": "Ne mogu uvesti stavke vrste Platna kartica"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Pravila jedne ili više organizacija onemogućuju uvoz stavke vrste Platna kartica u tvoj trezor."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Tvoj jednokratni kôd za oporavak može se koristiti za isključivanje prijave dvostruke autentifikacije u slučaju da izgubiš pristup svom davatelju usluge dvostruke autentifikacije. Bitwarden preporučuje da zapišeš kôd za oporavak i čuvaš ga na sigurnom mjestu."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Onemogući"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Detalji člana nisu pronađeni."
+  },
   "revokeAccess": {
     "message": "Opozovi pristup"
   },
@@ -3087,7 +3102,7 @@
     }
   },
   "planNameFamilies": {
-    "message": "Obitelji"
+    "message": "Families"
   },
   "planDescFamilies": {
     "message": "Za privatnu upotrebu, za dijeljenje s obitelji i prijateljima."
@@ -3336,7 +3351,7 @@
     "message": "SSO vanjski Id"
   },
   "ssoExternalIdDesc": {
-    "message": "SSO External ID is an unencrypted reference between Bitwarden and your configured SSO provider."
+    "message": "SSO vanjski ID je nešifrirana referenca između Bitwardena i tvojeg konfiguriranog SSO davatelja usluge."
   },
   "nestCollectionUnder": {
     "message": "Ugnijezdi zbirku pod"
@@ -4082,7 +4097,7 @@
     "message": "Ažuriraj preglednik"
   },
   "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+    "message": "Stvaranje tvojih uvida u rizik..."
   },
   "updateBrowserDesc": {
     "message": "Koristiš nepodržani preglednik. Web trezor možda neće ispravno raditi."
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Ažuriranje ključa za šifriranje ne može se nastaviti"
-  },
   "editFieldLabel": {
     "message": "Uredi $LABEL$",
     "placeholders": {
@@ -4533,23 +4545,14 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Prilikom ažuriranja tvojeg ključa za šifriranje, mape se nisu mogle dešifrirati. Za nastavak ažuriranja, tvoje mape moraju biti izbrisane. Nijedna stavka iz trezora neće biti izbrisana ako nastaviš."
-  },
-  "keyUpdated": {
-    "message": "Ključ ažuriran"
-  },
-  "updateEncryptionKey": {
-    "message": "Ažuriraj ključ za šifriranje"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Promijenili smo shemu šifriranja kako bismo pružili bolju sigurnost. Ažuriraj odmah svoj ključ za šifriranje unošenjem svoje glavne lozinke."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Nakon ažuriranja svojeg ključa za šifriranje, obavezno se trebaš odjaviti i ponovno prijaviti u sve Bitwarden aplikacije koje trenutno koristiš (npr. mobilna aplikacija, proširenje preglednika, ...). Ako se ne odjaviš i ponovno prijaviš (čime se preuzima tvoj novi ključ za šifriranje) može doći do oštećenja spremljenih podataka. Pokušati ćemo te automatski odjaviti, no, to bi možda moglo potrajati."
   },
   "updateEncryptionKeyAccountExportWarning": {
-    "message": "Any account restricted exports you have saved will become invalid."
+    "message": "Svi prethodni izvozi ograničeni ovim računom postati će nevažeći."
+  },
+  "legacyEncryptionUnsupported": {
+    "message": "Zastarjelo šifriranje više nije podržano. Obrati se podršci za oporavak računa."
   },
   "subscription": {
     "message": "Pretplata"
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Pristup u nuždi odbijen"
   },
+  "grantorDetailsNotFound": {
+    "message": "Podaci o davatelju nisu pronađeni"
+  },
   "passwordResetFor": {
     "message": "Lozinka za $USER$ resetirana. Sada se možeš prijaviti novom lozinkom.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Provedi vlasništvo nad podacima organizacije"
+  },
   "personalOwnership": {
     "message": "Ukloni osobni trezor"
   },
@@ -5698,7 +5707,7 @@
     "message": "WebAuthn uspješno ovjeren! Možeš zatvoriti ovu karticu."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Tvoja nova lozinka ne može biti ista kao tvoja trenutna lozinka."
   },
   "hintEqualsPassword": {
     "message": "Podsjetnik za lozinku ne može biti isti kao lozinka."
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Ako nastaviš, biti će zatvorena trenutna sesija za $NAME$, što će zahtijevati ponovnu prijavu. Aktivne sesije na drugim uređajima ostati će aktivne još jedan sat.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "ovaj korisnik"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Jedno ili više organizacijskih pravila zahtijeva da glavna lozinka ispunjava sljedeće uvjete:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Jedno ili više organizacijskih pravila zahtijeva da glavna lozinka ispunjava sljedeće uvjete:"
+  },
   "resetPasswordSuccess": {
     "message": "Uspješno ponovno postalvjena lozinka!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Dodaj"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Glavna lozinka je uspješno postavljena"
+  },
   "updatedMasterPassword": {
     "message": "Glavna lozinka ažurirana"
   },
   "updateMasterPassword": {
     "message": "Ažuriraj glavnu lozinku"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Promijeni svoju glavnu lozinku za dovršetak oporavka računa."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Tvoja glavna lozinka ne ispunjava zahtjeve ove organizacije. Promijeni glavnu lozinku za nastavak."
+  },
   "updateMasterPasswordWarning": {
     "message": "Tvoju glavnu lozinku je nedavno promijenio administrator tvoje organizacije. Za pristup trezoru, potrebno je ažurirati glavnu lozinku, što će te odjaviti iz trenutne sesije, te ćeš se morati ponovno prijaviti. Aktivne sesije na drugim uređajima mogu ostati aktivne još sat vremena."
   },
@@ -6306,16 +6336,16 @@
     "message": "Sponzorirani obiteljski paket"
   },
   "noSponsoredFamiliesMessage": {
-    "message": "No sponsored families"
+    "message": "Nema sponzoriranog Families paketa"
   },
   "nosponsoredFamiliesDetails": {
-    "message": "Sponsored non-member families plans will display here"
+    "message": "Sponzorirani ne-obiteljski paketi biti će prikazani ovdje"
   },
   "sponsorshipFreeBitwardenFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. You can sponsor Free Bitwarden Families for employees who are not a member of your Bitwarden organization. Sponsoring a non-member requires an available seat within your organization."
+    "message": "Članovi tvoje organizacije ispunjavaju uvjete za besplatni Bitwarden Families paket. Možeš sponzorirati besplatni Bitwarden Families paket za zaposlenike koji nisu članovi tvoje Bitwarden organizacije. Sponzoriranje ne-člana zahtijeva dostupno mjesto unutar vaše organizacije."
   },
   "sponsoredFamiliesRemoveActiveSponsorship": {
-    "message": "When you remove an active sponsorship, a seat within your organization will be available after the renewal date of the sponsored organization."
+    "message": "Kada ukloniš aktivno sponzorstvo, mjesto unutar tvoje organizacije bit će dostupno nakon datuma obnove sponzorirane organizacije."
   },
   "sponsoredFamiliesEligible": {
     "message": "Ti i tvoja obitelj ispunjavate uvjete za besplatni Bitwarden Families. Iskoristiti ponudu svojom e-poštom kako bi zaštitio svoje podatke čak i kada nisi na poslu."
@@ -6324,28 +6354,28 @@
     "message": "Iskoristi svoju ponudu za besplatni Bitwarden Families paket već danas kako bi tvoji podaci bili sigurni čak i kada nisi na poslu."
   },
   "sponsoredFamiliesIncludeMessage": {
-    "message": "The Bitwarden for Families plan includes"
+    "message": "Bitwarden Families paket uključuje"
   },
   "sponsoredFamiliesPremiumAccess": {
     "message": "Premium pristup do 6 korisnika"
   },
   "sponsoredFamiliesSharedCollectionsForFamilyMembers": {
-    "message": "Shared collections for family members"
+    "message": "Dijeljene zbirke za članove obitelji"
   },
   "memberFamilies": {
-    "message": "Member families"
+    "message": "Families člana"
   },
   "noMemberFamilies": {
-    "message": "No member families"
+    "message": "Nema članskih Families"
   },
   "noMemberFamiliesDescription": {
-    "message": "Members who have redeemed family plans will display here"
+    "message": "Članovi koji su iskoristili obiteljske pakete biti će prikazani ovdje"
   },
   "membersWithSponsoredFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. Here you can see members who have sponsored a Families organization."
+    "message": "Članovi tvoje organizacije ispunjavaju uvjete za besplatni Bitwarden Families paket. Ovdje možeš vidjeti članove koji su sponzorirali Families organizaciju."
   },
   "organizationHasMemberMessage": {
-    "message": "A sponsorship cannot be sent to $EMAIL$ because they are a member of your organization.",
+    "message": "Nije moguće poslati sponzorstvo na $EMAIL$ jer je taj korisnik član tvoje organizacije.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6405,7 +6435,7 @@
     "message": "Račun iskorišten"
   },
   "revokeAccountMessage": {
-    "message": "Revoke account $NAME$",
+    "message": "Opozovi račun $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -6477,10 +6507,10 @@
     "message": "Nevažeći kôd za provjeru"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Glavna lozinka više nije obavezna za članove ove organizacije. Provjeri prikazanu domenu sa svojim administratorom."
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Domena konektora ključa"
   },
   "leaveOrganization": {
     "message": "Napusti organizaciju"
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generiraj e-poštu"
   },
+  "generatePassword": {
+    "message": "Generiraj lozinku"
+  },
+  "generatePassphrase": {
+    "message": "Generiraj fraznu lozinku"
+  },
+  "passwordGenerated": {
+    "message": "Lozinka generirana"
+  },
+  "passphraseGenerated": {
+    "message": "Frazna lozinka generirana"
+  },
+  "usernameGenerated": {
+    "message": "Korisničko ime generirano"
+  },
+  "emailGenerated": {
+    "message": "e-pošta generirana"
+  },
   "spinboxBoundariesHint": {
     "message": "Vrijednost mora biti u rasponu $MIN$ - $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Koristi ovu lozinku"
   },
+  "useThisPassphrase": {
+    "message": "Koristi ovu fraznu lozinku"
+  },
   "useThisUsername": {
     "message": "Koristi ovo korisničko ime"
   },
@@ -7280,7 +7331,7 @@
     "message": "Prati korake za dovršetak prijave."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Prati korake za dovršetak prijave svojim sigurnosnim ključem."
   },
   "launchDuo": {
     "message": "Pokreni Duo"
@@ -7605,9 +7656,9 @@
     "message": "Ažuriran račun usluge",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Upiši ili odaberi projekte ili tajne",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Upiši ili odaberi projekte",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Upiši za filtriranje…",
@@ -7692,8 +7743,8 @@
     "message": "Pristupni tokeni",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Novi pristupni token",
+  "createAccessToken": {
+    "message": "Stvori pristupni token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -7963,7 +8014,7 @@
     "message": "Pozovi člana"
   },
   "addSponsorship": {
-    "message": "Add sponsorship"
+    "message": "Dodaj sponzorstvo"
   },
   "needsConfirmation": {
     "message": "Treba potvrdu"
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Pojavila se greška prilikom pokušaja čitanja uvozne datoteke"
   },
+  "accessedSecretWithId": {
+    "message": "Pristupljeno tajni s identifikatorom: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Pristupljeno tajni $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Uređena tajna s identifikatorom: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Izbrisana tajna s identifikatorom: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Stvorena nova tajna s identifikatorom: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Zatraži odobrenje administratora"
   },
+  "unableToCompleteLogin": {
+    "message": "Nije moguće dovršiti prijavu"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Moraš se prijaviti na pouzdanom uređaju ili zamoliti administratora da ti dodijeli lozinku."
+  },
   "trustedDeviceEncryption": {
     "message": "Enkripcija pouzdanog uređaja"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Uređaj pouzdan"
   },
-  "sendsNoItemsTitle": {
-    "message": "Nema aktivnih Sendova",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Koristi Send za sigurno slanje šifriranih podataka bilo kome.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Pozovi korisnike"
   },
@@ -8703,7 +8788,7 @@
     "message": "Omogući brisanje zbirki samo vlasnicima i adminima"
   },
   "limitItemDeletionDescription": {
-    "message": "Limit item deletion to members with the Manage collection permissions"
+    "message": "Ograniči brisanje stavke samo članovima koji imaju dozvolu „Moguće upravljanje”"
   },
   "allowAdminAccessToAllCollectionItemsDesc": {
     "message": "Vlasnici i admini mogu upravljati svim zbirkama i stavkama"
@@ -8837,6 +8922,30 @@
     "message": "Uobičajeni oblici",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Otkrivanje podudaranja URI-ja je način na koji Bitwarden identificira prijedloge za auto-ispunu.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "„Regularni izraz” je napredna mogućnost s povećanim rizikom od otkrivanja vjerodajnica.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "„Počinje s” je napredna mogućnost s povećnim rizikom od otkrivanja vjerodajnica.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Više o otkrivanju podudaranja",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Napredne mogućnosti",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Upozorenje",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Za održavanje svoje pretplate za $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -9426,19 +9535,19 @@
     "message": "Upravljanje naplatom s Portala pružatelja usluga"
   },
   "continueSettingUp": {
-    "message": "Continue setting up Bitwarden"
+    "message": "Nastavi Bitwarden postavljanje"
   },
   "continueSettingUpFreeTrial": {
     "message": "Nastavi s postavljanjem besplatne probe Bitwardena"
   },
   "continueSettingUpPasswordManager": {
-    "message": "Continue setting up Bitwarden Password Manager"
+    "message": "Nastavi postavljanje Bitwarden upravitelja lozinki"
   },
   "continueSettingUpFreeTrialPasswordManager": {
     "message": "Nastavi s postavljanjem besplatne probe Bitwarden Upravitelja Lozinki"
   },
   "continueSettingUpSecretsManager": {
-    "message": "Continue setting up Bitwarden Secrets Manager"
+    "message": "Nastavi postavljanje Bitwarden Secrets Managera"
   },
   "continueSettingUpFreeTrialSecretsManager": {
     "message": "Nastavi s postavljanjem besplatne probe Btwarden Secrets Managera"
@@ -10298,10 +10407,10 @@
     "message": "Naziv organizacije ne može biti duži od 50 znakova."
   },
   "rotationCompletedTitle": {
-    "message": "Key rotation successful"
+    "message": "Rotacija ključa uspjela"
   },
   "rotationCompletedDesc": {
-    "message": "Your master password and encryption keys have been updated. Your other devices have been logged out."
+    "message": "Tvoja glavna lozinka i ključ za šifriranje su ažurirani. Tvoji uređaji su odjavljeni."
   },
   "trustUserEmergencyAccess": {
     "message": "Vjeruj i potvrdi korisnika"
@@ -10316,19 +10425,19 @@
     "message": "Nemoj vjerovati"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Organizacija nije pouzdana"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Radi sigurnosti tvojeg računa, potvrdi samo ako je ovom korisniku odobren pristup u hitnim slučajevima i ako se otisak prsta podudara s onim prikazanim u računu"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Radi sigurnosti tvojeg računa, nastavi samo ako si član ove organizacije, imaš omogućen oporavak računa i otisak prsta prikazan u nastavku odgovara otisku prsta organizacije."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Ova organizacija ima poslovno pravilo koje će te prijaviti za oporavak računa. Prijava će omogućiti administratorima organizacije da promijene tvoju lozinku. Nastavi samo ako prepoznaješ ovu organizaciju i ako se fraza otiska prsta prikazana u nastavku podudara s otiskom prsta organizacije."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Vjeruj korisniku"
   },
   "sshKeyWrongPassword": {
     "message": "Unesena lozinka nije ispravna."
@@ -10500,7 +10609,7 @@
     "message": "Dodijeljene licence premašuju dostupne licence."
   },
   "userkeyRotationDisclaimerEmergencyAccessText": {
-    "message": "Fingerprint phrase for $NUM_USERS$ contacts for which you have enabled emergency access.",
+    "message": "Fraza otiska prsta za $NUM_USERS$ kontakata za koje je omogućen pristup u hitnim slučajevima.",
     "placeholders": {
       "num_users": {
         "content": "$1",
@@ -10509,7 +10618,7 @@
     }
   },
   "userkeyRotationDisclaimerAccountRecoveryOrgsText": {
-    "message": "Fingerprint phrase for the organization $ORG_NAME$ for which you have enabled account recovery.",
+    "message": "Jedinstvena fraza za organizaciju $ORG_NAME$ za koju je uključen oporavak računa.",
     "placeholders": {
       "org_name": {
         "content": "$1",
@@ -10518,10 +10627,10 @@
     }
   },
   "userkeyRotationDisclaimerDescription": {
-    "message": "Rotating your encryption keys will require you to trust keys of any organizations that can recover your account, and any contacts that you have enabled emergency access for. To continue, make sure you can verify the following:"
+    "message": "Rotiranje ključeva za šifriranje zahtijevat će da vjeruješ ključevima svih organizacija koje mogu oporaviti tvoj račun i svih kontakata za koje je omogućen pristup u hitnim slučajevima. Za nastavak provjeri možeš li provjeriti sljedeće:"
   },
   "userkeyRotationDisclaimerTitle": {
-    "message": "Untrusted encryption keys"
+    "message": "Nepouzdani ključevi za šifriranje"
   },
   "changeAtRiskPassword": {
     "message": "Promijeni rizičnu lozinku"
@@ -10533,10 +10642,10 @@
     "message": "Ne dozvoli članovima otključavanje računa PIN-om."
   },
   "upgradeForFullEventsMessage": {
-    "message": "Event logs are not stored for your organization. Upgrade to a Teams or Enterprise plan to get full access to organization event logs."
+    "message": "Zapisnici događaja ne pohranjuju se za tvoju organizaciju. Za puni pristup zapisnicima događaja organizacije nadogradi na paket Teams ili Enterprise."
   },
   "upgradeEventLogTitleMessage": {
-    "message": "Upgrade to see event logs from your organization."
+    "message": "Nadogradi za pregled zapisnika događaja tvoje organizacije."
   },
   "upgradeEventLogMessage": {
     "message": "Ovi događaji su samo primjeri i ne odražavaju stvarne događaje unutar tvoje Bitwarden organizacije."
@@ -10545,13 +10654,38 @@
     "message": "Besplatne organizacije mogu imati do 2 zbirke. Nadogradi na plaćeni plan za dodavanje više zbirki."
   },
   "businessUnit": {
-    "message": "Business Unit"
+    "message": "Poslovna jedinica"
   },
   "businessUnits": {
-    "message": "Business Units"
+    "message": "Poslovne jedinice"
   },
   "newBusinessUnit": {
-    "message": "New business unit"
+    "message": "Nova poslovna jedinica"
+  },
+  "sendsTitleNoItems": {
+    "message": "Sigurno pošalji osjetljive podatke",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Sigurno dijeli datoteke i podatke s bilo kime, na bilo kojoj platformi. Tvoji podaci ostaju kriptirani uz ograničenje izloženosti.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Brzo stvori lozinke"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Jednostavno stvori jake i jedinstvene lozinke odabirom tipke",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "kako bi tvoje prijave ostale sigurne.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Jednostavno stvori jake i sigurne lozinke odabirom tipke Generiraj lozinku kako bi tvoje prijave ostale sigurne. ",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
     "message": "Uštedi vrijeme s auto-ispunom"
@@ -10572,7 +10706,7 @@
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Jednostavna online kupnja"
   },
   "newCardNudgeBody": {
     "message": "S karticama jednostavno i sigurno automatski ispunjavaš obrasce za plaćanje."
@@ -10590,7 +10724,7 @@
     "message": "S bilješkama sigurno pohrani svoje osjetljive podatke poput podataka o banci ili osiguranju."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "SSH pristup prilagođen programerima"
   },
   "newSshNudgeBodyOne": {
     "message": "Pohrani svoje ključeve i poveži se sa SSH agentom za brzu, šifriranu autentifikaciju.",
@@ -10602,13 +10736,123 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Siguerno auto-ispuni svoje lozinke jednim klikom"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Nabavi Bitwarden proširenje za preglednik za jednostavnu auto-ispunu lozinki"
+  },
+  "getTheExtension": {
+    "message": "Nabavi prošitenje"
+  },
+  "addItLater": {
+    "message": "Dodaj kasnije"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Ne možeš auto-ispunjavati lozinke bez proširenja za preglednik"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Sigurno ne želiš sada dodati proširenje?"
+  },
+  "skipToWebApp": {
+    "message": "Preskoči na web stranicu"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden proširenje je instalirano!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Otvori proširenje i prijavi se za početak korištenja auto-ispune."
+  },
+  "openBitwardenExtension": {
+    "message": "Otvori Bitwarden proširenje"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "Za savjete o korištenju Bitwardena posjeti",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "centar za učenje",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "centar za pomoć",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "Pomoću Bitwarden proširenja za preglednik možeš jednostavno stvoriti nove prijave, pristupiti spremljenim prijavama izravno s alatne trake preglednika i brzo se prijaviti na svoje račune pomoću Bitwarden auto-ispune."
+  },
   "restart": {
     "message": "Saznaj više o SSH agentu"
   },
   "verifyProviderBankAccountWithStatementDescriptorWarning": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the provider's subscription page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "Plaćanje putem bankovnog računa dostupno je samo kupcima u SAD. Treba potvrditi bankovni račun. Unutar 1 - 2 radna dana izvršit ćemo mikro-uplatu. Unesi šifru u opisu ove uplate na stranici za naplatu pružatelja usluge za potvrdu bankovnog računa. Ne-potvrda bankovnog računa rezultirat će propuštenim plaćanjem i obustavom pretplate."
   },
   "clickPayWithPayPal": {
-    "message": "Please click the Pay with PayPal button to add your payment method."
+    "message": "Za dodavnje svojeg načina plaćanja, klikni tipku Plati PayPalom."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Uklanjanjem $EMAIL$, sponzorstvo za ovaj Families paket će završiti. Mjesto unutar tvoje organizacije bit će dostupno članovima ili sponzorstvima nakon datuma obnove sponzorirane organizacije $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Za dodavanje kredita potrebna je adresa za naplatu.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Adresa za naplatu"
+  },
+  "addBillingAddress": {
+    "message": "Dodaj adresu za naplatu"
+  },
+  "editBillingAddress": {
+    "message": "Uredi adresu za naplatu"
+  },
+  "noBillingAddress": {
+    "message": "Nije unesena adresa."
+  },
+  "billingAddressUpdated": {
+    "message": "Tvoja adresa za naplatu je ažurirana."
+  },
+  "paymentDetails": {
+    "message": "Detalji o plaćanju"
+  },
+  "paymentMethodUpdated": {
+    "message": "Tvoj način plaćanja je ažurirana."
+  },
+  "bankAccountVerified": {
+    "message": "Tvoj bankovni račun je potvrđen."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Sav raspoloživi kredit automatski će se primijeniti na fakture generirane za ovaj račun."
+  },
+  "mustBePositiveNumber": {
+    "message": "Mora biti veće od nule"
+  },
+  "cardSecurityCode": {
+    "message": "Kontrolni broj kartice"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Kontrolni broj kartice, također poznat kao CVV ili CVC, obično je troznamenkasti broj otisnut na poleđini vaše kreditne kartice ili četveroznamenkasti broj otisnut na prednjoj strani iznad broja vaše kartice."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Plaćanje putem bankovnog računa dostupno je samo kupcima u SAD. Treba potvrditi bankovni račun. Unutar 1 - 2 radna dana izvršit ćemo mikro-uplatu. Unesi šifru u opisu ove uplate na stranici za naplatu pružatelja usluge za potvrdu bankovnog računa. Ne-potvrda bankovnog računa rezultirat će propuštenim plaćanjem i obustavom pretplate."
+  },
+  "taxId": {
+    "message": "Porezni broj: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/hu/messages.json b/apps/web/src/locales/hu/messages.json
index 33ea6c3d9cd..6864afe594d 100644
--- a/apps/web/src/locales/hu/messages.json
+++ b/apps/web/src/locales/hu/messages.json
@@ -547,12 +547,6 @@
     "message": "Összecsukás/kinyitás",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Jelszó generálása"
-  },
-  "generatePassphrase": {
-    "message": "Jelmondat generálás"
-  },
   "checkPassword": {
     "message": "A jelszóvédelmi állapot ellenőrzése."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Én"
   },
+  "myItems": {
+    "message": "Saját elemek"
+  },
   "myVault": {
     "message": "Saját széf"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "A folytatásban a felhasználó kiléptetésre kerül a jelenlegi munkamenetből, szükséges az ismételt bejelentkezés. Más eszközökön aktív munkamenetek akár egy órán keresztül is aktívak maradhatnak."
   },
+  "changePasswordWarning": {
+    "message": "A jelszó megváltoztatása után be kell jelentkezni az új jelszóval. Az aktív munkamenetek más eszközökön egy órán belül kijelentkeznek."
+  },
   "emailChanged": {
     "message": "Az email cím megváltozott."
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "A kétlépcsős bejelentkezés engedélyezése véglegesen kizárhatja a felhasználót a Bitwarden fiókból. A helyreállítási kód lehetővé teszi a fiókjához való hozzáférést abban az esetben, ha már nem tudjuk használni a szokásos kétlépcsős bejelentkezési szolgáltatást (pl. készülék elvesztése). A Bitwarden támogatás nem tud segíteni abban az esetben, ha elveszítjük a hozzáférést a fiókhoz. Célszerű leírni vagy kinyomtatni a helyreállítási kódot és azt biztonságos helyen tartani."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Kártyaelem típus eltávolítása"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Ne engedjük meg a tagoknak, hogy kártyaelem típusokat hozzanak létre. A meglévő kártyák automatikusan eltávolításra kerülnek."
+  },
+  "restrictCardTypeImport": {
+    "message": "A kártya elem típusokat nem lehet importálni."
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Egy vagy több szervezet által beállított szabályzat megakadályozza a kártyák importálását a széfekbe."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Az egyszer használatos helyreállítási kóddal kikapcsolhatjuk a kétlépcsős bejelentkezést abban az esetben, ha elveszítjük a hozzáférést a kétlépcsős bejelentkezési szolgáltatóhoz. A Bitwarden azt javasolja, hogy írjuk le a helyreállítási kódot és tartsuk biztonságos helyen."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Letiltás"
   },
+  "orgUserDetailsNotFound": {
+    "message": "A tag adatai nem találhatók."
+  },
   "revokeAccess": {
     "message": "Hozzáférés visszavonása"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "A titkosítókulcs frissítése nem végrehajtható"
-  },
   "editFieldLabel": {
     "message": "$LABEL$ szerkesztése",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "A titkosítókulcs frissítésekor a mappáid nem fejthetőek vissza. A frissítés folytatásához a mappáidat törölni kell. Semmi nem fog törlődni, ha folytatod."
-  },
-  "keyUpdated": {
-    "message": "A kulcs frissítésre került."
-  },
-  "updateEncryptionKey": {
-    "message": "Titkosítási kulcs frissítés"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "A titkosítási rendszer megváltozott, hogy nagyobb biztonságot nyújtson. Frissítsük a titkosítási kulcsot az mesterjelszó megadásával lentebb."
-  },
   "updateEncryptionKeyWarning": {
     "message": "A titkosítási kulcs frissítése után ki kell jelentkezni és vissza kell jelentkezni az összes jelenleg használt Bitwarden alkalmazásba (például a mobilalkalmazás vagy a böngésző bővítmények). A kijelentkezés és a bejelentkezés elmulasztása (amely letölti az új titkosítási kulcsot) adatvesztést okozhat. Megkíséreljük az automatikusan kijelentkeztetést, azonban ez késhet."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "A fiókhoz korlátozottan mentett exportálások érvénytelenek lesznek."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "A régi titkosítás már nem támogatott. Lépjünk kapcsolatba a támogatással a fiók helyreállításához."
+  },
   "subscription": {
     "message": "Előfizetés"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "A vészhelyzeti hozzáférés elutasításra került."
   },
+  "grantorDetailsNotFound": {
+    "message": "Az adományozó adatai nem találhatók."
+  },
   "passwordResetFor": {
     "message": "A jelszó alaphelyzetbe került $USER$ részére. Most az új jelszóval lehet bejelentkezni.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "A szervezet adat tulajdonjogának érvényesítése"
+  },
   "personalOwnership": {
     "message": "Személyes tulajdon"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "A folyamat során $NAME$ kijelentkezése történik az aktuális munkamenetből, ezért vissza kell jelentkezni. Az aktív munkamenetek más eszközökön akár egy órán keresztül is aktívak maradhatnak.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "ez a felhasználó"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Egy vagy több szervezeti rendszabályhoz mesterjelszó szükséges a következő követelmények megfeleléséhez:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Egy vagy több szervezeti rendszabályhoz mesterjelszó szükséges a következő követelmények megfeleléséhez:"
+  },
   "resetPasswordSuccess": {
     "message": "A jelszó alaphelyzetbe állítása sikeres volt."
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Hozzáadás"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "A mesterjelszó sikeresen beállításra került."
+  },
   "updatedMasterPassword": {
     "message": "A mesterjelszó frissítésre került."
   },
   "updateMasterPassword": {
     "message": "Mesterjelszó frissítése"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Módosítsuk a mesterjelszót a fiók helyreállításának befejezéséhez."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "A mesterjelszó nem felel meg a szervezet követelményeinek. Módosítsuk a mesterjelszót a folytatáshoz."
+  },
   "updateMasterPasswordWarning": {
     "message": "A mesterjelszót nemrégiben megváltoztatta a szervezet rendszergazdája. A tároló eléréséhez most frissíteni kell a mesterjelszót. A folytatás kijelentkeztet az aktuális munkamenetből és újra be kell jelentkezni. A más eszközökön végzett aktív munkamenetek akár egy órán keresztül is aktívak maradhatnak."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Email generálása"
   },
+  "generatePassword": {
+    "message": "Jelszó generálása"
+  },
+  "generatePassphrase": {
+    "message": "Jelmondat generálás"
+  },
+  "passwordGenerated": {
+    "message": "A jelszó generálásra került."
+  },
+  "passphraseGenerated": {
+    "message": "A jelmondat generálásra került."
+  },
+  "usernameGenerated": {
+    "message": "A felhasználónév generálásra került."
+  },
+  "emailGenerated": {
+    "message": "Az email generálásra került."
+  },
   "spinboxBoundariesHint": {
     "message": "Az érték legyen $MIN$ és $MAX$ között.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Jelszó használata"
   },
+  "useThisPassphrase": {
+    "message": "Jelszó használata"
+  },
   "useThisUsername": {
     "message": "Felhasználónév használata"
   },
@@ -7605,9 +7656,9 @@
     "message": "A szolgáltatás fiók frissítésre került.",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Gépeljük be vagy válasszunk projekteket vagy titkos kódokat",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Projektek begépelése vagy kiválasztása",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Gépelés a szűréshez",
@@ -7692,8 +7743,8 @@
     "message": "Vezérjelek elérése",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Új hozzáférési vezérjel",
+  "createAccessToken": {
+    "message": "Elérési vezérjel létrehozása",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Hiba történt az import fájl beolvasásának kísérletekor."
   },
+  "accessedSecretWithId": {
+    "message": "Titkos adat elérése történt egy titkos adathoz azonosítóval: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Hozzáférés a titkos $SECRET_ID$ azonosítóhoz.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Titkos adat szerkesztése történt egy titkos adathoz azonosítóval: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Titkos adat törlése történt egy titkos adathoz azonosítóval: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Új titkos adat létrehozása történt egy azonosítóval: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Adminisztrátori jóváhagyás kérés"
   },
+  "unableToCompleteLogin": {
+    "message": "Nem lehet befejezni a bejelentkezést."
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Be kell jelentkezni egy megbízható eszközön vagy meg kell kérni az adminisztrátort, hogy rendeljen hozzá egy jelszót."
+  },
   "trustedDeviceEncryption": {
     "message": "Megbízható eszköztitkosítás"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Az eszköz megbízható."
   },
-  "sendsNoItemsTitle": {
-    "message": "Nincsenek natív Send elemek.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "A Send használatával biztonságosan megoszthatjuk a titkosított információkat bárkivel.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Felhasználók meghívása"
   },
@@ -8837,6 +8922,30 @@
     "message": "Általános formátumok",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Az URI egyezés észlelése az, ahogyan a Bitwarden azonosítja az automatikus kitöltési javaslatokat.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "A \"Normál kifejezés“ egy fejlett opció, amely a hitelesítő adatok növekvő kiszivárgásának kockázatával.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "A \"Kezdés\" egy fejlett opció, amely a hitelesítő adatok kiszivárgásának növekvő kockázatával.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Bővebben az egyezés felismerésről",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Haladó opciók",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Figyelmeztetés",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "$ORG$ előfizetés fenntartásához, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Új üzleti egység"
   },
+  "sendsTitleNoItems": {
+    "message": "Érzékeny információt küldése biztonságosan",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Fájlok vagy adatok megosztása biztonságosan bárkivel, bármilyen platformon. Az információk titkosítva maradnak a végpontokon, korlátozva a kitettséget.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Jelszavak gyors létrehozása"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Könnyen létrehozhatunk erős és egyedi jelszavakat a gombra kattintva",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Könnyedén hozhatunk létre erős és egyedi jelszavakat a Jelszó generálása gombra kattintva, amely segít megőrizni a bejelentkezések biztonságát.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Újraindítás"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Kattintás a Pay with PayPal gombra a fizetési mód hozzáadásához."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "$EMAIL$ eltávolításával a családi csomag szponzorálása véget ér. A szervezeten belüli hely a szponzorált szervezet megújítási dátuma után válik elérhetővé a tagok vagy a szponzorálások számára: $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "A jóváírás hozzáadásához szükséges számlázási cím.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Számlázási cím"
+  },
+  "addBillingAddress": {
+    "message": "Számlázási cím hozzáadása"
+  },
+  "editBillingAddress": {
+    "message": "Számlázási cím szerkesztése"
+  },
+  "noBillingAddress": {
+    "message": "Nincs cím rögzítve."
+  },
+  "billingAddressUpdated": {
+    "message": "A számlázási cím frissítésre került."
+  },
+  "paymentDetails": {
+    "message": "Fizetési részletek"
+  },
+  "paymentMethodUpdated": {
+    "message": "A fizetési mód frissítésre került."
+  },
+  "bankAccountVerified": {
+    "message": "A bankszámla megerősítésre került."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Bármilyen rendelkezésre álló jóváírás automatikusan érvényesül az ehhez a számlához generált számlákra."
+  },
+  "mustBePositiveNumber": {
+    "message": "Pozitív számnak kell lennie."
+  },
+  "cardSecurityCode": {
+    "message": "Kártya biztonsági kód"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "A kártya biztonsági kódja, más néven CVV vagy CVC, általában egy 3 számjegyű szám, amelyet a hitelkártya hátoldalára nyomtatnak vagy egy 4 számjegyű szám, amelyet a kártyaszám feletti előlapra nyomtatnak."
+  },
+  "verifyBankAccountWarning": {
+    "message": "A bankszámlával történő fizetés csak az Egyesült Államokban lévő ügyfelek számára elérhető. Ellenőrizni kell bankszámlát. A következő 1-2 munkanapon belül mikrobetét készül.  A bankszámla ellenőrzéséhez írjuk be a kimutatás leíró kódot ebből a befizetésből a Fizetési adatok oldalon. A bankszámla ellenőrzésének elmulasztása a fizetés elmaradását és az előfizetés felfüggesztését vonja maga után."
+  },
+  "taxId": {
+    "message": "Adó azonosító: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/id/messages.json b/apps/web/src/locales/id/messages.json
index 379a6424333..b1d0554dc4d 100644
--- a/apps/web/src/locales/id/messages.json
+++ b/apps/web/src/locales/id/messages.json
@@ -547,12 +547,6 @@
     "message": "Alihkan Ciutkan",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Buat Kata Sandi"
-  },
-  "generatePassphrase": {
-    "message": "Buat frasa sandi"
-  },
   "checkPassword": {
     "message": "Periksa apakah kata sandi telah terekspos."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Saya"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Brankas Saya"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Melanjutkan akan mengeluarkan Anda dari sesi saat ini, mengharuskan Anda untuk masuk kembali. Sesi aktif di perangkat lain dapat terus aktif hingga satu jam."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Surel Diubah"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Dengan mengaktifkan login dua-langkah, Anda bisa terkunci dari akun Bitwarden secara permanen. Jika Anda tidak bisa menggunakan provider login dua-langkah di kondisi normal (misal karena perangkat Anda hilang), Anda bisa menggunakan kode pemulihan untuk mengakses akun tersebut. Bitwarden sama sekali tidak dapat membantu jika Anda kehilangan akses ke akun Anda. Oleh karena itu, kami menyarankan Anda untuk menulis atau mencetak kode pemulihan dan menyimpannya di tempat yang aman."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Nonaktifkan"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Cabut Akses"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Kunci Diperbarui"
-  },
-  "updateEncryptionKey": {
-    "message": "Perbarui Kunci Enkripsi"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Setelah memperbarui kunci enkripsi Anda, Anda diminta untuk keluar dan masuk kembali ke semua aplikasi Bitwarden yang saat ini Anda gunakan (seperti aplikasi seluler atau ekstensi browser). Kegagalan untuk keluar dan masuk kembali (yang mengunduh kunci enkripsi baru Anda) dapat menyebabkan kerusakan data. Kami akan mencoba mengeluarkan Anda secara otomatis, namun, hal itu mungkin tertunda."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Langganan"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Akses darurat ditolak"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Setel ulang sandi untuk $USER$. Sekarang Anda dapat masuk menggunakan kata sandi baru.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Kepemilikan Pribadi"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "pengguna ini"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Satu atau lebih kebijakan organisasi memerlukan kata sandi utama Anda untuk memenuhi persyaratan berikut:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Ubah kata kunci berhasil!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Tambah"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Kata Sandi Telah Diperbarui"
   },
   "updateMasterPassword": {
     "message": "Perbarui Kata Sandi Utama"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Buat Kata Sandi"
+  },
+  "generatePassphrase": {
+    "message": "Buat frasa sandi"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/it/messages.json b/apps/web/src/locales/it/messages.json
index 8019ac7a750..8549da6aadf 100644
--- a/apps/web/src/locales/it/messages.json
+++ b/apps/web/src/locales/it/messages.json
@@ -3,7 +3,7 @@
     "message": "Tutte le applicazioni"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Logo Bitwarden"
   },
   "criticalApplications": {
     "message": "Applicazioni critiche"
@@ -99,7 +99,7 @@
     "message": "Contrassegna l'applicazione come critica"
   },
   "applicationsMarkedAsCriticalSuccess": {
-    "message": "Applications marked as critical"
+    "message": "Applicazioni contrassegnate come critiche"
   },
   "application": {
     "message": "Applicazione"
@@ -141,13 +141,13 @@
     "message": "Questi membri accedono ad applicazioni con parole d'accesso deboli, esposte, o riutilizzate."
   },
   "atRiskMembersDescriptionNone": {
-    "message": "These are no members logging into applications with weak, exposed, or reused passwords."
+    "message": "Non ci sono utenti connessi con password deboli, esposte o riutilizzate."
   },
   "atRiskApplicationsDescription": {
     "message": "Queste applicazioni hanno parole d'accesso deboli, esposte o riutilizzate."
   },
   "atRiskApplicationsDescriptionNone": {
-    "message": "These are no applications with weak, exposed, or reused passwords."
+    "message": "Non ci sono applicazioni con password deboli, esposte o riutilizzate."
   },
   "atRiskMembersDescriptionWithApp": {
     "message": "Questi membri stanno entrando in $APPNAME$ con parole d'accesso deboli, esposte, o riutilizzate.",
@@ -159,7 +159,7 @@
     }
   },
   "atRiskMembersDescriptionWithAppNone": {
-    "message": "There are no at risk members for $APPNAME$.",
+    "message": "Non ci sono membri a rischio per $APPNAME$.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -547,12 +547,6 @@
     "message": "Comprimi/espandi",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Genera password"
-  },
-  "generatePassphrase": {
-    "message": "Genera passphrase"
-  },
   "checkPassword": {
     "message": "Verifica se la password è stata esposta."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Io"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "La mia cassaforte"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Procedere ti farà uscire dalla sessione corrente, richiedendoti di accedere di nuovo. Le sessioni attive su altri dispositivi potrebbero continuare a rimanere attive per un massimo di un'ora."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email salvata"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Impostare la verifica in due passaggi potrebbe bloccarti permanentemente fuori dal tuo account Bitwarden. Un codice di recupero ti permette di accedere al tuo account il caso non potessi più usare il tuo solito metodo di verifica in due passaggi (per esempio se perdi il telefono). L'assistenza clienti di Bitwarden non sarà in grado di aiutarti se perdi l'accesso al tuo account. Scrivi o stampa il tuo codice di recupero e conservalo in un luogo sicuro."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Rimuovi l'elemento carta"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Non consentire ai membri di creare elementi di tipo carta. Le carte esistenti saranno rimosse automaticamente."
+  },
+  "restrictCardTypeImport": {
+    "message": "Impossibile importare elementi di tipo carta"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Non puoi importare carte nelle tue casseforti a causa di una politica impostata da una o più organizzazioni."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Puoi usare il codice di recupero monouso se non hai accesso a nessuno dei metodi impostati per l'accesso in due passaggi. Se accedi con un codice, l'accesso in due passaggi sarà disattivato. Conserva il codice in un luogo sicuro e accessibile solo a te."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Disattiva"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoca accesso"
   },
@@ -3333,10 +3348,10 @@
     "message": "L'ID esterno è un riferimento non crittografato usato da Bitwarden Directory Connector e API."
   },
   "ssoExternalId": {
-    "message": "SSO External ID"
+    "message": "ID esterno SSO"
   },
   "ssoExternalIdDesc": {
-    "message": "SSO External ID is an unencrypted reference between Bitwarden and your configured SSO provider."
+    "message": "L'ID esterno SSO è un riferimento non crittografato che collega Bitwarden e il provider SSO."
   },
   "nestCollectionUnder": {
     "message": "Annida raccolta sotto"
@@ -4082,7 +4097,7 @@
     "message": "Aggiorna browser"
   },
   "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+    "message": "Generazione delle tue informazioni sui rischi..."
   },
   "updateBrowserDesc": {
     "message": "Stai utilizzando un browser non supportato. La cassaforte web potrebbe non funzionare correttamente."
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Non è possibile procedere con l'aggiornamento della chiave di cifratura"
-  },
   "editFieldLabel": {
     "message": "Modifica $LABEL$",
     "placeholders": {
@@ -4533,23 +4545,14 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Quando si aggiorna la chiave di cifratura, le cartelle non possono essere decifrate. Per continuare con l'aggiornamento, le cartelle devono essere eliminate. Nessun elemento della cassaforte verrà eliminato se si procede."
-  },
-  "keyUpdated": {
-    "message": "Chiave aggiornata"
-  },
-  "updateEncryptionKey": {
-    "message": "Aggiorna chiave di crittografia"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Abbiamo modificato lo schema di crittografia per fornire una maggiore sicurezza. Aggiorna la tua chiave di crittografia inserendo la tua password principale."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Dopo aver aggiornato la tua chiave di crittografia, devi uscire ed entrare di nuovo in tutte le app Bitwarden che stai usando (come l'app mobile o l'estensione del browser). Se non si esce e rientra (per scaricare la nuova chiave di crittografia) i dati della tua cassaforte potrebbero essere danneggiati. Cercheremo di farti uscire automaticamente, ma potrebbe esserci un ritardo."
   },
   "updateEncryptionKeyAccountExportWarning": {
-    "message": "Any account restricted exports you have saved will become invalid."
+    "message": "Qualsiasi esportazione effettuata da un account limitato non sarà valida."
+  },
+  "legacyEncryptionUnsupported": {
+    "message": "La crittografia legacy non è più supportata. Contatta l'assistenza per recuperare il tuo account."
   },
   "subscription": {
     "message": "Abbonamento"
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Accesso di emergenza rifiutato"
   },
+  "grantorDetailsNotFound": {
+    "message": "Dettagli del concedente non trovati"
+  },
   "passwordResetFor": {
     "message": "Password ripristinata per $USER$. Ora puoi accedere usando la nuova password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Forza la proprietà dei dati dell'organizzazione"
+  },
   "personalOwnership": {
     "message": "Rimuovi cassaforte individuale"
   },
@@ -5698,7 +5707,7 @@
     "message": "WebAuthn verificato! Puoi chiudere questa scheda."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "La tua nuova password non può essere identica alla precedente."
   },
   "hintEqualsPassword": {
     "message": "Il suggerimento per la password non può essere uguale alla tua password."
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Se si procede, sarà chiusa la sessione corrente di $NAME$, cui sarà richiesto un nuovo accesso. Le sue sessioni attive su altri dispositivi potrebbero restare attive per un periodo massimo di un'ora.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "questo utente"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Una o più politiche dell'organizzazione richiedono che la tua password principale soddisfi questi requisiti:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Una o più politiche dell'organizzazione richiedono che la tua password principale soddisfi questi requisiti:"
+  },
   "resetPasswordSuccess": {
     "message": "Password ripristinata!"
   },
@@ -5896,7 +5917,7 @@
     "message": "Impronta"
   },
   "fingerprintPhrase": {
-    "message": "Fingerprint phrase:"
+    "message": "Frase impronta:"
   },
   "error": {
     "message": "Errore"
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Aggiungi"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Password principale salvata"
   },
   "updateMasterPassword": {
     "message": "Aggiorna password principale"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "La tua password principale è stata recentemente modificata da un amministratore nella tua organizzazione. Per accedere alla cassaforte, aggiornala ora. Procedere ti farà uscire dalla sessione corrente, richiedendoti di accedere di nuovo. Le sessioni attive su altri dispositivi potrebbero continuare a rimanere attive per un massimo di un'ora."
   },
@@ -6303,19 +6333,19 @@
     "message": "Bitwarden Families gratis"
   },
   "sponsoredBitwardenFamilies": {
-    "message": "Sponsored families"
+    "message": "Famiglie sponsorizzate"
   },
   "noSponsoredFamiliesMessage": {
-    "message": "No sponsored families"
+    "message": "Nessuna famiglia sponsorizzata"
   },
   "nosponsoredFamiliesDetails": {
-    "message": "Sponsored non-member families plans will display here"
+    "message": "I piani delle famiglie sponsorizzate non-membri saranno visualizzati qui"
   },
   "sponsorshipFreeBitwardenFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. You can sponsor Free Bitwarden Families for employees who are not a member of your Bitwarden organization. Sponsoring a non-member requires an available seat within your organization."
+    "message": "I membri della tua organizzazione potrebbero ricevere l'abilitazione gratuita delle famiglie Bitwarden. Puoi sponsorizzare le famiglie Bitwarden gratuite per i dipendenti che non sono membri della tua organizzazione Bitwarden. Sponsorizzare un non-membro richiede un posto disponibile all'interno della tua organizzazione."
   },
   "sponsoredFamiliesRemoveActiveSponsorship": {
-    "message": "When you remove an active sponsorship, a seat within your organization will be available after the renewal date of the sponsored organization."
+    "message": "Se rimuovi una sponsorizzazione attiva, un posto all'interno della tua organizzazione sarà disponibile dopo la data di rinnovo."
   },
   "sponsoredFamiliesEligible": {
     "message": "Tu e la tua famiglia siete idonei per Bitwarden Families gratis. Riscatta con la tua email personale per mantenere i tuoi dati al sicuro anche quando non sei a lavoro."
@@ -6324,28 +6354,28 @@
     "message": "Riscatta oggi il tuo piano Bitwarden Families gratis per mantenere i tuoi dati al sicuro anche quando non sei al lavoro."
   },
   "sponsoredFamiliesIncludeMessage": {
-    "message": "The Bitwarden for Families plan includes"
+    "message": "Il piano Bitwarden per famiglie include"
   },
   "sponsoredFamiliesPremiumAccess": {
     "message": "Accesso Premium fino a 6 utenti"
   },
   "sponsoredFamiliesSharedCollectionsForFamilyMembers": {
-    "message": "Shared collections for family members"
+    "message": "Raccolte condivise per i membri della famiglia"
   },
   "memberFamilies": {
-    "message": "Member families"
+    "message": "Famiglie membri"
   },
   "noMemberFamilies": {
-    "message": "No member families"
+    "message": "Famiglie non membri"
   },
   "noMemberFamiliesDescription": {
-    "message": "Members who have redeemed family plans will display here"
+    "message": "I membri che hanno riscattato i piani famiglia saranno visualizzati qui"
   },
   "membersWithSponsoredFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. Here you can see members who have sponsored a Families organization."
+    "message": "I membri della tua organizzazione possono avere accesso gratuito alle famiglie Bitwarden. Qui puoi vedere i membri sponsor."
   },
   "organizationHasMemberMessage": {
-    "message": "A sponsorship cannot be sent to $EMAIL$ because they are a member of your organization.",
+    "message": "Non puoi sponsorizzare $EMAIL$ perché sono membri della tua organizzazione.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6405,7 +6435,7 @@
     "message": "Account riscattato"
   },
   "revokeAccountMessage": {
-    "message": "Revoke account $NAME$",
+    "message": "Revoca l'account $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -6477,10 +6507,10 @@
     "message": "Codice di verifica non valido"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "La password principale non è più richiesta per i membri dell'organizzazione. Per favore, conferma il dominio qui sotto con l'amministratore."
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Dominio Key Connector"
   },
   "leaveOrganization": {
     "message": "Lascia organizzazione"
@@ -6760,7 +6790,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "Solo gli elementi della cassaforte personale associati a $EMAIL$, inclusi gli allegati, saranno esportati. Gli elementi della cassaforte dell'organizzazione non saranno inclusi",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Genera email"
   },
+  "generatePassword": {
+    "message": "Genera password"
+  },
+  "generatePassphrase": {
+    "message": "Genera passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generata"
+  },
+  "passphraseGenerated": {
+    "message": "Frase segreta generata"
+  },
+  "usernameGenerated": {
+    "message": "Nome utente generato"
+  },
+  "emailGenerated": {
+    "message": "Email generata"
+  },
   "spinboxBoundariesHint": {
     "message": "Il valore deve essere compreso tra $MIN$ e $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Usa questa password"
   },
+  "useThisPassphrase": {
+    "message": "Usa questa frase segreta"
+  },
   "useThisUsername": {
     "message": "Usa questo nome utente"
   },
@@ -7280,7 +7331,7 @@
     "message": "Segui i passaggi qui sotto per completare l'accesso."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Segui i prossimi passaggi per completare l'accesso con la tua chiave di sicurezza."
   },
   "launchDuo": {
     "message": "Avvia DUO"
@@ -7605,9 +7656,9 @@
     "message": "Account di servizio aggiornato",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Digita o seleziona progetti o segreti",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Digita o seleziona un progetto",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Digita per filtrare",
@@ -7692,8 +7743,8 @@
     "message": "Token di accesso",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Nuovo token di accesso",
+  "createAccessToken": {
+    "message": "Genera token di accesso",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -7963,7 +8014,7 @@
     "message": "Invita membro"
   },
   "addSponsorship": {
-    "message": "Add sponsorship"
+    "message": "Aggiungi sponsorizzazione"
   },
   "needsConfirmation": {
     "message": "Necessitano conferma"
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Si è verificato un errore durante la lettura del file di importazione"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Segreto $SECRET_ID$ acceduto.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Richiedi approvazione dell'amministratore"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Crittografia dispositivo fidato"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Dispositivo fidato"
   },
-  "sendsNoItemsTitle": {
-    "message": "Nessun Send attivo",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Usa Send per condividere informazioni crittografate in modo sicuro con chiunque.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invita utenti"
   },
@@ -8703,7 +8788,7 @@
     "message": "Limita l'eliminazione delle raccolte ai proprietari e agli amministratori"
   },
   "limitItemDeletionDescription": {
-    "message": "Limit item deletion to members with the Manage collection permissions"
+    "message": "Consenti l'eliminazione solo ai membri con i permessi di gestione raccolte"
   },
   "allowAdminAccessToAllCollectionItemsDesc": {
     "message": "Proprietari e amministratori possono gestire tutte le raccolte e gli elementi"
@@ -8837,6 +8922,30 @@
     "message": "Formati comuni",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Per mantenere il tuo abbonamento a $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -9426,19 +9535,19 @@
     "message": "Gestisci la fatturazione dal Portale del Fornitore"
   },
   "continueSettingUp": {
-    "message": "Continue setting up Bitwarden"
+    "message": "Continua a configurare Bitwarden"
   },
   "continueSettingUpFreeTrial": {
     "message": "Continua a configurare la tua prova gratuita di Bitwarden"
   },
   "continueSettingUpPasswordManager": {
-    "message": "Continue setting up Bitwarden Password Manager"
+    "message": "Continua a configurare la tua prova gratuita di Bitwarden Password Manager"
   },
   "continueSettingUpFreeTrialPasswordManager": {
     "message": "Continua a configurare la tua prova gratuita di Bitwarden Password Manager"
   },
   "continueSettingUpSecretsManager": {
-    "message": "Continue setting up Bitwarden Secrets Manager"
+    "message": "Continua a configurare la tua prova gratuita di Bitwarden Secrets Manager"
   },
   "continueSettingUpFreeTrialSecretsManager": {
     "message": "Continua a configurare la tua prova gratuita di Bitwarden Secrets Manager"
@@ -10298,37 +10407,37 @@
     "message": "Il nome dell'organizzazione non può superare i 50 caratteri."
   },
   "rotationCompletedTitle": {
-    "message": "Key rotation successful"
+    "message": "Rotazione chiave riuscita"
   },
   "rotationCompletedDesc": {
-    "message": "Your master password and encryption keys have been updated. Your other devices have been logged out."
+    "message": "La password principale e le chiavi di crittografia sono state aggiornate. Gli altri dispositivi sono stati disconnessi."
   },
   "trustUserEmergencyAccess": {
-    "message": "Trust and confirm user"
+    "message": "Contrassegna come affidabile e conferma l'utente"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Contrassegna organizzazione come affidabile"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Contrassegna come affidabile"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Non considerare affidabile"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "L'organizzazione non è contrassegnata come affidabile"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "Per la sicurezza del tuo account, conferma solo se hai concesso l'accesso di emergenza a questo utente e le loro frasi impronta corrispondono a quanto visualizzato nel loro account"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "Per la sicurezza del tuo account, procedi solo se sei un membro di questa organizzazione, se il recupero dell'account è abilitato e se la frase impronta visualizzata di seguito corrisponde a quella dell'organizzazione."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Questa organizzazione ha una politica Enterprise che ti abiliterà al recupero dell'account. Ciò consentirà agli amministratori di modificare la password. Procedi solo se riconosci questa organizzazione e se la frase impronta mostrata di seguito corrisponde a quella dell'organizzazione."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Considera l'utente affidabile"
   },
   "sshKeyWrongPassword": {
     "message": "La parola d'accesso inserita non è corretta."
@@ -10500,7 +10609,7 @@
     "message": "I posti assegnati superano i posti disponibili."
   },
   "userkeyRotationDisclaimerEmergencyAccessText": {
-    "message": "Fingerprint phrase for $NUM_USERS$ contacts for which you have enabled emergency access.",
+    "message": "Frase impronta per i contatti $NUM_USERS$ per i quali hai abilitato l'accesso di emergenza.",
     "placeholders": {
       "num_users": {
         "content": "$1",
@@ -10509,7 +10618,7 @@
     }
   },
   "userkeyRotationDisclaimerAccountRecoveryOrgsText": {
-    "message": "Fingerprint phrase for the organization $ORG_NAME$ for which you have enabled account recovery.",
+    "message": "Frase impronta per l'organizzazione $ORG_NAME$ per cui hai abilitato il recupero dell'account.",
     "placeholders": {
       "org_name": {
         "content": "$1",
@@ -10518,10 +10627,10 @@
     }
   },
   "userkeyRotationDisclaimerDescription": {
-    "message": "Rotating your encryption keys will require you to trust keys of any organizations that can recover your account, and any contacts that you have enabled emergency access for. To continue, make sure you can verify the following:"
+    "message": "Per la rotazione delle chiavi di crittografia dovrai affidarti alle chiavi di qualsiasi organizzazione in grado di recuperare il tuo account, e a tutti i contatti per i quali è stato abilitato l'accesso di emergenza. Per continuare, assicurati di poter verificare quanto segue:"
   },
   "userkeyRotationDisclaimerTitle": {
-    "message": "Untrusted encryption keys"
+    "message": "Chiavi di crittografia non attendibili"
   },
   "changeAtRiskPassword": {
     "message": "Cambia parola d'accesso a rischio"
@@ -10533,10 +10642,10 @@
     "message": "Non consentire ai membri di sbloccare il proprio account con un PIN."
   },
   "upgradeForFullEventsMessage": {
-    "message": "Event logs are not stored for your organization. Upgrade to a Teams or Enterprise plan to get full access to organization event logs."
+    "message": "I registri degli eventi non sono memorizzati per la tua organizzazione. Aggiorna a un piano di team o Enterprise per ottenere l'accesso completo ai registri."
   },
   "upgradeEventLogTitleMessage": {
-    "message": "Upgrade to see event logs from your organization."
+    "message": "Aggiorna il piano per vedere i registri degli eventi dalla tua organizzazione."
   },
   "upgradeEventLogMessage": {
     "message": "Questi eventi sono solo esempi e non riflettono eventi reali all'interno della tua organizzazione Bitwarden."
@@ -10548,67 +10657,202 @@
     "message": "Business Unit"
   },
   "businessUnits": {
-    "message": "Business Units"
+    "message": "Business Unit"
   },
   "newBusinessUnit": {
-    "message": "New business unit"
+    "message": "Nuova Business Unit"
+  },
+  "sendsTitleNoItems": {
+    "message": "Invia informazioni sensibili in modo sicuro",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Condividi facilmente file e dati con chiunque, su qualsiasi piattaforma. Le tue informazioni saranno crittografate end-to-end per la massima sicurezza.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Crea rapidamente password sicure"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Crea facilmente password forti e uniche cliccando su",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "per aiutarti a mantenere i tuoi login al sicuro.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Crea facilmente password forti e uniche cliccando sul pulsante 'Genera password' per aiutarti a mantenere al sicuro i tuoi login.",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Accedi in un attimo grazie al riempimento automatico"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Includi",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Sito",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "in modo che questo login appaia come un suggerimento per il riempimento automatico.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Accesso e pagamento online semplificati"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Con le carte memorizzate, riempi i campi di pagamento in modo facile e veloce."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Semplifica la creazione di account"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Con le identità, riempi in un attimo i moduli di registrazione per la creazione di account."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Mantieni al sicuro i tuoi dati sensibili"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Usa le note per memorizzare in modo sicuro i dati sensibili come i dettagli bancari o assicurativi."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Accesso SSH ideale per gli sviluppatori"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Memorizza le chiavi e connettiti con l'agente SSH per un'autenticazione crittografata veloce.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Scopri di più sull'agente SSH",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
-    "message": "Restart"
+    "message": "Riavvia"
   },
   "verifyProviderBankAccountWithStatementDescriptorWarning": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the provider's subscription page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "Il pagamento con un conto corrente bancario è disponibile solo per i clienti negli Stati Uniti. Ti sarà richiesto di verificare il tuo conto corrente. Effettueremo un micro-deposito entro i prossimi 1-2 giorni lavorativi. Cerca l'apposito codice nei dettagli della transazione e inseriscilo nella pagina di sottoscrizione del provider per verificare il conto bancario. La mancata verifica del conto bancario comporterà un mancato pagamento e la sospensione dell'abbonamento."
   },
   "clickPayWithPayPal": {
-    "message": "Please click the Pay with PayPal button to add your payment method."
+    "message": "Clicca sul pulsante 'Paga con PayPal' per aggiungere il tuo metodo di pagamento."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Se rimuovi $EMAIL$, la sponsorizzazione per questo piano famiglia terminerà. Un posto all'interno della tua organizzazione sarà disponibile per i membri o le sponsorizzazioni dopo la data di rinnovo $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Indirizzo di fatturazione richiesto per aggiungere credito.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ja/messages.json b/apps/web/src/locales/ja/messages.json
index 2de545cd27a..2e24fd7c27f 100644
--- a/apps/web/src/locales/ja/messages.json
+++ b/apps/web/src/locales/ja/messages.json
@@ -547,12 +547,6 @@
     "message": "開く/閉じる",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "パスワードの自動生成"
-  },
-  "generatePassphrase": {
-    "message": "パスフレーズを生成"
-  },
   "checkPassword": {
     "message": "パスワードが漏洩していないか確認する"
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "自分"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "保管庫"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "次に進むと現在のセッションからログアウトし再度ログインが必要になります。他のデバイスでのセッションは1時間程度維持されます。"
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "メールアドレスの変更"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "2段階認証を有効にすると Bitwarden アカウントから永久に閉め出されてしまうことがあります。リカバリーコードがあれば、通常の2段階認証プロバイダを使えなくなったとき (デバイスの紛失等) でもアカウントにアクセスできます。アカウントにアクセスできなくなっても Bitwarden はサポート出来ないため、リカバリーコードを書き出すか印刷し安全な場所で保管しておくことを推奨します。"
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "2段階認証プロバイダーへのアクセスを失った場合は、使い捨てのリカバリーコードを使用して2段階認証をオフにできます。 Bitwarden では、リカバリーコードを書き留めて安全な場所に保管することをお勧めしています。"
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "無効化"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "アクセスを取り消す"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "暗号化キーの更新を続行できません"
-  },
   "editFieldLabel": {
     "message": "$LABEL$ を編集",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "暗号化キーを更新する際、フォルダーを復号できませんでした。 アップデートを続行するには、フォルダーを削除する必要があります。続行しても保管庫のアイテムは削除されません。"
-  },
-  "keyUpdated": {
-    "message": "キーが更新されました"
-  },
-  "updateEncryptionKey": {
-    "message": "暗号化キーを更新します。"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "より良いセキュリティを提供するために暗号化方式を変更しました。以下にマスターパスワードを入力して、今すぐ暗号化キーを更新してください。"
-  },
   "updateEncryptionKeyWarning": {
     "message": "暗号化キーの更新後は、モバイルアプリやブラウザ拡張機能など現在利用中のすべてのBitwardenアプリで再ログインが必要となります。再ログインしないと(新しい暗号化キーをダウンロードすると)データが破損する可能性があります。自動的にログアウトを試みますが、遅延することがあります。"
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "契約"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "緊急アクセスが拒否されました"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "$USER$のパスワードをリセットしました。新しいパスワードでログインできます。",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "個別の保管庫を削除"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "このユーザー\n"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "組織ポリシーの要件を満たすためにマスターパスワードが必要です:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "パスワードをリセットしました"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "追加"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "マスターパスワードを更新しました"
   },
   "updateMasterPassword": {
     "message": "マスターパスワードを更新"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "マスターパスワードが最近組織の管理者によって変更されました。保管庫にアクセスするには、今すぐマスターパスワードを更新しなければなりません。続行すると現在のセッションからログアウトし、再度ログインする必要があります。 他のデバイス上のアクティブなセッションは、最大1時間アクティブであり続けることがあります。"
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "メールアドレスを生成"
   },
+  "generatePassword": {
+    "message": "パスワードの自動生成"
+  },
+  "generatePassphrase": {
+    "message": "パスフレーズを生成"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "値は $MIN$ から $MAX$ の間でなければなりません。",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "このパスワードを使用する"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "このユーザー名を使用する"
   },
@@ -7605,9 +7656,9 @@
     "message": "サービスアカウントを更新しました",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "プロジェクトまたはシークレットを入力・選択",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "入力して絞り込む",
@@ -7692,8 +7743,8 @@
     "message": "アクセストークン",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "新しいアクセストークン",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "インポートファイルの読み込み中にエラーが発生しました"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "シークレット $SECRET_ID$ にアクセスしました。",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "管理者の承認を要求する"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "信頼できるデバイスでの暗号化"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "信頼されたデバイス"
   },
-  "sendsNoItemsTitle": {
-    "message": "アクティブな Send なし",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Send を使用すると暗号化された情報を誰とでも安全に共有できます。",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "ユーザーを招待"
   },
@@ -8837,6 +8922,30 @@
     "message": "一般的な形式",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "$ORG$のサブスクリプションを維持するには、 ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ka/messages.json b/apps/web/src/locales/ka/messages.json
index 863f8d11dea..9dba6b40e41 100644
--- a/apps/web/src/locales/ka/messages.json
+++ b/apps/web/src/locales/ka/messages.json
@@ -547,12 +547,6 @@
     "message": "ჩამოშლის გადამრთველი",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "წარმოქმენი პაროლი"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "შეამოწმე პაროლი თუ გაბაზრდა"
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "მე"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "ჩემი საცავი"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "წარმოქმენი პაროლი"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/km/messages.json b/apps/web/src/locales/km/messages.json
index 27a160a9a3c..57b7a83469e 100644
--- a/apps/web/src/locales/km/messages.json
+++ b/apps/web/src/locales/km/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "My vault"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/kn/messages.json b/apps/web/src/locales/kn/messages.json
index 98c317d377f..f47c3f6de5a 100644
--- a/apps/web/src/locales/kn/messages.json
+++ b/apps/web/src/locales/kn/messages.json
@@ -547,12 +547,6 @@
     "message": "ಟಾಗಲ್ ಕುಸಿತ",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "ಪಾಸ್ವರ್ಡ್ ರಚಿಸಿ"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "ಪಾಸ್ವರ್ಡ್ ಬಹಿರಂಗಗೊಂಡಿದೆಯೇ ಎಂದು ಪರಿಶೀಲಿಸಿ."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "ನನ್ನ"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "ನನ್ನ ವಾಲ್ಟ್"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "ಮುಂದುವರಿಯುವುದರಿಂದ ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಸೆಷನ್‌ನಿಂದ ನಿಮ್ಮನ್ನು ಲಾಗ್ out ಟ್ ಮಾಡುತ್ತದೆ, ನಿಮಗೆ ಮತ್ತೆ ಲಾಗ್ ಇನ್ ಆಗುವ ಅಗತ್ಯವಿರುತ್ತದೆ. ಇತರ ಸಾಧನಗಳಲ್ಲಿನ ಸಕ್ರಿಯ ಸೆಷನ್‌ಗಳು ಒಂದು ಗಂಟೆಯವರೆಗೆ ಸಕ್ರಿಯವಾಗಿ ಮುಂದುವರಿಯಬಹುದು."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "ಇಮೇಲ್ ಬದಲಾಯಿಸಲಾಗಿದೆ"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "ಎರಡು-ಹಂತದ ಲಾಗಿನ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ನಿಮ್ಮ ಬಿಟ್‌ವಾರ್ಡನ್ ಖಾತೆಯಿಂದ ನಿಮ್ಮನ್ನು ಶಾಶ್ವತವಾಗಿ ಲಾಕ್ ಮಾಡಬಹುದು. ನಿಮ್ಮ ಸಾಮಾನ್ಯ ಎರಡು-ಹಂತದ ಲಾಗಿನ್ ಪೂರೈಕೆದಾರರನ್ನು ನೀವು ಇನ್ನು ಮುಂದೆ ಬಳಸಲಾಗದಿದ್ದಲ್ಲಿ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಪ್ರವೇಶಿಸಲು ಮರುಪಡೆಯುವಿಕೆ ಕೋಡ್ ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ (ಉದಾ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ). ನಿಮ್ಮ ಖಾತೆಗೆ ನೀವು ಪ್ರವೇಶವನ್ನು ಕಳೆದುಕೊಂಡರೆ ಬಿಟ್‌ವಾರ್ಡನ್ ಬೆಂಬಲವು ನಿಮಗೆ ಸಹಾಯ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಮರುಪಡೆಯುವಿಕೆ ಕೋಡ್ ಅನ್ನು ಬರೆಯಲು ಅಥವಾ ಮುದ್ರಿಸಲು ಮತ್ತು ಅದನ್ನು ಸುರಕ್ಷಿತ ಸ್ಥಳದಲ್ಲಿ ಇರಿಸಲು ನಾವು ಶಿಫಾರಸು ಮಾಡುತ್ತೇವೆ."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "ನಿಷ್‌ಕ್ರಿಯೆಗೊಳಿಸಿ"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "ಕೀ ನವೀಕರಿಸಲಾಗಿದೆ"
-  },
-  "updateEncryptionKey": {
-    "message": "ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಕೀಲಿಯನ್ನು ನವೀಕರಿಸಿ"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "ನಿಮ್ಮ ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಕೀಲಿಯನ್ನು ನವೀಕರಿಸಿದ ನಂತರ, ನೀವು ಪ್ರಸ್ತುತ ಬಳಸುತ್ತಿರುವ (ಮೊಬೈಲ್ ಅಪ್ಲಿಕೇಶನ್ ಅಥವಾ ಬ್ರೌಸರ್ ವಿಸ್ತರಣೆಗಳಂತಹ) ಎಲ್ಲಾ ಬಿಟ್‌ವಾರ್ಡೆನ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ನೀವು ಲಾಗ್ ಔಟ್ ಮತ್ತು ಬ್ಯಾಕ್ ಇನ್ ಮಾಡಬೇಕಾಗುತ್ತದೆ. ಲಾಗ್ and ಟ್ ಮಾಡಲು ಮತ್ತು ಹಿಂತಿರುಗಲು ವಿಫಲವಾದರೆ (ಅದು ನಿಮ್ಮ ಹೊಸ ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಕೀಲಿಯನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡುತ್ತದೆ) ಡೇಟಾ ಭ್ರಷ್ಟಾಚಾರಕ್ಕೆ ಕಾರಣವಾಗಬಹುದು. ನಾವು ನಿಮ್ಮನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಲಾಗ್ ಔಟ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸುತ್ತೇವೆ, ಆದಾಗ್ಯೂ, ಇದು ವಿಳಂಬವಾಗಬಹುದು."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "ಚಂದಾದಾರಿಕೆ"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "ತುರ್ತು ಪ್ರವೇಶವನ್ನು ತಿರಸ್ಕರಿಸಲಾಗಿದೆ"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "$USER$ ಗೆ ಪಾಸ್‌ವರ್ಡ್ ಮರುಹೊಂದಿಸಿ. ನೀವು ಈಗ ಹೊಸ ಪಾಸ್‌ವರ್ಡ್ ಬಳಸಿ ಲಾಗಿನ್ ಮಾಡಬಹುದು.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "ವೈಯಕ್ತಿಕ ಮಾಲೀಕತ್ವ"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "ಈ ಬಳಕೆದಾರ"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "ಒಂದು ಅಥವಾ ಹೆಚ್ಚಿನ ಸಂಸ್ಥೆಯ ನೀತಿಗಳಿಗೆ ಈ ಕೆಳಗಿನ ಅವಶ್ಯಕತೆಗಳನ್ನು ಪೂರೈಸಲು ಮಾಸ್ಟರ್ ಪಾಸ್‌ವರ್ಡ್ ಅಗತ್ಯವಿದೆ:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "ಪಾಸ್ವರ್ಡ್ ಮರುಹೊಂದಿಸುವ ಯಶಸ್ಸು!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "ಪಾಸ್ವರ್ಡ್ ರಚಿಸಿ"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ko/messages.json b/apps/web/src/locales/ko/messages.json
index 2340ae849fa..29d34b2d587 100644
--- a/apps/web/src/locales/ko/messages.json
+++ b/apps/web/src/locales/ko/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle Collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "비밀번호 생성"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "비밀번호가 노출되었는지 확인합니다."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "나"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "내 보관함"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "계속 진행하면, 현재 세션 또한 로그아웃 되므로 다시 로그인하여야 합니다. 2단계 로그인이 활성화 된 경우 다시 요구하는 메세지가 표시됩니다. 다른 기기의 활성화 된 세션은 최대 1시간 동안 유지 될 수 있습니다."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "이메일 변경됨"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "2단계 로그인을 활성화하면 Bitwarden 계정을 영원히 잠글 수 있습니다. 복구 코드를 사용하면 정상적인 2단계 로그인 제공자를 더 이상 사용할 수 없는 경우(예. 장치를 잃어버렸을 때) 계정에 액세스할 수 있습니다. 계정에 접근하지 못한다면 Bitwarden 지원팀은 어떤 도움도 줄 수 없습니다. 복구 코드를 기록하거나 출력하여 안전한 장소에 보관할 것을 권장합니다."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "비활성화"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "키 업데이트됨"
-  },
-  "updateEncryptionKey": {
-    "message": "암호화 키 업데이트"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "암호화 키를 업데이트하고난 후 현재 사용 중인 모든 Bitwarden 애플리케이션(예. 모바일 앱 혹은 브라우저 확장 기능)에서 로그아웃 후 다시 로그인해야 합니다. 재로그인하지 않으면 (새 암호화 키를 다운로드받는 경우) 데이터 손실이 발생할 수 있습니다. 자동으로 로그아웃을 시도하지만 지연될 수 있습니다."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "구독"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "긴급 접근 거절됨."
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "$USER$ 사용자의 비밀번호가 초기화되었습니다. 이제 새로운 비밀번호로 로그인할 수 있습니다.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "개인 소유권"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "이 사용자"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "하나 이상의 단체 정책이 마스터 비밀번호가 다음 사항을 따르도록 요구합니다:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "비밀번호 재설정 성공!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "추가"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "마스터 비밀번호 변경됨"
   },
   "updateMasterPassword": {
     "message": "마스터 비밀번호 변경"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "비밀번호 생성"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "가져온 파일을 읽는 도중 오류가 발생했습니다"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/lv/messages.json b/apps/web/src/locales/lv/messages.json
index 27818e4e3b9..2df1a726859 100644
--- a/apps/web/src/locales/lv/messages.json
+++ b/apps/web/src/locales/lv/messages.json
@@ -547,12 +547,6 @@
     "message": "Pārslēgt sakļaušanu",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Veidot paroli"
-  },
-  "generatePassphrase": {
-    "message": "Izveidot paroles vārdkopu"
-  },
   "checkPassword": {
     "message": "Pārbaudīt, vai parole ir bijusi nopludināta."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Es"
   },
+  "myItems": {
+    "message": "Mani vienumi"
+  },
   "myVault": {
     "message": "Mana glabātava"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Tiks veikta atteikšanās no pašreizējās sesijas, un pēc tam būs nepieciešams vēlreiz pieteikties. Citās ierīcēs darbojošās sesijas var būt spēkā līdz vienai stundai."
   },
+  "changePasswordWarning": {
+    "message": "Pēc savas paroles nomainīšanas būs nepieciešams pieteikties ar jauno paroli. Spēkā esošajās sesijās citās ierīcēs stundas laikā notiks atteikšanās."
+  },
   "emailChanged": {
     "message": "E-pasta adrese nomainīta"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Divpakāpju pieteikšanās var pastāvīgi liegt piekļuvi Bitwarden kontam. Atkopšanas kods ļauj piekļūt tam gadījumā, kad vairs nav iespējams izmantot ierasto divpakāpju pieteikšanās nodrošinātāju (piemēram, ir pazaudēta ierīce). Bitwarden atbalsts nevarēs palīdzēt, ja tiks pazaudēta piekļuve kontam. Ir ieteicams, ka atkopšanas kods tiek pierakstīts vai izdrukāts un turēts drošā vietā."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Noņemt karšu vienumu veidu"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Neļaut dalībniekiem izveidot karšu vienumu veidus. Esošās kartes tiks automātiski noņemtas."
+  },
+  "restrictCardTypeImport": {
+    "message": "Nevar ievietot karšu vienumu veidus"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Pamatnostādne, ko ir iestatījusi viena vai vairākas apvienības, liedz karšu ievietošanu savās glabātavās."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Vienreizējas izmantošanas atkopes kodu var izmantot, lai izslēgtu divpakāpju pieteikšanos gadījumā, ja tiek zaudēta piekļuve savam divpakāpju pieteikšanās nodrošinātājam. Bitwarden iesaka pierakstīt atkopes kodu un glabāt to drošā vietā."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Atspējot"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Informācija par dalībnieku netika atrasta."
+  },
   "revokeAccess": {
     "message": "Atsaukt piekļuvi"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Šifrēšanas atslēgas atjaunināšana nav iespējama"
-  },
   "editFieldLabel": {
     "message": "Labot $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Šifrēšanas atslēgas atjaunināšanas laikā mapes nevarēja atšifrēt. Lai turpinātu atjaunināšanu, mapes ir jāizdzēš. Glabātavas vienumi netiks izdzēsti, ja turpināsi."
-  },
-  "keyUpdated": {
-    "message": "Atslēga atjaunināta"
-  },
-  "updateEncryptionKey": {
-    "message": "Atjaunināt šifrēšanas atslēgu"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Mēs esam mainījuši šifrēšanas veidu, lai nodrošinātu labāku drošību. Savu šifrēšanas atslēgu var atjaunināt tagad, zemāk ievadot savu galveno paroli."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Pēc šifrēšanas atslēgas atjaunināšanas ir nepieciešams atteikties un tad pieteikties visās Bitwarden lietotnēs, kas pašreiz tiek izmantotas (piemēram, tālruņa lietotnē vai pārlūku paplašinājumā). Ja tas netiks darīts (tā tiek lejupielādēta jaunā šifrēšanas atslēga), dati var tikt bojāti. Tiks veikts automātisks atteikšanās mēģinājums, tomēr tas var notikt ar aizkavi."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Jebkuras konta ierobežotās izguves, kas ir saglabātas, kļūs nederīgas."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Mantota šifrēšana vairs netiek atbalstīta. Lūgums sazināties ar atbalstu, lai atkoptu savu kontu."
+  },
   "subscription": {
     "message": "Abonements"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Ārkārtas piekļuve noraidīta"
   },
+  "grantorDetailsNotFound": {
+    "message": "Informācijas par piešķīrēju netika atrasta"
+  },
   "passwordResetFor": {
     "message": "Parole atiestatīta lietotājam $USER$. Tagad var pieteikties ar jauno paroli.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Uzspiest apvienības datu īpašumtiesības"
+  },
   "personalOwnership": {
     "message": "Personīgās īpašumtiesības"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Turpināšana izrakstīs $NAME$ no pašreizējās sesijas, un pēc tam būs nepieciešams vēlreiz pieteikties. Citās ierīcēs darbojošās sesijas var būt spēkā līdz vienai stundai.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "šo lietotāju"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Vienā vai vairākos apvienības nosacījumos ir norādīts, ka galvenajai parolei ir jāatbilst šādām prasībām:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Vienā vai vairākās apvienības pamatnostādnēs ir norādīts, ka galvenajai parolei ir jāatbilst šādām prasībām:"
+  },
   "resetPasswordSuccess": {
     "message": "Peroles atiestatīšana bija veiksmīga"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Pievienot"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Galvenā parole sekmīgi iestatīta"
+  },
   "updatedMasterPassword": {
     "message": "Galvenā parole atjaunināta"
   },
   "updateMasterPassword": {
     "message": "Atjaunināt galveno paroli"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Jānomaina sava galvenā'parole, lai pabeigtu konta atkopi."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Galvenā parole neatbilst šīs apvienības prasībām. Jānomaina sava galvenā parole, lai turpinātu."
+  },
   "updateMasterPasswordWarning": {
     "message": "Apvienības pārvaldnieks nesen nomainīja galveno paroli. Tā ir jāatjaunina, lai varētu piekļūt glabātavai. Turpinot tiks izbeigta pašreizējā sesija un tiks pieprasīta atkārtota pieteikšanās. Esošās sesijas citās ierīcēs var turpināt darboties līdz vienai stundai."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Izveidot e-pasta adresi"
   },
+  "generatePassword": {
+    "message": "Veidot paroli"
+  },
+  "generatePassphrase": {
+    "message": "Izveidot paroles vārdkopu"
+  },
+  "passwordGenerated": {
+    "message": "Parole izveidota"
+  },
+  "passphraseGenerated": {
+    "message": "Paroles vārdkopa izveidota"
+  },
+  "usernameGenerated": {
+    "message": "Lietotājvārds izveidots"
+  },
+  "emailGenerated": {
+    "message": "E-pasta adrese izveidota"
+  },
   "spinboxBoundariesHint": {
     "message": "Vērtībai jābūt starp $MIN$ un $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Izmantot šo paroli"
   },
+  "useThisPassphrase": {
+    "message": "Izmantot šo paroles vārdkopu"
+  },
   "useThisUsername": {
     "message": "Izmantot šo lietotājvārdu"
   },
@@ -7605,9 +7656,9 @@
     "message": "Pakalpojumu konts ir atjaunināts",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Rakstīt vai atlasīt projektus vai noslēpumus",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Ierakstīt vai atlasīt projektus",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Rakstīt, lai atlasītu",
@@ -7692,8 +7743,8 @@
     "message": "Piekļuves pilnvaras",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Jauna piekļuves pilnvara",
+  "createAccessToken": {
+    "message": "Izveidot piekļuves pilnvaru",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Atgadījās kļūda, kad tika mēģināts nolasīt ievietošanas datni"
   },
+  "accessedSecretWithId": {
+    "message": "Piekļuve noslēpumam ar identifikatoru: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Tika piekļūts noslēpumam $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Laboja noslēpumu ar identifikatoru: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Izdzēsa noslēpumu ar identifikatoru: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Izveidoja noslēpumu ar identifikatoru: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "Izstrādātāja rīkkopa",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Pieprasīt pārvaldītāja apstiprinājumu"
   },
+  "unableToCompleteLogin": {
+    "message": "Nevar pabeigt pieteikšanos"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Nepieciešams pieteikties uzticamā ierīcē vai vaicāt pārvaldītājam, lai piešķir paroli."
+  },
   "trustedDeviceEncryption": {
     "message": "Uzticamo ierīču šifrēšana"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Ierīce ir uzticama"
   },
-  "sendsNoItemsTitle": {
-    "message": "Nav spēkā esošu Send",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Send ir izmantojams, lai ar ikvienu droši kopīgotu šifrētu informāciju.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Uzaicināt lietotājus"
   },
@@ -8837,6 +8922,30 @@
     "message": "Izplatīti veidoli",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI atbilstības noteikšana ir veids, kā Bitwarden atpazīst automātiskās aizpildes ieteikumus.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regulārā izteiksme\" ir lietpratējiem paredzēta iespēja ar paaugstinātu piekļuves datu atklāšanas bīstamību.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Sākas ar' ir lietpratējiem paredzēta iespēja ar paaugstinātu piekļuves datu atklāšanas bīstamību.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Vairāk par atbilstības noteikšanu",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Papildu iespējas",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Brīdinājums",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Lai uzturētu savu abonementu $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Jauna uzņēmējdarbības vienība"
   },
+  "sendsTitleNoItems": {
+    "message": "Drošā veidā nosūti jūtīgu informāciju",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Kopīgo datnes un datus drošā veidā ar ikvienu jebkurā platformā! Tava informācija paliks pilnībā šifrēta, vienlaikus ierobežojot riskantumu.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Ātra paroļu izveidošana"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Vienkārša spēcīgu un neatkārtojamu paroļu izveidošana ar",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": ", lai palīdzētu uzturērt pieteikšanās vienumus drošus.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Vienkārša spēcīgu un neatkārtojamu paroļu izveidošana ar pogu \"Izveidot paroli\", lai palīdzētu uzturēt pieteikšanās vienumus drošus.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Laika ietaupīšana ar automātisko aizpildi"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Droša paroļu automātiska aizpilde ar vienu klikšķi"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Iegūsti Bitwarden pārlūka paplašinājumu un uzsāc automātisko aizpildi jau šodien"
+  },
+  "getTheExtension": {
+    "message": "Iegūt paplašinājumu"
+  },
+  "addItLater": {
+    "message": "Pievienot to vēlāk"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Paroles nevar automātiski aizpildīt bez pārlūka paplašinājuma"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Vai tiešām tagad nepievienot paplašinājumu?"
+  },
+  "skipToWebApp": {
+    "message": "Pārcelties uz tīmekļa lietotni"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden paplašinājums uzstādīts."
+  },
+  "openExtensionToAutofill": {
+    "message": "Jāatver paplašinājums, lai pieteiktos un uzsāktu automātisko aizpildi."
+  },
+  "openBitwardenExtension": {
+    "message": "Atvērt Bitwarden paplašinājumu"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "Lai iegūtu padomus par Bitwarden izmantošanas uzsākšanu, jāapmeklē",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Mācīšanāš centrs",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Palīdzības centrs",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "Ar Bitwarden pārlūka paplašinājumu var vienkārši izveidot jaunus pieteikšanās vienumus, piekļūt tiem tieši no pārlūka rīkjoslas un ātri pieteikties kontos ar Bitwarden automātisko aizpildi."
+  },
   "restart": {
     "message": "Palaist no jauna"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Lūgums klikšķināt pogu \"Apmaksāt ar PayPal, lai pievienotu savu maksājumu veidu."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Ja noņemsi $EMAIL$, beigsies šī ģimeņu plāna pabalstītājdarbība. Vieta apvienībā kļūs pieejama dalībniekiem vai pabalstītājdarbībai pēc atbalstītās apvienības atjaunošanas datuma $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Norēķinu adrese ir nepieciešama, lai pievienot kredītu.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Norēķinu adrese"
+  },
+  "addBillingAddress": {
+    "message": "Pievienot norēķinu adresi"
+  },
+  "editBillingAddress": {
+    "message": "Labot norēķinu adresi"
+  },
+  "noBillingAddress": {
+    "message": "Nav pievienota adrese."
+  },
+  "billingAddressUpdated": {
+    "message": "Norēķinu adrese tika atjaunināta."
+  },
+  "paymentDetails": {
+    "message": "Maksājumu informācija"
+  },
+  "paymentMethodUpdated": {
+    "message": "Maksājumu veids tika atjaunināts."
+  },
+  "bankAccountVerified": {
+    "message": "Bankas konts tika apliecināts."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Jebkāds pieejamais kredīts tiks automātiski pielietots šim kontam izveidotajiem rēķiniem."
+  },
+  "mustBePositiveNumber": {
+    "message": "Jābūt pozitīvam skaitlim"
+  },
+  "cardSecurityCode": {
+    "message": "Kartes drošības kods"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Kartes drošības kods, zināms arī kā CVV vai CVC, parasti ir uz kartes aizmugures uzdrukāts 3 ciparu skaitlis vai uz priekšpuses uzdrukāts 4 ciparu skaitlis virs kartes numura."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Apmaksa ar bankas kontu ir pieejama tikai klientiem Savienotajās Valstīs. Būs nepieciešams apliecināt savu bankas kontu. Mēs veiksim sīkiemaksu nākamās darba dienas vai divu laikā. Pēc tam šīs iemaksas uzdevuma aprakstā esošais kods būs jāievada maksājumu informācijas lapā, lai apliecinātu bankas kontu. Bankas konta apliecināšanas neveikšana beigsies ar nokavētu maksājumu un apturētu abonementu."
+  },
+  "taxId": {
+    "message": "Nodokļu Id: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ml/messages.json b/apps/web/src/locales/ml/messages.json
index 54a837b83e1..0f37ab5065d 100644
--- a/apps/web/src/locales/ml/messages.json
+++ b/apps/web/src/locales/ml/messages.json
@@ -547,12 +547,6 @@
     "message": "ചുരുക്കുക",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "പാസ്‌വേഡ് സൃഷ്ടിക്കുക"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "പാസ്സ്‌വേർഡ് ചോർന്നോ എന്ന് നോക്കുക."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "എൻ്റെ വാൾട്"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "ഇമെയിൽ മാറ്റി"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Enabling two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (ex. you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "പ്രവര്‍ത്തന രഹിതമാക്കുക"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "കീ അപ്‌ഡേറ്റുചെയ്‌തു"
-  },
-  "updateEncryptionKey": {
-    "message": "എൻക്രിപ്ഷൻ കീ അപ്‌ഡേറ്റുചെയ്യുക"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "സബ്സ്ക്രിപ്ഷൻ"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "വ്യക്തിഗത ഉടമസ്ഥാവകാശം"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "പാസ്‌വേഡ് സൃഷ്ടിക്കുക"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/mr/messages.json b/apps/web/src/locales/mr/messages.json
index 27a160a9a3c..19cfb6bebc3 100644
--- a/apps/web/src/locales/mr/messages.json
+++ b/apps/web/src/locales/mr/messages.json
@@ -1,24 +1,24 @@
 {
   "allApplications": {
-    "message": "All applications"
+    "message": "सर्व अ‍ॅप्लिकेशन्स"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "बिटवॉर्डन चिन्ह"
   },
   "criticalApplications": {
-    "message": "Critical applications"
+    "message": "महत्त्वाचे अ‍ॅप्लिकेशन्स"
   },
   "noCriticalAppsAtRisk": {
-    "message": "No critical applications at risk"
+    "message": "कोणतेही महत्त्वाचे अ‍ॅप्लिकेशन्स धोक्यात नाहीत"
   },
   "accessIntelligence": {
-    "message": "Access Intelligence"
+    "message": "अ‍ॅक्सेस इंटेलिजेंस"
   },
   "riskInsights": {
-    "message": "Risk Insights"
+    "message": "जोखीम अंतर्दृष्टी"
   },
   "passwordRisk": {
-    "message": "Password Risk"
+    "message": "पासवर्डचा धोका"
   },
   "reviewAtRiskPasswords": {
     "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
@@ -54,7 +54,7 @@
     }
   },
   "createNewLoginItem": {
-    "message": "Create new login item"
+    "message": "नवीन लॉगिन आयटम तयार करा"
   },
   "criticalApplicationsWithCount": {
     "message": "Critical applications ($COUNT$)",
@@ -96,7 +96,7 @@
     "message": "Mark critical apps"
   },
   "markAppAsCritical": {
-    "message": "Mark app as critical"
+    "message": "अ‍ॅपला गंभीर म्हणून चिन्हांकित करा"
   },
   "applicationsMarkedAsCriticalSuccess": {
     "message": "Applications marked as critical"
@@ -105,13 +105,13 @@
     "message": "Application"
   },
   "atRiskPasswords": {
-    "message": "At-risk passwords"
+    "message": "धोकादायक पासवर्ड"
   },
   "requestPasswordChange": {
-    "message": "Request password change"
+    "message": "पासवर्ड बदलण्याची विनंती करा"
   },
   "totalPasswords": {
-    "message": "Total passwords"
+    "message": "एकूण पासवर्ड"
   },
   "searchApps": {
     "message": "Search applications"
@@ -120,7 +120,7 @@
     "message": "At-risk members"
   },
   "atRiskMembersWithCount": {
-    "message": "At-risk members ($COUNT$)",
+    "message": "जोखीम गटातील सदस्य ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -186,7 +186,7 @@
     "message": "What type of item is this?"
   },
   "name": {
-    "message": "Name"
+    "message": "नाव"
   },
   "uri": {
     "message": "URI"
@@ -205,13 +205,13 @@
     "message": "New URI"
   },
   "username": {
-    "message": "Username"
+    "message": "वापरकर्तानाव"
   },
   "password": {
-    "message": "Password"
+    "message": "पासवर्ड"
   },
   "newPassword": {
-    "message": "New password"
+    "message": "नवीन पासवर्ड"
   },
   "passphrase": {
     "message": "Passphrase"
@@ -232,7 +232,7 @@
     "message": "Cardholder name"
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "लॉगिन क्रेडेन्शियल्स"
   },
   "personalDetails": {
     "message": "Personal details"
@@ -241,13 +241,13 @@
     "message": "Identification"
   },
   "contactInfo": {
-    "message": "Contact info"
+    "message": "संपर्क माहिती"
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "कार्ड तपशील"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "$BRAND$ ची माहिती",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -259,16 +259,16 @@
     "message": "Item history"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "ऑथेंटिकेटर की"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "ऑटोफिल पर्याय"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "वेबसाइट (URI)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "वेबसाइट (URI) $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -318,25 +318,25 @@
     "message": "Autofill on page load?"
   },
   "number": {
-    "message": "Number"
+    "message": "क्रमांक"
   },
   "brand": {
-    "message": "Brand"
+    "message": "ब्रँड"
   },
   "expiration": {
-    "message": "Expiration"
+    "message": "कालबाह्यता"
   },
   "securityCode": {
-    "message": "Security code (CVV)"
+    "message": "सुरक्षा कोड (CVV)"
   },
   "securityCodeSlashCVV": {
-    "message": "Security code / CVV"
+    "message": "सुरक्षा कोड / CVV"
   },
   "identityName": {
     "message": "Identity name"
   },
   "company": {
-    "message": "Company"
+    "message": "कंपनी"
   },
   "ssn": {
     "message": "Social Security number"
@@ -348,46 +348,46 @@
     "message": "License number"
   },
   "email": {
-    "message": "Email"
+    "message": "ईमेल"
   },
   "phone": {
     "message": "Phone"
   },
   "january": {
-    "message": "January"
+    "message": "जानेवरी"
   },
   "february": {
-    "message": "February"
+    "message": "फेब्रुवरी"
   },
   "march": {
-    "message": "March"
+    "message": "मार्च"
   },
   "april": {
-    "message": "April"
+    "message": "एप्रिल"
   },
   "may": {
-    "message": "May"
+    "message": "मे"
   },
   "june": {
-    "message": "June"
+    "message": "जून"
   },
   "july": {
-    "message": "July"
+    "message": "जुलै"
   },
   "august": {
-    "message": "August"
+    "message": "ऑगस्ट"
   },
   "september": {
-    "message": "September"
+    "message": "सेप्टेंबर"
   },
   "october": {
-    "message": "October"
+    "message": "ऑक्टोबर"
   },
   "november": {
-    "message": "November"
+    "message": "नोवेंबर"
   },
   "december": {
-    "message": "December"
+    "message": "डिसेंबर"
   },
   "title": {
     "message": "Title"
@@ -414,13 +414,13 @@
     "message": "If you've renewed it, update the card's information"
   },
   "expirationMonth": {
-    "message": "Expiration month"
+    "message": "कालबाह्यता महिना"
   },
   "expirationYear": {
-    "message": "Expiration year"
+    "message": "कालबाह्यता वर्ष"
   },
   "authenticatorKeyTotp": {
-    "message": "Authenticator key (TOTP)"
+    "message": "ऑथेंटिकेटर की (TOTP)"
   },
   "totpHelperTitle": {
     "message": "Make 2-step verification seamless"
@@ -547,14 +547,8 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
-    "message": "Check if password has been exposed."
+    "message": "पासवर्ड उघड झाला आहे का तपासा."
   },
   "passwordExposed": {
     "message": "This password has been exposed $VALUE$ time(s) in data breaches. You should change it.",
@@ -566,13 +560,13 @@
     }
   },
   "passwordSafe": {
-    "message": "This password was not found in any known data breaches. It should be safe to use."
+    "message": "हा पासवर्ड कोणत्याही c डेटा उल्लंघनात आढळला नाही. तो वापरण्यास सुरक्षित असावा."
   },
   "save": {
-    "message": "Save"
+    "message": "जतन करा"
   },
   "cancel": {
-    "message": "Cancel"
+    "message": "रद्द करा"
   },
   "canceled": {
     "message": "Canceled"
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "My vault"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/my/messages.json b/apps/web/src/locales/my/messages.json
index 27a160a9a3c..57b7a83469e 100644
--- a/apps/web/src/locales/my/messages.json
+++ b/apps/web/src/locales/my/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "My vault"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/nb/messages.json b/apps/web/src/locales/nb/messages.json
index b2068d1d939..c076b67f21e 100644
--- a/apps/web/src/locales/nb/messages.json
+++ b/apps/web/src/locales/nb/messages.json
@@ -547,12 +547,6 @@
     "message": "Bytt mellom skjul/utvid",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generer et passord"
-  },
-  "generatePassphrase": {
-    "message": "Generér passordfrase"
-  },
   "checkPassword": {
     "message": "Sjekk om passordet har blitt utsatt."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Meg"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Mitt hvelv"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Å fortsette vil logge deg ut av din nåværende økt, og krever at du logger deg på igjen. Aktive økter på andre enheter kan forbli aktive i opptil en time."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "E-postadressen endret"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Å skru på 2-trinnsinnlogging kan låse deg permanent ut av din Bitwarden-konto. En gjenopprettingskode gir deg tilgang til kontoen din i det tilfellet at du ikke lenger kan bruke din vanlige 2-trinnsinnloggingsleverandør (f.eks. at du mister enheten din). Bitwarden-kundestøtten vil ikke kunne hjelpe deg dersom du mister tilgang til kontoen din. Vi anbefaler at du skriver ned eller skriver ut gjenopprettingskoden og legger den på en trygg plass."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Deaktiver"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Opphev tilgang"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Rediger $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Nøkkelen ble oppdatert"
-  },
-  "updateEncryptionKey": {
-    "message": "Oppdater krypteringsnøkkelen"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Etter å ha oppdatert krypteringsnøkkelen din, er du påkrevd å logge av og på på alle Bitwarden-appene og -programmene som du bruker for øyeblikket (deriblant mobilappen og nettleserutvidelsene). Å ikke logge av og på igjen (noe som vil laste ned din nye krypteringsnøkkel) kan føre til datakorrumpering. Vi vil forsøke å logge deg av automatisk, men det kan kanskje bli forsinket."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Abonnement"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Nødtilgang avvist"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Passord tilbakestille for $USER$. Du kan nå logge inn ved å bruke det nye passordet.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Personlig eierskap"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "denne brukeren"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "En eller flere av organisasjonens vilkår krever hovedpassordet ditt for å oppfylle følgende krav:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Tilbakestilling av passord vellykket!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Legg til"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Oppdaterte hovedpassordet"
   },
   "updateMasterPassword": {
     "message": "Oppdater hovedpassord"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Hovedpassordet ditt ble nylig endret av en administrator i organisasjonen din. For å få tilgang til hvelvet, må du oppdatere hovedpassordet ditt nå. Hvis du fortsetter, logges du ut av den nåværende økten, og du må logge på igjen. Aktive økter på andre enheter kan fortsette å være aktive i opptil én time."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generér E-post"
   },
+  "generatePassword": {
+    "message": "Generer et passord"
+  },
+  "generatePassphrase": {
+    "message": "Generér passordfrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Verdien må være mellom $MIN$ og $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Bruk dette passordet"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Bruk dette brukernavnet"
   },
@@ -7605,9 +7656,9 @@
     "message": "Tjenestekonto oppdatert",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Skriv inn eller velg prosjekter eller hemmeligheter",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Skriv for å filtrere",
@@ -7692,8 +7743,8 @@
     "message": "Tilgangstoken",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Be om administratorgodkjennelse"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Enheten er betrodd"
   },
-  "sendsNoItemsTitle": {
-    "message": "Ingen aktive Send",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Bruk Send til å dele kryptert informasjon med noen.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Inviter brukere"
   },
@@ -8837,6 +8922,30 @@
     "message": "Vanlige formater",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Spar tid med auto-utfylling"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Omstart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ne/messages.json b/apps/web/src/locales/ne/messages.json
index c8c0c90dcde..80aed726a98 100644
--- a/apps/web/src/locales/ne/messages.json
+++ b/apps/web/src/locales/ne/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "My vault"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/nl/messages.json b/apps/web/src/locales/nl/messages.json
index d92b9707fc9..9ee85ea8021 100644
--- a/apps/web/src/locales/nl/messages.json
+++ b/apps/web/src/locales/nl/messages.json
@@ -547,12 +547,6 @@
     "message": "Inklappen/uitklappen",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Wachtwoord genereren"
-  },
-  "generatePassphrase": {
-    "message": "Wachtwoordzin genereren"
-  },
   "checkPassword": {
     "message": "Controleer of wachtwoord is gelekt."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Ik"
   },
+  "myItems": {
+    "message": "Mijn items"
+  },
   "myVault": {
     "message": "Mijn kluis"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Doorgaan zal je huidige sessie uitloggen, waarna je opnieuw moet inloggen. Actieve sessies op andere apparaten blijven mogelijk nog een uur actief."
   },
+  "changePasswordWarning": {
+    "message": "Na het wijzigen van je wachtwoord moet je inloggen met je nieuwe wachtwoord. Actieve sessies op andere apparaten worden binnen één uur uitgelogd."
+  },
   "emailChanged": {
     "message": "E-mailadres gewijzigd"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Door aanmelden in twee stappen in te schakelen, kun je jezelf definitief buitensluiten van je Bitwarden-account. Een herstelcode geeft je toegang tot je account in het geval dat je je normale tweestapsaanmelding niet meer kunt gebruiken (bijv. als je je apparaat verliest). De Bitwarden-klantondersteuning kan je niet helpen als je de toegang tot je account verliest. We raden je met klem aan de herstelcode op te schrijven of af te drukken en op een veilige plaats te bewaren."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Kaart item type verwijderen"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Leden niet toestaan om kaartitemtypes te maken. Bestaande kaarten wordek automatisch verwijderd."
+  },
+  "restrictCardTypeImport": {
+    "message": "Kan kaart item types niet importeren"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Een beleid ingesteld door 1 of meer organisaties voorkomt dat je kaarten naar je kluizen kunt importeren."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Met je herstelcode voor eenmalig gebruik kun je tweestapsaanmelding uitschakelen in het geval dat je toegang verliest tot je tweestapsaanmeldingsprovider. Bitwarden adviseert de herstelcode op te schrijven en op een veilige plaats te bewaren."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Uitschakelen"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Details van lid niet gevonden."
+  },
   "revokeAccess": {
     "message": "Toegang intrekken"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Bijwerken encryptiesleutel kan niet verder gaan"
-  },
   "editFieldLabel": {
     "message": "$LABEL$ bewerken",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Bij het bijwerken van je encryptiesleutel konden we je mappen niet decoderen. Om door te gaan met de update, moeten je mappen worden verwijderd. Geen kluisitems worden verwijderd als je doorgaat."
-  },
-  "keyUpdated": {
-    "message": "Sleutel bijgewerkt"
-  },
-  "updateEncryptionKey": {
-    "message": "Encryptiesleutel bijwerken"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Wij hebben de versleutelings- methode aangepast om betere beveiliging te kunnen leveren. Voer uw hoofdwachtwoord in om dit door te voeren."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Na het bijwerken van je encryptiesleutel moet je je afmelden en weer aanmelden bij alle Bitwarden-applicaties die je gebruikt (zoals de mobiele app of browserextensies). Als je niet opnieuw inlogt (wat je nieuwe encryptiesleutel downloadt), kan dit gegevensbeschadiging tot gevolg hebben. We proberen je automatisch uit te loggen, maar het kan zijn dat dit met enige vertraging gebeurt."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Alle account-beperkte bewaarde exports die je hebt opgeslagen worden ongeldig."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Oude versleuteling wordt niet langer ondersteund. Neem contact op voor ondersteuning om je account te herstellen."
+  },
   "subscription": {
     "message": "Abonnement"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Noodtoegang afgewezen"
   },
+  "grantorDetailsNotFound": {
+    "message": "Details van concessiegever niet gevonden"
+  },
   "passwordResetFor": {
     "message": "Wachtwoord opnieuw ingesteld voor $USER$. Je kunt nu inloggen met het nieuwe wachtwoord.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Gegevenseigendom van organisatie afdwingen"
+  },
   "personalOwnership": {
     "message": "Persoonlijk eigendom"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Doorgaan logt de huidige sessie van $NAME$ uit, waarna deze opnieuw moet aanmelden. Actieve sessies op andere apparaten kunnen mogelijk nog één uur actief blijven.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "deze gebruiker"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Een of meer organisatiebeleidseisen stelt de volgende eisen aan je hoofdwachtwoord:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Een of meer organisatiebeleidseisen stelt de volgende eisen aan je hoofdwachtwoord:"
+  },
   "resetPasswordSuccess": {
     "message": "Wachtwoord opnieuw ingesteld!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Toevoegen"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Hoofdwachtwoord succesvol ingesteld"
+  },
   "updatedMasterPassword": {
     "message": "Hoofdwachtwoord bijgewerkt"
   },
   "updateMasterPassword": {
     "message": "Hoofdwachtwoord bijwerken"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Wijzig je hoofdwachtwoord om je account te herstellen."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Je hoofdwachtwoord voldoet niet aan de eisen van deze organisatie. Wijzig je hoofdwachtwoord om door te gaan."
+  },
   "updateMasterPasswordWarning": {
     "message": "Je hoofdwachtwoord is onlangs veranderd door een beheerder in jouw organisatie. Om toegang te krijgen tot de kluis, moet je deze nu bijwerken. Doorgaan zal je huidige sessie uitloggen, waarna je opnieuw moet inloggen. Actieve sessies op andere apparaten blijven mogelijk nog een uur actief."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "E-mailadres genereren"
   },
+  "generatePassword": {
+    "message": "Wachtwoord genereren"
+  },
+  "generatePassphrase": {
+    "message": "Wachtwoordzin genereren"
+  },
+  "passwordGenerated": {
+    "message": "Wachtwoord gegenereerd"
+  },
+  "passphraseGenerated": {
+    "message": "Wachtwoordzin gegenereerd"
+  },
+  "usernameGenerated": {
+    "message": "Gebruikersnaam gegenereerd"
+  },
+  "emailGenerated": {
+    "message": "E-mail gegenereerd"
+  },
   "spinboxBoundariesHint": {
     "message": "Waarde moet tussen $MIN$ en $MAX$ liggen.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Dit wachtwoord gebruiken"
   },
+  "useThisPassphrase": {
+    "message": "Deze wachtwoordzin gebruiken"
+  },
   "useThisUsername": {
     "message": "Deze gebruikersnaam gebruiken"
   },
@@ -7605,9 +7656,9 @@
     "message": "Serviceaccount bijgewerkt",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Typ of selecteer projecten of geheimen",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Typ of selecteer projecten",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Typ om te filteren",
@@ -7692,8 +7743,8 @@
     "message": "Toegangstoken",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Nieuw toegangstoken",
+  "createAccessToken": {
+    "message": "Toegangstoken aanmaken",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Er is een fout opgetreden bij het lezen van het bronbestand"
   },
+  "accessedSecretWithId": {
+    "message": "Geheim benaderd met identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Geopend geheim $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Geheim bewerkt met identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Geheim verwijderd met identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Nieuw geheim aangemaakt met identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Goedkeuring van beheerder vragen"
   },
+  "unableToCompleteLogin": {
+    "message": "Kan login niet voltooien"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Je moet inloggen op een vertrouwd apparaat of je beheerder vragen om je een wachtwoord toe te wijzen."
+  },
   "trustedDeviceEncryption": {
     "message": "Vertrouwde apparaat encryptie"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Vertrouwd apparaat"
   },
-  "sendsNoItemsTitle": {
-    "message": "Geen actieve Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Gebruik Verzenden voor het veilig delen van versleutelde informatie met wie dan ook.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Gebruikers uitnodigen"
   },
@@ -8837,6 +8922,30 @@
     "message": "Gangbare formaten",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI-matche-detectie is hoe Bitwarden invulsuggesties herkent.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Reguliere expressie\" is een geavanceerde optie met een verhoogd risico op het blootstellen van inloggegevens.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Begint met\" is een geavanceerde optie met een verhoogd risico op het blootstellen van inloggegevens.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Lees meer over overeenkomstdetectie",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Geavanceerde opties",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Waarschuwing",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Om je abonnement voor $ORG$ te behouden, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Nieuwe bedrijfseenheid"
   },
+  "sendsTitleNoItems": {
+    "message": "Gevoelige informatie veilig versturen",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Deel bestanden en gegevens veilig met iedereen, op elk platform. Je informatie blijft end-to-end versleuteld terwijl en blootstelling beperkt.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Snel wachtwoorden maken"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Maak eenvoudig sterke en unieke wachtwoorden door te klikken op",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "om je te helpen je inloggegevens veilig te houden.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Maak eenvoudig sterke en unieke wachtwoorden door op de knop Wachtwoord genereren te klikken om je logins veilig te houden.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Tijd besparen met automatisch aanvullen"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Automatisch je wachtwoorden veilig aanvullen met één klik"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Download de Bitwarden-browserextensie en begin vandaag met automatisch invullen"
+  },
+  "getTheExtension": {
+    "message": "Download de extensie"
+  },
+  "addItLater": {
+    "message": "Later toevoegen"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Je kunt wachtwoorden niet automatisch invullen zonder de browserextensie"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Weet je zeker dat je de extensie nu niet wilt toevoegen?"
+  },
+  "skipToWebApp": {
+    "message": "Ga naar webapp"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extensie geïnstalleerd!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open de extensie om in te loggen en te beginnen met automatisch invullen."
+  },
+  "openBitwardenExtension": {
+    "message": "Bitwarden-extensie openen"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "Bezoek voor tips over het beginnen met Bitwarden het",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Leercentrum",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Helpcentrum",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "Met de Bitwarden-browserextensie kun je eenvoudig nieuwe inloggegevens aanmaken, je opgeslagen logins rechtstreeks vanuit je browser toolbar benaderen en je snel aanmelden bij accounts met Bitwarden automatisch invullen."
+  },
   "restart": {
     "message": "Herstarten"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Klik op \"Pay with PayPal\" voor het toevoegen van je betaalmethode."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Als je $EMAIL$ verwijdert, zal de sponsoring voor dit Familieplan stoppen. Er komt een zetel beschikbaar binnen je organisatie voor leden of sponsorschap na de vernieuwingsdatum van de gesponsorde organisatie op $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Factuuradres vereist voor het toevoegen van krediet.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Factuuradres"
+  },
+  "addBillingAddress": {
+    "message": "Factuuradres toevoegen"
+  },
+  "editBillingAddress": {
+    "message": "Factuuradres bewerken"
+  },
+  "noBillingAddress": {
+    "message": "Geen adres in bestand."
+  },
+  "billingAddressUpdated": {
+    "message": "Je factuuradres is bijgewerkt."
+  },
+  "paymentDetails": {
+    "message": "Betalingsdetails"
+  },
+  "paymentMethodUpdated": {
+    "message": "Je betaalmethode is bijgewerkt."
+  },
+  "bankAccountVerified": {
+    "message": "Je bankrekening is geverifieerd."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Beschikbaar krediet wordt automatisch toegepast op facturen gegenereerd voor dit account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Moet een positief getal zijn"
+  },
+  "cardSecurityCode": {
+    "message": "Kaart beveiligingscode"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Kaart beveiligingscode, ook bekend als CVV of CVC, is meestal een getal van 3 cijfers op de achterkant van je creditcard of 4 cijfers gedrukt op de voorkant boven je kaartnummer."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Betaling met een bankrekening is alleen beschikbaar voor klanten in de Verenigde Staten. Je moet je bankrekening verifiëren. We zullen binnen 1-2 werkdagen een microbetaling uitvoeren. Voer de code van het bankafschrift uit deze storting in op de factuurpagina om de bankrekening te verifiëren. Als de bankrekening niet wordt geverifieerd, wordt er een betaling gemist en wordt je abonnement opgeschort."
+  },
+  "taxId": {
+    "message": "Btw ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/nn/messages.json b/apps/web/src/locales/nn/messages.json
index 619c1776cb6..9b74122c868 100644
--- a/apps/web/src/locales/nn/messages.json
+++ b/apps/web/src/locales/nn/messages.json
@@ -547,12 +547,6 @@
     "message": "Gøym/vid ut",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Laga passord"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Eg"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Kvelvet mitt"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Slå av"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Laga passord"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/or/messages.json b/apps/web/src/locales/or/messages.json
index 27a160a9a3c..57b7a83469e 100644
--- a/apps/web/src/locales/or/messages.json
+++ b/apps/web/src/locales/or/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "My vault"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/pl/messages.json b/apps/web/src/locales/pl/messages.json
index de9caf9bbce..8665c3ddc32 100644
--- a/apps/web/src/locales/pl/messages.json
+++ b/apps/web/src/locales/pl/messages.json
@@ -547,12 +547,6 @@
     "message": "Zwiń/rozwiń",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Wygeneruj hasło"
-  },
-  "generatePassphrase": {
-    "message": "Wygeneruj hasło wyrazowe"
-  },
   "checkPassword": {
     "message": "Sprawdź, czy hasło zostało ujawnione."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Ja"
   },
+  "myItems": {
+    "message": "Moje elementy"
+  },
   "myVault": {
     "message": "Mój sejf"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Ta czynność spowoduje wylogowanie z bieżącej sesji, przez co konieczne będzie ponowne zalogowanie się. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę."
   },
+  "changePasswordWarning": {
+    "message": "Po zmianie hasła musisz się zalogować przy użyciu nowego hasła. Aktywne sesje na innych urządzeniach zostaną wylogowane w ciągu jednej godziny."
+  },
   "emailChanged": {
     "message": "Adres e-mail został zapisany"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Włączenie logowania dwustopniowego można trwale zablokować konto Bitwarden. Kod odzyskiwania pozwala na dostęp do konta w przypadku, gdy nie będziesz mógł skorzystać ze standardowego dostawcy logowania dwustopniowego (np. w przypadku utraty urządzenia). Pomoc techniczna Bitwarden nie będzie w stanie Ci pomóc, jeśli stracisz dostęp do swojego konta. Zalecamy zapisanie lub wydrukowanie kodu odzyskiwania i przechowywanie go w bezpiecznym miejscu."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Usuń elementy typu karty"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Nie zezwalaj członkom na tworzenie elementów typu karty. Istniejące karty zostaną automatycznie usunięte."
+  },
+  "restrictCardTypeImport": {
+    "message": "Nie można importować elementów typu karty"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Polityka ustawiona przez 1 lub więcej organizacji uniemożliwia importowanie kart do sejfów."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Jednorazowy kod odzyskiwania może być użyty do wyłączenia dwuetapowego logowania w przypadku utraty dostępu do dostawcy logowania dwuetapowego. Bitwarden zaleca zapisanie kodu odzyskiwania i przechowywanie go w bezpiecznym miejscu."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Wyłącz"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Nie znaleziono szczegółów użytkownika."
+  },
   "revokeAccess": {
     "message": "Unieważnij dostęp"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Aktualizacja klucza szyfrowania nie może być kontynuowana"
-  },
   "editFieldLabel": {
     "message": "Edytuj $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Podczas aktualizacji klucza szyfrowania, folderów nie można odszyfrować. Aby kontynuować aktualizację, foldery muszą zostać usunięte. Żadne elementy sejfu nie zostaną usunięte."
-  },
-  "keyUpdated": {
-    "message": "Klucz został zaktualizowany"
-  },
-  "updateEncryptionKey": {
-    "message": "Zaktualizuj klucz szyfrowania"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Zmieniliśmy schemat szyfrowania, aby zapewnić lepsze bezpieczeństwo. Zaktualizuj swój klucz szyfrowania, wprowadzając hasło główne poniżej."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Po zaktualizowaniu klucza szyfrowania, musisz ponownie zalogować się do wszystkich aplikacji Bitwarden, z których obecnie korzystasz (na przykład aplikacje mobilne lub rozszerzenia przeglądarki). Niepowodzenie logowania (podczas którego pobierany jest nowy klucz szyfrowania) może spowodować uszkodzenie danych. Postaramy się wylogować Ciebie automatycznie, jednak może to chwilę potrwać."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Wszystkie zapisane eksporty objęte ograniczeniami konta zostaną unieważnione."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Starsze szyfrowanie nie jest już obsługiwane. Skontaktuj się z pomocą techniczną, aby odzyskać swoje konto."
+  },
   "subscription": {
     "message": "Subskrypcja"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Dostęp awaryjny został odrzucony"
   },
+  "grantorDetailsNotFound": {
+    "message": "Nie znaleziono szczegółów dotacji"
+  },
   "passwordResetFor": {
     "message": "Zresetowałeś hasło użytkownika $USER$. Możesz zalogować się za pomocą nowego hasła.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Wymuś własność danych organizacji"
+  },
   "personalOwnership": {
     "message": "Własność osobista"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Kontynuowanie spowoduje wylogowanie użytkownika $NAME$ z obecnej sesji i będzie musiał zalogować się ponownie. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "ten użytkownik"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Co najmniej jedna zasada organizacji wymaga, aby hasło główne spełniało następujące wymagania:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Co najmniej jedna zasada organizacji wymaga, aby hasło główne spełniało następujące wymagania:"
+  },
   "resetPasswordSuccess": {
     "message": "Hasło zostało zresetowane!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Dodaj"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Hasło główne zostało pomyślnie ustawione"
+  },
   "updatedMasterPassword": {
     "message": "Hasło główne zostało zapisane"
   },
   "updateMasterPassword": {
     "message": "Zaktualizuj hasło główne"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Zmień hasło główne, aby zakończyć odzyskiwanie konta."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Twoje hasło główne nie spełnia wymagań tej organizacji. Zmień hasło główne, aby kontynuować."
+  },
   "updateMasterPasswordWarning": {
     "message": "Hasło główne zostało zmienione przez administratora Twojej organizacji. Musisz je zaktualizować, aby uzyskać dostęp do sejfu. Ta czynność spowoduje wylogowanie z bieżącej sesji, przez co konieczne będzie ponowne zalogowanie się. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Wygeneruj e-mail"
   },
+  "generatePassword": {
+    "message": "Wygeneruj hasło"
+  },
+  "generatePassphrase": {
+    "message": "Wygeneruj hasło wyrazowe"
+  },
+  "passwordGenerated": {
+    "message": "Hasło zostało wygenerowane"
+  },
+  "passphraseGenerated": {
+    "message": "Hasło wyrazowe zostało wygenerowane"
+  },
+  "usernameGenerated": {
+    "message": "Nazwa użytkownika została wygenerowana"
+  },
+  "emailGenerated": {
+    "message": "E-mail został wygenerowany"
+  },
   "spinboxBoundariesHint": {
     "message": "Wartość musi być pomiędzy $MIN$ a $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Użyj tego hasła"
   },
+  "useThisPassphrase": {
+    "message": "Użyj tego hasła wyrazowego"
+  },
   "useThisUsername": {
     "message": "Użyj tej nazwy użytkownika"
   },
@@ -7605,9 +7656,9 @@
     "message": "Zaktualizowano konto serwisowe",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Wpisz lub wybierz projekty lub sekrety",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Wpisz lub wybierz projekty",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Wpisz, aby filtrować",
@@ -7692,8 +7743,8 @@
     "message": "Tokeny dostępu",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Nowy token dostępu",
+  "createAccessToken": {
+    "message": "Utwórz token dostępu",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Wystąpił błąd podczas próby odczytu pliku importu"
   },
+  "accessedSecretWithId": {
+    "message": "Uzyskano dostęp do sekretu o identyfikatorze: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Uzyskano dostęp do sekretu $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edytowano sekret z identyfikatorem: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Usunięto sekret z identyfikatorem: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Utworzono nowy sekret z identyfikatorem: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Poproś administratora o zatwierdzenie"
   },
+  "unableToCompleteLogin": {
+    "message": "Nie można ukończyć logowania"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Musisz zalogować się na zaufanym urządzeniu lub poprosić administratora o przypisanie hasła."
+  },
   "trustedDeviceEncryption": {
     "message": "Szyfrowanie zaufanego urządzenia"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Zaufano urządzeniu"
   },
-  "sendsNoItemsTitle": {
-    "message": "Brak aktywnych wysyłek",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Użyj wysyłki, aby bezpiecznie dzielić się zaszyfrowanymi informacjami ze wszystkimi.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Zaproś użytkowników"
   },
@@ -8837,6 +8922,30 @@
     "message": "Popularne formaty",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Wykrywanie URI polega na tym, jak Bitwarden identyfikuje sugestie autouzupełniania.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "„Wyrażenie regularne” jest zaawansowaną opcją zwiększającą ryzyko ujawnienia danych uwierzytelniających.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "„Rozpoczyna się od” jest zaawansowaną opcją powodującą zwiększone ryzyko wystawienia danych uwierzytelniających.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Dowiedz się więcej o wykrywaniu dopasowania",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Ustawienia zaawansowane",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Ostrzeżenie",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Aby utrzymać subskrypcję dla $ORG$ ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Nowa jednostka biznesowa"
   },
+  "sendsTitleNoItems": {
+    "message": "Wysyłaj bezpiecznie poufne informacje",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Udostępniaj pliki i dane bezpiecznie każdemu, na każdej platformie. Twoje dane pozostaną zaszyfrowane end-to-end przy jednoczesnym ograniczeniu narażenia.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Szybko twórz hasła"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Łatwo twórz silne i unikalne hasła, klikając na",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": ", aby pomóc Ci zachować bezpieczeństwo Twoich danych logowania.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Łatwo twórz silne i unikalne hasła, klikając na Wygeneruj Hasło, aby pomóc Ci zachować bezpieczeństwo Twoich danych logowania.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Oszczędzaj czas dzięki autouzupełnianiu"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Bezpieczne autouzupełnianie haseł jednym kliknięciem"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Pobierz rozszerzenie przeglądarki Bitwarden i rozpocznij autouzupełnianie już dziś"
+  },
+  "getTheExtension": {
+    "message": "Pobierz rozszerzenie"
+  },
+  "addItLater": {
+    "message": "Dodaj później"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Nie można autouzupełniać haseł bez rozszerzenia przeglądarki"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Czy na pewno nie chcesz teraz dodać rozszerzenia?"
+  },
+  "skipToWebApp": {
+    "message": "Pomiń do aplikacji internetowej"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Rozszerzenie Bitwarden zainstalowane!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Otwórz rozszerzenie, aby zalogować się i rozpocząć autouzupełnianie."
+  },
+  "openBitwardenExtension": {
+    "message": "Otwórz rozszerzenie Bitwarden"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "Aby uzyskać wskazówki na temat rozpoczęcia z Bitwarden, odwiedź",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Centrum Szkoleniowe",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Centrum Pomocy",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "Dzięki rozszerzeniu przeglądarki Bitwarden możesz łatwo tworzyć nowe dane logowania, uzyskać dostęp do zapisanych danych logowania bezpośrednio z paska narzędzi przeglądarki oraz szybkie logowanie za pomocą autouzupełniania Bitwarden."
+  },
   "restart": {
     "message": "Zrestartuj"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Kliknij przycisk Zapłać za pomocą PayPal, aby dodać metodę płatności."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Jeśli usuniesz $EMAIL$, sponsorowanie tego planu rodzinnego zostanie zakończone. Miejsce w Twojej organizacji stanie się dostępne dla członków lub sponsorów po dacie odnowienia sponsorowanej organizacji w dniu $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Aby dodać środki, wymagany jest adres rozliczeniowy.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Adres rozliczeniowy"
+  },
+  "addBillingAddress": {
+    "message": "Dodaj adres rozliczeniowy"
+  },
+  "editBillingAddress": {
+    "message": "Edytuj adres rozliczeniowy"
+  },
+  "noBillingAddress": {
+    "message": "Brak adresu w pliku."
+  },
+  "billingAddressUpdated": {
+    "message": "Twój adres rozliczeniowy został zaktualizowany."
+  },
+  "paymentDetails": {
+    "message": "Szczegóły płatności"
+  },
+  "paymentMethodUpdated": {
+    "message": "Twoja metoda płatności została zaktualizowana."
+  },
+  "bankAccountVerified": {
+    "message": "Twoje konto bankowe zostało zweryfikowane."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Wszelkie dostępne środki zostaną automatycznie zastosowane do faktur wygenerowanych dla tego konta."
+  },
+  "mustBePositiveNumber": {
+    "message": "Musi być liczbą dodatnią"
+  },
+  "cardSecurityCode": {
+    "message": "Kod bezpieczeństwa karty"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Kod bezpieczeństwa karty, znany również jako CVV lub CVC, jest to zazwyczaj trzycyfrowy numer wydrukowany na odwrocie karty kredytowej lub czterocyfrowy numer wydrukowany na przodzie nad numerem karty."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Płatność za pomocą konta bankowego jest dostępna tylko dla klientów w Stanach Zjednoczonych. Będziesz musiał/musiała zweryfikować swoje konto bankowe. W ciągu najbliższych 1-2 dni roboczych dokonamy mikrowpłaty. Wprowadź kod deskryptora z tej wpłaty na stronie dostawcy subskrypcji, aby zweryfikować konto bankowe. Niezweryfikowanie konta bankowego spowoduje brak płatności i zawieszenie Twojej subskrypcji."
+  },
+  "taxId": {
+    "message": "ID Podatku: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/pt_BR/messages.json b/apps/web/src/locales/pt_BR/messages.json
index 04403ade2d9..4654fe2c176 100644
--- a/apps/web/src/locales/pt_BR/messages.json
+++ b/apps/web/src/locales/pt_BR/messages.json
@@ -547,12 +547,6 @@
     "message": "Alternar Colapso",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Gerar Senha"
-  },
-  "generatePassphrase": {
-    "message": "Gerar frase secreta"
-  },
   "checkPassword": {
     "message": "Verifique se a senha foi exposta."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Eu"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Meu Cofre"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "O processo desconectará você da sessão atual, exigindo que você inicie a sessão novamente. As sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "E-mail salvo"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "A configuração de login em duas etapas pode bloqueá-lo permanentemente da sua conta no Bitwarden. Um código de recuperação permite que você acesse sua conta no caso de não poder mais usar seu provedor de login em duas etapas normalmente (exemplo: você perde seu dispositivo). O suporte do Bitwarden não será capaz de ajudá-lo se você perder o acesso à sua conta. Recomendamos que você anote ou imprima o código de recuperação e o mantenha em um lugar seguro."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Seu código de recuperação de uso único pode ser usado para desativar o login em duas etapas no caso de você perder acesso ao seu provedor de login em duas etapas. O Bitwarden recomenda que você anote o código de recuperação e o mantenha em um lugar seguro."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Desabilitar"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revogar acesso"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "A atualização da chave de criptografia não pode continuar"
-  },
   "editFieldLabel": {
     "message": "Editar $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Ao atualizar sua chave de criptografia, suas pastas não puderam ser descriptografadas. Para continuar com a atualização, suas pastas devem ser excluídas. Nenhum item de cofre será excluído se você prosseguir."
-  },
-  "keyUpdated": {
-    "message": "Chave Atualizada"
-  },
-  "updateEncryptionKey": {
-    "message": "Atualizar Chave de Criptografia"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Alteramos o esquema de criptografia para fornecer melhor segurança. Atualize sua chave de criptografia agora digitando sua senha mestra abaixo."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Depois de atualizar sua chave de criptografia, é necessário encerrar e iniciar a sessão em todos os aplicativos do Bitwarden que você está usando atualmente (como o aplicativo móvel ou as extensões do navegador). Não encerrar e iniciar sessão (que baixa sua nova chave de criptografia) pode resultar em corrupção de dados. Nós tentaremos desconectá-lo automaticamente, mas isso pode demorar um pouco."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Assinatura"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Acesso de emergência rejeitado"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Redefinição de senha para $USER$. Agora você pode acessar usando a nova senha.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Propriedade Pessoal"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "este usuário"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Uma ou mais políticas da organização exigem que a senha mestra cumpra aos seguintes requisitos:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Senha redefinida com sucesso!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Adicionar"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Senha Mestra Atualizada"
   },
   "updateMasterPassword": {
     "message": "Atualizar Senha Mestra"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Sua Senha Mestra foi alterada recentemente por um administrador em sua organização. Para acessar o cofre, você deve atualizar sua Senha Mestra agora. Prosseguir irá desconectá-lo da sessão atual, exigindo que você faça login novamente. As sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Gerar e-mail"
   },
+  "generatePassword": {
+    "message": "Gerar Senha"
+  },
+  "generatePassphrase": {
+    "message": "Gerar frase secreta"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Valor deve ser entre $MIN$ e $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use esta senha"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use este nome de usuário"
   },
@@ -7605,9 +7656,9 @@
     "message": "Conta de serviço atualizada",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Digite ou selecione projetos ou segredos",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Digite para filtrar",
@@ -7692,8 +7743,8 @@
     "message": "Tokens de acesso",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Novo token de acesso",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Ocorreu um erro ao tentar ler o arquivo de importação"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "$SECRET_ID$ secreto acessado.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Solicitar aprovação do administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Criptografia de dispositivo confiável"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Dispositivo confiável"
   },
-  "sendsNoItemsTitle": {
-    "message": "Não há Envios ativos",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Enviar para compartilhar informações criptografadas de forma segura com qualquer pessoa.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Convidar usuários"
   },
@@ -8837,6 +8922,30 @@
     "message": "Formatos comuns",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Para manter sua assinatura para $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Nova unidade de negócio"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/pt_PT/messages.json b/apps/web/src/locales/pt_PT/messages.json
index dc66923f629..e22731fda35 100644
--- a/apps/web/src/locales/pt_PT/messages.json
+++ b/apps/web/src/locales/pt_PT/messages.json
@@ -547,12 +547,6 @@
     "message": "Alternar colapso",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Gerar palavra-passe"
-  },
-  "generatePassphrase": {
-    "message": "Gerar frase de acesso"
-  },
   "checkPassword": {
     "message": "Verificar se a palavra-passe foi exposta."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Eu"
   },
+  "myItems": {
+    "message": "Os meus itens"
+  },
   "myVault": {
     "message": "O meu cofre"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Ao prosseguir, terminará a sua sessão atual e terá de iniciar sessão novamente. As sessões ativas noutros dispositivos poderão continuar ativas até uma hora."
   },
+  "changePasswordWarning": {
+    "message": "Depois de ter alterado a sua palavra-passe, é necessário iniciar sessão com a sua nova palavra-passe. As sessões ativas noutros dispositivos serão interrompidas dentro de uma hora."
+  },
   "emailChanged": {
     "message": "E-mail alterado"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "A configuração da verificação de dois passos pode bloquear permanentemente a sua conta Bitwarden. Um código de recuperação permite-lhe aceder à sua conta no caso de já não poder utilizar o seu fornecedor normal de verificação de dois passos (por exemplo, se perder o seu dispositivo). O suporte Bitwarden não poderá ajudá-lo se perder o acesso à sua conta. Recomendamos que anote ou imprima o código de recuperação e o guarde num local seguro."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remover o tipo de item do cartão"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Não permitir que os membros criem tipos de itens de cartão. Os cartões existentes serão automaticamente removidos."
+  },
+  "restrictCardTypeImport": {
+    "message": "Não é possível importar tipos de itens de cartão"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Uma política definida por 1 ou mais organizações impede-o de importar cartões para os seus cofres."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "O seu código de recuperação de utilização única pode ser utilizado para desativar a verificação de dois passos no caso de perder o acesso ao seu fornecedor de verificação de dois passos. O Bitwarden recomenda que anote o código de recuperação e o guarde num local seguro."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Desativar"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Detalhes do membro não encontrados."
+  },
   "revokeAccess": {
     "message": "Revogar o acesso"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "A atualização da chave de encriptação não pode prosseguir"
-  },
   "editFieldLabel": {
     "message": "Editar $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Ao atualizar a sua chave de encriptação, as suas pastas não puderam ser desencriptadas. Para continuar com a atualização, as suas pastas têm de ser eliminadas. Nenhum item do cofre será eliminado se prosseguir."
-  },
-  "keyUpdated": {
-    "message": "Chave atualizada"
-  },
-  "updateEncryptionKey": {
-    "message": "Atualizar chave de encriptação"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Alterámos o esquema de encriptação para proporcionar uma melhor segurança. Atualize a sua chave de encriptação agora, introduzindo a sua palavra-passe mestra abaixo."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Depois de atualizar a sua chave de encriptação, é necessário terminar sessão e voltar a iniciar em todas as aplicações Bitwarden que está a utilizar atualmente (como a aplicação móvel ou as extensões do navegador). A falha em terminar sessão e voltar a iniciar (que descarrega a sua nova chave de encriptação) pode resultar em corrupção de dados. Tentaremos terminar a sua sessão automaticamente, no entanto, pode demorar."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Todas as exportações com restrições de conta que tenha guardado tornar-se-ão inválidas."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "A encriptação herdada já não é suportada. Por favor, contacte o suporte para recuperar a sua conta."
+  },
   "subscription": {
     "message": "Subscrição"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Acesso de emergência rejeitado"
   },
+  "grantorDetailsNotFound": {
+    "message": "Detalhes do concedente não encontrados"
+  },
   "passwordResetFor": {
     "message": "Palavra-passe de $USER$ redefinida. Pode agora iniciar sessão utilizando a nova palavra-passe.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Reforçar a propriedade dos dados da organização"
+  },
   "personalOwnership": {
     "message": "Remover cofre pessoal"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Ao prosseguir, terminará a sessão atual de $NAME$ e terá de iniciar sessão novamente. As sessões ativas noutros dispositivos poderão continuar ativas até uma hora.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "este utilizador"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Uma ou mais políticas da organização exigem que a palavra-passe mestra cumpra os seguintes requisitos:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Uma ou mais políticas da organização exigem que a palavra-passe mestra cumpra os seguintes requisitos:"
+  },
   "resetPasswordSuccess": {
     "message": "Palavra-passe redefinida com sucesso!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Adicionar"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Palavra-passe mestra definida com sucesso"
+  },
   "updatedMasterPassword": {
     "message": "Palavra-passe mestra guardada"
   },
   "updateMasterPassword": {
     "message": "Atualizar a palavra-passe mestra"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Altere a sua palavra-passe mestra para concluir a recuperação da conta."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "A sua palavra-passe mestra não cumpre os requisitos desta organização. Altere a sua palavra-passe mestra para continuar."
+  },
   "updateMasterPasswordWarning": {
     "message": "A sua palavra-passe mestra foi recentemente alterada por um administrador da sua organização. Para aceder ao cofre, tem de atualizar a sua palavra-passe mestra agora. Ao prosseguir, terminará a sua sessão atual e terá de iniciar sessão novamente. As sessões ativas noutros dispositivos poderão continuar ativas até uma hora."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Gerar e-mail"
   },
+  "generatePassword": {
+    "message": "Gerar palavra-passe"
+  },
+  "generatePassphrase": {
+    "message": "Gerar frase de acesso"
+  },
+  "passwordGenerated": {
+    "message": "Palavra-passe gerada"
+  },
+  "passphraseGenerated": {
+    "message": "Frase de acesso gerada"
+  },
+  "usernameGenerated": {
+    "message": "Nome de utilizador gerado"
+  },
+  "emailGenerated": {
+    "message": "E-mail gerado"
+  },
   "spinboxBoundariesHint": {
     "message": "O valor deve estar entre $MIN$ e $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Utilizar esta palavra-passe"
   },
+  "useThisPassphrase": {
+    "message": "Utilizar esta frase de acesso"
+  },
   "useThisUsername": {
     "message": "Utilizar este nome de utilizador"
   },
@@ -7605,9 +7656,9 @@
     "message": "Conta de serviço atualizada",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Escreva ou selecione projetos ou segredos",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Introduza ou selecione projetos",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Escreva para filtrar",
@@ -7692,8 +7743,8 @@
     "message": "Tokens de acesso",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Novo token de acesso",
+  "createAccessToken": {
+    "message": "Criar token de acesso",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Ocorreu um erro ao tentar ler o ficheiro de importação"
   },
+  "accessedSecretWithId": {
+    "message": "Acedeu a um segredo com o identificador: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Segredo $SECRET_ID$ acedido.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Editou um segredo com o identificador: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Eliminou um segredo com o identificador: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Criou um novo segredo com o identificador: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Pedir aprovação do administrador"
   },
+  "unableToCompleteLogin": {
+    "message": "Não é possível concluir o início de sessão"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Tem de iniciar sessão num dispositivo de confiança ou pedir ao seu administrador que lhe atribua uma palavra-passe."
+  },
   "trustedDeviceEncryption": {
     "message": "Encriptação de dispositivo de confiança"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Dispositivo de confiança"
   },
-  "sendsNoItemsTitle": {
-    "message": "Sem Sends ativos",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Utilize o Send para partilhar de forma segura informações encriptadas com qualquer pessoa.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Convidar utilizadores"
   },
@@ -8837,6 +8922,30 @@
     "message": "Formatos comuns",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "A deteção de correspondência de URI é a forma como o Bitwarden identifica sugestões de preenchimento automático.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "A \"expressão regular\" é uma opção avançada com um risco acrescido de exposição de credenciais.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Começa com\" é uma opção avançada com um risco acrescido de exposição de credenciais.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Mais informações sobre a deteção de correspondências",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Para manter a sua subscrição para a $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -9732,7 +9841,7 @@
     "message": "Selecionar pasta"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 será permanentemente transferido para a organização selecionada. Este item deixará de lhe pertencer."
+    "message": "1 item será permanentemente transferido para a organização selecionada. Este item deixará de lhe pertencer."
   },
   "personalItemsTransferWarningPlural": {
     "message": "$PERSONAL_ITEMS_COUNT$ itens serão permanentemente transferidos para a organização selecionada. Estes itens deixarão de lhe pertencer.",
@@ -9744,7 +9853,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 será permanentemente transferido para a $ORG$. Este item deixará de lhe pertencer.",
+    "message": "1 item será permanentemente transferido para a $ORG$. Este item deixará de lhe pertencer.",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Nova unidade de negócio"
   },
+  "sendsTitleNoItems": {
+    "message": "Envie informações sensíveis com segurança",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Partilhe ficheiros e dados de forma segura com qualquer pessoa, em qualquer plataforma. As suas informações permanecerão encriptadas ponto a ponto, limitando a exposição.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Criar rapidamente palavras-passe"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Crie facilmente palavras-passe fortes e únicas clicando em",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "para o ajudar a manter as suas credenciais seguras.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Crie facilmente palavras-passe fortes e únicas clicando no botão Gerar palavra-passe para o ajudar a manter as suas credenciais seguras.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Poupe tempo com o preenchimento automático"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Preenchimento automático das suas palavras-passe de forma segura com um só clique"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Obtenha a extensão do navegador Bitwarden e comece a preencher automaticamente hoje mesmo"
+  },
+  "getTheExtension": {
+    "message": "Obter a extensão"
+  },
+  "addItLater": {
+    "message": "Adicioná-la mais tarde"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Não é possível preencher automaticamente as palavras-passe sem a extensão do navegador"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Tem a certeza de que não pretende adicionar a extensão agora?"
+  },
+  "skipToWebApp": {
+    "message": "Saltar para a Web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Extensão Bitwarden instalada!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Abra a extensão para iniciar sessão e começar o preenchimento automático."
+  },
+  "openBitwardenExtension": {
+    "message": "Abrir a extensão Bitwarden"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "Para obter dicas sobre como começar a utilizar o Bitwarden, visite a página",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Centro de aprendizagem",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Centro de ajuda",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "Com a extensão do navegador Bitwarden, pode criar facilmente novas credenciais, aceder às credenciais guardadas diretamente a partir da barra de ferramentas do navegador e iniciar sessão em contas rapidamente utilizando o preenchimento automático do Bitwarden."
+  },
   "restart": {
     "message": "Reiniciar"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Por favor, clique no botão Pagar com PayPal para adicionar o seu método de pagamento."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Se remover $EMAIL$, o patrocínio para este plano Familiar termina. Um lugar na sua organização ficará disponível para membros ou patrocínios após a data de renovação da organização patrocinada a $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Endereço de faturação necessário para adicionar crédito.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Endereço de faturação"
+  },
+  "addBillingAddress": {
+    "message": "Adicionar endereço de faturação"
+  },
+  "editBillingAddress": {
+    "message": "Editar endereço de faturação"
+  },
+  "noBillingAddress": {
+    "message": "Não existe endereço no ficheiro."
+  },
+  "billingAddressUpdated": {
+    "message": "O seu endereço de faturação foi atualizado."
+  },
+  "paymentDetails": {
+    "message": "Detalhes do pagamento"
+  },
+  "paymentMethodUpdated": {
+    "message": "O seu método de pagamento foi atualizado."
+  },
+  "bankAccountVerified": {
+    "message": "A sua conta bancária foi verificada."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Qualquer crédito disponível será automaticamente aplicado às faturas geradas para esta conta."
+  },
+  "mustBePositiveNumber": {
+    "message": "Tem de ser um número positivo"
+  },
+  "cardSecurityCode": {
+    "message": "Código de segurança do cartão"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "O código de segurança do cartão, também conhecido como CVV ou CVC, é normalmente um número de 3 dígitos impresso no verso do seu cartão de crédito ou um número de 4 dígitos impresso na parte da frente, por cima do número do seu cartão."
+  },
+  "verifyBankAccountWarning": {
+    "message": "O pagamento com uma conta bancária só está disponível para clientes nos Estados Unidos. Ser-lhe-á pedido que verifique a sua conta bancária. Efetuaremos um micro-depósito nos próximos 1-2 dias úteis. Introduza o código descritor do extrato deste depósito na página Detalhes do pagamento para verificar a conta bancária. A não verificação da conta bancária resultará na perda de um pagamento e na suspensão da subscrição."
+  },
+  "taxId": {
+    "message": "NIF: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ro/messages.json b/apps/web/src/locales/ro/messages.json
index 632733642b1..471b6af342b 100644
--- a/apps/web/src/locales/ro/messages.json
+++ b/apps/web/src/locales/ro/messages.json
@@ -547,12 +547,6 @@
     "message": "Comutare restrângere",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generare parolă"
-  },
-  "generatePassphrase": {
-    "message": "Generare parolă"
-  },
   "checkPassword": {
     "message": "Verificați dacă parola a fost dezvăluită."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Eu"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Seiful meu"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Continuând, veți fi deconectat de la sesiunea curentă, solicitându-vă să vă conectați din nou. Sesiunile active pe alte dispozitive pot continua să rămână active timp de până la o oră."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "E-mail salvat"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Configurarea unei autentificări în două etape vă poate bloca permanent din contul Bitwarden. Un cod de recuperare vă permite să vă accesați contul în cazul în care nu mai puteți utiliza furnizorul normal de autentificare în două etape (exemplu: vă pierdeți dispozitivul). Serviciul de asistență Bitwarden nu vă va putea ajuta dacă pierdeți accesul la cont. Vă recomandăm să notați sau să imprimați codul de recuperare și să-l păstrați într-un loc sigur."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Dezactivare"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revocare acces"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Cheie actualizată"
-  },
-  "updateEncryptionKey": {
-    "message": "Actualizare cheie de criptare"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "După actualizarea cheii de criptare, trebuie să vă reconectați în toate aplicațiile Bitwarden pe care le utilizați în prezent (cum ar fi aplicația mobilă sau extensiile browserului). Faptul de a nu vă deconecta și reconecta (care descarcă noua cheie de criptare) poate duce la corupția datelor. Vom încerca să vă deconectăm automat, însă ar putea fi întârziat."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Abonament"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Acces de urgență respins"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "S-a resetat parola pentru $USER$. Vă puteți conecta acum cu noua parolă.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Înlăturați seiful personal"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "acest utilizator"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Una sau mai multe politici ale organizației, necesită ca parola principală să îndeplinească următoarele cerințe:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Parolă resetată cu succes!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Adaugă"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Parolă principală salvată"
   },
   "updateMasterPassword": {
     "message": "Actualizare parolă principală"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Parola principală a fost schimbată recent de către un administrator din organizație. Pentru a accesa seiful, trebuie să vă actualizați acum parola principală. Continuând, veți fi deconectat din sesiunea curentă, fiind necesar să vă conectați din nou. Sesiunile active de pe alte dispozitive pot continua să rămână active timp de până la o oră."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generare parolă"
+  },
+  "generatePassphrase": {
+    "message": "Generare parolă"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ru/messages.json b/apps/web/src/locales/ru/messages.json
index c30371f7d86..944acc70862 100644
--- a/apps/web/src/locales/ru/messages.json
+++ b/apps/web/src/locales/ru/messages.json
@@ -547,12 +547,6 @@
     "message": "Свернуть/развернуть",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Сгенерировать пароль"
-  },
-  "generatePassphrase": {
-    "message": "Создать парольную фразу"
-  },
   "checkPassword": {
     "message": "Проверьте, не скомпрометирован ли пароль."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Мое"
   },
+  "myItems": {
+    "message": "Мои элементы"
+  },
   "myVault": {
     "message": "Хранилище"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "В случае продолжения, ваша сессия будет завершена и вам будет предложено авторизоваться повторно. Сессии на других устройствах могут оставаться активными в течение одного часа."
   },
+  "changePasswordWarning": {
+    "message": "После смены пароля потребуется авторизоваться с новым паролем. Активные сессии на других устройствах будут завершены в течение одного часа."
+  },
   "emailChanged": {
     "message": "Email сохранен"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "При включении двухэтапной аутентификации вы можете навсегда потерять доступ к вашей учетной записи Bitwarden. Код восстановления позволяет получить доступ к вашему аккаунту в случае, если вы больше не можете использовать свой обычный метод двухэтапной аутентификации (например, при потере устройства). Служба поддержки Bitwarden не сможет вам помочь, если вы потеряете доступ к своему аккаунту. Мы рекомендуем вам записать или распечатать код восстановления и хранить его в надежном месте."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Удалить элемент типа карта"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Не разрешать пользователям создавать элементы карт. Существующие карты будут автоматически удалены."
+  },
+  "restrictCardTypeImport": {
+    "message": "Невозможно импортировать элементы карт"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Политика, установленная 1 или более организациями, не позволяет импортировать карты в ваши хранилища."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Одноразовый код восстановления можно использовать для отключения двухэтапной аутентификации в случае потери доступа к провайдеру двухэтапной аутентификации. Bitwarden рекомендует записать код восстановления и хранить его в надежном месте."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Отключить"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Данные участника не найдены."
+  },
   "revokeAccess": {
     "message": "Отозвать доступ"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Обновление ключа шифрования невозможно"
-  },
   "editFieldLabel": {
     "message": "Изменить $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "При обновлении ключа шифрования не удалось расшифровать папки. Чтобы продолжить обновление, папки необходимо удалить. При продолжении обновления элементы хранилища удалены не будут."
-  },
-  "keyUpdated": {
-    "message": "Ключ обновлен"
-  },
-  "updateEncryptionKey": {
-    "message": "Обновить ключ шифрования"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Мы изменили схему шифрования, чтобы повысить безопасность. Обновите ключ шифрования, введя ниже мастер-пароль."
-  },
   "updateEncryptionKeyWarning": {
     "message": "После обновления ключа шифрования необходимо выйти из всех приложений Bitwarden, которые вы используете (например, из мобильного приложения или расширения браузера). Если этого не сделать, могут повредиться данные (так как при выходе и последующем входе загружается ваш новый ключ шифрования). Мы попытаемся автоматически осуществить завершение ваших сессий, однако это может произойти с задержкой."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Все сохраненные экспорты, затронутые ограничениями аккаунта, будут аннулированы."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Устаревшее шифрование больше не поддерживается. Для восстановления аккаунта обратитесь в службу поддержки."
+  },
   "subscription": {
     "message": "Подписка"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "В экстренном доступе отказано"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Сброшен пароль для $USER$. Теперь вы можете войти, используя новый пароль.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Удалить личное хранилище"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "В случае продолжения сессия $NAME$ будет завершена, что потребует повторной авторизации. Сессии на других устройствах могут оставаться активными до одного часа.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "этот пользователь"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Согласно одной или нескольким политикам организации необходимо, чтобы мастер-пароль отвечал следующим требованиям:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Согласно одной или нескольким политикам организации необходимо, чтобы мастер-пароль отвечал следующим требованиям:"
+  },
   "resetPasswordSuccess": {
     "message": "Пароль успешно сброшен!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Добавить"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Мастер-пароль успешно установлен"
+  },
   "updatedMasterPassword": {
     "message": "Мастер-пароль сохранен"
   },
   "updateMasterPassword": {
     "message": "Обновить мастер-пароль"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Измените мастер-пароль, чтобы завершить восстановление аккаунта."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Ваш мастер-пароль не соответствует требованиям этой организации. Измените его, чтобы продолжить."
+  },
   "updateMasterPasswordWarning": {
     "message": "Мастер-пароль недавно был изменен администратором вашей организации. Чтобы получить доступ к хранилищу, вы должны обновить мастер-пароль сейчас. В результате текущая сессия будет завершена и потребуется повторная авторизация. Сессии на других устройствах могут оставаться активными в течение одного часа."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Сгенерировать email"
   },
+  "generatePassword": {
+    "message": "Сгенерировать пароль"
+  },
+  "generatePassphrase": {
+    "message": "Создать парольную фразу"
+  },
+  "passwordGenerated": {
+    "message": "Пароль создан"
+  },
+  "passphraseGenerated": {
+    "message": "Парольная фраза создана"
+  },
+  "usernameGenerated": {
+    "message": "Имя пользователя создано"
+  },
+  "emailGenerated": {
+    "message": "Email создан"
+  },
   "spinboxBoundariesHint": {
     "message": "Значение должно быть между $MIN$ и $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Использовать этот пароль"
   },
+  "useThisPassphrase": {
+    "message": "Использовать эту парольную фразу"
+  },
   "useThisUsername": {
     "message": "Использовать это имя пользователя"
   },
@@ -7605,9 +7656,9 @@
     "message": "Сервисный аккаунт изменен",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Введите или выберите проекты или секреты",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Введите или выберите проекты",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Введите для фильтрации",
@@ -7692,8 +7743,8 @@
     "message": "Токены доступа",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Новый токен доступа",
+  "createAccessToken": {
+    "message": "Создать токен доступа",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Произошла ошибка при попытке чтения импортируемого файла"
   },
+  "accessedSecretWithId": {
+    "message": "Доступ к секрету с идентификатором: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Получен доступ к секрету $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Изменен секрет с идентификатором: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Удален секрет с идентификатором: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Создан новый секрет с идентификатором: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Запросить одобрение администратора"
   },
+  "unableToCompleteLogin": {
+    "message": "Не удалось завершить вход"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Вам необходимо авторизоваться с доверенного устройства или попросить вашего администратора назначить вам пароль."
+  },
   "trustedDeviceEncryption": {
     "message": "Шифрование доверенного устройства"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Доверенное устройство"
   },
-  "sendsNoItemsTitle": {
-    "message": "Нет активных Send",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Используйте Send для безопасного обмена зашифрованной информацией с кем угодно.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Пригласить пользователей"
   },
@@ -8837,6 +8922,30 @@
     "message": "Основные форматы",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Обнаружение совпадения URI - это способ, с помощью которого Bitwarden идентифицирует предложения по автозаполнению.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Регулярное выражение\" - это расширенный вариант с повышенным риском раскрытия учетных данных.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Начинается с\" - это расширенный вариант с повышенным риском раскрытия учетных данных.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Подробнее об обнаружении совпадений",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Расширенные настройки",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Предупреждение",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Для сохранения подписки на $ORG$ ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Новая бизнес-единица"
   },
+  "sendsTitleNoItems": {
+    "message": "Безопасная отправка конфиденциальной информации",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Безопасно обменивайтесь файлами и данными с кем угодно на любой платформе. Ваша информация надежно шифруется и доступ к ней ограничен.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Быстрое создание паролей"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Легко создавайте надежные и уникальные пароли, нажатием на кнопку,",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "чтобы обеспечить безопасность ваших логинов.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Легко создавайте надежные и уникальные пароли, нажатием на кнопку 'Сгенерировать пароль', чтобы обеспечить безопасность ваших логинов.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Экономьте время с помощью автозаполнения"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Автозаполнение паролей безопасно одним нажатием"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Установите расширение для браузера Bitwarden и начните использовать автозаполнение уже сегодня"
+  },
+  "getTheExtension": {
+    "message": "Получить расширение"
+  },
+  "addItLater": {
+    "message": "Добавить позже"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Вы не можете автоматически заполнять пароли без расширения браузера"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Вы уверены, что не хотите добавить расширение прямо сейчас?"
+  },
+  "skipToWebApp": {
+    "message": "Перейти к веб-приложению"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Расширение Bitwarden установлено!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Откройте расширение, чтобы авторизоваться и начать использовать автозаполнение."
+  },
+  "openBitwardenExtension": {
+    "message": "Открыть расширение Bitwarden"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "Для получения советов по началу работы с Bitwarden посетите сайт",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "База знаний",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Центр поддержки",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "С помощью расширения Bitwarden вы можете легко создавать новые логины, получать доступ к сохраненным логинам непосредственно с панели инструментов браузера и быстро входить в аккаунты с помощью автозаполнения Bitwarden."
+  },
   "restart": {
     "message": "Перезапустить"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Пожалуйста, нажмите кнопку \"Оплатить с помощью PayPal\", чтобы добавить свой способ оплаты."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Если вы удалите $EMAIL$, спонсорство по этому семейному плану прекратится. Места в вашей организации станут доступны для участников или спонсорских организаций после даты продления подписки $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Для пополнения счета необходим платежный адрес.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Платежный адрес"
+  },
+  "addBillingAddress": {
+    "message": "Добавить платежный адрес"
+  },
+  "editBillingAddress": {
+    "message": "Изменить платежный адрес"
+  },
+  "noBillingAddress": {
+    "message": "Нет адреса в файле."
+  },
+  "billingAddressUpdated": {
+    "message": "Ваш платежный адрес был обновлен."
+  },
+  "paymentDetails": {
+    "message": "Детали оплаты"
+  },
+  "paymentMethodUpdated": {
+    "message": "Ваш способ оплаты обновлен."
+  },
+  "bankAccountVerified": {
+    "message": "Ваш банковский счет был подтвержден."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Любой доступный кредит будет автоматически зачислен на счета, сгенерированные для этого счета."
+  },
+  "mustBePositiveNumber": {
+    "message": "Должно быть положительным числом"
+  },
+  "cardSecurityCode": {
+    "message": "Код безопасности карты"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Код безопасности карты, также известный как CVV или CVC. Обычно это трехзначный номер, напечатанный на обратной стороне вашей кредитной карты или четырехзначный номер, напечатанный на лицевой стороне над номером вашей карты."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Оплата с помощью банковского счета доступна только для клиентов в США. Вам потребуется подтвердить свой банковский счет. Мы сделаем микродепозит в течение следующих 1-2 рабочих дней. Введите код дескриптора выписки из этого депозита на странице платежных реквизитов для подтверждения банковского счета. Неподтверждение банковского счета приведет к пропуску платежа и приостановке подписки."
+  },
+  "taxId": {
+    "message": "ID налога: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/si/messages.json b/apps/web/src/locales/si/messages.json
index f75fd53c209..98bb0c5bfdc 100644
--- a/apps/web/src/locales/si/messages.json
+++ b/apps/web/src/locales/si/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "My vault"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/sk/messages.json b/apps/web/src/locales/sk/messages.json
index e785bd3749b..3ffbd08d86e 100644
--- a/apps/web/src/locales/sk/messages.json
+++ b/apps/web/src/locales/sk/messages.json
@@ -547,12 +547,6 @@
     "message": "Prepnúť zloženie",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generovať heslo"
-  },
-  "generatePassphrase": {
-    "message": "Generovať prístupovú frázu"
-  },
   "checkPassword": {
     "message": "Overiť či došlo k úniku hesla."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Ja"
   },
+  "myItems": {
+    "message": "Moje položky"
+  },
   "myVault": {
     "message": "Môj trezor"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Ak budete pokračovať, budete odhlásený a budete sa musieť opäť prihlásiť. Aktívne sedenia na iných zariadeniach môžu byť aktívne ešte hodinu."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "E-mail bol zmenený"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Zapnutie dvojstupňového prihlásenia vás môže natrvalo vymknúť z vášho Bitwarden účtu. Záchranný kód umožňuje prístup k vášmu kontu v prípade že už nemôžete použiť svoj normálny dvojstupňový spôsob overenia. (napríklad ak stratíte zariadenie) Zákaznícka podpora nebude schopná pomôcť vám ak stratíte prístup k účtu. Preto vám odporúčame zapísať si, alebo si vytlačiť záchranný kód a uložiť ho na bezpečnom mieste."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Odstrániť typ položky pre kartu"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Neumožniť členom vytvárať typ položky pre kartu. Existujúce karty budú automaticky odstránené."
+  },
+  "restrictCardTypeImport": {
+    "message": "Položky typu karta sa nedajú importovať"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Politika nastavená 1 alebo viacerými organizáciami vám bráni v importovaní kariet do vašich trezorov."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Váš jednorázový záchranný kód sa dá použiť na vypnutie dvojstupňového prihlasovania ak ste stratili pristúp k jeho poskytovateľovi. Bitwarden odporúča, aby ste si záchranný kód zapísali a odložili na bezpečné miesto."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Vypnúť"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Detaily o členovi nenájdené."
+  },
   "revokeAccess": {
     "message": "Zrušiť prístup"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Aktualizácia šifrovacieho kľúča nemôže pokračovať"
-  },
   "editFieldLabel": {
     "message": "Upraviť $LABEL$",
     "placeholders": {
@@ -4533,23 +4545,14 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Pri aktualizácii šifrovacieho kľúča nebolo možné dešifrovať vaše priečinky. Ak chcete pokračovať v aktualizácii, vaše priečinky sa musia odstrániť. Ak budete pokračovať, nebudú odstránené žiadne položky trezora."
-  },
-  "keyUpdated": {
-    "message": "Kľúč aktualizovaný"
-  },
-  "updateEncryptionKey": {
-    "message": "Aktualizovať šifrovací kľúč"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Po aktualizácii šifrovacieho kľúča budete požiadaní o opätovné prihlásenie do všetkých Bitwarden aplikácii ktoré momentálne používate (napríklad mobilné aplikácie, alebo rozšírenia v prehliadači). Ak sa opätovne neprihlásite (touto operáciou sa stiahnu nové šifrovacie kľúče), mohlo by to viesť k poškodeniu uložených dát. Pokúsime sa odhlásiť vás automaticky, ale môže to chvíľu trvať."
   },
   "updateEncryptionKeyAccountExportWarning": {
-    "message": "Any account restricted exports you have saved will become invalid."
+    "message": "Všetky exporty obmedzené účtom budú neplatné."
+  },
+  "legacyEncryptionUnsupported": {
+    "message": "Staršie šifrovanie už nie je podporované. Ak chcete obnoviť svoj účet, obráťte sa na podporu."
   },
   "subscription": {
     "message": "Predplatné"
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Núdzový prístup odmietnutý"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Resetovanie hesla pre $USER$. Teraz sa môžete prihlásiť s novým heslom.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Požadovanie vlastníctva údajov organizácie"
+  },
   "personalOwnership": {
     "message": "Zakázať osobný trezor"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Pokračovaním sa $NAME$ odhlási z aktuálnej relácie a bude sa musieť znova prihlásiť. Aktívne relácie na iných zariadeniach môžu zostať aktívne až jednu hodinu.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "tento používateľ"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Jedno alebo viac pravidiel organizácie požadujú, aby hlavné heslo spĺňalo nasledujúce požiadavky:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Jedno alebo viac pravidiel organizácie požadujú, aby hlavné heslo spĺňalo nasledujúce požiadavky:"
+  },
   "resetPasswordSuccess": {
     "message": "Heslo bolo úspešne obnovené!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Pridať"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Hlavné heslo bolo úspešne nastavené"
+  },
   "updatedMasterPassword": {
     "message": "Hlavné heslo aktualizované"
   },
   "updateMasterPassword": {
     "message": "Aktualizovať hlavné heslo"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Vaše hlavné heslo nedávno zmenil správca vo vašej organizácii. Ak chcete získať prístup k trezoru, musíte aktualizovať vaše hlavné heslo teraz. Pokračovaním sa odhlásite z aktuálnej relácie a budete sa musieť znova prihlásiť. Aktívne relácie na iných zariadeniach môžu zostať aktívne až jednu hodinu."
   },
@@ -6477,10 +6507,10 @@
     "message": "Neplatný verifikačný kód"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Hlavné heslo sa už nevyžaduje pre členov tejto organizácie. Nižšie uvedenú doménu potvrďte u správcu organizácie."
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Doména Key Connectora"
   },
   "leaveOrganization": {
     "message": "Opustiť organizáciu"
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generovať e-mail"
   },
+  "generatePassword": {
+    "message": "Generovať heslo"
+  },
+  "generatePassphrase": {
+    "message": "Generovať prístupovú frázu"
+  },
+  "passwordGenerated": {
+    "message": "Heslo vygenerované"
+  },
+  "passphraseGenerated": {
+    "message": "Prístupová fráza vygenerovaná"
+  },
+  "usernameGenerated": {
+    "message": "Používateľské meno vygenerované"
+  },
+  "emailGenerated": {
+    "message": "E-mail vygenerovaný"
+  },
   "spinboxBoundariesHint": {
     "message": "Hodnota musí byť medzi $MIN$ a $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Použiť toto heslo"
   },
+  "useThisPassphrase": {
+    "message": "Použiť túto prístupovú frázu"
+  },
   "useThisUsername": {
     "message": "Použiť toto používateľské meno"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Zadajte alebo vyberte projekty",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Nový prístupový token",
+  "createAccessToken": {
+    "message": "Vytvoriť prístupový token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Pri pokuse o prečítanie súboru na import sa vyskytla chyba"
   },
+  "accessedSecretWithId": {
+    "message": "Prístup k položke s identifikátorom: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Prístup k heslu $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Upravená položka s identifikátorom: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Odstránená položka s identifikátorom: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Vytvorená nová položka s identifikátorom: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Žiadosť o schválenie správcom"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Šifrovanie dôveryhodného zariadenia"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Dôveryhodné zariadenie"
   },
-  "sendsNoItemsTitle": {
-    "message": "Žiadne aktívne Sendy",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Použite Send na bezpečné zdieľanie zašifrovaných informácii s kýmkoľvek.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Pozvať používateľov"
   },
@@ -8837,6 +8922,30 @@
     "message": "Bežné formáty",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Aby ste udržali predplatné pre $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Nová organizačná jednotka"
   },
+  "sendsTitleNoItems": {
+    "message": "Send, citlivé informácie bezpečne",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Bezpečne zdieľajte súbory a údaje s kýmkoľvek a na akejkoľvek platforme. Vaše informácie zostanú end-to-end zašifrované a zároveň sa obmedzí ich odhalenie.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Rýchle vytváranie hesiel"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Jednoducho vytvorte silné a jedinečné heslá kliknutím na",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "aby ste mohli ochrániť prihlasovacie údaje.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Jednoducho vytvorte silné a jedinečné heslá kliknutím na tlačidlo Generovať heslo, aby ste zabezpečili prihlasovacie údaje.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Ušetrite čas s automatickým vypĺňaním"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Reštartovať"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Pre pridanie platobnej metódy kliknite prosím na Zaplatiť cez PayPal."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Ak odstránite $EMAIL$, sponzorstvo tohto predplatného pre Rodiny skončí. Sedenie v organizácii bude dostupné pre členov alebo sponzorstvo od následujúceho fakturačného obdobia sponzorovanej organizácie dňa $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Na pridanie kreditu je potrebná fakturačná adresa.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/sl/messages.json b/apps/web/src/locales/sl/messages.json
index 5a43561bf5a..432c94ded26 100644
--- a/apps/web/src/locales/sl/messages.json
+++ b/apps/web/src/locales/sl/messages.json
@@ -547,12 +547,6 @@
     "message": "Skrči/Razširi",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generiraj geslo"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Preveri izpostavljenost gesla."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Jaz"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Moj trezor"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Po tem dejanju boste odjavljeni in se boste morali prijaviti ponovno. Prijave na drugih napravah bodo ostale aktivne še največ eno uro."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "E-poštni naslov spremenjen"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Onemogočeno"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Odvzemi dostop"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Ključ posodobljen"
-  },
-  "updateEncryptionKey": {
-    "message": "Posodobi šifrirni ključ"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Naročnina"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Glavno geslo shranjeno"
   },
   "updateMasterPassword": {
     "message": "Posodobi glavno geslo"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generiraj geslo"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Pri branju datoteke za uvoz je prišlo do napake"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/sr/messages.json b/apps/web/src/locales/sr/messages.json
index e54b6d148ca..1499ab4a526 100644
--- a/apps/web/src/locales/sr/messages.json
+++ b/apps/web/src/locales/sr/messages.json
@@ -547,12 +547,6 @@
     "message": "Пребаци проширење",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Генерисање лозинке"
-  },
-  "generatePassphrase": {
-    "message": "Генеришите приступну фразу"
-  },
   "checkPassword": {
     "message": "Проверите да ли је лозинка изложена."
   },
@@ -2159,6 +2153,12 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Омогућавање пријаве у два корака може вас трајно закључати са вашег Bitwarden-а налога. Код за опоравак омогућава вам приступ вашем налогу у случају да више не можете да користите свог уобичајеног добављача услуге пријављивања у два корака (нпр. ако изгубите уређај). Подршка Bitwarden-а неће вам моћи помоћи ако изгубите приступ свом налогу. Препоручујемо да запишете или одштампате код за опоравак и сачувате га на сигурном месту."
   },
+  "restrictedItemTypesPolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypesPolicyDesc": {
+    "message": "Do not allow members to create card item types."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Ваш јединствени кôд за опоравак може се користити за искључивање у два корака у случају да изгубите приступ свом двоструком провајдеру пријаве. Bitwarden препоручује да запишете кôд за опоравак и држите га на сигурном месту."
   },
@@ -4478,9 +4478,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Ажурирање кључа за шифровање не може да се настави"
-  },
   "editFieldLabel": {
     "message": "Уреди $LABEL$",
     "placeholders": {
@@ -4533,24 +4530,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Приликом ажурирања кључа за шифровање, ваше фасцикле нису могле да се дешифрују. Да бисте наставили са ажурирањем, ваше фасцикле морају бити избрисане. Ниједна ставка у сефу неће бити избрисана ако наставите."
-  },
-  "keyUpdated": {
-    "message": "Кључ је ажуриран"
-  },
-  "updateEncryptionKey": {
-    "message": "Ажурирајте кључ за шифровање"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Променили смо шему шифровања да бисмо пружили бољу безбедност. Ажурирајте кључ за шифровање сада тако што ћете унети испод главну лозинку."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Након ажурирања кључа за шифровање, мораћете да се одјавите и вратите у све Bitwarden апликације које тренутно користите (као што су мобилна апликација или додаци прегледача). Ако се не одјавите и поново пријавите (чиме се преузима ваш нови кључ за шифровање), може доћи до оштећења података. Покушаћемо аутоматски да се одјавимо, али може доћи до одлагања."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Сваки рачун са ограничен извоз који сте сачували постаће неважећи."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Претплата"
   },
@@ -6824,6 +6812,24 @@
   "generateEmail": {
     "message": "Генеришите имејл"
   },
+  "generatePassword": {
+    "message": "Генерисање лозинке"
+  },
+  "generatePassphrase": {
+    "message": "Генеришите приступну фразу"
+  },
+  "passwordGenerated": {
+    "message": "Лозинка генерисана"
+  },
+  "passphraseGenerated": {
+    "message": "Приступна фраза је генерисана"
+  },
+  "usernameGenerated": {
+    "message": "Корисничко име генерисано"
+  },
+  "emailGenerated": {
+    "message": "Имејл генерисан"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6893,9 @@
   "useThisPassword": {
     "message": "Употреби ову лозинку"
   },
+  "useThisPassphrase": {
+    "message": "Употреби ову приступну фразу"
+  },
   "useThisUsername": {
     "message": "Употреби ово корисничко име"
   },
@@ -8604,14 +8613,6 @@
   "deviceTrusted": {
     "message": "Уређај поуздан"
   },
-  "sendsNoItemsTitle": {
-    "message": "Нема активних Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Употребите Send да безбедно делите шифроване информације са било ким.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Позови кориснике"
   },
@@ -10553,6 +10554,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Шаљите бзбедно осетљиве информације",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Делите датотеке и податке безбедно са било ким, на било којој платформи. Ваше информације ће остати шифроване од почетка-до-краја уз ограничење изложености.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Брзо креирајте лозинке"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Лако креирајте снажне и јединствене лозинке кликом на",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "да вам помогне да задржите своје пријаве сигурно.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Лако креирајте снажне и јединствене лозинке кликом на дугме „Генерирате лозинку“ да вам помогне да чувате своје пријаве на сигурно.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Уштедите време са ауто-пуњењем"
   },
@@ -10610,5 +10636,18 @@
   },
   "clickPayWithPayPal": {
     "message": "Кликните на Pay with PayPal да бисте додали начин лпаћања."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Ако уклоните $EMAIL$, спонзорство за овај породични план ће се завршити. Седиште у вашој организацији постаће доступно за чланове или спонзорства након што је спонзорисан датум обнове организације на $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/sr_CS/messages.json b/apps/web/src/locales/sr_CS/messages.json
index 95b9348aa04..05ec916c8bb 100644
--- a/apps/web/src/locales/sr_CS/messages.json
+++ b/apps/web/src/locales/sr_CS/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generiši lozinku"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "Moj trezor"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generiši lozinku"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/sr_CY/messages.json b/apps/web/src/locales/sr_CY/messages.json
index c2901f39c15..fd566100c6d 100644
--- a/apps/web/src/locales/sr_CY/messages.json
+++ b/apps/web/src/locales/sr_CY/messages.json
@@ -1,14 +1,187 @@
 {
-  "pageTitle": {
-    "message": "$APP_NAME$ Интернет Сеф",
-    "description": "The title of the website in the browser window.",
+  "allApplications": {
+    "message": "Све апликације"
+  },
+  "appLogoLabel": {
+    "message": "Bitwarden лого"
+  },
+  "criticalApplications": {
+    "message": "Критичне апликације"
+  },
+  "noCriticalAppsAtRisk": {
+    "message": "Нема критичних апликација у ризику"
+  },
+  "accessIntelligence": {
+    "message": "Приступи интелигенцији"
+  },
+  "riskInsights": {
+    "message": "Увид у ризик"
+  },
+  "passwordRisk": {
+    "message": "Ризик од лозинке"
+  },
+  "reviewAtRiskPasswords": {
+    "message": "Прегледај ризичне лозинке (слабе, изложене или поново коришћене) у апликацијама. Изабери своје најкритичније апликације да би дао приоритет безбедносним радњама како би твоји корисници адресирали ризичне лозинке."
+  },
+  "dataLastUpdated": {
+    "message": "Подаци су последњи пут ажурирани: $DATE$",
     "placeholders": {
-      "app_name": {
+      "date": {
         "content": "$1",
-        "example": "Bitwarden"
+        "example": "2021-01-01"
       }
     }
   },
+  "notifiedMembers": {
+    "message": "Обавештени чланови"
+  },
+  "revokeMembers": {
+    "message": "Уклони чланове"
+  },
+  "restoreMembers": {
+    "message": "Врати чланове"
+  },
+  "cannotRestoreAccessError": {
+    "message": "Није могуће повратити приступ организацији"
+  },
+  "allApplicationsWithCount": {
+    "message": "Све апликације ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "createNewLoginItem": {
+    "message": "Креирајте нову ставку за пријаву"
+  },
+  "criticalApplicationsWithCount": {
+    "message": "Критичне апликације ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "notifiedMembersWithCount": {
+    "message": "Обавештени чланови ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "noAppsInOrgTitle": {
+    "message": "Није пронађена ниједна апликација у $ORG NAME$",
+    "placeholders": {
+      "org name": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "noAppsInOrgDescription": {
+    "message": "Док корисници чувају пријаве, апликације се појављују овде, приказујући све ризичне лозинке. Означите критичне апликације и обавестите кориснике да ажурирају лозинке."
+  },
+  "noCriticalAppsTitle": {
+    "message": "Нисте означили ниједну апликацију као критичну"
+  },
+  "noCriticalAppsDescription": {
+    "message": "Изаберите своје најкритичније апликације да бисте открили ризичне лозинке и обавестите кориснике да промене те лозинке."
+  },
+  "markCriticalApps": {
+    "message": "Означите критичне апликације"
+  },
+  "markAppAsCritical": {
+    "message": "Означите апликацију као критичну"
+  },
+  "applicationsMarkedAsCriticalSuccess": {
+    "message": "Апликације означене као критичне"
+  },
+  "application": {
+    "message": "Апликација"
+  },
+  "atRiskPasswords": {
+    "message": "Лозинке под ризиком"
+  },
+  "requestPasswordChange": {
+    "message": "Затражити промену лозинке"
+  },
+  "totalPasswords": {
+    "message": "Укупне лозинке"
+  },
+  "searchApps": {
+    "message": "Претражите апликације"
+  },
+  "atRiskMembers": {
+    "message": "Чланови под ризиком"
+  },
+  "atRiskMembersWithCount": {
+    "message": "Ризични чланови ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "atRiskApplicationsWithCount": {
+    "message": "Ризичне апликације ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "atRiskMembersDescription": {
+    "message": "Ови чланови се пријављују у апликације са слабим, откривеним или поново коришћеним лозинкама."
+  },
+  "atRiskMembersDescriptionNone": {
+    "message": "Нема чланова пријављена у апликације са слабим, откривеним или поново коришћеним лозинкама."
+  },
+  "atRiskApplicationsDescription": {
+    "message": "Ове апликације имају слабу, проваљену или често коришћену лозинку."
+  },
+  "atRiskApplicationsDescriptionNone": {
+    "message": "Ове апликације немају слабу, проваљену или често коришћену лозинку."
+  },
+  "atRiskMembersDescriptionWithApp": {
+    "message": "Ови чланови се пријављују у $APPNAME$ са слабим, откривеним или поново коришћеним лозинкама.",
+    "placeholders": {
+      "appname": {
+        "content": "$1",
+        "example": "Salesforce"
+      }
+    }
+  },
+  "atRiskMembersDescriptionWithAppNone": {
+    "message": "There are no at risk members for $APPNAME$.",
+    "placeholders": {
+      "appname": {
+        "content": "$1",
+        "example": "Salesforce"
+      }
+    }
+  },
+  "totalMembers": {
+    "message": "Укупно чланова"
+  },
+  "atRiskApplications": {
+    "message": "Апликације под ризиком"
+  },
+  "totalApplications": {
+    "message": "Укупно апликација"
+  },
+  "unmarkAsCriticalApp": {
+    "message": "Уклони ознаку критичне апликације"
+  },
+  "criticalApplicationSuccessfullyUnmarked": {
+    "message": "Успешно уклоњена ознака са критичне апликације"
+  },
   "whatTypeOfItem": {
     "message": "Који је ово тип елемента?"
   },
@@ -46,12 +219,104 @@
   "notes": {
     "message": "Напомене"
   },
+  "privateNote": {
+    "message": "Приватна белешка"
+  },
+  "note": {
+    "message": "Белешка"
+  },
   "customFields": {
     "message": "Прилагођена поља"
   },
   "cardholderName": {
     "message": "Име власника картице"
   },
+  "loginCredentials": {
+    "message": "Акредитиве за пријављивање"
+  },
+  "personalDetails": {
+    "message": "Личне информације"
+  },
+  "identification": {
+    "message": "Идентификација"
+  },
+  "contactInfo": {
+    "message": "Контакт инфо"
+  },
+  "cardDetails": {
+    "message": "Детаљи картице"
+  },
+  "cardBrandDetails": {
+    "message": "$BRAND$ детаљи",
+    "placeholders": {
+      "brand": {
+        "content": "$1",
+        "example": "Visa"
+      }
+    }
+  },
+  "itemHistory": {
+    "message": "Историја предмета"
+  },
+  "authenticatorKey": {
+    "message": "Кључ аутентификатора"
+  },
+  "autofillOptions": {
+    "message": "Опције Ауто-пуњења"
+  },
+  "websiteUri": {
+    "message": "Вебсајт (URI)"
+  },
+  "websiteUriCount": {
+    "message": "Сајт (URI) $COUNT$",
+    "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "websiteAdded": {
+    "message": "Вебсајт додат"
+  },
+  "addWebsite": {
+    "message": "Додај вебсајт"
+  },
+  "deleteWebsite": {
+    "message": "Обриши вебсајт"
+  },
+  "defaultLabel": {
+    "message": "Подразумевано ($VALUE$)",
+    "description": "A label that indicates the default value for a field with the current default value in parentheses.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Base domain"
+      }
+    }
+  },
+  "showMatchDetection": {
+    "message": "Прикажи откривање подударања $WEBSITE$",
+    "placeholders": {
+      "website": {
+        "content": "$1",
+        "example": "https://example.com"
+      }
+    }
+  },
+  "hideMatchDetection": {
+    "message": "Сакриј откривање подударања $WEBSITE$",
+    "placeholders": {
+      "website": {
+        "content": "$1",
+        "example": "https://example.com"
+      }
+    }
+  },
+  "autoFillOnPageLoad": {
+    "message": "Ауто-попуњавање при учитавању странице?"
+  },
   "number": {
     "message": "Број"
   },
@@ -64,6 +329,9 @@
   "securityCode": {
     "message": "Безбедносни кôд (CVV)"
   },
+  "securityCodeSlashCVV": {
+    "message": "Безбедносни кôд/CVV"
+  },
   "identityName": {
     "message": "Име идентитета"
   },
@@ -133,9 +401,18 @@
   "ms": {
     "message": "Гђа."
   },
+  "mx": {
+    "message": "Mx"
+  },
   "dr": {
     "message": "Др"
   },
+  "cardExpiredTitle": {
+    "message": "Картица је истекла"
+  },
+  "cardExpiredMessage": {
+    "message": "Ако сте је обновили, ажурирајте податке о картици"
+  },
   "expirationMonth": {
     "message": "Месец истека"
   },
@@ -145,18 +422,24 @@
   "authenticatorKeyTotp": {
     "message": "Једнократни код"
   },
+  "totpHelperTitle": {
+    "message": "Учините верификацију у 2 корака беспрекорном"
+  },
+  "totpHelper": {
+    "message": "Bitwarden може да чува и попуњава верификационе кодове у 2 корака. Копирајте и налепите кључ у ово поље."
+  },
+  "totpHelperWithCapture": {
+    "message": "Bitwarden може да чува и попуњава верификационе кодове у 2 корака. Изаберите икону камере да бисте направили снимак екрана QR кода за аутентификацију ове веб локације или копирајте и налепите кључ у ово поље."
+  },
+  "learnMoreAboutAuthenticators": {
+    "message": "Сазнајте више о аутентификаторима"
+  },
   "folder": {
     "message": "Фасцикла"
   },
-  "newCustomField": {
-    "message": "Ново прилагођено поље"
-  },
   "value": {
     "message": "Вредност"
   },
-  "dragToSort": {
-    "message": "Превуците за сортирање"
-  },
   "cfTypeText": {
     "message": "Текст"
   },
@@ -166,10 +449,19 @@
   "cfTypeBoolean": {
     "message": "Булове"
   },
+  "cfTypeCheckbox": {
+    "message": "Поље за потврду"
+  },
   "cfTypeLinked": {
     "message": "Повезано",
     "description": "This describes a field that is 'linked' (related) to another field."
   },
+  "fieldType": {
+    "message": "Врста поља"
+  },
+  "fieldLabel": {
+    "message": "Ознака поља"
+  },
   "remove": {
     "message": "Уклони"
   },
@@ -180,19 +472,48 @@
     "message": "Без фасцикле",
     "description": "This is the folder for uncategorized items"
   },
+  "selfOwnershipLabel": {
+    "message": "Ти",
+    "description": "Used as a label to indicate that the user is the owner of an item."
+  },
   "addFolder": {
     "message": "Додај фасциклу"
   },
   "editFolder": {
     "message": "Уреди фасциклу"
   },
+  "editWithName": {
+    "message": "Уредити $ITEM$: $NAME$",
+    "placeholders": {
+      "item": {
+        "content": "$1",
+        "example": "login"
+      },
+      "name": {
+        "content": "$2",
+        "example": "Social"
+      }
+    }
+  },
+  "newFolder": {
+    "message": "Нова фасцикла"
+  },
+  "folderName": {
+    "message": "Име фасцикле"
+  },
+  "folderHintText": {
+    "message": "Угнездите фасциклу додавањем имена надређене фасцкле праћеног знаком „/“. Пример: Друштвени/Форуми"
+  },
+  "deleteFolderPermanently": {
+    "message": "Да ли сте сигурни да желите да трајно избришете ову фасциклу?"
+  },
   "baseDomain": {
     "message": "Главни домен",
-    "description": "Domain name. Ex. website.com"
+    "description": "Domain name. Example: website.com"
   },
   "domainName": {
     "message": "Име домена",
-    "description": "Domain name. Ex. website.com"
+    "description": "Domain name. Example: website.com"
   },
   "host": {
     "message": "Хост",
@@ -226,9 +547,6 @@
     "message": "Пребаци проширење",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Генерисање лозинке"
-  },
   "checkPassword": {
     "message": "Проверите да ли је лозинка изложена."
   },
@@ -277,13 +595,37 @@
   "searchFavorites": {
     "message": "Претражи омиљене"
   },
-  "searchType": {
-    "message": "Претражи тип",
-    "description": "Search item type"
+  "searchLogin": {
+    "message": "Претражити пријаве",
+    "description": "Search Login type"
+  },
+  "searchCard": {
+    "message": "Претражити картице",
+    "description": "Search Card type"
+  },
+  "searchIdentity": {
+    "message": "Претражити идентитете",
+    "description": "Search Identity type"
+  },
+  "searchSecureNote": {
+    "message": "Претражити сигурносне белешке",
+    "description": "Search Secure Note type"
   },
   "searchVault": {
     "message": "Претражи сеф"
   },
+  "searchMyVault": {
+    "message": "Претражити мој сеф"
+  },
+  "searchOrganization": {
+    "message": "Претражити организацију"
+  },
+  "searchMembers": {
+    "message": "Претрага чланова"
+  },
+  "searchGroups": {
+    "message": "Претрага група"
+  },
   "allItems": {
     "message": "Све ставке"
   },
@@ -305,6 +647,9 @@
   "typeSecureNote": {
     "message": "Сигурносна белешка"
   },
+  "typeSshKey": {
+    "message": "SSH кључ"
+  },
   "typeLoginPlural": {
     "message": "Пријаве"
   },
@@ -335,6 +680,9 @@
   "fullName": {
     "message": "Пуно име"
   },
+  "address": {
+    "message": "Адреса"
+  },
   "address1": {
     "message": "Адреса 1"
   },
@@ -365,6 +713,9 @@
   "select": {
     "message": "Изабери"
   },
+  "newItem": {
+    "message": "Нова ставке"
+  },
   "addItem": {
     "message": "Додај ставку"
   },
@@ -374,6 +725,46 @@
   "viewItem": {
     "message": "Види ставку"
   },
+  "newItemHeader": {
+    "message": "Нови $TYPE$",
+    "placeholders": {
+      "type": {
+        "content": "$1",
+        "example": "login"
+      }
+    }
+  },
+  "editItemHeader": {
+    "message": "Уреди $TYPE$",
+    "placeholders": {
+      "type": {
+        "content": "$1",
+        "example": "login"
+      }
+    }
+  },
+  "viewItemType": {
+    "message": "Видети $ITEMTYPE$",
+    "placeholders": {
+      "itemtype": {
+        "content": "$1",
+        "example": "login"
+      }
+    }
+  },
+  "new": {
+    "message": "Ново/а",
+    "description": "for adding new items"
+  },
+  "item": {
+    "message": "Ставка"
+  },
+  "itemDetails": {
+    "message": "Детаљи ставке"
+  },
+  "itemName": {
+    "message": "Име ставке"
+  },
   "ex": {
     "message": "нпр.",
     "description": "Short abbreviation for 'example'."
@@ -397,6 +788,9 @@
       }
     }
   },
+  "copySuccessful": {
+    "message": "Успешно копирање"
+  },
   "copyValue": {
     "message": "Копирај вредност",
     "description": "Copy value to clipboard"
@@ -405,6 +799,13 @@
     "message": "Копирај лозинку",
     "description": "Copy password to clipboard"
   },
+  "copyPassphrase": {
+    "message": "Копирај приступну фразу",
+    "description": "Copy passphrase to clipboard"
+  },
+  "passwordCopied": {
+    "message": "Лозинка копирана"
+  },
   "copyUsername": {
     "message": "Копирај име",
     "description": "Copy username to clipboard"
@@ -421,9 +822,51 @@
     "message": "Копирај УРЛ",
     "description": "Copy URI to clipboard"
   },
+  "copyCustomField": {
+    "message": "Копирати $FIELD$",
+    "placeholders": {
+      "field": {
+        "content": "$1",
+        "example": "Custom field label"
+      }
+    }
+  },
+  "copyWebsite": {
+    "message": "Копирати вебсајт"
+  },
+  "copyNotes": {
+    "message": "Копирати белешке"
+  },
+  "copyAddress": {
+    "message": "Копирати адресу"
+  },
+  "copyPhone": {
+    "message": "Копирати телефон"
+  },
+  "copyEmail": {
+    "message": "Копирај Е-пошту"
+  },
+  "copyCompany": {
+    "message": "Копирати фирму"
+  },
+  "copySSN": {
+    "message": "Копирати број социјалног осигурања"
+  },
+  "copyPassportNumber": {
+    "message": "Копирати број пасоша"
+  },
+  "copyLicenseNumber": {
+    "message": "Копирати број лиценце"
+  },
+  "copyName": {
+    "message": "Копирати име"
+  },
   "me": {
     "message": "Ја"
   },
+  "myItems": {
+    "message": "Моји предмети"
+  },
   "myVault": {
     "message": "Мој Сеф"
   },
@@ -437,10 +880,10 @@
     "message": "Сефови"
   },
   "vaultItems": {
-    "message": "Стваке сефа"
+    "message": "Стaвке сефа"
   },
-  "moveSelectedToOrg": {
-    "message": "Премести одабрано у организацију"
+  "filter": {
+    "message": "Филтер"
   },
   "deleteSelected": {
     "message": "Избриши изабрано"
@@ -478,9 +921,6 @@
   "maxFileSize": {
     "message": "Максимална величина је 500МБ."
   },
-  "updateKey": {
-    "message": "Не можете да користите ову способност док не промените Ваш кључ за шифровање."
-  },
   "addedItem": {
     "message": "Ставка додата"
   },
@@ -500,8 +940,17 @@
       }
     }
   },
-  "movedItemsToOrg": {
-    "message": "Одабране ставке премештене у $ORGNAME$",
+  "itemsMovedToOrg": {
+    "message": "Ставке премештене у $ORGNAME$",
+    "placeholders": {
+      "orgname": {
+        "content": "$1",
+        "example": "Company Name"
+      }
+    }
+  },
+  "itemMovedToOrg": {
+    "message": "Ставка премештена у $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -545,12 +994,39 @@
   "deletedFolder": {
     "message": "Фасцикла обрисана"
   },
+  "editInfo": {
+    "message": "Измени информације"
+  },
+  "access": {
+    "message": "Приступ"
+  },
+  "accessLevel": {
+    "message": "Ниво приступа"
+  },
+  "accessing": {
+    "message": "Приступ"
+  },
   "loggedOut": {
     "message": "Одјављено"
   },
+  "loggedOutDesc": {
+    "message": "Одјављени сте са свог налога."
+  },
   "loginExpired": {
     "message": "Ваша сесија је истекла."
   },
+  "restartRegistration": {
+    "message": "Поново покрените регистрацију"
+  },
+  "expiredLink": {
+    "message": "Истекла веза"
+  },
+  "pleaseRestartRegistrationOrTryLoggingIn": {
+    "message": "Поново покрените регистрацију или покушајте да се пријавите."
+  },
+  "youMayAlreadyHaveAnAccount": {
+    "message": "Можда већ имате налог"
+  },
   "logOutConfirmation": {
     "message": "Заиста желите да се одјавите?"
   },
@@ -566,20 +1042,185 @@
   "no": {
     "message": "Не"
   },
+  "location": {
+    "message": "Локација"
+  },
   "loginOrCreateNewAccount": {
     "message": "Пријавите се или креирајте нови налог за приступ Сефу."
   },
+  "loginWithDevice": {
+    "message": "Пријавите се са уређајем"
+  },
+  "loginWithDeviceEnabledNote": {
+    "message": "Пријава помоћу уређаја мора бити подешена у подешавањима Bitwarden апликације. Потребна је друга опција?"
+  },
+  "needAnotherOptionV1": {
+    "message": "Треба Вам друга опције?"
+  },
+  "loginWithMasterPassword": {
+    "message": "Пријавите се са главном лозинком"
+  },
+  "readingPasskeyLoading": {
+    "message": "Читање притупачног кључа..."
+  },
+  "readingPasskeyLoadingInfo": {
+    "message": "Држите овај прозор отворен и пратите упутства из прегледача."
+  },
+  "useADifferentLogInMethod": {
+    "message": "Користи други начин пријављивања"
+  },
+  "logInWithPasskey": {
+    "message": "Пријавите се са приступним кључем"
+  },
+  "useSingleSignOn": {
+    "message": "Употребити једнократну пријаву"
+  },
+  "welcomeBack": {
+    "message": "Добродошли назад"
+  },
+  "invalidPasskeyPleaseTryAgain": {
+    "message": "Неважећи приступни кључ. Молим вас, покушајте поново."
+  },
+  "twoFactorForPasskeysNotSupportedOnClientUpdateToLogIn": {
+    "message": "2FA за приступни кључ није подржано. Надоградити апликацјиу за пријаву."
+  },
+  "loginWithPasskeyInfo": {
+    "message": "Користите генерисан passkey који ће вас аутоматски пријавити без лозинке. Биометрија, као што је препознавање лица или отисак прста, или неки други FIDO2 метод за проверу идентитета."
+  },
+  "newPasskey": {
+    "message": "Нов приступни кључ"
+  },
+  "learnMoreAboutPasswordless": {
+    "message": "Сазнајте више о пријављивању без лозинке"
+  },
+  "creatingPasskeyLoading": {
+    "message": "Прављење приступалном гључа..."
+  },
+  "creatingPasskeyLoadingInfo": {
+    "message": "Држите овај прозор отворен и пратите упутства из прегледача."
+  },
+  "errorCreatingPasskey": {
+    "message": "Грешка у креацији приступног кључа"
+  },
+  "errorCreatingPasskeyInfo": {
+    "message": "Дошло је до проблема приликом креирања вашег приступног кључа."
+  },
+  "passkeySuccessfullyCreated": {
+    "message": "Приступни кључ је успешно креиран!"
+  },
+  "customPasskeyNameInfo": {
+    "message": "Именујте Ваш приступни кључ за лакшу идентификацију."
+  },
+  "useForVaultEncryption": {
+    "message": "Користи се за шифровање сефа"
+  },
+  "useForVaultEncryptionInfo": {
+    "message": "Пријавите се и откључајте на подржаним уређајима без ваше главне лозинке. Пратите упутства из прегледача да бисте завршили подешавање."
+  },
+  "useForVaultEncryptionErrorReadingPasskey": {
+    "message": "Грешка при читању кључа. Покушајте поново или опозовите избор ове опције."
+  },
+  "encryptionNotSupported": {
+    "message": "Шифровање није подржано"
+  },
+  "enablePasskeyEncryption": {
+    "message": "Подесити шифровање"
+  },
+  "usedForEncryption": {
+    "message": "Употребљено за шифровање"
+  },
+  "loginWithPasskeyEnabled": {
+    "message": "Пријављивање са упаљеним приступчним кључем"
+  },
+  "passkeySaved": {
+    "message": "„$NAME$“ сачувано",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Personal yubikey"
+      }
+    }
+  },
+  "passkeyRemoved": {
+    "message": "Приступни кључ је уклоњен"
+  },
+  "removePasskey": {
+    "message": "Уклонити приступни кључ"
+  },
+  "removePasskeyInfo": {
+    "message": "Ако су сви приступни кључеви уклоњени, нећете моћи да се пријавите на нове уређаје без ваше главне лозинке."
+  },
+  "passkeyLimitReachedInfo": {
+    "message": "Достугнут лимит приступног кључа. Уклонити један да би додали други."
+  },
+  "tryAgain": {
+    "message": "Покушај поново"
+  },
   "createAccount": {
     "message": "Креирај налог"
   },
+  "newToBitwarden": {
+    "message": "Нови сте у Bitwarden-у?"
+  },
+  "setAStrongPassword": {
+    "message": "Поставите јаку лозинку"
+  },
+  "finishCreatingYourAccountBySettingAPassword": {
+    "message": "Завршите креирање налога постављањем лозинке"
+  },
+  "newAroundHere": {
+    "message": "Нов овде?"
+  },
+  "startTrial": {
+    "message": "Почетак пробе"
+  },
   "logIn": {
     "message": "Пријавите се"
   },
+  "logInToBitwarden": {
+    "message": "Пријавите се на Bitwarden"
+  },
+  "enterTheCodeSentToYourEmail": {
+    "message": "Унесите кôд послат на ваш имејл"
+  },
+  "enterTheCodeFromYourAuthenticatorApp": {
+    "message": "Унесите кôд из апликације за аутентификацију"
+  },
+  "pressYourYubiKeyToAuthenticate": {
+    "message": "Стисните Ваш YubiKey за аутентификацију"
+  },
+  "authenticationTimeout": {
+    "message": "Истекло је време аутентификације"
+  },
+  "authenticationSessionTimedOut": {
+    "message": "Истекло је време сесије за аутентификацију. Молим вас покрените процес пријаве поново."
+  },
+  "verifyYourIdentity": {
+    "message": "Потврдите идентитет"
+  },
+  "weDontRecognizeThisDevice": {
+    "message": "Не препознајемо овај уређај. Унесите код послат на адресу ваше електронске поште да би сте потврдили ваш идентитет."
+  },
+  "continueLoggingIn": {
+    "message": "Настави са пријављивањем"
+  },
+  "whatIsADevice": {
+    "message": "Шта је уређај?"
+  },
+  "aDeviceIs": {
+    "message": "Уређај је јединствена инсталација Bitwarden апликације на коју сте се пријавили. Поновно инсталирање, брисање података апликације или брисање колачића може довести до тога да се уређај појави више пута."
+  },
+  "logInInitiated": {
+    "message": "Пријава је покренута"
+  },
+  "logInRequestSent": {
+    "message": "Захтев је послат"
+  },
   "submit": {
     "message": "Пошаљи"
   },
   "emailAddressDesc": {
-    "message": "Користите ваш имејл за пријављивање."
+    "message": "Користи твоју Е-пошту за пријављивање."
   },
   "yourName": {
     "message": "Ваше име"
@@ -593,6 +1234,9 @@
   "masterPassDesc": {
     "message": "Главна Лозинка је лозинка коју користите за приступ Вашем сефу. Врло је важно да је не заборавите. Не постоји начин да повратите лозинку у случају да је заборавите."
   },
+  "masterPassImportant": {
+    "message": "Главне лозинке се не могу повратити ако их заборавите!"
+  },
   "masterPassHintDesc": {
     "message": "Савет Главне Лозинке може да Вам помогне да се је потсетите ако је заборавите."
   },
@@ -602,32 +1246,64 @@
   "masterPassHint": {
     "message": "Савет Главне Лозинке (опционо)"
   },
+  "newMasterPassHint": {
+    "message": "Савет за нову главну лозинку (опционо)"
+  },
   "masterPassHintLabel": {
     "message": "Савет Главне Лозинке"
   },
+  "masterPassHintText": {
+    "message": "Ако заборавиш лозинку, наговештај за лозинку се може послати на твоју Е-пошту. $CURRENT$/$MAXIMUM$ карактера максимум.",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "maximum": {
+        "content": "$2",
+        "example": "50"
+      }
+    }
+  },
   "settings": {
     "message": "Подешавања"
   },
-  "passwordHint": {
-    "message": "Помоћ за лозинку"
+  "accountEmail": {
+    "message": "Е-пошта налога"
   },
-  "enterEmailToGetHint": {
-    "message": "Унесите Ваш имејл да би добили савет за Вашу Главну Лозинку."
+  "requestHint": {
+    "message": "Захтевај савет"
+  },
+  "requestPasswordHint": {
+    "message": "Затражити савет лозинке"
+  },
+  "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
+    "message": "Унеси адресу Е-поште свог налога и биће ти послат савет за лозинку"
   },
   "getMasterPasswordHint": {
     "message": "Добити савет за Главну Лозинку"
   },
   "emailRequired": {
-    "message": "Имејл је неопходан."
+    "message": "Адреса Е-поште је неопходна."
   },
   "invalidEmail": {
-    "message": "Неисправан имејл."
+    "message": "Нетачна адреса Е-поште."
   },
-  "masterPassRequired": {
+  "masterPasswordRequired": {
     "message": "Главна Лозинка је неопходна."
   },
-  "masterPassLength": {
-    "message": "Главна Лозинка треба имати бар 8 знака."
+  "confirmMasterPasswordRequired": {
+    "message": "Поновно уписивање главне лозинке је неопходно."
+  },
+  "masterPasswordMinlength": {
+    "message": "Главна лозинка мора бити дужине најмање $VALUE$ карактера.",
+    "description": "The Master Password must be at least a specific number of characters long.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "8"
+      }
+    }
   },
   "masterPassDoesntMatch": {
     "message": "Потврђена Главна Лозинка се не подудара."
@@ -635,17 +1311,35 @@
   "newAccountCreated": {
     "message": "Ваш налог је креиран! Сада се можте пријавити."
   },
+  "newAccountCreated2": {
+    "message": "Ваш нови налог је направљен!"
+  },
+  "youHaveBeenLoggedIn": {
+    "message": "Пријављени сте!"
+  },
+  "trialAccountCreated": {
+    "message": "Налог је успешно направљен."
+  },
   "masterPassSent": {
     "message": "Послали смо Вам поруку са саветом главне лозинке."
   },
   "unexpectedError": {
     "message": "Дошло је до неочекиване грешке."
   },
-  "emailAddress": {
-    "message": "Имејл"
+  "expirationDateError": {
+    "message": "Изаберите датум истека који је у будућности."
   },
-  "yourVaultIsLocked": {
-    "message": "Сеф је блокиран. Унесите главну лозинку за наставак."
+  "emailAddress": {
+    "message": "Адреса Е-поште"
+  },
+  "yourVaultIsLockedV2": {
+    "message": "Ваш сеф је блокиран"
+  },
+  "yourAccountIsLocked": {
+    "message": "Ваш налог је закључан"
+  },
+  "uuid": {
+    "message": "UUID"
   },
   "unlock": {
     "message": "Откључај"
@@ -666,12 +1360,21 @@
   "invalidMasterPassword": {
     "message": "Погрешна главна лозинка"
   },
+  "invalidFilePassword": {
+    "message": "Неважећа лозинка за датотеку, користите лозинку коју сте унели када сте креирали датотеку за извоз."
+  },
   "lockNow": {
     "message": "Закључај одмах"
   },
   "noItemsInList": {
     "message": "Нама ставке у листи."
   },
+  "noPermissionToViewAllCollectionItems": {
+    "message": "Немате дозволу да видите све ставке у овој колекцији."
+  },
+  "youDoNotHavePermissions": {
+    "message": "Немате дозволе за ову колекцију"
+  },
   "noCollectionsInList": {
     "message": "Нема колекције у листи."
   },
@@ -681,6 +1384,9 @@
   "noUsersInList": {
     "message": "Нема корисника у листи."
   },
+  "noMembersInList": {
+    "message": "Нема чланова за приказивање."
+  },
   "noEventsInList": {
     "message": "Нема догађаја у листи."
   },
@@ -690,6 +1396,42 @@
   "noOrganizationsList": {
     "message": "Не припадате ниједној организацији. Организације вам омогућавају да безбедно делите ставке са другим корисницима."
   },
+  "notificationSentDevice": {
+    "message": "Обавештење је послато на ваш уређај."
+  },
+  "notificationSentDevicePart1": {
+    "message": "Откључај Bitwarden на твом уређају или на "
+  },
+  "areYouTryingToAccessYourAccount": {
+    "message": "Да ли покушавате да приступите вашем налогу?"
+  },
+  "accessAttemptBy": {
+    "message": "Покушај приступа са $EMAIL$",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
+  "confirmAccess": {
+    "message": "Потврди приступ"
+  },
+  "denyAccess": {
+    "message": "Одбиј приступ"
+  },
+  "notificationSentDeviceAnchor": {
+    "message": "веб апликација"
+  },
+  "notificationSentDevicePart2": {
+    "message": "Потврдите да се фраза отиска прста поклапа са овом испод пре одобравања."
+  },
+  "notificationSentDeviceComplete": {
+    "message": "Октључај Bitwarden на твом уређају. Потврдите да се фраза отиска прста поклапа са овом испод пре одобравања."
+  },
+  "aNotificationWasSentToYourDevice": {
+    "message": "Обавештење је послато на ваш уређај"
+  },
   "versionNumber": {
     "message": "Верзија $VERSION_NUMBER$",
     "placeholders": {
@@ -699,20 +1441,8 @@
       }
     }
   },
-  "enterVerificationCodeApp": {
-    "message": "Унесите шестоцифрени верификациони код из апликације за утврђивање аутентичности."
-  },
-  "enterVerificationCodeEmail": {
-    "message": "Унесите шестоцифрени верификациони код који је послан на $EMAIL$.",
-    "placeholders": {
-      "email": {
-        "content": "$1",
-        "example": "example@gmail.com"
-      }
-    }
-  },
   "verificationCodeEmailSent": {
-    "message": "Провера имејла послата на $EMAIL$.",
+    "message": "Е-пошта за верификацију је послата на $EMAIL$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -720,17 +1450,15 @@
       }
     }
   },
-  "rememberMe": {
-    "message": "Запамти ме"
+  "dontAskAgainOnThisDeviceFor30Days": {
+    "message": "Не питајте поново на овом уређају 30 дана"
   },
-  "sendVerificationCodeEmailAgain": {
-    "message": "Поново послати верификациони код на имејл"
+  "selectAnotherMethod": {
+    "message": "Изаберите другу методу",
+    "description": "Select another two-step login method"
   },
-  "useAnotherTwoStepMethod": {
-    "message": "Користите другу методу пријављивања у два корака"
-  },
-  "insertYubiKey": {
-    "message": "Убаците свој YubiKey у УСБ порт рачунара, а затим додирните његово дугме."
+  "useYourRecoveryCode": {
+    "message": "Употребите шифру за опоравак"
   },
   "insertU2f": {
     "message": "Убаците свој сигурносни кључ у УСБ порт рачунара, и ако има дугме, додирните га."
@@ -747,6 +1475,9 @@
   "twoStepOptions": {
     "message": "Опције дво-коракне пријаве"
   },
+  "selectTwoStepLoginMethod": {
+    "message": "Одабрати методу пријављивања у два корака"
+  },
   "recoveryCodeDesc": {
     "message": "Изгубили сте приступ свим својим двофакторским добављачима? Употребите код за опоравак да онемогућите све двофакторске добављаче из налога."
   },
@@ -756,18 +1487,18 @@
   "authenticatorAppTitle": {
     "message": "Апликација Аутентификатор"
   },
-  "authenticatorAppDesc": {
-    "message": "Користите апликацију за аутентификацију (као што је Authy или Google Authenticator) за генерисање верификационих кодова.",
-    "description": "'Authy' and 'Google Authenticator' are product names and should not be translated."
+  "authenticatorAppDescV2": {
+    "message": "Унесите кôд који генерише апликација за аутентификацију као што је Bitwarden Authenticator.",
+    "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
-  "yubiKeyTitle": {
-    "message": "YubiKey OTP сигурносни кључ"
+  "yubiKeyTitleV2": {
+    "message": "Yubico OTP сигурносни кључ"
   },
   "yubiKeyDesc": {
     "message": "Користите YubiKey за приступ налогу. Ради са YubiKey 4 и 5, и NEO уређаје."
   },
-  "duoDesc": {
-    "message": "Провери са Duo Security користећи Duo Mobile апликацију, СМС, телефонски позив, или U2F кључ.",
+  "duoDescV2": {
+    "message": "Унесите кôд који је генерисао Duo Security.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
@@ -789,11 +1520,14 @@
   "webAuthnMigrated": {
     "message": "(Мигрирао из FIDO)"
   },
+  "openInNewTab": {
+    "message": "Отвори у новом језичку"
+  },
   "emailTitle": {
     "message": "Е-пошта"
   },
-  "emailDesc": {
-    "message": "Верификациони кодови ће вам бити послати имејлом."
+  "emailDescV2": {
+    "message": "Унесите код послат на вашу е-пошту."
   },
   "continue": {
     "message": "Настави"
@@ -807,9 +1541,6 @@
   "moveToOrgDesc": {
     "message": "Изаберите организацију коју желите да преместите овај предмет. Прелазак на организацију преноси власништво над ставком у ту организацију. Више нећете бити директни власник ове ставке након што је премештена."
   },
-  "moveManyToOrgDesc": {
-    "message": "Изаберите организацију коју желите да преместите ове ставке. Прелазак на организацију преноси власништво над ставкама у ту организацију. Више нећете бити директни власник ове ставки након што су премештене."
-  },
   "collectionsDesc": {
     "message": "Уредите колекције са којима се ова ставка дели. Само корисници организације који имају приступ овим колекцијама моћи ће да виде ову ставку."
   },
@@ -822,8 +1553,8 @@
       }
     }
   },
-  "moveSelectedItemsDesc": {
-    "message": "Изаберите фасциклу у коју желите да преместите одабране $COUNT$ ставке.",
+  "deleteSelectedCollectionsDesc": {
+    "message": "$COUNT$ колекција/е ће бити трајно избрисана/е.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -831,20 +1562,15 @@
       }
     }
   },
-  "moveSelectedItemsCountDesc": {
-    "message": "Одабрали сте $COUNT$ ставку(и). $MOVEABLE_COUNT$ ставка(и) може да се преместе у организацију, $NONMOVEABLE_COUNT$ не.",
+  "deleteSelectedConfirmation": {
+    "message": "Желите ли заиста да наставите?"
+  },
+  "moveSelectedItemsDesc": {
+    "message": "Изаберите фасциклу коју желите да додате $COUNT$ изабраним ставкама.",
     "placeholders": {
       "count": {
         "content": "$1",
-        "example": "10"
-      },
-      "moveable_count": {
-        "content": "$2",
-        "example": "8"
-      },
-      "nonmoveable_count": {
-        "content": "$3",
-        "example": "2"
+        "example": "150"
       }
     }
   },
@@ -854,15 +1580,30 @@
   "copyVerificationCode": {
     "message": "Копирај верификациони код"
   },
+  "copyUuid": {
+    "message": "Копирај UUID"
+  },
+  "errorRefreshingAccessToken": {
+    "message": "Грешка при освежавању токена приступа"
+  },
+  "errorRefreshingAccessTokenDesc": {
+    "message": "Није пронађен токен за освежавање или АПИ кључеви. Покушајте да се одјавите и поново пријавите."
+  },
   "warning": {
     "message": "Упозорење"
   },
   "confirmVaultExport": {
     "message": "Потврдите извоз сефа"
   },
+  "confirmSecretsExport": {
+    "message": "Потврдите извоз тајни"
+  },
   "exportWarningDesc": {
     "message": "Овај извоз садржи податке сефа у нешифрираном формату. Не бисте смели да сачувате или шаљете извезену датотеку преко несигурних канала (као што је имејл). Избришите датотеку одмах након што завршите са коришћењем."
   },
+  "exportSecretsWarningDesc": {
+    "message": "Овај извоз садржи тајне податке у нешифрираном формату. Не бисте смели да сачувате или шаљете извезену датотеку преко несигурних канала (као што је имејл). Избришите датотеку одмах након што завршите са коришћењем."
+  },
   "encExportKeyWarningDesc": {
     "message": "Овај извоз шифрује податке користећи кључ за шифровање вашег налога. Ако икада промените кључ за шифровање свог налога, требало би да поново извезете, јер нећете моћи да дешифрујете овај извоз."
   },
@@ -872,12 +1613,60 @@
   "export": {
     "message": "Извези"
   },
+  "exportFrom": {
+    "message": "Извоз од"
+  },
   "exportVault": {
     "message": "Извоз сефа"
   },
+  "exportSecrets": {
+    "message": "Извоз тајне"
+  },
   "fileFormat": {
     "message": "Формат датотеке"
   },
+  "fileEncryptedExportWarningDesc": {
+    "message": "Овај извоз ће бити заштићен лозинком и захтеваће лозинку датотеке за дешифровање."
+  },
+  "exportPasswordDescription": {
+    "message": "Ова лозинка ће се користити за извоз и увоз ове датотеке"
+  },
+  "confirmMasterPassword": {
+    "message": "Потрдити Главну Лозинку"
+  },
+  "confirmFormat": {
+    "message": "Потврдити формат"
+  },
+  "filePassword": {
+    "message": "Лозинка датотеке"
+  },
+  "confirmFilePassword": {
+    "message": "Потврдити лозинку датотеке"
+  },
+  "accountRestrictedOptionDescription": {
+    "message": "Користите кључ за шифровање вашег налога, изведен из корисничког имена и главне лозинке, да шифрујете извоз и ограничите увоз само на тренутни Bitwarden налог."
+  },
+  "passwordProtectedOptionDescription": {
+    "message": "Подесите лозинку за шифровање извоза и увоз у било који Bitwarden налог користећи лозинку за дешифровање."
+  },
+  "exportTypeHeading": {
+    "message": "Тип извоза"
+  },
+  "accountRestricted": {
+    "message": "Налог је ограничен"
+  },
+  "passwordProtected": {
+    "message": "Заштићено лозинком"
+  },
+  "filePasswordAndConfirmFilePasswordDoNotMatch": {
+    "message": "Унете лозинке се не подударају."
+  },
+  "confirmVaultImport": {
+    "message": "Потврдите увоз сефа"
+  },
+  "confirmVaultImportDesc": {
+    "message": "Ова датотека је заштићена лозинком. Унесите лозинку датотеке да бисте увезли податке."
+  },
   "exportSuccess": {
     "message": "Податци сефа су извежени."
   },
@@ -892,27 +1681,33 @@
   },
   "minSpecial": {
     "message": "Минимално Специјално",
-    "description": "Minimum Special Characters"
+    "description": "Minimum special characters"
   },
   "ambiguous": {
-    "message": "Избегавај двосмислене карактере"
+    "message": "Избегавај двосмислене карактере",
+    "description": "deprecated. Use avoidAmbiguous instead."
   },
-  "regeneratePassword": {
-    "message": "Поново генериши лозинку"
+  "avoidAmbiguous": {
+    "message": "Избегавај двосмислене карактере",
+    "description": "Label for the avoid ambiguous characters checkbox."
   },
   "length": {
     "message": "Дужина"
   },
+  "passwordMinLength": {
+    "message": "Минимална дужина лозинке"
+  },
   "uppercase": {
     "message": "Велика слова (A-Z)",
-    "description": "Include uppercase letters in the password generator."
+    "description": "deprecated. Use uppercaseLabel instead."
   },
   "lowercase": {
     "message": "Мала слова (a-z)",
-    "description": "Include lowercase letters in the password generator."
+    "description": "deprecated. Use lowercaseLabel instead."
   },
   "numbers": {
-    "message": "Цифре (0-9)"
+    "message": "Цифре (0-9)",
+    "description": "deprecated. Use numbersLabel instead."
   },
   "specialCharacters": {
     "message": "Специјална слова (!@#$%^&*)"
@@ -925,20 +1720,42 @@
   },
   "capitalize": {
     "message": "Прво слово велико",
-    "description": "Make the first letter of a work uppercase."
+    "description": "Make the first letter of a word uppercase."
   },
   "includeNumber": {
     "message": "Убаци број"
   },
+  "generatorPolicyInEffect": {
+    "message": "Захтеви политике предузећа су примењени на опције генератора.",
+    "description": "Indicates that a policy limits the credential generator screen."
+  },
   "passwordHistory": {
     "message": "Историја Лозинке"
   },
+  "generatorHistory": {
+    "message": "Генератор историје"
+  },
+  "clearGeneratorHistoryTitle": {
+    "message": "Испразнити генератор историје"
+  },
+  "cleargGeneratorHistoryDescription": {
+    "message": "Ако наставите, сви уноси ће бити трајно избрисани из генератора историје. Да ли сте сигурни да желите да наставите?"
+  },
   "noPasswordsInList": {
     "message": "Нама лозинке у листи."
   },
+  "clearHistory": {
+    "message": "Обриши историју"
+  },
+  "nothingToShow": {
+    "message": "Ништа да се покаже"
+  },
+  "nothingGeneratedRecently": {
+    "message": "Недавно нисте ништа генерисали"
+  },
   "clear": {
     "message": "Очисти",
-    "description": "To clear something out. example: To clear browser history."
+    "description": "To clear something out. Example: To clear browser history."
   },
   "accountUpdated": {
     "message": "Налог ажуриран"
@@ -967,12 +1784,21 @@
   "loggedOutWarning": {
     "message": "Ако наставите, одјавићете се са тренутне сесије, што захтева поновно пријављивање. Активне сесије на другим уређајима могу да остану активне до једног сата."
   },
+  "changePasswordWarning": {
+    "message": "Након промене лозинке, мораћете да се пријавите са новом лозинком. Активне сесије на другим уређајима биће одјављене у року од једног сата."
+  },
   "emailChanged": {
     "message": "Имејл промењен"
   },
   "logBackIn": {
     "message": "Молимо да се поново пријавите."
   },
+  "currentSession": {
+    "message": "Тренутна сесија"
+  },
+  "requestPending": {
+    "message": "Захтев је на чекању"
+  },
   "logBackInOthersToo": {
     "message": "Молимо вас да се поново пријавите. Ако користите друге Bitwarden апликације, одјавите се и вратите се и на њих."
   },
@@ -1018,6 +1844,19 @@
       }
     }
   },
+  "kdfMemory": {
+    "message": "KDF меморија (МБ)",
+    "description": "Memory refers to computer memory (RAM). MB is short for megabytes."
+  },
+  "argon2Warning": {
+    "message": "Постављање превисоких KDF итерација, меморија и паралелизам може резултирати лошим перформансама приликом пријављивања (и откључавања) Bitwarden-а на старим уређајима или са споријим процесорима. Препоручујемо вам да промените вредност у корацима, а затим тестирате све своје уређаје."
+  },
+  "kdfParallelism": {
+    "message": "KDF паралелизам"
+  },
+  "argon2Desc": {
+    "message": "Веће KDF итерације, меморија и паралелизам могу помоћи у заштити ваше главне лозинке од грубе присиле од стране нападача."
+  },
   "changeKdf": {
     "message": "Променити KDF"
   },
@@ -1027,9 +1866,6 @@
   "dangerZone": {
     "message": "Опасна зона"
   },
-  "dangerZoneDesc": {
-    "message": "Пажљиво, ове акције су крајне!"
-  },
   "deauthorizeSessions": {
     "message": "Одузели овлашћење сесије"
   },
@@ -1039,9 +1875,39 @@
   "deauthorizeSessionsWarning": {
     "message": "Наставак ће вас такође одјавити из тренутне сесије, што захтева поновно пријављивање. Од вас ће такође бити затражено да се поново пријавите у два корака, ако је омогућено. Активне сесије на другим уређајима могу да остану активне још један сат."
   },
+  "newDeviceLoginProtection": {
+    "message": "Пријава на новом уређају"
+  },
+  "turnOffNewDeviceLoginProtection": {
+    "message": "Искључи заштиту пријаве на новом уређају"
+  },
+  "turnOnNewDeviceLoginProtection": {
+    "message": "Укључи заштиту пријаве на новом уређају"
+  },
+  "turnOffNewDeviceLoginProtectionModalDesc": {
+    "message": "Наставите доле да бисте искључили верификационе имејлове које Bitwarden шаље када се пријавите са новог уређаја."
+  },
+  "turnOnNewDeviceLoginProtectionModalDesc": {
+    "message": "Наставите доле да бисте Bitwarden Ва- шаље верификационе имејлове када се пријавите са новог уређаја."
+  },
+  "turnOffNewDeviceLoginProtectionWarning": {
+    "message": "Ако је заштита нових пријава искључена, је било ко са вашом главном лозинком може приступити вашем налогу са било којег уређаја. Да бисте заштитили свој рачун без верификационих имејлова, поставите пријаву у два корака."
+  },
+  "accountNewDeviceLoginProtectionSaved": {
+    "message": "Промене нових уређаји за заштиту пријаве су сачуване"
+  },
   "sessionsDeauthorized": {
     "message": "Одузето овлашћење свих сесија"
   },
+  "accountIsOwnedMessage": {
+    "message": "Овај налого припада $ORGANIZATIONNAME$",
+    "placeholders": {
+      "organizationName": {
+        "content": "$1",
+        "example": "Organization"
+      }
+    }
+  },
   "purgeVault": {
     "message": "Испрани Сеф"
   },
@@ -1078,8 +1944,11 @@
   "accountDeletedDesc": {
     "message": "Ваш налог је затворен и сви повезани подаци су избрисани."
   },
+  "deleteOrganizationWarning": {
+    "message": "Брисање организације је трајно. Не може се поништити."
+  },
   "myAccount": {
-    "message": "Мој Налог"
+    "message": "Мој налог"
   },
   "tools": {
     "message": "Алатке"
@@ -1087,6 +1956,26 @@
   "importData": {
     "message": "Увези податке"
   },
+  "onboardingImportDataDetailsPartOne": {
+    "message": "Ако немате податке за увоз, можете креирати ",
+    "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
+  },
+  "onboardingImportDataDetailsLink": {
+    "message": "нову ставку",
+    "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
+  },
+  "onboardingImportDataDetailsLoginLink": {
+    "message": "нова пријава",
+    "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new login instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
+  },
+  "onboardingImportDataDetailsPartTwoNoOrgs": {
+    "message": " уместо.",
+    "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead."
+  },
+  "onboardingImportDataDetailsPartTwoWithOrgs": {
+    "message": " уместо. Можда ћете морати да сачекате док администратор не потврди чланство.",
+    "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. You may need to wait until your administrator confirms your organization membership."
+  },
   "importError": {
     "message": "Грешка при увозу"
   },
@@ -1096,6 +1985,18 @@
   "importSuccess": {
     "message": "Подаци су успешно увезени у ваш сеф."
   },
+  "importSuccessNumberOfItems": {
+    "message": "$AMOUNT$ ставке/и су увезене.",
+    "placeholders": {
+      "amount": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "dataExportSuccess": {
+    "message": "Подаци су успешно извезени"
+  },
   "importWarning": {
     "message": "Увозите податке у $ORGANIZATION$. Ваши подаци могу бити подељени са члановима ове организације. Да ли желите да наставите?",
     "placeholders": {
@@ -1114,12 +2015,43 @@
   "importEncKeyError": {
     "message": "Грешка у дешифрирању извозне датотеке. Ваш кључ за шифровање не одговара кључу који се користио за извоз података."
   },
+  "destination": {
+    "message": "Одредиште"
+  },
+  "learnAboutImportOptions": {
+    "message": "Сазнајте више о опцијама увоза"
+  },
+  "selectImportFolder": {
+    "message": "Изабери фасциклу"
+  },
+  "selectImportCollection": {
+    "message": "Изабери колекцију"
+  },
+  "importTargetHint": {
+    "message": "Изаберите ову опцију ако желите да се садржај увезене датотеке премести у $DESTINATION$",
+    "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.",
+    "placeholders": {
+      "destination": {
+        "content": "$1",
+        "example": "folder or collection"
+      }
+    }
+  },
+  "importUnassignedItemsError": {
+    "message": "Датотека садржи недодељене ставке."
+  },
   "selectFormat": {
     "message": "Одабрати формат датотеке за увоз"
   },
   "selectImportFile": {
     "message": "Одабрати датотеку за увоз"
   },
+  "chooseFile": {
+    "message": "Изабери датотеку"
+  },
+  "noFileChosen": {
+    "message": "Није изабрана ниједна датотека"
+  },
   "orCopyPasteFileContents": {
     "message": "или копирајте/налепите садржај датотеке за увоз"
   },
@@ -1151,25 +2083,11 @@
   "languageDesc": {
     "message": "Променити језик за Сеф."
   },
-  "disableIcons": {
-    "message": "Угаси иконице сајта"
+  "enableFavicon": {
+    "message": "Прикажи иконе сајтова"
   },
-  "disableIconsDesc": {
-    "message": "Иконе веб сајта пружају препознатљиву слику поред сваке пријаву у сефу."
-  },
-  "enableGravatars": {
-    "message": "Омогући Gravatar",
-    "description": "'Gravatar' is the name of a service. See www.gravatar.com"
-  },
-  "enableGravatarsDesc": {
-    "message": "Користите слике аватара учитане са gravatar.com."
-  },
-  "enableFullWidth": {
-    "message": "Упали пуни ширину распореда",
-    "description": "Allows scaling the web vault UI's width"
-  },
-  "enableFullWidthDesc": {
-    "message": "Дозволите веб сефу да користи пуну ширину прозора прегледача."
+  "faviconDesc": {
+    "message": "Прикажи препознатљиву иконицу поред сваке ставке за пријаву."
   },
   "default": {
     "message": "Подразумевано"
@@ -1216,15 +2134,46 @@
   "twoStepLogin": {
     "message": "Дво-коракна лозинка"
   },
+  "twoStepLoginEnforcement": {
+    "message": "Спровођење пријаве у два корака"
+  },
   "twoStepLoginDesc": {
     "message": "Заштитите свој налог захтевањем додатног корака приликом пријављивања."
   },
-  "twoStepLoginOrganizationDesc": {
-    "message": "Захтевајте пријаву у два корака за кориснике ваше организације конфигурисањем добављача на нивоу организације."
+  "twoStepLoginTeamsDesc": {
+    "message": "Омогућите пријаву у два корака за вашу организацију."
+  },
+  "twoStepLoginEnterpriseDescStart": {
+    "message": "Примени Bitwarden опције за пријаву у два корака за чланове користећи ",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enforce Bitwarden Two-step Login options for members by using the Two-step Login Policy.'"
+  },
+  "twoStepLoginPolicy": {
+    "message": "Опције дво-коракне политике"
+  },
+  "twoStepLoginOrganizationDuoDesc": {
+    "message": "Да бисте спровели пријаву у два корака Duoупотребите опције испод."
+  },
+  "twoStepLoginOrganizationSsoDesc": {
+    "message": "Ако сте поставили SSO или планирате, Пријава у два корака је можда већ принуђена преко вашег добављача идентитета."
   },
   "twoStepLoginRecoveryWarning": {
     "message": "Омогућавање пријаве у два корака може вас трајно закључати са вашег Bitwarden-а налога. Код за опоравак омогућава вам приступ вашем налогу у случају да више не можете да користите свог уобичајеног добављача услуге пријављивања у два корака (нпр. ако изгубите уређај). Подршка Bitwarden-а неће вам моћи помоћи ако изгубите приступ свом налогу. Препоручујемо да запишете или одштампате код за опоравак и сачувате га на сигурном месту."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Уклоните тип ставке картице"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Не дозволите члановима да креирају врсте предмета картице. Постојеће картице ће се аутоматски уклонити."
+  },
+  "restrictCardTypeImport": {
+    "message": "Не могу увозити врсте картица"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Политика која је поставила 1 или више организација спречава вас да се увозе картице у сефу."
+  },
+  "yourSingleUseRecoveryCode": {
+    "message": "Ваш јединствени кôд за опоравак може се користити за искључивање у два корака у случају да изгубите приступ свом двоструком провајдеру пријаве. Bitwarden препоручује да запишете кôд за опоравак и држите га на сигурном месту."
+  },
   "viewRecoveryCode": {
     "message": "Погледати шифру за опоравак"
   },
@@ -1238,9 +2187,12 @@
   "enabled": {
     "message": "Омогућено"
   },
+  "restoreAccess": {
+    "message": "Врати притуп"
+  },
   "premium": {
     "message": "Премијум",
-    "description": "Premium Membership"
+    "description": "Premium membership"
   },
   "premiumMembership": {
     "message": "Премијум чланство"
@@ -1260,44 +2212,80 @@
   "manage": {
     "message": "Управљати"
   },
+  "manageCollection": {
+    "message": "Управљај колекцијом"
+  },
+  "viewItems": {
+    "message": "Прикажи ставке"
+  },
+  "viewItemsHidePass": {
+    "message": "Прикажи ставке, сакривене лозинке"
+  },
+  "editItems": {
+    "message": "Уреди ставке"
+  },
+  "editItemsHidePass": {
+    "message": "Уреди ставке, сакривене лозинке"
+  },
   "disable": {
     "message": "Онемогући"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Детаљи чланова нису пронађени."
+  },
+  "revokeAccess": {
+    "message": "Опозови Приступ"
+  },
+  "revoke": {
+    "message": "Опозови"
+  },
   "twoStepLoginProviderEnabled": {
     "message": "Овај добављач услуге пријављивања у два корака је омогућен на вашем налогу."
   },
   "twoStepLoginAuthDesc": {
     "message": "Унесите главну лозинку да бисте изменили подешавања пријављивања у два корака."
   },
-  "twoStepAuthenticatorDesc": {
-    "message": "Следите ове кораке за подешавање пријаве у два корака помоћу апликације за проверу аутентичности:"
+  "twoStepAuthenticatorInstructionPrefix": {
+    "message": "Преузмите апликацију за аутентификацију као што је"
   },
-  "twoStepAuthenticatorDownloadApp": {
-    "message": "Преузмите апликацију за аутентификацију у два корака"
+  "twoStepAuthenticatorInstructionInfix1": {
+    "message": ","
   },
-  "twoStepAuthenticatorNeedApp": {
-    "message": "Треба вам апликација за аутентификацију у два корака? Преузмите једну од следеће"
+  "twoStepAuthenticatorInstructionInfix2": {
+    "message": "или"
   },
-  "iosDevices": {
-    "message": "iOS уређаји"
+  "twoStepAuthenticatorInstructionSuffix": {
+    "message": "."
   },
-  "androidDevices": {
-    "message": "Android уређаји"
+  "continueToExternalUrlTitle": {
+    "message": "Наставити на $URL$?",
+    "placeholders": {
+      "url": {
+        "content": "$1",
+        "example": "bitwarden.com"
+      }
+    }
   },
-  "windowsDevices": {
-    "message": "Windows уређаји"
+  "continueToExternalUrlDesc": {
+    "message": "Напуштате Bitwarden и покрећете спољне веб странице у новом прозору."
   },
-  "twoStepAuthenticatorAppsRecommended": {
-    "message": "Ове апликације се препоручују, међутим, друге апликације за утврђивање аутентичности такође ће радити."
+  "twoStepContinueToBitwardenUrlTitle": {
+    "message": "Наставити на bitwarden.com?"
   },
-  "twoStepAuthenticatorScanCode": {
-    "message": "Скенирајте овај QR код са апликацијом за идентификљцију"
+  "twoStepContinueToBitwardenUrlDesc": {
+    "message": "Bitwarden Authenticator омогућава вам да чувате кључеве аутентификатора и генеришете ТОТП кодове за токове верификације у 2 корака. Сазнајте више на bitwarden.com."
+  },
+  "twoStepAuthenticatorScanCodeV2": {
+    "message": "Скенирајте КР кôд у наставку помоћу апликације за аутентификацију или унесите кључ."
+  },
+  "twoStepAuthenticatorQRCanvasError": {
+    "message": "Учитавање QR кôда није успело. Покушајте поново или користите тастер испод."
   },
   "key": {
     "message": "Кључ"
   },
-  "twoStepAuthenticatorEnterCode": {
-    "message": "Унесите резултирајући шестоцифрени код из апликације"
+  "twoStepAuthenticatorEnterCodeV2": {
+    "message": "Верификациони кôд"
   },
   "twoStepAuthenticatorReaddDesc": {
     "message": "У случају да га требате додати на други уређај, доле је КР код (или кључ) који захтева ваша апликација за аутентификацију."
@@ -1377,11 +2365,11 @@
   "twoFactorDuoDesc": {
     "message": "Унесите информације о апликацији Bitwarden из администрације Duo."
   },
-  "twoFactorDuoIntegrationKey": {
-    "message": "Кључ интеграције"
+  "twoFactorDuoClientId": {
+    "message": "Ид клијента"
   },
-  "twoFactorDuoSecretKey": {
-    "message": "Тајни кључ"
+  "twoFactorDuoClientSecret": {
+    "message": "Тајна клијента"
   },
   "twoFactorDuoApiHostname": {
     "message": "API Име хоста"
@@ -1440,11 +2428,8 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Догодила се грешка приликом читања безбедносног кључа. Покушајте поново."
   },
-  "twoFactorWebAuthnWarning": {
-    "message": "Због ограничења платформе, WebAuthn се не могу користити на свим Bitwarden апликацијама. Требали бисте омогућити другог добављача услуге пријављивања у два корака како бисте могли да приступите свом налогу када WebAuthn не могу да се користе. Подржане платформе:"
-  },
-  "twoFactorWebAuthnSupportWeb": {
-    "message": "Веб сеф и додатке прегледача на рачунару са WebAuthn омогућен прегледач (Chrome, Opera, Vivaldi, или Firefox са FIDO U2F омогућено)."
+  "twoFactorWebAuthnWarning1": {
+    "message": "Због ограничења платформе, WebAuthn се не могу користити на свим Bitwarden апликацијама. Требали бисте подесити другог добављача услуге пријављивања у два корака како бисте могли да приступите свом налогу када WebAuthn не могу да се користе."
   },
   "twoFactorRecoveryYourCode": {
     "message": "Ваш Bitwarden код за опоравак пријаве у два корака"
@@ -1461,7 +2446,11 @@
   },
   "reportsDesc": {
     "message": "Идентификујте и затворите безбедносне празнине у вашим онлајн налозима кликом на извештаје у наставку.",
-    "description": "Vault Health Reports can be used to evaluate the security of your Bitwarden Personal or Organization Vault."
+    "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization vault."
+  },
+  "orgsReportsDesc": {
+    "message": "Идентификујте и затворите безбедносне празнине у вашим налозима организације кликом на извештаје у наставку.",
+    "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization vault."
   },
   "unsecuredWebsitesReport": {
     "message": "Извештај о несигурним веб локацијама"
@@ -1472,12 +2461,16 @@
   "unsecuredWebsitesFound": {
     "message": "Пронађене су незаштићене веб странице"
   },
-  "unsecuredWebsitesFoundDesc": {
-    "message": "Нашли смо $COUNT$ ставке у вашем сефу са незаштићеним УРЛ. Требали би да промените шеме у https:// ако веб страница то дозвољава.",
+  "unsecuredWebsitesFoundReportDesc": {
+    "message": "Нашли смо $COUNT$ ставке у вашем $VAULT$ са незаштићеним УРЛ. Требали би да промените шеме у https:// ако веб страница то дозвољава.",
     "placeholders": {
       "count": {
         "content": "$1",
         "example": "8"
+      },
+      "vault": {
+        "content": "$2",
+        "example": "this will be 'vault' or 'vaults'"
       }
     }
   },
@@ -1493,12 +2486,16 @@
   "inactive2faFound": {
     "message": "Нађене пријаве без 2FA"
   },
-  "inactive2faFoundDesc": {
-    "message": "Насшли смо $COUNT$ сајта у вашем сефу који можда нису подешени са двофакторском потврдом идентитета (према twofactorauth.org). Да бисте додатно заштитили ове налоге, требало би да омогућите двостепену потврду идентитета.",
+  "inactive2faFoundReportDesc": {
+    "message": "Нашли смо $COUNT$ сајта у вашем $VAULT$ који можда нису конфигурисани за пријаву у два корака (према 2fa.directory). Да бисте додатно заштитили ове налоге, требало би да подесите пријаву у два корака.",
     "placeholders": {
       "count": {
         "content": "$1",
         "example": "8"
+      },
+      "vault": {
+        "content": "$2",
+        "example": "this will be 'vault' or 'vaults'"
       }
     }
   },
@@ -1517,12 +2514,16 @@
   "exposedPasswordsFound": {
     "message": "Пронађене изложене лозинке"
   },
-  "exposedPasswordsFoundDesc": {
+  "exposedPasswordsFoundReportDesc": {
     "message": "Пронашли смо у вашем сефу $COUNT$ предмета који садрже лозинке откривене у познатим повредама података. Требали би да их промените да бисте користили нову лозинку.",
     "placeholders": {
       "count": {
         "content": "$1",
         "example": "8"
+      },
+      "vault": {
+        "content": "$2",
+        "example": "this will be 'vault' or 'vaults'"
       }
     }
   },
@@ -1532,6 +2533,9 @@
   "checkExposedPasswords": {
     "message": "Проверите изложене лозинке"
   },
+  "timesExposed": {
+    "message": "Пута изложено"
+  },
   "exposedXTimes": {
     "message": "Изложено $COUNT$ пута",
     "placeholders": {
@@ -1550,18 +2554,25 @@
   "weakPasswordsFound": {
     "message": "Пронађене су слабе лозинке"
   },
-  "weakPasswordsFoundDesc": {
+  "weakPasswordsFoundReportDesc": {
     "message": "Пронашли смо у вашем сефу $COUNT$ ставки са слабим лозинкама. Требали бисте их ажурирати да би користили јаче лозинке.",
     "placeholders": {
       "count": {
         "content": "$1",
         "example": "8"
+      },
+      "vault": {
+        "content": "$2",
+        "example": "this will be 'vault' or 'vaults'"
       }
     }
   },
   "noWeakPasswords": {
     "message": "Ниједна ставка у вашем сефу сабржи слабе лозинке."
   },
+  "weakness": {
+    "message": "Слабост"
+  },
   "reusedPasswordsReport": {
     "message": "Извештај о поновној употреби лозинки"
   },
@@ -1571,18 +2582,25 @@
   "reusedPasswordsFound": {
     "message": "Пронађене поновне лозинке"
   },
-  "reusedPasswordsFoundDesc": {
+  "reusedPasswordsFoundReportDesc": {
     "message": "Нашли смо $COUNT$ лозинке које се поново користе у вашем сефу. Требали бисте да их промените у јединствену вредност.",
     "placeholders": {
       "count": {
         "content": "$1",
         "example": "8"
+      },
+      "vault": {
+        "content": "$2",
+        "example": "this will be 'vault' or 'vaults'"
       }
     }
   },
   "noReusedPasswords": {
     "message": "Ниједна пријава у ваш сефу нема лозинке које се поново користе."
   },
+  "timesReused": {
+    "message": "Пута поново употребљено"
+  },
   "reusedXTimes": {
     "message": "Коришћено $COUNT$ пута",
     "placeholders": {
@@ -1654,6 +2672,12 @@
   "billing": {
     "message": "Наплате"
   },
+  "billingPlanLabel": {
+    "message": "План претплате"
+  },
+  "paymentType": {
+    "message": "Врста Уплате"
+  },
   "accountCredit": {
     "message": "Салдо налога",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1681,7 +2705,7 @@
   },
   "goPremium": {
     "message": "Купи Премијум",
-    "description": "Another way of saying \"Get a premium membership\""
+    "description": "Another way of saying \"Get a Premium membership\""
   },
   "premiumUpdated": {
     "message": "Надоградили сте на премијум."
@@ -1692,8 +2716,8 @@
   "premiumSignUpStorage": {
     "message": "1ГБ шифровано складиште за прилоге."
   },
-  "premiumSignUpTwoStep": {
-    "message": "Додатне опције пријаве у два корака као што су YubiKey, FIDO U2F, и Duo."
+  "premiumSignUpTwoStepOptions": {
+    "message": "Приоритарне опције пријаве у два корака као што су YubiKey и Duo."
   },
   "premiumSignUpEmergency": {
     "message": "Улаз у хитним случајевима"
@@ -1719,6 +2743,22 @@
       }
     }
   },
+  "premiumPriceWithFamilyPlan": {
+    "message": "Идите на премиум за само $PRICE$ годишње, или набавите премијум налоге за $FAMILYPLANUSERCOUNT$ корисника и неограничено породично дељење са ",
+    "placeholders": {
+      "price": {
+        "content": "$1",
+        "example": "$10"
+      },
+      "familyplanusercount": {
+        "content": "$2",
+        "example": "6"
+      }
+    }
+  },
+  "bitwardenFamiliesPlan": {
+    "message": "Bitwarden Families план."
+  },
   "addons": {
     "message": "Додаци"
   },
@@ -1770,6 +2810,9 @@
   "year": {
     "message": "година"
   },
+  "yr": {
+    "message": "год"
+  },
   "month": {
     "message": "месец"
   },
@@ -1789,6 +2832,9 @@
       }
     }
   },
+  "paymentChargedWithUnpaidSubscription": {
+    "message": "Ваш начин плаћања ће бити наплаћен за све неплаћене претплате."
+  },
   "paymentChargedWithTrial": {
     "message": "Ваш план долази са бесплатним 7-дневним пробним периодом. Начин плаћања неће бити наплаћен док се пробно време не заврши. Наплата ће се вршити периодично, сваки $INTERVAL$. Можете отказати било када."
   },
@@ -1798,6 +2844,9 @@
   "billingInformation": {
     "message": "Информације за обрачун"
   },
+  "billingTrialSubLabel": {
+    "message": "Ваш начин плаћања неће бити наплаћен током бесплатног пробног периода од 7 дана."
+  },
   "creditCard": {
     "message": "Кредитна Картица"
   },
@@ -1807,6 +2856,9 @@
   "cancelSubscription": {
     "message": "Откажи претплату"
   },
+  "subscriptionExpiration": {
+    "message": "Истицање претплате"
+  },
   "subscriptionCanceled": {
     "message": "Претплата је отказана."
   },
@@ -1846,15 +2898,18 @@
   "downloadLicense": {
     "message": "Преузимање лиценце"
   },
+  "viewBillingToken": {
+    "message": "Види токен наплате"
+  },
   "updateLicense": {
     "message": "Ажурирање лиценце"
   },
-  "updatedLicense": {
-    "message": "Лиценца ажурирана"
-  },
   "manageSubscription": {
     "message": "Управљај претплатама"
   },
+  "launchCloudSubscription": {
+    "message": "Покренути Cloud претплату"
+  },
   "storage": {
     "message": "Складиште"
   },
@@ -1892,8 +2947,11 @@
   "invoices": {
     "message": "Фактуре"
   },
-  "noInvoices": {
-    "message": "Нема фактуре."
+  "noUnpaidInvoices": {
+    "message": "Нема неплаћених фактура."
+  },
+  "noPaidInvoices": {
+    "message": "Нема плаћених фактура."
   },
   "paid": {
     "message": "Плаћено",
@@ -1951,6 +3009,9 @@
   "contactSupport": {
     "message": "Обратите се корисничкој подршци"
   },
+  "contactSupportShort": {
+    "message": "Контактирај подршку"
+  },
   "updatedPaymentMethod": {
     "message": "Ажуриран начин плаћања."
   },
@@ -2052,6 +3113,9 @@
   "planDescTeams": {
     "message": "За предузећа и друге тимске организације."
   },
+  "planNameTeamsStarter": {
+    "message": "Teams Starter"
+  },
   "planNameEnterprise": {
     "message": "Предузећа"
   },
@@ -2154,12 +3218,45 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Хвала што сте се пријавили за Bitwarden за $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialSecretsManagerThankYou": {
+    "message": "Хвала што сте се пријавили за Bitwarden Secrets Manager за $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Када се заврши бесплатни период плана $PLAN$ (7 дана), биће претворен у плаћеном плану.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "Послали смо имејл са потврдом на адресу за обрачун вашег тима на "
+  },
   "monthly": {
     "message": "Месечно"
   },
   "annually": {
     "message": "Годишње"
   },
+  "annual": {
+    "message": "Годишње"
+  },
   "basePrice": {
     "message": "Основна цена"
   },
@@ -2223,9 +3320,24 @@
   "deleteGroupConfirmation": {
     "message": "Да ли сте сигурни да желите да обришете ову групу?"
   },
+  "deleteMultipleGroupsConfirmation": {
+    "message": "Да ли сте сигурни да желите да избришете $QUANTITY$ групу/е?",
+    "placeholders": {
+      "quantity": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "removeUserConfirmation": {
     "message": "Да ли сте сигурни да желите да уклоните овог корисника?"
   },
+  "removeOrgUserConfirmation": {
+    "message": "Када се члан уклони, он више нема приступ подацима организације и ова радња је неповратна. Да бисте поново додали члана у организацију, они морају бити позвани и поново укључени."
+  },
+  "revokeUserConfirmation": {
+    "message": "Када се члан опозове, он више нема приступ подацима организације. Да бисте брзо вратили приступ члановима, идите на картицу Опозвано."
+  },
   "removeUserConfirmationKeyConnector": {
     "message": "Упозорење! Овај корисник захтева Key Connector да управља њиховом шифровањем. Уклањање овог корисника из ваше организације трајно ће онемогућити њихов рачун. Ова радња се не може поништити. Да ли желите да наставите?"
   },
@@ -2235,15 +3347,18 @@
   "externalIdDesc": {
     "message": "Спољни ид се може користити као референца или за повезивање овог ресурса са спољним системом као што је корисничка фасцикла."
   },
+  "ssoExternalId": {
+    "message": "SSO Спољни ИД"
+  },
+  "ssoExternalIdDesc": {
+    "message": "SSO Спољни ИД је неуредна референца између Bitwarden-а и вашег конфигурисаног SSO провајдера."
+  },
+  "nestCollectionUnder": {
+    "message": "Постави колекцију испод"
+  },
   "accessControl": {
     "message": "Контрола Приступа"
   },
-  "groupAccessAllItems": {
-    "message": "Ова група може приступити и изменити све ставке."
-  },
-  "groupAccessSelectedCollections": {
-    "message": "Ова група може приступити само одабраним колекцијама."
-  },
   "readOnly": {
     "message": "Само за читање"
   },
@@ -2256,14 +3371,23 @@
   "editCollection": {
     "message": "Уреди колекцију"
   },
+  "collectionInfo": {
+    "message": "Инфо колекције"
+  },
   "deleteCollectionConfirmation": {
     "message": "Сигурно обрисати ову колекцију?"
   },
-  "editUser": {
-    "message": "Измени корисника"
+  "editMember": {
+    "message": "Уредити члан"
   },
-  "inviteUser": {
-    "message": "Позива Кориснике"
+  "fieldOnTabRequiresAttention": {
+    "message": "Поље на језичку '$TAB$' захтева пажњу.",
+    "placeholders": {
+      "tab": {
+        "content": "$1",
+        "example": "Collection info"
+      }
+    }
   },
   "inviteUserDesc": {
     "message": "Позовите новог корисника у своју организацију тако што ћете доле унети имејл његовог Bitwarden налога. Ако немају Bitwarden налог, биће затражено да креирају нови налог."
@@ -2277,24 +3401,21 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "Преостала вам је 1 позивница."
+  },
+  "inviteZeroEmailDesc": {
+    "message": "Преостало вам је 0 позивница."
+  },
   "userUsingTwoStep": {
     "message": "Овај корисник користи пријаву у два корака за заштиту свог налога."
   },
-  "userAccessAllItems": {
-    "message": "Овај корисник може приступити и изменити све ставке."
-  },
-  "userAccessSelectedCollections": {
-    "message": "Овај корисник може приступити само одабраним колекцијама."
-  },
   "search": {
     "message": "Тражи"
   },
   "invited": {
     "message": "Позвано"
   },
-  "accepted": {
-    "message": "Прихваћено"
-  },
   "confirmed": {
     "message": "Потврђено"
   },
@@ -2322,15 +3443,15 @@
   "userDesc": {
     "message": "Редовни корисник са приступом додељеним колекцијама у вашој организацији."
   },
-  "manager": {
-    "message": "Менаџер"
-  },
-  "managerDesc": {
-    "message": "Менаџери могу да приступе додељеним колекцијама и управљају њима у вашој организацији."
-  },
   "all": {
     "message": "Све"
   },
+  "addAccess": {
+    "message": "Додај приступ"
+  },
+  "addAccessFilter": {
+    "message": "Додај филтер приступа"
+  },
   "refresh": {
     "message": "Освежи"
   },
@@ -2361,6 +3482,15 @@
   "webVault": {
     "message": "Интернет Сеф"
   },
+  "cli": {
+    "message": "CLI"
+  },
+  "bitWebVault": {
+    "message": "Bitwarden Интернет Сеф"
+  },
+  "bitSecretsManager": {
+    "message": "Bitwarden Менаџер Тајности"
+  },
   "loggedIn": {
     "message": "Пријављено."
   },
@@ -2382,6 +3512,19 @@
   "failedLogin2fa": {
     "message": "Покушај пријаве није успео са нетачном пријавом у два корака."
   },
+  "incorrectPassword": {
+    "message": "Погрешна лозинка"
+  },
+  "incorrectCode": {
+    "message": "Погрешан код"
+  },
+  "incorrectPin": {
+    "message": "Нетачан PIN"
+  },
+  "pin": {
+    "message": "ПИН",
+    "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
+  },
   "exportedVault": {
     "message": "Сеф извежен."
   },
@@ -2427,6 +3570,12 @@
       }
     }
   },
+  "viewAllLogInOptions": {
+    "message": "Погледајте сав извештај у опције"
+  },
+  "viewAllLoginOptions": {
+    "message": "Погледајте сав извештај у опције"
+  },
   "viewedItemId": {
     "message": "Прогледана ставка $ID$.",
     "placeholders": {
@@ -2454,6 +3603,15 @@
       }
     }
   },
+  "viewedCardNumberItemId": {
+    "message": "Прегледан број картице за ставку $ID$.",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "Unique ID"
+      }
+    }
+  },
   "viewedSecurityCodeItemId": {
     "message": "Прогледан сигурносни код за $ID$.",
     "placeholders": {
@@ -2463,6 +3621,24 @@
       }
     }
   },
+  "viewCollectionWithName": {
+    "message": "Преглед колекције - $NAME$",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Collection1"
+      }
+    }
+  },
+  "editItemWithName": {
+    "message": "Уредити ставку - $NAME$",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Google Login"
+      }
+    }
+  },
   "copiedPasswordItemId": {
     "message": "Копирана лозинка за $ID$.",
     "placeholders": {
@@ -2517,6 +3693,9 @@
       }
     }
   },
+  "deletedCollections": {
+    "message": "Избрисане колекције"
+  },
   "deletedCollectionId": {
     "message": "Колекција $ID$ избрисана.",
     "placeholders": {
@@ -2562,6 +3741,15 @@
       }
     }
   },
+  "deletedManyGroups": {
+    "message": "Обрисано $QUANTITY$ група/е.",
+    "placeholders": {
+      "quantity": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "removedUserId": {
     "message": "Корисник $ID$ уклоњен.",
     "placeholders": {
@@ -2571,6 +3759,42 @@
       }
     }
   },
+  "removeUserIdAccess": {
+    "message": "Опозови приступ „$ID$“",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
+  "revokedUserId": {
+    "message": "Опозван приступ организацији за $ID$.",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
+  "restoredUserId": {
+    "message": "Враћен приступ организацији за $ID$.",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
+  "revokeUserId": {
+    "message": "Опозови приступ „$ID$“",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "createdAttachmentForItem": {
     "message": "Креиран прилог за $ID$.",
     "placeholders": {
@@ -2634,6 +3858,9 @@
       }
     }
   },
+  "unlinkedSso": {
+    "message": "Неповезан SSO."
+  },
   "unlinkedSsoUser": {
     "message": "Отповезај SSO за $ID$.",
     "placeholders": {
@@ -2682,6 +3909,97 @@
   "device": {
     "message": "Уређај"
   },
+  "loginStatus": {
+    "message": "Статус пријаве"
+  },
+  "firstLogin": {
+    "message": "Прва пријава"
+  },
+  "trusted": {
+    "message": "Поуздан"
+  },
+  "needsApproval": {
+    "message": "Потребно је одобрење"
+  },
+  "areYouTryingtoLogin": {
+    "message": "Да ли покушавате да се пријавите?"
+  },
+  "logInAttemptBy": {
+    "message": "Покушај пријаве од $EMAIL$",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
+  "deviceType": {
+    "message": "Тип уређаја"
+  },
+  "ipAddress": {
+    "message": "ИП адреса"
+  },
+  "confirmLogIn": {
+    "message": "Потврди пријављивање"
+  },
+  "denyLogIn": {
+    "message": "Одбиј пријављивање"
+  },
+  "thisRequestIsNoLongerValid": {
+    "message": "Овај захтев више није важећи."
+  },
+  "logInConfirmedForEmailOnDevice": {
+    "message": "Пријава потврђена за $EMAIL$ на $DEVICE$",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      },
+      "device": {
+        "content": "$2",
+        "example": "iOS"
+      }
+    }
+  },
+  "youDeniedALogInAttemptFromAnotherDevice": {
+    "message": "Одбили сте покушај пријаве са другог уређаја. Ако сте то заиста били ви, покушајте поново да се пријавите помоћу уређаја."
+  },
+  "loginRequestHasAlreadyExpired": {
+    "message": "Захтев за пријаву је већ истекао."
+  },
+  "justNow": {
+    "message": "Управо сада"
+  },
+  "requestedXMinutesAgo": {
+    "message": "Затражено пре $MINUTES$ минута",
+    "placeholders": {
+      "minutes": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
+  "creatingAccountOn": {
+    "message": "Креирај налог на"
+  },
+  "checkYourEmail": {
+    "message": "Проверите свој имејл"
+  },
+  "followTheLinkInTheEmailSentTo": {
+    "message": "Пратите везу послатој на"
+  },
+  "andContinueCreatingYourAccount": {
+    "message": "и наставите са креирањем налога."
+  },
+  "noEmail": {
+    "message": "Немате имејл?"
+  },
+  "goBack": {
+    "message": "Ићи назад"
+  },
+  "toEditYourEmailAddress": {
+    "message": "да измените свој имејл."
+  },
   "view": {
     "message": "Приказ"
   },
@@ -2763,6 +4081,9 @@
   "emailVerified": {
     "message": "Ваш имејл је потврђен."
   },
+  "emailVerifiedV2": {
+    "message": "Имејл верификован"
+  },
   "emailVerifiedFailed": {
     "message": "Није могуће верификовати ваш имејл. Покушајте да пошаљете нову поруку за верификацију."
   },
@@ -2775,21 +4096,94 @@
   "updateBrowser": {
     "message": "Ажурирајте Претраживач"
   },
+  "generatingYourRiskInsights": {
+    "message": "Генерисање прегледа вашег ризика..."
+  },
   "updateBrowserDesc": {
     "message": "Користите неподржани веб прегледач. Веб сеф можда неће правилно функционисати."
   },
+  "youHaveAPendingLoginRequest": {
+    "message": "Имате захтев за пријаву на чекању са другог уређаја."
+  },
+  "reviewLoginRequest": {
+    "message": "Прегледајте захтев за пријаву"
+  },
+  "freeTrialEndPromptCount": {
+    "message": "Ваша проба се завршава за $COUNT$ дана.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "remaining days"
+      }
+    }
+  },
+  "freeTrialEndPromptMultipleDays": {
+    "message": "$ORGANIZATION$, Ваша проба са завршава за $COUNT$ дана.",
+    "placeholders": {
+      "count": {
+        "content": "$2",
+        "example": "remaining days"
+      },
+      "organization": {
+        "content": "$1",
+        "example": "organization name"
+      }
+    }
+  },
+  "freeTrialEndPromptTomorrow": {
+    "message": "$ORGANIZATION$, Ваша проба са завршава сутра.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "organization name"
+      }
+    }
+  },
+  "freeTrialEndPromptTomorrowNoOrgName": {
+    "message": "Ваша бесплатна пробна се завршава сутра."
+  },
+  "freeTrialEndPromptToday": {
+    "message": "$ORGANIZATION$, Ваша проба са завршава данас.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "organization name"
+      }
+    }
+  },
+  "freeTrialEndingTodayWithoutOrgName": {
+    "message": "Ваша бесплатна пробна се завршава данас."
+  },
+  "clickHereToAddPaymentMethod": {
+    "message": "Кликните овде да додате начин плаћања."
+  },
   "joinOrganization": {
     "message": "Придружи Организацију"
   },
+  "joinOrganizationName": {
+    "message": "Придружити се $ORGANIZATIONNAME$",
+    "placeholders": {
+      "organizationName": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
   "joinOrganizationDesc": {
     "message": "Позвани сте да се придружите наведеној организацији. Да бисте прихватили позивницу, потребно је да се пријавите или направите нови Bitwarden налог."
   },
+  "finishJoiningThisOrganizationBySettingAMasterPassword": {
+    "message": "Завршите придруживање овој организацији постављањем главне лозинке."
+  },
   "inviteAccepted": {
     "message": "Позив прихваћен"
   },
   "inviteAcceptedDesc": {
     "message": "Овој организацији можете приступити када администратор потврди ваше чланство. Послаћемо вам имејл када се то догоди."
   },
+  "inviteInitAcceptedDesc": {
+    "message": "Сада можете приступити овој организацији."
+  },
   "inviteAcceptFailed": {
     "message": "Није могуће прихватити позивницу. Замолите администратора организације да пошаље нову позивницу."
   },
@@ -2798,7 +4192,7 @@
     "placeholders": {
       "description": {
         "content": "$1",
-        "example": "You must enable 2FA on your user account before you can join this organization."
+        "example": "You must set up 2FA on your user account before you can join this organization."
       }
     }
   },
@@ -2808,6 +4202,9 @@
   "recoverAccountTwoStepDesc": {
     "message": "Ако не можете да приступите свом налогу путем уобичајених метода пријављивања у два корака, можете користити свој код за опоравак пријаве да бисте онемогућили све добављаче услуга у два корака на свом налогу."
   },
+  "logInBelowUsingYourSingleUseRecoveryCode": {
+    "message": "Пријавите се испод коришћења вашег једнократног кôда за опоравак. Ово ће искључити све провајдере у два корака на вашем налогу."
+  },
   "recoverAccountTwoStep": {
     "message": "Опоравак пријаве у два корака"
   },
@@ -2826,9 +4223,15 @@
   "deleteRecoverConfirmDesc": {
     "message": "Затражили сте да избришете свој Bitwarden рачун. Кликните на доње дугме да бисте потврдили."
   },
+  "deleteRecoverOrgConfirmDesc": {
+    "message": "Захтевали сте да избришете своју Bitwarden оранизацију."
+  },
   "myOrganization": {
     "message": "Моја организација"
   },
+  "organizationInfo": {
+    "message": "Инфо о организацији"
+  },
   "deleteOrganization": {
     "message": "Уклони организацију"
   },
@@ -2870,15 +4273,15 @@
   },
   "billingPlan": {
     "message": "План",
-    "description": "A billing plan/package. For example: families, teams, enterprise, etc."
+    "description": "A billing plan/package. For example: Families, Teams, Enterprise, etc."
   },
   "changeBillingPlan": {
     "message": "Промените план",
-    "description": "A billing plan/package. For example: families, teams, enterprise, etc."
+    "description": "A billing plan/package. For example: Families, Teams, Enterprise, etc."
   },
   "changeBillingPlanUpgrade": {
     "message": "Надоградите свој рачун на други план тако што ћете пружити информације у наставку. Обавезно проверите да имате активни начин плаћања на рачун.",
-    "description": "A billing plan/package. For example: families, teams, enterprise, etc."
+    "description": "A billing plan/package. For example: Families, Teams, Enterprise, etc."
   },
   "invoiceNumber": {
     "message": "Фактура #$NUMBER$",
@@ -2949,6 +4352,9 @@
   "limitSubscriptionDesc": {
     "message": "Поставите ограничење лиценце за своју претплату. Једном када се достигне ова граница, нећете моћи да позовете нове кориснике."
   },
+  "limitSmSubscriptionDesc": {
+    "message": "Поставите ограничење лиценце за своју претплату менаџера тајни. Једном када се достигне ова граница, нећете моћи да позовете нове чланове."
+  },
   "maxSeatLimit": {
     "message": "Максимална граница лиценце (опционо)",
     "description": "Upper limit of seats to allow through autoscaling"
@@ -2985,6 +4391,9 @@
   "subscriptionUpdated": {
     "message": "Претплата је ажурирана"
   },
+  "subscribedToSecretsManager": {
+    "message": "Претплата је ажурирана. Сада имате приступ Secrets Manager-у."
+  },
   "additionalOptions": {
     "message": "Додатне опције"
   },
@@ -2994,6 +4403,12 @@
   "subscriptionUserSeatsUnlimitedAutoscale": {
     "message": "Подешавање ваше претплате резултираће прорисаним променама у вашим новчаним вредностима. Ако ново позвани корисници прелази ваше лиценце за претплату, одмах ћете добити прорисану накнаду за додатни корисник."
   },
+  "smStandaloneTrialSeatCountUpdateMessageFragment1": {
+    "message": "Ако желите да додате додатна"
+  },
+  "smStandaloneTrialSeatCountUpdateMessageFragment2": {
+    "message": "седишта без понуде у пакету, контактирајте"
+  },
   "subscriptionUserSeatsLimitedAutoscale": {
     "message": "Подешавање ваше претплате резултираће прорисаним променама у вашим новчаним вредностима. Ако ново позвани корисници прелази ваше лиценце за претплату, одмах ћете добити прорисану накнаду за додатни корисник док ваши лимит $MAX$ није достигнут.",
     "placeholders": {
@@ -3003,6 +4418,15 @@
       }
     }
   },
+  "subscriptionUserSeatsWithoutAdditionalSeatsOption": {
+    "message": "Можете позвати до $COUNT$ чланова без додатне накнаде. Контактирајте корисничку подршку да надоградите свој план и позовете још чланова.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "10"
+      }
+    }
+  },
   "subscriptionFreePlan": {
     "message": "Не можете позвати више од $COUNT$ корисника без надоградње претплате.",
     "placeholders": {
@@ -3012,12 +4436,12 @@
       }
     }
   },
-  "subscriptionFamiliesPlan": {
-    "message": "Не можете позвати више од $COUNT$ корисника без надоградње претплате. Молимо контактирајте корисничку подршку за надоградњу.",
+  "subscriptionUpgrade": {
+    "message": "Не можете позвати више од $COUNT$ чланова без надоградње претплате.",
     "placeholders": {
       "count": {
         "content": "$1",
-        "example": "6"
+        "example": "2"
       }
     }
   },
@@ -3039,6 +4463,15 @@
       }
     }
   },
+  "subscriptionSeatMaxReached": {
+    "message": "Не можете позвати више од $COUNT$ чланова без надоградње смештаја претплате.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "50"
+      }
+    }
+  },
   "seatsToAdd": {
     "message": "Места за додавање"
   },
@@ -3060,26 +4493,66 @@
       }
     }
   },
-  "keyUpdated": {
-    "message": "Кључ је ажуриран"
+  "editFieldLabel": {
+    "message": "Уреди $LABEL$",
+    "placeholders": {
+      "label": {
+        "content": "$1",
+        "example": "Custom field"
+      }
+    }
   },
-  "updateKeyTitle": {
-    "message": "Ажурирате кључ"
+  "reorderToggleButton": {
+    "message": "Преместити $LABEL$. Користите тастер са стрелицом да бисте померили ставку.",
+    "placeholders": {
+      "label": {
+        "content": "$1",
+        "example": "Custom field"
+      }
+    }
   },
-  "updateEncryptionKey": {
-    "message": "Ажурирајте кључ за шифровање"
+  "reorderFieldUp": {
+    "message": "$LABEL$ премештено на горе, позиција $INDEX$ од $LENGTH$",
+    "placeholders": {
+      "label": {
+        "content": "$1",
+        "example": "Custom field"
+      },
+      "index": {
+        "content": "$2",
+        "example": "1"
+      },
+      "length": {
+        "content": "$3",
+        "example": "3"
+      }
+    }
   },
-  "updateEncryptionKeyShortDesc": {
-    "message": "Тренутно користите застарелу шему шифровања."
-  },
-  "updateEncryptionKeyDesc": {
-    "message": "Прешли смо на веће кључеве за шифровање који пружају бољу сигурност и приступ новијим функцијама. Ажурирање кључа за шифровање је брзо и једноставно. Само унесите главну лозинку испод. Ово ажурирање ће временом постати обавезно."
+  "reorderFieldDown": {
+    "message": "$LABEL$ премештено на доле, позиција $INDEX$ од $LENGTH$",
+    "placeholders": {
+      "label": {
+        "content": "$1",
+        "example": "Custom field"
+      },
+      "index": {
+        "content": "$2",
+        "example": "1"
+      },
+      "length": {
+        "content": "$3",
+        "example": "3"
+      }
+    }
   },
   "updateEncryptionKeyWarning": {
     "message": "Након ажурирања кључа за шифровање, мораћете да се одјавите и вратите у све Bitwarden апликације које тренутно користите (као што су мобилна апликација или додаци прегледача). Ако се не одјавите и поново пријавите (чиме се преузима ваш нови кључ за шифровање), може доћи до оштећења података. Покушаћемо аутоматски да се одјавимо, али може доћи до одлагања."
   },
-  "updateEncryptionKeyExportWarning": {
-    "message": "Сваки шифровани извоз који сте сачували такође ће постати неважећи."
+  "updateEncryptionKeyAccountExportWarning": {
+    "message": "Сваки рачун са ограничен извоз који сте сачували постаће неважећи."
+  },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy енкрипција више није подржана. Молимо контактирајте подршку за повраћај налога."
   },
   "subscription": {
     "message": "Претплата"
@@ -3108,11 +4581,26 @@
   "nothingSelected": {
     "message": "Нисте ништа изабрали."
   },
+  "receiveMarketingEmailsV2": {
+    "message": "Добијајте савете, најаве и могућности истраживања од Bitwarden-а у пријемном сандучету."
+  },
+  "unsubscribe": {
+    "message": "Одјави се"
+  },
+  "atAnyTime": {
+    "message": "било када."
+  },
+  "byContinuingYouAgreeToThe": {
+    "message": "Ако наставите, слажете се са"
+  },
+  "and": {
+    "message": "и"
+  },
   "acceptPolicies": {
     "message": "Означавањем овог поља пристајете на следеће:"
   },
-  "acceptPoliciesError": {
-    "message": "Услови услуге и Политика приватности нису признати."
+  "acceptPoliciesRequired": {
+    "message": "Услови услуге и Политика приватности нису прихваћени."
   },
   "termsOfService": {
     "message": "Услови коришћења услуге"
@@ -3126,9 +4614,15 @@
   "vaultTimeout": {
     "message": "Тајмаут сефа"
   },
+  "vaultTimeout1": {
+    "message": "Истекло време"
+  },
   "vaultTimeoutDesc": {
     "message": "Изаберите када ће сеф истећи и да изврши одабрану радњу."
   },
+  "vaultTimeoutLogoutDesc": {
+    "message": "Одаберите када ће ваш сеф бити одјављен."
+  },
   "oneMinute": {
     "message": "1 минут"
   },
@@ -3154,6 +4648,10 @@
     "message": "Промењено",
     "description": "ex. Date this item was updated"
   },
+  "dateCreated": {
+    "message": "Креирано",
+    "description": "ex. Date this item was created"
+  },
   "datePasswordUpdated": {
     "message": "Лозинка ажурирана",
     "description": "ex. Date this password was updated"
@@ -3161,6 +4659,21 @@
   "organizationIsDisabled": {
     "message": "Организација је онемогућена."
   },
+  "secretsAccessSuspended": {
+    "message": "Суспендованим организацијама се не може приступити. За помоћ контактирајте власника своје организације."
+  },
+  "secretsCannotCreate": {
+    "message": "Тајне се не могу креирати у суспендованим организацијама. За помоћ контактирајте власника своје организације."
+  },
+  "projectsCannotCreate": {
+    "message": "Пројекти се не могу креирати у суспендованим организацијама. За помоћ контактирајте власника своје организације."
+  },
+  "serviceAccountsCannotCreate": {
+    "message": "Сервисни налози се не могу креирати у суспендованим организацијама. За помоћ контактирајте власника своје организације."
+  },
+  "disabledOrganizationFilterError": {
+    "message": "Није могуће приступити ставкама у онемогућене организације. Обратите се власнику организације за помоћ."
+  },
   "licenseIsExpired": {
     "message": "Лиценца је истекла."
   },
@@ -3170,6 +4683,9 @@
   "selected": {
     "message": "Изабано"
   },
+  "recommended": {
+    "message": "Препоручено"
+  },
   "ownership": {
     "message": "Власништво"
   },
@@ -3210,8 +4726,8 @@
   "attachmentsNeedFix": {
     "message": "Ова ставка има старе прилоге које треба поправити."
   },
-  "attachmentFixDesc": {
-    "message": "Ово је стари прилог који треба поправити. Кликните да бисте сазнали више."
+  "attachmentFixDescription": {
+    "message": "Овај прилог користи застарело шифровање. Изаберите „Поправи“ да бисте преузели, поново шифровали и поново отпремили прилог."
   },
   "fix": {
     "message": "Фиксирај",
@@ -3228,10 +4744,19 @@
     "message": "Да бисте осигурали интегритет кључева за шифровање, молимо да проверите Вашу Сигурносну Фразу Сефа пре наставка.",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
+  "fingerprintMatchInfo": {
+    "message": "Уверите се да је ваш сеф откључан и да се фраза отиска прста подудара на другом уређају."
+  },
+  "fingerprintPhraseHeader": {
+    "message": "Сигурносна фраза сефа"
+  },
   "dontAskFingerprintAgain": {
     "message": "Не питај више за проверу Сигурносне Фразе Сефа",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
+  "youWillBeNotifiedOnceTheRequestIsApproved": {
+    "message": "Бићете обавештени када захтев буде одобрен"
+  },
   "free": {
     "message": "Бесплатно",
     "description": "Free, as in 'Free beer'"
@@ -3270,24 +4795,30 @@
   "couldNotChargeCardPayInvoice": {
     "message": "Нисмо могли да наплатимо вашу картицу. Молимо погледајте и платите наведену неплаћену фактуру."
   },
-  "inAppPurchase": {
-    "message": "Куповина Унутар Апликације"
-  },
-  "cannotPerformInAppPurchase": {
-    "message": "Не можете да извршите ову радњу док користите начин плаћања за куповину у апликацији."
-  },
-  "manageSubscriptionFromStore": {
-    "message": "Морате управљати претплатом из продавнице у којој је обављена куповина у апликацији."
-  },
   "minLength": {
     "message": "Минимална Дужина"
   },
   "clone": {
     "message": "Клонирај"
   },
+  "masterPassPolicyTitle": {
+    "message": "Захтеви за главну лозинку"
+  },
   "masterPassPolicyDesc": {
     "message": "Поставите минималне захтеве за чврстоћу главне лозинке."
   },
+  "passwordStrengthScore": {
+    "message": "Снага лозинкe $SCORE$",
+    "placeholders": {
+      "score": {
+        "content": "$1",
+        "example": "4"
+      }
+    }
+  },
+  "twoStepLoginPolicyTitle": {
+    "message": "Потребна дво-степенска пријава"
+  },
   "twoStepLoginPolicyDesc": {
     "message": "Захтевајте од корисника да поставе пријаву у два корака на своје личне налоге."
   },
@@ -3300,9 +4831,6 @@
   "passwordGeneratorPolicyDesc": {
     "message": "Поставите минималне захтеве за конфигурацију генератора лозинки."
   },
-  "passwordGeneratorPolicyInEffect": {
-    "message": "Једна или више смерница организације утичу на поставке вашег генератора."
-  },
   "masterPasswordPolicyInEffect": {
     "message": "Једна или више смерница организације захтевају да ваша главна лозинка да би испуњавали следеће захтеве:"
   },
@@ -3348,8 +4876,9 @@
   "minimumNumberOfWords": {
     "message": "Минимални број речи"
   },
-  "defaultType": {
-    "message": "Подразумевани тип"
+  "overridePasswordTypePolicy": {
+    "message": "Тип лозинке",
+    "description": "Name of the password generator policy that overrides the user's password/passphrase selection."
   },
   "userPreference": {
     "message": "Подешавање Корисника"
@@ -3365,7 +4894,7 @@
   },
   "lock": {
     "message": "Закључај",
-    "description": "Verb form: to make secure or inaccesible by"
+    "description": "Verb form: to make secure or inaccessible by"
   },
   "trash": {
     "message": "Отпад",
@@ -3416,30 +4945,12 @@
   "restoreSelected": {
     "message": "Врати изабрано"
   },
-  "restoreItem": {
-    "message": "Врати ставку"
-  },
   "restoredItem": {
     "message": "Ставка враћена"
   },
   "restoredItems": {
     "message": "Ставке враћене"
   },
-  "restoreItemConfirmation": {
-    "message": "Да ли сте сигурни да желите да вратите ову ставку?"
-  },
-  "restoreItems": {
-    "message": "Врати ставке"
-  },
-  "restoreSelectedItemsDesc": {
-    "message": "Одабрали сте $COUNT$ ставке за повраћај. Да ли сте сигурни да желите да повратите све ове ставке?",
-    "placeholders": {
-      "count": {
-        "content": "$1",
-        "example": "150"
-      }
-    }
-  },
   "restoredItemId": {
     "message": "Ставка $ID$ повраћена.",
     "placeholders": {
@@ -3473,9 +4984,6 @@
   "setMasterPassword": {
     "message": "Постави Главну Лозинку"
   },
-  "ssoCompleteRegistration": {
-    "message": "Да бисте довршили пријављивање помоћу SSO, молимо да поставите главну лозинку за приступ и заштиту вашег сефа."
-  },
   "identifier": {
     "message": "Идентификатор"
   },
@@ -3485,15 +4993,45 @@
   "ssoLogInWithOrgIdentifier": {
     "message": "Пријавите се помоћу портала за јединствену пријаву ваше организације. Унесите идентификатор организације да бисте започели."
   },
+  "singleSignOnEnterOrgIdentifier": {
+    "message": "За почетак унесите SSO идентификатор ваше организације"
+  },
+  "singleSignOnEnterOrgIdentifierText": {
+    "message": "To log in with your SSO provider, enter your organization's SSO identifier to begin. You may need to enter this SSO identifier when you log in from a new device."
+  },
   "enterpriseSingleSignOn": {
     "message": "Enterprise Једна Пријава"
   },
   "ssoHandOff": {
     "message": "Можете да затворите овај језичак и да наставите са додатком."
   },
+  "youSuccessfullyLoggedIn": {
+    "message": "Успешно сте се пријавили"
+  },
+  "thisWindowWillCloseIn5Seconds": {
+    "message": "Овај прозор ће се аутоматски затворити за 5 секунди"
+  },
+  "youMayCloseThisWindow": {
+    "message": "Можете затворити овај прозор"
+  },
   "includeAllTeamsFeatures": {
     "message": "Све функције тима, плус:"
   },
+  "includeAllTeamsStarterFeatures": {
+    "message": "Све функције Teams Starter, плус:"
+  },
+  "chooseMonthlyOrAnnualBilling": {
+    "message": "Изаберите месечни или годишњи обрачун"
+  },
+  "abilityToAddMoreThanNMembers": {
+    "message": "Могућност додавања више од $COUNT$ члана",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "10"
+      }
+    }
+  },
   "includeSsoAuthentication": {
     "message": "SSO аутентификација преко SAML2.0 и OpenID везу"
   },
@@ -3506,6 +5044,13 @@
   "ssoIdentifierRequired": {
     "message": "Потребан је идентификатор организације."
   },
+  "ssoIdentifier": {
+    "message": "SSO идентификација"
+  },
+  "ssoIdentifierHintPartOne": {
+    "message": "Дајте овај ИД својим члановима да се пријаве са ССО. Да бисте заобишли овај корак, подесите ",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
+  },
   "unlinkSso": {
     "message": "Откачи SSO"
   },
@@ -3521,11 +5066,14 @@
   "singleOrgDesc": {
     "message": "Ограничите корисницима могућност придруживања било којој другој организацији."
   },
+  "singleOrgPolicyDesc": {
+    "message": "Restrict members from joining other organizations. This policy is required for organizations that have enabled domain verification."
+  },
   "singleOrgBlockCreateMessage": {
     "message": "Ваша тренутна организација има смернице које не дозвољавају да се придружите више организација. Молимо контактирајте администраторе своје организације или се пријавите са другим Bitwarden налога."
   },
-  "singleOrgPolicyWarning": {
-    "message": "Чланови организације који нису власници или администратори и који су већ чланови друге организације биће уклоњени из ваше организације."
+  "singleOrgPolicyMemberWarning": {
+    "message": "Non-compliant members will be placed in revoked status until they leave all other organizations. Administrators are exempt and can restore members once compliance is met."
   },
   "requireSso": {
     "message": "Аутентификација једнократном пријавом"
@@ -3545,12 +5093,40 @@
   "requireSsoExemption": {
     "message": "Власници и администратори организација изузети су ове политике."
   },
+  "limitSendViews": {
+    "message": "Ограничити приказе"
+  },
+  "limitSendViewsHint": {
+    "message": "Нико не може да види ово Send након што се достигне ограничење.",
+    "description": "Displayed under the limit views field on Send"
+  },
+  "limitSendViewsCount": {
+    "message": "Осталих прегледа: $ACCESSCOUNT$",
+    "description": "Displayed under the limit views field on Send",
+    "placeholders": {
+      "accessCount": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "sendDetails": {
+    "message": "Детаљи Send-а",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendTypeTextToShare": {
+    "message": "Текст за дељење"
+  },
   "sendTypeFile": {
     "message": "Датотека"
   },
   "sendTypeText": {
     "message": "Текст"
   },
+  "sendPasswordDescV3": {
+    "message": "Додајте опционалну лозинку за примаоце да приступе овом Send.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
   "createSend": {
     "message": "Креирај ново „Send“",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -3575,19 +5151,15 @@
     "message": "Избриши „Send“",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
-  "deleteSendConfirmation": {
-    "message": "Сигурно избрисати овај „Send“?",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "whatTypeOfSend": {
-    "message": "Који је ово тип „Send“-a?",
+  "deleteSendPermanentConfirmation": {
+    "message": "Да ли сте сигурни да желите да трајно избришете овај Send?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletionDate": {
     "message": "Брисање после"
   },
-  "deletionDateDesc": {
-    "message": "„The Send“ ће бити трајно избрисан наведеног датума и времена.",
+  "deletionDateDescV2": {
+    "message": "Send ће бити трајно обрисано у наведени датум.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
@@ -3600,28 +5172,19 @@
   "maxAccessCount": {
     "message": "Максималан број приступа"
   },
-  "maxAccessCountDesc": {
-    "message": "Ако је постављено, корисници више неће моћи да приступе овом „send“ када се достигне максимални број приступа.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "currentAccessCount": {
-    "message": "Тренутни број приступа"
-  },
-  "sendPasswordDesc": {
-    "message": "Опционално захтевајте лозинку за приступ корисницима „Send“-у.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendNotesDesc": {
-    "message": "Приватне белешке о овом „Send“.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "disabled": {
     "message": "Онемогућено"
   },
+  "revoked": {
+    "message": "Опозвано"
+  },
   "sendLink": {
     "message": "УРЛ „Send“",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
+  "copyLink": {
+    "message": "Копирај везу"
+  },
   "copySendLink": {
     "message": "Копирај УРЛ „Send“",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -3635,13 +5198,6 @@
   "removePasswordConfirmation": {
     "message": "Да ли сте сигурни да желите уклонити лозинку?"
   },
-  "hideEmail": {
-    "message": "Сакриј моју е-адресу од примаоца."
-  },
-  "disableThisSend": {
-    "message": "Онемогућите овај „Send“ да нико не би могао да му приступи.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "allSends": {
     "message": "Све „Send“"
   },
@@ -3652,6 +5208,9 @@
   "pendingDeletion": {
     "message": "Брисање на чекању"
   },
+  "hideTextByDefault": {
+    "message": "Сакриј текст подразумевано"
+  },
   "expired": {
     "message": "Истекло"
   },
@@ -3671,8 +5230,8 @@
     "message": "Ово Слање је подразумевано скривено. Можете да пребацујете његову видљивост помоћу дугмета испод.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
-  "downloadFile": {
-    "message": "Преузми датотеку"
+  "downloadAttachments": {
+    "message": "Преузмите прилоге"
   },
   "sendAccessUnavailable": {
     "message": "„Send“ које покушавате да приступите не постоји или више није доступан.",
@@ -3766,7 +5325,7 @@
     "placeholders": {
       "description": {
         "content": "$1",
-        "example": "You must enable 2FA on your user account before you can join this organization."
+        "example": "You must set up 2FA on your user account before you can join this organization."
       }
     }
   },
@@ -3819,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Одбијен хитни приступ"
   },
+  "grantorDetailsNotFound": {
+    "message": "Детаљи одобравања нису пронађени"
+  },
   "passwordResetFor": {
     "message": "Ресетовање лозинке за $USER$. Сада се можете пријавити помоћу нове лозинке.",
     "placeholders": {
@@ -3828,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Спровести власништво података о организацији"
+  },
   "personalOwnership": {
     "message": "Лично власништво"
   },
@@ -3873,13 +5438,6 @@
     "message": "Не дозволите корисницима да сакрију своју е-пошту од примаоца приликом креирања или уређивања „Send“-а.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
-  "sendOptionsPolicyInEffect": {
-    "message": "Следеће организационе политике су тренутно на снази:"
-  },
-  "sendDisableHideEmailInEffect": {
-    "message": "Корисници не могу да сакрију своју е-пошту од примаоца приликом креирања или уређивања „Send“-а.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "modifiedPolicyId": {
     "message": "Политика $ID$ промењена.",
     "placeholders": {
@@ -3901,9 +5459,27 @@
   "customDesc": {
     "message": "Омогућава детаљнију контролу корисничких дозвола за напредне конфигурације."
   },
+  "customDescNonEnterpriseStart": {
+    "message": "Прилагођене улоге су ",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Custom roles is an enterprise feature. Contact our support team to upgrade your subscription'"
+  },
+  "customDescNonEnterpriseLink": {
+    "message": "enterprise способност",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Custom roles is an enterprise feature. Contact our support team to upgrade your subscription'"
+  },
+  "customDescNonEnterpriseEnd": {
+    "message": ". Контактирајте наш тим за подршку да бисте надоградили своју претплату",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Custom roles is an enterprise feature. Contact our support team to upgrade your subscription'"
+  },
+  "customNonEnterpriseError": {
+    "message": "Да бисте омогућили прилагођене дозволе, организација мора бити на Enterprise 2020."
+  },
   "permissions": {
     "message": "Дозволе"
   },
+  "permission": {
+    "message": "Дозвола"
+  },
   "accessEventLogs": {
     "message": "Приступе извештаја догађаја"
   },
@@ -3928,15 +5504,6 @@
   "deleteAnyCollection": {
     "message": "Брише било коју колекцију"
   },
-  "manageAssignedCollections": {
-    "message": "Управљање додељеним колекцијама"
-  },
-  "editAssignedCollections": {
-    "message": "Уреди додељеним колекцијама"
-  },
-  "deleteAssignedCollections": {
-    "message": "Брише додељеним колекцијама"
-  },
   "manageGroups": {
     "message": "Управљање групама"
   },
@@ -3949,8 +5516,8 @@
   "manageUsers": {
     "message": "Управљај корисницима"
   },
-  "manageResetPassword": {
-    "message": "Управљање ресетовањем лозинке"
+  "manageAccountRecovery": {
+    "message": "Управљајте опоравком налога"
   },
   "disableRequiredError": {
     "message": "Морате ручно да онемогућите $POLICYNAME$ пријаву пре него што ова политика може да се онемогући.",
@@ -3970,27 +5537,6 @@
   "personalOwnershipCheckboxDesc": {
     "message": "Онемогућите лично власништво за кориснике организације"
   },
-  "textHiddenByDefault": {
-    "message": "На притуп „Send“-а, сакриј текст по дефаулту",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendNameDesc": {
-    "message": "Име да се опише ово слање.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendTextDesc": {
-    "message": "Текст који желиш да пошаљеш."
-  },
-  "sendFileDesc": {
-    "message": "Датотека коју желиш да пошаљеш."
-  },
-  "copySendLinkOnSave": {
-    "message": "Копирај везу да би поделио слање на бележницу након снимања."
-  },
-  "sendLinkLabel": {
-    "message": "Пошаљи везу",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "send": {
     "message": "Пошаљи",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4022,6 +5568,75 @@
     "message": "или",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more, see how it works, **or** try it now.'"
   },
+  "developmentDevOpsAndITTeamsChooseBWSecret": {
+    "message": "Развојни, ДевОпс и ИТ тимови бирају Bitwarden Secrets Manager да безбедно управљају и примењују своју инфраструктуру и машинске тајне."
+  },
+  "centralizeSecretsManagement": {
+    "message": "Централизујте управљање тајнама."
+  },
+  "centralizeSecretsManagementDescription": {
+    "message": "Безбедно чувајте тајне и управљајте њима на једној локацији да бисте спречили ширење тајни широм ваше организације."
+  },
+  "preventSecretLeaks": {
+    "message": "Спречите цурење тајне."
+  },
+  "preventSecretLeaksDescription": {
+    "message": "Заштитите тајне помоћу енкрипције од краја до краја. Нема више тајни тврдог кодирања или дељења путем .env датотека."
+  },
+  "enhanceDeveloperProductivity": {
+    "message": "Повећајте продуктивност програмера."
+  },
+  "enhanceDeveloperProductivityDescription": {
+    "message": "Програмски преузмите и примените тајне како би програмери могли да се усредсреде на оно што је најважније, као што је побољшање квалитета кода."
+  },
+  "strengthenBusinessSecurity": {
+    "message": "Ојачајте сигурност пословања."
+  },
+  "strengthenBusinessSecurityDescription": {
+    "message": "Одржавајте чврсту контролу над машинским и људским приступом тајнама помоћу SSO интеграција, евиденције догађаја и ротације приступа."
+  },
+  "tryItNow": {
+    "message": "Пробајте сада"
+  },
+  "sendRequest": {
+    "message": "Слање захтева"
+  },
+  "addANote": {
+    "message": "Додај белешку"
+  },
+  "bitwardenSecretsManager": {
+    "message": "Bitwarden Secrets Manager"
+  },
+  "moreProductsFromBitwarden": {
+    "message": "Више производа од Bitwarden"
+  },
+  "requestAccessToSecretsManager": {
+    "message": "Потражи приступ Манаџеру тајни"
+  },
+  "youNeedApprovalFromYourAdminToTrySecretsManager": {
+    "message": "Потребно вам је одобрење администратора да испробате менаџер тајни."
+  },
+  "smAccessRequestEmailSent": {
+    "message": "Имејл за приступ менаџера тајни послат администраторима."
+  },
+  "requestAccessSMDefaultEmailContent": {
+    "message": "Hi,\n\nI am requesting a subscription to Bitwarden Secrets Manager for our team. Your support would mean a great deal!\n\nBitwarden Secrets Manager is an end-to-end encrypted secrets management solution for securely storing, sharing, and deploying machine credentials like API keys, database passwords, and authentication certificates.\n\nSecrets Manager will help us to:\n\n- Improve security\n- Streamline operations\n- Prevent costly secret leaks\n\nTo request a free trial for our team, please reach out to Bitwarden.\n\nThank you for your help!"
+  },
+  "giveMembersAccess": {
+    "message": "Омогућите члановима приступ:"
+  },
+  "viewAndSelectTheMembers": {
+    "message": "погледајте и изаберите чланове којима желите да дате приступ Менаџеру тајни."
+  },
+  "openYourOrganizations": {
+    "message": "Отворите вашу организацију"
+  },
+  "usingTheMenuSelect": {
+    "message": "Помоћу менија, изаберите"
+  },
+  "toGrantAccessToSelectedMembers": {
+    "message": "да одобрите приступ одабраним члановима."
+  },
   "sendVaultCardTryItNow": {
     "message": "пробај сада",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more, see how it works, or **try it now**.'"
@@ -4038,8 +5653,8 @@
     "message": "да пробаш одмах.",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send or sign up to **try it today.**'"
   },
-  "sendCreatorIdentifier": {
-    "message": "Bitwarden корисник $USER_IDENTIFIER$ је поделио следеће са тобом",
+  "sendAccessCreatorIdentifier": {
+    "message": "Bitwarden члан $USER_IDENTIFIER$ је поделио следеће са тобом",
     "placeholders": {
       "user_identifier": {
         "content": "$1",
@@ -4047,6 +5662,10 @@
       }
     }
   },
+  "viewSend": {
+    "message": "Видети Send",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
   "viewSendHiddenEmailWarning": {
     "message": "Bitwarden корисник који је створио овај „Send“ је изабрао да сакрије своју е-адресу. Требате да се осигурате да верујете извору ове везе пре употребе или преузимања његовог садржаја.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
@@ -4066,29 +5685,41 @@
   "dateParsingError": {
     "message": "Појавила се грешка при снимању датума брисања и истицања."
   },
+  "hideYourEmail": {
+    "message": "Сакријте свој имејл од гледалаца."
+  },
   "webAuthnFallbackMsg": {
     "message": "Да би проверили Ваш 2FA Кликните на дугме испод."
   },
   "webAuthnAuthenticate": {
     "message": "WebAutn аутентификација"
   },
+  "readSecurityKey": {
+    "message": "Read security key"
+  },
+  "awaitingSecurityKeyInteraction": {
+    "message": "Awaiting security key interaction..."
+  },
   "webAuthnNotSupported": {
     "message": "WebAuthn није подржано у овом прегледачу."
   },
   "webAuthnSuccess": {
     "message": "<strong>Успешна провера WebAuthn-а!</strong><br>Можете да затворите овај језичак."
   },
+  "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
+    "message": "Your new password cannot be the same as your current password."
+  },
   "hintEqualsPassword": {
     "message": "Ваша помоћ за лозинку не може да буде иста као лозинка."
   },
-  "enrollPasswordReset": {
-    "message": "Упишите се ресетовање лозинке"
+  "enrollAccountRecovery": {
+    "message": "Пријавите се за опоравак налога"
   },
-  "enrolledPasswordReset": {
-    "message": "Уписани за ресетовање лозинке"
+  "enrolledAccountRecovery": {
+    "message": "Уписан/а у опоравак налога"
   },
-  "withdrawPasswordReset": {
-    "message": "Повуците се са ресетовања лозинке"
+  "withdrawAccountRecovery": {
+    "message": "Повуците са опоравка налога"
   },
   "enrollPasswordResetSuccess": {
     "message": "Успешно уписвање!"
@@ -4096,8 +5727,8 @@
   "withdrawPasswordResetSuccess": {
     "message": "Успешно отписивање!"
   },
-  "eventEnrollPasswordReset": {
-    "message": "Корисник $ID$ је уписан у помоћ за ресетовање лозинке.",
+  "eventEnrollAccountRecovery": {
+    "message": "Корисник $ID$ уписан у опоравак налога.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4105,8 +5736,8 @@
       }
     }
   },
-  "eventWithdrawPasswordReset": {
-    "message": "Корисник $ID$ је укинут са помоћа за ресетовање лозинке.",
+  "eventWithdrawAccountRecovery": {
+    "message": "Корисник $ID$ исписан из опоравка налога.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4153,36 +5784,45 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Ако наставите, објавићете $NAME$ са тренутне сесије, захтевајући их да се поново пријаве. Активне сесије на другим уређајима могу наставити да остају активне до једног сата.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "овај корисник"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Једна или више смерница организације захтевају главну лозинку да би испуњавали следеће захтеве:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Једна или више смерница организације захтевају главну лозинку да би испуњавали следеће захтеве:"
+  },
   "resetPasswordSuccess": {
     "message": "Успешно ресетовање лозинке!"
   },
   "resetPasswordEnrollmentWarning": {
     "message": "Упис ће омогућити администраторима организације да промене вашу главну лозинку. Јесте ли сигурни да желите да се упишете?"
   },
-  "resetPasswordPolicy": {
-    "message": "Ресетовање главне лозинке"
+  "accountRecoveryPolicy": {
+    "message": "Администрација опоравка налога"
   },
-  "resetPasswordPolicyDescription": {
-    "message": "Дозволи администраторе организације да ресетују корисничку главну лозинку за организацију."
+  "accountRecoveryPolicyDesc": {
+    "message": "На основу методе шифровања, опоравите налоге када су главне лозинке или поуздани уређаји заборављени или изгубљени."
   },
-  "resetPasswordPolicyWarning": {
-    "message": "Корисници у организацији ће се морати само-уписати или се аутоматски уписати пре него што администратори могу да ресетују њихову главну лозинку."
+  "accountRecoveryPolicyWarning": {
+    "message": "Постојећи налози са главним лозинкама ће захтевати да се чланови сами пријаве пре него што администратори могу да опораве њихове налоге. Аутоматска регистрација ће укључити опоравак налога за нове чланове."
+  },
+  "accountRecoverySingleOrgRequirementDesc": {
+    "message": "Политика предузећа за јединствену организацију мора бити омогућена пре активирања ове политике."
   },
   "resetPasswordPolicyAutoEnroll": {
     "message": "Ауто уписивање"
   },
-  "resetPasswordPolicyAutoEnrollDescription": {
-    "message": "Сви корисници ће се аутоматски уписати у ресетовање лозинке након што се прихвати њихов позив."
-  },
-  "resetPasswordPolicyAutoEnrollWarning": {
-    "message": "Корисници који су већ у организацији неће бити ретроактивно уписани у ресетовање лозинке. Мораће се само-уписати пре него што администратори могу да ресетују њихову главну лозинку."
-  },
   "resetPasswordPolicyAutoEnrollCheckbox": {
     "message": "Аутоматски упишите нове кориснике"
   },
@@ -4213,12 +5853,21 @@
   "reinviteSelected": {
     "message": "Поновно послати позивнице"
   },
+  "resendNotification": {
+    "message": "Поново ослати обавештење"
+  },
   "noSelectedUsersApplicable": {
     "message": "Ова акција није применљива на било који од одабраних корисника."
   },
   "removeUsersWarning": {
     "message": "Јесте ли сигурни да желите да уклоните следеће кориснике? Процес може потрајати неколико секунди да се заврши, и не може се прекинути или отказати."
   },
+  "removeOrgUsersConfirmation": {
+    "message": "Када се члан уклони, он више нема приступ подацима организације и ова радња је неповратна. Да бисте поново додали члана у организацију, он мора бити позван и поново укључени. Процес може потрајати неколико секунди и не може се прекинути или отказати."
+  },
+  "revokeUsersWarning": {
+    "message": "Када се члан опозове, он више нема приступ подацима организације. Да бисте брзо вратили приступ члану, идите на картицу Опозвано. Процес може потрајати неколико секунди и не може се прекинути или отказати."
+  },
   "theme": {
     "message": "Тема"
   },
@@ -4249,20 +5898,46 @@
   "bulkRemovedMessage": {
     "message": "Успешно уклоњено"
   },
+  "bulkRevokedMessage": {
+    "message": "Успешно опозван приступ организацији"
+  },
+  "bulkRestoredMessage": {
+    "message": "Успешно враћен приступ организацији"
+  },
   "bulkFilteredMessage": {
     "message": "Искључено, није применљиво за ову акцију."
   },
+  "nonCompliantMembersTitle": {
+    "message": "Non-compliant members"
+  },
+  "nonCompliantMembersError": {
+    "message": "Members that are non-compliant with the Single organization or Two-step login policy cannot be restored until they adhere to the policy requirements"
+  },
   "fingerprint": {
     "message": "Отисак прста"
   },
-  "removeUsers": {
-    "message": "Уклони кориснике"
+  "fingerprintPhrase": {
+    "message": "Fingerprint phrase:"
   },
   "error": {
     "message": "Грешка"
   },
-  "resetPasswordManageUsers": {
-    "message": "Управљање корисницима такође морају бити омогућени са дозволом за управљање ресетовање лозинке"
+  "decryptionError": {
+    "message": "Грешка при декрипцији"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden није могао да декриптује ставке из трезора наведене испод."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Обратите се корисничкој подршци",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "да бисте избегли додатни губитак података.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "accountRecoveryManageUsers": {
+    "message": "Корисницима за управљање такође мора бити додељена дозвола за опоравак налога за управљање"
   },
   "setupProvider": {
     "message": "Подешавање првајдера"
@@ -4282,6 +5957,10 @@
   "clients": {
     "message": "Клијента"
   },
+  "client": {
+    "message": "Клијент",
+    "description": "This is used as a table header to describe which client application created an event log."
+  },
   "providerAdmin": {
     "message": "Администратор провајдера"
   },
@@ -4321,9 +6000,15 @@
   "newClientOrganizationDesc": {
     "message": "Креирајте нову организацију клијента која ће бити повезана са вама као провајдера. Бићете у могућности да приступите и управљате овој организацијом."
   },
+  "newClient": {
+    "message": "Нови клијент"
+  },
   "addExistingOrganization": {
     "message": "Додај постојећу организацију"
   },
+  "addNewOrganization": {
+    "message": "Додај нову организацију"
+  },
   "myProvider": {
     "message": "Мој провајдер"
   },
@@ -4382,18 +6067,45 @@
   "add": {
     "message": "Додај"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Главна лозинка успешно постављена"
+  },
   "updatedMasterPassword": {
     "message": "Главна лозинка ажурирана"
   },
   "updateMasterPassword": {
     "message": "Ажурирај главну лозинку"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Промените главну лозинку да бисте завршили опоравак налога."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Ваша главна лозинка не испуњава захтеве ове организације. Промените главну лозинку да бисте наставили."
+  },
   "updateMasterPasswordWarning": {
     "message": "Ваша главна лозинка је недавно промењена од стране администратора организације. Како бисте приступили сефу, морате да ажурирате вашу главну лозинку. Ако наставите бићете одјављени из ваше тренутне сесије, што ће захтевати да се поново пријавите. Активне сесије на другим уређајима ће можда наставити да раде до сат времена."
   },
   "masterPasswordInvalidWarning": {
     "message": "Ваша главна лозинка не испуњава услове политике ове организације. Да бисте се придружили организацији, морате одмах ажурирати своју главну лозинку. Ако наставите, одјавићете се из ваше тренутне сесије. Активне сесије на другим уређајима могу да остану активне до један сат."
   },
+  "updateWeakMasterPasswordWarning": {
+    "message": "Ваша главна лозинка не испуњава једну или више смерница ваше организације. Да бисте приступили сефу, морате одмах да ажурирате главну лозинку. Ако наставите, одјавићете се са ваше тренутне сесије, што захтева да се поново пријавите. Активне сесије на другим уређајима могу да остану активне до један сат."
+  },
+  "automaticAppLogin": {
+    "message": "Аутоматски пријавите кориснике за дозвољене апликације"
+  },
+  "automaticAppLoginDesc": {
+    "message": "Обрасци за пријаву ће аутоматски бити попуњени и послати за апликације које покреће ваш провајдер идентитета."
+  },
+  "automaticAppLoginIdpHostLabel": {
+    "message": "Хост добављача идентитета"
+  },
+  "automaticAppLoginIdpHostDesc": {
+    "message": "Унесите УРЛ хоста добављача идентитета. Унесите више УРЛ-ова одвајањем зарезом."
+  },
+  "tdeDisabledMasterPasswordRequired": {
+    "message": "Ваша организација је ажурирала опције дешифровања. Поставите главну лозинку за приступ вашем сефу."
+  },
   "maximumVaultTimeout": {
     "message": "Тајмаут сефа"
   },
@@ -4425,17 +6137,59 @@
       }
     }
   },
-  "customVaultTimeout": {
-    "message": "Прилагодити тајмаут сефа"
+  "vaultTimeoutPolicyInEffect1": {
+    "message": "Макимум $HOURS$ сат(а) и $MINUTES$ минут(а).",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "vaultTimeoutPolicyWithActionInEffect": {
+    "message": "Смернице ваше организације утичу на временско ограничење сефа. Максимално дозвољено ограничење сефа је $HOURS$ сат(и) и $MINUTES$ минут(а). Ваша радња временског ограничења сефа је подешена на $ACTION$.",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      },
+      "action": {
+        "content": "$3",
+        "example": "Lock"
+      }
+    }
+  },
+  "vaultTimeoutActionPolicyInEffect": {
+    "message": "Смернице ваше организације су поставиле вашу радњу временског ограничења сефа на $ACTION$.",
+    "placeholders": {
+      "action": {
+        "content": "$1",
+        "example": "Lock"
+      }
+    }
   },
   "vaultTimeoutToLarge": {
     "message": "Време истека вашег сефа је премашило дозвољена ограничења од стране ваше организације."
   },
+  "vaultCustomTimeoutMinimum": {
+    "message": "Минимално прилагођено временско ограничење је 1 минут."
+  },
+  "vaultTimeoutRangeError": {
+    "message": "Временско ограничење сефа није у дозвољеном опсегу."
+  },
   "disablePersonalVaultExport": {
     "message": "Онемогућите извоз личног сефа"
   },
-  "disablePersonalVaultExportDesc": {
-    "message": "Забрањује корисницима да извозе своје приватне податке из сефа."
+  "disablePersonalVaultExportDescription": {
+    "message": "Не дозволи члановима да извозе податке из свог индивидуалног сефа."
   },
   "vaultExportDisabled": {
     "message": "Извоз сефа онемогућен"
@@ -4443,6 +6197,18 @@
   "personalVaultExportPolicyInEffect": {
     "message": "Једна или више полиса ваше организације вас спречава да извезете ваш сеф."
   },
+  "activateAutofill": {
+    "message": "Активирати ауто-пуњење"
+  },
+  "activateAutofillPolicyDesc": {
+    "message": "Активирајте ауто-пуњење при учитавању странице на додатку прегледача за све постојеће и нове чланове."
+  },
+  "experimentalFeature": {
+    "message": "Компромитоване или непоуздане веб локације могу да искористе ауто-пуњење при учитавању странице."
+  },
+  "learnMoreAboutAutofill": {
+    "message": "Сазнајте више о ауто-пуњење"
+  },
   "selectType": {
     "message": "Одабрати тип SSO-а"
   },
@@ -4486,34 +6252,34 @@
     "message": "Прилагођен обим"
   },
   "additionalUserIdClaimTypes": {
-    "message": "Custom User ID Claim Types"
+    "message": "Типови захтева за кориснички ИД"
   },
   "additionalEmailClaimTypes": {
-    "message": "Email Claim Types"
+    "message": "Врсте потраживања имејла"
   },
   "additionalNameClaimTypes": {
-    "message": "Custom Name Claim Types"
+    "message": "Типови захтева за корисничко име"
   },
   "acrValues": {
-    "message": "Requested Authentication Context Class Reference values"
+    "message": "Захтеване референтне вредности класе контекста аутентикације"
   },
   "expectedReturnAcrValue": {
-    "message": "Expected \"acr\" Claim Value In Response"
+    "message": "Очекивано \"acr\" захтевају вредност у одговору"
   },
   "spEntityId": {
-    "message": "SP Entity ID"
+    "message": "SP entity ID"
   },
   "spMetadataUrl": {
-    "message": "SAML 2.0 Metadata URL"
+    "message": "SAML 2.0 metadata URL"
   },
   "spAcsUrl": {
-    "message": "Assertion Consumer Service (ACS) URL"
+    "message": "Assertion consumer service (ACS) URL"
   },
   "spNameIdFormat": {
-    "message": "Name ID Format"
+    "message": "Формат ИД назива"
   },
   "spOutboundSigningAlgorithm": {
-    "message": "Outbound Signing Algorithm"
+    "message": "Алгоритам за излазно потписивање"
   },
   "spSigningBehavior": {
     "message": "Понашање пријављања"
@@ -4527,6 +6293,12 @@
   "spValidateCertificates": {
     "message": "Проверити цертификате"
   },
+  "spUniqueEntityId": {
+    "message": "Постави уникатни ИД провајдера сервиса"
+  },
+  "spUniqueEntityIdDesc": {
+    "message": "Генерише идентификатор који је јединствен за вашу организацију"
+  },
   "idpEntityId": {
     "message": "Id ентитета"
   },
@@ -4549,31 +6321,67 @@
     "message": "Дозволи нежељени одговор на аутентификацију"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Allow outbound logout requests"
+    "message": "Дозволи одлазне захтеве за одјављивањем"
   },
   "idpSignAuthenticationRequests": {
     "message": "Sign authentication requests"
   },
   "ssoSettingsSaved": {
-    "message": "Single Sign-On configuration was saved."
+    "message": "Single sign-on configuration saved"
   },
   "sponsoredFamilies": {
-    "message": "Free Bitwarden Families"
+    "message": "Бесплатно Bitwarden Families"
+  },
+  "sponsoredBitwardenFamilies": {
+    "message": "Sponsored families"
+  },
+  "noSponsoredFamiliesMessage": {
+    "message": "Нема спонзорисаних породица"
+  },
+  "nosponsoredFamiliesDetails": {
+    "message": "Овде ће се приказати планови не-чланова породице"
+  },
+  "sponsorshipFreeBitwardenFamilies": {
+    "message": "Чланови ваше организације су прихватљиви за Free Bitwarden Families. Можете спонзорисати Free Bitwarden Families за запослене који нису члан ваше Bitwarden организације. За спонзорисање не-члана потребно је доступно седиште у вашој организацији."
+  },
+  "sponsoredFamiliesRemoveActiveSponsorship": {
+    "message": "When you remove an active sponsorship, a seat within your organization will be available after the renewal date of the sponsored organization."
   },
   "sponsoredFamiliesEligible": {
-    "message": "You and your family are eligible for Free Bitwarden Families. Redeem with your personal email to keep your data secure even when you are not at work."
+    "message": "Ви и ваша породица испуњавате услове за бесплатне Bitwarden Families. Искористите својом личном е-поштом да бисте заштитили своје податке чак и када нисте на послу."
   },
   "sponsoredFamiliesEligibleCard": {
-    "message": "Redeem your Free Bitwarden for Families plan today to keep your data secure even when you are not at work."
+    "message": "Искористите свој бесплатни план Bitwarden for Families данас да бисте заштитили своје податке чак и када нисте на послу."
   },
-  "sponsoredFamiliesInclude": {
-    "message": "The Bitwarden for Families plan include"
+  "sponsoredFamiliesIncludeMessage": {
+    "message": "Bitwarden for Families укључује"
   },
   "sponsoredFamiliesPremiumAccess": {
-    "message": "Premium access for up to 6 users"
+    "message": "Премиум приступ за до 6 корисника"
   },
-  "sponsoredFamiliesSharedCollections": {
-    "message": "Shared collections for Family secrets"
+  "sponsoredFamiliesSharedCollectionsForFamilyMembers": {
+    "message": "Дељене колекције за чланове породице"
+  },
+  "memberFamilies": {
+    "message": "Member families"
+  },
+  "noMemberFamilies": {
+    "message": "No member families"
+  },
+  "noMemberFamiliesDescription": {
+    "message": "Members who have redeemed family plans will display here"
+  },
+  "membersWithSponsoredFamilies": {
+    "message": "Members of your organization are eligible for Free Bitwarden Families. Here you can see members who have sponsored a Families organization."
+  },
+  "organizationHasMemberMessage": {
+    "message": "Спонзорство се не може послати на $EMAIL$ јер је члан ваше организације.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
   },
   "badToken": {
     "message": "Веза више није важећа. Питајте спонзора да поново пошаље понуду."
@@ -4600,34 +6408,34 @@
     "message": "Accept offer for an existing organization or create a new Families organization."
   },
   "setupSponsoredFamiliesLoginDesc": {
-    "message": "You've been offered a free Bitwarden Families Plan Organization. To continue, you need to log in to the account that received the offer."
+    "message": "You've been offered a free Bitwarden Families plan organization. To continue, you need to log in to the account that received the offer."
   },
   "sponsoredFamiliesAcceptFailed": {
-    "message": "Unable to accept offer. Please resend the offer email from your enterprise account and try again."
+    "message": "Unable to accept offer. Please resend the offer email from your Enterprise account and try again."
   },
   "sponsoredFamiliesAcceptFailedShort": {
-    "message": "Unable to accept offer. $DESCRIPTION$",
+    "message": "Није могуће прихватити понуду. $DESCRIPTION$",
     "placeholders": {
       "description": {
         "content": "$1",
-        "example": "You must have at least one existing Families Organization."
+        "example": "You must have at least one existing Families organization."
       }
     }
   },
   "sponsoredFamiliesOffer": {
-    "message": "Accept Free Bitwarden Families"
+    "message": "Прихвати Бесплатно Free Bitwarden Families"
   },
   "sponsoredFamiliesOfferRedeemed": {
-    "message": "Free Bitwarden Families offer successfully redeemed"
+    "message": "Бесплатна понуда за Bitwarden Families је успешно искоришћена"
   },
   "redeemed": {
-    "message": "Redeemed"
+    "message": "Откупљено"
   },
   "redeemedAccount": {
-    "message": "Redeemed Account"
+    "message": "Налог откупљен"
   },
-  "revokeAccount": {
-    "message": "Revoke account $NAME$",
+  "revokeAccountMessage": {
+    "message": "Опозови налог $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4636,7 +6444,7 @@
     }
   },
   "resendEmailLabel": {
-    "message": "Resend Sponsorship email to $NAME$ sponsorship",
+    "message": "Resend sponsorship email to $NAME$ sponsorship",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4645,10 +6453,10 @@
     }
   },
   "freeFamiliesPlan": {
-    "message": "Free Families Plan"
+    "message": "Бесплатан породични план"
   },
   "redeemNow": {
-    "message": "Redeem Now"
+    "message": "Откупи сада"
   },
   "recipient": {
     "message": "Прималац"
@@ -4662,15 +6470,9 @@
   "sponsorshipCreated": {
     "message": "Спонзорство креиран"
   },
-  "revoke": {
-    "message": "Опозови"
-  },
   "emailSent": {
     "message": "Е-пошта је послата"
   },
-  "revokeSponsorshipConfirmation": {
-    "message": "After removing this account, the Families plan sponsorship will expire at the end of the billing period. You will not be able to redeem a new sponsorship offer until the existing one expires. Are you sure you want to continue?"
-  },
   "removeSponsorshipSuccess": {
     "message": "Спонзорство уклоњено"
   },
@@ -4698,17 +6500,17 @@
   "verificationCodeRequired": {
     "message": "Верификациони код је обавезан."
   },
+  "webauthnCancelOrTimeout": {
+    "message": "Аутентификација је отказана или је трајала предуго. Молим вас, покушајте поново."
+  },
   "invalidVerificationCode": {
     "message": "Неисправан верификациони код"
   },
-  "convertOrganizationEncryptionDesc": {
-    "message": "$ORGANIZATION$ is using SSO with a self-hosted key server. A master password is no longer required to log in for members of this organization.",
-    "placeholders": {
-      "organization": {
-        "content": "$1",
-        "example": "My Org Name"
-      }
-    }
+  "removeMasterPasswordForOrganizationUserKeyConnector": {
+    "message": "Главна лозинка више није потребна за чланове следеће организације. Молимо потврдите домен са администратором организације."
+  },
+  "keyConnectorDomain": {
+    "message": "Домен конектора кључа"
   },
   "leaveOrganization": {
     "message": "Напусти организацију"
@@ -4727,33 +6529,39 @@
   },
   "ssoPolicyHelpStart": {
     "message": "Упалити",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enable the SSO Authentication policy to require all members to log in with SSO.'"
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
-  "ssoPolicyHelpLink": {
-    "message": "политику SSO аутентификације",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enable the SSO Authentication policy to require all members to log in with SSO.'"
+  "ssoPolicyHelpAnchor": {
+    "message": "захтева смернице за аутентификацију јединственог пријављивања",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpEnd": {
     "message": "да би сви чланови обавезно користили SSO.",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enable the SSO Authentication policy to require all members to log in with SSO.'"
-  },
-  "ssoPolicyHelpKeyConnector": {
-    "message": "SSO Authentication and Single Organization policies are required to set up Key Connector decryption."
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "memberDecryptionOption": {
-    "message": "Member Decryption Options"
+    "message": "Опциј дешифровања члана"
   },
   "memberDecryptionPassDesc": {
-    "message": "Once authenticated, members will decrypt vault data using their Master Passwords."
+    "message": "Након аутентификације, чланови ће дешифровати податке из сефа користећи своје главне лозинке."
   },
   "keyConnector": {
     "message": "Key Connector"
   },
-  "memberDecryptionKeyConnectorDesc": {
-    "message": "Connect Login with SSO to your self-hosted decryption key server. Using this option, members won’t need to use their Master Passwords to decrypt vault data. Contact Bitwarden Support for set up assistance."
+  "memberDecryptionKeyConnectorDescStart": {
+    "message": "Connect login with SSO to your self-hosted decryption key server. Using this option, members won’t need to use their master passwords to decrypt vault data. The",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Connect login with SSO to your self-hosted decryption key server. Using this option, members won’t need to use their master passwords to decrypt vault data. The require SSO authentication and single organization policies are required to set up Key Connector decryption. Contact Bitwarden Support for set up assistance.'"
+  },
+  "memberDecryptionKeyConnectorDescLink": {
+    "message": "require SSO authentication and single organization policies",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Connect login with SSO to your self-hosted decryption key server. Using this option, members won’t need to use their master passwords to decrypt vault data. The require SSO authentication and single organization policies are required to set up Key Connector decryption. Contact Bitwarden Support for set up assistance.'"
+  },
+  "memberDecryptionKeyConnectorDescEnd": {
+    "message": "are required to set up Key Connector decryption. Contact Bitwarden Support for set up assistance.",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Connect login with SSO to your self-hosted decryption key server. Using this option, members won’t need to use their master passwords to decrypt vault data. The require SSO authentication and single organization policies are required to set up Key Connector decryption. Contact Bitwarden Support for set up assistance.'"
   },
   "keyConnectorPolicyRestriction": {
-    "message": "\"Login with SSO and Key Connector Decryption\" is enabled. This policy will only apply to Owners and Admins."
+    "message": "\"Login with SSO and Key Connector Decryption\" is activated. This policy will only apply to owners and admins."
   },
   "enabledSso": {
     "message": "SSO омогућен"
@@ -4768,7 +6576,7 @@
     "message": "Онемогућити Key Connector"
   },
   "keyConnectorWarning": {
-    "message": "Once members begin using Key Connector, your Organization cannot revert to Master Password decryption. Proceed only if you are comfortable deploying and managing a key server."
+    "message": "Once members begin using Key Connector, your organization cannot revert to master password decryption. Proceed only if you are comfortable deploying and managing a key server."
   },
   "migratedKeyConnector": {
     "message": "Мигрирано на Key Connector"
@@ -4780,13 +6588,13 @@
     "message": "The sponsorship offer has expired. You may delete the organization you created to avoid a charge at the end of your 7 day trial. Otherwise you may close this prompt to keep the organization and assume billing responsibility."
   },
   "newFamiliesOrganization": {
-    "message": "New Families Organization"
+    "message": "Нова организација Families"
   },
   "acceptOffer": {
     "message": "Прихвати понуду"
   },
   "sponsoringOrg": {
-    "message": "Sponsoring Organization"
+    "message": "Спонзорска организација"
   },
   "keyConnectorTest": {
     "message": "Тест"
@@ -4798,28 +6606,28 @@
     "message": "Key Connector недоступан. Проверити URL."
   },
   "sponsorshipTokenHasExpired": {
-    "message": "The sponsorship offer has expired."
+    "message": "Понуда за спонзорство је истекла."
   },
   "freeWithSponsorship": {
     "message": "БЕСПЛАТНО уз спонзорство"
   },
   "viewBillingSyncToken": {
-    "message": "View Billing Sync Token"
+    "message": "Види токен синхронизације наплате"
   },
-  "generateBillingSyncToken": {
-    "message": "Generate Billing Sync Token"
+  "generateBillingToken": {
+    "message": "Генериши токен наплате"
   },
   "copyPasteBillingSync": {
-    "message": "Copy and paste this token into the Billing Sync settings of your self-hosted organization."
+    "message": "Copy and paste this token into the billing sync settings of your self-hosted organization."
   },
   "billingSyncCanAccess": {
-    "message": "Your Billing Sync token can access and edit this organization's subscription settings."
+    "message": "Your billing sync token can access and edit this organization's subscription settings."
   },
-  "manageBillingSync": {
-    "message": "Manage Billing Sync"
+  "manageBillingTokenSync": {
+    "message": "Управљати токеном наплате"
   },
   "setUpBillingSync": {
-    "message": "Set Up Billing Sync"
+    "message": "Подесити синхронизацију наплате"
   },
   "generateToken": {
     "message": "Генеришите Токен"
@@ -4831,28 +6639,58 @@
     "message": "If you proceed, you will need to re-setup billing sync on your self-hosted server."
   },
   "rotateBillingSyncTokenTitle": {
-    "message": "Rotating the Billing Sync Token will invalidate the previous token."
+    "message": "Rotating the billing sync token will invalidate the previous token."
+  },
+  "selfHostedServer": {
+    "message": "личан хостинг"
+  },
+  "customEnvironment": {
+    "message": "Прилагођено окружење"
+  },
+  "selfHostedBaseUrlHint": {
+    "message": "Наведите основну УРЛ адресу вашег локалног хостовања Bitwarden-а. Пример: https://bitwarden.company.com"
+  },
+  "selfHostedCustomEnvHeader": {
+    "message": "За напредну конфигурацију, можете навести основну УРЛ адресу сваке услуге независно."
+  },
+  "selfHostedEnvFormInvalid": {
+    "message": "Морате додати или основни УРЛ сервера или бар једно прилагођено окружење."
+  },
+  "apiUrl": {
+    "message": "УРЛ АПИ Сервера"
+  },
+  "webVaultUrl": {
+    "message": "УРЛ сервера Сефа"
+  },
+  "identityUrl": {
+    "message": "УРЛ сервера идентитета"
+  },
+  "notificationsUrl": {
+    "message": "УРЛ сервера обавештења"
+  },
+  "iconsUrl": {
+    "message": "УРЛ сервера иконица"
+  },
+  "environmentSaved": {
+    "message": "УРЛ адресе окружења су сачуване"
   },
   "selfHostingTitle": {
-    "message": "Self-Hosting"
+    "message": "Ауто-хстинг"
   },
   "selfHostingEnterpriseOrganizationSectionCopy": {
     "message": "To set-up your organization on your own server, you will need to upload your license file. To support Free Families plans and advanced billing capabilities for your self-hosted organization, you will need to set up billing sync."
   },
   "billingSyncApiKeyRotated": {
-    "message": "Token rotated."
-  },
-  "billingSync": {
-    "message": "Billing Sync"
-  },
-  "billingSyncDesc": {
-    "message": "Billing Sync provides Free Families plans for members and advanced billing capabilities by linking your self-hosted Bitwarden to the Bitwarden cloud server."
+    "message": "Токен је обрнут."
   },
   "billingSyncKeyDesc": {
-    "message": "A Billing Sync Token from your cloud organization's subscription settings is required to complete this form."
+    "message": "A billing sync token from your cloud organization's subscription settings is required to complete this form."
   },
   "billingSyncKey": {
-    "message": "Billing Sync Token"
+    "message": "Синхронизација токена наплате"
+  },
+  "automaticBillingSyncDesc": {
+    "message": "Аутоматска синхронизација откључава Families спонзорства и омогућава вам да синхронизујете лиценцу без отпремања датотеке. Након ажурирања на Bitwarden клауд серверу, изаберите Синх Лиценсе да бисте применили промене."
   },
   "active": {
     "message": "Активан"
@@ -4896,20 +6734,45 @@
   "required": {
     "message": "обавезно"
   },
+  "charactersCurrentAndMaximum": {
+    "message": "$CURRENT$ од макс $MAX$ карактера",
+    "placeholders": {
+      "current": {
+        "content": "$1",
+        "example": "0"
+      },
+      "max": {
+        "content": "$2",
+        "example": "100"
+      }
+    }
+  },
+  "characterMaximum": {
+    "message": "Максимум $MAX$ карактера",
+    "placeholders": {
+      "max": {
+        "content": "$1",
+        "example": "100"
+      }
+    }
+  },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Required if Entity ID is not a URL."
+    "message": "Потребно ако Entity ID није УРЛ."
+  },
+  "offerNoLongerValid": {
+    "message": "This offer is no longer valid. Contact your organization administrators for more information."
   },
   "openIdOptionalCustomizations": {
     "message": "Опциона подешавања"
   },
   "openIdAuthorityRequired": {
-    "message": "Required if Authority is not valid."
+    "message": "Потребно ако Authority није добро."
   },
   "separateMultipleWithComma": {
     "message": "Вишеструко одвојите зарезом."
   },
   "sessionTimeout": {
-    "message": "Your session has timed out. Please go back and try logging in again."
+    "message": "Ваша сесија је истекла. Вратите се и покушајте поново да се пријавите."
   },
   "exportingPersonalVaultTitle": {
     "message": "Извоз личног сефа"
@@ -4917,8 +6780,8 @@
   "exportingOrganizationVaultTitle": {
     "message": "Извоз сефа организације"
   },
-  "exportingPersonalVaultDescription": {
-    "message": "Only the personal vault items associated with $EMAIL$ will be exported. Organization vault items will not be included.",
+  "exportingIndividualVaultDescription": {
+    "message": "Само појединачне ставке сефа повезане са $EMAIL$ ће бити извењене. Ставке организационог сефа неће бити укључене. Само информације о ставкама из сефа ће бити извезене и неће укључивати повезане прилоге.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4926,8 +6789,17 @@
       }
     }
   },
-  "exportingOrganizationVaultDescription": {
-    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. Personal vault items and items from other organizations will not be included.",
+  "exportingIndividualVaultWithAttachmentsDescription": {
+    "message": "Извешће се само појединачни сеф, укључујући прилоге повезане са $EMAIL$. Организациони сефски предмети неће бити укључени",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
+  "exportingOrganizationVaultDesc": {
+    "message": "Биће извезен само сеф организације повезан са $ORGANIZATION$. Ставке у појединачним сефовима или другим организацијама неће бити укључене.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4960,26 +6832,79 @@
     "message": "Тренутна организација",
     "description": "This is used by screen readers to indicate the organization that is currently being shown to the user."
   },
+  "accountLoggedInAsName": {
+    "message": "Налог: Пријављено као $NAME$",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "accountSettings": {
     "message": "Подешавања налога"
   },
   "generator": {
-    "message": "Генератор"
-  },
-  "whatWouldYouLikeToGenerate": {
-    "message": "Шта желите да генеришете?"
-  },
-  "passwordType": {
-    "message": "Тип лозинке"
-  },
-  "regenerateUsername": {
-    "message": "Поново генериши име"
+    "message": "Генератор",
+    "description": "Short for 'credential generator'."
   },
   "generateUsername": {
     "message": "Генериши име"
   },
-  "usernameType": {
-    "message": "Тип имена"
+  "generateEmail": {
+    "message": "Генеришите имејл"
+  },
+  "generatePassword": {
+    "message": "Генерисање лозинке"
+  },
+  "generatePassphrase": {
+    "message": "Генеришите приступну фразу"
+  },
+  "passwordGenerated": {
+    "message": "Лозинка генерисана"
+  },
+  "passphraseGenerated": {
+    "message": "Приступна фраза је генерисана"
+  },
+  "usernameGenerated": {
+    "message": "Корисничко име генерисано"
+  },
+  "emailGenerated": {
+    "message": "Имејл генерисан"
+  },
+  "spinboxBoundariesHint": {
+    "message": "Value must be between $MIN$ and $MAX$.",
+    "description": "Explains spin box minimum and maximum values to the user",
+    "placeholders": {
+      "min": {
+        "content": "$1",
+        "example": "8"
+      },
+      "max": {
+        "content": "$2",
+        "example": "128"
+      }
+    }
+  },
+  "passwordLengthRecommendationHint": {
+    "message": " Use $RECOMMENDED$ characters or more to generate a strong password.",
+    "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
+    "placeholders": {
+      "recommended": {
+        "content": "$1",
+        "example": "14"
+      }
+    }
+  },
+  "passphraseNumWordsRecommendationHint": {
+    "message": " Use $RECOMMENDED$ words or more to generate a strong passphrase.",
+    "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
+    "placeholders": {
+      "recommended": {
+        "content": "$1",
+        "example": "6"
+      }
+    }
   },
   "plusAddressedEmail": {
     "message": "Плус имејл адресе",
@@ -4992,7 +6917,10 @@
     "message": "„Ухвати све“ е-порука"
   },
   "catchallEmailDesc": {
-    "message": "Use your domain's configured catch-all inbox."
+    "message": "Користите подешено catch-all пријемно сандуче вашег домена."
+  },
+  "useThisEmail": {
+    "message": "Користи овај имејл"
   },
   "random": {
     "message": "Случајно",
@@ -5001,6 +6929,29 @@
   "randomWord": {
     "message": "Случајна реч"
   },
+  "usernameGenerator": {
+    "message": "Генератор корисничког имена"
+  },
+  "useThisPassword": {
+    "message": "Употреби ову лозинку"
+  },
+  "useThisPassphrase": {
+    "message": "Употреби ову приступну фразу"
+  },
+  "useThisUsername": {
+    "message": "Употреби ово корисничко име"
+  },
+  "securePasswordGenerated": {
+    "message": "Сигурна лозинка је генерисана! Не заборавите да ажурирате и своју лозинку на веб локацији."
+  },
+  "useGeneratorHelpTextPartOne": {
+    "message": "Употребити генератор",
+    "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
+  },
+  "useGeneratorHelpTextPartTwo": {
+    "message": "да креирате јаку јединствену лозинку",
+    "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
+  },
   "service": {
     "message": "Сервис"
   },
@@ -5039,7 +6990,7 @@
   },
   "lastSync": {
     "message": "Последња синхронизација",
-    "Description": "Used as a prefix to indicate the last time a sync occured. Example \"Last sync 1968-11-16 00:00:00\""
+    "description": "Used as a prefix to indicate the last time a sync occurred. Example \"Last sync 1968-11-16 00:00:00\""
   },
   "sponsorshipsSynced": {
     "message": "Self-hosted sponsorships synced."
@@ -5054,20 +7005,3854 @@
     }
   },
   "billingContactProviderForAssistance": {
-    "message": "Please reach out to them for further assistance",
+    "message": "Обратите се њима за даљу помоћ",
     "description": "This text is displayed if an organization's billing is managed by a Provider. It tells the user to contact the Provider for assistance."
   },
   "forwardedEmail": {
-    "message": "Forwarded Email Alias"
+    "message": "Прослеђен псеудоним е-поште"
   },
   "forwardedEmailDesc": {
-    "message": "Generate an email alias with an external forwarding service."
+    "message": "Генеришите псеудоним е-поште помоћу екстерне услуге прослеђивања."
+  },
+  "forwarderDomainName": {
+    "message": "Домен имејла",
+    "description": "Labels the domain name email forwarder service option"
+  },
+  "forwarderDomainNameHint": {
+    "message": "Изаберите домен који подржава изабрана услуга",
+    "description": "Guidance provided for email forwarding services that support multiple email domains."
+  },
+  "forwarderError": {
+    "message": "$SERVICENAME$ грешка: $ERRORMESSAGE$",
+    "description": "Reports an error returned by a forwarding service to the user.",
+    "placeholders": {
+      "servicename": {
+        "content": "$1",
+        "example": "SimpleLogin"
+      },
+      "errormessage": {
+        "content": "$2",
+        "example": "Invalid characters in domain name."
+      }
+    }
+  },
+  "forwarderGeneratedBy": {
+    "message": "Генерисао Bitwarden.",
+    "description": "Displayed with the address on the forwarding service's configuration screen."
+  },
+  "forwarderGeneratedByWithWebsite": {
+    "message": "Вебсајт: $WEBSITE$. Генерисао Bitwarden.",
+    "description": "Displayed with the address on the forwarding service's configuration screen.",
+    "placeholders": {
+      "WEBSITE": {
+        "content": "$1",
+        "example": "www.example.com"
+      }
+    }
+  },
+  "forwaderInvalidToken": {
+    "message": "Погрешан АПИ токен $SERVICENAME$",
+    "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
+    "placeholders": {
+      "servicename": {
+        "content": "$1",
+        "example": "SimpleLogin"
+      }
+    }
+  },
+  "forwaderInvalidTokenWithMessage": {
+    "message": "Погрешан АПИ токен $SERVICENAME$: $ERRORMESSAGE$",
+    "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
+    "placeholders": {
+      "servicename": {
+        "content": "$1",
+        "example": "SimpleLogin"
+      },
+      "errormessage": {
+        "content": "$2",
+        "example": "Please verify your email address to continue."
+      }
+    }
+  },
+  "forwaderInvalidOperation": {
+    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
+    "placeholders": {
+      "servicename": {
+        "content": "$1",
+        "example": "SimpleLogin"
+      }
+    }
+  },
+  "forwaderInvalidOperationWithMessage": {
+    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
+    "placeholders": {
+      "servicename": {
+        "content": "$1",
+        "example": "SimpleLogin"
+      },
+      "errormessage": {
+        "content": "$2",
+        "example": "Please verify your email address to continue."
+      }
+    }
+  },
+  "forwarderNoAccountId": {
+    "message": "Није могуће добити ИД налога маскираног имејла $SERVICENAME$.",
+    "description": "Displayed when the forwarding service fails to return an account ID.",
+    "placeholders": {
+      "servicename": {
+        "content": "$1",
+        "example": "SimpleLogin"
+      }
+    }
+  },
+  "forwarderNoDomain": {
+    "message": "Погрешан домен $SERVICENAME$.",
+    "description": "Displayed when the domain is empty or domain authorization failed at the forwarding service.",
+    "placeholders": {
+      "servicename": {
+        "content": "$1",
+        "example": "SimpleLogin"
+      }
+    }
+  },
+  "forwarderNoUrl": {
+    "message": "Погрешан УРЛ $SERVICENAME$.",
+    "description": "Displayed when the url of the forwarding service wasn't supplied.",
+    "placeholders": {
+      "servicename": {
+        "content": "$1",
+        "example": "SimpleLogin"
+      }
+    }
+  },
+  "forwarderUnknownError": {
+    "message": "Непозната грешка $SERVICENAME$-а.",
+    "description": "Displayed when the forwarding service failed due to an unknown error.",
+    "placeholders": {
+      "servicename": {
+        "content": "$1",
+        "example": "SimpleLogin"
+      }
+    }
+  },
+  "forwarderUnknownForwarder": {
+    "message": "Непознати шпедитер: '$SERVICENAME$'.",
+    "description": "Displayed when the forwarding service is not supported.",
+    "placeholders": {
+      "servicename": {
+        "content": "$1",
+        "example": "JustTrust.us"
+      }
+    }
   },
   "hostname": {
     "message": "Име домаћина",
     "description": "Part of a URL."
   },
-  "apiAccessToken": {
-    "message": "Приступни АПИ токен"
+  "deviceVerification": {
+    "message": "Провера уређаја"
+  },
+  "enableDeviceVerification": {
+    "message": "Омогућити проверу уређаја"
+  },
+  "deviceVerificationDesc": {
+    "message": "Када је омогућено, верификациони кодови се шаљу на вашу е-адресу када се пријавите са непрепознатог уређаја"
+  },
+  "updatedDeviceVerification": {
+    "message": "Провера уређаја је ажурирана"
+  },
+  "areYouSureYouWantToEnableDeviceVerificationTheVerificationCodeEmailsWillArriveAtX": {
+    "message": "Да ли сте сигурни да желите да омогућите верификацију уређаја? Верификациони кодо ће бити послат на: $EMAIL$",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "My Email"
+      }
+    }
+  },
+  "premiumSubcriptionRequired": {
+    "message": "Premium претплата је потребна"
+  },
+  "scim": {
+    "message": "SCIM provisioning",
+    "description": "The text, 'SCIM', is an acronym and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronym and should not be translated."
+  },
+  "scimIntegrationDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning. Find supported integrations",
+    "description": "the text, 'SCIM', is an acronym and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Упали SCIM",
+    "description": "the text, 'SCIM', is an acronym and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronym and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API key",
+    "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Променити кључ"
+  },
+  "scimApiKey": {
+    "message": "SCIM API key",
+    "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronyms and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM УРЛ",
+    "description": "the text, 'SCIM' and 'URL', are acronyms and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "SCIM API кључ успешно ротиран",
+    "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM подешавања сачувана",
+    "description": "the text, 'SCIM', is an acronym and should not be translated."
+  },
+  "inputRequired": {
+    "message": "Унос је потребан."
+  },
+  "inputEmail": {
+    "message": "Унос није е-адреса."
+  },
+  "inputMinLength": {
+    "message": "Унос трба имати најмање $COUNT$ слова.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "8"
+      }
+    }
+  },
+  "inputMaxLength": {
+    "message": "Унос не сме бити већи од $COUNT$ карактера.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "inputForbiddenCharacters": {
+    "message": "The following characters are not allowed: $CHARACTERS$",
+    "placeholders": {
+      "characters": {
+        "content": "$1",
+        "example": "@, #, $, %"
+      }
+    }
+  },
+  "inputMinValue": {
+    "message": "Вредност мора бити најмање $MIN$.",
+    "placeholders": {
+      "min": {
+        "content": "$1",
+        "example": "8"
+      }
+    }
+  },
+  "inputMaxValue": {
+    "message": "Вредност не сме бити већа од $MAX$.",
+    "placeholders": {
+      "max": {
+        "content": "$1",
+        "example": "100"
+      }
+    }
+  },
+  "multipleInputEmails": {
+    "message": "1 или више имејлова су неважећи"
+  },
+  "tooManyEmails": {
+    "message": "Можете послати само до $COUNT$ имејла истовремено",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "20"
+      }
+    }
+  },
+  "fieldsNeedAttention": {
+    "message": "$COUNT$ поље(а) изнад захтевај(у) вашу пажњу.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "4"
+      }
+    }
+  },
+  "singleFieldNeedsAttention": {
+    "message": "1 поље захтева вашу пажњу."
+  },
+  "multipleFieldsNeedAttention": {
+    "message": "$COUNT$ поља захтевају вашу пажњу.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "duoHealthCheckResultsInNullAuthUrlError": {
+    "message": "Грешка при повезивању са услугом Duo. Користите други метод пријаве у два корака или контактирајте Duo за помоћ."
+  },
+  "duoRequiredByOrgForAccount": {
+    "message": "DUO пријава у два корака је потребна за ваш налог."
+  },
+  "duoTwoFactorRequiredPageSubtitle": {
+    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+  },
+  "followTheStepsBelowToFinishLoggingIn": {
+    "message": "Follow the steps below to finish logging in."
+  },
+  "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
+    "message": "Следите наведене кораке да бисте завршили пријаву са својим безбедносним кључем."
+  },
+  "launchDuo": {
+    "message": "Покренути DUO"
+  },
+  "turnOn": {
+    "message": "Укључи"
+  },
+  "on": {
+    "message": "Укључено"
+  },
+  "off": {
+    "message": "Искључено"
+  },
+  "members": {
+    "message": "Чланови"
+  },
+  "reporting": {
+    "message": "Пријављивање"
+  },
+  "numberOfUsers": {
+    "message": "Број корисника"
+  },
+  "pickAnAvatarColor": {
+    "message": "Изабрати боју аватара"
+  },
+  "customizeAvatar": {
+    "message": "Прилагодити аватар"
+  },
+  "avatarUpdated": {
+    "message": "Аватар ажуриран"
+  },
+  "brightBlue": {
+    "message": "Јаркоплава"
+  },
+  "green": {
+    "message": "Зелена"
+  },
+  "orange": {
+    "message": "Наранџаста"
+  },
+  "lavender": {
+    "message": "Лаванда"
+  },
+  "yellow": {
+    "message": "Жута"
+  },
+  "indigo": {
+    "message": "Индиго"
+  },
+  "teal": {
+    "message": "Плавозелена"
+  },
+  "salmon": {
+    "message": "Лосос"
+  },
+  "pink": {
+    "message": "Розе"
+  },
+  "customColor": {
+    "message": "Сопствена боја"
+  },
+  "selectPlaceholder": {
+    "message": "-- Одабрати --"
+  },
+  "multiSelectPlaceholder": {
+    "message": "-- Тип за филтрирање --"
+  },
+  "multiSelectLoading": {
+    "message": "Преузимање опција..."
+  },
+  "multiSelectNotFound": {
+    "message": "Ни једна ставка"
+  },
+  "multiSelectClearAll": {
+    "message": "Обриши све"
+  },
+  "toggleCharacterCount": {
+    "message": "Пребаци бројање слова",
+    "description": "'Character count' describes a feature that displays a number next to each character of the password."
+  },
+  "passwordCharacterCount": {
+    "message": "Број знакова лозинке",
+    "description": "'Character count' describes a feature that displays a number next to each character of the password."
+  },
+  "hide": {
+    "message": "Сакриј"
+  },
+  "projects": {
+    "message": "Пројекти",
+    "description": "Description for the Projects field."
+  },
+  "lastEdited": {
+    "message": "Последња измена",
+    "description": "The label for the date and time when a item was last edited."
+  },
+  "editSecret": {
+    "message": "Уреди тајну",
+    "description": "Action to modify an existing secret."
+  },
+  "addSecret": {
+    "message": "Додај тајну",
+    "description": "Action to create a new secret."
+  },
+  "copySecretName": {
+    "message": "Копирати име тајне",
+    "description": "Action to copy the name of a secret to the system's clipboard."
+  },
+  "copySecretValue": {
+    "message": "Копирати вредност тајне",
+    "description": "Action to copy the value of a secret to the system's clipboard."
+  },
+  "deleteSecret": {
+    "message": "Обрисати тајну",
+    "description": "Action to delete a single secret from the system."
+  },
+  "deleteSecrets": {
+    "message": "Обрисати тајне",
+    "description": "The action to delete multiple secrets from the system."
+  },
+  "hardDeleteSecret": {
+    "message": "Трајно избрисати тајну"
+  },
+  "hardDeleteSecrets": {
+    "message": "Трајно избрисати тајне"
+  },
+  "secretProjectAssociationDescription": {
+    "message": "Изаберите пројекте са којима ће тајна бити повезана. Тајну ће моћи да виде само корисници организације са приступом овим пројектима.",
+    "description": "A prompt explaining how secrets can be associated with projects."
+  },
+  "selectProjects": {
+    "message": "Одабрати пројекте",
+    "description": "A label for a type-to-filter input field to choose projects."
+  },
+  "searchProjects": {
+    "message": "Претражити пројекте",
+    "description": "Label for the search bar used to search projects."
+  },
+  "project": {
+    "message": "Пројекат",
+    "description": "Similar to collections, projects can be used to group secrets."
+  },
+  "editProject": {
+    "message": "Уреди Пројекат",
+    "description": "The action to modify an existing project."
+  },
+  "viewProject": {
+    "message": "Приказ пројекта",
+    "description": "The action to view details of a project."
+  },
+  "deleteProject": {
+    "message": "Избриши пројекат",
+    "description": "The action to delete a project from the system."
+  },
+  "deleteProjects": {
+    "message": "Избриши пројекте",
+    "description": "The action to delete multiple projects from the system."
+  },
+  "secret": {
+    "message": "Тајна",
+    "description": "Label for a secret (key/value pair)"
+  },
+  "serviceAccount": {
+    "message": "Налог сервиса",
+    "description": "A machine user which can be used to automate processes and access secrets in the system."
+  },
+  "serviceAccounts": {
+    "message": "Налози сервиса",
+    "description": "The title for the section that deals with service accounts."
+  },
+  "secrets": {
+    "message": "Тајне",
+    "description": "The title for the section of the application that deals with secrets."
+  },
+  "nameValuePair": {
+    "message": "Name/Value pair",
+    "description": "Title for a name/ value pair. Secrets typically consist of a name and value pair."
+  },
+  "secretEdited": {
+    "message": "Тајна промењена",
+    "description": "Notification for the successful editing of a secret."
+  },
+  "secretCreated": {
+    "message": "Тајна креирана",
+    "description": "Notification for the successful creation of a secret."
+  },
+  "newSecret": {
+    "message": "Нова тајна",
+    "description": "Title for creating a new secret."
+  },
+  "newServiceAccount": {
+    "message": "Нови налог услуге",
+    "description": "Title for creating a new service account."
+  },
+  "secretsNoItemsTitle": {
+    "message": "Нема тајне за приказ",
+    "description": "Empty state to indicate that there are no secrets to display."
+  },
+  "secretsNoItemsMessage": {
+    "message": "Да бисте започели, додајте нову тајну или увезите тајне.",
+    "description": "Message to encourage the user to start adding secrets."
+  },
+  "secretsTrashNoItemsMessage": {
+    "message": "У отпад нема тајне."
+  },
+  "serviceAccountsNoItemsMessage": {
+    "message": "Create a new service account to get started automating secret access.",
+    "description": "Message to encourage the user to start creating service accounts."
+  },
+  "serviceAccountsNoItemsTitle": {
+    "message": "Нема ништа за приказати",
+    "description": "Title to indicate that there are no service accounts to display."
+  },
+  "searchSecrets": {
+    "message": "Претражити тајне",
+    "description": "Placeholder text for searching secrets."
+  },
+  "deleteServiceAccounts": {
+    "message": "Избришите сервисне налоге",
+    "description": "Title for the action to delete one or multiple service accounts."
+  },
+  "deleteServiceAccount": {
+    "message": "Избришите сервисни налог",
+    "description": "Title for the action to delete a single service account."
+  },
+  "viewServiceAccount": {
+    "message": "Видети сервисни налог",
+    "description": "Action to view the details of a service account."
+  },
+  "deleteServiceAccountDialogMessage": {
+    "message": "Брисање налога услуге $SERVICE_ACCOUNT$ је трајно и неповратно.",
+    "placeholders": {
+      "service_account": {
+        "content": "$1",
+        "example": "Service account name"
+      }
+    }
+  },
+  "deleteServiceAccountsDialogMessage": {
+    "message": "Брисање услужних налога је трајно и неповратно."
+  },
+  "deleteServiceAccountsConfirmMessage": {
+    "message": "Брисање $COUNT$ сервисна рачуна",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "deleteServiceAccountToast": {
+    "message": "Сервисни налог избрисан"
+  },
+  "deleteServiceAccountsToast": {
+    "message": "Услужни налог избрисан"
+  },
+  "searchServiceAccounts": {
+    "message": "Тражити сервисне налоге",
+    "description": "Placeholder text for searching service accounts."
+  },
+  "editServiceAccount": {
+    "message": "Уредити услужни налог",
+    "description": "Title for editing a service account."
+  },
+  "addProject": {
+    "message": "Додај пројекат",
+    "description": "Title for creating a new project."
+  },
+  "projectEdited": {
+    "message": "Пројекат промењен",
+    "description": "Notification for the successful editing of a project."
+  },
+  "projectSaved": {
+    "message": "Пројекат сачуван",
+    "description": "Notification for the successful saving of a project."
+  },
+  "projectCreated": {
+    "message": "Пројекат креиран",
+    "description": "Notification for the successful creation of a project."
+  },
+  "projectName": {
+    "message": "Назив Пројекта",
+    "description": "Label for entering the name of a project."
+  },
+  "newProject": {
+    "message": "Нови пројекат",
+    "description": "Title for creating a new project."
+  },
+  "softDeleteSecretWarning": {
+    "message": "Брисање тајни може утицати на постојеће интеграције.",
+    "description": "Warns that deleting secrets can have consequences on integrations"
+  },
+  "softDeletesSuccessToast": {
+    "message": "Тајне послане у отпад",
+    "description": "Notifies that the selected secrets have been moved to the trash"
+  },
+  "hardDeleteSecretConfirmation": {
+    "message": "Да ли сте сигурни да желите да трајно избришете ову тајну?"
+  },
+  "hardDeleteSecretsConfirmation": {
+    "message": "Да ли сте сигурни да желите да трајно избришете ове тајне?"
+  },
+  "hardDeletesSuccessToast": {
+    "message": "Тајне трајно избрисане"
+  },
+  "smAccess": {
+    "message": "Приступ",
+    "description": "Title indicating what permissions a service account has"
+  },
+  "projectCommaSecret": {
+    "message": "Пројекат, тајна",
+    "description": ""
+  },
+  "serviceAccountName": {
+    "message": "Има налога сервиса",
+    "description": "Label for the name of a service account"
+  },
+  "serviceAccountCreated": {
+    "message": "Сервисни налог креиран",
+    "description": "Notifies that a new service account has been created"
+  },
+  "serviceAccountUpdated": {
+    "message": "Услужни налог ажуриран",
+    "description": "Notifies that a service account has been updated"
+  },
+  "typeOrSelectProjects": {
+    "message": "Унети или одабрати пројекте",
+    "description": "Instructions for selecting projects for a service account"
+  },
+  "newSaTypeToFilter": {
+    "message": "Тип за филтрирање",
+    "description": "Instructions for filtering a list of projects or secrets"
+  },
+  "deleteProjectsToast": {
+    "message": "Пројекат избрисан",
+    "description": "Notifies that the selected projects have been deleted"
+  },
+  "deleteProjectToast": {
+    "message": "Пројекат и све повезане тајне су избрисане",
+    "description": "Notifies that a project has been deleted"
+  },
+  "deleteProjectDialogMessage": {
+    "message": "Брисање пројекта $PROJECT$ је трајно и неповратно.",
+    "description": "Informs users that projects are hard deleted and not sent to trash",
+    "placeholders": {
+      "project": {
+        "content": "$1",
+        "example": "project name"
+      }
+    }
+  },
+  "deleteProjectInputLabel": {
+    "message": "Унети \"$CONFIRM$\" за наставак",
+    "description": "Users are prompted to type 'confirm' to delete a project",
+    "placeholders": {
+      "confirm": {
+        "content": "$1",
+        "example": "Delete 3 projects"
+      }
+    }
+  },
+  "deleteProjectConfirmMessage": {
+    "message": "Обрисати $PROJECT$",
+    "description": "Confirmation prompt to delete a specific project, where '$PROJECT$' is a placeholder for the name of the project.",
+    "placeholders": {
+      "project": {
+        "content": "$1",
+        "example": "project name"
+      }
+    }
+  },
+  "deleteProjectsConfirmMessage": {
+    "message": "Обрисати $COUNT$ пројекта",
+    "description": "Confirmation prompt to delete multiple projects, where '$COUNT$' is a placeholder for the number of projects to be deleted.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "deleteProjectsDialogMessage": {
+    "message": "Брисање пројекта је трајно и неповратно.",
+    "description": "This message is displayed in a dialog box as a warning before proceeding with project deletion."
+  },
+  "projectsNoItemsTitle": {
+    "message": "Нема пројекта за приказ",
+    "description": "Empty state to be displayed when there are no projects to display in the list."
+  },
+  "projectsNoItemsMessage": {
+    "message": "Add a new project to get started organizing secrets.",
+    "description": "Message to be displayed when there are no projects to display in the list."
+  },
+  "smConfirmationRequired": {
+    "message": "Потврда је обавезна",
+    "description": "Indicates that user confirmation is required for an action to proceed."
+  },
+  "bulkDeleteProjectsErrorMessage": {
+    "message": "Следећи пројекти се не могу избрисати:",
+    "description": "Message to be displayed when there is an error during bulk project deletion."
+  },
+  "softDeleteSuccessToast": {
+    "message": "Тајна послана у отпад",
+    "description": "Notification to be displayed when a secret is successfully sent to the trash."
+  },
+  "hardDeleteSuccessToast": {
+    "message": "Тајна трајно избрисана"
+  },
+  "accessTokens": {
+    "message": "Приступни токени",
+    "description": "Title for the section displaying access tokens."
+  },
+  "createAccessToken": {
+    "message": "Креирати приступни токен",
+    "description": "Button label for creating a new access token."
+  },
+  "expires": {
+    "message": "Истиче",
+    "description": "Label for the expiration date of an access token."
+  },
+  "canRead": {
+    "message": "Може да чита",
+    "description": "Label for the access level of an access token (Read only)."
+  },
+  "accessTokensNoItemsTitle": {
+    "message": "Нема токен за приказ",
+    "description": "Title to be displayed when there are no access tokens to display in the list."
+  },
+  "accessTokensNoItemsDesc": {
+    "message": "To get started, create an access token",
+    "description": "Message to be displayed when there are no access tokens to display in the list."
+  },
+  "downloadAccessToken": {
+    "message": "Преузмите или копирајте пре затварања.",
+    "description": "Message to be displayed before closing an access token, reminding the user to download or copy it."
+  },
+  "expiresOnAccessToken": {
+    "message": "Истиче:",
+    "description": "Label for the expiration date of an access token."
+  },
+  "accessTokenCallOutTitle": {
+    "message": "Access tokens are not stored and cannot be retrieved",
+    "description": "Notification to inform the user that access tokens are only displayed once and cannot be retrieved again."
+  },
+  "copyToken": {
+    "message": "Копирај токен",
+    "description": "Copies the generated access token to the user's clipboard."
+  },
+  "accessToken": {
+    "message": "Приступни токени",
+    "description": "A unique string that gives a client application (eg. CLI) access to a secret or set of secrets."
+  },
+  "accessTokenExpirationRequired": {
+    "message": "Потребан је датум истека",
+    "description": "Error message indicating that an expiration date for the access token must be set."
+  },
+  "accessTokenCreatedAndCopied": {
+    "message": "Access token created and copied to clipboard",
+    "description": "Notification to inform the user that the access token has been created and copied to the clipboard."
+  },
+  "revokeAccessToken": {
+    "message": "Опозови приступ токенима",
+    "description": "Invalidates / cancels an access token and as such removes access to secrets for the client application."
+  },
+  "revokeAccessTokens": {
+    "message": "Опозови приступ токена"
+  },
+  "revokeAccessTokenDesc": {
+    "message": "Опозив приступних токена је трајно и неповратно."
+  },
+  "accessTokenRevoked": {
+    "message": "Приступ токена опозван",
+    "description": "Toast message after deleting one or multiple access tokens."
+  },
+  "noAccessTokenSelected": {
+    "message": "Није изабран приступни токен за опозив",
+    "description": "Toast error message after trying to delete access tokens but not selecting any access tokens."
+  },
+  "submenu": {
+    "message": "Под-мени"
+  },
+  "from": {
+    "message": "Од"
+  },
+  "to": {
+    "message": "За"
+  },
+  "member": {
+    "message": "Члан"
+  },
+  "update": {
+    "message": "Ажурирај"
+  },
+  "plusNMore": {
+    "message": "+ још $QUANTITY$",
+    "placeholders": {
+      "quantity": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
+  "groupInfo": {
+    "message": "Информације о групи"
+  },
+  "editGroupMembersDesc": {
+    "message": "Grant members access to the group's assigned collections."
+  },
+  "editGroupCollectionsDesc": {
+    "message": "Grant access to collections by adding them to this group."
+  },
+  "restrictedCollectionAssignmentDesc": {
+    "message": "Можете да доделите само колекције којима управљате."
+  },
+  "selectMembers": {
+    "message": "Изаберите чланове"
+  },
+  "selectCollections": {
+    "message": "Изаберите колекције"
+  },
+  "role": {
+    "message": "Улога"
+  },
+  "removeMember": {
+    "message": "Уклони члан"
+  },
+  "collection": {
+    "message": "Колекција"
+  },
+  "noCollection": {
+    "message": "Нема колекције"
+  },
+  "noCollectionsAdded": {
+    "message": "Ниједна колекција додата"
+  },
+  "noMembersAdded": {
+    "message": "Ниједан члан додат"
+  },
+  "noGroupsAdded": {
+    "message": "Ниједна група додата"
+  },
+  "group": {
+    "message": "Група"
+  },
+  "domainVerification": {
+    "message": "Верификација домена"
+  },
+  "newDomain": {
+    "message": "Нови домен"
+  },
+  "noDomains": {
+    "message": "Нема домена"
+  },
+  "noDomainsSubText": {
+    "message": "Повезивање домена омогућава члановима да прескоче SSO идентификацију при пријављивање са SSO."
+  },
+  "copyDnsTxtRecord": {
+    "message": "Копирати DNS TXT запис"
+  },
+  "dnsTxtRecord": {
+    "message": "DNS TXT запис"
+  },
+  "dnsTxtRecordInputHint": {
+    "message": "Копирајте и налепите TXT запис у DNS провајдер."
+  },
+  "removeDomain": {
+    "message": "Уклони домен"
+  },
+  "removeDomainWarning": {
+    "message": "Уклањање домена се не може опозвати. Сигурно наставити?"
+  },
+  "domainRemoved": {
+    "message": "Домен уклоњен"
+  },
+  "domainSaved": {
+    "message": "Домен сачуван"
+  },
+  "duplicateDomainError": {
+    "message": "Не можете два пута тражити исти домен."
+  },
+  "domainNotAvailable": {
+    "message": "Неко други користи $DOMAIN$. Користите други домен да бисте наставили.",
+    "placeholders": {
+      "DOMAIN": {
+        "content": "$1",
+        "example": "bitwarden.com"
+      }
+    }
+  },
+  "domainNameTh": {
+    "message": "Име"
+  },
+  "domainStatusTh": {
+    "message": "Статус"
+  },
+  "lastChecked": {
+    "message": "Последња провера"
+  },
+  "editDomain": {
+    "message": "Уреди домен"
+  },
+  "domainFormInvalid": {
+    "message": "Постоје грешке у формулару које захтевају вашу пажњу"
+  },
+  "addedDomain": {
+    "message": "Домен $DOMAIN$ додат",
+    "placeholders": {
+      "DOMAIN": {
+        "content": "$1",
+        "example": "bitwarden.com"
+      }
+    }
+  },
+  "removedDomain": {
+    "message": "Домен $DOMAIN$ уклоњен",
+    "placeholders": {
+      "DOMAIN": {
+        "content": "$1",
+        "example": "bitwarden.com"
+      }
+    }
+  },
+  "verificationRequiredForActionSetPinToContinue": {
+    "message": "За ову радњу је потребна верификација. Подесите ПИН да бисте наставили."
+  },
+  "setPin": {
+    "message": "Поставите PIN"
+  },
+  "verifyWithBiometrics": {
+    "message": "Верификујте помоћу биометрије"
+  },
+  "awaitingConfirmation": {
+    "message": "Чека се потврда"
+  },
+  "couldNotCompleteBiometrics": {
+    "message": "Није могуће завршити биометрију."
+  },
+  "needADifferentMethod": {
+    "message": "Потребан вам је други начин?"
+  },
+  "useMasterPassword": {
+    "message": "Користите главну лозинку"
+  },
+  "usePin": {
+    "message": "Користите ПИН"
+  },
+  "useBiometrics": {
+    "message": "Користите биометрију"
+  },
+  "enterVerificationCodeSentToEmail": {
+    "message": "Унесите верификациони кôд који је послат на Вашу е-адресу."
+  },
+  "resendCode": {
+    "message": "Поново послати кôд"
+  },
+  "memberColumnHeader": {
+    "message": "Члан"
+  },
+  "groupSlashMemberColumnHeader": {
+    "message": "Група/Члан"
+  },
+  "selectGroupsAndMembers": {
+    "message": "Изаберите групе и чланове"
+  },
+  "selectGroups": {
+    "message": "Изаберите групе"
+  },
+  "userPermissionOverrideHelperDesc": {
+    "message": "Дозволе постављене за члана ће заменити дозволе које је поставила група тог члана."
+  },
+  "noMembersOrGroupsAdded": {
+    "message": "Нема додатих чланова или група"
+  },
+  "deleted": {
+    "message": "Обрисано"
+  },
+  "memberStatusFilter": {
+    "message": "Филтрирај члан по статусу"
+  },
+  "inviteMember": {
+    "message": "Позови Члан"
+  },
+  "addSponsorship": {
+    "message": "Add sponsorship"
+  },
+  "needsConfirmation": {
+    "message": "Потребна је потврда"
+  },
+  "memberRole": {
+    "message": "Улога члана"
+  },
+  "moreFromBitwarden": {
+    "message": "Више од Bitwarden"
+  },
+  "switchProducts": {
+    "message": "Пребацити призвод"
+  },
+  "freeOrgInvLimitReachedManageBilling": {
+    "message": "Free organizations may have up to $SEATCOUNT$ members. Upgrade to a paid plan to invite more members.",
+    "placeholders": {
+      "seatcount": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "freeOrgInvLimitReachedNoManageBilling": {
+    "message": "Free organizations may have up to $SEATCOUNT$ members. Contact your organization owner to upgrade.",
+    "placeholders": {
+      "seatcount": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "teamsStarterPlanInvLimitReachedManageBilling": {
+    "message": "Teams Starter plans may have up to $SEATCOUNT$ members. Upgrade to your plan to invite more members.",
+    "placeholders": {
+      "seatcount": {
+        "content": "$1",
+        "example": "10"
+      }
+    }
+  },
+  "teamsStarterPlanInvLimitReachedNoManageBilling": {
+    "message": "Teams Starter планови могу имати до $SEATCOUNT$ чланова. Контактирајте влацника ваше организације да надоградите свој план и позовете још чланова.",
+    "placeholders": {
+      "seatcount": {
+        "content": "$1",
+        "example": "10"
+      }
+    }
+  },
+  "freeOrgMaxCollectionReachedManageBilling": {
+    "message": "Free organizations may have up to $COLLECTIONCOUNT$ collections. Upgrade to a paid plan to add more collections.",
+    "placeholders": {
+      "COLLECTIONCOUNT": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "freeOrgMaxCollectionReachedNoManageBilling": {
+    "message": "Free organizations may have up to $COLLECTIONCOUNT$ collections. Contact your organization owner to upgrade.",
+    "placeholders": {
+      "COLLECTIONCOUNT": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "server": {
+    "message": "Сервер"
+  },
+  "exportData": {
+    "message": "Увези податке"
+  },
+  "exportingOrganizationSecretDataTitle": {
+    "message": "Извоз тајних података организације"
+  },
+  "exportingOrganizationSecretDataDescription": {
+    "message": "Само подаци тајног менаџера повезани са $ORGANIZATION$ биће извезени. Ставке у другим производима или из других организација неће бити укључене.",
+    "placeholders": {
+      "ORGANIZATION": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "fileUpload": {
+    "message": "Отпремање датотеке"
+  },
+  "upload": {
+    "message": "Отпреми"
+  },
+  "acceptedFormats": {
+    "message": "Прихваћени формати:"
+  },
+  "copyPasteImportContents": {
+    "message": "Копирајте и налепите садржај увоза:"
+  },
+  "or": {
+    "message": "или"
+  },
+  "unlockWithBiometrics": {
+    "message": "Откључај са биометријом"
+  },
+  "unlockWithPin": {
+    "message": "Откључај са ПИН"
+  },
+  "unlockWithMasterPassword": {
+    "message": "Откључај са главном лозинком"
+  },
+  "licenseAndBillingManagement": {
+    "message": "Управљање лиценцама и наплатом"
+  },
+  "automaticSync": {
+    "message": "Аутоматска синхронизација"
+  },
+  "manualUpload": {
+    "message": "Ручно отпремање"
+  },
+  "manualBillingTokenUploadDesc": {
+    "message": "Ако не желите да омогућите синхронизацију обрачуна, ручно отпремите своју лиценцу овде. Ово неће аутоматски откључати Families спонзорства."
+  },
+  "syncLicense": {
+    "message": "Синхронизација лиценце"
+  },
+  "licenseSyncSuccess": {
+    "message": "Успешна синхронизација лиценце"
+  },
+  "licenseUploadSuccess": {
+    "message": "Успешан унос лиценце"
+  },
+  "lastLicenseSync": {
+    "message": "Последња синх лиценце"
+  },
+  "billingSyncHelp": {
+    "message": "Помоћ синх наплате"
+  },
+  "licensePaidFeaturesHelp": {
+    "message": "Помоћ функције које се плаћају лиценцом"
+  },
+  "selfHostGracePeriodHelp": {
+    "message": "Након што ваша претплата истекне, имате 60 дана да примените ажурирану лиценцу на Вашу организацију. Грациозни период се завршава $GRACE_PERIOD_END_DATE$.",
+    "placeholders": {
+      "GRACE_PERIOD_END_DATE": {
+        "content": "$1",
+        "example": "May 12, 2024"
+      }
+    }
+  },
+  "uploadLicense": {
+    "message": "Унос лиценце"
+  },
+  "projectPeopleDescription": {
+    "message": "Одобрите групама или људима приступ овом пројекту."
+  },
+  "projectPeopleSelectHint": {
+    "message": "Унесите или изаберите људе или групе"
+  },
+  "projectServiceAccountsDescription": {
+    "message": "Одобрите услужним налозима приступ овом пројекту."
+  },
+  "projectServiceAccountsSelectHint": {
+    "message": "Унесите или изаберите сервисне налоге"
+  },
+  "projectEmptyPeopleAccessPolicies": {
+    "message": "Додајте људе или групе да бисте започели сарадњу"
+  },
+  "projectEmptyServiceAccountAccessPolicies": {
+    "message": "Додајте налоге услуге да бисте одобрили приступ"
+  },
+  "serviceAccountPeopleDescription": {
+    "message": "Одобрите групама или људима приступ овом налогу сервиса."
+  },
+  "serviceAccountProjectsDescription": {
+    "message": "Доделите пројекте овом налогу услуге. "
+  },
+  "serviceAccountEmptyProjectAccesspolicies": {
+    "message": "Додајте пројекте да бисте одобрили приступ"
+  },
+  "canReadWrite": {
+    "message": "Може читати, писати"
+  },
+  "groupSlashUser": {
+    "message": "Група/Корисник"
+  },
+  "lowKdfIterations": {
+    "message": "Ниска KDF понављања"
+  },
+  "updateLowKdfIterationsDesc": {
+    "message": "Ажурирајте подешавања шифровања да бисте испунили нове безбедносне препоруке и побољшали заштиту налога."
+  },
+  "kdfSettingsChangeLogoutWarning": {
+    "message": "Ако наставите, одјавићете се са свих активних сесија. Мораћете поново да се пријавите и завршитепријаве у два корака, ако имате. Препоручујемо да извезете трезор пре него што промените подешавања шифровања да бисте спречили губитак података."
+  },
+  "secretsManager": {
+    "message": "Менаџер тајни"
+  },
+  "secretsManagerAccessDescription": {
+    "message": "Activate user access to Secrets Manager."
+  },
+  "userAccessSecretsManagerGA": {
+    "message": "Овај корисник може приступити Менаџеру Тајни"
+  },
+  "important": {
+    "message": "Важно:"
+  },
+  "viewAll": {
+    "message": "Прегледај све"
+  },
+  "showingPortionOfTotal": {
+    "message": "Приказ $PORTION$ од $TOTAL$",
+    "placeholders": {
+      "portion": {
+        "content": "$1",
+        "example": "2"
+      },
+      "total": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "resolveTheErrorsBelowAndTryAgain": {
+    "message": "Поправите грешке испод и покушајте поново."
+  },
+  "description": {
+    "message": "Опис"
+  },
+  "errorReadingImportFile": {
+    "message": "Дошло је до грешке у покушају читања датотеке за увоз"
+  },
+  "accessedSecretWithId": {
+    "message": "Тајна приступљена са идентификатором: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "accessedSecret": {
+    "message": "Приступ тајни $SECRET_ID$.",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "editedSecretWithId": {
+    "message": "Тајна уређена са идентификатором: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Тајна избрисана са идентификатором: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Креирати нову тајну са идентификатором: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "sdk": {
+    "message": "SDK",
+    "description": "Software Development Kit"
+  },
+  "createAnAccount": {
+    "message": "Креирај налог"
+  },
+  "createSecret": {
+    "message": "Креирати тајну"
+  },
+  "createProject": {
+    "message": "Креирај пројекат"
+  },
+  "createServiceAccount": {
+    "message": "Креирајте налог сервиса"
+  },
+  "downloadThe": {
+    "message": "Преузети",
+    "description": "Link to a downloadable resource. This will be used as part of a larger phrase. Example: Download the Secrets Manager CLI"
+  },
+  "smCLI": {
+    "message": "Secrets Manager CLI"
+  },
+  "importSecrets": {
+    "message": "Увоз тајне"
+  },
+  "getStarted": {
+    "message": "Почните"
+  },
+  "complete": {
+    "message": "$COMPLETED$/$TOTAL$ завршено",
+    "placeholders": {
+      "COMPLETED": {
+        "content": "$1",
+        "example": "1"
+      },
+      "TOTAL": {
+        "content": "$2",
+        "example": "4"
+      }
+    }
+  },
+  "restoreSecret": {
+    "message": "Врати тајну"
+  },
+  "restoreSecrets": {
+    "message": "Врати тајне"
+  },
+  "restoreSecretPrompt": {
+    "message": "Да ли сте сигурни да желите да вратите ову тајну?"
+  },
+  "restoreSecretsPrompt": {
+    "message": "Да ли сте сигурни да желите да вратите ове тајне?"
+  },
+  "secretRestoredSuccessToast": {
+    "message": "Тајна враћена"
+  },
+  "secretsRestoredSuccessToast": {
+    "message": "Тајне враћене"
+  },
+  "selectionIsRequired": {
+    "message": "Потребно је да изаберете нешто."
+  },
+  "saPeopleWarningTitle": {
+    "message": "Приступни токени су и даље доступни"
+  },
+  "saPeopleWarningMessage": {
+    "message": "Уклањање људи са налога услуге не уклања приступне токене које су креирали. Ради најбоље безбедносне праксе, препоручује се да опозовете приступне токене које су креирали људи уклоњени са налога услуге."
+  },
+  "smAccessRemovalWarningProjectTitle": {
+    "message": "Уклоните приступ овом пројекту"
+  },
+  "smAccessRemovalWarningProjectMessage": {
+    "message": "Ова радња ће уклонити ваш приступ пројекту."
+  },
+  "smAccessRemovalWarningSaTitle": {
+    "message": "Уклоните приступ овом налогу услуге"
+  },
+  "smAccessRemovalWarningSaMessage": {
+    "message": "Ова радња ће вам уклонити приступ налогу услуге."
+  },
+  "removeAccess": {
+    "message": "Уклони приступ"
+  },
+  "checkForBreaches": {
+    "message": "Проверите познате упада података за ову лозинку"
+  },
+  "exposedMasterPassword": {
+    "message": "Изложена главна лозинка"
+  },
+  "exposedMasterPasswordDesc": {
+    "message": "Лозинка је пронађена у случају повреде података. Користите јединствену лозинку да бисте заштитили свој налог. Да ли сте сигурни да желите да користите откривену лозинку?"
+  },
+  "weakAndExposedMasterPassword": {
+    "message": "Слаба и зложена главна лозинка"
+  },
+  "weakAndBreachedMasterPasswordDesc": {
+    "message": "Идентификована је слаба лозинка и пронађена у упаду података. Користите јаку и јединствену лозинку да заштитите свој налог. Да ли сте сигурни да желите да користите ову лозинку?"
+  },
+  "characterMinimum": {
+    "message": "Минимум $LENGTH$ карактера",
+    "placeholders": {
+      "length": {
+        "content": "$1",
+        "example": "14"
+      }
+    }
+  },
+  "masterPasswordMinimumlength": {
+    "message": "Главна лозинка треба имати барем $LENGTH$ карактера.",
+    "placeholders": {
+      "length": {
+        "content": "$1",
+        "example": "14"
+      }
+    }
+  },
+  "inputTrimValidator": {
+    "message": "Унос не сме да садржи само размак.",
+    "description": "Notification to inform the user that a form's input can't contain only whitespace."
+  },
+  "dismiss": {
+    "message": "Одбаци"
+  },
+  "notAvailableForFreeOrganization": {
+    "message": "Ова функција није доступна за бесплатне организације. Обратите се власнику организације за надоградњу."
+  },
+  "smProjectSecretsNoItemsNoAccess": {
+    "message": "Контактирајте администратора своје организације да бисте управљали тајнама за овај пројекат.",
+    "description": "The message shown to the user under a project's secrets tab when the user only has read access to the project."
+  },
+  "enforceOnLoginDesc": {
+    "message": "Захтевајте од постојећих чланова да промене њихове лозинке"
+  },
+  "smProjectDeleteAccessRestricted": {
+    "message": "Немате дозволе да избришете овај пројекат",
+    "description": "The individual description shown to the user when the user doesn't have access to delete a project."
+  },
+  "smProjectsDeleteBulkConfirmation": {
+    "message": "Следећи пројекти се не могу брисати. Да ли желите да наставите?",
+    "description": "The message shown to the user when bulk deleting projects and the user doesn't have access to some projects."
+  },
+  "updateKdfSettings": {
+    "message": "Ажурирати KDF подешавања"
+  },
+  "loginInitiated": {
+    "message": "Пријава је покренута"
+  },
+  "rememberThisDeviceToMakeFutureLoginsSeamless": {
+    "message": "Remember this device to make future logins seamless"
+  },
+  "deviceApprovalRequired": {
+    "message": "Потребно је одобрење уређаја. Изаберите опцију одобрења испод:"
+  },
+  "deviceApprovalRequiredV2": {
+    "message": "Потребно је одобрење уређаја"
+  },
+  "selectAnApprovalOptionBelow": {
+    "message": "Изаберите опцију одобрења у наставку"
+  },
+  "rememberThisDevice": {
+    "message": "Запамти овај уређај"
+  },
+  "uncheckIfPublicDevice": {
+    "message": "Искључите ако се користи јавни уређај"
+  },
+  "approveFromYourOtherDevice": {
+    "message": "Одобри са мојим другим уређајем"
+  },
+  "requestAdminApproval": {
+    "message": "Затражити одобрење администратора"
+  },
+  "unableToCompleteLogin": {
+    "message": "Није могуће завршити пријаву"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Потребно је да се пријавите на поузданом уређају или да замолите администратора да вам додели лозинку."
+  },
+  "trustedDeviceEncryption": {
+    "message": "Шифровање поузданог уређаја"
+  },
+  "trustedDevices": {
+    "message": "Поуздани уређаји"
+  },
+  "memberDecryptionOptionTdeDescPart1": {
+    "message": "Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
+  },
+  "memberDecryptionOptionTdeDescLink1": {
+    "message": "single organization",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
+  },
+  "memberDecryptionOptionTdeDescPart2": {
+    "message": "policy,",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
+  },
+  "memberDecryptionOptionTdeDescLink2": {
+    "message": "SSO required",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
+  },
+  "memberDecryptionOptionTdeDescPart3": {
+    "message": "policy, and",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
+  },
+  "memberDecryptionOptionTdeDescLink3": {
+    "message": "account recovery administration",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
+  },
+  "memberDecryptionOptionTdeDescPart4": {
+    "message": "policy will turn on when this option is used.",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
+  },
+  "orgPermissionsUpdatedMustSetPassword": {
+    "message": "Дозволе за вашу организацију су ажуриране, што захтева да поставите главну лозинку.",
+    "description": "Used as a card title description on the set password page to explain why the user is there"
+  },
+  "orgRequiresYouToSetPassword": {
+    "message": "Ваша организација захтева да поставите главну лозинку.",
+    "description": "Used as a card title description on the set password page to explain why the user is there"
+  },
+  "cardMetrics": {
+    "message": "од $TOTAL$",
+    "placeholders": {
+      "total": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
+  "notFound": {
+    "message": "$RESOURCE$ није нађено/а",
+    "placeholders": {
+      "resource": {
+        "content": "$1",
+        "example": "Service Account"
+      }
+    }
+  },
+  "verificationRequired": {
+    "message": "Потребдна верификација",
+    "description": "Default title for the user verification dialog."
+  },
+  "recoverAccount": {
+    "message": "Опоравак налога"
+  },
+  "updatedTempPassword": {
+    "message": "Корисник је ажурирао лозинку издату путем опоравка налога."
+  },
+  "activatedAccessToSecretsManager": {
+    "message": "Активиран приступ Манаџеру тајни",
+    "description": "Confirmation message that one or more users gained access to Secrets Manager"
+  },
+  "activateAccess": {
+    "message": "Активирати приступ"
+  },
+  "bulkEnableSecretsManagerDescription": {
+    "message": "Омогућите следећим члановима приступ Манаџеру Тајни. Улога додељена у Менаџеру лозинки односиће се на Менаџеру Тајни.",
+    "description": "This description is shown to an admin when they are attempting to add more users to Secrets Manager."
+  },
+  "activateSecretsManager": {
+    "message": "Активирати менаџер тајни"
+  },
+  "yourOrganizationsFingerprint": {
+    "message": "Ваша Сигурносна Фраза организације",
+    "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their organization's public key with another user, for the purposes of sharing."
+  },
+  "deviceApprovals": {
+    "message": "Одобрења уређаја"
+  },
+  "deviceApprovalsDesc": {
+    "message": "Дозволите пријављивање чланова тако што ћете одобрити њихове захтеве за пријаву испод. Неодобрени захтеви истичу после 1 недељу. Проверите информације о члану пре него што одобрите."
+  },
+  "deviceInfo": {
+    "message": "Информације о уређају"
+  },
+  "time": {
+    "message": "Време"
+  },
+  "denyAllRequests": {
+    "message": "Одбиј све захтеве"
+  },
+  "denyRequest": {
+    "message": "Одбиј захтев"
+  },
+  "approveRequest": {
+    "message": "Одобри захтев"
+  },
+  "deviceApproved": {
+    "message": "Уређај одобрен"
+  },
+  "deviceRemoved": {
+    "message": "Уређај је уклоњен"
+  },
+  "removeDevice": {
+    "message": "Уклони уређај"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Да ли сте сигурни да желите да уклоните овај уређај?"
+  },
+  "noDeviceRequests": {
+    "message": "Нема захтева уређаја"
+  },
+  "noDeviceRequestsDesc": {
+    "message": "Захтеви за одобрење уређаја чланова ће се појавити овде"
+  },
+  "loginRequestDenied": {
+    "message": "Захтев за пријаву је одбијен"
+  },
+  "allLoginRequestsDenied": {
+    "message": "Сви захтеви за пријаву су одбијени"
+  },
+  "loginRequestApproved": {
+    "message": "Захтев за пријаву је одобрен"
+  },
+  "removeOrgUserNoMasterPasswordTitle": {
+    "message": "Налог нема главну лозинку"
+  },
+  "removeOrgUserNoMasterPasswordDesc": {
+    "message": "Уклањање $USER$ без постављања главне лозинке за њих може ограничити приступ њиховом пуном налогу. Да ли сте сигурни да желите да наставите?",
+    "placeholders": {
+      "user": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
+  "noMasterPassword": {
+    "message": "Без главне лозинке"
+  },
+  "removeMembersWithoutMasterPasswordWarning": {
+    "message": "Уклањање чланова који немају главну лозинку без постављања једне за њих може ограничити приступ њиховом пуном налогу."
+  },
+  "approvedAuthRequest": {
+    "message": "Одобрен уређај за $ID$.",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "First 8 Character of a GUID"
+      }
+    }
+  },
+  "rejectedAuthRequest": {
+    "message": "Одбијен уређај за $ID$.",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "First 8 Character of a GUID"
+      }
+    }
+  },
+  "requestedDeviceApproval": {
+    "message": "Затражено је одобрење уређаја."
+  },
+  "tdeOffboardingPasswordSet": {
+    "message": "User set a master password during TDE offboarding."
+  },
+  "startYour7DayFreeTrialOfBitwardenFor": {
+    "message": "Започните своју 7-дневну бесплатну пробну Bitwarden-а за $ORG$",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "startYour7DayFreeTrialOfBitwardenSecretsManagerFor": {
+    "message": "Започните своју 7-дневну бесплатну пробну Bitwarden Secrets Manager за $ORG$",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "next": {
+    "message": "Следеће"
+  },
+  "ssoLoginIsRequired": {
+    "message": "SSO пријава је потребна"
+  },
+  "selectedRegionFlag": {
+    "message": "Одабрана застава"
+  },
+  "accountSuccessfullyCreated": {
+    "message": "Налог је успешно креиран!"
+  },
+  "adminApprovalRequested": {
+    "message": "Захтевано је одобрење администратора"
+  },
+  "adminApprovalRequestSentToAdmins": {
+    "message": "Ваш захтев је послат вашем администратору."
+  },
+  "troubleLoggingIn": {
+    "message": "Имате проблема са пријављивањем?"
+  },
+  "loginApproved": {
+    "message": "Пријава је одобрена"
+  },
+  "userEmailMissing": {
+    "message": "Недостаје имејл корисника"
+  },
+  "activeUserEmailNotFoundLoggingYouOut": {
+    "message": "Active user email not found. Logging you out."
+  },
+  "deviceTrusted": {
+    "message": "Уређај поуздан"
+  },
+  "inviteUsers": {
+    "message": "Позови кориснике"
+  },
+  "secretsManagerForPlan": {
+    "message": "Secrets Manager for $PLAN$",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "secretsManagerForPlanDesc": {
+    "message": "For engineering and DevOps teams to manage secrets throughout the software development lifecycle."
+  },
+  "free2PersonOrganization": {
+    "message": "Бесплатна организација за 2 особе"
+  },
+  "unlimitedSecrets": {
+    "message": "Неограничене тајне"
+  },
+  "unlimitedProjects": {
+    "message": "Неограничени пројекти"
+  },
+  "projectsIncluded": {
+    "message": "$COUNT$ projects included",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "serviceAccountsIncluded": {
+    "message": "$COUNT$ service accounts included",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "additionalServiceAccountCost": {
+    "message": "$COST$ per month for additional service accounts",
+    "placeholders": {
+      "cost": {
+        "content": "$1",
+        "example": "$0.50"
+      }
+    }
+  },
+  "subscribeToSecretsManager": {
+    "message": "Пријави се на Secrets Manager"
+  },
+  "addSecretsManagerUpgradeDesc": {
+    "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
+  },
+  "additionalServiceAccounts": {
+    "message": "Додатни сервисни налози"
+  },
+  "includedServiceAccounts": {
+    "message": "Ваш план долази са $COUNT$ налога сервиса.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "50"
+      }
+    }
+  },
+  "addAdditionalServiceAccounts": {
+    "message": "Можете додати још сервисних налога за $COST$ месечно.",
+    "placeholders": {
+      "cost": {
+        "content": "$1",
+        "example": "$0.50"
+      }
+    }
+  },
+  "collectionManagement": {
+    "message": "Управљање збирке"
+  },
+  "collectionManagementDesc": {
+    "message": "Управљајте понашањем збирке за организацију"
+  },
+  "limitCollectionCreationDesc": {
+    "message": "Ограничите креирање збирке на власнике и администраторе"
+  },
+  "limitCollectionDeletionDesc": {
+    "message": "Ограничите брисање збирке на власнике и администраторе"
+  },
+  "limitItemDeletionDescription": {
+    "message": "Limit item deletion to members with the Manage collection permissions"
+  },
+  "allowAdminAccessToAllCollectionItemsDesc": {
+    "message": "Власници и администратори могу да управљају свим колекцијама и ставкама"
+  },
+  "updatedCollectionManagement": {
+    "message": "Ажурирано подешавање управљања колекцијом"
+  },
+  "passwordManagerPlanPrice": {
+    "message": "Цена плана менаџера лозинки"
+  },
+  "secretsManagerPlanPrice": {
+    "message": "Цена плана менаџера тајни"
+  },
+  "passwordManager": {
+    "message": "Менаџер лозинки"
+  },
+  "freeOrganization": {
+    "message": "Бесплатна организација"
+  },
+  "limitServiceAccounts": {
+    "message": "Limit service accounts (optional)"
+  },
+  "limitServiceAccountsDesc": {
+    "message": "Set a limit for your service accounts. Once this limit is reached, you will not be able to create new service accounts."
+  },
+  "serviceAccountLimit": {
+    "message": "Service account limit (optional)"
+  },
+  "maxServiceAccountCost": {
+    "message": "Max potential service account cost"
+  },
+  "loggedInExclamation": {
+    "message": "Пријављено!"
+  },
+  "beta": {
+    "message": "Бета"
+  },
+  "assignCollectionAccess": {
+    "message": "Додели приступ збирке"
+  },
+  "editedCollections": {
+    "message": "Уређене колекције"
+  },
+  "baseUrl": {
+    "message": "УРЛ Сервера"
+  },
+  "selfHostBaseUrl": {
+    "message": "УРЛ сервера који се самостално хостује",
+    "description": "Label for field requesting a self-hosted integration service URL"
+  },
+  "alreadyHaveAccount": {
+    "message": "Већ имате налог?"
+  },
+  "toggleSideNavigation": {
+    "message": "Укључите бочну навигацију"
+  },
+  "skipToContent": {
+    "message": "Прескочи на садржај"
+  },
+  "managePermissionRequired": {
+    "message": "Најмање један члан или група мора имати могућност управљања дозволом."
+  },
+  "typePasskey": {
+    "message": "Приступни кључ"
+  },
+  "passkeyNotCopied": {
+    "message": "Приступни кључ неће бити копиран"
+  },
+  "passkeyNotCopiedAlert": {
+    "message": "Приступни кључ неће бити копиран на клонирану ставку. Да ли желите да наставите са клонирањем ставке?"
+  },
+  "modifiedCollectionManagement": {
+    "message": "Измењено подешавање управљања колекцијом $ID$.",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "Unique ID"
+      }
+    }
+  },
+  "seeDetailedInstructions": {
+    "message": "Погледајте детаљна упутства на нашој веб локацији за помоћ на",
+    "description": "This is followed a by a hyperlink to the help website."
+  },
+  "installBrowserExtension": {
+    "message": "Инсталирајте додатак претраживача"
+  },
+  "installBrowserExtensionDetails": {
+    "message": "Користите додатак за брзо чување пријава и аутоматско попуњавање образаца без отварања веб апликације."
+  },
+  "projectAccessUpdated": {
+    "message": "Приступ пројекту је ажуриран"
+  },
+  "unexpectedErrorSend": {
+    "message": "Дошло је до неочекиване грешке при учитавању овога Send. Покушати поново касније."
+  },
+  "seatLimitReached": {
+    "message": "Достигнуто је ограничење броја места"
+  },
+  "contactYourProvider": {
+    "message": "Обратите се свом провајдеру да бисте купили додатна места."
+  },
+  "seatLimitReachedContactYourProvider": {
+    "message": "Достигнуто је ограничење броја места. Обратите се свом провајдеру да бисте купили додатна места."
+  },
+  "collectionAccessRestricted": {
+    "message": "Приступ колекцији је ограничен"
+  },
+  "readOnlyCollectionAccess": {
+    "message": "Немате приступ за управљање овом колекцијом."
+  },
+  "grantManageCollectionWarningTitle": {
+    "message": "Missing Manage Collection Permissions"
+  },
+  "grantManageCollectionWarning": {
+    "message": "Grant Manage collection permissions to allow full collection management including deletion of collection."
+  },
+  "grantCollectionAccess": {
+    "message": "Одобрите групама или члановима приступ овој колекцији."
+  },
+  "grantCollectionAccessMembersOnly": {
+    "message": "Одобрите члановима приступ овој колекцији."
+  },
+  "adminCollectionAccess": {
+    "message": "Администратори могу да приступе и управљају колекцијама."
+  },
+  "serviceAccountAccessUpdated": {
+    "message": "Приступ услужног налога ажуриран"
+  },
+  "commonImportFormats": {
+    "message": "Уобичајени формати",
+    "description": "Label indicating the most common import formats"
+  },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Детекција подударања URI-ја је начин на који Bitwarden идентификује предлоге за ауто-попуњавање.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "„Регуларни израз“ је напредна опција са повећаним ризиком од откривања акредитива.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "„Почиње са“ је напредна опција са повећаним ризиком од откривања акредитива.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Више о откривању подударања",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Напредне опције",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Упозорење",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
+  "maintainYourSubscription": {
+    "message": "Да бисте одржали своју претплату за $ORG$, ",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Example Inc."
+      }
+    }
+  },
+  "addAPaymentMethod": {
+    "message": "додајте начин плаћања",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method'"
+  },
+  "organizationInformation": {
+    "message": "Информације о организацији"
+  },
+  "confirmationDetails": {
+    "message": "Детаљи потврде"
+  },
+  "smFreeTrialThankYou": {
+    "message": "Хвала што сте се пријавили за Bitwarden Secrets Manager!"
+  },
+  "smFreeTrialConfirmationEmail": {
+    "message": "Послали смо е-поруку са потврдом на ваш имејл на "
+  },
+  "sorryToSeeYouGo": {
+    "message": "Жао нам је што идете Помозите да се побољша Bitwarden тако што ћете поделити зашто отказујете.",
+    "description": "A message shown to users as part of an offboarding survey asking them to provide more information on their subscription cancelation."
+  },
+  "selectCancellationReason": {
+    "message": "Изаберите разлог за отказивање",
+    "description": "Used as a form field label for a select input on the offboarding survey."
+  },
+  "anyOtherFeedback": {
+    "message": "Да ли бисте желели да поделите још неке информације?",
+    "description": "Used as a form field label for a textarea input on the offboarding survey."
+  },
+  "missingFeatures": {
+    "message": "Недостају способности",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "movingToAnotherTool": {
+    "message": "Прелазак на други алат",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "tooDifficultToUse": {
+    "message": "Тешко је за коришћење",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "notUsingEnough": {
+    "message": "Не користим га довољно",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "tooExpensive": {
+    "message": "Превише скупо",
+    "description": "An option for the offboarding survey shown when a user cancels their subscription."
+  },
+  "freeForOneYear": {
+    "message": "Бесплатно 1 годину"
+  },
+  "newWebApp": {
+    "message": "Добродошли у нову и побољшану веб апликацију. Сазнајте више о томе шта се променило."
+  },
+  "releaseBlog": {
+    "message": "Прочитајте блог о издању"
+  },
+  "adminConsole": {
+    "message": "Администраторска конзола"
+  },
+  "providerPortal": {
+    "message": "Портал провајдера"
+  },
+  "success": {
+    "message": "Успех"
+  },
+  "restrictedGroupAccess": {
+    "message": "Не можете да се додате у групе."
+  },
+  "cannotAddYourselfToCollections": {
+    "message": "Не можете да се додате у колекције."
+  },
+  "assign": {
+    "message": "Додели"
+  },
+  "assignToCollections": {
+    "message": "Додели колекцијама"
+  },
+  "assignToTheseCollections": {
+    "message": "Додели овим колекцијама"
+  },
+  "bulkCollectionAssignmentDialogDescriptionSingular": {
+    "message": "Only organization members with access to these collections will be able to see the item."
+  },
+  "bulkCollectionAssignmentDialogDescriptionPlural": {
+    "message": "Only organization members with access to these collections will be able to see the items."
+  },
+  "selectCollectionsToAssign": {
+    "message": "Изаберите колекције за доделу"
+  },
+  "noCollectionsAssigned": {
+    "message": "Није додељена ниједна колекција"
+  },
+  "successfullyAssignedCollections": {
+    "message": "Успешно додељене колекције"
+  },
+  "bulkCollectionAssignmentWarning": {
+    "message": "Одабрали сте $TOTAL_COUNT$ ставки. Не можете да ажурирате $READONLY_COUNT$ од ставки јер немате дозволе за уређивање.",
+    "placeholders": {
+      "total_count": {
+        "content": "$1",
+        "example": "10"
+      },
+      "readonly_count": {
+        "content": "$2",
+        "example": "3"
+      }
+    }
+  },
+  "addField": {
+    "message": "Додај поље"
+  },
+  "editField": {
+    "message": "Уреди поље"
+  },
+  "items": {
+    "message": "Ставке"
+  },
+  "assignedSeats": {
+    "message": "Додељена места"
+  },
+  "assigned": {
+    "message": "Додељено"
+  },
+  "used": {
+    "message": "У употреби"
+  },
+  "remaining": {
+    "message": "Преостало"
+  },
+  "unlinkOrganization": {
+    "message": "Прекини везу са организацијом"
+  },
+  "manageSeats": {
+    "message": "УПРАВЉАЈТЕ МЕСТИМА"
+  },
+  "manageSeatsDescription": {
+    "message": "Прилагођавања местима ће се одразити на следећи обрачунски циклус."
+  },
+  "unassignedSeatsDescription": {
+    "message": "Недодијељена претплатничка места"
+  },
+  "purchaseSeatDescription": {
+    "message": "Додатна места су купљена"
+  },
+  "assignedSeatCannotUpdate": {
+    "message": "Додељена места се не могу ажурирати. За помоћ контактирајте власника организације."
+  },
+  "subscriptionUpdateFailed": {
+    "message": "Ажурирање претплате није успело"
+  },
+  "trial": {
+    "message": "Проба",
+    "description": "A subscription status label."
+  },
+  "pastDue": {
+    "message": "Протекли задаци",
+    "description": "A subscription status label"
+  },
+  "subscriptionExpired": {
+    "message": "Претплата је истекла",
+    "description": "The date header used when a subscription is past due."
+  },
+  "pastDueWarningForChargeAutomatically": {
+    "message": "Имате грејс период од $DAYS$ дана од датума истека ваше претплате да бисте одржали претплату. Решите фактуре са кашњењем до $SUSPENSION_DATE$.",
+    "placeholders": {
+      "days": {
+        "content": "$1",
+        "example": "11"
+      },
+      "suspension_date": {
+        "content": "$2",
+        "example": "01/10/2024"
+      }
+    },
+    "description": "A warning shown to the user when their subscription is past due and they are charged automatically."
+  },
+  "pastDueWarningForSendInvoice": {
+    "message": "Имате грејс период од $DAYS$ дана од датума када ваша прва неплаћена фактура треба да одржи претплату. Решите фактуре са кашњењем до $SUSPENSION_DATE$.",
+    "placeholders": {
+      "days": {
+        "content": "$1",
+        "example": "11"
+      },
+      "suspension_date": {
+        "content": "$2",
+        "example": "01/10/2024"
+      }
+    },
+    "description": "A warning shown to the user when their subscription is past due and they pay via invoice."
+  },
+  "unpaidInvoice": {
+    "message": "Неплаћен рачун",
+    "description": "The header of a warning box shown to a user whose subscription is unpaid."
+  },
+  "toReactivateYourSubscription": {
+    "message": "Да бисте поново активирали своју претплату, решите фактуре са кашњењем.",
+    "description": "The body of a warning box shown to a user whose subscription is unpaid."
+  },
+  "cancellationDate": {
+    "message": "Датум отказивања",
+    "description": "The date header used when a subscription is cancelled."
+  },
+  "machineAccountsCannotCreate": {
+    "message": "Налози машине се не могу креирати у суспендованим организацијама. За помоћ контактирајте власника своје организације."
+  },
+  "machineAccount": {
+    "message": "Налог машине",
+    "description": "A machine user which can be used to automate processes and access secrets in the system."
+  },
+  "machineAccounts": {
+    "message": "Налози машине",
+    "description": "The title for the section that deals with machine accounts."
+  },
+  "newMachineAccount": {
+    "message": "Нов налог машине",
+    "description": "Title for creating a new machine account."
+  },
+  "machineAccountsNoItemsMessage": {
+    "message": "Креирајте нови налог машине да бисте започели аутоматизацију тајног приступа.",
+    "description": "Message to encourage the user to start creating machine accounts."
+  },
+  "machineAccountsNoItemsTitle": {
+    "message": "Нема ништа за приказати",
+    "description": "Title to indicate that there are no machine accounts to display."
+  },
+  "deleteMachineAccounts": {
+    "message": "Избришите налоге машине",
+    "description": "Title for the action to delete one or multiple machine accounts."
+  },
+  "deleteMachineAccount": {
+    "message": "Избришите налог машине",
+    "description": "Title for the action to delete a single machine account."
+  },
+  "viewMachineAccount": {
+    "message": "Приказ налог машине",
+    "description": "Action to view the details of a machine account."
+  },
+  "deleteMachineAccountDialogMessage": {
+    "message": "Брисање налога машине $MACHINE_ACCOUNT$ је трајно и неповратно.",
+    "placeholders": {
+      "machine_account": {
+        "content": "$1",
+        "example": "Machine account name"
+      }
+    }
+  },
+  "deleteMachineAccountsDialogMessage": {
+    "message": "Брисање налога машине је трајно и неповратно."
+  },
+  "deleteMachineAccountsConfirmMessage": {
+    "message": "Брисање $COUNT$ налога машине",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "deleteMachineAccountToast": {
+    "message": "Налог машине избрисан"
+  },
+  "deleteMachineAccountsToast": {
+    "message": "Налози машине избрисани"
+  },
+  "searchMachineAccounts": {
+    "message": "Тражити налоге машине",
+    "description": "Placeholder text for searching machine accounts."
+  },
+  "editMachineAccount": {
+    "message": "Уредити налог машине",
+    "description": "Title for editing a machine account."
+  },
+  "machineAccountName": {
+    "message": "Име налога машине",
+    "description": "Label for the name of a machine account"
+  },
+  "machineAccountCreated": {
+    "message": "Налог машине креиран",
+    "description": "Notifies that a new machine account has been created"
+  },
+  "machineAccountUpdated": {
+    "message": "Налог машине ажуриран",
+    "description": "Notifies that a machine account has been updated"
+  },
+  "projectMachineAccountsDescription": {
+    "message": "Одобрите налозима машине приступ овом пројекту."
+  },
+  "projectMachineAccountsSelectHint": {
+    "message": "Унесите или изаберите налоге машине"
+  },
+  "projectEmptyMachineAccountAccessPolicies": {
+    "message": "Додајте налоге машине да бисте одобрили приступ"
+  },
+  "machineAccountPeopleDescription": {
+    "message": "Одобрите групама или људима приступ овом налогу машине."
+  },
+  "machineAccountProjectsDescription": {
+    "message": "Доделите пројекте овом налогу машине. "
+  },
+  "createMachineAccount": {
+    "message": "Креирајте налог машине"
+  },
+  "maPeopleWarningMessage": {
+    "message": "Уклањање људи са налога машине не уклања приступне токене које су креирали. Ради најбоље безбедносне праксе, препоручује се да опозовете приступне токене које су креирали људи уклоњени са налога машине."
+  },
+  "smAccessRemovalWarningMaTitle": {
+    "message": "Уклоните приступ овом налогу машине"
+  },
+  "smAccessRemovalWarningMaMessage": {
+    "message": "Ова радња ће вам уклонити приступ налогу машине."
+  },
+  "machineAccountsIncluded": {
+    "message": "$COUNT$ рачуни машина укључени",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "additionalMachineAccountCost": {
+    "message": "$COST$ месечно за додатне рачуне машина",
+    "placeholders": {
+      "cost": {
+        "content": "$1",
+        "example": "$0.50"
+      }
+    }
+  },
+  "additionalMachineAccounts": {
+    "message": "Додатни налози машине"
+  },
+  "includedMachineAccounts": {
+    "message": "Ваш план долази са $COUNT$ налога машине.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "50"
+      }
+    }
+  },
+  "addAdditionalMachineAccounts": {
+    "message": "Можете додати још налога машине за $COST$ месечно.",
+    "placeholders": {
+      "cost": {
+        "content": "$1",
+        "example": "$0.50"
+      }
+    }
+  },
+  "limitMachineAccounts": {
+    "message": "Ограничити рачуне машина (опционо)"
+  },
+  "limitMachineAccountsDesc": {
+    "message": "Поставите ограничење за рачуне машине. Када се ово ограничење достигне, нећете моћи да креирате нове налоге на машини."
+  },
+  "machineAccountLimit": {
+    "message": "Ограничење рачуна машине (опционо)"
+  },
+  "maxMachineAccountCost": {
+    "message": "Максимални потенцијални трошак рачуна машине"
+  },
+  "machineAccountAccessUpdated": {
+    "message": "Приступ налога машине ажуриран"
+  },
+  "restrictedGroupAccessDesc": {
+    "message": "Не можете да се додате у групу."
+  },
+  "deleteProvider": {
+    "message": "Избриши провајдера"
+  },
+  "deleteProviderConfirmation": {
+    "message": "Брисање провајдера је трајно и неповратно. Унесите своју главну лозинку да бисте потврдили брисање провајдера и свих повезаних података."
+  },
+  "deleteProviderName": {
+    "message": "Не може да се избрише $ID$",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
+  "deleteProviderWarningDescription": {
+    "message": "Морате прекинути везу са свим клијентима да бисте могли да избришете $ID$.",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
+  "providerDeleted": {
+    "message": "Провајдер је избрисан"
+  },
+  "providerDeletedDesc": {
+    "message": "Провајдер и сви повезани подаци су избрисани."
+  },
+  "deleteProviderRecoverConfirmDesc": {
+    "message": "Захтевали сте брисање овог провајдера. Користите дугме испод да потврдите."
+  },
+  "deleteProviderWarning": {
+    "message": "Брисање провајдера је трајно. Не може се поништити."
+  },
+  "errorAssigningTargetCollection": {
+    "message": "Грешка при додељивању циљне колекције."
+  },
+  "errorAssigningTargetFolder": {
+    "message": "Грешка при додељивању циљне фасцикле."
+  },
+  "integrationsAndSdks": {
+    "message": "Интеграције & SDK",
+    "description": "The title for the section that deals with integrations and SDKs."
+  },
+  "integrations": {
+    "message": "Интеграције"
+  },
+  "integrationsDesc": {
+    "message": "Аутоматски синхронизујте тајне од Bitwarden Secrets Manager са сервисима треће стране."
+  },
+  "sdks": {
+    "message": "SDK"
+  },
+  "sdksDesc": {
+    "message": "Употребите Bitwarden Secrets Manager SDK на следећим програмским језицима да направите сопствене апликације."
+  },
+  "ssoDescStart": {
+    "message": "Подеси",
+    "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
+  },
+  "ssoDescEnd": {
+    "message": "for Bitwarden using the implementation guide for your Identity Provider.",
+    "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
+  },
+  "userProvisioning": {
+    "message": "User provisioning"
+  },
+  "scimIntegration": {
+    "message": "SCIM"
+  },
+  "scimIntegrationDescStart": {
+    "message": "Подеси ",
+    "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
+  },
+  "scimIntegrationDescEnd": {
+    "message": "(System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider.",
+    "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
+  },
+  "bwdc": {
+    "message": "Bitwarden Directory Connector"
+  },
+  "bwdcDesc": {
+    "message": "Configure Bitwarden Directory Connector to automatically provision users and groups using the implementation guide for your Identity Provider."
+  },
+  "eventManagement": {
+    "message": "Управљање догађајима"
+  },
+  "eventManagementDesc": {
+    "message": "Integrate Bitwarden event logs with your SIEM (system information and event management) system by using the implementation guide for your platform."
+  },
+  "deviceManagement": {
+    "message": "Управљање уређајима"
+  },
+  "deviceManagementDesc": {
+    "message": "Конфигуришите управљање уређајима за Bitwarden помоћу водича за имплементацију за своју платформу."
+  },
+  "deviceIdMissing": {
+    "message": "Недостаје ИД уређаја"
+  },
+  "deviceTypeMissing": {
+    "message": "Недостаје тип уређаја"
+  },
+  "deviceCreationDateMissing": {
+    "message": "Недостаје датум креације уређаја"
+  },
+  "desktopRequired": {
+    "message": "Desktop је потребан"
+  },
+  "reopenLinkOnDesktop": {
+    "message": "Reopen this link from your email on a desktop."
+  },
+  "integrationCardTooltip": {
+    "message": "Покренути $INTEGRATION$ водич за имплементацију.",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Google"
+      }
+    }
+  },
+  "smIntegrationTooltip": {
+    "message": "Подесити $INTEGRATION$.",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Google"
+      }
+    }
+  },
+  "smSdkTooltip": {
+    "message": "Преглед $SDK$ спремишта",
+    "placeholders": {
+      "sdk": {
+        "content": "$1",
+        "example": "Rust"
+      }
+    }
+  },
+  "integrationCardAriaLabel": {
+    "message": "open $INTEGRATION$ implementation guide in a new tab.",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "google"
+      }
+    }
+  },
+  "smSdkAriaLabel": {
+    "message": "view $SDK$ repository in a new tab.",
+    "placeholders": {
+      "sdk": {
+        "content": "$1",
+        "example": "rust"
+      }
+    }
+  },
+  "smIntegrationCardAriaLabel": {
+    "message": "set up $INTEGRATION$ implementation guide in a new tab.",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "google"
+      }
+    }
+  },
+  "createNewClientToManageAsProvider": {
+    "message": "Креирајте нову клијентску организацију којом ћете управљати као добављач. Додатна места ће се одразити у следећем обрачунском циклусу."
+  },
+  "selectAPlan": {
+    "message": "Изаберите пакет"
+  },
+  "thirtyFivePercentDiscount": {
+    "message": "Попуст од 35%"
+  },
+  "monthPerMember": {
+    "message": "месечно по члану"
+  },
+  "monthPerMemberBilledAnnually": {
+    "message": "month per member billed annually"
+  },
+  "seats": {
+    "message": "Места"
+  },
+  "addOrganization": {
+    "message": "Додај организацију"
+  },
+  "createdNewClient": {
+    "message": "Нови клијент је успешно креиран"
+  },
+  "noAccess": {
+    "message": "Немате приступ"
+  },
+  "collectionAdminConsoleManaged": {
+    "message": "Овој колекцији се може приступити само са администраторске конзоле"
+  },
+  "organizationOptionsMenu": {
+    "message": "Укључи мени Организација"
+  },
+  "vaultItemSelect": {
+    "message": "Изаберите ставку сефа"
+  },
+  "collectionItemSelect": {
+    "message": "Изаберите ставку колекције"
+  },
+  "manageBillingFromProviderPortalMessage": {
+    "message": "Управљајте наплатом из Provider Portal"
+  },
+  "continueSettingUp": {
+    "message": "Наставити са подешавањем Bitwarden-а"
+  },
+  "continueSettingUpFreeTrial": {
+    "message": "Наставите са подешавањем бесплатне пробне верзије Bitwarden-а"
+  },
+  "continueSettingUpPasswordManager": {
+    "message": "Наставите са подешавањем Bitwarden менаџер лозинки"
+  },
+  "continueSettingUpFreeTrialPasswordManager": {
+    "message": "Наставите са подешавањем бесплатне пробне верзије Bitwarden менаџер лозинки"
+  },
+  "continueSettingUpSecretsManager": {
+    "message": "Наставите са подешавањем Bitwarden Secrets Manager"
+  },
+  "continueSettingUpFreeTrialSecretsManager": {
+    "message": "Наставите са подешавањем бесплатне пробне верзије Bitwarden Secrets Manager"
+  },
+  "enterTeamsOrgInfo": {
+    "message": "Унесите своје информације о организацији Teams"
+  },
+  "enterFamiliesOrgInfo": {
+    "message": "Унесите своје информације о Families организацији"
+  },
+  "enterEnterpriseOrgInfo": {
+    "message": "Унесите своје информације о организацији Enterprise"
+  },
+  "viewItemsIn": {
+    "message": "Видети ставке у $NAME$",
+    "description": "Button to view the contents of a folder or collection",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Work"
+      }
+    }
+  },
+  "backTo": {
+    "message": "Назад на $NAME$",
+    "description": "Navigate back to a previous folder or collection",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Work"
+      }
+    }
+  },
+  "back": {
+    "message": "Назад",
+    "description": "Button text to navigate back"
+  },
+  "removeItem": {
+    "message": "Уклонити $NAME$",
+    "description": "Remove a selected option, such as a folder or collection",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Work"
+      }
+    }
+  },
+  "viewInfo": {
+    "message": "Прикажи информације"
+  },
+  "viewAccess": {
+    "message": "Прикажи приступ"
+  },
+  "noCollectionsSelected": {
+    "message": "Нисте изабрали ниједну колекцију."
+  },
+  "updateName": {
+    "message": "Ажурирајте име"
+  },
+  "updatedOrganizationName": {
+    "message": "Ажурирано име организације"
+  },
+  "providerPlan": {
+    "message": "Управљени провајдери сервиса"
+  },
+  "managedServiceProvider": {
+    "message": "Managed service provider"
+  },
+  "multiOrganizationEnterprise": {
+    "message": "Multi-organization enterprise"
+  },
+  "orgSeats": {
+    "message": "Седиста организације"
+  },
+  "providerDiscount": {
+    "message": "$AMOUNT$% попуста",
+    "placeholders": {
+      "amount": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "lowKDFIterationsBanner": {
+    "message": "Ниске KDF итерације. Повећајте број понављања да бисте побољшали безбедност свог налога."
+  },
+  "changeKDFSettings": {
+    "message": "Променити KDF подешавања"
+  },
+  "secureYourInfrastructure": {
+    "message": "Обезбедите своју инфраструктуру"
+  },
+  "protectYourFamilyOrBusiness": {
+    "message": "Заштитите своју породицу или посао"
+  },
+  "upgradeOrganizationCloseSecurityGaps": {
+    "message": "Затворите безбедносне празнине извештајима о надгледању"
+  },
+  "upgradeOrganizationCloseSecurityGapsDesc": {
+    "message": "Будите испред безбедносних пропуста надоградњом на плаћени план за побољшано праћење."
+  },
+  "approveAllRequests": {
+    "message": "Одобри све захтеве"
+  },
+  "allLoginRequestsApproved": {
+    "message": "Сви захтеви за пријаву су одобрени"
+  },
+  "payPal": {
+    "message": "PayPal"
+  },
+  "bitcoin": {
+    "message": "Bitcoin"
+  },
+  "updatedTaxInformation": {
+    "message": "Ажуриране пореске информације"
+  },
+  "billingInvalidTaxIdError": {
+    "message": "Invalid tax ID, if you believe this is an error please contact support."
+  },
+  "billingTaxIdTypeInferenceError": {
+    "message": "We were unable to validate your tax ID, if you believe this is an error please contact support."
+  },
+  "billingPreviewInvalidTaxIdError": {
+    "message": "Invalid tax ID, if you believe this is an error please contact support."
+  },
+  "billingPreviewInvoiceError": {
+    "message": "An error occurred while previewing the invoice. Please try again later."
+  },
+  "unverified": {
+    "message": "Непроверено"
+  },
+  "verified": {
+    "message": "Проверено"
+  },
+  "viewSecret": {
+    "message": "Види тајну"
+  },
+  "noClients": {
+    "message": "Нема клијената за попис"
+  },
+  "providerBillingEmailHint": {
+    "message": "Овај имејл ће примати све фактуре које се односе на овог провајдера",
+    "description": "A hint that shows up on the Provider setup page to inform the admin the billing email will receive the provider's invoices."
+  },
+  "upgradeOrganizationEnterprise": {
+    "message": "Идентификујте безбедносне ризике ревизијом приступа чланова"
+  },
+  "onlyAvailableForEnterpriseOrganization": {
+    "message": "Брзо прегледајте приступ чланова широм организације надоградњом на Enterprise план."
+  },
+  "date": {
+    "message": "Датум"
+  },
+  "exportClientReport": {
+    "message": "Извези извештај клијента"
+  },
+  "memberAccessReport": {
+    "message": "Приступ чланова"
+  },
+  "memberAccessReportDesc": {
+    "message": "Уверите се да чланови имају приступ правим акредитивима и да су њихови налози сигурни. Користите овај извештај да бисте добили ЦСВ приступ чланова и конфигурације налога."
+  },
+  "memberAccessReportPageDesc": {
+    "message": "Провера приступа чланова организације кроз групе, колекције и ставке колекције. ЦСВ извоз пружа детаљну анализу по члану, укључујући информације о дозволама за прикупљање и конфигурацијама налога."
+  },
+  "memberAccessReportNoCollection": {
+    "message": "(Нема колекције)"
+  },
+  "memberAccessReportNoCollectionPermission": {
+    "message": "(Без дозволе за колекцију)"
+  },
+  "memberAccessReportNoGroup": {
+    "message": "(Нема групе)"
+  },
+  "memberAccessReportTwoFactorEnabledTrue": {
+    "message": "Да"
+  },
+  "memberAccessReportTwoFactorEnabledFalse": {
+    "message": "Не"
+  },
+  "memberAccessReportAuthenticationEnabledTrue": {
+    "message": "Да"
+  },
+  "memberAccessReportAuthenticationEnabledFalse": {
+    "message": "Не"
+  },
+  "higherKDFIterations": {
+    "message": "Веће KDF итерације може помоћи у заштити ваше главне лозинке од грубе присиле од стране нападача."
+  },
+  "incrementsOf100,000": {
+    "message": "повећање од 100.000"
+  },
+  "smallIncrements": {
+    "message": "малим корацима"
+  },
+  "kdfIterationRecommends": {
+    "message": "Препоручујемо 600.000 или више"
+  },
+  "kdfToHighWarningIncreaseInIncrements": {
+    "message": "За старије уређаје, постављање вашег КДФ-а превисоко може довести до проблема са перформансама. Повећајте вредност у $VALUE$ и тестирајте своје уређаје.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "increments of 100,000"
+      }
+    }
+  },
+  "providerReinstate": {
+    "message": " Контактирајте корисничку подршку да бисте обновили претплату."
+  },
+  "secretPeopleDescription": {
+    "message": "Одобрите групама или особама приступ овој тајни. Дозволе постављене за особе ће заменити дозволе које су поставиле групе."
+  },
+  "secretPeopleEmptyMessage": {
+    "message": "Додајте особе или групе да бисте делили приступ овој тајни"
+  },
+  "secretMachineAccountsDescription": {
+    "message": "Одобрите налозима машине приступ овој тајни."
+  },
+  "secretMachineAccountsEmptyMessage": {
+    "message": "Додајте машинске налоге да бисте одобрили приступ овој тајни"
+  },
+  "smAccessRemovalWarningSecretTitle": {
+    "message": "Уклоните приступ овој тајни"
+  },
+  "smAccessRemovalSecretMessage": {
+    "message": "Ова радња ће вам уклонити приступ овој тајни."
+  },
+  "invoice": {
+    "message": "Фактура"
+  },
+  "unassignedSeatsAvailable": {
+    "message": "Имат $SEATS$ доступна нераспоређена места.",
+    "placeholders": {
+      "seats": {
+        "content": "$1",
+        "example": "10"
+      }
+    },
+    "description": "A message showing how many unassigned seats are available for a provider."
+  },
+  "contactYourProviderForAdditionalSeats": {
+    "message": "Обратите се свом админ провајдеру да бисте купили додатна места."
+  },
+  "open": {
+    "message": "Отвори",
+    "description": "The status of an invoice."
+  },
+  "uncollectible": {
+    "message": "Ненаплативо",
+    "description": "The status of an invoice."
+  },
+  "clientDetails": {
+    "message": "Детаљи клијента"
+  },
+  "downloadCSV": {
+    "message": "Преузми ЦСВ"
+  },
+  "monthlySubscriptionUserSeatsMessage": {
+    "message": "Прилагођавања ваше претплате ће резултирати пропорционалним трошковима у односу на укупне износе рачуна у вашем следећем обрачунском периоду. "
+  },
+  "annualSubscriptionUserSeatsMessage": {
+    "message": "Прилагођавања ваше претплате ће резултирати пропорционалним трошковима за месечни обрачунски циклус. "
+  },
+  "billingHistoryDescription": {
+    "message": "Преузмите ЦСВ да бисте добили детаље о клијенту за сваки датум обрачуна. Пропорционални трошкови нису укључени у ЦСВ и могу се разликовати од повезане фактуре. За најтачније податке о обрачуну погледајте своје месечне фактуре.",
+    "description": "A paragraph on the Billing History page of the Provider Portal letting users know they can download a CSV report for their invoices that does not include prorations."
+  },
+  "noInvoicesToList": {
+    "message": "Нема фактура за попис",
+    "description": "A paragraph on the Billing History page of the Provider Portal letting users know they can download a CSV report for their invoices that does not include prorations."
+  },
+  "providerClientVaultPrivacyNotification": {
+    "message": "Обавештење: Касније овог месеца, приватност сефа клијента ће бити побољшана и чланови провајдера више неће имати директан приступ ставкама клијентског сефа. За питања,",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions, please contact Bitwarden support'."
+  },
+  "contactBitwardenSupport": {
+    "message": "контактирајте подршку Bitwarden-а.",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions, please contact Bitwarden support'. 'Bitwarden' should not be translated"
+  },
+  "sponsored": {
+    "message": "Спонзорисано"
+  },
+  "licenseAndBillingManagementDesc": {
+    "message": "Након ажурирања на Bitwarden клауду серверу, отпремите датотеку лиценце да бисте применили најновије промене."
+  },
+  "addToFolder": {
+    "message": "Додај фасцикли"
+  },
+  "selectFolder": {
+    "message": "Изабери фасциклу"
+  },
+  "personalItemTransferWarningSingular": {
+    "message": "1 ставка биће трајно пребачена у изабрану организацију. Више нећете имати ову ставку."
+  },
+  "personalItemsTransferWarningPlural": {
+    "message": "$PERSONAL_ITEMS_COUNT$ ставке биће трајно пребачени у изабрану организацију. Више нећете имати ове ставке.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "personalItemWithOrgTransferWarningSingular": {
+    "message": "1 ставка биће трајно пребачена у $ORG$. Више нећете имати ову ставку.",
+    "placeholders": {
+      "org": {
+        "content": "$1",
+        "example": "Organization name"
+      }
+    }
+  },
+  "personalItemsWithOrgTransferWarningPlural": {
+    "message": "$PERSONAL_ITEMS_COUNT$ ставке биће трајно пребачени у $ORG$. Више нећете имати ове ставке.",
+    "placeholders": {
+      "personal_items_count": {
+        "content": "$1",
+        "example": "2"
+      },
+      "org": {
+        "content": "$2",
+        "example": "Organization name"
+      }
+    }
+  },
+  "data": {
+    "message": "Подаци"
+  },
+  "purchasedSeatsRemoved": {
+    "message": "купљена места уклоњена"
+  },
+  "environmentVariables": {
+    "message": "Променљиве окружења"
+  },
+  "organizationId": {
+    "message": "ИД Организације"
+  },
+  "projectIds": {
+    "message": "ИД Пројекте"
+  },
+  "projectId": {
+    "message": "ИД Пројекта"
+  },
+  "projectsAccessedByMachineAccount": {
+    "message": "Следећим пројектима се може приступити преко овог машинског налога."
+  },
+  "config": {
+    "message": "Подешавање"
+  },
+  "learnMoreAboutEmergencyAccess": {
+    "message": "Сазнајте више о приступу у хитним случајевима"
+  },
+  "learnMoreAboutMatchDetection": {
+    "message": "Сазнајте више о откривању подударања"
+  },
+  "learnMoreAboutMasterPasswordReprompt": {
+    "message": "Сазнајте више о поновном постављању главне лозинке"
+  },
+  "learnMoreAboutSearchingYourVault": {
+    "message": "Сазнајте више о претраживању вашег сефа"
+  },
+  "learnMoreAboutYourAccountFingerprintPhrase": {
+    "message": "Сазнајте више о фрази отиска прста на налогу"
+  },
+  "impactOfRotatingYourEncryptionKey": {
+    "message": "Утицај ротирања кључа за шифровање"
+  },
+  "learnMoreAboutEncryptionAlgorithms": {
+    "message": "Сазнајте више о алгоритмима за шифровање"
+  },
+  "learnMoreAboutKDFIterations": {
+    "message": "Сазнајте више о KDF понављања"
+  },
+  "learnMoreAboutLocalization": {
+    "message": "Сазнајте више о локализацији"
+  },
+  "learnMoreAboutWebsiteIcons": {
+    "message": "Сазнајте више о коришћењу икона веб локација"
+  },
+  "learnMoreAboutUserAccess": {
+    "message": "Сазнајте више о приступу корисника"
+  },
+  "learnMoreAboutMemberRoles": {
+    "message": "Сазнајте више о улогама и дозволама чланова"
+  },
+  "whatIsACvvNumber": {
+    "message": "Шта је CVV број?"
+  },
+  "learnMoreAboutApi": {
+    "message": "Сазнајте више о API Bitwarden-а"
+  },
+  "fileSend": {
+    "message": "Датотека „Send“"
+  },
+  "fileSends": {
+    "message": "Датотека „Send“"
+  },
+  "textSend": {
+    "message": "Текст „Send“"
+  },
+  "textSends": {
+    "message": "Текст „Send“"
+  },
+  "includesXMembers": {
+    "message": "for $COUNT$ member",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
+  "costPerMember": {
+    "message": "$COST$",
+    "placeholders": {
+      "cost": {
+        "content": "$1",
+        "example": "$3"
+      }
+    }
+  },
+  "optionalOnPremHosting": {
+    "message": "Optional on-premises hosting"
+  },
+  "upgradeFreeOrganization": {
+    "message": "Upgrade your $NAME$ organization ",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "includeSsoAuthenticationMessage": {
+    "message": "SSO аутентификација"
+  },
+  "familiesPlanInvLimitReachedManageBilling": {
+    "message": "Families organizations may have up to $SEATCOUNT$ members. Upgrade to a paid plan to invite more members.",
+    "placeholders": {
+      "seatcount": {
+        "content": "$1",
+        "example": "6"
+      }
+    }
+  },
+  "familiesPlanInvLimitReachedNoManageBilling": {
+    "message": "Families organizations may have up to $SEATCOUNT$ members. Contact your organization owner to upgrade.",
+    "placeholders": {
+      "seatcount": {
+        "content": "$1",
+        "example": "6"
+      }
+    }
+  },
+  "upgradePlans": {
+    "message": "Надоградите свој план да бисте позвали чланове и искусили моћне безбедносне функције."
+  },
+  "upgradeDiscount": {
+    "message": "Уштедите $AMOUNT$%",
+    "placeholders": {
+      "amount": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "enterprisePlanUpgradeMessage": {
+    "message": "Напредне могућности за веће организације"
+  },
+  "teamsPlanUpgradeMessage": {
+    "message": "Отпорна заштита за растуће тимове"
+  },
+  "teamsInviteMessage": {
+    "message": "Invite unlimited members"
+  },
+  "accessToCreateGroups": {
+    "message": "Приступ за креирање група"
+  },
+  "syncGroupsAndUsersFromDirectory": {
+    "message": "Синхронизујте групе и кориснике из директоријума"
+  },
+  "familyPlanUpgradeMessage": {
+    "message": "Осигурајте своје породичне пријаве"
+  },
+  "accessToPremiumFeatures": {
+    "message": "Приступ Премиум функцијама"
+  },
+  "additionalStorageGbMessage": {
+    "message": "ГБ додатног простора за складиштење"
+  },
+  "sshKeyAlgorithm": {
+    "message": "Алгоритам кључа"
+  },
+  "sshPrivateKey": {
+    "message": "Приватни кључ"
+  },
+  "sshPublicKey": {
+    "message": "Јавни кључ"
+  },
+  "sshFingerprint": {
+    "message": "Отисак"
+  },
+  "sshKeyFingerprint": {
+    "message": "Отисак прста"
+  },
+  "sshKeyPrivateKey": {
+    "message": "Приватни кључ"
+  },
+  "sshKeyPublicKey": {
+    "message": "Јавни кључ"
+  },
+  "sshKeyAlgorithmED25519": {
+    "message": "ED25519"
+  },
+  "sshKeyAlgorithmRSA2048": {
+    "message": "RSA 2048-бита"
+  },
+  "sshKeyAlgorithmRSA3072": {
+    "message": "RSA 3072-бита"
+  },
+  "sshKeyAlgorithmRSA4096": {
+    "message": "RSA 4096-бита"
+  },
+  "premiumAccounts": {
+    "message": "6 премијум налога"
+  },
+  "unlimitedSharing": {
+    "message": "Неограничено дељење"
+  },
+  "unlimitedCollections": {
+    "message": "Неограничене колекције"
+  },
+  "secureDataSharing": {
+    "message": "Сигурносно дељење података"
+  },
+  "eventLogMonitoring": {
+    "message": "Праћење дневника догађаја"
+  },
+  "directoryIntegration": {
+    "message": "Directory integration"
+  },
+  "passwordLessSso": {
+    "message": "PasswordLess SSO"
+  },
+  "accountRecovery": {
+    "message": "Опоравка налога"
+  },
+  "customRoles": {
+    "message": "Прилагођене улоге"
+  },
+  "unlimitedSecretsStorage": {
+    "message": "Неограничено складиштење тајни"
+  },
+  "unlimitedUsers": {
+    "message": "Неограничен број корисника"
+  },
+  "UpTo50MachineAccounts": {
+    "message": "До 50 машинских налога"
+  },
+  "UpTo20MachineAccounts": {
+    "message": "До 20 машинских налога"
+  },
+  "current": {
+    "message": "Тренутно"
+  },
+  "secretsManagerSubscriptionInfo": {
+    "message": "Ваша претплата на Secrets Manager ће се надоградити на основу одабраног плана"
+  },
+  "bitwardenPasswordManager": {
+    "message": "Bitwarden Менаџер Лозинке"
+  },
+  "secretsManagerComplimentaryPasswordManager": {
+    "message": "Ваша комплементарна једногодишња претплата на Менаџер Лозинки ће надоградити на изабрани план. Неће вам бити наплаћено док се бесплатни период не заврши."
+  },
+  "fileSavedToDevice": {
+    "message": "Датотека је сачувана на уређају. Управљајте преузимањима са свог уређаја."
+  },
+  "publicApi": {
+    "message": "Јавни API",
+    "description": "The text, 'API', is an acronym and should not be translated."
+  },
+  "showCharacterCount": {
+    "message": "Прикажи бројање слова"
+  },
+  "hideCharacterCount": {
+    "message": "Сакриј бројање слова"
+  },
+  "editAccess": {
+    "message": "Уредити приступ"
+  },
+  "textHelpText": {
+    "message": "Користите текстуална поља за податке као што су безбедносна питања"
+  },
+  "hiddenHelpText": {
+    "message": "Користите скривена поља за осетљиве податке као што је лозинка"
+  },
+  "checkBoxHelpText": {
+    "message": "Користите поља за потврду ако желите да аутоматски попуните поље за потврду обрасца, на пример имејл за памћење"
+  },
+  "linkedHelpText": {
+    "message": "Користите повезано поље када имате проблема са аутоматским попуњавањем за одређену веб локацију."
+  },
+  "linkedLabelHelpText": {
+    "message": "Унесите html Ид поља, име, aria-label, или placeholder."
+  },
+  "uppercaseDescription": {
+    "message": "Укључити велика слова",
+    "description": "Tooltip for the password generator uppercase character checkbox"
+  },
+  "uppercaseLabel": {
+    "message": "A-Z",
+    "description": "Label for the password generator uppercase character checkbox"
+  },
+  "lowercaseDescription": {
+    "message": "Укључити мала слова",
+    "description": "Full description for the password generator lowercase character checkbox"
+  },
+  "lowercaseLabel": {
+    "message": "a-z",
+    "description": "Label for the password generator lowercase character checkbox"
+  },
+  "numbersDescription": {
+    "message": "Укључити бројеве",
+    "description": "Full description for the password generator numbers checkbox"
+  },
+  "numbersLabel": {
+    "message": "0-9",
+    "description": "Label for the password generator numbers checkbox"
+  },
+  "specialCharactersDescription": {
+    "message": "Укључити специјална слова",
+    "description": "Full description for the password generator special characters checkbox"
+  },
+  "addAttachment": {
+    "message": "Додај прилог"
+  },
+  "maxFileSizeSansPunctuation": {
+    "message": "Максимална величина је 500МБ"
+  },
+  "permanentlyDeleteAttachmentConfirmation": {
+    "message": "Да ли сте сигурни да желите да трајно избришете овај прилог?"
+  },
+  "manageSubscriptionFromThe": {
+    "message": "Manage subscription from the",
+    "description": "This represents the beginning of a sentence. The full sentence will be 'Manage subscription from the Provider Portal', but 'Provider Portal' will be a link and thus cannot be included in the translation file."
+  },
+  "toHostBitwardenOnYourOwnServer": {
+    "message": "To host Bitwarden on your own server, you will need to upload your license file. To support Free Families plans and advanced billing capabilities for your self-hosted organization, you will need to set up automatic sync in your self-hosted organization."
+  },
+  "selfHostingTitleProper": {
+    "message": "Селф-Хостинг"
+  },
+  "claim-domain-single-org-warning": {
+    "message": "Claiming a domain will turn on the single organization policy."
+  },
+  "single-org-revoked-user-warning": {
+    "message": "Non-compliant members will be revoked. Administrators can restore members once they leave all other organizations."
+  },
+  "deleteOrganizationUser": {
+    "message": "Обриши $NAME$",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Doe"
+      },
+      "description": "Title for the delete organization user dialog"
+    }
+  },
+  "deleteOrganizationUserWarningDesc": {
+    "message": "This will permanently delete all items owned by $NAME$. Collection items are not impacted.",
+    "description": "Warning description for the delete organization user dialog",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Doe"
+      }
+    }
+  },
+  "deleteManyOrganizationUsersWarningDesc": {
+    "message": "This will permanently delete all items owned by the following members. Collection items are not impacted.",
+    "description": "Warning description for the bulk delete organization users dialog"
+  },
+  "organizationUserDeleted": {
+    "message": "$NAME$ је обрисан",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Doe"
+      }
+    }
+  },
+  "organizationUserDeletedDesc": {
+    "message": "Корисник је уклоњен из организације и сви повезани кориснички подаци су избрисани."
+  },
+  "deletedUserId": {
+    "message": "Deleted user $ID$ - an owner / admin deleted the user account",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "First 8 Character of a GUID"
+      }
+    }
+  },
+  "userLeftOrganization": {
+    "message": "$ID$ је напустио организацију",
+    "placeholders": {
+      "id": {
+        "content": "$1",
+        "example": "First 8 Character of a GUID"
+      }
+    }
+  },
+  "suspendedOrganizationTitle": {
+    "message": "$ORGANIZATION$ је суспендована",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
+  },
+  "suspendedUserOrgMessage": {
+    "message": "Обратите се власнику ваше организације за помоћ."
+  },
+  "suspendedOwnerOrgMessage": {
+    "message": "Да бисте поново добили приступ својој организацији, додајте начин плаћања."
+  },
+  "deleteMembers": {
+    "message": "Избрисати чланове"
+  },
+  "noSelectedMembersApplicable": {
+    "message": "Ова акција није применљива на било који од одабраних чланова."
+  },
+  "deletedSuccessfully": {
+    "message": "Успешно обрисано"
+  },
+  "freeFamiliesSponsorship": {
+    "message": "Remove Free Bitwarden Families sponsorship"
+  },
+  "freeFamiliesSponsorshipPolicyDesc": {
+    "message": "Do not allow members to redeem a Families plan through this organization."
+  },
+  "verifyBankAccountWithStatementDescriptorWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the organization's billing page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "verifyBankAccountWithStatementDescriptorInstructions": {
+    "message": "We have made a micro-deposit to your bank account (this may take 1-2 business days). Enter the six-digit code starting with 'SM' found on the deposit description. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "descriptorCode": {
+    "message": "Кôд дескриптора"
+  },
+  "cannotRemoveViewOnlyCollections": {
+    "message": "Не можете уклонити колекције са дозволама само за приказ: $COLLECTIONS$",
+    "placeholders": {
+      "collections": {
+        "content": "$1",
+        "example": "Work, Personal"
+      }
+    }
+  },
+  "removeMembers": {
+    "message": "Уклони чланове"
+  },
+  "devices": {
+    "message": "Уређаји"
+  },
+  "deviceListDescription": {
+    "message": "Ваш рачун је пријављен на сваку од доле наведених уређаја. Ако не препознајете уређај, извадите га сада."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Ваш рачун је пријављен на сваку од доле наведених уређаја."
+  },
+  "claimedDomains": {
+    "message": "Claimed domains"
+  },
+  "claimDomain": {
+    "message": "Claim domain"
+  },
+  "reclaimDomain": {
+    "message": "Reclaim domain"
+  },
+  "claimDomainNameInputHint": {
+    "message": "Example: mydomain.com. Subdomains require separate entries to be claimed."
+  },
+  "automaticClaimedDomains": {
+    "message": "Automatic Claimed Domains"
+  },
+  "automaticDomainClaimProcess": {
+    "message": "Bitwarden will attempt to claim the domain 3 times during the first 72 hours. If the domain can’t be claimed, check the DNS record in your host and manually claim. The domain will be removed from your organization in 7 days if it is not claimed."
+  },
+  "domainNotClaimed": {
+    "message": "$DOMAIN$ not claimed. Check your DNS records.",
+    "placeholders": {
+      "DOMAIN": {
+        "content": "$1",
+        "example": "bitwarden.com"
+      }
+    }
+  },
+  "domainStatusClaimed": {
+    "message": "Claimed"
+  },
+  "domainStatusUnderVerification": {
+    "message": "Под провером"
+  },
+  "claimedDomainsDesc": {
+    "message": "Claim a domain to own all member accounts whose email address matches the domain. Members will be able to skip the SSO identifier when logging in. Administrators will also be able to delete member accounts."
+  },
+  "invalidDomainNameClaimMessage": {
+    "message": "Input is not a valid format. Format: mydomain.com. Subdomains require separate entries to be claimed."
+  },
+  "domainClaimedEvent": {
+    "message": "$DOMAIN$ claimed",
+    "placeholders": {
+      "DOMAIN": {
+        "content": "$1",
+        "example": "bitwarden.com"
+      }
+    }
+  },
+  "domainNotClaimedEvent": {
+    "message": "$DOMAIN$ not claimed",
+    "placeholders": {
+      "DOMAIN": {
+        "content": "$1",
+        "example": "bitwarden.com"
+      }
+    }
+  },
+  "updatedRevokeSponsorshipConfirmationForSentSponsorship": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan cannot be redeemed. Are you sure you want to continue?",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "sponsored@organization.com"
+      }
+    }
+  },
+  "updatedRevokeSponsorshipConfirmationForAcceptedSponsorship": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end and the saved payment method will be charged $40 + applicable tax on $DATE$. You will not be able to redeem a new sponsorship until $DATE$. Are you sure you want to continue?",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "sponsored@organization.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/10/2024"
+      }
+    }
+  },
+  "domainClaimed": {
+    "message": "Domain claimed"
+  },
+  "organizationNameMaxLength": {
+    "message": "Име организације не може прећи 50 знакова."
+  },
+  "rotationCompletedTitle": {
+    "message": "Key rotation successful"
+  },
+  "rotationCompletedDesc": {
+    "message": "Your master password and encryption keys have been updated. Your other devices have been logged out."
+  },
+  "trustUserEmergencyAccess": {
+    "message": "Trust and confirm user"
+  },
+  "trustOrganization": {
+    "message": "Trust organization"
+  },
+  "trust": {
+    "message": "Trust"
+  },
+  "doNotTrust": {
+    "message": "Do not trust"
+  },
+  "organizationNotTrusted": {
+    "message": "Организација није поверљива"
+  },
+  "emergencyAccessTrustWarning": {
+    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+  },
+  "orgTrustWarning": {
+    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+  },
+  "orgTrustWarning1": {
+    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+  },
+  "trustUser": {
+    "message": "Trust user"
+  },
+  "sshKeyWrongPassword": {
+    "message": "Лозинка коју сте унели није тачна."
+  },
+  "importSshKey": {
+    "message": "Увоз"
+  },
+  "confirmSshKeyPassword": {
+    "message": "Потврда лозинке"
+  },
+  "enterSshKeyPasswordDesc": {
+    "message": "Унети лозинку за SSH кључ."
+  },
+  "enterSshKeyPassword": {
+    "message": "Унесите лозинку"
+  },
+  "invalidSshKey": {
+    "message": "SSH кључ је неважећи"
+  },
+  "sshKeyTypeUnsupported": {
+    "message": "Тип SSH кључа није подржан"
+  },
+  "importSshKeyFromClipboard": {
+    "message": "Увезите кључ из оставе"
+  },
+  "sshKeyImported": {
+    "message": "SSH кључ је успешно увезен"
+  },
+  "copySSHPrivateKey": {
+    "message": "Копирај приватни кључ"
+  },
+  "openingExtension": {
+    "message": "Отварање Bitwarden додатка прегледача"
+  },
+  "somethingWentWrong": {
+    "message": "Нешто није у реду..."
+  },
+  "openingExtensionError": {
+    "message": "Имали смо проблема са отварањем додатка. Кликните на дугме да бисте га сада отворили."
+  },
+  "openExtension": {
+    "message": "Отвори додатак"
+  },
+  "doNotHaveExtension": {
+    "message": "Немате додатак за Bitwarden?"
+  },
+  "installExtension": {
+    "message": "Инсталирајте додатак"
+  },
+  "openedExtension": {
+    "message": "Отворите додатак претраживача"
+  },
+  "openedExtensionViewAtRiskPasswords": {
+    "message": "Успешно је отворен додатак. Сада можете да прегледате своје ризичне лозинке."
+  },
+  "openExtensionManuallyPart1": {
+    "message": "Имали смо проблема са отварањем додатка. Отворите Bitwarden иконицу",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
+  },
+  "openExtensionManuallyPart2": {
+    "message": "са алатне траке.",
+    "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
+  },
+  "resellerRenewalWarningMsg": {
+    "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
+    "placeholders": {
+      "reseller": {
+        "content": "$1",
+        "example": "Reseller Name"
+      },
+      "renewal_date": {
+        "content": "$2",
+        "example": "01/01/2024"
+      }
+    }
+  },
+  "resellerOpenInvoiceWarningMgs": {
+    "message": "An invoice for your subscription was issued on $ISSUED_DATE$. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $DUE_DATE$.",
+    "placeholders": {
+      "reseller": {
+        "content": "$1",
+        "example": "Reseller Name"
+      },
+      "issued_date": {
+        "content": "$2",
+        "example": "01/01/2024"
+      },
+      "due_date": {
+        "content": "$3",
+        "example": "01/15/2024"
+      }
+    }
+  },
+  "resellerPastDueWarningMsg": {
+    "message": "The invoice for your subscription has not been paid. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $GRACE_PERIOD_END$.",
+    "placeholders": {
+      "reseller": {
+        "content": "$1",
+        "example": "Reseller Name"
+      },
+      "grace_period_end": {
+        "content": "$2",
+        "example": "02/14/2024"
+      }
+    }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Поново покрените претплату"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Контактирајте $PROVIDER$ за помоћ.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
+  },
+  "accountDeprovisioningNotification": {
+    "message": "Administrators now have the ability to delete member accounts that belong to a claimed domain."
+  },
+  "deleteManagedUserWarningDesc": {
+    "message": "This action will delete the member account including all items in their vault. This replaces the previous Remove action."
+  },
+  "deleteManagedUserWarning": {
+    "message": "Избриши је нова акција!"
+  },
+  "seatsRemaining": {
+    "message": "You have $REMAINING$ seats remaining out of $TOTAL$ seats assigned to this organization. Contact your provider to manage your subscription.",
+    "placeholders": {
+      "remaining": {
+        "content": "$1",
+        "example": "5"
+      },
+      "total": {
+        "content": "$2",
+        "example": "10"
+      }
+    }
+  },
+  "existingOrganization": {
+    "message": "Постојећа организација"
+  },
+  "selectOrganizationProviderPortal": {
+    "message": "Select an organization to add to your Provider Portal."
+  },
+  "noOrganizations": {
+    "message": "There are no organizations to list"
+  },
+  "yourProviderSubscriptionCredit": {
+    "message": "Your provider subscription will receive a credit for any remaining time in the organization's subscription."
+  },
+  "doYouWantToAddThisOrg": {
+    "message": "Do you want to add this organization to $PROVIDER$?",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Cool MSP"
+      }
+    }
+  },
+  "addedExistingOrganization": {
+    "message": "Added existing organization"
+  },
+  "assignedExceedsAvailable": {
+    "message": "Assigned seats exceed available seats."
+  },
+  "userkeyRotationDisclaimerEmergencyAccessText": {
+    "message": "Fingerprint phrase for $NUM_USERS$ contacts for which you have enabled emergency access.",
+    "placeholders": {
+      "num_users": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
+  "userkeyRotationDisclaimerAccountRecoveryOrgsText": {
+    "message": "Fingerprint phrase for the organization $ORG_NAME$ for which you have enabled account recovery.",
+    "placeholders": {
+      "org_name": {
+        "content": "$1",
+        "example": "My org"
+      }
+    }
+  },
+  "userkeyRotationDisclaimerDescription": {
+    "message": "Rotating your encryption keys will require you to trust keys of any organizations that can recover your account, and any contacts that you have enabled emergency access for. To continue, make sure you can verify the following:"
+  },
+  "userkeyRotationDisclaimerTitle": {
+    "message": "Untrusted encryption keys"
+  },
+  "changeAtRiskPassword": {
+    "message": "Променити ризичну лозинку"
+  },
+  "removeUnlockWithPinPolicyTitle": {
+    "message": "Remove Unlock with PIN"
+  },
+  "removeUnlockWithPinPolicyDesc": {
+    "message": "Do not allow members to unlock their account with a PIN."
+  },
+  "upgradeForFullEventsMessage": {
+    "message": "Извештаји догађаја се не чувају за вашу организацију. Надоградите се у плану Teams или Enterprise да бисте добили потпуни приступ извештајима догађаја организације."
+  },
+  "upgradeEventLogTitleMessage": {
+    "message": "Надоградите да бисте видели извештаји догађаја из ваше организације."
+  },
+  "upgradeEventLogMessage": {
+    "message": "Ови догађаји су само примери и не одражавају стварне догађаје у вашем Bitwarden отганизацији."
+  },
+  "cannotCreateCollection": {
+    "message": "Бесплатне организације могу имати до 2 колекције. Надоградите на плаћени план за додавање више колекција."
+  },
+  "businessUnit": {
+    "message": "Business Unit"
+  },
+  "businessUnits": {
+    "message": "Business Units"
+  },
+  "newBusinessUnit": {
+    "message": "New business unit"
+  },
+  "sendsTitleNoItems": {
+    "message": "Шаљите бзбедно осетљиве информације",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Делите датотеке и податке безбедно са било ким, на било којој платформи. Ваше информације ће остати шифроване од почетка-до-краја уз ограничење изложености.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Брзо креирајте лозинке"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Лако креирајте снажне и јединствене лозинке кликом на",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "да вам помогне да задржите своје пријаве сигурно.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Лако креирајте снажне и јединствене лозинке кликом на дугме „Генерирате лозинку“ да вам помогне да чувате своје пријаве на сигурно.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
+  "newLoginNudgeTitle": {
+    "message": "Уштедите време са ауто-пуњењем"
+  },
+  "newLoginNudgeBodyOne": {
+    "message": "Укључите",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
+    "example": "Include a Website so this login appears as an autofill suggestion."
+  },
+  "newLoginNudgeBodyBold": {
+    "message": "Веб сајт",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
+    "example": "Include a Website so this login appears as an autofill suggestion."
+  },
+  "newLoginNudgeBodyTwo": {
+    "message": "тако да се ова пријава појављује као предлог за ауто-пуњење.",
+    "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
+    "example": "Include a Website so this login appears as an autofill suggestion."
+  },
+  "newCardNudgeTitle": {
+    "message": "Лако онлајн плачање"
+  },
+  "newCardNudgeBody": {
+    "message": "Са картицама, лако и сигурносно попуните формуларе за плаћање."
+  },
+  "newIdentityNudgeTitle": {
+    "message": "Поједноставите креирање налога"
+  },
+  "newIdentityNudgeBody": {
+    "message": "Са идентитетима, брзо попуните регистрације или контактних образаци."
+  },
+  "newNoteNudgeTitle": {
+    "message": "Држите на сигурном своје осетљиве податке"
+  },
+  "newNoteNudgeBody": {
+    "message": "Са белешкама, сигурно чувајте осетљиве податке попут банкарског или подаци о осигурању."
+  },
+  "newSshNudgeTitle": {
+    "message": "Лак SSH приступ"
+  },
+  "newSshNudgeBodyOne": {
+    "message": "Чувајте кључеве и повежите се са SSH агент за брзу, шифровану аутентификацију.",
+    "description": "Two part message",
+    "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "newSshNudgeBodyTwo": {
+    "message": "Сазнајте више о SSH агенту",
+    "description": "Two part message",
+    "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
+  },
+  "setupExtensionPageTitle": {
+    "message": "Ауто-попунити лозинке са једним кликом"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Преузети Bitwarden додатак за претраживач и почнети са ауто-попуњавањем"
+  },
+  "getTheExtension": {
+    "message": "Добити додатак"
+  },
+  "addItLater": {
+    "message": "Додати касније"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Не можете ауто-попуњавати лозинке без екстензије за прегледач"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Да ли сте сигурни да не желите да сада додате екстензију?"
+  },
+  "skipToWebApp": {
+    "message": "Прескочи на веб апликацију"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden екстензија инсталираана!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Отворите екстензију да бисте се пријавили и започели ауто-попуњавање."
+  },
+  "openBitwardenExtension": {
+    "message": "Отворити Bitwarden екстензију"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "За савете о почетку рада са Bitwarden-ом посетите",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Центар за учење",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Центар за помоћ",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "Помоћу Bitwarden екстензије за прегледач можете лако да креирате нове пријаве, приступите сачуваним пријавама директно из траке са алаткама прегледача и брзо се пријавите на налоге користећи Bitwarden ауто-попуњавање."
+  },
+  "restart": {
+    "message": "Поново покрени"
+  },
+  "verifyProviderBankAccountWithStatementDescriptorWarning": {
+    "message": "Плаћање са банковним рачуном доступно је само купцима у Сједињеним Државама. Од вас ће бити потребно да проверите свој банковни рачун. Направит ћемо микро депозит у наредних 1-2 радна дана. Унесите кôд за дескриптор изјаве са овог депозита на претплатничкој страници провајдера да бисте потврдили банковни рачун. Неуспех у верификацији банковног рачуна резултираће пропуштеним плаћањем и претплатом је суспендовано."
+  },
+  "clickPayWithPayPal": {
+    "message": "Кликните на Pay with PayPal да бисте додали начин лпаћања."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Ако уклоните $EMAIL$, спонзорство за овај породични план ће се завршити. Седиште у вашој организацији постаће доступно за чланове или спонзорства након што је спонзорисан датум обнове организације на $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Адреса за наплату је потребна за додавање кредита.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Адреса рачуна"
+  },
+  "addBillingAddress": {
+    "message": "Додајте адресу за обрачун"
+  },
+  "editBillingAddress": {
+    "message": "Уредити адресу за обрачун"
+  },
+  "noBillingAddress": {
+    "message": "Нема адресе."
+  },
+  "billingAddressUpdated": {
+    "message": "Ваша адреса је промењена."
+  },
+  "paymentDetails": {
+    "message": "Детаљи плаћања"
+  },
+  "paymentMethodUpdated": {
+    "message": "Ваш начин плаћања је ажуриран."
+  },
+  "bankAccountVerified": {
+    "message": "Банковни рачун је верификован."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Сваки расположиви кредит ће бити аутоматски примењен на фактуре генерисане за овај налог."
+  },
+  "mustBePositiveNumber": {
+    "message": "Мора бити позитиван број"
+  },
+  "cardSecurityCode": {
+    "message": "Сигурносни кôд картица"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Безбедносни кôд картице, такође познат као CVV или CVC, је обично троцифрени број одштампан на полеђини ваше кредитне картице или четвороцифрени број одштампан на предњој страни изнад броја ваше картице."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Плаћање путем банковног рачуна је доступно само купцима у Сједињеним Америчким Државама. Биће потребно да верификујете свој банковни рачун. Извршићемо микро-депозит у наредних 1-2 радна дана. Унесите кôд дескриптора извода са овог депозита на страници са детаљима плаћања да бисте верификовали банковни рачун. Уколико не верификујете банковни рачун, доћи ће до пропуштеног плаћања и суспендовања ваше претплате."
+  },
+  "taxId": {
+    "message": "Порески број: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/sv/messages.json b/apps/web/src/locales/sv/messages.json
index 3bbfc4577ea..8a8b5d4fdc7 100644
--- a/apps/web/src/locales/sv/messages.json
+++ b/apps/web/src/locales/sv/messages.json
@@ -3,13 +3,13 @@
     "message": "Alla applikationer"
   },
   "appLogoLabel": {
-    "message": "Bitwarden logo"
+    "message": "Bitwardens logotyp"
   },
   "criticalApplications": {
     "message": "Kritiska applikationer"
   },
   "noCriticalAppsAtRisk": {
-    "message": "No critical applications at risk"
+    "message": "Inga kritiska applikationer i riskzonen"
   },
   "accessIntelligence": {
     "message": "Access Intelligence"
@@ -21,10 +21,10 @@
     "message": "Lösenordsrisk"
   },
   "reviewAtRiskPasswords": {
-    "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
+    "message": "Granska risklösenord (svaga, exponerade eller återanvända) i olika applikationer. Välj ut de mest kritiska applikationerna för att prioritera säkerhetsåtgärder för användarna för att hantera risklösenord."
   },
   "dataLastUpdated": {
-    "message": "Data last updated: $DATE$",
+    "message": "Data senast uppdaterade: $DATE$",
     "placeholders": {
       "date": {
         "content": "$1",
@@ -33,16 +33,16 @@
     }
   },
   "notifiedMembers": {
-    "message": "Notified members"
+    "message": "Meddelade medlemmar"
   },
   "revokeMembers": {
-    "message": "Revoke members"
+    "message": "Återkalla medlemmar"
   },
   "restoreMembers": {
-    "message": "Restore members"
+    "message": "Återställ medlemmar"
   },
   "cannotRestoreAccessError": {
-    "message": "Cannot restore organization access"
+    "message": "Det går inte att återställa organisationsåtkomst"
   },
   "allApplicationsWithCount": {
     "message": "Alla applikationer ($COUNT$)",
@@ -66,7 +66,7 @@
     }
   },
   "notifiedMembersWithCount": {
-    "message": "Notified members ($COUNT$)",
+    "message": "Meddelade medlemmar ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -84,13 +84,13 @@
     }
   },
   "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+    "message": "När användare sparar inloggningar visas applikationer här och visar eventuella riskfyllda lösenord. Markera kritiska appar och meddela användarna att de ska uppdatera lösenorden."
   },
   "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+    "message": "Du har inte markerat några applikationer som kritiska"
   },
   "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+    "message": "Välj ut dina mest kritiska applikationer för att upptäcka riskfyllda lösenord och meddela användarna att de ska byta lösenord."
   },
   "markCriticalApps": {
     "message": "Markera kritiska applikationer"
@@ -99,28 +99,28 @@
     "message": "Markera app som kritisk"
   },
   "applicationsMarkedAsCriticalSuccess": {
-    "message": "Applications marked as critical"
+    "message": "Applikationer markerade som kritiska"
   },
   "application": {
     "message": "Applikation"
   },
   "atRiskPasswords": {
-    "message": "At-risk passwords"
+    "message": "Lösenord i riskzonen"
   },
   "requestPasswordChange": {
-    "message": "Request password change"
+    "message": "Begär ändring av lösenord"
   },
   "totalPasswords": {
-    "message": "Total passwords"
+    "message": "Totalt antal lösenord"
   },
   "searchApps": {
-    "message": "Search applications"
+    "message": "Sök applikationer"
   },
   "atRiskMembers": {
-    "message": "At-risk members"
+    "message": "Riskutsatta medlemmar"
   },
   "atRiskMembersWithCount": {
-    "message": "At-risk members ($COUNT$)",
+    "message": "Medlemmar i riskzonen ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -129,7 +129,7 @@
     }
   },
   "atRiskApplicationsWithCount": {
-    "message": "At-risk applications ($COUNT$)",
+    "message": "Applikationer i riskzonen ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -138,19 +138,19 @@
     }
   },
   "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+    "message": "Dessa medlemmar loggar in i applikationer med svaga, exponerade eller återanvända lösenord."
   },
   "atRiskMembersDescriptionNone": {
-    "message": "These are no members logging into applications with weak, exposed, or reused passwords."
+    "message": "Det finns inga medlemmar som loggar in i applikationer med svaga, exponerade eller återanvända lösenord."
   },
   "atRiskApplicationsDescription": {
-    "message": "These applications have weak, exposed, or reused passwords."
+    "message": "Dessa applikationer har svaga, exponerade eller återanvända lösenord."
   },
   "atRiskApplicationsDescriptionNone": {
-    "message": "These are no applications with weak, exposed, or reused passwords."
+    "message": "Det här är inga applikationer med svaga, exponerade eller återanvända lösenord."
   },
   "atRiskMembersDescriptionWithApp": {
-    "message": "These members are logging into $APPNAME$ with weak, exposed, or reused passwords.",
+    "message": "Dessa medlemmar loggar in på $APPNAME$ med svaga, exponerade eller återanvända lösenord.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -159,7 +159,7 @@
     }
   },
   "atRiskMembersDescriptionWithAppNone": {
-    "message": "There are no at risk members for $APPNAME$.",
+    "message": "Det finns inga medlemmar i riskzonen för $APPNAME$.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -168,19 +168,19 @@
     }
   },
   "totalMembers": {
-    "message": "Total members"
+    "message": "Totalt antal medlemmar"
   },
   "atRiskApplications": {
-    "message": "At-risk applications"
+    "message": "Applikationer i riskzonen"
   },
   "totalApplications": {
-    "message": "Total applications"
+    "message": "Totalt antal applikationer"
   },
   "unmarkAsCriticalApp": {
-    "message": "Unmark as critical app"
+    "message": "Avmarkera som kritisk app"
   },
   "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+    "message": "Kritisk applikation avmarkerades"
   },
   "whatTypeOfItem": {
     "message": "Vilken typ av objekt är detta?"
@@ -220,7 +220,7 @@
     "message": "Anteckningar"
   },
   "privateNote": {
-    "message": "Private note"
+    "message": "Privat notering"
   },
   "note": {
     "message": "Anteckning"
@@ -235,19 +235,19 @@
     "message": "Inloggningsuppgifter"
   },
   "personalDetails": {
-    "message": "Personal details"
+    "message": "Personliga uppgifter"
   },
   "identification": {
     "message": "Identifikation"
   },
   "contactInfo": {
-    "message": "Contact info"
+    "message": "Kontaktuppgifter"
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "Kortinformation"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "$BRAND$ detaljer",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -278,7 +278,7 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Webbplats tillagd"
   },
   "addWebsite": {
     "message": "Lägg till webbplats"
@@ -297,7 +297,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "Show match detection $WEBSITE$",
+    "message": "Visa matchningsdetektering $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -306,7 +306,7 @@
     }
   },
   "hideMatchDetection": {
-    "message": "Hide match detection $WEBSITE$",
+    "message": "Detektering av dold matchning $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -315,7 +315,7 @@
     }
   },
   "autoFillOnPageLoad": {
-    "message": "Autofill on page load?"
+    "message": "Autofyll vid sidladdning?"
   },
   "number": {
     "message": "Nummer"
@@ -330,7 +330,7 @@
     "message": "Säkerhetskod (CVV)"
   },
   "securityCodeSlashCVV": {
-    "message": "Security code / CVV"
+    "message": "Säkerhetskod / CVV"
   },
   "identityName": {
     "message": "Identitetsnamn"
@@ -408,10 +408,10 @@
     "message": "Dr"
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Utgånget kort"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "Om du har förnyat kortet ska du uppdatera kortinformationen"
   },
   "expirationMonth": {
     "message": "Utgångsmånad"
@@ -423,13 +423,13 @@
     "message": "Autentiseringsnyckel (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "Gör tvåstegsverifiering sömlös"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden kan lagra och fylla tvåstegsverifieringskoder. Kopiera och klistra in nyckeln i detta fält."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden kan lagra och fylla i 2-stegsverifieringskoder. Välj kameraikonen för att ta en skärmdump av den här webbplatsens QR-kod för autentisering, eller kopiera och klistra in nyckeln i det här fältet."
   },
   "learnMoreAboutAuthenticators": {
     "message": "Läs mer om autentiserare"
@@ -450,7 +450,7 @@
     "message": "Booleskt värde"
   },
   "cfTypeCheckbox": {
-    "message": "Checkbox"
+    "message": "Kryssruta"
   },
   "cfTypeLinked": {
     "message": "Länkad",
@@ -483,7 +483,7 @@
     "message": "Redigera mapp"
   },
   "editWithName": {
-    "message": "Edit $ITEM$: $NAME$",
+    "message": "Redigera $ITEM$: $NAME$",
     "placeholders": {
       "item": {
         "content": "$1",
@@ -496,16 +496,16 @@
     }
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Ny mapp"
   },
   "folderName": {
-    "message": "Folder name"
+    "message": "Mappnamn"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Nästla en mapp genom att lägga till namnet på den överordnade mappen följt av \"/\". Exempel: Sociala/Forums"
   },
   "deleteFolderPermanently": {
-    "message": "Are you sure you want to permanently delete this folder?"
+    "message": "Är du säker på att du vill radera den här mappen permanent?"
   },
   "baseDomain": {
     "message": "Basdomän",
@@ -547,12 +547,6 @@
     "message": "Växla synlig/dold",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generera lösenord"
-  },
-  "generatePassphrase": {
-    "message": "Generera lösenfras"
-  },
   "checkPassword": {
     "message": "Kontrollera om ditt lösenord har äventyrats."
   },
@@ -766,7 +760,7 @@
     "message": "Objekt"
   },
   "itemDetails": {
-    "message": "Item details"
+    "message": "Objektdetaljer"
   },
   "itemName": {
     "message": "Objektnamn"
@@ -795,7 +789,7 @@
     }
   },
   "copySuccessful": {
-    "message": "Copy Successful"
+    "message": "Kopiering lyckades"
   },
   "copyValue": {
     "message": "Kopiera värde",
@@ -862,7 +856,7 @@
     "message": "Kopiera passnummer"
   },
   "copyLicenseNumber": {
-    "message": "Copy license number"
+    "message": "Kopiera licensnummer"
   },
   "copyName": {
     "message": "Kopiera namn"
@@ -870,6 +864,9 @@
   "me": {
     "message": "Jag"
   },
+  "myItems": {
+    "message": "Mina objekt"
+  },
   "myVault": {
     "message": "Mitt valv"
   },
@@ -944,7 +941,7 @@
     }
   },
   "itemsMovedToOrg": {
-    "message": "Items moved to $ORGNAME$",
+    "message": "Objekt flyttade till $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -953,7 +950,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Item moved to $ORGNAME$",
+    "message": "Objekt flyttade till $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -1007,7 +1004,7 @@
     "message": "Åtkomstnivå"
   },
   "accessing": {
-    "message": "Accessing"
+    "message": "Tillgång"
   },
   "loggedOut": {
     "message": "Utloggad"
@@ -1019,13 +1016,13 @@
     "message": "Din inloggningssession har upphört."
   },
   "restartRegistration": {
-    "message": "Restart registration"
+    "message": "Starta om registrering"
   },
   "expiredLink": {
-    "message": "Expired link"
+    "message": "Utgången länk"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "Please restart registration or try logging in."
+    "message": "Starta om registreringen eller försök att logga in."
   },
   "youMayAlreadyHaveAnAccount": {
     "message": "Du kanske redan har ett konto"
@@ -1046,7 +1043,7 @@
     "message": "Nej"
   },
   "location": {
-    "message": "Location"
+    "message": "Plats"
   },
   "loginOrCreateNewAccount": {
     "message": "Logga in eller skapa ett nytt konto för att komma åt ditt valv."
@@ -1058,7 +1055,7 @@
     "message": "\"Logga in med enhet\" måste ställas in i inställningarna i Bitwardens app. Behöver du ett annat alternativ?"
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "Behöver du ett annat alternativ?"
   },
   "loginWithMasterPassword": {
     "message": "Logga in med huvudlösenord"
@@ -1169,7 +1166,7 @@
     "message": "Ställ in ett starkt lösenord"
   },
   "finishCreatingYourAccountBySettingAPassword": {
-    "message": "Finish creating your account by setting a password"
+    "message": "Avsluta skapandet av ditt konto genom att ange ett lösenord"
   },
   "newAroundHere": {
     "message": "Är du ny här?"
@@ -1184,40 +1181,40 @@
     "message": "Logga in på Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Enter the code sent to your email"
+    "message": "Ange koden som skickats till din e-post"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "Ange koden från din autentiseringsapp"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Press your YubiKey to authenticate"
+    "message": "Tryck på din YubiKey för att autentisera"
   },
   "authenticationTimeout": {
-    "message": "Authentication timeout"
+    "message": "Timeout för autentisering"
   },
   "authenticationSessionTimedOut": {
-    "message": "The authentication session timed out. Please restart the login process."
+    "message": "Autentiseringssessionen timade ut. Vänligen starta om inloggningsprocessen."
   },
   "verifyYourIdentity": {
-    "message": "Verify your Identity"
+    "message": "Verifiera din identitet"
   },
   "weDontRecognizeThisDevice": {
-    "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
+    "message": "Vi känner inte igen den här enheten. Ange koden som skickats till din e-post för att verifiera din identitet."
   },
   "continueLoggingIn": {
-    "message": "Continue logging in"
+    "message": "Fortsätt logga in"
   },
   "whatIsADevice": {
-    "message": "What is a device?"
+    "message": "Vad är en enhet?"
   },
   "aDeviceIs": {
-    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+    "message": "En enhet är en unik installation av Bitwarden-appen där du har loggat in. Ominstallation, rensning av appdata eller rensning av dina cookies kan leda till att en enhet visas flera gånger."
   },
   "logInInitiated": {
     "message": "Inloggning påbörjad"
   },
   "logInRequestSent": {
-    "message": "Request sent"
+    "message": "Begäran skickades"
   },
   "submit": {
     "message": "Skicka"
@@ -1272,7 +1269,7 @@
     "message": "Inställningar"
   },
   "accountEmail": {
-    "message": "Account email"
+    "message": "Konto E-post"
   },
   "requestHint": {
     "message": "Begär ledtråd"
@@ -1281,7 +1278,7 @@
     "message": "Begär lösenordsledtråd"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Enter your account email address and your password hint will be sent to you"
+    "message": "Ange din e-postadress för kontot så skickas en lösenordshint till dig"
   },
   "getMasterPasswordHint": {
     "message": "Hämta huvudlösenordsledtråd"
@@ -1376,7 +1373,7 @@
     "message": "Du har inte behörighet att se alla objekt i denna samling."
   },
   "youDoNotHavePermissions": {
-    "message": "You do not have permissions to this collection"
+    "message": "Du har inte behörighet till denna samling"
   },
   "noCollectionsInList": {
     "message": "Det finns inga samlingar att visa."
@@ -1403,13 +1400,13 @@
     "message": "En avisering har skickats till din enhet."
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the "
+    "message": "Lås upp Bitwarden på din enhet eller på "
   },
   "areYouTryingToAccessYourAccount": {
-    "message": "Are you trying to access your account?"
+    "message": "Försöker du komma åt ditt konto?"
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "Åtkomstförsök via $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1418,22 +1415,22 @@
     }
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "Bekräfta åtkomst"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "Neka åtkomst"
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "webbapp"
   },
   "notificationSentDevicePart2": {
-    "message": "Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Kontrollera att fingeravtrycksfrasen stämmer överens med den nedan innan du godkänner."
   },
   "notificationSentDeviceComplete": {
-    "message": "Unlock Bitwarden on your device. Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Lås upp Bitwarden på din enhet. Kontrollera att fingeravtrycksfrasen matchar den nedan innan du godkänner."
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "A notification was sent to your device"
+    "message": "Ett meddelande har skickats till din enhet"
   },
   "versionNumber": {
     "message": "Version $VERSION_NUMBER$",
@@ -1454,14 +1451,14 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "Fråga inte igen på denna enhet kommande 30 dagar"
   },
   "selectAnotherMethod": {
-    "message": "Select another method",
+    "message": "Välj en annan metod",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use your recovery code"
+    "message": "Använd din återställningskod"
   },
   "insertU2f": {
     "message": "Sätt in din säkerhetsnyckel i din dators USB-port. Om den har en knapp, tryck på den."
@@ -1479,7 +1476,7 @@
     "message": "Alternativ för tvåstegsverifiering"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "Välj metod för tvåstegsinloggning"
   },
   "recoveryCodeDesc": {
     "message": "Förlorat åtkomst till alla dina metoder för tvåstegsverifiering? Använd din återställningskod för att inaktivera tvåstegsverifiering på ditt konto."
@@ -1524,7 +1521,7 @@
     "message": "(Migrerad från FIDO)"
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "Öppna i ny flik"
   },
   "emailTitle": {
     "message": "E-post"
@@ -1548,7 +1545,7 @@
     "message": "Redigera de samlingar som detta objekt delas med. Endast organisationsanvändare med tillgång till dessa samlingar kommer att kunna se detta objekt."
   },
   "deleteSelectedItemsDesc": {
-    "message": "Du har markerat $COUNT$ objekt att radera. Är du säker på att du vill radera alla dessa objekt?",
+    "message": "$COUNT$ föremål kommer att skickas till papperskorgen.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1569,7 +1566,7 @@
     "message": "Är du säker på att du vill fortsätta?"
   },
   "moveSelectedItemsDesc": {
-    "message": "Choose a folder that you would like to add the $COUNT$ selected item(s) to.",
+    "message": "Välj en mapp som du vill lägga till de valda artiklarna $COUNT$ till.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1587,10 +1584,10 @@
     "message": "Kopiera UUID"
   },
   "errorRefreshingAccessToken": {
-    "message": "Access Token Refresh Error"
+    "message": "Fel vid uppdatering av åtkomsttoken"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "No refresh token or API keys found. Please try logging out and logging back in."
+    "message": "Ingen uppdateringstoken eller API-nyckel hittades. Försök att logga ut och logga in igen."
   },
   "warning": {
     "message": "Varning"
@@ -1605,7 +1602,7 @@
     "message": "Denna export innehåller ditt valv i ett okrypterat format. Du bör inte lagra eller skicka den exporterade filen över osäkra kanaler (t.ex. e-post). Radera den omedelbart när du är färdig med den."
   },
   "exportSecretsWarningDesc": {
-    "message": "Denna export innehåller ditt valv i ett okrypterat format. Du bör inte lagra eller skicka den exporterade filen över osäkra kanaler (t.ex. e-post). Radera den omedelbart när du är färdig med den. "
+    "message": "Denna export innehåller ditt valv i ett okrypterat format. Du bör inte lagra eller skicka den exporterade filen över osäkra kanaler (t.ex. e-post). Radera den omedelbart när du är färdig med den."
   },
   "encExportKeyWarningDesc": {
     "message": "Denna export krypterar dina data med kontots krypteringsnyckel. Om du någonsin roterar kontots krypteringsnyckel bör du exportera igen eftersom du inte kommer att kunna dekryptera denna exportfil."
@@ -1647,7 +1644,7 @@
     "message": "Bekräfta fillösenord"
   },
   "accountRestrictedOptionDescription": {
-    "message": "Use your account encryption key, derived from your account's username and Master Password, to encrypt the export and restrict import to only the current Bitwarden account."
+    "message": "Använd ditt kontos krypteringsnyckel, som härrör från ditt kontos användarnamn och huvudlösenord, för att kryptera exporten och begränsa importen till endast det aktuella Bitwarden-kontot."
   },
   "passwordProtectedOptionDescription": {
     "message": "Välj ett fillösenord för att kryptera exportfilen. Filen kan sedan importeras till valfritt Bitwarden-konto med hjälp av fillösenordet."
@@ -1729,32 +1726,32 @@
     "message": "Inkludera siffra"
   },
   "generatorPolicyInEffect": {
-    "message": "Enterprise policy requirements have been applied to your generator options.",
+    "message": "Företagets policykrav har tillämpats på dina generatoralternativ.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "passwordHistory": {
     "message": "Lösenordshistorik"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "Generatorns historia"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "Rensa generatorhistorik"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "Om du fortsätter kommer alla poster att raderas permanent från generatorns historik. Är du säker på att du vill fortsätta?"
   },
   "noPasswordsInList": {
     "message": "Det finns inga lösenord att visa."
   },
   "clearHistory": {
-    "message": "Clear history"
+    "message": "Töm historik"
   },
   "nothingToShow": {
-    "message": "Nothing to show"
+    "message": "Ingenting att visa"
   },
   "nothingGeneratedRecently": {
-    "message": "You haven't generated anything recently"
+    "message": "Du har inte genererat något nyligen"
   },
   "clear": {
     "message": "Rensa",
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Om du fortsätter kommer du loggas ut från sin nuvarande session vilket kräver att du loggar in igen. Aktiva sessioner på andra enheter kan fortsätta vara aktiva i upp till en timme."
   },
+  "changePasswordWarning": {
+    "message": "När du har ändrat ditt lösenord måste du logga in med ditt nya lösenord. Aktiva sessioner på andra enheter kommer att loggas ut inom en timme."
+  },
   "emailChanged": {
     "message": "E-postadressen redigerades"
   },
@@ -1794,10 +1794,10 @@
     "message": "Vänligen logga in igen."
   },
   "currentSession": {
-    "message": "Current session"
+    "message": "Aktuell session"
   },
   "requestPending": {
-    "message": "Request pending"
+    "message": "Begäran väntar"
   },
   "logBackInOthersToo": {
     "message": "Vänligen logga in igen. Om du använder andra Bitwarden-applikationer, logga ut och in igen i dem också."
@@ -1849,13 +1849,13 @@
     "description": "Memory refers to computer memory (RAM). MB is short for megabytes."
   },
   "argon2Warning": {
-    "message": "Setting your KDF iterations, memory, and parallelism too high could result in poor performance when logging into (and unlocking) Bitwarden on slower or older devices. We recommend changing these individually in small increments and then test all of your devices."
+    "message": "Att ställa in dina KDF-iterationer, minne och parallellism för högt kan resultera i dålig prestanda när du loggar in (och låser upp) Bitwarden på långsammare eller äldre enheter. Vi rekommenderar att du ändrar dessa individuellt i små steg och sedan testar alla dina enheter."
   },
   "kdfParallelism": {
     "message": "KDF-parallellism"
   },
   "argon2Desc": {
-    "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
+    "message": "Högre KDF-iterationer, minne och parallellism kan hjälpa till att skydda ditt huvudlösenord från att bli brutalt tvingad av en angripare."
   },
   "changeKdf": {
     "message": "Ändra KDF"
@@ -1876,31 +1876,31 @@
     "message": "Om du fortsätter kommer du loggas ut från sin nuvarande session vilket kräver att du loggar in igen. Du kommer även behöva verifiera med tvåstegsverifiering om det är aktiverat. Aktiva sessioner på andra enheter kan fortsätta vara aktiva i upp till en timme."
   },
   "newDeviceLoginProtection": {
-    "message": "New device login"
+    "message": "Ny enhetsinloggning"
   },
   "turnOffNewDeviceLoginProtection": {
-    "message": "Turn off new device login protection"
+    "message": "Inaktivera inloggningsskydd för nya enheter"
   },
   "turnOnNewDeviceLoginProtection": {
-    "message": "Turn on new device login protection"
+    "message": "Aktivera inloggningsskydd för nya enheter"
   },
   "turnOffNewDeviceLoginProtectionModalDesc": {
-    "message": "Proceed below to turn off the verification emails bitwarden sends when you login from a new device."
+    "message": "Fortsätt nedan för att stänga av de verifieringsmeddelanden som bitwarden skickar när du loggar in från en ny enhet."
   },
   "turnOnNewDeviceLoginProtectionModalDesc": {
-    "message": "Proceed below to have bitwarden send you verification emails when you login from a new device."
+    "message": "Fortsätt nedan för att bitwarden ska skicka verifieringsmeddelanden till dig när du loggar in från en ny enhet."
   },
   "turnOffNewDeviceLoginProtectionWarning": {
-    "message": "With new device login protection turned off, anyone with your master password can access your account from any device. To protect your account without verification emails, set up two-step login."
+    "message": "När inloggningsskyddet för nya enheter är avstängt kan alla som har ditt huvudlösenord komma åt ditt konto från vilken enhet som helst. Om du vill skydda ditt konto utan verifieringsmeddelanden kan du ställa in tvåstegsinloggning."
   },
   "accountNewDeviceLoginProtectionSaved": {
-    "message": "New device login protection changes saved"
+    "message": "Ändringar av inloggningsskydd för ny enhet sparas"
   },
   "sessionsDeauthorized": {
     "message": "Alla sessioner avauktoriserades"
   },
   "accountIsOwnedMessage": {
-    "message": "This account is owned by $ORGANIZATIONNAME$",
+    "message": "Detta konto ägs av $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -1945,7 +1945,7 @@
     "message": "Ditt konto har stängts och all tillhörande data har raderats."
   },
   "deleteOrganizationWarning": {
-    "message": "Deleting your organization is permanent. It cannot be undone."
+    "message": "Att ta bort din organisation är permanent. Det går inte att ångra."
   },
   "myAccount": {
     "message": "Mitt konto"
@@ -1973,7 +1973,7 @@
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead."
   },
   "onboardingImportDataDetailsPartTwoWithOrgs": {
-    "message": " instead. You may need to wait until your administrator confirms your organization membership.",
+    "message": " istället. Du kan behöva vänta tills administratören bekräftar ditt medlemskap i organisationen.",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. You may need to wait until your administrator confirms your organization membership."
   },
   "importError": {
@@ -2028,7 +2028,7 @@
     "message": "Välj en samling"
   },
   "importTargetHint": {
-    "message": "Select this option if you want the imported file contents moved to a $DESTINATION$",
+    "message": "Välj det här alternativet om du vill att innehållet i den importerade filen ska flyttas till en $DESTINATION$",
     "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.",
     "placeholders": {
       "destination": {
@@ -2148,7 +2148,7 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enforce Bitwarden Two-step Login options for members by using the Two-step Login Policy.'"
   },
   "twoStepLoginPolicy": {
-    "message": "policyn för tvåstegsinloggning"
+    "message": "Policyn för tvåstegsinloggning"
   },
   "twoStepLoginOrganizationDuoDesc": {
     "message": "För att kräva tvåstegsverifiering med Duo, använd alternativen nedan."
@@ -2159,8 +2159,20 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Att aktivera tvåstegsverifiering kan låsa ute dig från ditt Bitwarden-konto permanent. En återställningskod låter dig komma åt ditt konto om du inte längre kan använda din vanliga metod för tvåstegsverifiering (t.ex. om du förlorar din enhet). Bitwardens kundservice kommer inte att kunna hjälpa dig om du förlorar åtkomst till ditt konto. Vi rekommenderar att du skriver ner eller skriver ut återställningskoden och förvarar den på ett säkert ställe."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Ta bort kortets artikeltyp"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Tillåt inte medlemmar att skapa kortobjektstyper. Befintliga kort kommer automatiskt att tas bort."
+  },
+  "restrictCardTypeImport": {
+    "message": "Det går inte att importera typer av kortposter"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "En policy som har fastställts av en eller flera organisationer hindrar dig från att importera kort till dina valv."
+  },
   "yourSingleUseRecoveryCode": {
-    "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
+    "message": "Din återställningskod för engångsbruk kan användas för att stänga av tvåstegsinloggning i händelse av att du förlorar åtkomst till din leverantör av tvåstegsinloggning. Bitwarden rekommenderar att du skriver ner återställningskoden och förvarar den på en säker plats."
   },
   "viewRecoveryCode": {
     "message": "Visa återställningskod"
@@ -2201,28 +2213,31 @@
     "message": "Hantera"
   },
   "manageCollection": {
-    "message": "Manage collection"
+    "message": "Hantera samling"
   },
   "viewItems": {
-    "message": "View items"
+    "message": "Visa objekt"
   },
   "viewItemsHidePass": {
-    "message": "View items, hidden passwords"
+    "message": "Visa objekt, dolda lösenord"
   },
   "editItems": {
-    "message": "Edit items"
+    "message": "Redigera objekt"
   },
   "editItemsHidePass": {
-    "message": "Edit items, hidden passwords"
+    "message": "Redigera objekt, dolda lösenord"
   },
   "disable": {
     "message": "Stäng av"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Medlemsuppgifter hittades inte."
+  },
   "revokeAccess": {
     "message": "Återkalla åtkomst"
   },
   "revoke": {
-    "message": "Revoke"
+    "message": "Återkalla"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Denna metod för tvåstegsverifiering är aktiverad på ditt konto."
@@ -2231,7 +2246,7 @@
     "message": "Ange ditt huvudlösenord för att ändra inställningarna för tvåstegsverifiering."
   },
   "twoStepAuthenticatorInstructionPrefix": {
-    "message": "Download an authenticator app such as"
+    "message": "Ladda ner en autentiseringsapp som t.ex"
   },
   "twoStepAuthenticatorInstructionInfix1": {
     "message": ","
@@ -2252,19 +2267,19 @@
     }
   },
   "continueToExternalUrlDesc": {
-    "message": "You are leaving Bitwarden and launching an external website in a new window."
+    "message": "Du lämnar Bitwarden och startar en extern webbplats i ett nytt fönster."
   },
   "twoStepContinueToBitwardenUrlTitle": {
     "message": "Fortsätt till bitwarden.com?"
   },
   "twoStepContinueToBitwardenUrlDesc": {
-    "message": "Bitwarden Authenticator allows you to store authenticator keys and generate TOTP codes for 2-step verification flows. Learn more on the bitwarden.com website."
+    "message": "Med Bitwarden Authenticator kan du lagra autentiseringsnycklar och generera TOTP-koder för flöden med 2-stegsverifiering. Läs mer på webbplatsen bitwarden.com."
   },
   "twoStepAuthenticatorScanCodeV2": {
     "message": "Skanna QR-koden nedan med din autentiseringsapp eller ange nyckeln."
   },
   "twoStepAuthenticatorQRCanvasError": {
-    "message": "Could not load QR code. Try again or use the key below."
+    "message": "QR-koden kunde inte laddas. Försök igen eller använd nyckeln nedan."
   },
   "key": {
     "message": "Nyckel"
@@ -2354,7 +2369,7 @@
     "message": "Klient-ID"
   },
   "twoFactorDuoClientSecret": {
-    "message": "Client Secret"
+    "message": "Klienthemlighet"
   },
   "twoFactorDuoApiHostname": {
     "message": "API-värdnamn"
@@ -2414,7 +2429,7 @@
     "message": "Det gick inte att läsa säkerhetsnyckeln. Försök igen."
   },
   "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
+    "message": "På grund av plattformsbegränsningar kan WebAuthn inte användas på alla Bitwarden-applikationer. Du bör konfigurera en annan leverantör av tvåstegsinloggning så att du kan komma åt ditt konto när WebAuthn inte kan användas."
   },
   "twoFactorRecoveryYourCode": {
     "message": "Din återställningskod för tvåstegsverifiering"
@@ -2447,7 +2462,7 @@
     "message": "Osäkra webbplatser hittades"
   },
   "unsecuredWebsitesFoundReportDesc": {
-    "message": "We found $COUNT$ items in your $VAULT$ with unsecured URIs. You should change their URI scheme to https:// if the website allows it.",
+    "message": "Vi hittade $COUNT$ objekt i din $VAULT$ med osäkrade URI:er. Du bör ändra deras URI-schema till https:// om webbplatsen tillåter det.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2472,7 +2487,7 @@
     "message": "Inloggningar utan 2FA hittades"
   },
   "inactive2faFoundReportDesc": {
-    "message": "We found $COUNT$ website(s) in your $VAULT$ that may not be configured with two-step login (according to 2fa.directory). To further protect these accounts, you should set up two-step login.",
+    "message": "Vi hittade $COUNT$ webbplats(er) i din $VAULT$ som kanske inte är konfigurerade med tvåstegsinloggning (enligt 2fa.directory). För att ytterligare skydda dessa konton bör du konfigurera tvåstegsinloggning.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2500,7 +2515,7 @@
     "message": "Avslöjade lösenord hittades"
   },
   "exposedPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ items in your $VAULT$ that have passwords that were exposed in known data breaches. You should change them to use a new password.",
+    "message": "Vi hittade $COUNT$ objekt i din $VAULT$ som har lösenord som har exponerats i kända dataintrång. Du bör ändra dem så att du använder ett nytt lösenord.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2519,7 +2534,7 @@
     "message": "Kontrollera avslöjade lösenord"
   },
   "timesExposed": {
-    "message": "Times exposed"
+    "message": "Tiderna avslöjade"
   },
   "exposedXTimes": {
     "message": "Avslöjad $COUNT$ gång(er)",
@@ -2540,7 +2555,7 @@
     "message": "Svaga lösenord hittades"
   },
   "weakPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ items in your $VAULT$ with passwords that are not strong. You should update them to use stronger passwords.",
+    "message": "Vi hittade $COUNT$ objekt i din $VAULT$ med lösenord som inte är starka. Du bör uppdatera dem så att de använder starkare lösenord.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2556,7 +2571,7 @@
     "message": "Inga objekt i ditt valv har svaga lösenord."
   },
   "weakness": {
-    "message": "Weakness"
+    "message": "Svaghet"
   },
   "reusedPasswordsReport": {
     "message": "Rapport om återanvända lösenord"
@@ -2568,7 +2583,7 @@
     "message": "Återanvända lösenord hittades"
   },
   "reusedPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ passwords that are being reused in your $VAULT$. You should change them to a unique value.",
+    "message": "Vi hittade $COUNT$-lösenord som återanvänds i din $VAULT$. Du bör ändra dem till ett unikt värde.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2584,7 +2599,7 @@
     "message": "Inga inloggningar i ditt valv har lösenord som återanvänds."
   },
   "timesReused": {
-    "message": "Times reused"
+    "message": "Återanvända gånger"
   },
   "reusedXTimes": {
     "message": "Återanvänt $COUNT$ gånger",
@@ -2884,7 +2899,7 @@
     "message": "Hämta licens"
   },
   "viewBillingToken": {
-    "message": "View Billing Token"
+    "message": "Visa faktureringstoken"
   },
   "updateLicense": {
     "message": "Uppdatera licens"
@@ -3213,7 +3228,7 @@
     }
   },
   "trialSecretsManagerThankYou": {
-    "message": "Thanks for signing up for Bitwarden Secrets Manager for $PLAN$!",
+    "message": "Tack för att du registrerar dig för Bitwarden hemlighetshanterare för $PLAN$!",
     "placeholders": {
       "plan": {
         "content": "$1",
@@ -3252,7 +3267,7 @@
     "message": "Din nya organisation är redo!"
   },
   "organizationUpgraded": {
-    "message": "Din organisation har uppgraderats."
+    "message": "Din organisation har uppgraderats"
   },
   "leave": {
     "message": "Lämna"
@@ -3261,7 +3276,7 @@
     "message": "Är du säker på att du vill lämna denna organisation?"
   },
   "leftOrganization": {
-    "message": "Du har lämnat organisationen."
+    "message": "Du har lämnat organisationen"
   },
   "defaultCollection": {
     "message": "Standardsamling"
@@ -3321,10 +3336,10 @@
     "message": "När en medlem tas bort har de inte längre tillgång till organisationsdata och denna åtgärd är oåterkallelig. För att lägga tillbaka medlemmen till organisationen måste de bjudas in och bekräftas igen."
   },
   "revokeUserConfirmation": {
-    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
+    "message": "När en medlem återkallas har denne inte längre tillgång till organisationsdata. Om du snabbt vill återställa medlemmens åtkomst går du till fliken Återkallad."
   },
   "removeUserConfirmationKeyConnector": {
-    "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently deactivate their account. This action cannot be undone. Do you want to proceed?"
+    "message": "Varning för denna användare! Den här användaren behöver Key Connector för att hantera sin kryptering. Om du tar bort den här användaren från din organisation kommer användarens konto att inaktiveras permanent. Denna åtgärd kan inte ångras. Vill du fortsätta?"
   },
   "externalId": {
     "message": "Externt ID"
@@ -3333,10 +3348,10 @@
     "message": "Det externa id:t kan användas som referens eller för att länka denna resurs till ett externt system såsom en användarkatalog."
   },
   "ssoExternalId": {
-    "message": "SSO External ID"
+    "message": "SSO Externt ID"
   },
   "ssoExternalIdDesc": {
-    "message": "SSO External ID is an unencrypted reference between Bitwarden and your configured SSO provider."
+    "message": "SSO Externt ID är en okrypterad referens mellan Bitwarden och din konfigurerade SSO-leverantör."
   },
   "nestCollectionUnder": {
     "message": "Kapsla samling under"
@@ -3387,10 +3402,10 @@
     }
   },
   "inviteSingleEmailDesc": {
-    "message": "You have 1 invite remaining."
+    "message": "Du har 1 inbjudan kvar."
   },
   "inviteZeroEmailDesc": {
-    "message": "You have 0 invites remaining."
+    "message": "Du har 0 inbjudningar kvar."
   },
   "userUsingTwoStep": {
     "message": "Denna användare använder tvåstegsverifiering för att skydda sitt konto."
@@ -3414,19 +3429,19 @@
     "message": "Hantera alla aspekter av din organisation, inklusive fakturering och prenumerationer"
   },
   "clientOwnerDesc": {
-    "message": "This user should be independent of the Provider. If the Provider is disassociated with the organization, this user will maintain ownership of the organization."
+    "message": "Denna användare bör vara oberoende av Providern. Om Providern skiljs från organisationen kommer den här användaren att behålla ägandet av organisationen."
   },
   "admin": {
     "message": "Administratör"
   },
   "adminDesc": {
-    "message": "Manage organization access, all collections, members, reporting, and security settings"
+    "message": "Hantera organisationens åtkomst, alla samlingar, medlemmar, rapportering och säkerhetsinställningar"
   },
   "user": {
     "message": "Användare"
   },
   "userDesc": {
-    "message": "Access and add items to assigned collections"
+    "message": "Få tillgång till och lägga till objekt i tilldelade samlingar"
   },
   "all": {
     "message": "Alla"
@@ -3435,7 +3450,7 @@
     "message": "Lägg till åtkomst"
   },
   "addAccessFilter": {
-    "message": "Add Access Filter"
+    "message": "Lägg till åtkomstfilter"
   },
   "refresh": {
     "message": "Uppdatera"
@@ -3589,7 +3604,7 @@
     }
   },
   "viewedCardNumberItemId": {
-    "message": "Viewed Card Number for item $ID$.",
+    "message": "Visat kortnummer för artikel $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3754,7 +3769,7 @@
     }
   },
   "revokedUserId": {
-    "message": "Revoked organization access for $ID$.",
+    "message": "Återkallad organisationsåtkomst för $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3763,7 +3778,7 @@
     }
   },
   "restoredUserId": {
-    "message": "Restored organization access for $ID$.",
+    "message": "Återställd organisationsåtkomst för $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3844,7 +3859,7 @@
     }
   },
   "unlinkedSso": {
-    "message": "Unlinked SSO."
+    "message": "Ej länkad SSO."
   },
   "unlinkedSsoUser": {
     "message": "Olänkad SSO för användare $ID$.",
@@ -3883,7 +3898,7 @@
     }
   },
   "accessedClientVault": {
-    "message": "Accessed $ID$ organization vault.",
+    "message": "Åtkomst till $ID$ organisationsvalv.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3895,22 +3910,22 @@
     "message": "Enhet"
   },
   "loginStatus": {
-    "message": "Login status"
+    "message": "Inloggningsstatus"
   },
   "firstLogin": {
-    "message": "First login"
+    "message": "Första inloggningen"
   },
   "trusted": {
-    "message": "Trusted"
+    "message": "Betrodd"
   },
   "needsApproval": {
-    "message": "Needs approval"
+    "message": "Behöver godkännande"
   },
   "areYouTryingtoLogin": {
-    "message": "Are you trying to log in?"
+    "message": "Försöker du logga in?"
   },
   "logInAttemptBy": {
-    "message": "Login attempt by $EMAIL$",
+    "message": "Inloggningsförsök av $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3919,22 +3934,22 @@
     }
   },
   "deviceType": {
-    "message": "Device Type"
+    "message": "Enhetstyp"
   },
   "ipAddress": {
-    "message": "IP Address"
+    "message": "IP-adress"
   },
   "confirmLogIn": {
-    "message": "Confirm login"
+    "message": "Bekräfta inloggning"
   },
   "denyLogIn": {
-    "message": "Deny login"
+    "message": "Neka inloggning"
   },
   "thisRequestIsNoLongerValid": {
-    "message": "This request is no longer valid."
+    "message": "Denna begäran är inte längre giltig."
   },
   "logInConfirmedForEmailOnDevice": {
-    "message": "Login confirmed for $EMAIL$ on $DEVICE$",
+    "message": "Inloggning bekräftad för $EMAIL$ på $DEVICE$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3947,16 +3962,16 @@
     }
   },
   "youDeniedALogInAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this really was you, try to log in with the device again."
+    "message": "Du nekade ett inloggningsförsök från en annan enhet. Om detta verkligen var du, försök att logga in med enheten igen."
   },
   "loginRequestHasAlreadyExpired": {
-    "message": "Login request has already expired."
+    "message": "Inloggningsbegäran har redan löpt ut."
   },
   "justNow": {
-    "message": "Just now"
+    "message": "Just nu"
   },
   "requestedXMinutesAgo": {
-    "message": "Requested $MINUTES$ minutes ago",
+    "message": "Begärd för $MINUTES$ minuter sedan",
     "placeholders": {
       "minutes": {
         "content": "$1",
@@ -4067,7 +4082,7 @@
     "message": "E-postadressen har verifierats"
   },
   "emailVerifiedV2": {
-    "message": "Email verified"
+    "message": "E-post verifierad"
   },
   "emailVerifiedFailed": {
     "message": "Det gick inte att verifiera din e-postadress. Prova att skicka ett nytt verifieringsmeddelande."
@@ -4082,19 +4097,19 @@
     "message": "Uppdatera webbläsare"
   },
   "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+    "message": "Skapa din riskinsikt..."
   },
   "updateBrowserDesc": {
     "message": "Du använder en webbläsare som inte stöds. Webbvalvet kanske inte fungerar som det ska."
   },
   "youHaveAPendingLoginRequest": {
-    "message": "You have a pending login request from another device."
+    "message": "Du har en väntande inloggningsbegäran från en annan enhet."
   },
   "reviewLoginRequest": {
-    "message": "Review login request"
+    "message": "Granska begäran om inloggning"
   },
   "freeTrialEndPromptCount": {
-    "message": "Your free trial ends in $COUNT$ days.",
+    "message": "Din kostnadsfria testperiod avslutas om $COUNT$ dagar.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4103,7 +4118,7 @@
     }
   },
   "freeTrialEndPromptMultipleDays": {
-    "message": "$ORGANIZATION$, your free trial ends in $COUNT$ days.",
+    "message": "$ORGANIZATION$, din gratis provperiod slutar om $COUNT$ dagar.",
     "placeholders": {
       "count": {
         "content": "$2",
@@ -4116,7 +4131,7 @@
     }
   },
   "freeTrialEndPromptTomorrow": {
-    "message": "$ORGANIZATION$, your free trial ends tomorrow.",
+    "message": "$ORGANIZATION$, din gratis provperiod slutar i morgon.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4125,10 +4140,10 @@
     }
   },
   "freeTrialEndPromptTomorrowNoOrgName": {
-    "message": "Your free trial ends tomorrow."
+    "message": "Din kostnadsfria testperiod avslutas i morgon."
   },
   "freeTrialEndPromptToday": {
-    "message": "$ORGANIZATION$, your free trial ends today.",
+    "message": "$ORGANIZATION$, din gratis provperiod slutar idag.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4137,16 +4152,16 @@
     }
   },
   "freeTrialEndingTodayWithoutOrgName": {
-    "message": "Your free trial ends today."
+    "message": "Din kostnadsfria provperiod slutar idag."
   },
   "clickHereToAddPaymentMethod": {
-    "message": "Click here to add a payment method."
+    "message": "Klicka här för att lägga till en betalningsmetod."
   },
   "joinOrganization": {
     "message": "Gå med i organisation"
   },
   "joinOrganizationName": {
-    "message": "Join $ORGANIZATIONNAME$",
+    "message": "Gå med i $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -4158,7 +4173,7 @@
     "message": "Du har bjudits in att gå med i organisationen ovan. För att acceptera inbjudan måste du logga in eller skapa ett nytt Bitwarden-konto."
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Finish joining this organization by setting a master password."
+    "message": "Avsluta anslutningen till denna organisation genom att ange ett huvudlösenord."
   },
   "inviteAccepted": {
     "message": "Inbjudan accepterades"
@@ -4188,7 +4203,7 @@
     "message": "Om du inte kan komma åt ditt konto genom dina vanliga metoder för tvåstegsverifiering kan du använda din återställningskod för att inaktivera alla metoder för tvåstegsverifiering på ditt konto."
   },
   "logInBelowUsingYourSingleUseRecoveryCode": {
-    "message": "Log in below using your single-use recovery code. This will turn off all two-step providers on your account."
+    "message": "Logga in nedan med din återställningskod för engångsbruk. Detta kommer att stänga av alla tvåstegsleverantörer på ditt konto."
   },
   "recoverAccountTwoStep": {
     "message": "Återställ kontots tvåstegsverifiering"
@@ -4209,7 +4224,7 @@
     "message": "Du har begärt att radera ditt Bitwarden-konto. Klicka på knappen nedan för att bekräfta."
   },
   "deleteRecoverOrgConfirmDesc": {
-    "message": "You have requested to delete your Bitwarden organization."
+    "message": "Du har begärt att få radera din Bitwarden-organisation."
   },
   "myOrganization": {
     "message": "Min organisation"
@@ -4230,10 +4245,10 @@
     }
   },
   "deletingOrganizationActiveUserAccountsWarning": {
-    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+    "message": "Användarkonton förblir aktiva efter borttagningen men kommer inte längre att vara kopplade till denna organisation."
   },
   "deletingOrganizationIsPermanentWarning": {
-    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "message": "Radering av $ORGANIZATION$ är permanent och oåterkallelig.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4335,17 +4350,17 @@
     "message": "Ange ditt installations-id"
   },
   "limitSubscriptionDesc": {
-    "message": "Set a seat limit for your subscription. Once this limit is reached, you will not be able to invite new members."
+    "message": "Ange en platsgräns för din prenumeration. När den här gränsen har nåtts kan du inte bjuda in nya medlemmar."
   },
   "limitSmSubscriptionDesc": {
-    "message": "Set a seat limit for your Secrets Manager subscription. Once this limit is reached, you will not be able to invite new members."
+    "message": "Ange en platsgräns för din prenumeration på Secrets Manager. När denna gräns är nådd kommer du inte att kunna bjuda in nya medlemmar."
   },
   "maxSeatLimit": {
     "message": "Platsgräns (valfritt)",
     "description": "Upper limit of seats to allow through autoscaling"
   },
   "maxSeatCost": {
-    "message": "Max potential seat cost"
+    "message": "Max potentiell kostnad för säte"
   },
   "addSeats": {
     "message": "Lägg till platser",
@@ -4356,7 +4371,7 @@
     "description": "Seat = User Seat"
   },
   "subscriptionDesc": {
-    "message": "Adjustments to your subscription will result in prorated changes to your billing totals. If newly invited users exceed your subscription seats, you will immediately receive a prorated charge for the additional users."
+    "message": "Justeringar av din prenumeration kommer att resultera i proportionella ändringar av dina faktureringssummor. Om antalet nyinbjudna användare överstiger antalet platser i ditt abonnemang kommer du omedelbart att få en proportionell avgift för de ytterligare användarna."
   },
   "subscriptionUserSeats": {
     "message": "Din prenumeration tillåter totalt $COUNT$ medlemmar.",
@@ -4383,19 +4398,19 @@
     "message": "Ytterligare alternativ"
   },
   "additionalOptionsDesc": {
-    "message": "For additional help in managing your subscription, please contact Customer Support."
+    "message": "För ytterligare hjälp med att hantera din prenumeration, vänligen kontakta kundtjänst."
   },
   "subscriptionUserSeatsUnlimitedAutoscale": {
-    "message": "Adjustments to your subscription will result in prorated changes to your billing totals. If newly invited members exceed your subscription seats, you will immediately receive a prorated charge for the additional members."
+    "message": "Justeringar av din prenumeration kommer att resultera i proportionella ändringar av dina faktureringssummor. Om antalet nyinbjudna medlemmar överstiger antalet platser i ditt abonnemang kommer du omedelbart att få en proportionell avgift för de ytterligare medlemmarna."
   },
   "smStandaloneTrialSeatCountUpdateMessageFragment1": {
     "message": "Om du vill lägga till ytterligare"
   },
   "smStandaloneTrialSeatCountUpdateMessageFragment2": {
-    "message": "seats without the bundled offer, please contact"
+    "message": "platser utan det samlade erbjudandet, vänligen kontakta"
   },
   "subscriptionUserSeatsLimitedAutoscale": {
-    "message": "Adjustments to your subscription will result in prorated changes to your billing totals. If newly invited members exceed your subscription seats, you will immediately receive a prorated charge for the additional members until your $MAX$ seat limit is reached.",
+    "message": "Justeringar av din prenumeration kommer att resultera i proportionella ändringar av dina faktureringssummor. Om nyinbjudna medlemmar överstiger antalet platser i ditt abonnemang kommer du omedelbart att få en proportionell avgift för de ytterligare medlemmarna tills din platsgräns på $MAX$ har uppnåtts.",
     "placeholders": {
       "max": {
         "content": "$1",
@@ -4404,7 +4419,7 @@
     }
   },
   "subscriptionUserSeatsWithoutAdditionalSeatsOption": {
-    "message": "You can invite up to $COUNT$ members for no additional charge. Contact Customer Support to upgrade your plan and invite more members.",
+    "message": "Du kan bjuda in upp till $COUNT$ medlemmar utan extra kostnad. Kontakta kundtjänst för att uppgradera din plan och bjuda in fler medlemmar.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4422,7 +4437,7 @@
     }
   },
   "subscriptionUpgrade": {
-    "message": "You cannot invite more than $COUNT$ members without upgrading your plan.",
+    "message": "Du kan inte bjuda in fler än $COUNT$ användare utan att uppgradera din plan.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4431,7 +4446,7 @@
     }
   },
   "subscriptionSponsoredFamiliesPlan": {
-    "message": "Your subscription allows for a total of $COUNT$ members. Your plan is sponsored and billed to an external organization.",
+    "message": "Din prenumeration tillåter totalt $COUNT$ medlemmar. Din plan är sponsrad och faktureras till en extern organisation.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4440,7 +4455,7 @@
     }
   },
   "subscriptionMaxReached": {
-    "message": "Adjustments to your subscription will result in prorated changes to your billing totals. You cannot invite more than $COUNT$ members without increasing your subscription seats.",
+    "message": "Justeringar av din prenumeration kommer att resultera i proportionella ändringar av dina faktureringssummor. Du kan inte bjuda in mer än $COUNT$ medlemmar utan att öka dina prenumerationsplatser.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4449,7 +4464,7 @@
     }
   },
   "subscriptionSeatMaxReached": {
-    "message": "You cannot invite more than $COUNT$ members without increasing your subscription seats.",
+    "message": "Du kan inte bjuda in fler än $COUNT$ medlemmar utan att öka dina abonnemangsplatser.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4478,11 +4493,8 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
-    "message": "Edit $LABEL$",
+    "message": "Redigera $LABEL$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4491,7 +4503,7 @@
     }
   },
   "reorderToggleButton": {
-    "message": "Reorder $LABEL$. Use arrow key to move item up or down.",
+    "message": "Ordna om $LABEL$. Använd piltangenten för att flytta objektet uppåt eller nedåt.",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4500,7 +4512,7 @@
     }
   },
   "reorderFieldUp": {
-    "message": "$LABEL$ moved up, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ flyttas upp, position $INDEX$ av $LENGTH$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4517,7 +4529,7 @@
     }
   },
   "reorderFieldDown": {
-    "message": "$LABEL$ moved down, position $INDEX$ of $LENGTH$",
+    "message": "$LABEL$ flyttas ner, position $INDEX$ av $LENGTH$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4533,23 +4545,14 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Nyckeln uppdaterades"
-  },
-  "updateEncryptionKey": {
-    "message": "Uppdatera krypteringsnyckel"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Efter att ha uppdaterat din krypteringsnyckel, måste du logga ut och in igen i alla Bitwarden-program som du använder (t.ex. mobilappen och webbläsartillägget). Att inte logga ut och in igen (vilket hämtar din nya krypteringsnyckel) kan resultera i datakorruption. Vi kommer försöka logga ut dig automatiskt, men det kan vara fördröjt."
   },
   "updateEncryptionKeyAccountExportWarning": {
-    "message": "Any account restricted exports you have saved will become invalid."
+    "message": "Alla kontobegränsade exporter som du har sparat kommer att bli ogiltiga."
+  },
+  "legacyEncryptionUnsupported": {
+    "message": "Äldre kryptering stöds inte längre. Kontakta support för att återställa ditt konto."
   },
   "subscription": {
     "message": "Prenumeration"
@@ -4582,13 +4585,13 @@
     "message": "Få råd, tillkännagivanden och forskningsmöjligheter från Bitwarden i din inkorg."
   },
   "unsubscribe": {
-    "message": "Unsubscribe"
+    "message": "Avsluta prenumeration"
   },
   "atAnyTime": {
     "message": "när som helst."
   },
   "byContinuingYouAgreeToThe": {
-    "message": "By continuing, you agree to the"
+    "message": "Genom att fortsätta samtycker du till"
   },
   "and": {
     "message": "och"
@@ -4597,7 +4600,7 @@
     "message": "Genom att kryssa i denna ruta godkänner du följande:"
   },
   "acceptPoliciesRequired": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Användarvillkoren och Integritetspolicyn har inte accepterats."
   },
   "termsOfService": {
     "message": "Användarvillkor"
@@ -4612,13 +4615,13 @@
     "message": "Valvets tidsgräns"
   },
   "vaultTimeout1": {
-    "message": "Timeout"
+    "message": "Tidsgräns"
   },
   "vaultTimeoutDesc": {
     "message": "Välj när valvets tidsgräns överskrids och den valda åtgärden utförs."
   },
   "vaultTimeoutLogoutDesc": {
-    "message": "Choose when your vault will be logged out."
+    "message": "Välj när ditt valv loggas ut."
   },
   "oneMinute": {
     "message": "1 minut"
@@ -4657,19 +4660,19 @@
     "message": "Organisationen är inaktiverad"
   },
   "secretsAccessSuspended": {
-    "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance."
+    "message": "Avstängda organisationer kan inte nås. Kontakta din organisationsägare för hjälp."
   },
   "secretsCannotCreate": {
-    "message": "Secrets cannot be created in suspended organizations. Please contact your organization owner for assistance."
+    "message": "Det går inte att skapa hemligheter i avstängda organisationer. Kontakta din organisationsägare för att få hjälp."
   },
   "projectsCannotCreate": {
-    "message": "Projects cannot be created in suspended organizations. Please contact your organization owner for assistance."
+    "message": "Det går inte att skapa projekt i avstängda organisationer. Kontakta din organisationsägare för att få hjälp."
   },
   "serviceAccountsCannotCreate": {
-    "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
+    "message": "Servicekonton kan inte skapas i avstängda organisationer. Kontakta din organisationsägare för att få hjälp."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in suspended organizations cannot be accessed. Contact your organization owner for assistance."
+    "message": "Det går inte att komma åt objekt i avstängda organisationer. Kontakta din organisationsägare för hjälp."
   },
   "licenseIsExpired": {
     "message": "Licensen har upphört att gälla."
@@ -4681,7 +4684,7 @@
     "message": "Markerade"
   },
   "recommended": {
-    "message": "Recommended"
+    "message": "Rekommenderas"
   },
   "ownership": {
     "message": "Ägarskap"
@@ -4724,7 +4727,7 @@
     "message": "Detta objekt har gamla bilagor som behöver åtgärdas."
   },
   "attachmentFixDescription": {
-    "message": "This attachment uses outdated encryption. Select 'Fix' to download, re-encrypt, and re-upload the attachment."
+    "message": "Den här bilagan använder föråldrad kryptering. Välj \"Fix\" för att ladda ner, kryptera om och ladda upp bilagan på nytt."
   },
   "fix": {
     "message": "Åtgärda",
@@ -4752,7 +4755,7 @@
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "You will be notified once the request is approved"
+    "message": "Du kommer att få ett meddelande när begäran har godkänts"
   },
   "free": {
     "message": "Gratis",
@@ -4805,7 +4808,7 @@
     "message": "Ange minimikrav för huvudlösenordsstyrka."
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "Lösenordsstyrka $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -4991,22 +4994,22 @@
     "message": "Logga in genom organisationens inloggningsportal. Ange organisationens identifierare för att börja."
   },
   "singleSignOnEnterOrgIdentifier": {
-    "message": "Enter your organization's SSO identifier to begin"
+    "message": "Ange din organisations SSO-identifierare för att börja"
   },
   "singleSignOnEnterOrgIdentifierText": {
-    "message": "To log in with your SSO provider, enter your organization's SSO identifier to begin. You may need to enter this SSO identifier when you log in from a new device."
+    "message": "För att logga in med din SSO-leverantör anger du din organisations SSO-identifierare för att börja. Du kan behöva ange den här SSO-identifieraren när du loggar in från en ny enhet."
   },
   "enterpriseSingleSignOn": {
-    "message": "Enterprise single sign-on"
+    "message": "Enkel inloggning för företag"
   },
   "ssoHandOff": {
     "message": "Du kan nu stänga denna flik och fortsätta i tillägget."
   },
   "youSuccessfullyLoggedIn": {
-    "message": "You successfully logged in"
+    "message": "Du har framgångsrikt loggat in"
   },
   "thisWindowWillCloseIn5Seconds": {
-    "message": "This window will automatically close in 5 seconds"
+    "message": "Detta fönster stängs automatiskt om 5 sekunder"
   },
   "youMayCloseThisWindow": {
     "message": "Du kan stänga detta fönster"
@@ -5015,13 +5018,13 @@
     "message": "Alla funktioner för team, plus:"
   },
   "includeAllTeamsStarterFeatures": {
-    "message": "All Teams Starter features, plus:"
+    "message": "Alla Teams Starter-funktioner, plus:"
   },
   "chooseMonthlyOrAnnualBilling": {
     "message": "Välj månadsvis eller årlig fakturering"
   },
   "abilityToAddMoreThanNMembers": {
-    "message": "Ability to add more than $COUNT$ members",
+    "message": "Möjlighet att lägga till fler än $COUNT$ medlemmar",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -5045,14 +5048,14 @@
     "message": "SSO-identifierare"
   },
   "ssoIdentifierHintPartOne": {
-    "message": "Provide this ID to your members to login with SSO. To bypass this step, set up ",
+    "message": "Ge detta ID till dina medlemmar så att de kan logga in med SSO. För att kringgå detta steg, konfigurera",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Provide this ID to your members to login with SSO. To bypass this step, set up Domain verification'"
   },
   "unlinkSso": {
     "message": "Avlänka SSO"
   },
   "unlinkSsoConfirmation": {
-    "message": "Are you sure you want to unlink SSO for this organization?"
+    "message": "Är du säker på att du vill ta bort SSO-länken för den här organisationen?"
   },
   "linkSso": {
     "message": "Länka SSO"
@@ -5064,13 +5067,13 @@
     "message": "Hindra användare från att gå med i några andra organisationer."
   },
   "singleOrgPolicyDesc": {
-    "message": "Restrict members from joining other organizations. This policy is required for organizations that have enabled domain verification."
+    "message": "Begränsa medlemmar från att gå med i andra organisationer. Den här principen krävs för organisationer som har aktiverat domänverifiering."
   },
   "singleOrgBlockCreateMessage": {
     "message": "Din nuvarande organisation har en policy som hindrar dig från att gå med i fler än en organisation. Vänligen kontakta din organisations administratörer eller registrera ett annat Bitwarden-konto."
   },
   "singleOrgPolicyMemberWarning": {
-    "message": "Non-compliant members will be placed in revoked status until they leave all other organizations. Administrators are exempt and can restore members once compliance is met."
+    "message": "Medlemmar som inte uppfyller kraven kommer att få statusen återkallad tills de lämnar alla andra organisationer. Administratörer är undantagna och kan återställa medlemmar när efterlevnaden är uppfylld."
   },
   "requireSso": {
     "message": "Kräv autentisering med Single Sign-On"
@@ -5091,14 +5094,14 @@
     "message": "Organisationens ägare och administratörer är undantagna från denna policy."
   },
   "limitSendViews": {
-    "message": "Limit views"
+    "message": "Begränsa antalet visningar"
   },
   "limitSendViewsHint": {
-    "message": "No one can view this Send after the limit is reached.",
+    "message": "Ingen kan se denna sändning efter att gränsen har nåtts.",
     "description": "Displayed under the limit views field on Send"
   },
   "limitSendViewsCount": {
-    "message": "$ACCESSCOUNT$ views left",
+    "message": "$ACCESSCOUNT$ visningar kvar",
     "description": "Displayed under the limit views field on Send",
     "placeholders": {
       "accessCount": {
@@ -5108,11 +5111,11 @@
     }
   },
   "sendDetails": {
-    "message": "Send details",
+    "message": "Skicka information",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeTextToShare": {
-    "message": "Text to share"
+    "message": "Text att dela"
   },
   "sendTypeFile": {
     "message": "Fil"
@@ -5121,7 +5124,7 @@
     "message": "Text"
   },
   "sendPasswordDescV3": {
-    "message": "Add an optional password for recipients to access this Send.",
+    "message": "Lägg till ett valfritt lösenord för att mottagarna ska få åtkomst till detta meddelande.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
@@ -5149,14 +5152,14 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendPermanentConfirmation": {
-    "message": "Are you sure you want to permanently delete this Send?",
+    "message": "Är du säker på att du vill ta bort det här meddelandet permanent?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletionDate": {
     "message": "Raderingsdatum"
   },
   "deletionDateDescV2": {
-    "message": "The Send will be permanently deleted on this date.",
+    "message": "Sändningen kommer att raderas permanent på detta datum.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
@@ -5206,7 +5209,7 @@
     "message": "Väntar på radering"
   },
   "hideTextByDefault": {
-    "message": "Hide text by default"
+    "message": "Dölj text som standard"
   },
   "expired": {
     "message": "Utgången"
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Nödåtkomst nekad"
   },
+  "grantorDetailsNotFound": {
+    "message": "Uppgifter om bidragsgivare hittades inte"
+  },
   "passwordResetFor": {
     "message": "Lösenordet för $USER$ återställdes. Du kan nu logga in med det nya lösenordet.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Genomför äganderätt till organisationsdata"
+  },
   "personalOwnership": {
     "message": "Radera individuellt valv"
   },
@@ -5511,7 +5520,7 @@
     "message": "Hantera kontoåterställning"
   },
   "disableRequiredError": {
-    "message": "You must manually turn the $POLICYNAME$ policy before this policy can be turned off.",
+    "message": "Du måste manuellt stänga av policyn $POLICYNAME$ innan den här policyn kan stängas av.",
     "placeholders": {
       "policyName": {
         "content": "$1",
@@ -5523,7 +5532,7 @@
     "message": "En organisationspolicy påverkar dina ägarskapsalternativ."
   },
   "personalOwnershipPolicyInEffectImports": {
-    "message": "An organization policy has blocked importing items into your individual vault."
+    "message": "En organisationspolicy har blockerat import av objekt till ditt individuella valv."
   },
   "personalOwnershipCheckboxDesc": {
     "message": "Inaktivera personligt ägarskap för organisationens användare"
@@ -5533,7 +5542,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendAccessTaglineProductDesc": {
-    "message": "Bitwarden Send transmits sensitive, temporary information to others easily and securely.",
+    "message": "Bitwarden Send förmedlar känslig, tillfällig information till andra på ett enkelt och säkert sätt.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendAccessTaglineLearnMore": {
@@ -5560,73 +5569,73 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more, see how it works, **or** try it now.'"
   },
   "developmentDevOpsAndITTeamsChooseBWSecret": {
-    "message": "Development, DevOps, and IT teams choose Bitwarden Secrets Manager to securely manage and deploy their infrastructure and machine secrets."
+    "message": "Utvecklings-, DevOps- och IT-team väljer Bitwarden Secrets Manager för att på ett säkert sätt hantera och distribuera sin infrastruktur och sina maskinhemligheter."
   },
   "centralizeSecretsManagement": {
-    "message": "Centralize secrets management."
+    "message": "Centralisera hanteringen av hemligheter."
   },
   "centralizeSecretsManagementDescription": {
-    "message": "Securely store and manage secrets in one location to prevent secret sprawl across your organization."
+    "message": "Lagra och hantera hemligheter på ett säkert sätt på en och samma plats för att förhindra att hemligheter sprids i organisationen."
   },
   "preventSecretLeaks": {
-    "message": "Prevent secret leaks."
+    "message": "Förhindra läckage av hemligheter."
   },
   "preventSecretLeaksDescription": {
-    "message": "Protect secrets with end-to-end encryption. No more hard coding secrets or sharing through .env files."
+    "message": "Skydda hemligheter med end-to-end-kryptering. Inget mer hårdkodande av hemligheter eller delning via .env-filer."
   },
   "enhanceDeveloperProductivity": {
-    "message": "Enhance developer productivity."
+    "message": "Förbättra utvecklarnas produktivitet."
   },
   "enhanceDeveloperProductivityDescription": {
-    "message": "Programmatically retrieve and deploy secrets at runtime so developers can focus on what matters most, like improving code quality."
+    "message": "Hämta och distribuera hemligheter programmatiskt vid körning så att utvecklare kan fokusera på det som är viktigast, som att förbättra kodkvaliteten."
   },
   "strengthenBusinessSecurity": {
-    "message": "Strengthen business security."
+    "message": "Stärka säkerheten i verksamheten."
   },
   "strengthenBusinessSecurityDescription": {
-    "message": "Maintain tight control over machine and human access to secrets with SSO integrations, event logs, and access rotation."
+    "message": "Håll noggrann kontroll över maskinell och mänsklig åtkomst till hemligheter med SSO-integreringar, händelseloggar och åtkomstrotation."
   },
   "tryItNow": {
-    "message": "Try it now"
+    "message": "Prova det nu"
   },
   "sendRequest": {
-    "message": "Send request"
+    "message": "Skicka begäran"
   },
   "addANote": {
-    "message": "Add a note"
+    "message": "Lägg till en anteckning"
   },
   "bitwardenSecretsManager": {
-    "message": "Bitwarden Secrets Manager"
+    "message": "Bitwarden Hemlighetshanterare"
   },
   "moreProductsFromBitwarden": {
     "message": "Fler produkter från Bitwarden"
   },
   "requestAccessToSecretsManager": {
-    "message": "Request access to Secrets Manager"
+    "message": "Begär tillgång till Secrets Manager"
   },
   "youNeedApprovalFromYourAdminToTrySecretsManager": {
-    "message": "You need approval from your administrator to try Secrets Manager."
+    "message": "Du behöver godkännande från din administratör för att prova Secrets Manager."
   },
   "smAccessRequestEmailSent": {
-    "message": "Access request for secrets manager email sent to admins."
+    "message": "Begäran om åtkomst för hemligheter manager e-post skickad till administratörer."
   },
   "requestAccessSMDefaultEmailContent": {
-    "message": "Hi,\n\nI am requesting a subscription to Bitwarden Secrets Manager for our team. Your support would mean a great deal!\n\nBitwarden Secrets Manager is an end-to-end encrypted secrets management solution for securely storing, sharing, and deploying machine credentials like API keys, database passwords, and authentication certificates.\n\nSecrets Manager will help us to:\n\n- Improve security\n- Streamline operations\n- Prevent costly secret leaks\n\nTo request a free trial for our team, please reach out to Bitwarden.\n\nThank you for your help!"
+    "message": "Hej, \n\nJag vill prenumerera på Bitwarden Secrets Manager för vårt team. Er hjälp skulle betyda mycket för oss!\n\nBitwarden Secrets Manager är en helt krypterad lösning för hantering av hemlig information som gör det möjligt att säkert lagra, dela och distribuera maskinuppgifter som API-nycklar, databaslösenord och autentiseringscertifikat. \n\nSecrets Manager hjälper oss att: \n\n- förbättra säkerheten \n- effektivisera verksamheten \n- förhindra kostsamma läckor av hemlig information.\n\nFör att begära en kostnadsfri testversion för vårt team, vänligen kontakta Bitwarden. \n\nTack för er hjälp!"
   },
   "giveMembersAccess": {
-    "message": "Give members access:"
+    "message": "Ge medlemmarna tillgång:"
   },
   "viewAndSelectTheMembers": {
-    "message": "view and select the members you want to give access to Secrets Manager."
+    "message": "och välj de medlemmar som du vill ge tillgång till Secrets Manager."
   },
   "openYourOrganizations": {
-    "message": "Open your organization's"
+    "message": "Öppna din organisations"
   },
   "usingTheMenuSelect": {
-    "message": "Using the menu, select"
+    "message": "Välj med hjälp av menyn"
   },
   "toGrantAccessToSelectedMembers": {
-    "message": "to grant access to selected members."
+    "message": "för att ge åtkomst till utvalda medlemmar."
   },
   "sendVaultCardTryItNow": {
     "message": "prova det nu",
@@ -5645,7 +5654,7 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send or sign up to **try it today.**'"
   },
   "sendAccessCreatorIdentifier": {
-    "message": "Bitwarden member $USER_IDENTIFIER$ shared the following with you",
+    "message": "Bitwarden-medlemmen $USER_IDENTIFIER$ delade med sig av följande till dig",
     "placeholders": {
       "user_identifier": {
         "content": "$1",
@@ -5677,7 +5686,7 @@
     "message": "Det gick inte att spara raderings- och utgångsdatum."
   },
   "hideYourEmail": {
-    "message": "Hide your email address from viewers."
+    "message": "Dölj din e-postadress från tittarna."
   },
   "webAuthnFallbackMsg": {
     "message": "Klicka på knappen nedan för att verifiera din 2FA."
@@ -5686,31 +5695,31 @@
     "message": "Autentisera WebAuthn"
   },
   "readSecurityKey": {
-    "message": "Read security key"
+    "message": "Läs säkerhetsnyckel"
   },
   "awaitingSecurityKeyInteraction": {
-    "message": "Awaiting security key interaction..."
+    "message": "Väntar på interaktion med säkerhetsnyckel..."
   },
   "webAuthnNotSupported": {
     "message": "WebAuthn stöds inte i denna webbläsare."
   },
   "webAuthnSuccess": {
-    "message": "WebAuthn verified successfully! You may close this tab."
+    "message": "WebAuthn verifierad framgångsrikt! Du kan stänga den här fliken."
   },
   "yourNewPasswordCannotBeTheSameAsYourCurrentPassword": {
-    "message": "Your new password cannot be the same as your current password."
+    "message": "Ditt nya lösenord får inte vara samma som ditt aktuella lösenord."
   },
   "hintEqualsPassword": {
     "message": "Din lösenordsledtråd får inte vara samma som ditt lösenord."
   },
   "enrollAccountRecovery": {
-    "message": "Enroll in account recovery"
+    "message": "Anmäl dig till kontoåterställning"
   },
   "enrolledAccountRecovery": {
-    "message": "Enrolled in account recovery"
+    "message": "Registrerad i kontoåterställning"
   },
   "withdrawAccountRecovery": {
-    "message": "Withdraw from account recovery"
+    "message": "Uttag från kontoåterställning"
   },
   "enrollPasswordResetSuccess": {
     "message": "Deltagandet lyckades!"
@@ -5719,7 +5728,7 @@
     "message": "Utträdet lyckades!"
   },
   "eventEnrollAccountRecovery": {
-    "message": "User $ID$ enrolled in account recovery.",
+    "message": "Användare $ID$ registrerad i kontoåterställning.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5728,7 +5737,7 @@
     }
   },
   "eventWithdrawAccountRecovery": {
-    "message": "User $ID$ withdrew from account recovery.",
+    "message": "Användaren $ID$ drog tillbaka från kontoåterställning.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5746,7 +5755,7 @@
     }
   },
   "eventResetSsoLink": {
-    "message": "Reset SSO link for user $ID$",
+    "message": "Återställ SSO-länk för användare $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5755,7 +5764,7 @@
     }
   },
   "firstSsoLogin": {
-    "message": "$ID$ logged in using Sso for the first time",
+    "message": "$ID$ loggade in med Sso för första gången",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5775,20 +5784,32 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Om du fortsätter loggas $NAME$ ut från sin nuvarande session och måste logga in igen. Aktiva sessioner på andra enheter kan fortsätta att vara aktiva i upp till en timme.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "denna användare"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "En eller flera organisationspolicyer kräver att huvudlösenordet uppfyller följande krav:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "En eller flera organisationspolicyer kräver att huvudlösenordet uppfyller följande krav:"
+  },
   "resetPasswordSuccess": {
     "message": "Lösenordsåterställningen lyckades!"
   },
   "resetPasswordEnrollmentWarning": {
-    "message": "Deltagande tillåter organisationsadministratörer att ändra ditt huvudlösenord. Är du säker på att du vill delta?"
+    "message": "Registrering tillåter organisationsadministratörer att ändra ditt huvudlösenord"
   },
   "accountRecoveryPolicy": {
-    "message": "Account recovery administration"
+    "message": "Administration av kontoåterställning"
   },
   "accountRecoveryPolicyDesc": {
     "message": "Baserat på krypteringsmetoden kan du återställa konton om huvudlösenord eller betrodda enheter glöms bort eller förloras."
@@ -5797,7 +5818,7 @@
     "message": "För befintliga konton med huvudlösenord måste medlemmarna själva logga in för att administratörer ska kunna återställa deras konton. Automatisk registrering aktiverar kontoförnyelse för nya medlemmar."
   },
   "accountRecoverySingleOrgRequirementDesc": {
-    "message": "The single organization Enterprise policy must be turned on before activating this policy."
+    "message": "Företagspolicyn för en enda organisation måste vara aktiverad innan den här policyn aktiveras."
   },
   "resetPasswordPolicyAutoEnroll": {
     "message": "Automatiskt deltagande"
@@ -5833,7 +5854,7 @@
     "message": "Skicka inbjudningar igen"
   },
   "resendNotification": {
-    "message": "Resend notification"
+    "message": "Skicka meddelande på nytt"
   },
   "noSelectedUsersApplicable": {
     "message": "Denna åtgärd är inte tillämplig på någon av de valda användarna."
@@ -5842,10 +5863,10 @@
     "message": "Är du säker på att du vill ta bort följande användare? Processen kan ta några sekunder att slutföra och kan inte pausas eller avbrytas."
   },
   "removeOrgUsersConfirmation": {
-    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
+    "message": "När medlemmar tas bort har de inte längre tillgång till organisationsdata och åtgärden är oåterkallelig. För att lägga till medlemmen i organisationen igen måste denne bjudas in och onboardas på nytt. Processen kan ta några sekunder att slutföra och kan inte avbrytas eller avbrytas."
   },
   "revokeUsersWarning": {
-    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
+    "message": "När medlemmar återkallas har de inte längre tillgång till organisationsdata. För att snabbt återställa medlemmens åtkomst går du till fliken Revoked. Processen kan ta några sekunder att slutföra och kan inte avbrytas eller annulleras."
   },
   "theme": {
     "message": "Tema"
@@ -5878,60 +5899,60 @@
     "message": "Tog bort"
   },
   "bulkRevokedMessage": {
-    "message": "Revoked organization access successfully"
+    "message": "Återkallad organisationsåtkomst framgångsrikt"
   },
   "bulkRestoredMessage": {
-    "message": "Restored organization access successfully"
+    "message": "Återställde organisationens åtkomst framgångsrikt"
   },
   "bulkFilteredMessage": {
     "message": "Exkluderad, inte tillämplig för denna åtgärd"
   },
   "nonCompliantMembersTitle": {
-    "message": "Non-compliant members"
+    "message": "Medlemmar som inte uppfyller kraven"
   },
   "nonCompliantMembersError": {
-    "message": "Members that are non-compliant with the Single organization or Two-step login policy cannot be restored until they adhere to the policy requirements"
+    "message": "Medlemmar som inte följer policyn för inloggning med en organisation eller tvåstegsinloggning kan inte återställas förrän de följer policykraven"
   },
   "fingerprint": {
     "message": "Fingeravtryck"
   },
   "fingerprintPhrase": {
-    "message": "Fingerprint phrase:"
+    "message": "Fingeravtrycksfras:"
   },
   "error": {
     "message": "Fel"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Dekrypteringsfel"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "Bitwarden kunde inte dekryptera valvföremålet/valvföremålen som listas nedan."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "Kontakta kundtjänst",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "för att undvika ytterligare dataförlust.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "accountRecoveryManageUsers": {
-    "message": "Manage users must also be granted with the manage account recovery permission"
+    "message": "Hantera användare måste också beviljas behörigheten hantera kontoåterställning"
   },
   "setupProvider": {
-    "message": "Provider setup"
+    "message": "Inställning av leverantör"
   },
   "setupProviderLoginDesc": {
-    "message": "You've been invited to setup a new Provider. To continue, you need to log in or create a new Bitwarden account."
+    "message": "Du har blivit inbjuden att skapa en ny Provider. För att fortsätta måste du logga in eller skapa ett nytt Bitwarden-konto."
   },
   "setupProviderDesc": {
-    "message": "Please enter the details below to complete the Provider setup. Contact Customer Support if you have any questions."
+    "message": "Fyll i uppgifterna nedan för att slutföra Provider-inställningen. Kontakta kundtjänst om du har några frågor."
   },
   "providerName": {
-    "message": "Provider name"
+    "message": "Leverantörsnamn"
   },
   "providerSetup": {
-    "message": "Provider successfully set up"
+    "message": "Leverantör framgångsrikt installerad"
   },
   "clients": {
     "message": "Klienter"
@@ -5941,10 +5962,10 @@
     "description": "This is used as a table header to describe which client application created an event log."
   },
   "providerAdmin": {
-    "message": "Provider admin"
+    "message": "Leverantör admin"
   },
   "providerAdminDesc": {
-    "message": "The highest access user that can manage all aspects of your Provider as well as access and manage client organizations."
+    "message": "Den användare som har högst åtkomst och som kan hantera alla aspekter av din Provider samt få åtkomst till och hantera kundorganisationer."
   },
   "serviceUser": {
     "message": "Tjänstanvändare"
@@ -5953,31 +5974,31 @@
     "message": "Tjänstanvändare kan komma åt och hantera alla klientorganisationer."
   },
   "providerInviteUserDesc": {
-    "message": "Invite a new user to your Provider by entering their Bitwarden account email address below. If they do not have a Bitwarden account already, they will be prompted to create a new account."
+    "message": "Bjud in en ny användare till din Provider genom att ange e-postadressen till deras Bitwarden-konto nedan. Om de inte redan har ett Bitwarden-konto kommer de att uppmanas att skapa ett nytt konto."
   },
   "joinProvider": {
-    "message": "Join Provider"
+    "message": "Anslut leverantör"
   },
   "joinProviderDesc": {
-    "message": "You've been invited to join the Provider listed above. To accept the invitation, you need to log in or create a new Bitwarden account."
+    "message": "Du har blivit inbjuden att gå med i den leverantör som anges ovan. För att acceptera inbjudan måste du logga in eller skapa ett nytt Bitwarden-konto."
   },
   "providerInviteAcceptFailed": {
-    "message": "Unable to accept invitation. Ask a Provider admin to send a new invitation."
+    "message": "Det går inte att acceptera inbjudan. Be en Provider-administratör att skicka en ny inbjudan."
   },
   "providerInviteAcceptedDesc": {
-    "message": "You can access this Provider once an administrator confirms your membership. We'll send you an email when that happens."
+    "message": "Du får tillgång till den här leverantören när en administratör har bekräftat ditt medlemskap. Vi skickar ett e-postmeddelande till dig när det sker."
   },
   "providerUsersNeedConfirmed": {
-    "message": "You have users that have accepted their invitation, but still need to be confirmed. Users will not have access to the Provider until they are confirmed."
+    "message": "Du har användare som har accepterat sin inbjudan, men som fortfarande behöver bekräftas. Användarna kommer inte att ha tillgång till Providern förrän de har bekräftats."
   },
   "provider": {
-    "message": "Provider"
+    "message": "Leverantör"
   },
   "newClientOrganization": {
     "message": "Ny klientorganisation"
   },
   "newClientOrganizationDesc": {
-    "message": "Create a new client organization that will be associated with you as the Provider. You will be able to access and manage this organization."
+    "message": "Skapa en ny kundorganisation som kommer att vara kopplad till dig som Provider. Du kommer att kunna komma åt och hantera den här organisationen."
   },
   "newClient": {
     "message": "Ny klient"
@@ -5989,10 +6010,10 @@
     "message": "Lägg till ny organisation"
   },
   "myProvider": {
-    "message": "My Provider"
+    "message": "Min leverantör"
   },
   "addOrganizationConfirmation": {
-    "message": "Are you sure you want to add $ORGANIZATION$ as a client to $PROVIDER$?",
+    "message": "Är du säker på att du vill lägga till $ORGANIZATION$ som en kund till $PROVIDER$?",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -6005,10 +6026,10 @@
     }
   },
   "organizationJoinedProvider": {
-    "message": "Organization was successfully added to the Provider"
+    "message": "Organisation har lagts till i Provider"
   },
   "accessingUsingProvider": {
-    "message": "Accessing organization using Provider $PROVIDER$",
+    "message": "Åtkomst till organisation med hjälp av leverantören $PROVIDER$",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -6017,13 +6038,13 @@
     }
   },
   "providerIsDisabled": {
-    "message": "Provider suspended"
+    "message": "Leverantör avstängd"
   },
   "providerUpdated": {
     "message": "Leverantör sparades"
   },
   "yourProviderIs": {
-    "message": "Your Provider is $PROVIDER$. They have administrative and billing privileges for your organization.",
+    "message": "Din leverantör är $PROVIDER$. De har administrations- och faktureringsrättigheter för din organisation.",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -6032,7 +6053,7 @@
     }
   },
   "detachedOrganization": {
-    "message": "The organization $ORGANIZATION$ has been detached from your Provider.",
+    "message": "Organisationen $ORGANIZATION$ har kopplats bort från din Provider.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -6041,52 +6062,61 @@
     }
   },
   "detachOrganizationConfirmation": {
-    "message": "Are you sure you want to detach this organization? The organization will continue to exist but will no longer be managed by the Provider."
+    "message": "Är du säker på att du vill koppla bort den här organisationen? Organisationen kommer att fortsätta att existera men kommer inte längre att hanteras av leverantören."
   },
   "add": {
     "message": "Lägg till"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Masterlösenordet har ställts in"
+  },
   "updatedMasterPassword": {
     "message": "Huvudlösenordet sparades"
   },
   "updateMasterPassword": {
     "message": "Uppdatera huvudlösenord"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Ändra ditt huvudlösenord för att slutföra kontoåterställningen."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Ditt huvudlösenord uppfyller inte den här organisationens krav. Ändra ditt huvudlösenord för att fortsätta."
+  },
   "updateMasterPasswordWarning": {
     "message": "Ditt huvudlösenord ändrades nyligen av en administratör i din organisation. För att få tillgång till valvet måste du uppdatera ditt huvudlösenord nu. Om du fortsätter kommer du att loggas ut från din nuvarande session, vilket kräver att du loggar in igen. Aktiva sessioner på andra enheter kan komma att vara aktiva i upp till en timme."
   },
   "masterPasswordInvalidWarning": {
-    "message": "Your master password does not meet the policy requirements of this organization. In order to join the organization, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Ditt huvudlösenord uppfyller inte den här organisationens policykrav. För att kunna gå med i organisationen måste du uppdatera ditt huvudlösenord nu. Om du fortsätter loggas du ut från din nuvarande session och måste logga in igen. Aktiva sessioner på andra enheter kan fortsätta att vara aktiva i upp till en timme."
   },
   "updateWeakMasterPasswordWarning": {
-    "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Ditt huvudlösenord uppfyller inte en eller flera av organisationens policyer. För att få tillgång till valvet måste du uppdatera ditt huvudlösenord nu. Om du fortsätter loggas du ut från din nuvarande session och måste logga in igen. Aktiva sessioner på andra enheter kan fortsätta att vara aktiva i upp till en timme."
   },
   "automaticAppLogin": {
-    "message": "Automatically log in users for allowed applications"
+    "message": "Automatiskt logga in användare för tillåtna applikationer"
   },
   "automaticAppLoginDesc": {
-    "message": "Login forms will automatically be filled and submitted for apps launched from your configured identity provider."
+    "message": "Inloggningsformulär fylls i och skickas automatiskt för appar som startas från din konfigurerade identitetsleverantör."
   },
   "automaticAppLoginIdpHostLabel": {
-    "message": "Identity provider host"
+    "message": "Identitetsleverantörens värd"
   },
   "automaticAppLoginIdpHostDesc": {
-    "message": "Enter your identity provider host URL. Enter multiple URLs by separating with a comma."
+    "message": "Ange värd-URL för din identitetsleverantör. Ange flera webbadresser genom att separera dem med ett kommatecken."
   },
   "tdeDisabledMasterPasswordRequired": {
-    "message": "Your organization has updated your decryption options. Please set a master password to access your vault."
+    "message": "Din organisation har uppdaterat dina dekrypteringsalternativ. Ange ett huvudlösenord för att komma åt ditt valv."
   },
   "maximumVaultTimeout": {
-    "message": "Vault timeout"
+    "message": "Timeout för valv"
   },
   "maximumVaultTimeoutDesc": {
-    "message": "Set a maximum vault timeout for members."
+    "message": "Ange en maximal tidsgräns för valv för medlemmar."
   },
   "maximumVaultTimeoutLabel": {
-    "message": "Maximum vault timeout"
+    "message": "Maximal tidsgräns för valv"
   },
   "invalidMaximumVaultTimeout": {
-    "message": "Invalid maximum vault timeout."
+    "message": "Ogiltig maximal tidsgräns för valv."
   },
   "hours": {
     "message": "Timmar"
@@ -6095,7 +6125,7 @@
     "message": "Minuter"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies have set your maximum allowed vault timeout to $HOURS$ hour(s) and $MINUTES$ minute(s).",
+    "message": "I organisationens policyer har den maximalt tillåtna tidsgränsen för valvet angetts till $HOURS$ timme(n) och $MINUTES$ minut(er).",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -6121,7 +6151,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is $HOURS$ hour(s) and $MINUTES$ minute(s). Your vault timeout action is set to $ACTION$.",
+    "message": "Din organisations policyer påverkar valvets timeout. Högsta tillåtna timeout för valvet är $HOURS$ timme(n) och $MINUTES$ minut(er). Åtgärden för valvets timeout är inställd på $ACTION$.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -6138,7 +6168,7 @@
     }
   },
   "vaultTimeoutActionPolicyInEffect": {
-    "message": "Your organization policies have set your vault timeout action to $ACTION$.",
+    "message": "I organisationens policyer har timeoutåtgärden för valvet ställts in på $ACTION$.",
     "placeholders": {
       "action": {
         "content": "$1",
@@ -6147,34 +6177,34 @@
     }
   },
   "vaultTimeoutToLarge": {
-    "message": "Your vault timeout exceeds the restriction set by your organization."
+    "message": "Tidsgränsen för ditt valv överskrider den begränsning som har fastställts av din organisation."
   },
   "vaultCustomTimeoutMinimum": {
-    "message": "Minimum custom timeout is 1 minute."
+    "message": "Minsta anpassade timeout är 1 minut."
   },
   "vaultTimeoutRangeError": {
-    "message": "Vault timeout is not within allowed range."
+    "message": "Vault timeout ligger inte inom tillåtet intervall."
   },
   "disablePersonalVaultExport": {
-    "message": "Remove individual vault export"
+    "message": "Ta bort export av enskilda valv"
   },
   "disablePersonalVaultExportDescription": {
     "message": "Tillåt inte medlemmar att exportera data från sina individuella valv."
   },
   "vaultExportDisabled": {
-    "message": "Vault export removed"
+    "message": "Vault-export borttagen"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your individual vault."
+    "message": "En eller flera organisationspolicyer hindrar dig från att exportera ditt enskilda valv."
   },
   "activateAutofill": {
     "message": "Aktivera autofyll"
   },
   "activateAutofillPolicyDesc": {
-    "message": "Activate the auto-fill on page load setting on the browser extension for all existing and new members."
+    "message": "Aktivera inställningen för automatisk ifyllnad vid sidladdning i webbläsartillägget för alla befintliga och nya medlemmar."
   },
   "experimentalFeature": {
-    "message": "Compromised or untrusted websites can exploit auto-fill on page load."
+    "message": "Komprometterade eller opålitliga webbplatser kan utnyttja automatisk ifyllning vid sidladdning."
   },
   "learnMoreAboutAutofill": {
     "message": "Läs mer om autofyll"
@@ -6186,22 +6216,22 @@
     "message": "Typ"
   },
   "openIdConnectConfig": {
-    "message": "OpenID connect configuration"
+    "message": "Konfiguration av OpenID-anslutning"
   },
   "samlSpConfig": {
-    "message": "SAML service provider configuration"
+    "message": "Konfiguration av SAML-tjänsteleverantör"
   },
   "samlIdpConfig": {
-    "message": "SAML identity provider configuration"
+    "message": "Konfiguration av SAML-identitetsleverantör"
   },
   "callbackPath": {
-    "message": "Callback path"
+    "message": "Sökväg för återuppringning"
   },
   "signedOutCallbackPath": {
-    "message": "Signed out callback path"
+    "message": "Signerad väg för återuppringning"
   },
   "authority": {
-    "message": "Authority"
+    "message": "Myndighet"
   },
   "clientId": {
     "message": "Klient-ID"
@@ -6210,142 +6240,142 @@
     "message": "Klienthemlighet"
   },
   "metadataAddress": {
-    "message": "Metadata address"
+    "message": "Adress för metadata"
   },
   "oidcRedirectBehavior": {
-    "message": "OIDC redirect behavior"
+    "message": "OIDC omdirigera beteende"
   },
   "getClaimsFromUserInfoEndpoint": {
-    "message": "Get claims from user info endpoint"
+    "message": "Hämta anspråk från slutpunkt för användarinformation"
   },
   "additionalScopes": {
-    "message": "Custom scopes"
+    "message": "Anpassade kikarsikten"
   },
   "additionalUserIdClaimTypes": {
-    "message": "Custom user ID claim types"
+    "message": "Anpassade kravtyper för användar-ID"
   },
   "additionalEmailClaimTypes": {
-    "message": "Email claim types"
+    "message": "E-postanspråkstyper"
   },
   "additionalNameClaimTypes": {
-    "message": "Custom name claim types"
+    "message": "Anspråkstyper med anpassade namn"
   },
   "acrValues": {
-    "message": "Requested authentication context class reference values"
+    "message": "Referensvärden för klass för begärd autentiseringskontext"
   },
   "expectedReturnAcrValue": {
-    "message": "Expected \"acr\" claim value in response"
+    "message": "Förväntat \"acr\"-kravvärde i svar"
   },
   "spEntityId": {
-    "message": "SP entity ID"
+    "message": "SP-enhetens ID"
   },
   "spMetadataUrl": {
-    "message": "SAML 2.0 metadata URL"
+    "message": "URL för SAML 2.0-metadata"
   },
   "spAcsUrl": {
-    "message": "Assertion consumer service (ACS) URL"
+    "message": "URL för Assertion Consumer Service (ACS)"
   },
   "spNameIdFormat": {
-    "message": "Name ID format"
+    "message": "Namn ID-format"
   },
   "spOutboundSigningAlgorithm": {
-    "message": "Outbound signing algorithm"
+    "message": "Algoritm för utgående signering"
   },
   "spSigningBehavior": {
-    "message": "Signing behavior"
+    "message": "Signeringsbeteende"
   },
   "spMinIncomingSigningAlgorithm": {
-    "message": "Minimum incoming signing algorithm"
+    "message": "Algoritm för minsta inkommande signering"
   },
   "spWantAssertionsSigned": {
-    "message": "Expect signed assertions"
+    "message": "Förväntar sig signerade påståenden"
   },
   "spValidateCertificates": {
-    "message": "Validate certificates"
+    "message": "Validera certifikat"
   },
   "spUniqueEntityId": {
-    "message": "Set a unique SP entity ID"
+    "message": "Ange ett unikt ID för SP-enheten"
   },
   "spUniqueEntityIdDesc": {
-    "message": "Generate an identifier that is unique to your organization"
+    "message": "Generera en identifierare som är unik för din organisation"
   },
   "idpEntityId": {
-    "message": "Entity ID"
+    "message": "Enhetens ID"
   },
   "idpBindingType": {
-    "message": "Binding type"
+    "message": "Typ av bindning"
   },
   "idpSingleSignOnServiceUrl": {
-    "message": "Single sign-on service URL"
+    "message": "URL för tjänst för enkel inloggning"
   },
   "idpSingleLogoutServiceUrl": {
-    "message": "Single log-out service URL"
+    "message": "URL för tjänst med en enda inloggning"
   },
   "idpX509PublicCert": {
-    "message": "X509 public certificate"
+    "message": "X509 offentligt certifikat"
   },
   "idpOutboundSigningAlgorithm": {
-    "message": "Outbound signing algorithm"
+    "message": "Algoritm för utgående signering"
   },
   "idpAllowUnsolicitedAuthnResponse": {
-    "message": "Allow unsolicited authentication response"
+    "message": "Tillåt oönskat autentiseringssvar"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Allow outbound logout requests"
+    "message": "Tillåt utgående begäran om utloggning"
   },
   "idpSignAuthenticationRequests": {
-    "message": "Sign authentication requests"
+    "message": "Signera autentiseringsbegäran"
   },
   "ssoSettingsSaved": {
-    "message": "Single sign-on configuration saved"
+    "message": "Konfiguration för enkel inloggning sparad"
   },
   "sponsoredFamilies": {
-    "message": "Free Bitwarden Families"
+    "message": "Gratis Bitwarden Familjer"
   },
   "sponsoredBitwardenFamilies": {
-    "message": "Sponsored families"
+    "message": "Sponsrade familjer"
   },
   "noSponsoredFamiliesMessage": {
-    "message": "No sponsored families"
+    "message": "Inga sponsrade familjer"
   },
   "nosponsoredFamiliesDetails": {
-    "message": "Sponsored non-member families plans will display here"
+    "message": "Sponsrade familjeplaner för icke-medlemmar visas här"
   },
   "sponsorshipFreeBitwardenFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. You can sponsor Free Bitwarden Families for employees who are not a member of your Bitwarden organization. Sponsoring a non-member requires an available seat within your organization."
+    "message": "Medlemmar i din organisation är berättigade till Free Bitwarden Families. Du kan sponsra Free Bitwarden Families för anställda som inte är medlemmar i din Bitwarden-organisation. För att sponsra en icke-medlem krävs en ledig plats inom din organisation."
   },
   "sponsoredFamiliesRemoveActiveSponsorship": {
-    "message": "When you remove an active sponsorship, a seat within your organization will be available after the renewal date of the sponsored organization."
+    "message": "När du tar bort ett aktivt sponsorskap kommer en plats inom din organisation att bli tillgänglig efter förnyelsedatumet för den sponsrade organisationen."
   },
   "sponsoredFamiliesEligible": {
-    "message": "You and your family are eligible for Free Bitwarden Families. Redeem with your personal email to keep your data secure even when you are not at work."
+    "message": "Du och din familj är berättigade till gratis Bitwarden Families. Lös in med din personliga e-post för att hålla dina uppgifter säkra även när du inte är på jobbet."
   },
   "sponsoredFamiliesEligibleCard": {
-    "message": "Redeem your Free Bitwarden for Families plan today to keep your data secure even when you are not at work."
+    "message": "Lös in din kostnadsfria Bitwarden for Families-plan idag för att skydda dina data även när du inte är på jobbet."
   },
   "sponsoredFamiliesIncludeMessage": {
-    "message": "The Bitwarden for Families plan includes"
+    "message": "Bitwarden for Families-planen omfattar"
   },
   "sponsoredFamiliesPremiumAccess": {
-    "message": "Premium access for up to 6 users"
+    "message": "Premiumåtkomst för upp till 6 användare"
   },
   "sponsoredFamiliesSharedCollectionsForFamilyMembers": {
-    "message": "Shared collections for family members"
+    "message": "Delade samlingar för familjemedlemmar"
   },
   "memberFamilies": {
-    "message": "Member families"
+    "message": "Familjer som är medlemmar"
   },
   "noMemberFamilies": {
-    "message": "No member families"
+    "message": "Inga medlemsfamiljer"
   },
   "noMemberFamiliesDescription": {
-    "message": "Members who have redeemed family plans will display here"
+    "message": "Medlemmar som har löst in familjeplaner visas här"
   },
   "membersWithSponsoredFamilies": {
-    "message": "Members of your organization are eligible for Free Bitwarden Families. Here you can see members who have sponsored a Families organization."
+    "message": "Medlemmar i din organisation är berättigade till Free Bitwarden Families. Här kan du se medlemmar som har sponsrat en Families-organisation."
   },
   "organizationHasMemberMessage": {
-    "message": "A sponsorship cannot be sent to $EMAIL$ because they are a member of your organization.",
+    "message": "En sponsring kan inte skickas till $EMAIL$ eftersom de är medlemmar i din organisation.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6357,7 +6387,7 @@
     "message": "Länken är inte längre giltig. Be sponsorn att skicka erbjudandet igen."
   },
   "reclaimedFreePlan": {
-    "message": "Reclaimed free plan"
+    "message": "Återvunnen fri planlösning"
   },
   "redeem": {
     "message": "Lös in"
@@ -6366,25 +6396,25 @@
     "message": "Välj den organisation som du vill sponsra"
   },
   "familiesSponsoringOrgSelect": {
-    "message": "Which Free Families offer would you like to redeem?"
+    "message": "Vilket Free Families-erbjudande skulle du vilja utnyttja?"
   },
   "sponsoredFamiliesEmail": {
-    "message": "Enter your personal email to redeem Bitwarden Families"
+    "message": "Ange din personliga e-postadress för att lösa in Bitwarden Families"
   },
   "sponsoredFamiliesLeaveCopy": {
-    "message": "If you remove an offer or are removed from the sponsoring organization, your Families sponsorship will expire at the next renewal date."
+    "message": "Om du tar bort ett erbjudande eller tas bort från den sponsrande organisationen upphör din Families-sponsring att gälla vid nästa förnyelsedatum."
   },
   "acceptBitwardenFamiliesHelp": {
-    "message": "Accept offer for an existing organization or create a new Families organization."
+    "message": "Acceptera erbjudandet för en befintlig organisation eller skapa en ny Families-organisation."
   },
   "setupSponsoredFamiliesLoginDesc": {
-    "message": "You've been offered a free Bitwarden Families plan organization. To continue, you need to log in to the account that received the offer."
+    "message": "Du har blivit erbjuden en gratis Bitwarden Families planorganisation. För att fortsätta måste du logga in på det konto som fick erbjudandet."
   },
   "sponsoredFamiliesAcceptFailed": {
-    "message": "Unable to accept offer. Please resend the offer email from your Enterprise account and try again."
+    "message": "Det gick inte att acceptera erbjudandet. Skicka erbjudandet på nytt från ditt Enterprise-konto och försök igen."
   },
   "sponsoredFamiliesAcceptFailedShort": {
-    "message": "Unable to accept offer. $DESCRIPTION$",
+    "message": "Kan inte acceptera erbjudandet. $DESCRIPTION$",
     "placeholders": {
       "description": {
         "content": "$1",
@@ -6393,19 +6423,19 @@
     }
   },
   "sponsoredFamiliesOffer": {
-    "message": "Accept Free Bitwarden Families"
+    "message": "Acceptera gratis Bitwarden Familjer"
   },
   "sponsoredFamiliesOfferRedeemed": {
-    "message": "Free Bitwarden Families offer successfully redeemed"
+    "message": "Gratis Bitwarden Families-erbjudande framgångsrikt inlöst"
   },
   "redeemed": {
-    "message": "Redeemed"
+    "message": "Inlöst"
   },
   "redeemedAccount": {
-    "message": "Account redeemed"
+    "message": "Inlöst konto"
   },
   "revokeAccountMessage": {
-    "message": "Revoke account $NAME$",
+    "message": "Återkalla konto $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -6414,7 +6444,7 @@
     }
   },
   "resendEmailLabel": {
-    "message": "Resend sponsorship email to $NAME$ sponsorship",
+    "message": "Skicka sponsringsmejl till $NAME$ sponsring",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -6423,7 +6453,7 @@
     }
   },
   "freeFamiliesPlan": {
-    "message": "Free Families plan"
+    "message": "Plan för fria familjer"
   },
   "redeemNow": {
     "message": "Lös in nu"
@@ -6432,25 +6462,25 @@
     "message": "Mottagare"
   },
   "removeSponsorship": {
-    "message": "Remove sponsorship"
+    "message": "Ta bort sponsring"
   },
   "removeSponsorshipConfirmation": {
-    "message": "After removing a sponsorship, you will be responsible for this subscription and related invoices. Are you sure you want to continue?"
+    "message": "När du har tagit bort en sponsring kommer du att vara ansvarig för denna prenumeration och relaterade fakturor. Är du säker på att du vill fortsätta?"
   },
   "sponsorshipCreated": {
-    "message": "Sponsorship created"
+    "message": "Sponsring skapad"
   },
   "emailSent": {
-    "message": "Email sent"
+    "message": "E-post skickat"
   },
   "removeSponsorshipSuccess": {
-    "message": "Sponsorship removed"
+    "message": "Sponsring borttagen"
   },
   "ssoKeyConnectorError": {
-    "message": "Key Connector error: make sure Key Connector is available and working correctly."
+    "message": "Fel på Key Connector: kontrollera att Key Connector är tillgänglig och fungerar korrekt."
   },
   "keyConnectorUrl": {
-    "message": "Key Connector URL"
+    "message": "URL för nyckelanslutning"
   },
   "sendVerificationCode": {
     "message": "Skicka en verifieringskod till din e-postadress"
@@ -6468,19 +6498,19 @@
     "message": "Bekräfta din identitet för att fortsätta."
   },
   "verificationCodeRequired": {
-    "message": "Verification code is required."
+    "message": "Verifieringskod krävs."
   },
   "webauthnCancelOrTimeout": {
-    "message": "The authentication was cancelled or took too long. Please try again."
+    "message": "Autentiseringen avbröts eller tog för lång tid. Vänligen försök igen."
   },
   "invalidVerificationCode": {
     "message": "Ogiltig verifieringskod"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Ett huvudlösenord krävs inte längre för medlemmar i följande organisation. Vänligen bekräfta domänen nedan med din organisationsadministratör."
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Key Connector-domän"
   },
   "leaveOrganization": {
     "message": "Lämna organisation"
@@ -6492,17 +6522,17 @@
     "message": "Huvudlösenord togs bort"
   },
   "allowSso": {
-    "message": "Allow SSO authentication"
+    "message": "Tillåt SSO-autentisering"
   },
   "allowSsoDesc": {
-    "message": "Once set up, your configuration will be saved and members will be able to authenticate using their Identity Provider credentials."
+    "message": "När konfigurationen är klar sparas den och medlemmarna kan autentisera sig med sina Identity Provider-referenser."
   },
   "ssoPolicyHelpStart": {
     "message": "Använd",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpAnchor": {
-    "message": "require single sign-on authentication policy",
+    "message": "kräver autentiseringspolicy för enkel inloggning",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpEnd": {
@@ -6510,28 +6540,28 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "memberDecryptionOption": {
-    "message": "Member decryption options"
+    "message": "Alternativ för dekryptering av medlemmar"
   },
   "memberDecryptionPassDesc": {
-    "message": "Once authenticated, members will decrypt vault data using their master passwords."
+    "message": "När medlemmarna har autentiserat sig kommer de att dekryptera valvdata med hjälp av sina huvudlösenord."
   },
   "keyConnector": {
-    "message": "Key Connector"
+    "message": "Nyckelkontakt"
   },
   "memberDecryptionKeyConnectorDescStart": {
-    "message": "Connect login with SSO to your self-hosted decryption key server. Using this option, members won’t need to use their master passwords to decrypt vault data. The",
+    "message": "Anslut inloggning med SSO till din egen server för dekrypteringsnycklar. Med det här alternativet behöver medlemmarna inte använda sina huvudlösenord för att dekryptera valvdata. Den",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Connect login with SSO to your self-hosted decryption key server. Using this option, members won’t need to use their master passwords to decrypt vault data. The require SSO authentication and single organization policies are required to set up Key Connector decryption. Contact Bitwarden Support for set up assistance.'"
   },
   "memberDecryptionKeyConnectorDescLink": {
-    "message": "require SSO authentication and single organization policies",
+    "message": "kräver SSO-autentisering och policyer för en enda organisation",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Connect login with SSO to your self-hosted decryption key server. Using this option, members won’t need to use their master passwords to decrypt vault data. The require SSO authentication and single organization policies are required to set up Key Connector decryption. Contact Bitwarden Support for set up assistance.'"
   },
   "memberDecryptionKeyConnectorDescEnd": {
-    "message": "are required to set up Key Connector decryption. Contact Bitwarden Support for set up assistance.",
+    "message": "krävs för att konfigurera dekryptering med Key Connector. Kontakta Bitwarden Support för hjälp med installationen.",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Connect login with SSO to your self-hosted decryption key server. Using this option, members won’t need to use their master passwords to decrypt vault data. The require SSO authentication and single organization policies are required to set up Key Connector decryption. Contact Bitwarden Support for set up assistance.'"
   },
   "keyConnectorPolicyRestriction": {
-    "message": "\"Login with SSO and Key Connector Decryption\" is activated. This policy will only apply to owners and admins."
+    "message": "\"Inloggning med SSO och dekryptering av Key Connector\" är aktiverad. Denna policy gäller endast för ägare och administratörer."
   },
   "enabledSso": {
     "message": "SSO aktiverad"
@@ -6540,127 +6570,127 @@
     "message": "SSO inaktiverad"
   },
   "enabledKeyConnector": {
-    "message": "Key Connector activated"
+    "message": "Nyckelkontakt aktiverad"
   },
   "disabledKeyConnector": {
-    "message": "Key Connector deactivated"
+    "message": "Key Connector avaktiverad"
   },
   "keyConnectorWarning": {
-    "message": "Once members begin using Key Connector, your organization cannot revert to master password decryption. Proceed only if you are comfortable deploying and managing a key server."
+    "message": "När medlemmarna börjar använda Key Connector kan din organisation inte återgå till dekryptering av huvudlösenord. Fortsätt endast om du är bekväm med att distribuera och hantera en nyckelserver."
   },
   "migratedKeyConnector": {
-    "message": "Migrated to Key Connector"
+    "message": "Migrerad till Key Connector"
   },
   "paymentSponsored": {
-    "message": "Please provide a payment method to associate with the organization. Don't worry, we won't charge you anything unless you select additional features or your sponsorship expires. "
+    "message": "Ange en betalningsmetod som ska kopplas till organisationen. Oroa dig inte, vi kommer inte att debitera dig något om du inte väljer ytterligare funktioner eller om ditt sponsorskap upphör."
   },
   "orgCreatedSponsorshipInvalid": {
-    "message": "The sponsorship offer has expired. You may delete the organization you created to avoid a charge at the end of your 7 day trial. Otherwise you may close this prompt to keep the organization and assume billing responsibility."
+    "message": "Sponsringserbjudandet har löpt ut. Du kan ta bort den organisation du skapade för att undvika en kostnad i slutet av din 7-dagars provperiod. Annars kan du stänga den här prompten för att behålla organisationen och ta på dig faktureringsansvaret."
   },
   "newFamiliesOrganization": {
-    "message": "New Families organization"
+    "message": "Organisationen New Families"
   },
   "acceptOffer": {
-    "message": "Accept offer"
+    "message": "Acceptera erbjudandet"
   },
   "sponsoringOrg": {
-    "message": "Sponsoring organization"
+    "message": "Sponsrande organisation"
   },
   "keyConnectorTest": {
     "message": "Testa"
   },
   "keyConnectorTestSuccess": {
-    "message": "Success! Key Connector reached."
+    "message": "Framgång! Key Connector har nåtts."
   },
   "keyConnectorTestFail": {
-    "message": "Cannot reach Key Connector. Check URL."
+    "message": "Det går inte att nå Key Connector. Kontrollera webbadressen."
   },
   "sponsorshipTokenHasExpired": {
-    "message": "The sponsorship offer has expired."
+    "message": "Sponsringserbjudandet har löpt ut."
   },
   "freeWithSponsorship": {
-    "message": "FREE with sponsorship"
+    "message": "GRATIS med sponsring"
   },
   "viewBillingSyncToken": {
-    "message": "View billing sync token"
+    "message": "Visa token för fakturasynkronisering"
   },
   "generateBillingToken": {
-    "message": "Generate billing token"
+    "message": "Generera faktureringstoken"
   },
   "copyPasteBillingSync": {
-    "message": "Copy and paste this token into the billing sync settings of your self-hosted organization."
+    "message": "Kopiera och klistra in den här token i inställningarna för fakturasynkronisering i din organisation med egen värd."
   },
   "billingSyncCanAccess": {
-    "message": "Your billing sync token can access and edit this organization's subscription settings."
+    "message": "Din synkroniseringstoken för fakturering kan komma åt och redigera den här organisationens prenumerationsinställningar."
   },
   "manageBillingTokenSync": {
-    "message": "Manage Billing Token"
+    "message": "Hantera faktureringstoken"
   },
   "setUpBillingSync": {
-    "message": "Set up billing sync"
+    "message": "Ställ in faktureringssynkronisering"
   },
   "generateToken": {
     "message": "Generera token"
   },
   "rotateToken": {
-    "message": "Rotate token"
+    "message": "Rotera token"
   },
   "rotateBillingSyncTokenWarning": {
-    "message": "If you proceed, you will need to re-setup billing sync on your self-hosted server."
+    "message": "Om du fortsätter måste du konfigurera om faktureringssynkroniseringen på din egen server."
   },
   "rotateBillingSyncTokenTitle": {
-    "message": "Rotating the billing sync token will invalidate the previous token."
+    "message": "Om du roterar token för faktureringssynkronisering ogiltigförklaras den föregående token."
   },
   "selfHostedServer": {
-    "message": "self-hosted"
+    "message": "själv-hostad"
   },
   "customEnvironment": {
-    "message": "Custom environment"
+    "message": "Anpassad miljö"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com"
+    "message": "Ange bas-URL:en för din lokala Bitwarden-installation. Exempel: https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
-    "message": "For advanced configuration, you can specify the base URL of each service independently."
+    "message": "För avancerad konfiguration kan du ange bas-URL:en för varje tjänst separat."
   },
   "selfHostedEnvFormInvalid": {
-    "message": "You must add either the base Server URL or at least one custom environment."
+    "message": "Du måste lägga till antingen basserverns URL eller minst en anpassad miljö."
   },
   "apiUrl": {
-    "message": "API server URL"
+    "message": "URL till API-server"
   },
   "webVaultUrl": {
-    "message": "Web vault server URL"
+    "message": "URL för webbvalvsserver"
   },
   "identityUrl": {
-    "message": "Identity server URL"
+    "message": "URL för identitetsserver"
   },
   "notificationsUrl": {
-    "message": "Notifications server URL"
+    "message": "URL för meddelandeserver"
   },
   "iconsUrl": {
-    "message": "Icons server URL"
+    "message": "Ikoner server URL"
   },
   "environmentSaved": {
-    "message": "Environment URLs saved"
+    "message": "URL:er för miljö sparas"
   },
   "selfHostingTitle": {
-    "message": "Self-hosting"
+    "message": "Självhanterande"
   },
   "selfHostingEnterpriseOrganizationSectionCopy": {
-    "message": "To set-up your organization on your own server, you will need to upload your license file. To support Free Families plans and advanced billing capabilities for your self-hosted organization, you will need to set up billing sync."
+    "message": "Om du vill konfigurera din organisation på din egen server måste du ladda upp din licensfil. För att stödja Free Families-planer och avancerade faktureringsfunktioner för din egenhostade organisation måste du ställa in faktureringssynkronisering."
   },
   "billingSyncApiKeyRotated": {
-    "message": "Token rotated"
+    "message": "Token roterad"
   },
   "billingSyncKeyDesc": {
-    "message": "A billing sync token from your cloud organization's subscription settings is required to complete this form."
+    "message": "En token för faktureringssynkronisering från din molnorganisations prenumerationsinställningar krävs för att fylla i det här formuläret."
   },
   "billingSyncKey": {
-    "message": "Billing sync token"
+    "message": "Token för fakturasynkronisering"
   },
   "automaticBillingSyncDesc": {
-    "message": "Automatic sync unlocks Families sponsorships and allows you to sync your license without uploading a file. After making updates in the Bitwarden cloud server, select Sync License to apply changes."
+    "message": "Automatisk synkronisering låser upp Familiesponsring och låter dig synkronisera din licens utan att ladda upp en fil. När du har gjort uppdateringar i Bitwardens molnserver väljer du Synkronisera licens för att tillämpa ändringarna."
   },
   "active": {
     "message": "Aktiv"
@@ -6669,16 +6699,16 @@
     "message": "Inaktiv"
   },
   "sentAwaitingSync": {
-    "message": "Sent (awaiting sync)"
+    "message": "Skickad (väntar på synkronisering)"
   },
   "sent": {
-    "message": "Sent"
+    "message": "Skickat"
   },
   "requestRemoved": {
-    "message": "Removed (awaiting sync)"
+    "message": "Borttagen (i väntan på synkronisering)"
   },
   "requested": {
-    "message": "Requested"
+    "message": "Begärda"
   },
   "formErrorSummaryPlural": {
     "message": "$COUNT$ fält ovan kräver din uppmärksamhet.",
@@ -6705,7 +6735,7 @@
     "message": "obligatoriskt"
   },
   "charactersCurrentAndMaximum": {
-    "message": "$CURRENT$/$MAX$ character maximum",
+    "message": "$CURRENT$/$MAX$ maximalt antal tecken",
     "placeholders": {
       "current": {
         "content": "$1",
@@ -6727,31 +6757,31 @@
     }
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Required if Entity ID is not a URL."
+    "message": "Krävs om Entity ID inte är en URL."
   },
   "offerNoLongerValid": {
-    "message": "This offer is no longer valid. Contact your organization administrators for more information."
+    "message": "Detta erbjudande är inte längre giltigt. Kontakta din organisations administratörer för mer information."
   },
   "openIdOptionalCustomizations": {
-    "message": "Optional customizations"
+    "message": "Valfria anpassningar"
   },
   "openIdAuthorityRequired": {
-    "message": "Required if Authority is not valid."
+    "message": "Krävs om myndigheten inte är giltig."
   },
   "separateMultipleWithComma": {
-    "message": "Separate multiple with a comma."
+    "message": "Separera flera med ett kommatecken."
   },
   "sessionTimeout": {
-    "message": "Your session has timed out. Please go back and try logging in again."
+    "message": "Din session har tidsbegränsats. Vänligen gå tillbaka och försök logga in igen."
   },
   "exportingPersonalVaultTitle": {
-    "message": "Exporting individual vault"
+    "message": "Exportera enskilda valv"
   },
   "exportingOrganizationVaultTitle": {
-    "message": "Exporting organization vault"
+    "message": "Exportera organisationsvalv"
   },
   "exportingIndividualVaultDescription": {
-    "message": "Only the individual vault items associated with $EMAIL$ will be exported. Organization vault items will not be included. Only vault item information will be exported and will not include associated attachments.",
+    "message": "Endast de enskilda valvobjekt som är associerade med $EMAIL$ exporteras. Valvobjekt för organisationer kommer inte att inkluderas. Endast information om valvobjektet exporteras och inkluderar inte tillhörande bilagor.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6760,7 +6790,7 @@
     }
   },
   "exportingIndividualVaultWithAttachmentsDescription": {
-    "message": "Only the individual vault items including attachments associated with $EMAIL$ will be exported. Organization vault items will not be included",
+    "message": "Endast de enskilda valvobjekten inklusive bilagor som är associerade med $EMAIL$ exporteras. Organisationens valvobjekt kommer inte att inkluderas",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -6769,7 +6799,7 @@
     }
   },
   "exportingOrganizationVaultDesc": {
-    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. Items in individual vaults or other organizations will not be included.",
+    "message": "Endast det organisationsvalv som är associerat med $ORGANIZATION$ exporteras. Objekt i enskilda valv eller andra organisationer kommer inte att inkluderas.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -6778,7 +6808,7 @@
     }
   },
   "accessDenied": {
-    "message": "Access denied. You do not have permission to view this page."
+    "message": "Åtkomst nekad. Du har inte behörighet att visa den här sidan."
   },
   "masterPassword": {
     "message": "Huvudlösenord"
@@ -6796,7 +6826,7 @@
     "message": "Tillbaka till rapporter"
   },
   "organizationPicker": {
-    "message": "Organization picker"
+    "message": "Väljare av organisation"
   },
   "currentOrganization": {
     "message": "Nuvarande organisation",
@@ -6822,7 +6852,25 @@
     "message": "Generera användarnamn"
   },
   "generateEmail": {
-    "message": "Generate email"
+    "message": "Generera e-post"
+  },
+  "generatePassword": {
+    "message": "Generera lösenord"
+  },
+  "generatePassphrase": {
+    "message": "Generera lösenfras"
+  },
+  "passwordGenerated": {
+    "message": "Lösenord genererat"
+  },
+  "passphraseGenerated": {
+    "message": "Lösenfras genererad"
+  },
+  "usernameGenerated": {
+    "message": "Användarnamn genererat"
+  },
+  "emailGenerated": {
+    "message": "E-post genererad"
   },
   "spinboxBoundariesHint": {
     "message": "Värde måste vara mellan $MIN$ och $MAX$.",
@@ -6859,20 +6907,20 @@
     }
   },
   "plusAddressedEmail": {
-    "message": "Plus addressed email",
+    "message": "Plus adresserad e-post",
     "description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
   },
   "plusAddressedEmailDesc": {
-    "message": "Use your email provider's sub-addressing capabilities."
+    "message": "Använd din e-postleverantörs funktioner för underadressering."
   },
   "catchallEmail": {
-    "message": "Catch-all email"
+    "message": "E-post för alla"
   },
   "catchallEmailDesc": {
-    "message": "Use your domain's configured catch-all inbox."
+    "message": "Använd din domäns konfigurerade inkorg."
   },
   "useThisEmail": {
-    "message": "Use this email"
+    "message": "Använd denna e-post"
   },
   "random": {
     "message": "Slumpmässigt",
@@ -6882,33 +6930,36 @@
     "message": "Slumpmässigt ord"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Generator för användarnamn"
   },
   "useThisPassword": {
     "message": "Använd detta lösenord"
   },
+  "useThisPassphrase": {
+    "message": "Använd denna lösenfras"
+  },
   "useThisUsername": {
     "message": "Använd detta användarnamn"
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "Säkert lösenord genererat! Glöm inte att även uppdatera ditt lösenord på hemsidan."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Använd generatorn",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "för att skapa ett starkt unikt lösenord",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "service": {
     "message": "Tjänst"
   },
   "unknownCipher": {
-    "message": "Unknown item, you may need to request permission to access this item."
+    "message": "Okänt objekt, du kan behöva begära tillstånd för att få tillgång till detta objekt."
   },
   "cannotSponsorSelf": {
-    "message": "You cannot redeem for the active account. Enter a different email."
+    "message": "Du kan inte lösa in för det aktiva kontot. Ange en annan e-postadress."
   },
   "revokeWhenExpired": {
     "message": "Upphör $DATE$",
@@ -6920,7 +6971,7 @@
     }
   },
   "awaitingSyncSingular": {
-    "message": "Token rotated $DAYS$ day ago. Update the billing sync token in your self-hosted organization settings.",
+    "message": "Token roterade för $DAYS$$ dag sedan. Uppdatera token för fakturasynkronisering i inställningarna för din organisation med egen värd.",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -6929,7 +6980,7 @@
     }
   },
   "awaitingSyncPlural": {
-    "message": "Token rotated $DAYS$ days ago. Update the billing sync token in your self-hosted organization settings.",
+    "message": "Token roterade för $DAYS$ dagar sedan. Uppdatera token för fakturasynkronisering i inställningarna för din organisation med egen värd.",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -6942,10 +6993,10 @@
     "description": "Used as a prefix to indicate the last time a sync occurred. Example \"Last sync 1968-11-16 00:00:00\""
   },
   "sponsorshipsSynced": {
-    "message": "Self-hosted sponsorships synced."
+    "message": "Självhanterade sponsringar synkroniserade."
   },
   "billingManagedByProvider": {
-    "message": "Managed by $PROVIDER$",
+    "message": "Hanteras av $PROVIDER$",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -6954,11 +7005,11 @@
     }
   },
   "billingContactProviderForAssistance": {
-    "message": "Please reach out to them for further assistance",
+    "message": "Vänligen kontakta dem för ytterligare hjälp",
     "description": "This text is displayed if an organization's billing is managed by a Provider. It tells the user to contact the Provider for assistance."
   },
   "forwardedEmail": {
-    "message": "Forwarded email alias"
+    "message": "Alias för vidarebefordrad e-post"
   },
   "forwardedEmailDesc": {
     "message": "Generera ett e-postalias med en extern vidarebefordranstjänst."
@@ -6968,7 +7019,7 @@
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
-    "message": "Choose a domain that is supported by the selected service",
+    "message": "Välj en domän som stöds av den valda tjänsten",
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
@@ -6986,7 +7037,7 @@
     }
   },
   "forwarderGeneratedBy": {
-    "message": "Generated by Bitwarden.",
+    "message": "Genereras av Bitwarden.",
     "description": "Displayed with the address on the forwarding service's configuration screen."
   },
   "forwarderGeneratedByWithWebsite": {
@@ -7000,7 +7051,7 @@
     }
   },
   "forwaderInvalidToken": {
-    "message": "Invalid $SERVICENAME$ API token",
+    "message": "Ogiltig $SERVICENAME$ API-token",
     "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -7010,7 +7061,7 @@
     }
   },
   "forwaderInvalidTokenWithMessage": {
-    "message": "Invalid $SERVICENAME$ API token: $ERRORMESSAGE$",
+    "message": "Ogiltig $SERVICENAME$ API-token: $ERRORMESSAGE$",
     "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -7024,7 +7075,7 @@
     }
   },
   "forwaderInvalidOperation": {
-    "message": "$SERVICENAME$ refused your request. Please contact your service provider for assistance.",
+    "message": "$SERVICENAME$ avvisade din begäran. Vänligen kontakta din tjänsteleverantör för hjälp.",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -7034,7 +7085,7 @@
     }
   },
   "forwaderInvalidOperationWithMessage": {
-    "message": "$SERVICENAME$ refused your request: $ERRORMESSAGE$",
+    "message": "$SERVICENAME$ avvisade din begäran: $ERRORMESSAGE$",
     "description": "Displayed when the user is forbidden from using the API by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -7048,7 +7099,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Unable to obtain $SERVICENAME$ masked email account ID.",
+    "message": "Det gick inte att få $SERVICENAME$ maskerat ID för e-postkonto.",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -7078,7 +7129,7 @@
     }
   },
   "forwarderUnknownError": {
-    "message": "Unknown $SERVICENAME$ error occurred.",
+    "message": "Okänt $SERVICENAME$-fel inträffade.",
     "description": "Displayed when the forwarding service failed due to an unknown error.",
     "placeholders": {
       "servicename": {
@@ -7088,7 +7139,7 @@
     }
   },
   "forwarderUnknownForwarder": {
-    "message": "Unknown forwarder: '$SERVICENAME$'.",
+    "message": "Okänd vidarebefordrare: '$SERVICENAME$'.",
     "description": "Displayed when the forwarding service is not supported.",
     "placeholders": {
       "servicename": {
@@ -7102,19 +7153,19 @@
     "description": "Part of a URL."
   },
   "deviceVerification": {
-    "message": "Device verification"
+    "message": "Verifiering av enhet"
   },
   "enableDeviceVerification": {
-    "message": "Turn on device verification"
+    "message": "Slå på enhetsverifiering"
   },
   "deviceVerificationDesc": {
-    "message": "Verification codes are sent to your email address when logging in from an unrecognized device"
+    "message": "Verifieringskoder skickas till din e-postadress när du loggar in från en enhet som inte känns igen"
   },
   "updatedDeviceVerification": {
-    "message": "Updated device verification"
+    "message": "Uppdaterad enhetsverifiering"
   },
   "areYouSureYouWantToEnableDeviceVerificationTheVerificationCodeEmailsWillArriveAtX": {
-    "message": "Are you sure you want to turn on device verification? The verification code emails will arrive at: $EMAIL$",
+    "message": "Är du säker på att du vill aktivera enhetsverifiering? E-postmeddelandena med verifieringskoden kommer att anlända till: $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -7123,18 +7174,18 @@
     }
   },
   "premiumSubcriptionRequired": {
-    "message": "Premium subscription required"
+    "message": "Premium-prenumeration krävs"
   },
   "scim": {
-    "message": "SCIM provisioning",
+    "message": "Tillhandahållande av SCIM",
     "description": "The text, 'SCIM', is an acronym and should not be translated."
   },
   "scimDescription": {
-    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "message": "Automatisk provisionering av användare och grupper med din föredragna identitetsleverantör via SCIM-provisionering",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimIntegrationDescription": {
-    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning. Find supported integrations",
+    "message": "Tillhandahåll automatiskt användare och grupper med din föredragna identitetsleverantör via SCIM-tillhandahållande. Hitta integrationer som stöds",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimEnabledCheckboxDesc": {
@@ -7142,22 +7193,22 @@
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimEnabledCheckboxDescHelpText": {
-    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "message": "Konfigurera din önskade identitetsleverantör genom att ange URL och SCIM API-nyckel",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "scimApiKeyHelperText": {
-    "message": "This API key has access to manage users within your organization. It should be kept secret."
+    "message": "Denna API-nyckel har åtkomst för att hantera användare inom din organisation. Den bör hållas hemlig."
   },
   "copyScimKey": {
-    "message": "Copy the SCIM API key to your clipboard",
+    "message": "Kopiera SCIM API-nyckeln till ditt urklipp",
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "rotateScimKey": {
-    "message": "Rotate the SCIM API key",
+    "message": "Rotera SCIM API-nyckeln",
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "rotateScimKeyWarning": {
-    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "message": "Är du säker på att du vill rotera SCIM API-nyckeln? Den nuvarande nyckeln kommer inte längre att fungera för befintliga integrationer.",
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "rotateKey": {
@@ -7168,7 +7219,7 @@
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "copyScimUrl": {
-    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "message": "Kopiera URL:en för SCIM-slutpunkten till ditt urklipp",
     "description": "the text, 'SCIM' and 'URL', are acronyms and should not be translated."
   },
   "scimUrl": {
@@ -7176,21 +7227,21 @@
     "description": "the text, 'SCIM' and 'URL', are acronyms and should not be translated."
   },
   "scimApiKeyRotated": {
-    "message": "SCIM API key successfully rotated",
+    "message": "SCIM API-nyckel har roterats framgångsrikt",
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "scimSettingsSaved": {
-    "message": "SCIM settings saved",
+    "message": "SCIM-inställningar sparade",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "inputRequired": {
     "message": "Inmatning är obligatoriskt."
   },
   "inputEmail": {
-    "message": "Input is not an email address."
+    "message": "Input är inte en e-postadress."
   },
   "inputMinLength": {
-    "message": "Input must be at least $COUNT$ characters long.",
+    "message": "Inmatningen måste vara minst $COUNT$ tecken lång.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7199,7 +7250,7 @@
     }
   },
   "inputMaxLength": {
-    "message": "Input must not exceed $COUNT$ characters in length.",
+    "message": "Inmatningen får inte vara längre än $COUNT$ tecken.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7208,7 +7259,7 @@
     }
   },
   "inputForbiddenCharacters": {
-    "message": "The following characters are not allowed: $CHARACTERS$",
+    "message": "Följande tecken är inte tillåtna: $CHARACTERS$",
     "placeholders": {
       "characters": {
         "content": "$1",
@@ -7217,7 +7268,7 @@
     }
   },
   "inputMinValue": {
-    "message": "Input value must be at least $MIN$.",
+    "message": "Inmatningsvärdet måste vara minst $MIN$.",
     "placeholders": {
       "min": {
         "content": "$1",
@@ -7226,7 +7277,7 @@
     }
   },
   "inputMaxValue": {
-    "message": "Input value must not exceed $MAX$.",
+    "message": "Inmatningsvärdet får inte överstiga $MAX$.",
     "placeholders": {
       "max": {
         "content": "$1",
@@ -7235,10 +7286,10 @@
     }
   },
   "multipleInputEmails": {
-    "message": "1 or more emails are invalid"
+    "message": "1 eller flera e-postmeddelanden är ogiltiga"
   },
   "tooManyEmails": {
-    "message": "You can only submit up to $COUNT$ emails at a time",
+    "message": "Du kan bara skicka upp till $COUNT$ e-postmeddelanden åt gången",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7247,7 +7298,7 @@
     }
   },
   "fieldsNeedAttention": {
-    "message": "$COUNT$ field(s) above need your attention.",
+    "message": "$COUNT$-fältet/-fälten ovan behöver din uppmärksamhet.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7268,25 +7319,25 @@
     }
   },
   "duoHealthCheckResultsInNullAuthUrlError": {
-    "message": "Error connecting with the Duo service. Use a different two-step login method or contact Duo for assistance."
+    "message": "Fel vid anslutning till Duo-tjänsten. Använd en annan tvåstegsinloggningsmetod eller kontakta Duo för hjälp."
   },
   "duoRequiredByOrgForAccount": {
-    "message": "Duo two-step login is required for your account."
+    "message": "Tvåstegsinloggning med Duo krävs för ditt konto."
   },
   "duoTwoFactorRequiredPageSubtitle": {
-    "message": "Duo two-step login is required for your account. Follow the steps below to finish logging in."
+    "message": "Tvåstegsinloggning med Duo krävs för ditt konto. Följ stegen nedan för att slutföra inloggningen."
   },
   "followTheStepsBelowToFinishLoggingIn": {
-    "message": "Follow the steps below to finish logging in."
+    "message": "Följ stegen nedan för att slutföra inloggningen."
   },
   "followTheStepsBelowToFinishLoggingInWithSecurityKey": {
-    "message": "Follow the steps below to finish logging in with your security key."
+    "message": "Följ stegen nedan för att slutföra inloggningen med din säkerhetsnyckel."
   },
   "launchDuo": {
     "message": "Starta Duo"
   },
   "turnOn": {
-    "message": "Turn on"
+    "message": "Sätt på"
   },
   "on": {
     "message": "På"
@@ -7298,7 +7349,7 @@
     "message": "Medlemmar"
   },
   "reporting": {
-    "message": "Reporting"
+    "message": "Rapportering"
   },
   "numberOfUsers": {
     "message": "Antal användare"
@@ -7334,7 +7385,7 @@
     "message": "Teal"
   },
   "salmon": {
-    "message": "Salmon"
+    "message": "Laxfärg"
   },
   "pink": {
     "message": "Rosa"
@@ -7349,7 +7400,7 @@
     "message": "-- Skriv för att filtrera --"
   },
   "multiSelectLoading": {
-    "message": "Retrieving options..."
+    "message": "Hämtar alternativ..."
   },
   "multiSelectNotFound": {
     "message": "Inga objekt hittades"
@@ -7362,7 +7413,7 @@
     "description": "'Character count' describes a feature that displays a number next to each character of the password."
   },
   "passwordCharacterCount": {
-    "message": "Password character count",
+    "message": "Antal tecken i lösenordet",
     "description": "'Character count' describes a feature that displays a number next to each character of the password."
   },
   "hide": {
@@ -7385,11 +7436,11 @@
     "description": "Action to create a new secret."
   },
   "copySecretName": {
-    "message": "Copy secret name",
+    "message": "Kopiera hemligt namn",
     "description": "Action to copy the name of a secret to the system's clipboard."
   },
   "copySecretValue": {
-    "message": "Copy secret value",
+    "message": "Kopiera hemligt värde",
     "description": "Action to copy the value of a secret to the system's clipboard."
   },
   "deleteSecret": {
@@ -7401,13 +7452,13 @@
     "description": "The action to delete multiple secrets from the system."
   },
   "hardDeleteSecret": {
-    "message": "Permanently delete secret"
+    "message": "Ta bort hemligheten permanent"
   },
   "hardDeleteSecrets": {
     "message": "Ta bort hemligheter permanent"
   },
   "secretProjectAssociationDescription": {
-    "message": "Select projects that the secret will be associated with. Only organization users with access to these projects will be able to see the secret.",
+    "message": "Välj de projekt som hemligheten ska associeras med. Endast organisationsanvändare med åtkomst till dessa projekt kommer att kunna se hemligheten.",
     "description": "A prompt explaining how secrets can be associated with projects."
   },
   "selectProjects": {
@@ -7459,11 +7510,11 @@
     "description": "Title for a name/ value pair. Secrets typically consist of a name and value pair."
   },
   "secretEdited": {
-    "message": "Secret edited",
+    "message": "Hemlig redigerad",
     "description": "Notification for the successful editing of a secret."
   },
   "secretCreated": {
-    "message": "Secret created",
+    "message": "Hemlighet skapad",
     "description": "Notification for the successful creation of a secret."
   },
   "newSecret": {
@@ -7531,7 +7582,7 @@
     }
   },
   "deleteServiceAccountToast": {
-    "message": "Service account deleted"
+    "message": "Servicekonto raderat"
   },
   "deleteServiceAccountsToast": {
     "message": "Tjänstkonton togs bort"
@@ -7557,7 +7608,7 @@
     "description": "Notification for the successful saving of a project."
   },
   "projectCreated": {
-    "message": "Project created",
+    "message": "Tjänst skapad",
     "description": "Notification for the successful creation of a project."
   },
   "projectName": {
@@ -7569,7 +7620,7 @@
     "description": "Title for creating a new project."
   },
   "softDeleteSecretWarning": {
-    "message": "Deleting secrets can affect existing integrations.",
+    "message": "Om du tar bort hemligheter kan det påverka befintliga integrationer.",
     "description": "Warns that deleting secrets can have consequences on integrations"
   },
   "softDeletesSuccessToast": {
@@ -7577,7 +7628,7 @@
     "description": "Notifies that the selected secrets have been moved to the trash"
   },
   "hardDeleteSecretConfirmation": {
-    "message": "Are you sure you want to permanently delete this secret?"
+    "message": "Är du säker på att du vill radera den här hemligheten permanent?"
   },
   "hardDeleteSecretsConfirmation": {
     "message": "Är du säker på att du vill ta bort dessa hemligheter permanent?"
@@ -7590,7 +7641,7 @@
     "description": "Title indicating what permissions a service account has"
   },
   "projectCommaSecret": {
-    "message": "Project, Secret",
+    "message": "Projekt, hemligt",
     "description": ""
   },
   "serviceAccountName": {
@@ -7605,24 +7656,24 @@
     "message": "Tjänstkonto uppdaterat",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Skriv eller välj projekt eller hemligheter",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Skriv eller välj projekt",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Skriv för att filtrera",
     "description": "Instructions for filtering a list of projects or secrets"
   },
   "deleteProjectsToast": {
-    "message": "Projects deleted",
+    "message": "Projekt som tagits bort",
     "description": "Notifies that the selected projects have been deleted"
   },
   "deleteProjectToast": {
-    "message": "Project deleted",
+    "message": "Projekt raderat",
     "description": "Notifies that a project has been deleted"
   },
   "deleteProjectDialogMessage": {
-    "message": "Deleting project $PROJECT$ is permanent and irreversible.",
+    "message": "Att radera projektet $PROJECT$ är permanent och oåterkalleligt.",
     "description": "Informs users that projects are hard deleted and not sent to trash",
     "placeholders": {
       "project": {
@@ -7662,7 +7713,7 @@
     }
   },
   "deleteProjectsDialogMessage": {
-    "message": "Deleting projects is permanent and irreversible.",
+    "message": "Radering av projekt är permanent och oåterkallelig.",
     "description": "This message is displayed in a dialog box as a warning before proceeding with project deletion."
   },
   "projectsNoItemsTitle": {
@@ -7670,11 +7721,11 @@
     "description": "Empty state to be displayed when there are no projects to display in the list."
   },
   "projectsNoItemsMessage": {
-    "message": "Add a new project to get started organizing secrets.",
+    "message": "Lägg till ett nytt projekt för att komma igång med att organisera hemligheter.",
     "description": "Message to be displayed when there are no projects to display in the list."
   },
   "smConfirmationRequired": {
-    "message": "Confirmation required",
+    "message": "Bekräftelse krävs",
     "description": "Indicates that user confirmation is required for an action to proceed."
   },
   "bulkDeleteProjectsErrorMessage": {
@@ -7686,14 +7737,14 @@
     "description": "Notification to be displayed when a secret is successfully sent to the trash."
   },
   "hardDeleteSuccessToast": {
-    "message": "Secret permanently deleted"
+    "message": "Hemlighet permanent raderad"
   },
   "accessTokens": {
     "message": "Åtkomsttoken",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Nytt åtkomsttoken",
+  "createAccessToken": {
+    "message": "Skapa åtkomsttoken",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -7713,7 +7764,7 @@
     "description": "Message to be displayed when there are no access tokens to display in the list."
   },
   "downloadAccessToken": {
-    "message": "Download or copy before closing.",
+    "message": "Ladda ner eller kopiera innan du stänger.",
     "description": "Message to be displayed before closing an access token, reminding the user to download or copy it."
   },
   "expiresOnAccessToken": {
@@ -7733,7 +7784,7 @@
     "description": "A unique string that gives a client application (eg. CLI) access to a secret or set of secrets."
   },
   "accessTokenExpirationRequired": {
-    "message": "Expiration date required",
+    "message": "Utgångsdatum krävs",
     "description": "Error message indicating that an expiration date for the access token must be set."
   },
   "accessTokenCreatedAndCopied": {
@@ -7755,7 +7806,7 @@
     "description": "Toast message after deleting one or multiple access tokens."
   },
   "noAccessTokenSelected": {
-    "message": "No access token selected to revoke",
+    "message": "Ingen access-token vald för att återkalla",
     "description": "Toast error message after trying to delete access tokens but not selecting any access tokens."
   },
   "submenu": {
@@ -7774,7 +7825,7 @@
     "message": "Uppdatera"
   },
   "plusNMore": {
-    "message": "+ $QUANTITY$ more",
+    "message": "+ $QUANTITY$ mer",
     "placeholders": {
       "quantity": {
         "content": "$1",
@@ -7783,13 +7834,13 @@
     }
   },
   "groupInfo": {
-    "message": "Group info"
+    "message": "Gruppinformation"
   },
   "editGroupMembersDesc": {
-    "message": "Grant members access to the group's assigned collections."
+    "message": "Ge medlemmarna tillgång till gruppens tilldelade samlingar."
   },
   "editGroupCollectionsDesc": {
-    "message": "Grant access to collections by adding them to this group."
+    "message": "Ge tillgång till samlingar genom att lägga till dem i den här gruppen."
   },
   "restrictedCollectionAssignmentDesc": {
     "message": "Du kan endast tilldela samlingar som du hanterar."
@@ -7804,7 +7855,7 @@
     "message": "Roll"
   },
   "removeMember": {
-    "message": "Remove member"
+    "message": "Ta bort medlem"
   },
   "collection": {
     "message": "Samling"
@@ -7825,7 +7876,7 @@
     "message": "Grupp"
   },
   "domainVerification": {
-    "message": "Domain verification"
+    "message": "Verifiering av domän"
   },
   "newDomain": {
     "message": "Ny domän"
@@ -7834,7 +7885,7 @@
     "message": "Inga domäner"
   },
   "noDomainsSubText": {
-    "message": "Connecting a domain allows members to skip the SSO identifier field during Login with SSO."
+    "message": "Genom att ansluta en domän kan medlemmarna hoppa över fältet för SSO-identifierare under inloggning med SSO."
   },
   "copyDnsTxtRecord": {
     "message": "Kopiera DNS TXT-post"
@@ -7843,25 +7894,25 @@
     "message": "DNS TXT-post"
   },
   "dnsTxtRecordInputHint": {
-    "message": "Copy and paste the TXT record into your DNS Provider."
+    "message": "Kopiera och klistra in TXT-posten i din DNS-leverantör."
   },
   "removeDomain": {
-    "message": "Remove domain"
+    "message": "Ta bort domän"
   },
   "removeDomainWarning": {
-    "message": "Removing a domain cannot be undone. Are you sure you want to continue?"
+    "message": "Att ta bort en domän kan inte ångras. Är du säker på att du vill fortsätta?"
   },
   "domainRemoved": {
-    "message": "Domain removed"
+    "message": "Domän borttagen"
   },
   "domainSaved": {
-    "message": "Domain saved"
+    "message": "Domän sparad"
   },
   "duplicateDomainError": {
-    "message": "You can't claim the same domain twice."
+    "message": "Du kan inte göra anspråk på samma domän två gånger."
   },
   "domainNotAvailable": {
-    "message": "Someone else is using $DOMAIN$. Use a different domain to continue.",
+    "message": "Någon annan använder $DOMAIN$. Använd en annan domän för att fortsätta.",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -7876,16 +7927,16 @@
     "message": "Status"
   },
   "lastChecked": {
-    "message": "Last checked"
+    "message": "Senast kontrollerat"
   },
   "editDomain": {
     "message": "Redigera domän"
   },
   "domainFormInvalid": {
-    "message": "There are form errors that need your attention"
+    "message": "Det finns formfel som behöver din uppmärksamhet"
   },
   "addedDomain": {
-    "message": "Added domain $DOMAIN$",
+    "message": "Lagt till domän $DOMAIN$",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -7894,7 +7945,7 @@
     }
   },
   "removedDomain": {
-    "message": "Removed domain $DOMAIN$",
+    "message": "Borttagen domän $DOMAIN$",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -7912,10 +7963,10 @@
     "message": "Verifiera med biometri"
   },
   "awaitingConfirmation": {
-    "message": "Awaiting confirmation"
+    "message": "Inväntar bekräftelse"
   },
   "couldNotCompleteBiometrics": {
-    "message": "Could not complete biometrics."
+    "message": "Kunde inte fylla i biometri."
   },
   "needADifferentMethod": {
     "message": "Behöver du en annan metod?"
@@ -7930,7 +7981,7 @@
     "message": "Använd biometri"
   },
   "enterVerificationCodeSentToEmail": {
-    "message": "Enter the verification code that was sent to your email."
+    "message": "Ange verifieringskoden som skickades till din e-post."
   },
   "resendCode": {
     "message": "Skicka kod igen"
@@ -7948,22 +7999,22 @@
     "message": "Välj grupper"
   },
   "userPermissionOverrideHelperDesc": {
-    "message": "Permissions set for a member will replace permissions set by that member's group."
+    "message": "De behörigheter som anges för en medlem ersätter de behörigheter som anges av medlemmens grupp."
   },
   "noMembersOrGroupsAdded": {
-    "message": "No members or groups added"
+    "message": "Inga medlemmar eller grupper tillagda"
   },
   "deleted": {
-    "message": "Deleted"
+    "message": "Raderad"
   },
   "memberStatusFilter": {
-    "message": "Member status filter"
+    "message": "Filter för medlemsstatus"
   },
   "inviteMember": {
     "message": "Bjud in medlem"
   },
   "addSponsorship": {
-    "message": "Add sponsorship"
+    "message": "Lägg till sponsring"
   },
   "needsConfirmation": {
     "message": "Kräver bekräftelse"
@@ -7975,7 +8026,7 @@
     "message": "Mer från Bitwarden"
   },
   "switchProducts": {
-    "message": "Switch products"
+    "message": "Produkter för växlar"
   },
   "freeOrgInvLimitReachedManageBilling": {
     "message": "Gratis organisationer kan ha upp till $SEATCOUNT$ medlemmar. Uppgradera till en betald plan för att bjuda in fler medlemmar.",
@@ -7996,7 +8047,7 @@
     }
   },
   "teamsStarterPlanInvLimitReachedManageBilling": {
-    "message": "Teams Starter plans may have up to $SEATCOUNT$ members. Upgrade to your plan to invite more members.",
+    "message": "Teams Starter-planer kan ha upp till $SEATCOUNT$-medlemmar. Uppgradera till din plan för att bjuda in fler medlemmar.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8005,7 +8056,7 @@
     }
   },
   "teamsStarterPlanInvLimitReachedNoManageBilling": {
-    "message": "Teams Starter plans may have up to $SEATCOUNT$ members. Contact your organization owner to upgrade your plan and invite more members.",
+    "message": "Teams Starter-planer kan ha upp till $SEATCOUNT$-medlemmar. Kontakta din organisationsägare för att uppgradera din plan och bjuda in fler medlemmar.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -8014,7 +8065,7 @@
     }
   },
   "freeOrgMaxCollectionReachedManageBilling": {
-    "message": "Free organizations may have up to $COLLECTIONCOUNT$ collections. Upgrade to a paid plan to add more collections.",
+    "message": "Fria organisationer kan ha upp till $COLLECTIONCOUNT$ samlingar. Uppgradera till en betald plan för att lägga till fler samlingar.",
     "placeholders": {
       "COLLECTIONCOUNT": {
         "content": "$1",
@@ -8023,7 +8074,7 @@
     }
   },
   "freeOrgMaxCollectionReachedNoManageBilling": {
-    "message": "Free organizations may have up to $COLLECTIONCOUNT$ collections. Contact your organization owner to upgrade.",
+    "message": "Fria organisationer kan ha upp till $COLLECTIONCOUNT$ samlingar. Kontakta din organisationsägare för att uppgradera.",
     "placeholders": {
       "COLLECTIONCOUNT": {
         "content": "$1",
@@ -8038,10 +8089,10 @@
     "message": "Exportera data"
   },
   "exportingOrganizationSecretDataTitle": {
-    "message": "Exporting Organization Secret Data"
+    "message": "Export av hemliga organisationsdata"
   },
   "exportingOrganizationSecretDataDescription": {
-    "message": "Only the Secrets Manager data associated with $ORGANIZATION$ will be exported. Items in other products or from other organizations will not be included.",
+    "message": "Endast de Secrets Manager-data som är associerade med $ORGANIZATION$ kommer att exporteras. Objekt i andra produkter eller från andra organisationer kommer inte att inkluderas.",
     "placeholders": {
       "ORGANIZATION": {
         "content": "$1",
@@ -8050,16 +8101,16 @@
     }
   },
   "fileUpload": {
-    "message": "File upload"
+    "message": "Ladda upp fil"
   },
   "upload": {
-    "message": "Upload"
+    "message": "Ladda upp"
   },
   "acceptedFormats": {
-    "message": "Accepted Formats:"
+    "message": "Godkända format:"
   },
   "copyPasteImportContents": {
-    "message": "Copy & paste import contents:"
+    "message": "Kopiera och klistra in importinnehållet:"
   },
   "or": {
     "message": "eller"
@@ -8074,7 +8125,7 @@
     "message": "Lås upp med huvudlösenord"
   },
   "licenseAndBillingManagement": {
-    "message": "License and billing management"
+    "message": "Licens- och faktureringshantering"
   },
   "automaticSync": {
     "message": "Automatisk synkronisering"
@@ -8083,28 +8134,28 @@
     "message": "Manuell uppladdning"
   },
   "manualBillingTokenUploadDesc": {
-    "message": "If you do not want to opt into billing sync, manually upload your license here. This will not automatically unlock Families sponsorships."
+    "message": "Om du inte vill välja fakturasynkronisering ska du ladda upp din licens manuellt här. Detta kommer inte automatiskt att låsa upp Families sponsring."
   },
   "syncLicense": {
     "message": "Synkronisera licens"
   },
   "licenseSyncSuccess": {
-    "message": "Successfully synced license"
+    "message": "Framgångsrik synkronisering av licens"
   },
   "licenseUploadSuccess": {
-    "message": "Successfully uploaded license"
+    "message": "Lyckades ladda upp licens"
   },
   "lastLicenseSync": {
-    "message": "Last license sync"
+    "message": "Senaste synkronisering av licens"
   },
   "billingSyncHelp": {
-    "message": "Billing Sync help"
+    "message": "Hjälp med faktureringssynkronisering"
   },
   "licensePaidFeaturesHelp": {
-    "message": "License paid features help"
+    "message": "Licensbetalda funktioner hjälp"
   },
   "selfHostGracePeriodHelp": {
-    "message": "After your subscription expires, you have 60 days to apply an updated license file to your organization. Grace period ends $GRACE_PERIOD_END_DATE$.",
+    "message": "Efter att din prenumeration har löpt ut har du 60 dagar på dig att tillämpa en uppdaterad licensfil på din organisation. Anståndsperioden slutar $GRACE_PERIOD_END_DATE$.",
     "placeholders": {
       "GRACE_PERIOD_END_DATE": {
         "content": "$1",
@@ -8116,7 +8167,7 @@
     "message": "Ladda upp licens"
   },
   "projectPeopleDescription": {
-    "message": "Grant groups or people access to this project."
+    "message": "Ge grupper eller personer tillgång till detta projekt."
   },
   "projectPeopleSelectHint": {
     "message": "Skriv eller välj personer eller grupper"
@@ -8140,31 +8191,31 @@
     "message": "Tilldela projekt till detta tjänstkonto. "
   },
   "serviceAccountEmptyProjectAccesspolicies": {
-    "message": "Add projects to grant access"
+    "message": "Lägg till projekt för att bevilja åtkomst"
   },
   "canReadWrite": {
-    "message": "Can read, write"
+    "message": "Kan läsa och skriva"
   },
   "groupSlashUser": {
     "message": "Grupp/Användare"
   },
   "lowKdfIterations": {
-    "message": "Low KDF Iterations"
+    "message": "Låga KDF-iterationer"
   },
   "updateLowKdfIterationsDesc": {
-    "message": "Update your encryption settings to meet new security recommendations and improve account protection."
+    "message": "Uppdatera dina krypteringsinställningar så att de uppfyller nya säkerhetsrekommendationer och förbättrar kontots skydd."
   },
   "kdfSettingsChangeLogoutWarning": {
-    "message": "Proceeding will log you out of all active sessions. You will need to log back in and complete two-step login, if any. We recommend exporting your vault before changing your encryption settings to prevent data loss."
+    "message": "Om du fortsätter loggas du ut från alla aktiva sessioner. Du måste logga in igen och genomföra tvåstegsinloggning, om sådan finns. Vi rekommenderar att du exporterar ditt valv innan du ändrar dina krypteringsinställningar för att förhindra dataförlust."
   },
   "secretsManager": {
     "message": "Secrets Manager"
   },
   "secretsManagerAccessDescription": {
-    "message": "Activate user access to Secrets Manager."
+    "message": "Aktivera användaråtkomst till Secrets Manager."
   },
   "userAccessSecretsManagerGA": {
-    "message": "This user can access Secrets Manager"
+    "message": "Denna användare har åtkomst till Secrets Manager"
   },
   "important": {
     "message": "Viktigt:"
@@ -8186,16 +8237,52 @@
     }
   },
   "resolveTheErrorsBelowAndTryAgain": {
-    "message": "Resolve the errors below and try again."
+    "message": "Åtgärda felen nedan och försök igen."
   },
   "description": {
     "message": "Beskrivning"
   },
   "errorReadingImportFile": {
-    "message": "An error occurred when trying to read the import file"
+    "message": "Ett fel uppstod när du försökte läsa importfilen"
+  },
+  "accessedSecretWithId": {
+    "message": "Åtkomst till en hemlighet med identifierare: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
   },
   "accessedSecret": {
-    "message": "Accessed secret $SECRET_ID$.",
+    "message": "Åtkomst till hemligheten $SECRET_ID$.",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "editedSecretWithId": {
+    "message": "Redigerade en hemlighet med identifierare: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Raderade en hemlighet med identifierare: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Skapade en ny hemlighet med identifierare: $SECRET_ID$",
     "placeholders": {
       "secret_id": {
         "content": "$1",
@@ -8224,7 +8311,7 @@
     "description": "Link to a downloadable resource. This will be used as part of a larger phrase. Example: Download the Secrets Manager CLI"
   },
   "smCLI": {
-    "message": "Secrets Manager CLI"
+    "message": "Hemlighetshanterare CLI"
   },
   "importSecrets": {
     "message": "Importera hemligheter"
@@ -8233,7 +8320,7 @@
     "message": "Kom igång"
   },
   "complete": {
-    "message": "$COMPLETED$/$TOTAL$ Complete",
+    "message": "$COMPLETED$/$TOTAL$ Komplett",
     "placeholders": {
       "COMPLETED": {
         "content": "$1",
@@ -8252,43 +8339,43 @@
     "message": "Återställ hemligheter"
   },
   "restoreSecretPrompt": {
-    "message": "Are you sure you want to restore this secret?"
+    "message": "Är du säker på att du vill återställa denna hemlighet?"
   },
   "restoreSecretsPrompt": {
     "message": "Är du säker på att du vill återställa dessa hemligheter?"
   },
   "secretRestoredSuccessToast": {
-    "message": "Secret restored"
+    "message": "Hemlig återställning"
   },
   "secretsRestoredSuccessToast": {
-    "message": "Secrets restored"
+    "message": "Hemligheter återställda"
   },
   "selectionIsRequired": {
-    "message": "Selection is required."
+    "message": "Urval krävs."
   },
   "saPeopleWarningTitle": {
     "message": "Åtkomsttoken fortfarande tillgängliga"
   },
   "saPeopleWarningMessage": {
-    "message": "Removing people from a service account does not remove the access tokens they created. For security best practice, it is recommended to revoke access tokens created by people removed from a service account."
+    "message": "Om du tar bort personer från ett servicekonto tas inte de åtkomsttokens som de skapade bort. Av säkerhetsskäl rekommenderar vi att du återkallar åtkomsttokens som skapats av personer som tagits bort från ett servicekonto."
   },
   "smAccessRemovalWarningProjectTitle": {
-    "message": "Remove access to this project"
+    "message": "Ta bort åtkomst till detta projekt"
   },
   "smAccessRemovalWarningProjectMessage": {
-    "message": "This action will remove your access to the project."
+    "message": "Denna åtgärd kommer att ta bort din tillgång till projektet."
   },
   "smAccessRemovalWarningSaTitle": {
-    "message": "Remove access to this service account"
+    "message": "Ta bort åtkomst till detta servicekonto"
   },
   "smAccessRemovalWarningSaMessage": {
-    "message": "This action will remove your access to the service account."
+    "message": "Denna åtgärd kommer att ta bort din tillgång till servicekontot."
   },
   "removeAccess": {
-    "message": "Remove access"
+    "message": "Ta bort åtkomst"
   },
   "checkForBreaches": {
-    "message": "Check known data breaches for this password"
+    "message": "Kontrollera kända dataintrång för detta lösenord"
   },
   "exposedMasterPassword": {
     "message": "Huvudlösenordet har exponerats"
@@ -8300,7 +8387,7 @@
     "message": "Svagt och exponerat huvudlösenord"
   },
   "weakAndBreachedMasterPasswordDesc": {
-    "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
+    "message": "Svagt lösenord identifierat och hittat i ett dataintrång. Använd ett starkt och unikt lösenord för att skydda ditt konto. Är du säker på att du vill använda det här lösenordet?"
   },
   "characterMinimum": {
     "message": "Minst $LENGTH$ tecken",
@@ -8321,28 +8408,28 @@
     }
   },
   "inputTrimValidator": {
-    "message": "Input must not contain only whitespace.",
+    "message": "Inmatningen får inte innehålla enbart blanksteg.",
     "description": "Notification to inform the user that a form's input can't contain only whitespace."
   },
   "dismiss": {
-    "message": "Dismiss"
+    "message": "Avfärda"
   },
   "notAvailableForFreeOrganization": {
-    "message": "This feature is not available for free organizations. Contact your organization owner to upgrade."
+    "message": "Den här funktionen är inte tillgänglig för kostnadsfria organisationer. Kontakta din organisationsägare för att uppgradera."
   },
   "smProjectSecretsNoItemsNoAccess": {
-    "message": "Contact your organization's admin to manage secrets for this project.",
+    "message": "Kontakta din organisations administratör för att hantera hemligheter för det här projektet.",
     "description": "The message shown to the user under a project's secrets tab when the user only has read access to the project."
   },
   "enforceOnLoginDesc": {
-    "message": "Require existing members to change their passwords"
+    "message": "Kräva att befintliga medlemmar ändrar sina lösenord"
   },
   "smProjectDeleteAccessRestricted": {
-    "message": "You don't have permissions to delete this project",
+    "message": "Du har inte behörighet att ta bort det här projektet",
     "description": "The individual description shown to the user when the user doesn't have access to delete a project."
   },
   "smProjectsDeleteBulkConfirmation": {
-    "message": "The following projects can not be deleted. Would you like to continue?",
+    "message": "Följande projekt kan inte tas bort. Vill du fortsätta?",
     "description": "The message shown to the user when bulk deleting projects and the user doesn't have access to some projects."
   },
   "updateKdfSettings": {
@@ -8352,69 +8439,75 @@
     "message": "Inloggning påbörjad"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Remember this device to make future logins seamless"
+    "message": "Kom ihåg den här enheten för att göra framtida inloggningar smidiga"
   },
   "deviceApprovalRequired": {
-    "message": "Device approval required. Select an approval option below:"
+    "message": "Godkännande av enhet krävs. Välj ett alternativ för godkännande nedan:"
   },
   "deviceApprovalRequiredV2": {
-    "message": "Device approval required"
+    "message": "Godkännande av utrustning krävs"
   },
   "selectAnApprovalOptionBelow": {
-    "message": "Select an approval option below"
+    "message": "Välj ett godkännandealternativ nedan"
   },
   "rememberThisDevice": {
     "message": "Kom ihåg denna enhet"
   },
   "uncheckIfPublicDevice": {
-    "message": "Uncheck if using a public device"
+    "message": "Avmarkera om du använder en offentlig enhet"
   },
   "approveFromYourOtherDevice": {
-    "message": "Approve from your other device"
+    "message": "Godkänn från din andra enhet"
   },
   "requestAdminApproval": {
-    "message": "Request admin approval"
+    "message": "Begär godkännande av administratör"
+  },
+  "unableToCompleteLogin": {
+    "message": "Det går inte att slutföra inloggningen"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Du måste logga in på en betrodd enhet eller be din administratör att tilldela dig ett lösenord."
   },
   "trustedDeviceEncryption": {
-    "message": "Trusted device encryption"
+    "message": "Kryptering av betrodd enhet"
   },
   "trustedDevices": {
     "message": "Betrodda enheter"
   },
   "memberDecryptionOptionTdeDescPart1": {
-    "message": "Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The",
+    "message": "Medlemmar behöver inte ett huvudlösenord när de loggar in med SSO. Huvudlösenordet ersätts med en krypteringsnyckel som lagras på enheten, vilket gör den enheten betrodd. Den första enheten som en medlem skapar sitt konto på och loggar in på kommer att vara betrodd. Nya enheter måste godkännas av en befintlig betrodd enhet eller av en administratör. Den",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescLink1": {
-    "message": "single organization",
+    "message": "enskild organisation",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescPart2": {
-    "message": "policy,",
+    "message": "politik,",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescLink2": {
-    "message": "SSO required",
+    "message": "SSO krävs",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescPart3": {
-    "message": "policy, and",
+    "message": "politik, och",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescLink3": {
-    "message": "account recovery administration",
+    "message": "administration av kontoåterställning",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "memberDecryptionOptionTdeDescPart4": {
-    "message": "policy will turn on when this option is used.",
+    "message": "kommer att aktiveras när detta alternativ används.",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "orgPermissionsUpdatedMustSetPassword": {
-    "message": "Your organization permissions were updated, requiring you to set a master password.",
+    "message": "Dina organisationsbehörigheter har uppdaterats och du måste ange ett huvudlösenord.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "orgRequiresYouToSetPassword": {
-    "message": "Your organization requires you to set a master password.",
+    "message": "Din organisation kräver att du anger ett huvudlösenord.",
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
@@ -8427,7 +8520,7 @@
     }
   },
   "notFound": {
-    "message": "$RESOURCE$ not found",
+    "message": "$RESOURCE$ hittades inte",
     "placeholders": {
       "resource": {
         "content": "$1",
@@ -8443,79 +8536,79 @@
     "message": "Återställ konto"
   },
   "updatedTempPassword": {
-    "message": "User updated a password issued through account recovery."
+    "message": "Användaren uppdaterade ett lösenord som utfärdats genom kontoåterställning."
   },
   "activatedAccessToSecretsManager": {
-    "message": "Activated access to Secrets Manager",
+    "message": "Aktiverad tillgång till Secrets Manager",
     "description": "Confirmation message that one or more users gained access to Secrets Manager"
   },
   "activateAccess": {
-    "message": "Activate access"
+    "message": "Aktivera åtkomst"
   },
   "bulkEnableSecretsManagerDescription": {
-    "message": "Grant the following members access to Secrets Manager. The role granted in the Password Manager will apply to Secrets Manager.",
+    "message": "Ge följande medlemmar tillgång till Secrets Manager. Den roll som beviljas i Password Manager kommer att gälla för Secrets Manager.",
     "description": "This description is shown to an admin when they are attempting to add more users to Secrets Manager."
   },
   "activateSecretsManager": {
-    "message": "Activate Secrets Manager"
+    "message": "Aktivera Secrets Manager"
   },
   "yourOrganizationsFingerprint": {
     "message": "Din organisations fingeravtrycksfras",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their organization's public key with another user, for the purposes of sharing."
   },
   "deviceApprovals": {
-    "message": "Device approvals"
+    "message": "Godkända enheter"
   },
   "deviceApprovalsDesc": {
-    "message": "Approve login requests below to allow the requesting member to finish logging in. Unapproved requests expire after 1 week. Verify the member’s information before approving."
+    "message": "Godkänn inloggningsbegäran nedan så att den begärande medlemmen kan slutföra inloggningen. Ogodkända förfrågningar upphör att gälla efter 1 vecka. Verifiera medlemmens information innan du godkänner."
   },
   "deviceInfo": {
-    "message": "Device info"
+    "message": "Information om enheten"
   },
   "time": {
     "message": "Tid"
   },
   "denyAllRequests": {
-    "message": "Deny all requests"
+    "message": "Avslå alla förfrågningar"
   },
   "denyRequest": {
-    "message": "Deny request"
+    "message": "Avvisa begäran"
   },
   "approveRequest": {
-    "message": "Approve request"
+    "message": "Godkänna begäran"
   },
   "deviceApproved": {
-    "message": "Device approved"
+    "message": "Godkänd enhet"
   },
   "deviceRemoved": {
-    "message": "Device removed"
+    "message": "Enhet borttagen"
   },
   "removeDevice": {
-    "message": "Remove device"
+    "message": "Ta bort enheten"
   },
   "removeDeviceConfirmation": {
-    "message": "Are you sure you want to remove this device?"
+    "message": "Är du säker på att du vill ta bort den här enheten?"
   },
   "noDeviceRequests": {
     "message": "Inga enhetsförfrågningar"
   },
   "noDeviceRequestsDesc": {
-    "message": "Member device approval requests will appear here"
+    "message": "Begäran om godkännande av medlemmars enheter kommer att visas här"
   },
   "loginRequestDenied": {
-    "message": "Login request denied"
+    "message": "Inloggningsbegäran nekad"
   },
   "allLoginRequestsDenied": {
-    "message": "All login requests denied"
+    "message": "Alla inloggningsbegäranden nekade"
   },
   "loginRequestApproved": {
-    "message": "Login request approved"
+    "message": "Inloggningsbegäran godkänd"
   },
   "removeOrgUserNoMasterPasswordTitle": {
-    "message": "Account does not have master password"
+    "message": "Kontot har inte något huvudlösenord"
   },
   "removeOrgUserNoMasterPasswordDesc": {
-    "message": "Removing $USER$ without setting a master password for them may restrict access to their full account. Are you sure you want to continue?",
+    "message": "Om du tar bort $USER$ utan att ange ett huvudlösenord för dem kan det begränsa åtkomsten till deras fullständiga konto. Är du säker på att du vill fortsätta?",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -8527,10 +8620,10 @@
     "message": "Inget huvudlösenord"
   },
   "removeMembersWithoutMasterPasswordWarning": {
-    "message": "Removing members who do not have master passwords without setting one for them may restrict access to their full account."
+    "message": "Om du tar bort medlemmar som inte har huvudlösenord utan att ange ett för dem kan det begränsa åtkomsten till deras fullständiga konto."
   },
   "approvedAuthRequest": {
-    "message": "Approved device for $ID$.",
+    "message": "Godkänd enhet för $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -8539,7 +8632,7 @@
     }
   },
   "rejectedAuthRequest": {
-    "message": "Denied device for $ID$.",
+    "message": "Nekad enhet för $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -8548,13 +8641,13 @@
     }
   },
   "requestedDeviceApproval": {
-    "message": "Requested device approval."
+    "message": "Begärde godkännande av enheten."
   },
   "tdeOffboardingPasswordSet": {
-    "message": "User set a master password during TDE offboarding."
+    "message": "Användaren ställde in ett huvudlösenord under TDE-offboarding."
   },
   "startYour7DayFreeTrialOfBitwardenFor": {
-    "message": "Start your 7-Day free trial of Bitwarden for $ORG$",
+    "message": "Starta din 7-dagars gratis provperiod av Bitwarden för $ORG$",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -8575,42 +8668,34 @@
     "message": "Nästa"
   },
   "ssoLoginIsRequired": {
-    "message": "SSO login is required"
+    "message": "SSO-inloggning krävs"
   },
   "selectedRegionFlag": {
-    "message": "Selected region flag"
+    "message": "Flagga för vald region"
   },
   "accountSuccessfullyCreated": {
     "message": "Ditt konto har skapats!"
   },
   "adminApprovalRequested": {
-    "message": "Admin approval requested"
+    "message": "Admin godkännande begärs"
   },
   "adminApprovalRequestSentToAdmins": {
-    "message": "Your request has been sent to your admin."
+    "message": "Din begäran har skickats till din administratör."
   },
   "troubleLoggingIn": {
     "message": "Problem med att logga in?"
   },
   "loginApproved": {
-    "message": "Login approved"
+    "message": "Inloggning godkänd"
   },
   "userEmailMissing": {
-    "message": "User email missing"
+    "message": "Användarens e-postadress saknas"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "E-postadressen för aktiv användare hittades inte. Loggar ut dig."
   },
   "deviceTrusted": {
-    "message": "Device trusted"
-  },
-  "sendsNoItemsTitle": {
-    "message": "Inga aktiva Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+    "message": "Enhet betrodd"
   },
   "inviteUsers": {
     "message": "Bjud in användare"
@@ -8625,19 +8710,19 @@
     }
   },
   "secretsManagerForPlanDesc": {
-    "message": "For engineering and DevOps teams to manage secrets throughout the software development lifecycle."
+    "message": "För teknik- och DevOps-team som hanterar hemligheter under hela livscykeln för programvaruutveckling."
   },
   "free2PersonOrganization": {
-    "message": "Free 2-person Organizations"
+    "message": "Gratis organisationer för 2 personer"
   },
   "unlimitedSecrets": {
-    "message": "Unlimited secrets"
+    "message": "Obegränsade hemligheter"
   },
   "unlimitedProjects": {
     "message": "Obegränsade projekt"
   },
   "projectsIncluded": {
-    "message": "$COUNT$ projects included",
+    "message": "$COUNT$ projekt som ingår",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -8646,7 +8731,7 @@
     }
   },
   "serviceAccountsIncluded": {
-    "message": "$COUNT$ service accounts included",
+    "message": "$COUNT$ servicekonton ingår",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -8655,7 +8740,7 @@
     }
   },
   "additionalServiceAccountCost": {
-    "message": "$COST$ per month for additional service accounts",
+    "message": "$COST$ per månad för ytterligare servicekonton",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -8667,13 +8752,13 @@
     "message": "Prenumerera på Secrets Manager"
   },
   "addSecretsManagerUpgradeDesc": {
-    "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan."
+    "message": "Lägg till Secrets Manager till din uppgraderade plan för att behålla åtkomsten till alla hemligheter som skapats med din tidigare plan."
   },
   "additionalServiceAccounts": {
-    "message": "Additional service accounts"
+    "message": "Ytterligare servicekonton"
   },
   "includedServiceAccounts": {
-    "message": "Your plan comes with $COUNT$ service accounts.",
+    "message": "Din plan levereras med $COUNT$ servicekonton.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -8682,7 +8767,7 @@
     }
   },
   "addAdditionalServiceAccounts": {
-    "message": "You can add additional service accounts for $COST$ per month.",
+    "message": "Du kan lägga till ytterligare servicekonton för $COST$ per månad.",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -8694,28 +8779,28 @@
     "message": "Samlingshantering"
   },
   "collectionManagementDesc": {
-    "message": "Manage the collection behavior for the organization"
+    "message": "Hantera insamlingsbeteendet för organisationen"
   },
   "limitCollectionCreationDesc": {
-    "message": "Limit collection creation to owners and admins"
+    "message": "Begränsa skapandet av samlingar till ägare och administratörer"
   },
   "limitCollectionDeletionDesc": {
-    "message": "Limit collection deletion to owners and admins"
+    "message": "Begränsa borttagning av samlingar till ägare och administratörer"
   },
   "limitItemDeletionDescription": {
-    "message": "Limit item deletion to members with the Manage collection permissions"
+    "message": "Begränsa borttagning av objekt till medlemmar med behörigheten Hantera samling"
   },
   "allowAdminAccessToAllCollectionItemsDesc": {
     "message": "Ägare och administratörer kan hantera alla samlingar och objekt"
   },
   "updatedCollectionManagement": {
-    "message": "Updated collection management setting"
+    "message": "Uppdaterad inställning för samlingshantering"
   },
   "passwordManagerPlanPrice": {
-    "message": "Password Manager plan price"
+    "message": "Pris för Password Manager-plan"
   },
   "secretsManagerPlanPrice": {
-    "message": "Secrets Manager plan price"
+    "message": "Pris för Secrets Manager-planen"
   },
   "passwordManager": {
     "message": "Lösenordshanterare"
@@ -8724,16 +8809,16 @@
     "message": "Gratis organisation"
   },
   "limitServiceAccounts": {
-    "message": "Limit service accounts (optional)"
+    "message": "Begränsa servicekonton (tillval)"
   },
   "limitServiceAccountsDesc": {
-    "message": "Set a limit for your service accounts. Once this limit is reached, you will not be able to create new service accounts."
+    "message": "Ange en gräns för dina servicekonton. När den här gränsen har nåtts kan du inte skapa nya servicekonton."
   },
   "serviceAccountLimit": {
-    "message": "Service account limit (optional)"
+    "message": "Gräns för servicekonto (valfritt)"
   },
   "maxServiceAccountCost": {
-    "message": "Max potential service account cost"
+    "message": "Max potentiell kostnad för servicekonto"
   },
   "loggedInExclamation": {
     "message": "Inloggad!"
@@ -8751,32 +8836,32 @@
     "message": "Server-URL"
   },
   "selfHostBaseUrl": {
-    "message": "Self-host server URL",
+    "message": "URL för server med egen värd",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "alreadyHaveAccount": {
     "message": "Har du redan ett konto?"
   },
   "toggleSideNavigation": {
-    "message": "Toggle side navigation"
+    "message": "Växla sidonavigering"
   },
   "skipToContent": {
-    "message": "Skip to content"
+    "message": "Hoppa till innehåll"
   },
   "managePermissionRequired": {
-    "message": "At least one member or group must have can manage permission."
+    "message": "Minst en medlem eller grupp måste ha behörigheten can manage."
   },
   "typePasskey": {
     "message": "Nyckel"
   },
   "passkeyNotCopied": {
-    "message": "Passkey will not be copied"
+    "message": "Nyckeln kommer inte att kopieras"
   },
   "passkeyNotCopiedAlert": {
-    "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
+    "message": "Nyckeln kommer inte att kopieras till det klonade föremålet. Vill du fortsätta klona det här objektet?"
   },
   "modifiedCollectionManagement": {
-    "message": "Modified collection management setting $ID$.",
+    "message": "Modifierad inställning för samlingshantering $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -8792,34 +8877,34 @@
     "message": "Installera webbläsartillägg"
   },
   "installBrowserExtensionDetails": {
-    "message": "Use the extension to quickly save logins and auto-fill forms without opening the web app."
+    "message": "Använd tillägget för att snabbt spara inloggningar och automatiskt fylla i formulär utan att öppna webbappen."
   },
   "projectAccessUpdated": {
-    "message": "Project access updated"
+    "message": "Uppdatering av projektåtkomst"
   },
   "unexpectedErrorSend": {
     "message": "Ett oväntat fel inträffade när denna Send laddades. Försök igen senare."
   },
   "seatLimitReached": {
-    "message": "Seat limit has been reached"
+    "message": "Platsgränsen har nåtts"
   },
   "contactYourProvider": {
-    "message": "Contact your provider to purchase additional seats."
+    "message": "Kontakta din leverantör för att köpa ytterligare platser."
   },
   "seatLimitReachedContactYourProvider": {
-    "message": "Seat limit has been reached. Contact your provider to purchase additional seats."
+    "message": "Gränsen för antal platser har nåtts. Kontakta din leverantör för att köpa ytterligare platser."
   },
   "collectionAccessRestricted": {
-    "message": "Collection access is restricted"
+    "message": "Tillgången till samlingen är begränsad"
   },
   "readOnlyCollectionAccess": {
-    "message": "You do not have access to manage this collection."
+    "message": "Du har inte tillgång till att hantera den här samlingen."
   },
   "grantManageCollectionWarningTitle": {
-    "message": "Missing Manage Collection Permissions"
+    "message": "Saknar behörigheter för hantering av samlingar"
   },
   "grantManageCollectionWarning": {
-    "message": "Grant Manage collection permissions to allow full collection management including deletion of collection."
+    "message": "Ge behörigheten Manage collection för att möjliggöra fullständig hantering av samlingen, inklusive borttagning av samlingen."
   },
   "grantCollectionAccess": {
     "message": "Ge grupper eller medlemmar tillgång till denna samling."
@@ -8831,12 +8916,36 @@
     "message": "Administratörer kan komma åt och hantera samlingar."
   },
   "serviceAccountAccessUpdated": {
-    "message": "Service account access updated"
+    "message": "Åtkomst till servicekonto uppdaterad"
   },
   "commonImportFormats": {
-    "message": "Common formats",
+    "message": "Vanliga format",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Detektering av URI-matchning är hur Bitwarden identifierar autofyllförslag.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Reguljär uttryck\" är ett avancerat alternativ med ökad risk för att röja inloggningsuppgifter.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Börjar med\" är ett avancerat alternativ med ökad risk för att röja inloggningsuppgifter.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Mer om matchdetektering",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Avancerade inställningar",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Varning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "För att behålla din prenumeration på $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -8852,23 +8961,23 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method'"
   },
   "organizationInformation": {
-    "message": "Organization information"
+    "message": "Företagsuppgifter"
   },
   "confirmationDetails": {
-    "message": "Confirmation details"
+    "message": "Bekräftelseuppgifter"
   },
   "smFreeTrialThankYou": {
-    "message": "Thank you for signing up for Bitwarden Secrets Manager!"
+    "message": "Tack för att du anmälde dig till Bitwarden Secrets Manager!"
   },
   "smFreeTrialConfirmationEmail": {
-    "message": "We've sent a confirmation email to your email at "
+    "message": "Vi har skickat ett bekräftelsemail till din e-postadress på"
   },
   "sorryToSeeYouGo": {
-    "message": "Sorry to see you go! Help improve Bitwarden by sharing why you're canceling.",
+    "message": "Ledsen att se dig gå! Hjälp till att förbättra Bitwarden genom att dela med dig av varför du avbokar.",
     "description": "A message shown to users as part of an offboarding survey asking them to provide more information on their subscription cancelation."
   },
   "selectCancellationReason": {
-    "message": "Select a reason for canceling",
+    "message": "Välj en orsak till avbeställningen",
     "description": "Used as a form field label for a select input on the offboarding survey."
   },
   "anyOtherFeedback": {
@@ -8876,19 +8985,19 @@
     "description": "Used as a form field label for a textarea input on the offboarding survey."
   },
   "missingFeatures": {
-    "message": "Missing features",
+    "message": "Saknade funktioner",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "movingToAnotherTool": {
-    "message": "Moving to another tool",
+    "message": "Flytta till ett annat verktyg",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "tooDifficultToUse": {
-    "message": "Too difficult to use",
+    "message": "För svårt att använda",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "notUsingEnough": {
-    "message": "Not using enough",
+    "message": "Använder inte tillräckligt",
     "description": "An option for the offboarding survey shown when a user cancels their subscription."
   },
   "tooExpensive": {
@@ -8902,16 +9011,16 @@
     "message": "Välkommen till den nya och förbättrade webbappen. Läs mer om vad som har förändrats."
   },
   "releaseBlog": {
-    "message": "Read release blog"
+    "message": "Läs release-blogg"
   },
   "adminConsole": {
-    "message": "Admin Console"
+    "message": "Adminkonsol"
   },
   "providerPortal": {
-    "message": "Provider Portal"
+    "message": "Portal för leverantörer"
   },
   "success": {
-    "message": "Success"
+    "message": "Lyckades"
   },
   "restrictedGroupAccess": {
     "message": "Du kan inte lägga till dig själv i grupper."
@@ -8926,13 +9035,13 @@
     "message": "Tilldela till samlingar"
   },
   "assignToTheseCollections": {
-    "message": "Assign to these collections"
+    "message": "Tilldela till dessa samlingar"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Only organization members with access to these collections will be able to see the item."
+    "message": "Endast organisationsmedlemmar med tillgång till dessa samlingar kan se objektet."
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Only organization members with access to these collections will be able to see the items."
+    "message": "Endast organisationsmedlemmar med tillgång till dessa samlingar kan se objekten."
   },
   "selectCollectionsToAssign": {
     "message": "Välj samlingar att tilldela"
@@ -8941,10 +9050,10 @@
     "message": "Inga samlingar har tilldelats"
   },
   "successfullyAssignedCollections": {
-    "message": "Successfully assigned collections"
+    "message": "Framgångsrikt tilldelade samlingar"
   },
   "bulkCollectionAssignmentWarning": {
-    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "message": "Du har valt $TOTAL_COUNT$ artiklar. Du kan inte uppdatera $READONLY_COUNT$ av objekten eftersom du inte har redigeringsbehörighet.",
     "placeholders": {
       "total_count": {
         "content": "$1",
@@ -8966,37 +9075,37 @@
     "message": "Objekt"
   },
   "assignedSeats": {
-    "message": "Assigned seats"
+    "message": "Tilldelade platser"
   },
   "assigned": {
-    "message": "Assigned"
+    "message": "Tilldelad"
   },
   "used": {
-    "message": "Used"
+    "message": "Använda"
   },
   "remaining": {
-    "message": "Remaining"
+    "message": "Återstående"
   },
   "unlinkOrganization": {
-    "message": "Unlink organization"
+    "message": "Koppla bort organisation"
   },
   "manageSeats": {
-    "message": "MANAGE SEATS"
+    "message": "HANTERA SÄTEN"
   },
   "manageSeatsDescription": {
-    "message": "Adjustments to seats will be reflected in the next billing cycle."
+    "message": "Justeringar av platser kommer att återspeglas i nästa faktureringscykel."
   },
   "unassignedSeatsDescription": {
-    "message": "Unassigned seats"
+    "message": "Ej tilldelade platser"
   },
   "purchaseSeatDescription": {
-    "message": "Additional seats purchased"
+    "message": "Ytterligare platser köpta"
   },
   "assignedSeatCannotUpdate": {
-    "message": "Assigned Seats can not be updated. Please contact your organization owner for assistance."
+    "message": "Tilldelade platser kan inte uppdateras. Vänligen kontakta din organisationsägare för hjälp."
   },
   "subscriptionUpdateFailed": {
-    "message": "Subscription update failed"
+    "message": "Uppdatering av prenumeration misslyckades"
   },
   "trial": {
     "message": "Provperiod",
@@ -9007,11 +9116,11 @@
     "description": "A subscription status label"
   },
   "subscriptionExpired": {
-    "message": "Subscription expired",
+    "message": "Bokdistribution har gått ut",
     "description": "The date header used when a subscription is past due."
   },
   "pastDueWarningForChargeAutomatically": {
-    "message": "You have a grace period of $DAYS$ days from your subscription expiration date to maintain your subscription. Please resolve the past due invoices by $SUSPENSION_DATE$.",
+    "message": "Du har en anståndsperiod på $DAYS$ dagar från prenumerationens utgångsdatum för att behålla din prenumeration. Vänligen lös de förfallna fakturorna senast $SUSPENSION_DATE$.",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -9025,7 +9134,7 @@
     "description": "A warning shown to the user when their subscription is past due and they are charged automatically."
   },
   "pastDueWarningForSendInvoice": {
-    "message": "You have a grace period of $DAYS$ days from the date your first unpaid invoice is due to maintain your subscription. Please resolve the past due invoices by $SUSPENSION_DATE$.",
+    "message": "Du har en anståndsperiod på $DAYS$ dagar från det datum då din första obetalda faktura förfaller till betalning för att behålla din prenumeration. Vänligen lös de förfallna fakturorna senast $SUSPENSION_DATE$.",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -9043,15 +9152,15 @@
     "description": "The header of a warning box shown to a user whose subscription is unpaid."
   },
   "toReactivateYourSubscription": {
-    "message": "To reactivate your subscription, please resolve the past due invoices.",
+    "message": "För att återaktivera din prenumeration, vänligen betala de förfallna fakturorna.",
     "description": "The body of a warning box shown to a user whose subscription is unpaid."
   },
   "cancellationDate": {
-    "message": "Cancellation date",
+    "message": "Datum för avbokning",
     "description": "The date header used when a subscription is cancelled."
   },
   "machineAccountsCannotCreate": {
-    "message": "Machine accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
+    "message": "Det går inte att skapa maskinkonton i avstängda organisationer. Kontakta din organisationsägare för att få hjälp."
   },
   "machineAccount": {
     "message": "Maskinkonto",
@@ -9066,11 +9175,11 @@
     "description": "Title for creating a new machine account."
   },
   "machineAccountsNoItemsMessage": {
-    "message": "Create a new machine account to get started automating secret access.",
+    "message": "Skapa ett nytt maskinkonto för att komma igång med att automatisera hemlig åtkomst.",
     "description": "Message to encourage the user to start creating machine accounts."
   },
   "machineAccountsNoItemsTitle": {
-    "message": "Nothing to show yet",
+    "message": "Inget att visa ännu",
     "description": "Title to indicate that there are no machine accounts to display."
   },
   "deleteMachineAccounts": {
@@ -9086,7 +9195,7 @@
     "description": "Action to view the details of a machine account."
   },
   "deleteMachineAccountDialogMessage": {
-    "message": "Deleting machine account $MACHINE_ACCOUNT$ is permanent and irreversible.",
+    "message": "Radering av maskinkontot $MACHINE_ACCOUNT$ är permanent och oåterkallelig.",
     "placeholders": {
       "machine_account": {
         "content": "$1",
@@ -9095,7 +9204,7 @@
     }
   },
   "deleteMachineAccountsDialogMessage": {
-    "message": "Deleting machine accounts is permanent and irreversible."
+    "message": "Radering av maskinkonton är permanent och oåterkallelig."
   },
   "deleteMachineAccountsConfirmMessage": {
     "message": "Radera $COUNT$ maskinkonton",
@@ -9107,13 +9216,13 @@
     }
   },
   "deleteMachineAccountToast": {
-    "message": "Machine account deleted"
+    "message": "Maskinkonto raderat"
   },
   "deleteMachineAccountsToast": {
-    "message": "Machine accounts deleted"
+    "message": "Maskinkonton raderade"
   },
   "searchMachineAccounts": {
-    "message": "Search machine accounts",
+    "message": "Konton för sökmaskiner",
     "description": "Placeholder text for searching machine accounts."
   },
   "editMachineAccount": {
@@ -9121,46 +9230,46 @@
     "description": "Title for editing a machine account."
   },
   "machineAccountName": {
-    "message": "Machine account name",
+    "message": "Maskinens kontonamn",
     "description": "Label for the name of a machine account"
   },
   "machineAccountCreated": {
-    "message": "Machine account created",
+    "message": "Maskinkonto skapat",
     "description": "Notifies that a new machine account has been created"
   },
   "machineAccountUpdated": {
-    "message": "Machine account updated",
+    "message": "Uppdatering av maskinkonto",
     "description": "Notifies that a machine account has been updated"
   },
   "projectMachineAccountsDescription": {
-    "message": "Grant machine accounts access to this project."
+    "message": "Ge maskinkonton tillgång till detta projekt."
   },
   "projectMachineAccountsSelectHint": {
-    "message": "Type or select machine accounts"
+    "message": "Skriv in eller välj maskinkonton"
   },
   "projectEmptyMachineAccountAccessPolicies": {
-    "message": "Add machine accounts to grant access"
+    "message": "Lägg till maskinkonton för att bevilja åtkomst"
   },
   "machineAccountPeopleDescription": {
-    "message": "Grant groups or people access to this machine account."
+    "message": "Ge grupper eller personer tillgång till detta maskinkonto."
   },
   "machineAccountProjectsDescription": {
-    "message": "Assign projects to this machine account. "
+    "message": "Tilldela projekt till detta maskinkonto."
   },
   "createMachineAccount": {
     "message": "Skapa ett maskinkonto"
   },
   "maPeopleWarningMessage": {
-    "message": "Removing people from a machine account does not remove the access tokens they created. For security best practice, it is recommended to revoke access tokens created by people removed from a machine account."
+    "message": "Om du tar bort personer från ett maskinkonto tas inte de åtkomsttokens som de skapade bort. Av säkerhetsskäl rekommenderas att du återkallar åtkomsttokens som skapats av personer som tagits bort från ett maskinkonto."
   },
   "smAccessRemovalWarningMaTitle": {
-    "message": "Remove access to this machine account"
+    "message": "Ta bort åtkomst till detta maskinkonto"
   },
   "smAccessRemovalWarningMaMessage": {
-    "message": "This action will remove your access to the machine account."
+    "message": "Denna åtgärd kommer att ta bort din tillgång till maskinkontot."
   },
   "machineAccountsIncluded": {
-    "message": "$COUNT$ machine accounts included",
+    "message": "$COUNT$ maskinkonton ingår",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9169,7 +9278,7 @@
     }
   },
   "additionalMachineAccountCost": {
-    "message": "$COST$ per month for additional machine accounts",
+    "message": "$COST$ per månad för ytterligare maskinkonton",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -9178,10 +9287,10 @@
     }
   },
   "additionalMachineAccounts": {
-    "message": "Additional machine accounts"
+    "message": "Ytterligare maskinkonton"
   },
   "includedMachineAccounts": {
-    "message": "Your plan comes with $COUNT$ machine accounts.",
+    "message": "Din plan levereras med $COUNT$ maskinkonton.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -9190,7 +9299,7 @@
     }
   },
   "addAdditionalMachineAccounts": {
-    "message": "You can add additional machine accounts for $COST$ per month.",
+    "message": "Du kan lägga till ytterligare maskinkonton för $COST$ per månad.",
     "placeholders": {
       "cost": {
         "content": "$1",
@@ -9199,19 +9308,19 @@
     }
   },
   "limitMachineAccounts": {
-    "message": "Limit machine accounts (optional)"
+    "message": "Begränsa maskinkonton (valfritt)"
   },
   "limitMachineAccountsDesc": {
-    "message": "Set a limit for your machine accounts. Once this limit is reached, you will not be able to create new machine accounts."
+    "message": "Ställ in en gräns för dina maskinkonton. När denna gräns har uppnåtts kan du inte skapa nya maskinkonton."
   },
   "machineAccountLimit": {
-    "message": "Machine account limit (optional)"
+    "message": "Gräns för maskinkonto (valfritt)"
   },
   "maxMachineAccountCost": {
-    "message": "Max potential machine account cost"
+    "message": "Max potentiell kostnad för maskinkonto"
   },
   "machineAccountAccessUpdated": {
-    "message": "Machine account access updated"
+    "message": "Uppdatering av åtkomst till maskinkonto"
   },
   "restrictedGroupAccessDesc": {
     "message": "Du kan inte lägga till dig själv i en grupp."
@@ -9220,10 +9329,10 @@
     "message": "Radera leverantör"
   },
   "deleteProviderConfirmation": {
-    "message": "Deleting a provider is permanent and irreversible. Enter your master password to confirm the deletion of the provider and all associated data."
+    "message": "Radering av en leverantör är permanent och oåterkallelig. Ange ditt huvudlösenord för att bekräfta borttagningen av leverantören och alla tillhörande data."
   },
   "deleteProviderName": {
-    "message": "Cannot delete $ID$",
+    "message": "Det går inte att ta bort $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9232,7 +9341,7 @@
     }
   },
   "deleteProviderWarningDescription": {
-    "message": "You must unlink all clients before you can delete $ID$.",
+    "message": "Du måste koppla bort alla klienter innan du kan ta bort $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9241,22 +9350,22 @@
     }
   },
   "providerDeleted": {
-    "message": "Provider deleted"
+    "message": "Leverantör borttagen"
   },
   "providerDeletedDesc": {
-    "message": "The Provider and all associated data has been deleted."
+    "message": "Leverantören och alla tillhörande uppgifter har raderats."
   },
   "deleteProviderRecoverConfirmDesc": {
-    "message": "You have requested to delete this Provider. Use the button below to confirm."
+    "message": "Du har begärt att få radera denna leverantör. Använd knappen nedan för att bekräfta."
   },
   "deleteProviderWarning": {
-    "message": "Deleting your provider is permanent. It cannot be undone."
+    "message": "Radering av din leverantör är permanent. Det går inte att ångra."
   },
   "errorAssigningTargetCollection": {
-    "message": "Error assigning target collection."
+    "message": "Fel vid tilldelning av målsamling."
   },
   "errorAssigningTargetFolder": {
-    "message": "Error assigning target folder."
+    "message": "Fel vid tilldelning av målmapp."
   },
   "integrationsAndSdks": {
     "message": "Integrationer och SDK:er",
@@ -9272,65 +9381,65 @@
     "message": "SDK:er"
   },
   "sdksDesc": {
-    "message": "Use Bitwarden Secrets Manager SDK in the following programming languages to build your own applications."
+    "message": "Använd Bitwarden Secrets Manager SDK i följande programmeringsspråk för att bygga dina egna applikationer."
   },
   "ssoDescStart": {
-    "message": "Configure",
+    "message": "Konfigurera",
     "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
   },
   "ssoDescEnd": {
-    "message": "for Bitwarden using the implementation guide for your Identity Provider.",
+    "message": "för Bitwarden med hjälp av implementeringsguiden för din Identity Provider.",
     "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
   },
   "userProvisioning": {
-    "message": "User provisioning"
+    "message": "Tillhandahållande av användare"
   },
   "scimIntegration": {
     "message": "SCIM"
   },
   "scimIntegrationDescStart": {
-    "message": "Configure ",
+    "message": "Konfigurera",
     "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
   },
   "scimIntegrationDescEnd": {
-    "message": "(System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider.",
+    "message": "(System for Cross-domain Identity Management) för att automatiskt tillhandahålla användare och grupper till Bitwarden med hjälp av implementeringsguiden för din Identity Provider.",
     "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
   },
   "bwdc": {
     "message": "Bitwarden Directory Connector"
   },
   "bwdcDesc": {
-    "message": "Configure Bitwarden Directory Connector to automatically provision users and groups using the implementation guide for your Identity Provider."
+    "message": "Konfigurera Bitwarden Directory Connector för automatisk provisionering av användare och grupper med hjälp av implementeringsguiden för din Identity Provider."
   },
   "eventManagement": {
-    "message": "Event management"
+    "message": "Eventhantering"
   },
   "eventManagementDesc": {
-    "message": "Integrate Bitwarden event logs with your SIEM (system information and event management) system by using the implementation guide for your platform."
+    "message": "Integrera Bitwardens händelseloggar med ditt SIEM-system (system information and event management) genom att använda implementeringsguiden för din plattform."
   },
   "deviceManagement": {
-    "message": "Device management"
+    "message": "Hantering av enheter"
   },
   "deviceManagementDesc": {
-    "message": "Configure device management for Bitwarden using the implementation guide for your platform."
+    "message": "Konfigurera enhetshanteringen för Bitwarden med hjälp av implementeringsguiden för din plattform."
   },
   "deviceIdMissing": {
-    "message": "Device ID is missing"
+    "message": "Enhetens ID saknas"
   },
   "deviceTypeMissing": {
-    "message": "Device type is missing"
+    "message": "Enhetstyp saknas"
   },
   "deviceCreationDateMissing": {
-    "message": "Device creation date is missing"
+    "message": "Datum för skapande av enhet saknas"
   },
   "desktopRequired": {
-    "message": "Desktop required"
+    "message": "Skrivbord krävs"
   },
   "reopenLinkOnDesktop": {
-    "message": "Reopen this link from your email on a desktop."
+    "message": "Öppna den här länken igen från ditt e-postmeddelande på ett skrivbord."
   },
   "integrationCardTooltip": {
-    "message": "Launch $INTEGRATION$ implementation guide.",
+    "message": "Starta implementeringsguiden för $INTEGRATION$.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9339,7 +9448,7 @@
     }
   },
   "smIntegrationTooltip": {
-    "message": "Set up $INTEGRATION$.",
+    "message": "Ställ in $INTEGRATION$.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9348,7 +9457,7 @@
     }
   },
   "smSdkTooltip": {
-    "message": "View $SDK$ repository",
+    "message": "Visa $SDK$-förvaret",
     "placeholders": {
       "sdk": {
         "content": "$1",
@@ -9357,7 +9466,7 @@
     }
   },
   "integrationCardAriaLabel": {
-    "message": "open $INTEGRATION$ implementation guide in a new tab.",
+    "message": "öppna $INTEGRATION$ implementeringsguide i en ny flik.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9366,7 +9475,7 @@
     }
   },
   "smSdkAriaLabel": {
-    "message": "view $SDK$ repository in a new tab.",
+    "message": "visa $SDK$ repository i en ny flik.",
     "placeholders": {
       "sdk": {
         "content": "$1",
@@ -9375,7 +9484,7 @@
     }
   },
   "smIntegrationCardAriaLabel": {
-    "message": "set up $INTEGRATION$ implementation guide in a new tab.",
+    "message": "konfigurera $INTEGRATION$ implementeringsguide i en ny flik.",
     "placeholders": {
       "integration": {
         "content": "$1",
@@ -9384,10 +9493,10 @@
     }
   },
   "createNewClientToManageAsProvider": {
-    "message": "Create a new client organization to manage as a Provider. Additional seats will be reflected in the next billing cycle."
+    "message": "Skapa en ny kundorganisation som du kan hantera som Provider. Ytterligare platser kommer att återspeglas i nästa faktureringscykel."
   },
   "selectAPlan": {
-    "message": "Select a plan"
+    "message": "Välj en plan"
   },
   "thirtyFivePercentDiscount": {
     "message": "35% rabatt"
@@ -9396,61 +9505,61 @@
     "message": "månad per medlem"
   },
   "monthPerMemberBilledAnnually": {
-    "message": "month per member billed annually"
+    "message": "månad per medlem faktureras årsvis"
   },
   "seats": {
-    "message": "Seats"
+    "message": "Platser"
   },
   "addOrganization": {
     "message": "Lägg till organisation"
   },
   "createdNewClient": {
-    "message": "Successfully created new client"
+    "message": "Framgångsrikt skapat ny klient"
   },
   "noAccess": {
-    "message": "No access"
+    "message": "Ingen åtkomst"
   },
   "collectionAdminConsoleManaged": {
-    "message": "This collection is only accessible from the admin console"
+    "message": "Denna samling är endast tillgänglig från adminkonsolen"
   },
   "organizationOptionsMenu": {
-    "message": "Toggle Organization Menu"
+    "message": "Toggle Organisation Meny"
   },
   "vaultItemSelect": {
-    "message": "Select vault item"
+    "message": "Välj valvobjekt"
   },
   "collectionItemSelect": {
-    "message": "Select collection item"
+    "message": "Välj kollektionsobjekt"
   },
   "manageBillingFromProviderPortalMessage": {
-    "message": "Manage billing from the Provider Portal"
+    "message": "Hantera fakturering från Provider Portal"
   },
   "continueSettingUp": {
-    "message": "Continue setting up Bitwarden"
+    "message": "Fortsätt att ställa i ordning Bitwarden"
   },
   "continueSettingUpFreeTrial": {
-    "message": "Continue setting up your free trial of Bitwarden"
+    "message": "Fortsätt att konfigurera din kostnadsfria testversion av Bitwarden"
   },
   "continueSettingUpPasswordManager": {
-    "message": "Continue setting up Bitwarden Password Manager"
+    "message": "Fortsätt konfigurera Bitwarden Password Manager"
   },
   "continueSettingUpFreeTrialPasswordManager": {
-    "message": "Continue setting up your free trial of Bitwarden Password Manager"
+    "message": "Fortsätt att konfigurera din kostnadsfria testversion av Bitwarden Password Manager"
   },
   "continueSettingUpSecretsManager": {
-    "message": "Continue setting up Bitwarden Secrets Manager"
+    "message": "Fortsätt konfigurera Bitwarden Secrets Manager"
   },
   "continueSettingUpFreeTrialSecretsManager": {
-    "message": "Continue setting up your free trial of Bitwarden Secrets Manager"
+    "message": "Fortsätt att konfigurera din kostnadsfria testversion av Bitwarden Secrets Manager"
   },
   "enterTeamsOrgInfo": {
-    "message": "Enter your Teams organization information"
+    "message": "Ange information om din Teams-organisation"
   },
   "enterFamiliesOrgInfo": {
-    "message": "Enter your Families organization information"
+    "message": "Ange information om din Families-organisation"
   },
   "enterEnterpriseOrgInfo": {
-    "message": "Enter your Enterprise organization information"
+    "message": "Ange information om din Enterprise-organisation"
   },
   "viewItemsIn": {
     "message": "Visa objekt i $NAME$",
@@ -9477,7 +9586,7 @@
     "description": "Button text to navigate back"
   },
   "removeItem": {
-    "message": "Remove $NAME$",
+    "message": "Ta bort $NAME$",
     "description": "Remove a selected option, such as a folder or collection",
     "placeholders": {
       "name": {
@@ -9487,31 +9596,31 @@
     }
   },
   "viewInfo": {
-    "message": "View info"
+    "message": "Visa information"
   },
   "viewAccess": {
-    "message": "View access"
+    "message": "Visa åtkomst"
   },
   "noCollectionsSelected": {
-    "message": "You have not selected any collections."
+    "message": "Du har inte valt några samlingar."
   },
   "updateName": {
     "message": "Uppdatera namn"
   },
   "updatedOrganizationName": {
-    "message": "Updated organization name"
+    "message": "Uppdaterat organisationsnamn"
   },
   "providerPlan": {
-    "message": "Managed Service Provider"
+    "message": "Leverantör av managed services"
   },
   "managedServiceProvider": {
-    "message": "Managed service provider"
+    "message": "Leverantör av managed services"
   },
   "multiOrganizationEnterprise": {
-    "message": "Multi-organization enterprise"
+    "message": "Företag med flera organisationer"
   },
   "orgSeats": {
-    "message": "Organization Seats"
+    "message": "Organisation Säten"
   },
   "providerDiscount": {
     "message": "$AMOUNT$% rabatt",
@@ -9523,7 +9632,7 @@
     }
   },
   "lowKDFIterationsBanner": {
-    "message": "Low KDF iterations. Increase your iterations to improve the security of your account."
+    "message": "Låga KDF-iterationer. Öka dina iterationer för att förbättra säkerheten för ditt konto."
   },
   "changeKDFSettings": {
     "message": "Ändra KDF-inställningar"
@@ -9535,16 +9644,16 @@
     "message": "Skydda din familj eller ditt företag"
   },
   "upgradeOrganizationCloseSecurityGaps": {
-    "message": "Close security gaps with monitoring reports"
+    "message": "Täta säkerhetsluckor med hjälp av övervakningsrapporter"
   },
   "upgradeOrganizationCloseSecurityGapsDesc": {
-    "message": "Stay ahead of security vulnerabilities by upgrading to a paid plan for enhanced monitoring."
+    "message": "Ligg steget före säkerhetsproblem genom att uppgradera till en betald plan för utökad övervakning."
   },
   "approveAllRequests": {
     "message": "Godkänn alla förfrågningar"
   },
   "allLoginRequestsApproved": {
-    "message": "All login requests approved"
+    "message": "Alla inloggningsförfrågningar godkända"
   },
   "payPal": {
     "message": "PayPal"
@@ -9553,41 +9662,41 @@
     "message": "Bitcoin"
   },
   "updatedTaxInformation": {
-    "message": "Updated tax information"
+    "message": "Uppdaterad skatteinformation"
   },
   "billingInvalidTaxIdError": {
-    "message": "Invalid tax ID, if you believe this is an error please contact support."
+    "message": "Ogiltigt skatte-ID, om du tror att detta är ett fel, vänligen kontakta support."
   },
   "billingTaxIdTypeInferenceError": {
-    "message": "We were unable to validate your tax ID, if you believe this is an error please contact support."
+    "message": "Vi kunde inte validera ditt skatte-ID, om du tror att detta är ett fel, vänligen kontakta support."
   },
   "billingPreviewInvalidTaxIdError": {
-    "message": "Invalid tax ID, if you believe this is an error please contact support."
+    "message": "Ogiltigt skatte-ID, om du tror att detta är ett fel, vänligen kontakta support."
   },
   "billingPreviewInvoiceError": {
-    "message": "An error occurred while previewing the invoice. Please try again later."
+    "message": "Ett fel inträffade vid förhandsgranskning av fakturan. Vänligen försök igen senare."
   },
   "unverified": {
-    "message": "Unverified"
+    "message": "Obekräftad"
   },
   "verified": {
-    "message": "Verified"
+    "message": "Verifierad"
   },
   "viewSecret": {
     "message": "Visa hemlighet"
   },
   "noClients": {
-    "message": "There are no clients to list"
+    "message": "Det finns inga kunder att räkna upp"
   },
   "providerBillingEmailHint": {
-    "message": "This email address will receive all invoices pertaining to this provider",
+    "message": "Den här e-postadressen kommer att få alla fakturor som gäller den här leverantören",
     "description": "A hint that shows up on the Provider setup page to inform the admin the billing email will receive the provider's invoices."
   },
   "upgradeOrganizationEnterprise": {
-    "message": "Identify security risks by auditing member access"
+    "message": "Identifiera säkerhetsrisker genom att granska medlemmarnas åtkomst"
   },
   "onlyAvailableForEnterpriseOrganization": {
-    "message": "Quickly view member access across the organization by upgrading to an Enterprise plan."
+    "message": "Visa snabbt medlemsåtkomst i hela organisationen genom att uppgradera till en Enterprise-plan."
   },
   "date": {
     "message": "Datum"
@@ -9599,46 +9708,46 @@
     "message": "Medlemsåtkomst"
   },
   "memberAccessReportDesc": {
-    "message": "Ensure members have access to the right credentials and their accounts are secure. Use this report to obtain a CSV of member access and account configurations."
+    "message": "Se till att medlemmarna har tillgång till rätt inloggningsuppgifter och att deras konton är säkra. Använd den här rapporten för att få en CSV-fil med medlemsåtkomst och kontokonfigurationer."
   },
   "memberAccessReportPageDesc": {
-    "message": "Audit organization member access across groups, collections, and collection items. The CSV export provides a detailed breakdown per member, including information on collection permissions and account configurations."
+    "message": "Granska organisationsmedlemmars åtkomst i grupper, samlingar och samlingsobjekt. CSV-exporten ger en detaljerad uppdelning per medlem, inklusive information om samlingsbehörigheter och kontokonfigurationer."
   },
   "memberAccessReportNoCollection": {
     "message": "(Ingen samling)"
   },
   "memberAccessReportNoCollectionPermission": {
-    "message": "(No Collection Permission)"
+    "message": "(Inget tillstånd för insamling)"
   },
   "memberAccessReportNoGroup": {
     "message": "(Ingen grupp)"
   },
   "memberAccessReportTwoFactorEnabledTrue": {
-    "message": "On"
+    "message": "På"
   },
   "memberAccessReportTwoFactorEnabledFalse": {
-    "message": "Off"
+    "message": "Av"
   },
   "memberAccessReportAuthenticationEnabledTrue": {
-    "message": "On"
+    "message": "På"
   },
   "memberAccessReportAuthenticationEnabledFalse": {
-    "message": "Off"
+    "message": "Av"
   },
   "higherKDFIterations": {
-    "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker."
+    "message": "Högre KDF-iterationer kan hjälpa till att skydda ditt huvudlösenord från att bli brute forced av en angripare."
   },
   "incrementsOf100,000": {
-    "message": "increments of 100,000"
+    "message": "steg om 100.000"
   },
   "smallIncrements": {
-    "message": "small increments"
+    "message": "små steg"
   },
   "kdfIterationRecommends": {
     "message": "Vi rekommenderar 600.000 eller mer"
   },
   "kdfToHighWarningIncreaseInIncrements": {
-    "message": "For older devices, setting your KDF too high may lead to performance issues. Increase the value in $VALUE$ and test your devices.",
+    "message": "För äldre enheter kan det leda till prestandaproblem om du ställer in KDF för högt. Öka värdet i $VALUE$ och testa dina enheter.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -9647,31 +9756,31 @@
     }
   },
   "providerReinstate": {
-    "message": " Contact Customer Support to reinstate your subscription."
+    "message": " Kontakta kundtjänst för att återupprätta din prenumeration."
   },
   "secretPeopleDescription": {
-    "message": "Grant groups or people access to this secret. Permissions set for people will override permissions set by groups."
+    "message": "Ge grupper eller personer tillgång till denna hemlighet. Behörigheter som anges för personer kommer att åsidosätta behörigheter som anges av grupper."
   },
   "secretPeopleEmptyMessage": {
-    "message": "Add people or groups to share access to this secret"
+    "message": "Lägg till personer eller grupper som ska dela åtkomst till denna hemlighet"
   },
   "secretMachineAccountsDescription": {
-    "message": "Grant machine accounts access to this secret."
+    "message": "Ge maskinkonton tillgång till denna hemlighet."
   },
   "secretMachineAccountsEmptyMessage": {
-    "message": "Add machine accounts to grant access to this secret"
+    "message": "Lägg till maskinkonton för att ge åtkomst till denna hemlighet"
   },
   "smAccessRemovalWarningSecretTitle": {
-    "message": "Remove access to this secret"
+    "message": "Ta bort åtkomst till denna hemlighet"
   },
   "smAccessRemovalSecretMessage": {
-    "message": "This action will remove your access to this secret."
+    "message": "Denna åtgärd kommer att ta bort din tillgång till denna hemlighet."
   },
   "invoice": {
     "message": "Faktura"
   },
   "unassignedSeatsAvailable": {
-    "message": "You have $SEATS$ unassigned seats available.",
+    "message": "Du har $SEATS$ icke tilldelade platser tillgängliga.",
     "placeholders": {
       "seats": {
         "content": "$1",
@@ -9681,49 +9790,49 @@
     "description": "A message showing how many unassigned seats are available for a provider."
   },
   "contactYourProviderForAdditionalSeats": {
-    "message": "Contact your provider admin to purchase additional seats."
+    "message": "Kontakta din leverantörsadministratör för att köpa ytterligare platser."
   },
   "open": {
     "message": "Öppen",
     "description": "The status of an invoice."
   },
   "uncollectible": {
-    "message": "Uncollectible",
+    "message": "Ej indrivningsbara",
     "description": "The status of an invoice."
   },
   "clientDetails": {
-    "message": "Client details"
+    "message": "Information om klienten"
   },
   "downloadCSV": {
     "message": "Ladda ner CSV"
   },
   "monthlySubscriptionUserSeatsMessage": {
-    "message": "Adjustments to your subscription will result in prorated charges to your billing totals on your next billing period. "
+    "message": "Justeringar av din prenumeration kommer att resultera i proportionella debiteringar av dina faktureringssummor på din nästa faktureringsperiod."
   },
   "annualSubscriptionUserSeatsMessage": {
-    "message": "Adjustments to your subscription will result in prorated charges on a monthly billing cycle. "
+    "message": "Justeringar av din prenumeration kommer att resultera i proportionella avgifter på en månatlig faktureringscykel."
   },
   "billingHistoryDescription": {
-    "message": "Download a CSV to obtain client details for each billing date. Prorated charges are not included in the CSV and may vary from the linked invoice. For the most accurate billing details, refer to your monthly invoices.",
+    "message": "Ladda ner en CSV-fil för att få fram klientuppgifter för varje faktureringsdatum. Proraterade avgifter ingår inte i CSV-filen och kan skilja sig från den länkade fakturan. De mest exakta faktureringsuppgifterna hittar du på dina månadsfakturor.",
     "description": "A paragraph on the Billing History page of the Provider Portal letting users know they can download a CSV report for their invoices that does not include prorations."
   },
   "noInvoicesToList": {
-    "message": "There are no invoices to list",
+    "message": "Det finns inga fakturor att lista",
     "description": "A paragraph on the Billing History page of the Provider Portal letting users know they can download a CSV report for their invoices that does not include prorations."
   },
   "providerClientVaultPrivacyNotification": {
-    "message": "Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions,",
+    "message": "Meddelande: Senare denna månad kommer sekretessen i kundvalvet att förbättras och leverantörsmedlemmar kommer inte längre att ha direkt tillgång till kundvalvets objekt. För frågor,",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions, please contact Bitwarden support'."
   },
   "contactBitwardenSupport": {
-    "message": "contact Bitwarden support.",
+    "message": "kontakt Bitwarden support.",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions, please contact Bitwarden support'. 'Bitwarden' should not be translated"
   },
   "sponsored": {
-    "message": "Sponsored"
+    "message": "Sponsrad"
   },
   "licenseAndBillingManagementDesc": {
-    "message": "After making updates in the Bitwarden cloud server, upload your license file to apply the most recent changes."
+    "message": "När du har gjort uppdateringar i Bitwardens molnserver laddar du upp din licensfil för att tillämpa de senaste ändringarna."
   },
   "addToFolder": {
     "message": "Lägg till i mapp"
@@ -9732,10 +9841,10 @@
     "message": "Välj mapp"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+    "message": "1 objekt kommer att permanent överföras till den valda organisationen. Du kommer inte längre att äga detta objekt."
   },
   "personalItemsTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ objekt kommer att överföras permanent till den valda organisationen. Du kommer inte längre att äga dessa objekt.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -9744,7 +9853,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "message": "1 objekt kommer att överföras permanent till $ORG$. Du kommer inte längre att äga det här objektet.",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -9753,7 +9862,7 @@
     }
   },
   "personalItemsWithOrgTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ objekt kommer att överföras permanent till $ORG$. Du kommer inte längre att äga dessa objekt.",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -9769,7 +9878,7 @@
     "message": "Data"
   },
   "purchasedSeatsRemoved": {
-    "message": "purchased seats removed"
+    "message": "köpta säten borttagna"
   },
   "environmentVariables": {
     "message": "Miljövariabler"
@@ -9778,52 +9887,52 @@
     "message": "Organisations-ID"
   },
   "projectIds": {
-    "message": "Project IDs"
+    "message": "Projekt-ID"
   },
   "projectId": {
     "message": "Projekt-ID"
   },
   "projectsAccessedByMachineAccount": {
-    "message": "The following projects can be accessed by this machine account."
+    "message": "Följande projekt kan nås med detta maskinkonto."
   },
   "config": {
-    "message": "Config"
+    "message": "Konfig"
   },
   "learnMoreAboutEmergencyAccess": {
     "message": "Läs mer om nödåtkomst"
   },
   "learnMoreAboutMatchDetection": {
-    "message": "Learn more about match detection"
+    "message": "Läs mer om matchningsdetektering"
   },
   "learnMoreAboutMasterPasswordReprompt": {
-    "message": "Learn more about master password re-prompt"
+    "message": "Läs mer om omprövning av huvudlösenord"
   },
   "learnMoreAboutSearchingYourVault": {
-    "message": "Learn more about searching your vault"
+    "message": "Läs mer om hur du söker i ditt valv"
   },
   "learnMoreAboutYourAccountFingerprintPhrase": {
-    "message": "Learn about your account fingerprint phrase"
+    "message": "Läs mer om ditt kontos fingeravtryck"
   },
   "impactOfRotatingYourEncryptionKey": {
-    "message": "Impact of rotating your encryption key"
+    "message": "Effekten av att rotera din krypteringsnyckel"
   },
   "learnMoreAboutEncryptionAlgorithms": {
     "message": "Läs mer om krypteringsalgoritmer"
   },
   "learnMoreAboutKDFIterations": {
-    "message": "Learn more about KDF iterations"
+    "message": "Läs mer om KDF-iterationer"
   },
   "learnMoreAboutLocalization": {
     "message": "Läs mer om lokalisering"
   },
   "learnMoreAboutWebsiteIcons": {
-    "message": "Learn more about using website icons"
+    "message": "Läs mer om hur du använder webbplatsikoner"
   },
   "learnMoreAboutUserAccess": {
     "message": "Läs mer om användaråtkomst"
   },
   "learnMoreAboutMemberRoles": {
-    "message": "Learn more about member roles and permissions"
+    "message": "Läs mer om medlemsroller och behörigheter"
   },
   "whatIsACvvNumber": {
     "message": "Vad är ett CVV-nummer?"
@@ -9832,16 +9941,16 @@
     "message": "Läs mer om Bitwardens API"
   },
   "fileSend": {
-    "message": "File Send"
+    "message": "Skicka fil"
   },
   "fileSends": {
-    "message": "File Sends"
+    "message": "Skicka filer"
   },
   "textSend": {
-    "message": "Text Send"
+    "message": "Skicka text"
   },
   "textSends": {
-    "message": "Text Sends"
+    "message": "Text skickas"
   },
   "includesXMembers": {
     "message": "för $COUNT$ medlem",
@@ -9862,10 +9971,10 @@
     }
   },
   "optionalOnPremHosting": {
-    "message": "Optional on-premises hosting"
+    "message": "Valfri lokal hosting"
   },
   "upgradeFreeOrganization": {
-    "message": "Upgrade your $NAME$ organization ",
+    "message": "Uppgradera din $NAME$-organisation",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -9877,7 +9986,7 @@
     "message": "SSO-autentisering"
   },
   "familiesPlanInvLimitReachedManageBilling": {
-    "message": "Families organizations may have up to $SEATCOUNT$ members. Upgrade to a paid plan to invite more members.",
+    "message": "Familjeorganisationer kan ha upp till $SEATCOUNT$-medlemmar. Uppgradera till en betald plan för att bjuda in fler medlemmar.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -9886,7 +9995,7 @@
     }
   },
   "familiesPlanInvLimitReachedNoManageBilling": {
-    "message": "Families organizations may have up to $SEATCOUNT$ members. Contact your organization owner to upgrade.",
+    "message": "Familjeorganisationer kan ha upp till $SEATCOUNT$ medlemmar. Kontakta din organisationsägare för att uppgradera.",
     "placeholders": {
       "seatcount": {
         "content": "$1",
@@ -9895,7 +10004,7 @@
     }
   },
   "upgradePlans": {
-    "message": "Upgrade your plan to invite members and experience powerful security features."
+    "message": "Uppgradera din plan för att bjuda in medlemmar och få tillgång till kraftfulla säkerhetsfunktioner."
   },
   "upgradeDiscount": {
     "message": "Spara $AMOUNT$%",
@@ -9907,19 +10016,19 @@
     }
   },
   "enterprisePlanUpgradeMessage": {
-    "message": "Advanced capabilities for larger organizations"
+    "message": "Avancerade funktioner för större organisationer"
   },
   "teamsPlanUpgradeMessage": {
-    "message": "Resilient protection for growing teams"
+    "message": "Motståndskraftigt skydd för växande team"
   },
   "teamsInviteMessage": {
-    "message": "Invite unlimited members"
+    "message": "Bjud in obegränsat antal medlemmar"
   },
   "accessToCreateGroups": {
-    "message": "Access to create groups"
+    "message": "Tillgång till att skapa grupper"
   },
   "syncGroupsAndUsersFromDirectory": {
-    "message": "Sync groups and users from a directory"
+    "message": "Synka grupper och användare från en katalog"
   },
   "familyPlanUpgradeMessage": {
     "message": "Säkra dina familjeinloggningar"
@@ -9928,19 +10037,19 @@
     "message": "Tillgång till Premium-funktioner"
   },
   "additionalStorageGbMessage": {
-    "message": "GB additional storage"
+    "message": "GB extra lagringsutrymme"
   },
   "sshKeyAlgorithm": {
     "message": "Nyckelalgoritm"
   },
   "sshPrivateKey": {
-    "message": "Private key"
+    "message": "Privat nyckel"
   },
   "sshPublicKey": {
-    "message": "Public key"
+    "message": "Publik nyckel"
   },
   "sshFingerprint": {
-    "message": "Fingerprint"
+    "message": "Fingeravtryck"
   },
   "sshKeyFingerprint": {
     "message": "Fingeravtryck"
@@ -9964,7 +10073,7 @@
     "message": "RSA 4096-Bit"
   },
   "premiumAccounts": {
-    "message": "6 premium accounts"
+    "message": "6 premiumkonton"
   },
   "unlimitedSharing": {
     "message": "Obegränsad delning"
@@ -9976,10 +10085,10 @@
     "message": "Säker datadelning"
   },
   "eventLogMonitoring": {
-    "message": "Event log monitoring"
+    "message": "Övervakning av händelselogg"
   },
   "directoryIntegration": {
-    "message": "Directory integration"
+    "message": "Integration av kataloger"
   },
   "passwordLessSso": {
     "message": "PasswordLess SSO"
@@ -9991,7 +10100,7 @@
     "message": "Anpassade roller"
   },
   "unlimitedSecretsStorage": {
-    "message": "Unlimited secrets storage"
+    "message": "Obegränsad lagring av hemligheter"
   },
   "unlimitedUsers": {
     "message": "Obegränsat antal användare"
@@ -10003,22 +10112,22 @@
     "message": "Upp till 20 maskinkonton"
   },
   "current": {
-    "message": "Current"
+    "message": "Nuvarande"
   },
   "secretsManagerSubscriptionInfo": {
-    "message": "Your Secrets Manager subscription will upgrade based on the plan selected"
+    "message": "Din prenumeration på Secrets Manager kommer att uppgraderas baserat på den valda planen"
   },
   "bitwardenPasswordManager": {
     "message": "Bitwarden Lösenordshanterare"
   },
   "secretsManagerComplimentaryPasswordManager": {
-    "message": "Your complimentary one year Password Manager subscription will upgrade to the selected plan. You will not be charged until the complimentary period is over."
+    "message": "Din kostnadsfria ettåriga prenumeration på Password Manager kommer att uppgraderas till den valda planen. Du kommer inte att debiteras förrän den kostnadsfria perioden är över."
   },
   "fileSavedToDevice": {
-    "message": "File saved to device. Manage from your device downloads."
+    "message": "Fil sparad till enhet. Hantera nedladdningar från din enhet."
   },
   "publicApi": {
-    "message": "Public API",
+    "message": "Offentligt API",
     "description": "The text, 'API', is an acronym and should not be translated."
   },
   "showCharacterCount": {
@@ -10037,13 +10146,13 @@
     "message": "Använd dolda fält för känslig data, som t. ex. ett lösenord"
   },
   "checkBoxHelpText": {
-    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+    "message": "Använd kryssrutor om du vill fylla i en kryssruta i ett formulär automatiskt, t.ex. för att komma ihåg e-post"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "Använd ett länkat fält när du har problem med autofyll för en viss webbplats."
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "Ange fältets html-id, namn, aria-label eller platshållare."
   },
   "uppercaseDescription": {
     "message": "Inkludera versaler",
@@ -10080,23 +10189,23 @@
     "message": "Maximal filstorlek är 500 MB"
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "Är du säker på att du vill radera den här bilagan permanent?"
   },
   "manageSubscriptionFromThe": {
-    "message": "Manage subscription from the",
+    "message": "Hantera prenumeration från",
     "description": "This represents the beginning of a sentence. The full sentence will be 'Manage subscription from the Provider Portal', but 'Provider Portal' will be a link and thus cannot be included in the translation file."
   },
   "toHostBitwardenOnYourOwnServer": {
-    "message": "To host Bitwarden on your own server, you will need to upload your license file. To support Free Families plans and advanced billing capabilities for your self-hosted organization, you will need to set up automatic sync in your self-hosted organization."
+    "message": "Om du vill vara värd för Bitwarden på din egen server måste du ladda upp din licensfil. För att stödja Free Families-planer och avancerade faktureringsfunktioner för din egenhostade organisation måste du ställa in automatisk synkronisering i din egenhostade organisation."
   },
   "selfHostingTitleProper": {
-    "message": "Self-Hosting"
+    "message": "Självhosting"
   },
   "claim-domain-single-org-warning": {
-    "message": "Claiming a domain will turn on the single organization policy."
+    "message": "När du gör anspråk på en domän aktiveras principen för en enda organisation."
   },
   "single-org-revoked-user-warning": {
-    "message": "Non-compliant members will be revoked. Administrators can restore members once they leave all other organizations."
+    "message": "Medlemmar som inte uppfyller kraven kommer att återkallas. Administratörer kan återställa medlemmar när de lämnar alla andra organisationer."
   },
   "deleteOrganizationUser": {
     "message": "Radera $NAME$",
@@ -10109,7 +10218,7 @@
     }
   },
   "deleteOrganizationUserWarningDesc": {
-    "message": "This will permanently delete all items owned by $NAME$. Collection items are not impacted.",
+    "message": "Detta kommer att permanent radera alla objekt som ägs av $NAME$. Samlingsobjekt påverkas inte.",
     "description": "Warning description for the delete organization user dialog",
     "placeholders": {
       "name": {
@@ -10119,11 +10228,11 @@
     }
   },
   "deleteManyOrganizationUsersWarningDesc": {
-    "message": "This will permanently delete all items owned by the following members. Collection items are not impacted.",
+    "message": "Detta kommer att permanent radera alla objekt som ägs av följande medlemmar. Samlingsobjekt påverkas inte.",
     "description": "Warning description for the bulk delete organization users dialog"
   },
   "organizationUserDeleted": {
-    "message": "Deleted $NAME$",
+    "message": "Raderad $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -10132,10 +10241,10 @@
     }
   },
   "organizationUserDeletedDesc": {
-    "message": "The user was removed from the organization and all associated user data has been deleted."
+    "message": "Användaren har tagits bort från organisationen och alla tillhörande användardata har raderats."
   },
   "deletedUserId": {
-    "message": "Deleted user $ID$ - an owner / admin deleted the user account",
+    "message": "Borttagen användare $ID$ - en ägare/administratör har tagit bort användarkontot",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -10144,7 +10253,7 @@
     }
   },
   "userLeftOrganization": {
-    "message": "User $ID$ left organization",
+    "message": "Användaren $ID$ lämnade organisationen",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -10153,7 +10262,7 @@
     }
   },
   "suspendedOrganizationTitle": {
-    "message": "The $ORGANIZATION$ is suspended",
+    "message": "$ORGANIZATION$ är avstängd",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -10162,10 +10271,10 @@
     }
   },
   "suspendedUserOrgMessage": {
-    "message": "Contact your organization owner for assistance."
+    "message": "Kontakta din organisationsägare för att få hjälp."
   },
   "suspendedOwnerOrgMessage": {
-    "message": "To regain access to your organization, add a payment method."
+    "message": "Lägg till en betalningsmetod för att återfå åtkomst till din organisation."
   },
   "deleteMembers": {
     "message": "Radera medlemmar"
@@ -10174,25 +10283,25 @@
     "message": "Denna åtgärd är inte tillämplig på någon av de valda medlemmarna."
   },
   "deletedSuccessfully": {
-    "message": "Deleted successfully"
+    "message": "Raderad framgångsrikt"
   },
   "freeFamiliesSponsorship": {
-    "message": "Remove Free Bitwarden Families sponsorship"
+    "message": "Ta bort Free Bitwarden Families sponsring"
   },
   "freeFamiliesSponsorshipPolicyDesc": {
-    "message": "Do not allow members to redeem a Families plan through this organization."
+    "message": "Tillåt inte medlemmar att lösa in en Families-plan via denna organisation."
   },
   "verifyBankAccountWithStatementDescriptorWarning": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the organization's billing page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "Betalning med bankkonto är endast tillgänglig för kunder i USA. Du kommer att bli ombedd att verifiera ditt bankkonto. Vi kommer att göra en mikroinsättning inom de närmaste 1-2 bankdagarna. Ange koden för kontoutdraget från den här insättningen på organisationens faktureringssida för att verifiera bankkontot. Om du inte verifierar bankkontot kommer det att resultera i en missad betalning och din prenumeration kommer att stängas av."
   },
   "verifyBankAccountWithStatementDescriptorInstructions": {
-    "message": "We have made a micro-deposit to your bank account (this may take 1-2 business days). Enter the six-digit code starting with 'SM' found on the deposit description. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "Vi har gjort en mikroinsättning till ditt bankkonto (detta kan ta 1-2 bankdagar). Ange den sexsiffriga koden som börjar med \"SM\" som finns i beskrivningen av insättningen. Om du inte verifierar bankkontot kommer det att leda till en missad betalning och att din prenumeration stängs av."
   },
   "descriptorCode": {
-    "message": "Descriptor code"
+    "message": "Deskriptor kod"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "Du kan inte ta bort samlingar med behörigheten Visa endast: $COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -10201,37 +10310,37 @@
     }
   },
   "removeMembers": {
-    "message": "Remove members"
+    "message": "Ta bort medlemmar"
   },
   "devices": {
-    "message": "Devices"
+    "message": "Enheter"
   },
   "deviceListDescription": {
-    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+    "message": "Ditt konto var inloggat på var och en av enheterna nedan. Om du inte känner igen en enhet, ta bort den nu."
   },
   "deviceListDescriptionTemp": {
-    "message": "Your account was logged in to each of the devices below."
+    "message": "Ditt konto var inloggat på var och en av enheterna nedan."
   },
   "claimedDomains": {
-    "message": "Claimed domains"
+    "message": "Domäner med anspråk"
   },
   "claimDomain": {
-    "message": "Claim domain"
+    "message": "Domän för anspråk"
   },
   "reclaimDomain": {
-    "message": "Reclaim domain"
+    "message": "Återkräva domän"
   },
   "claimDomainNameInputHint": {
-    "message": "Example: mydomain.com. Subdomains require separate entries to be claimed."
+    "message": "Exempel: mydomain.com. Underdomäner kräver separata poster för att hävdas."
   },
   "automaticClaimedDomains": {
-    "message": "Automatic Claimed Domains"
+    "message": "Automatiskt hävdade domäner"
   },
   "automaticDomainClaimProcess": {
-    "message": "Bitwarden will attempt to claim the domain 3 times during the first 72 hours. If the domain can’t be claimed, check the DNS record in your host and manually claim. The domain will be removed from your organization in 7 days if it is not claimed."
+    "message": "Bitwarden kommer att försöka göra anspråk på domänen 3 gånger under de första 72 timmarna. Om domänen inte kan göras anspråk på, kontrollera DNS-posten i din host och gör anspråk manuellt. Domänen kommer att tas bort från din organisation inom 7 dagar om den inte görs anspråk på."
   },
   "domainNotClaimed": {
-    "message": "$DOMAIN$ not claimed. Check your DNS records.",
+    "message": "$DOMAIN$ inte hävdad. Kontrollera dina DNS-poster.",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10240,19 +10349,19 @@
     }
   },
   "domainStatusClaimed": {
-    "message": "Claimed"
+    "message": "Ägd"
   },
   "domainStatusUnderVerification": {
-    "message": "Under verification"
+    "message": "Under verifiering"
   },
   "claimedDomainsDesc": {
-    "message": "Claim a domain to own all member accounts whose email address matches the domain. Members will be able to skip the SSO identifier when logging in. Administrators will also be able to delete member accounts."
+    "message": "Gör anspråk på en domän för att äga alla medlemskonton vars e-postadress matchar domänen. Medlemmar kommer att kunna hoppa över SSO-identifieraren när de loggar in. Administratörer kommer också att kunna ta bort medlemskonton."
   },
   "invalidDomainNameClaimMessage": {
-    "message": "Input is not a valid format. Format: mydomain.com. Subdomains require separate entries to be claimed."
+    "message": "Inmatningen är inte ett giltigt format. Format: mydomain.com. Underdomäner kräver separata poster för att hävdas."
   },
   "domainClaimedEvent": {
-    "message": "$DOMAIN$ claimed",
+    "message": "$DOMAIN$ hävdade",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10261,7 +10370,7 @@
     }
   },
   "domainNotClaimedEvent": {
-    "message": "$DOMAIN$ not claimed",
+    "message": "$DOMAIN$ inte anspråktagen",
     "placeholders": {
       "DOMAIN": {
         "content": "$1",
@@ -10270,7 +10379,7 @@
     }
   },
   "updatedRevokeSponsorshipConfirmationForSentSponsorship": {
-    "message": "If you remove $EMAIL$, the sponsorship for this Family plan cannot be redeemed. Are you sure you want to continue?",
+    "message": "Om du tar bort $EMAIL$ kan sponsringen för den här familjeplanen inte lösas in. Är du säker på att du vill fortsätta?",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10279,7 +10388,7 @@
     }
   },
   "updatedRevokeSponsorshipConfirmationForAcceptedSponsorship": {
-    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end and the saved payment method will be charged $40 + applicable tax on $DATE$. You will not be able to redeem a new sponsorship until $DATE$. Are you sure you want to continue?",
+    "message": "Om du tar bort $EMAIL$ kommer sponsringen för denna familjeplan att upphöra och den sparade betalningsmetoden debiteras $40 + tillämplig skatt på $DATE$. Du kommer inte att kunna lösa in en ny sponsring förrän $DATE$. Är du säker på att du vill fortsätta?",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -10292,108 +10401,108 @@
     }
   },
   "domainClaimed": {
-    "message": "Domain claimed"
+    "message": "Domänanspråk"
   },
   "organizationNameMaxLength": {
-    "message": "Organization name cannot exceed 50 characters."
+    "message": "Organisationsnamnet får inte överstiga 50 tecken."
   },
   "rotationCompletedTitle": {
-    "message": "Key rotation successful"
+    "message": "Nyckelrotation framgångsrik"
   },
   "rotationCompletedDesc": {
-    "message": "Your master password and encryption keys have been updated. Your other devices have been logged out."
+    "message": "Ditt huvudlösenord och dina krypteringsnycklar har uppdaterats. Dina andra enheter har loggats ut."
   },
   "trustUserEmergencyAccess": {
-    "message": "Trust and confirm user"
+    "message": "Lita på och bekräfta användaren"
   },
   "trustOrganization": {
-    "message": "Trust organization"
+    "message": "Lita på organisation"
   },
   "trust": {
-    "message": "Trust"
+    "message": "Förtroende"
   },
   "doNotTrust": {
-    "message": "Do not trust"
+    "message": "Lita inte på"
   },
   "organizationNotTrusted": {
-    "message": "Organization is not trusted"
+    "message": "Organisationen är inte betrodd"
   },
   "emergencyAccessTrustWarning": {
-    "message": "For the security of your account, only confirm if you have granted emergency access to this user and their fingerprint matches what is displayed in their account"
+    "message": "För att skydda ditt konto ska du bara bekräfta om du har beviljat nödåtkomst till den här användaren och om fingeravtrycket matchar det som visas på användarens konto"
   },
   "orgTrustWarning": {
-    "message": "For the security of your account, only proceed if you are a member of this organization, have account recovery enabled, and the fingerprint displayed below matches the organization's fingerprint."
+    "message": "För att skydda ditt konto ska du bara fortsätta om du är medlem i den här organisationen, har aktiverat kontoåterställning och om det fingeravtryck som visas nedan matchar organisationens fingeravtryck."
   },
   "orgTrustWarning1": {
-    "message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
+    "message": "Den här organisationen har en företagspolicy som gör att du kan registrera dig till kontoåterställning. Registreringen gör det möjligt för organisationens administratörer att ändra ditt lösenord. Fortsätt bara om du känner igen den här organisationen och om fingeravtrycksfrasen som visas nedan matchar organisationens fingeravtryck."
   },
   "trustUser": {
-    "message": "Trust user"
+    "message": "Lita på användare"
   },
   "sshKeyWrongPassword": {
-    "message": "The password you entered is incorrect."
+    "message": "Lösenordet du har angett är felaktigt."
   },
   "importSshKey": {
-    "message": "Import"
+    "message": "Importera"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirm password"
+    "message": "Bekräfta lösenord"
   },
   "enterSshKeyPasswordDesc": {
-    "message": "Enter the password for the SSH key."
+    "message": "Ange lösenordet för SSH-nyckeln."
   },
   "enterSshKeyPassword": {
-    "message": "Enter password"
+    "message": "Ange lösenord"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "SSH-nyckeln är ogiltig"
   },
   "sshKeyTypeUnsupported": {
-    "message": "The SSH key type is not supported"
+    "message": "SSH-nyckeltypen stöds inte"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "Importera nyckel från urklipp"
   },
   "sshKeyImported": {
-    "message": "SSH key imported successfully"
+    "message": "SSH-nyckel importerad framgångsrikt"
   },
   "copySSHPrivateKey": {
-    "message": "Copy private key"
+    "message": "Kopiera privat nyckel"
   },
   "openingExtension": {
-    "message": "Opening the Bitwarden browser extension"
+    "message": "Öppna webbläsartillägget Bitwarden"
   },
   "somethingWentWrong": {
-    "message": "Something went wrong..."
+    "message": "Något gick fel …"
   },
   "openingExtensionError": {
-    "message": "We had trouble opening the Bitwarden browser extension. Click the button to open it now."
+    "message": "Vi hade problem med att öppna webbläsartillägget Bitwarden. Klicka på knappen för att öppna det nu."
   },
   "openExtension": {
-    "message": "Open extension"
+    "message": "Öppen förlängning"
   },
   "doNotHaveExtension": {
-    "message": "Don't have the Bitwarden browser extension?"
+    "message": "Har du inte webbläsartillägget Bitwarden?"
   },
   "installExtension": {
-    "message": "Install extension"
+    "message": "Installera förlängning"
   },
   "openedExtension": {
-    "message": "Opened the browser extension"
+    "message": "Öppnade webbläsartillägget"
   },
   "openedExtensionViewAtRiskPasswords": {
-    "message": "Successfully opened the Bitwarden browser extension. You can now review your at-risk passwords."
+    "message": "Framgångsrikt öppnat webbläsartillägget Bitwarden. Du kan nu granska dina risklösenord."
   },
   "openExtensionManuallyPart1": {
-    "message": "We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon",
+    "message": "Vi hade problem med att öppna webbläsartillägget Bitwarden. Öppna Bitwarden-ikonen",
     "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
   },
   "openExtensionManuallyPart2": {
-    "message": "from the toolbar.",
+    "message": "från verktygsfältet.",
     "description": "This will be used as part of a larger sentence, broken up to include the Bitwarden icon. The full sentence will read 'We had trouble opening the Bitwarden browser extension. Open the Bitwarden icon [Bitwarden Icon] from the toolbar.'"
   },
   "resellerRenewalWarningMsg": {
-    "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
+    "message": "Din prenumeration kommer snart att förnyas. För att säkerställa oavbruten service, kontakta $RESELLER$ för att bekräfta din förnyelse före $RENEWAL_DATE$.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10406,7 +10515,7 @@
     }
   },
   "resellerOpenInvoiceWarningMgs": {
-    "message": "An invoice for your subscription was issued on $ISSUED_DATE$. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $DUE_DATE$.",
+    "message": "En faktura för din prenumeration utfärdades den $ISSUED_DATE$. För att säkerställa oavbruten service, kontakta $RESELLER$ för att bekräfta din förnyelse före $DUE_DATE$.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10423,7 +10532,7 @@
     }
   },
   "resellerPastDueWarningMsg": {
-    "message": "The invoice for your subscription has not been paid. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $GRACE_PERIOD_END$.",
+    "message": "Fakturan för din prenumeration har inte betalats. För att säkerställa oavbruten service, kontakta $RESELLER$ för att bekräfta din förnyelse före $GRACE_PERIOD_END$.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10436,13 +10545,13 @@
     }
   },
   "restartOrganizationSubscription": {
-    "message": "Organization subscription restarted"
+    "message": "Organisationsprenumeration omstartad"
   },
   "restartSubscription": {
-    "message": "Restart your subscription"
+    "message": "Starta om din prenumeration"
   },
   "suspendedManagedOrgMessage": {
-    "message": "Contact $PROVIDER$ for assistance.",
+    "message": "Kontakta $PROVIDER$ för hjälp.",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -10451,16 +10560,16 @@
     }
   },
   "accountDeprovisioningNotification": {
-    "message": "Administrators now have the ability to delete member accounts that belong to a claimed domain."
+    "message": "Administratörer har nu möjlighet att ta bort medlemskonton som tillhör en hävdad domän."
   },
   "deleteManagedUserWarningDesc": {
-    "message": "This action will delete the member account including all items in their vault. This replaces the previous Remove action."
+    "message": "Denna åtgärd tar bort medlemskontot inklusive alla objekt i deras valv. Detta ersätter den tidigare åtgärden Ta bort."
   },
   "deleteManagedUserWarning": {
-    "message": "Delete is a new action!"
+    "message": "Ta bort är en ny åtgärd!"
   },
   "seatsRemaining": {
-    "message": "You have $REMAINING$ seats remaining out of $TOTAL$ seats assigned to this organization. Contact your provider to manage your subscription.",
+    "message": "Du har $REMAINING$ platser kvar av $TOTAL$ platser som tilldelats den här organisationen. Kontakta din leverantör för att hantera din prenumeration.",
     "placeholders": {
       "remaining": {
         "content": "$1",
@@ -10473,19 +10582,19 @@
     }
   },
   "existingOrganization": {
-    "message": "Existing organization"
+    "message": "Befintlig organisation"
   },
   "selectOrganizationProviderPortal": {
-    "message": "Select an organization to add to your Provider Portal."
+    "message": "Välj en organisation som du vill lägga till i Provider Portal."
   },
   "noOrganizations": {
-    "message": "There are no organizations to list"
+    "message": "Det finns inga organisationer att räkna upp"
   },
   "yourProviderSubscriptionCredit": {
-    "message": "Your provider subscription will receive a credit for any remaining time in the organization's subscription."
+    "message": "Din leverantörs prenumeration kommer att få en kredit för eventuell återstående tid i organisationens prenumeration."
   },
   "doYouWantToAddThisOrg": {
-    "message": "Do you want to add this organization to $PROVIDER$?",
+    "message": "Vill du lägga till den här organisationen i $PROVIDER$?",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -10494,13 +10603,13 @@
     }
   },
   "addedExistingOrganization": {
-    "message": "Added existing organization"
+    "message": "Lagt till befintlig organisation"
   },
   "assignedExceedsAvailable": {
-    "message": "Assigned seats exceed available seats."
+    "message": "Antalet tilldelade platser överstiger antalet tillgängliga platser."
   },
   "userkeyRotationDisclaimerEmergencyAccessText": {
-    "message": "Fingerprint phrase for $NUM_USERS$ contacts for which you have enabled emergency access.",
+    "message": "Fingeravtrycksfras för $NUM_USERS$ kontakter för vilka du har aktiverat nödåtkomst.",
     "placeholders": {
       "num_users": {
         "content": "$1",
@@ -10509,7 +10618,7 @@
     }
   },
   "userkeyRotationDisclaimerAccountRecoveryOrgsText": {
-    "message": "Fingerprint phrase for the organization $ORG_NAME$ for which you have enabled account recovery.",
+    "message": "Fingeravtrycksfras för organisationen $ORG_NAME$ för vilken du har aktiverat kontoåterställning.",
     "placeholders": {
       "org_name": {
         "content": "$1",
@@ -10518,97 +10627,232 @@
     }
   },
   "userkeyRotationDisclaimerDescription": {
-    "message": "Rotating your encryption keys will require you to trust keys of any organizations that can recover your account, and any contacts that you have enabled emergency access for. To continue, make sure you can verify the following:"
+    "message": "Om du roterar dina krypteringsnycklar måste du lita på nycklar från alla organisationer som kan återställa ditt konto och alla kontakter som du har aktiverat nödåtkomst för. För att fortsätta, se till att du kan verifiera följande:"
   },
   "userkeyRotationDisclaimerTitle": {
-    "message": "Untrusted encryption keys"
+    "message": "Otillförlitliga krypteringsnycklar"
   },
   "changeAtRiskPassword": {
-    "message": "Change at-risk password"
+    "message": "Ändra lösenord för riskgrupper"
   },
   "removeUnlockWithPinPolicyTitle": {
-    "message": "Remove Unlock with PIN"
+    "message": "Ta bort upplåsning med PIN-kod"
   },
   "removeUnlockWithPinPolicyDesc": {
-    "message": "Do not allow members to unlock their account with a PIN."
+    "message": "Låt inte medlemmar låsa upp sitt konto med en PIN-kod."
   },
   "upgradeForFullEventsMessage": {
-    "message": "Event logs are not stored for your organization. Upgrade to a Teams or Enterprise plan to get full access to organization event logs."
+    "message": "Händelseloggar lagras inte för din organisation. Uppgradera till en Teams- eller Enterprise-plan för att få full åtkomst till organisationens händelseloggar."
   },
   "upgradeEventLogTitleMessage": {
-    "message": "Upgrade to see event logs from your organization."
+    "message": "Uppgradera för att se händelseloggar från din organisation."
   },
   "upgradeEventLogMessage": {
-    "message": "These events are examples only and do not reflect real events within your Bitwarden organization."
+    "message": "Dessa händelser är endast exempel och återspeglar inte verkliga händelser inom din Bitwarden-organisation."
   },
   "cannotCreateCollection": {
-    "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
+    "message": "Gratisorganisationer kan ha upp till 2 samlingar. Uppgradera till en betald plan för att lägga till fler samlingar."
   },
   "businessUnit": {
-    "message": "Business Unit"
+    "message": "Affärsenhet"
   },
   "businessUnits": {
-    "message": "Business Units"
+    "message": "Affärsenheter"
   },
   "newBusinessUnit": {
-    "message": "New business unit"
+    "message": "Ny affärsenhet"
+  },
+  "sendsTitleNoItems": {
+    "message": "Skicka känslig information på ett säkert sätt",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Dela filer och data på ett säkert sätt med vem som helst, på vilken plattform som helst. Din information kommer att förbli krypterad från början till slut samtidigt som exponeringen begränsas.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Skapa lösenord snabbt"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Skapa enkelt starka och unika lösenord genom att klicka på",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "för att hjälpa dig att hålla dina inloggningar säkra.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Skapa enkelt starka och unika lösenord genom att klicka på knappen Generera lösenord så att du kan hålla dina inloggningar säkra.",
+    "description": "Aria label for the body content of the generator nudge"
   },
   "newLoginNudgeTitle": {
-    "message": "Save time with autofill"
+    "message": "Spara tid med autofyll"
   },
   "newLoginNudgeBodyOne": {
-    "message": "Include a",
+    "message": "Inkludera ett",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyBold": {
-    "message": "Website",
+    "message": "Webbplats",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newLoginNudgeBodyTwo": {
-    "message": "so this login appears as an autofill suggestion.",
+    "message": "så att den här inloggningen visas som ett autofyllningsförslag.",
     "description": "This is in multiple parts to allow for bold text in the middle of the sentence.",
     "example": "Include a Website so this login appears as an autofill suggestion."
   },
   "newCardNudgeTitle": {
-    "message": "Seamless online checkout"
+    "message": "Sömlös utcheckning online"
   },
   "newCardNudgeBody": {
-    "message": "With cards, easily autofill payment forms securely and accurately."
+    "message": "Med kort kan du enkelt autofylla betalningsformulär på ett säkert och exakt sätt."
   },
   "newIdentityNudgeTitle": {
-    "message": "Simplify creating accounts"
+    "message": "Förenkla skapandet av konton"
   },
   "newIdentityNudgeBody": {
-    "message": "With identities, quickly autofill long registration or contact forms."
+    "message": "Med identiteter kan du snabbt autofylla långa registrerings- eller kontaktformulär."
   },
   "newNoteNudgeTitle": {
-    "message": "Keep your sensitive data safe"
+    "message": "Håll ditt känsliga data säkert"
   },
   "newNoteNudgeBody": {
-    "message": "With notes, securely store sensitive data like banking or insurance details."
+    "message": "Med anteckningar kan du säkert lagra känslig information som bank- eller försäkringsuppgifter."
   },
   "newSshNudgeTitle": {
-    "message": "Developer-friendly SSH access"
+    "message": "Utvecklarvänlig SSH-åtkomst"
   },
   "newSshNudgeBodyOne": {
-    "message": "Store your keys and connect with the SSH agent for fast, encrypted authentication.",
+    "message": "Förvara dina nycklar och anslut till SSH-agenten för snabb, krypterad autentisering.",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
   "newSshNudgeBodyTwo": {
-    "message": "Learn more about SSH agent",
+    "message": "Läs mer om SSH-agent",
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofyll dina lösenord på ett säkert sätt med ett klick"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Skaffa webbläsartillägget Bitwarden och börja autofylla redan idag"
+  },
+  "getTheExtension": {
+    "message": "Hämta tillägget"
+  },
+  "addItLater": {
+    "message": "Lägg till den senare"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Du kan inte autofylla lösenord utan webbläsartillägget"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Är du säker på att du inte vill lägga till tillägget nu?"
+  },
+  "skipToWebApp": {
+    "message": "Hoppa till webbapp"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitvärdesförlängningen installerad!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Öppna tillägget för att logga in och starta autofyllning."
+  },
+  "openBitwardenExtension": {
+    "message": "Öppna Bitwarden-förlängning"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "För tips om hur du kommer igång med Bitwarden besök",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Lärcentrum",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Hjälpcenter",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "Med webbläsartillägget Bitwarden kan du enkelt skapa nya inloggningar, komma åt dina sparade inloggningar direkt från webbläsarens verktygsfält och logga in på konton snabbt med hjälp av Bitwardens autofyll."
+  },
   "restart": {
-    "message": "Restart"
+    "message": "Starta om"
   },
   "verifyProviderBankAccountWithStatementDescriptorWarning": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the provider's subscription page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+    "message": "Betalning med bankkonto är endast tillgänglig för kunder i USA. Du kommer att bli ombedd att verifiera ditt bankkonto. Vi kommer att göra en mikroinsättning inom de närmaste 1-2 bankdagarna. Ange koden för kontoutdrag från den här insättningen på leverantörens prenumerationssida för att verifiera bankkontot. Om du inte verifierar bankkontot kommer det att leda till en missad betalning och att din prenumeration stängs av."
   },
   "clickPayWithPayPal": {
-    "message": "Please click the Pay with PayPal button to add your payment method."
+    "message": "Klicka på knappen Betala med PayPal för att lägga till din betalningsmetod."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Om du tar bort $EMAIL$ upphör sponsringen för den här familjeplanen. En plats inom din organisation kommer att bli tillgänglig för medlemmar eller sponsring efter förnyelsedatumet för den sponsrade organisationen på $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Faktureringsadress krävs för att lägga till kredit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Faktureringsadress"
+  },
+  "addBillingAddress": {
+    "message": "Lägg till faktureringsadress"
+  },
+  "editBillingAddress": {
+    "message": "Redigera faktureringsadress"
+  },
+  "noBillingAddress": {
+    "message": "Ingen adress finns registrerad."
+  },
+  "billingAddressUpdated": {
+    "message": "Din faktureringsadress har uppdaterats."
+  },
+  "paymentDetails": {
+    "message": "Detaljer för betalning"
+  },
+  "paymentMethodUpdated": {
+    "message": "Din betalningsmetod har uppdaterats."
+  },
+  "bankAccountVerified": {
+    "message": "Ditt bankkonto har verifierats."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Eventuell tillgänglig kredit kommer automatiskt att tillämpas på fakturor som genereras för detta konto."
+  },
+  "mustBePositiveNumber": {
+    "message": "Måste vara ett positivt nummer."
+  },
+  "cardSecurityCode": {
+    "message": "Kortets säkerhetskod"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Kortets säkerhetskod, även känd som CVV eller CVC, är vanligtvis ett 3-siffrigt nummer tryckt på baksidan av ditt kreditkort eller ett 4-siffrigt nummer tryckt på framsidan ovanför ditt kortnummer."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Betalning med bankkonto är endast tillgänglig för kunder i USA. Du kommer att bli ombedd att verifiera ditt bankkonto. Vi kommer att göra en mikroinsättning inom de närmaste 1-2 bankdagarna. Ange koden för kontoutdraget från den här insättningen på sidan Betalningsinformation för att verifiera bankkontot. Om du inte verifierar bankkontot kommer det att resultera i en missad betalning och din prenumeration kommer att stängas av."
+  },
+  "taxId": {
+    "message": "Skatte-ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/te/messages.json b/apps/web/src/locales/te/messages.json
index 27a160a9a3c..57b7a83469e 100644
--- a/apps/web/src/locales/te/messages.json
+++ b/apps/web/src/locales/te/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Generate password"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Check if password has been exposed."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Me"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "My vault"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Generate password"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/th/messages.json b/apps/web/src/locales/th/messages.json
index 7651ae5bc06..9562698d1b3 100644
--- a/apps/web/src/locales/th/messages.json
+++ b/apps/web/src/locales/th/messages.json
@@ -547,12 +547,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "สร้างรหัสผ่าน"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "ตรวจสอบว่ารหัสผ่านถูกเปิดเผยหรือไม่"
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "ฉัน"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "ตู้เซฟของฉัน"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "Email saved"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Turn off"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "Revoke access"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Subscription"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Emergency access rejected"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "Password reset for $USER$. You can now login using the new password.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "this user"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "One or more organization policies require the master password to meet the following requirements:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Password reset success!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "สร้างรหัสผ่าน"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Use this username"
   },
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "An error occurred when trying to read the import file"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Common formats",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/tr/messages.json b/apps/web/src/locales/tr/messages.json
index 7e6f3e6ab4e..4a336df5a9f 100644
--- a/apps/web/src/locales/tr/messages.json
+++ b/apps/web/src/locales/tr/messages.json
@@ -547,12 +547,6 @@
     "message": "Daraltmayı aç/kapat",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Parola oluştur"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Parolanız ele geçirilip geçirilmediğini kontrol edin."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Ben"
   },
+  "myItems": {
+    "message": "Kayıtlarım"
+  },
   "myVault": {
     "message": "Kasam"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Devam ederseniz geçerli oturumunuz sonlanacak ve yeniden oturum açmanız gerekecek. Diğer cihazlardaki aktif oturumlar bir saate kadar aktif kalabilir."
   },
+  "changePasswordWarning": {
+    "message": "Parolanızı değiştirdikten sonra yeni parolanızyla tekrar giriş yapmanız gerekecektir. Diğer cihazlarınızdaki aktif oturumlar bir saat içinde kapatılacaktır."
+  },
   "emailChanged": {
     "message": "E-posta kaydedildi"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "İki aşamalı girişi etkinleştirmek, Bitwarden hesabınızı kalıcı olarak kilitleyebilir. Kurtarma kodunuz, iki aşamalı giriş sağlayıcınızı kullanamamanız durumunda hesabınıza erişmenize olanak sağlar (ör. cihazınızı kaybedersiniz). Hesabınıza erişiminizi kaybederseniz Bitwarden destek ekibi size yardımcı olamaz. Kurtarma kodunu not almanızı veya yazdırmanızı ve güvenli bir yerde saklamanızı öneririz."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Kart kaydı türünü kaldır"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Devre dışı bırak"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Üye bilgileri bulunamadı."
+  },
   "revokeAccess": {
     "message": "Erişimi iptal et"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Şifreleme anahtarı güncellemesine devam edilemiyor"
-  },
   "editFieldLabel": {
     "message": "$LABEL$ alanını düzenle",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "Anahtar güncellendi"
-  },
-  "updateEncryptionKey": {
-    "message": "Şifreleme anahtarını güncelle"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Güvenliği daha da artırmak için şifreleme şemamızı değiştirdik. Aşağıya ana parolanızı yazarak şifreleme anahtarınızı güncelleyebilirsiniz."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Şifreleme anahtarınızı güncelledikten sonra, şu anda kullanmakta olduğunuz tüm Bitwarden uygulamalarında (mobil uygulama veya tarayıcı uzantıları gibi) oturumunuzu kapatıp tekrar açmanız gerekir. Yeni şifreleme anahtarınızı indirme için oturumu kapatıp tekrar açmamamız verilerin bozulmasına neden olabilir. Oturumunuzu otomatik olarak kapatmaya çalışacağız, ancak bu gecikebilir."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Abonelik"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Acil durum erişimi reddedildi"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "$USER$ için parola sıfırlandı. Artık yeni parola ile giriş yapabilirsiniz.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "Kişisel kasayı kaldır"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "bu kullanıcı"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Bir veya daha fazla kuruluş ilkesi gereğince ana parola aşağıdaki gereksinimleri karşılamalıdır:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "Parola başarıyla sıfırlandı."
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Ekle"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Ana parola başarıyla ayarlandı"
+  },
   "updatedMasterPassword": {
     "message": "Ana parola kaydedildi"
   },
   "updateMasterPassword": {
     "message": "Ana parolayı güncelle"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Hesap kurtarmayı tamamlamak için ana parolanızı değiştirin."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Ana parolanız bu kuruluşun gereksinimlerini karşılamıyor. Devam için ana parolanızı değiştirin."
+  },
   "updateMasterPasswordWarning": {
     "message": "Ana parolanız kuruluşunuzdaki bir yönetici tarafından yakın zamanda değiştirildi. Kasanıza erişmek için ana parolanızı güncellemelisiniz. Devam ettiğinizde oturumunuz kapanacak ve yeniden oturum açmanız gerekecektir. Diğer cihazlardaki aktif oturumlar bir saate kadar aktif kalabilir."
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Parola oluştur"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Parola üretildi"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Kullanıcı adı üretildi"
+  },
+  "emailGenerated": {
+    "message": "E-posta üretildi"
+  },
   "spinboxBoundariesHint": {
     "message": "Değer $MIN$ ile $MAX$ arasında olmalıdır.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Bu parolayı kullan"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "Bu kullanıcı adını kullan"
   },
@@ -7605,9 +7656,9 @@
     "message": "Hizmet hesabı güncellendi",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Projeleri veya sırları yazın veya seçin",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Projeleri yazın veya seçin",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Filtrelemek için yaz",
@@ -7692,8 +7743,8 @@
     "message": "Erişim token'ları",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Yeni erişim token'ı",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "İçe aktarma dosyası okunurken bir hata oluştu"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "$SECRET_ID$ sırrına erişildi.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Yönetici onayı iste"
   },
+  "unableToCompleteLogin": {
+    "message": "Oturum açma tamamlanamadı"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Güvenilen bir cihazdan oturum açmalı veya yöneticinizden size parola atamasını istemelisiniz."
+  },
   "trustedDeviceEncryption": {
     "message": "Güvenilir cihaz şifrelemesi"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Cihaza güvenildi"
   },
-  "sendsNoItemsTitle": {
-    "message": "Aktif Send yok",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Şifrelenmiş bilgileri güvenle paylaşmak için Send'i kullanabilirsiniz.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Kullanıcıları davet et"
   },
@@ -8837,6 +8922,30 @@
     "message": "Sık kullanılan biçimler",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Gelişmiş seçenekler",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Uyarı",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "$ORG$ aboneliğinizi sürdürmek için ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Hassas bilgileri güvenle paylaşın",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Dosyaları ve verileri istediğiniz kişilerle, istediğiniz platformda paylaşın. Bilgileriniz başkalarının eline geçmemesi için uçtan şifrelenecektir.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Otomatik doldurmayla zaman kazanın"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Parolalarınızı tek tıklamayla güvenli bir şekilde doldurun"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Bitwarden tarayıcı uzantısını yükleyin, otomatik doldurmaya başlayın"
+  },
+  "getTheExtension": {
+    "message": "Uzantıyı yükle"
+  },
+  "addItLater": {
+    "message": "Daha sonra yükle"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Tarayıcı uzantısı olmadan parolaları otomatik dolduramazsınız"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Uzantıyı yüklemek istemediğinizden emin misiniz?"
+  },
+  "skipToWebApp": {
+    "message": "Web uygulamasına geç"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden uzantısı yüklendi!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Otomatik doldurmaya başlamak için uzantıyı açıp giriş yapın."
+  },
+  "openBitwardenExtension": {
+    "message": "Bitwarden uzantısını aç"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "Bitwarden tarayıcı uzantısıyla kolayca yeni hesaplar oluşturabilir, kayıtlı hesaplarınıza doğrudan tarayıcı araç çubuğunuzdan erişebilir, otomatik doldurma özelliğini kullanarak hesaplarınıza kolayca giriş yapabilirsiniz."
+  },
   "restart": {
     "message": "Yeniden başlat"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Fatura adresi"
+  },
+  "addBillingAddress": {
+    "message": "Fatura adresi ekle"
+  },
+  "editBillingAddress": {
+    "message": "Fatura adresini düzenle"
+  },
+  "noBillingAddress": {
+    "message": "Kayıtlı adres yok."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Ödeme bilgileri"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/uk/messages.json b/apps/web/src/locales/uk/messages.json
index a899bde3d04..cc59b1b39c9 100644
--- a/apps/web/src/locales/uk/messages.json
+++ b/apps/web/src/locales/uk/messages.json
@@ -99,7 +99,7 @@
     "message": "Позначити програму критичною"
   },
   "applicationsMarkedAsCriticalSuccess": {
-    "message": "Applications marked as critical"
+    "message": "Позначені критичні програми"
   },
   "application": {
     "message": "Програма"
@@ -141,13 +141,13 @@
     "message": "Ці учасники використовують у програмах слабкі, викриті, або повторювані паролі."
   },
   "atRiskMembersDescriptionNone": {
-    "message": "These are no members logging into applications with weak, exposed, or reused passwords."
+    "message": "Немає учасників, які використовують у програмах слабкі, викриті, або повторювані паролі."
   },
   "atRiskApplicationsDescription": {
     "message": "Ці програми мають слабкі, викриті, або повторювані паролі."
   },
   "atRiskApplicationsDescriptionNone": {
-    "message": "These are no applications with weak, exposed, or reused passwords."
+    "message": "Немає програм, які мають слабкі, викриті, або повторювані паролі."
   },
   "atRiskMembersDescriptionWithApp": {
     "message": "Ці учасники використовують у $APPNAME$ слабкі, викриті, або повторювані паролі.",
@@ -159,7 +159,7 @@
     }
   },
   "atRiskMembersDescriptionWithAppNone": {
-    "message": "There are no at risk members for $APPNAME$.",
+    "message": "Немає учасників з ризиками для $APPNAME$.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -526,7 +526,7 @@
     "message": "Починається з"
   },
   "regEx": {
-    "message": "Звичайний вираз",
+    "message": "Регулярний вираз",
     "description": "A programming term, also known as 'RegEx'."
   },
   "matchDetection": {
@@ -547,12 +547,6 @@
     "message": "Згорнути/розгорнути",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Генерувати пароль"
-  },
-  "generatePassphrase": {
-    "message": "Генерувати парольну фразу"
-  },
   "checkPassword": {
     "message": "Перевірити чи пароль було викрито."
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "Я"
   },
+  "myItems": {
+    "message": "Мої записи"
+  },
   "myVault": {
     "message": "Моє сховище"
   },
@@ -922,7 +919,7 @@
     "message": "Оберіть файл."
   },
   "maxFileSize": {
-    "message": "Максимальний розмір файлу 500 Мб."
+    "message": "Максимальний розмір файлу 500 МБ."
   },
   "addedItem": {
     "message": "Запис додано"
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Продовжуючи, ви вийдете з поточного сеансу і необхідно буде виконати вхід знову. Активні сеанси на інших пристроях можуть залишатися активними протягом години."
   },
+  "changePasswordWarning": {
+    "message": "Після зміни пароля потрібно буде ввійти в систему з новим паролем. Активні сеанси на інших пристроях буде завершено протягом години."
+  },
   "emailChanged": {
     "message": "Е-пошту змінено"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "Увімкнення двоетапної перевірки може цілком заблокувати доступ до облікового запису Bitwarden. Код відновлення дає вам змогу отримати доступ до свого облікового запису у випадку, якщо ви не можете скористатися провайдером двоетапної перевірки (наприклад, якщо втрачено пристрій). Служба підтримки Bitwarden не зможе допомогти відновити доступ до вашого облікового запису. Ми радимо вам записати чи надрукувати цей код відновлення і зберігати його в надійному місці."
   },
+  "restrictedItemTypePolicy": {
+    "message": "Вилучити тип запису \"Картка\""
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Не дозволяти учасникам створювати записи карток. Наявні картки будуть автоматично вилучені."
+  },
+  "restrictCardTypeImport": {
+    "message": "Не вдається імпортувати записи карток"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Політика принаймні однієї організації не дозволяє вам імпортувати записи карток до сховища."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Одноразовий код відновлення можна використати для вимкнення двоетапної перевірки у випадку, якщо ви втратите доступ до вашого провайдера двоетапної перевірки. Bitwarden рекомендує вам записати код відновлення і зберігати його в надійному місці."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "Вимкнути"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Не знайдено подробиць про учасника."
+  },
   "revokeAccess": {
     "message": "Відкликати доступ"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Неможливо продовжити оновлення ключа шифрування"
-  },
   "editFieldLabel": {
     "message": "Редагувати $LABEL$",
     "placeholders": {
@@ -4533,23 +4545,14 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Не вдалося розшифрувати ваші теки під час оновлення ключа шифрування. Щоб продовжити оновлення, необхідно видалити теки. Якщо ви продовжите, записи у сховищі не будуть видалені."
-  },
-  "keyUpdated": {
-    "message": "Ключ оновлено"
-  },
-  "updateEncryptionKey": {
-    "message": "Оновити ключ шифрування"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "Ми змінили схему шифрування для кращої безпеки. Введіть головний пароль нижче, щоб оновити свій ключ шифрування."
-  },
   "updateEncryptionKeyWarning": {
     "message": "Після оновлення вашого ключа шифрування вам необхідно вийти з системи і потім виконати повторний вхід у всіх програмах Bitwarden, які ви використовуєте. Збій при виході та повторному вході може призвести до пошкодження даних. Ми спробуємо завершити ваші сеанси автоматично, однак, цей процес може відбутися із затримкою."
   },
   "updateEncryptionKeyAccountExportWarning": {
-    "message": "Any account restricted exports you have saved will become invalid."
+    "message": "Будь-які збережені експорти, обмежені обліковим записом, стануть недійсними."
+  },
+  "legacyEncryptionUnsupported": {
+    "message": "Застаріле шифрування більше не підтримується. Зверніться до служби підтримки, щоб відновити обліковий запис."
   },
   "subscription": {
     "message": "Передплата"
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "Екстрений доступ відхилено"
   },
+  "grantorDetailsNotFound": {
+    "message": "Не знайдено подробиць про надавача"
+  },
   "passwordResetFor": {
     "message": "Пароль для користувача $USER$ скинуто. Тепер ви можете увійти використовуючи новий пароль.",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Примусове володіння даними організації"
+  },
   "personalOwnership": {
     "message": "Вилучити особисте сховище"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Продовжуючи, користувач $NAME$ вийде зі свого поточного сеансу і йому необхідно буде виконати вхід знову. Активні сеанси на інших пристроях можуть залишатися активними протягом години.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "цей користувач"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "Одна або декілька політик організації вимагають дотримання таких вимог для головного пароля:"
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Одна або декілька політик організації вимагають дотримання таких вимог для головного пароля:"
+  },
   "resetPasswordSuccess": {
     "message": "Пароль успішно скинуто!"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Додати"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Головний пароль успішно встановлено"
+  },
   "updatedMasterPassword": {
     "message": "Головний пароль збережено"
   },
   "updateMasterPassword": {
     "message": "Оновити головний пароль"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Змініть свій головний пароль, щоб завершити відновлення облікового запису."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Ваш головний пароль не відповідає вимогам цієї організації. Змініть свій головний пароль, щоб продовжити."
+  },
   "updateMasterPasswordWarning": {
     "message": "Ваш головний пароль нещодавно було змінено адміністратором організації. Щоб отримати доступ до сховища, вам необхідно оновити свій головний пароль зараз. Продовживши, ви вийдете з поточного сеансу, після чого потрібно буде повторно виконати вхід. Сеанси на інших пристроях можуть залишатися активними протягом однієї години."
   },
@@ -6477,10 +6507,10 @@
     "message": "Недійсний код підтвердження"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+    "message": "Головний пароль більше не є обов'язковим для учасників зазначеної організації. Підтвердьте вказаний нижче домен з адміністратором вашої організації."
   },
   "keyConnectorDomain": {
-    "message": "Key Connector domain"
+    "message": "Домен Key Connector"
   },
   "leaveOrganization": {
     "message": "Покинути організацію"
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Генерувати е-пошту"
   },
+  "generatePassword": {
+    "message": "Генерувати пароль"
+  },
+  "generatePassphrase": {
+    "message": "Генерувати парольну фразу"
+  },
+  "passwordGenerated": {
+    "message": "Пароль згенеровано"
+  },
+  "passphraseGenerated": {
+    "message": "Парольну фразу згенеровано"
+  },
+  "usernameGenerated": {
+    "message": "Ім'я користувача згенеровано"
+  },
+  "emailGenerated": {
+    "message": "Адресу е-пошти згенеровано"
+  },
   "spinboxBoundariesHint": {
     "message": "Значення має бути між $MIN$ та $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "Використати цей пароль"
   },
+  "useThisPassphrase": {
+    "message": "Використати цю парольну фразу"
+  },
   "useThisUsername": {
     "message": "Використати це ім'я користувача"
   },
@@ -7605,9 +7656,9 @@
     "message": "Службовий обліковий запис оновлено",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Введіть або виберіть проєкти чи секрети",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Введіть або виберіть проєкти",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Введіть, щоб фільтрувати",
@@ -7692,8 +7743,8 @@
     "message": "Токени доступу",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "Новий токен доступу",
+  "createAccessToken": {
+    "message": "Створити токен доступу",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Під час спроби прочитання імпортованого файлу сталася помилка"
   },
+  "accessedSecretWithId": {
+    "message": "Доступ до секрету з ідентифікатором: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Доступ до секрету $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Редаговано секрет з ідентифікатором: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Видалено секрет з ідентифікатором: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Створено новий секрет з ідентифікатором: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Запит підтвердження адміністратора"
   },
+  "unableToCompleteLogin": {
+    "message": "Не вдалося завершити вхід"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "Ви повинні ввійти до системи на довіреному пристрої або попросити адміністратора призначити вам пароль."
+  },
   "trustedDeviceEncryption": {
     "message": "Шифрування довіреного пристрою"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Довірений пристрій"
   },
-  "sendsNoItemsTitle": {
-    "message": "Немає активних відправлень",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Використовуйте відправлення, щоб безпечно надавати доступ іншим до зашифрованої інформації.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Запросити користувачів"
   },
@@ -8837,6 +8922,30 @@
     "message": "Поширені формати",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "Виявлення збігів URI – це спосіб ідентифікації пропозицій автозаповнення Bitwarden.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "Регулярний вираз – це функція, що має підвищений ризик розкриття облікових даних, призначена для досвідчених користувачів.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Починається з\" – це функція, що має підвищений ризик розкриття облікових даних, призначена для досвідчених користувачів.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "Докладніше про виявлення збігів",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Додаткові налаштування",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Попередження",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "Щоб зберегти свою передплату на $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "Новий бізнес-підрозділ"
   },
+  "sendsTitleNoItems": {
+    "message": "Безпечно надсилайте конфіденційну інформацію",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Безпечно діліться файлами й даними з ким завгодно, на будь-якій платформі. Ваша інформація наскрізно зашифрована та має обмежений доступ.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Швидко створюйте паролі"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Легко створюйте надійні та унікальні паролі, натиснувши на",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "щоб зберегти свої записи в безпеці.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Легко створюйте надійні та унікальні паролі, натиснувши кнопку Генерувати пароль, щоб зберегти свої записи в безпеці.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Заощаджуйте час з автозаповненням"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Автоматично заповнюйте паролі одним рухом"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Отримайте розширення для браузера Bitwarden та користуйтеся автозаповненням"
+  },
+  "getTheExtension": {
+    "message": "Отримати розширення"
+  },
+  "addItLater": {
+    "message": "Додати згодом"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "Не можна автоматично заповнювати паролі без розширення для браузера"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Ви дійсно не хочете додати розширення?"
+  },
+  "skipToWebApp": {
+    "message": "Перейти до вебпрограми"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Розширення Bitwarden встановлено!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Відкрийте розширення, щоб увійти й користуватися автозаповненням."
+  },
+  "openBitwardenExtension": {
+    "message": "Відкрити розширення Bitwarden"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "Щоб переглянути поради щодо початку роботи з Bitwarden, відвідайте",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Навчальний центр",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Довідковий центр",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "За допомогою розширення для браузера Bitwarden можна легко створювати нові паролі, користуватися збереженими паролями безпосередньо з панелі інструментів браузера та швидко входити до облікових записів за допомогою автозаповнення Bitwarden."
+  },
   "restart": {
     "message": "Перезапустити"
   },
@@ -10609,6 +10788,71 @@
     "message": "Оплата з банківським рахунком доступна тільки для клієнтів у США. Вам необхідно буде підтвердити свій банківський рахунок. Ми здійснимо мікродепозит протягом наступних 1–2 робочих днів. Введіть код дескриптора з цього депозиту на сторінці передплати провайдера, щоб підтвердити банківський рахунок. Неможливість засвідчення банківського рахунку призведе до втрати платежу та припинення вашої передплати."
   },
   "clickPayWithPayPal": {
-    "message": "Please click the Pay with PayPal button to add your payment method."
+    "message": "Натисніть кнопку Сплатити з PayPal, щоб додати спосіб оплати."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "Якщо ви вилучите $EMAIL$, спонсорство цього сімейного плану завершиться. Місце у вашій організації стане доступним для учасників чи спонсорства після дати поновлення спонсорованої організації – $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Щоб додати кредит, необхідно ввести платіжну адресу.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Платіжна адреса"
+  },
+  "addBillingAddress": {
+    "message": "Додати платіжну адресу"
+  },
+  "editBillingAddress": {
+    "message": "Редагувати платіжну адресу"
+  },
+  "noBillingAddress": {
+    "message": "Немає збереженої адреси."
+  },
+  "billingAddressUpdated": {
+    "message": "Вашу платіжну адресу оновлено."
+  },
+  "paymentDetails": {
+    "message": "Подробиці платежу"
+  },
+  "paymentMethodUpdated": {
+    "message": "Ваш спосіб оплати оновлено."
+  },
+  "bankAccountVerified": {
+    "message": "Ваш банківський рахунок підтверджено."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Наявні кредити автоматично застосуються для сплати рахунків, згенерованих для цього облікового запису."
+  },
+  "mustBePositiveNumber": {
+    "message": "Має бути додатним числом"
+  },
+  "cardSecurityCode": {
+    "message": "Код безпеки картки"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Код безпеки картки, також відомий як CVV чи CVC, – це номер із 3 цифр, який зазвичай можна знайти на звороті вашої кредитної картки, або номер із 4 цифр, надрукований під номером картки на лицьовій стороні."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Оплата з банківським рахунком доступна тільки для клієнтів у США. Вам необхідно буде підтвердити свій банківський рахунок. Ми здійснимо мікродепозит протягом наступних 1–2 робочих днів. Введіть код дескриптора з квитанції для цього депозиту, який можна знайти на сторінці подробиць платежу, щоб підтвердити банківський рахунок. У разі невдалого підтвердження банківського рахунку платіж не буде проведено і ваша передплата призупиниться."
+  },
+  "taxId": {
+    "message": "ІПН: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/vi/messages.json b/apps/web/src/locales/vi/messages.json
index 78a536991a7..b1bc5557228 100644
--- a/apps/web/src/locales/vi/messages.json
+++ b/apps/web/src/locales/vi/messages.json
@@ -1,30 +1,30 @@
 {
   "allApplications": {
-    "message": "All applications"
+    "message": "Tất cả các ứng dụng"
   },
   "appLogoLabel": {
     "message": "Bitwarden logo"
   },
   "criticalApplications": {
-    "message": "Critical applications"
+    "message": "Ứng dụng quan trọng"
   },
   "noCriticalAppsAtRisk": {
-    "message": "No critical applications at risk"
+    "message": "Không có ứng dụng quan trọng nào bị đe dọa"
   },
   "accessIntelligence": {
-    "message": "Access Intelligence"
+    "message": "Trí tuệ truy cập"
   },
   "riskInsights": {
-    "message": "Risk Insights"
+    "message": "Thấu hiểu về rủi ro"
   },
   "passwordRisk": {
-    "message": "Password Risk"
+    "message": "Mật khẩu rủi ro"
   },
   "reviewAtRiskPasswords": {
-    "message": "Review at-risk passwords (weak, exposed, or reused) across applications. Select your most critical applications to prioritize security actions for your users to address at-risk passwords."
+    "message": "Kiểm tra các mật khẩu có nguy cơ (yếu, bị lộ hoặc được sử dụng lại) trên các ứng dụng. Chọn các ứng dụng quan trọng nhất của bạn để ưu tiên các biện pháp bảo mật cho người dùng nhằm giải quyết các mật khẩu có nguy cơ."
   },
   "dataLastUpdated": {
-    "message": "Data last updated: $DATE$",
+    "message": "Dữ liệu được cập nhật lần cuối: $DATE$",
     "placeholders": {
       "date": {
         "content": "$1",
@@ -33,19 +33,19 @@
     }
   },
   "notifiedMembers": {
-    "message": "Notified members"
+    "message": "Các thành viên được thông báo"
   },
   "revokeMembers": {
-    "message": "Revoke members"
+    "message": "Hủy tư cách thành viên"
   },
   "restoreMembers": {
-    "message": "Restore members"
+    "message": "Khôi phục tư cách thành viên"
   },
   "cannotRestoreAccessError": {
-    "message": "Cannot restore organization access"
+    "message": "Không thể khôi phục quyền truy cập tổ chức"
   },
   "allApplicationsWithCount": {
-    "message": "All applications ($COUNT$)",
+    "message": "Tổng số ứng dụng ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -54,10 +54,10 @@
     }
   },
   "createNewLoginItem": {
-    "message": "Create new login item"
+    "message": "Tạo mục đăng nhập mới"
   },
   "criticalApplicationsWithCount": {
-    "message": "Critical applications ($COUNT$)",
+    "message": "Ứng dụng quan trọng ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -66,7 +66,7 @@
     }
   },
   "notifiedMembersWithCount": {
-    "message": "Notified members ($COUNT$)",
+    "message": "Các thành viên đã được thông báo ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -75,7 +75,7 @@
     }
   },
   "noAppsInOrgTitle": {
-    "message": "No applications found in $ORG NAME$",
+    "message": "Không tìm thấy ứng dụng nào trong $ORG NAME$",
     "placeholders": {
       "org name": {
         "content": "$1",
@@ -84,43 +84,43 @@
     }
   },
   "noAppsInOrgDescription": {
-    "message": "As users save logins, applications appear here, showing any at-risk passwords. Mark critical apps and notify users to update passwords."
+    "message": "Khi người dùng lưu thông tin đăng nhập, các ứng dụng sẽ hiển thị tại đây, bao gồm cả các mật khẩu có nguy cơ bị lộ. Đánh dấu các ứng dụng quan trọng và thông báo cho người dùng cập nhật mật khẩu."
   },
   "noCriticalAppsTitle": {
-    "message": "You haven't marked any applications as a Critical"
+    "message": "Bạn chưa đánh dấu bất kỳ ứng dụng nào là Quan trọng"
   },
   "noCriticalAppsDescription": {
-    "message": "Select your most critical applications to discover at-risk passwords, and notify users to change those passwords."
+    "message": "Chọn các ứng dụng quan trọng nhất của bạn để phát hiện các mật khẩu có nguy cơ bị lộ, và thông báo cho người dùng thay đổi các mật khẩu đó."
   },
   "markCriticalApps": {
-    "message": "Mark critical apps"
+    "message": "Đánh dấu các ứng dụng quan trọng"
   },
   "markAppAsCritical": {
-    "message": "Mark app as critical"
+    "message": "Đánh dấu các ứng dụng quan trọng"
   },
   "applicationsMarkedAsCriticalSuccess": {
-    "message": "Applications marked as critical"
+    "message": "Các ứng dụng được đánh dấu là quan trọng"
   },
   "application": {
-    "message": "Application"
+    "message": "Ứng dụng"
   },
   "atRiskPasswords": {
-    "message": "At-risk passwords"
+    "message": "Mật khẩu có rủi ro cao"
   },
   "requestPasswordChange": {
-    "message": "Request password change"
+    "message": "Yêu cầu thay đổi mật khẩu"
   },
   "totalPasswords": {
-    "message": "Total passwords"
+    "message": "Tổng số mật khẩu"
   },
   "searchApps": {
-    "message": "Search applications"
+    "message": "Tìm kiếm ứng dụng"
   },
   "atRiskMembers": {
-    "message": "At-risk members"
+    "message": "Các thành viên có rủi ro"
   },
   "atRiskMembersWithCount": {
-    "message": "At-risk members ($COUNT$)",
+    "message": "Các thành viên có rủi ro ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -129,7 +129,7 @@
     }
   },
   "atRiskApplicationsWithCount": {
-    "message": "At-risk applications ($COUNT$)",
+    "message": "Các ứng dụng có rủi ro ($COUNT$)",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -138,19 +138,19 @@
     }
   },
   "atRiskMembersDescription": {
-    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+    "message": "Các thành viên này đang đăng nhập vào các ứng dụng bằng mật khẩu yếu, dễ bị lộ hoặc được sử dụng lại."
   },
   "atRiskMembersDescriptionNone": {
-    "message": "These are no members logging into applications with weak, exposed, or reused passwords."
+    "message": "Không có thành viên nào đăng nhập vào ứng dụng bằng mật khẩu yếu, dễ bị lộ hoặc được sử dụng lại."
   },
   "atRiskApplicationsDescription": {
-    "message": "These applications have weak, exposed, or reused passwords."
+    "message": "Các ứng dụng này có mật khẩu yếu, dễ bị lộ hoặc được sử dụng lại."
   },
   "atRiskApplicationsDescriptionNone": {
-    "message": "These are no applications with weak, exposed, or reused passwords."
+    "message": "Đây không phải là các ứng dụng sử dụng mật khẩu yếu, dễ bị lộ hoặc được sử dụng lại."
   },
   "atRiskMembersDescriptionWithApp": {
-    "message": "These members are logging into $APPNAME$ with weak, exposed, or reused passwords.",
+    "message": "Các thành viên này đang đăng nhập vào $APPNAME$ bằng mật khẩu yếu, dễ bị lộ hoặc đã được sử dụng lại.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -159,7 +159,7 @@
     }
   },
   "atRiskMembersDescriptionWithAppNone": {
-    "message": "There are no at risk members for $APPNAME$.",
+    "message": "Không có thành viên nào thuộc nhóm có rủi ro đối với $APPNAME$.",
     "placeholders": {
       "appname": {
         "content": "$1",
@@ -168,19 +168,19 @@
     }
   },
   "totalMembers": {
-    "message": "Total members"
+    "message": "Tổng số thành viên"
   },
   "atRiskApplications": {
-    "message": "At-risk applications"
+    "message": "Ứng dụng có nguy cơ cao"
   },
   "totalApplications": {
-    "message": "Total applications"
+    "message": "Tổng số ứng dụng"
   },
   "unmarkAsCriticalApp": {
-    "message": "Unmark as critical app"
+    "message": "Bỏ đánh dấu ứng dụng quan trọng"
   },
   "criticalApplicationSuccessfullyUnmarked": {
-    "message": "Critical application successfully unmarked"
+    "message": "Ứng dụng quan trọng đã được gỡ bỏ dấu hiệu thành công"
   },
   "whatTypeOfItem": {
     "message": "Mục này là gì?"
@@ -205,7 +205,7 @@
     "message": "URI mới"
   },
   "username": {
-    "message": "Tên người dùng"
+    "message": "Tên đăng nhập"
   },
   "password": {
     "message": "Mật khẩu"
@@ -220,7 +220,7 @@
     "message": "Ghi chú"
   },
   "privateNote": {
-    "message": "Private note"
+    "message": "Ghi chú riêng tư"
   },
   "note": {
     "message": "Ghi chú"
@@ -235,19 +235,19 @@
     "message": "Thông tin đăng nhập"
   },
   "personalDetails": {
-    "message": "Personal details"
+    "message": "Thông tin cá nhân"
   },
   "identification": {
-    "message": "Identification"
+    "message": "Định danh"
   },
   "contactInfo": {
-    "message": "Contact info"
+    "message": "Thông tin liên hệ"
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "Thông tin thẻ"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "Chi tiết của $BRAND$",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -256,7 +256,7 @@
     }
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "Lịch sử mục"
   },
   "authenticatorKey": {
     "message": "Khóa xác thực"
@@ -265,10 +265,10 @@
     "message": "Tùy chọn tự động điền"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "Trang web (URI)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "Trang web (URI) $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -278,16 +278,16 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Đã thêm trang web"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "Thêm trang web"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "Xóa trang web"
   },
   "defaultLabel": {
-    "message": "Default ($VALUE$)",
+    "message": "Mặc định ($VALUE$)",
     "description": "A label that indicates the default value for a field with the current default value in parentheses.",
     "placeholders": {
       "value": {
@@ -297,7 +297,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "Show match detection $WEBSITE$",
+    "message": "Hiện phát hiện trùng khớp $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -306,7 +306,7 @@
     }
   },
   "hideMatchDetection": {
-    "message": "Hide match detection $WEBSITE$",
+    "message": "Ẩn phát hiện trùng khớp $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -315,7 +315,7 @@
     }
   },
   "autoFillOnPageLoad": {
-    "message": "Autofill on page load?"
+    "message": "Tự động điền khi tải trang?"
   },
   "number": {
     "message": "Số"
@@ -408,10 +408,10 @@
     "message": "Dr"
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Thẻ hết hạn"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "Nếu bạn đã gia hạn, hãy cập nhật thông tin thẻ"
   },
   "expirationMonth": {
     "message": "Tháng hết hạn"
@@ -423,16 +423,16 @@
     "message": "Khóa xác thực (TOTP)"
   },
   "totpHelperTitle": {
-    "message": "Make 2-step verification seamless"
+    "message": "Giúp quá trình xác minh 2 bước diễn ra liền mạch"
   },
   "totpHelper": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field."
+    "message": "Bitwarden có thể lưu trữ và điền mã xác thực 2 bước. Sao chép và dán khóa vào ô này."
   },
   "totpHelperWithCapture": {
-    "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
+    "message": "Bitwarden có thể lưu trữ và điền mã xác minh 2 bước. Hãy chọn biểu tượng máy ảnh để quét mã QR xác thực của trang web, hoặc sao chép và dán khoá vào ô này."
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "Tìm hiểu thêm về các công cụ xác thực"
   },
   "folder": {
     "message": "Thư mục"
@@ -450,17 +450,17 @@
     "message": "Boolean"
   },
   "cfTypeCheckbox": {
-    "message": "Checkbox"
+    "message": "Hộp chọn"
   },
   "cfTypeLinked": {
     "message": "Đã liên kết",
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "fieldType": {
-    "message": "Field type"
+    "message": "Loại trường"
   },
   "fieldLabel": {
-    "message": "Field label"
+    "message": "Tiêu đề trường"
   },
   "remove": {
     "message": "Xóa"
@@ -483,7 +483,7 @@
     "message": "Chỉnh sửa thư mục"
   },
   "editWithName": {
-    "message": "Edit $ITEM$: $NAME$",
+    "message": "Chỉnh sửa $ITEM$: $NAME$",
     "placeholders": {
       "item": {
         "content": "$1",
@@ -496,16 +496,16 @@
     }
   },
   "newFolder": {
-    "message": "New folder"
+    "message": "Thư mục mới"
   },
   "folderName": {
-    "message": "Folder name"
+    "message": "Tên thư mục"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "Tạo một thư mục con bằng cách thêm tên thư mục cha theo sau là dấu “/”. Ví dụ: Social/Forums"
   },
   "deleteFolderPermanently": {
-    "message": "Are you sure you want to permanently delete this folder?"
+    "message": "Bạn có chắc muốn xóa vĩnh viễn thư mục này?"
   },
   "baseDomain": {
     "message": "Tên miền cơ sở",
@@ -547,12 +547,6 @@
     "message": "Ẩn bớt",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "Tạo mật khẩu"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "Kiểm tra xem mật khẩu có bị lộ không."
   },
@@ -566,7 +560,7 @@
     }
   },
   "passwordSafe": {
-    "message": "Mật khẩu này không tìm thấy trong bất kỳ vụ rò rỉ dữ liệu nào. Nó an toàn để sử dụng."
+    "message": "Không tìm thấy mật khẩu này trong các vụ rò rỉ dữ liệu trước đây. Nó an toàn để sử dụng."
   },
   "save": {
     "message": "Lưu"
@@ -654,7 +648,7 @@
     "message": "Ghi chú"
   },
   "typeSshKey": {
-    "message": "SSH key"
+    "message": "Khóa SSH"
   },
   "typeLoginPlural": {
     "message": "Thông tin đăng nhập"
@@ -687,7 +681,7 @@
     "message": "Họ và tên"
   },
   "address": {
-    "message": "Address"
+    "message": "Địa chỉ"
   },
   "address1": {
     "message": "Địa chỉ 1"
@@ -732,7 +726,7 @@
     "message": "Xem mục"
   },
   "newItemHeader": {
-    "message": "New $TYPE$",
+    "message": "$TYPE$ mới",
     "placeholders": {
       "type": {
         "content": "$1",
@@ -741,7 +735,7 @@
     }
   },
   "editItemHeader": {
-    "message": "Edit $TYPE$",
+    "message": "Chỉnh sửa $TYPE$",
     "placeholders": {
       "type": {
         "content": "$1",
@@ -750,7 +744,7 @@
     }
   },
   "viewItemType": {
-    "message": "View $ITEMTYPE$",
+    "message": "Xem $ITEMTYPE$",
     "placeholders": {
       "itemtype": {
         "content": "$1",
@@ -806,11 +800,11 @@
     "description": "Copy password to clipboard"
   },
   "copyPassphrase": {
-    "message": "Copy passphrase",
+    "message": "Sao chép cụm mật khẩu",
     "description": "Copy passphrase to clipboard"
   },
   "passwordCopied": {
-    "message": "Password copied"
+    "message": "Đã sao chép mật khẩu"
   },
   "copyUsername": {
     "message": "Sao chép tên đăng nhập",
@@ -825,11 +819,11 @@
     "description": "Copy credit card security code (CVV)"
   },
   "copyUri": {
-    "message": "Sao chép URI",
+    "message": "Sao chép đường dẫn",
     "description": "Copy URI to clipboard"
   },
   "copyCustomField": {
-    "message": "Copy $FIELD$",
+    "message": "Sao chép $FIELD$",
     "placeholders": {
       "field": {
         "content": "$1",
@@ -838,38 +832,41 @@
     }
   },
   "copyWebsite": {
-    "message": "Copy website"
+    "message": "Sao chép trang web"
   },
   "copyNotes": {
-    "message": "Copy notes"
+    "message": "Sao chép ghi chú"
   },
   "copyAddress": {
-    "message": "Copy address"
+    "message": "Sao chép địa chỉ"
   },
   "copyPhone": {
-    "message": "Copy phone"
+    "message": "Sao chép số điện thoại"
   },
   "copyEmail": {
-    "message": "Copy email"
+    "message": "Sao chép email"
   },
   "copyCompany": {
-    "message": "Copy company"
+    "message": "Sao chép công ty"
   },
   "copySSN": {
-    "message": "Copy Social Security number"
+    "message": "Sao chép số bảo hiểm xã hội"
   },
   "copyPassportNumber": {
-    "message": "Copy passport number"
+    "message": "Sao chép số hộ chiếu"
   },
   "copyLicenseNumber": {
-    "message": "Copy license number"
+    "message": "Sao chép số giấy phép"
   },
   "copyName": {
-    "message": "Copy name"
+    "message": "Sao chép tên"
   },
   "me": {
     "message": "Tôi"
   },
+  "myItems": {
+    "message": "Các mục của tôi"
+  },
   "myVault": {
     "message": "Kho của tôi"
   },
@@ -883,7 +880,7 @@
     "message": "Kho"
   },
   "vaultItems": {
-    "message": "Vault items"
+    "message": "Các mục trong kho"
   },
   "filter": {
     "message": "Bộ lọc"
@@ -944,7 +941,7 @@
     }
   },
   "itemsMovedToOrg": {
-    "message": "Items moved to $ORGNAME$",
+    "message": "Các mục đã được chuyển tới $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -953,7 +950,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Item moved to $ORGNAME$",
+    "message": "Mục đã được chuyển tới $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -1007,28 +1004,28 @@
     "message": "Cấp độ truy cập"
   },
   "accessing": {
-    "message": "Accessing"
+    "message": "Đang truy cập"
   },
   "loggedOut": {
     "message": "Đã đăng xuất"
   },
   "loggedOutDesc": {
-    "message": "You have been logged out of your account."
+    "message": "Bạn đã đăng xuất khỏi tài khoản của mình."
   },
   "loginExpired": {
     "message": "Phiên đăng nhập của bạn đã hết hạn."
   },
   "restartRegistration": {
-    "message": "Restart registration"
+    "message": "Tiến hành đăng ký lại"
   },
   "expiredLink": {
-    "message": "Expired link"
+    "message": "Liên kết đã hết hạn"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "Please restart registration or try logging in."
+    "message": "Vui lòng đăng ký lại hoặc thử đăng nhập."
   },
   "youMayAlreadyHaveAnAccount": {
-    "message": "You may already have an account"
+    "message": "Bạn có thể đã có tài khoản"
   },
   "logOutConfirmation": {
     "message": "Bạn có chắc muốn đăng xuất?"
@@ -1046,7 +1043,7 @@
     "message": "Không"
   },
   "location": {
-    "message": "Location"
+    "message": "Vị trí"
   },
   "loginOrCreateNewAccount": {
     "message": "Đăng nhập hoặc tạo tài khoản mới để truy cập kho mật khẩu của bạn."
@@ -1058,7 +1055,7 @@
     "message": "Đăng nhập bằng thiết bị phải được thiết lập trong cài đặt của ứng dụng Bitwarden. Dùng cách khác?"
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "Cần một tùy chọn khác?"
   },
   "loginWithMasterPassword": {
     "message": "Đăng nhập bằng mật khẩu chính"
@@ -1073,13 +1070,13 @@
     "message": "Dùng phương thức đăng nhập khác"
   },
   "logInWithPasskey": {
-    "message": "Log in with passkey"
+    "message": "Đăng nhập bằng khóa truy cập"
   },
   "useSingleSignOn": {
-    "message": "Use single sign-on"
+    "message": "Dùng đăng nhập một lần"
   },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "Chào mừng bạn trở lại"
   },
   "invalidPasskeyPleaseTryAgain": {
     "message": "Mã khoá không hợp lệ. Vui lòng thử lại."
@@ -1088,19 +1085,19 @@
     "message": "Chưa hỗ trợ 2FA cho mã khoá. Cập nhật ứng dụng để đăng nhập."
   },
   "loginWithPasskeyInfo": {
-    "message": "Use a generated passkey that will automatically log you in without a password. Biometrics, like facial recognition or fingerprint, or another FIDO2 security method will verify your identity."
+    "message": "Sử dụng khóa truy cập được tạo sẵn để đăng nhập tự động mà không cần mật khẩu. Các phương pháp xác thực sinh trắc học như nhận diện khuôn mặt hoặc vân tay, hoặc phương pháp bảo mật FIDO2 khác sẽ xác minh danh tính của bạn."
   },
   "newPasskey": {
     "message": "Mã khoá mới"
   },
   "learnMoreAboutPasswordless": {
-    "message": "Learn more about passwordless"
+    "message": "Tìm hiểu thêm về công nghệ không cần mật khẩu"
   },
   "creatingPasskeyLoading": {
     "message": "Đang tạo mã khoá..."
   },
   "creatingPasskeyLoadingInfo": {
-    "message": "Keep this window open and follow prompts from your browser."
+    "message": "Giữ cửa sổ này mở và làm theo lời nhắc từ trình duyệt của bạn."
   },
   "errorCreatingPasskey": {
     "message": "Lỗi tạo mã khoá"
@@ -1115,22 +1112,22 @@
     "message": "Đặt tên cho mã khoá của bạn để dễ phân biệt."
   },
   "useForVaultEncryption": {
-    "message": "Use for vault encryption"
+    "message": "Sử dụng để mã hóa kho lưu trữ"
   },
   "useForVaultEncryptionInfo": {
-    "message": "Log in and unlock on supported devices without your master password. Follow the prompts from your browser to finalize setup."
+    "message": "Đăng nhập và mở khóa trên các thiết bị được hỗ trợ mà không cần mật khẩu chính. Làm theo các hướng dẫn từ trình duyệt của bạn để hoàn tất quá trình cài đặt."
   },
   "useForVaultEncryptionErrorReadingPasskey": {
     "message": "Lỗi đọc mã khoá. Hãy thử lại hoặc bỏ tuỳ chọn này."
   },
   "encryptionNotSupported": {
-    "message": "Encryption not supported"
+    "message": "Không hỗ trợ mã hóa"
   },
   "enablePasskeyEncryption": {
     "message": "Thiết lập mã hóa"
   },
   "usedForEncryption": {
-    "message": "Used for encryption"
+    "message": "Dùng để mã hóa"
   },
   "loginWithPasskeyEnabled": {
     "message": "Đăng nhập bằng mã khoá đã bật"
@@ -1163,7 +1160,7 @@
     "message": "Tạo tài khoản"
   },
   "newToBitwarden": {
-    "message": "New to Bitwarden?"
+    "message": "Bạn mới sử dụng Bitwarden?"
   },
   "setAStrongPassword": {
     "message": "Đặt mật khẩu mạnh"
@@ -1181,43 +1178,43 @@
     "message": "Đăng nhập"
   },
   "logInToBitwarden": {
-    "message": "Log in to Bitwarden"
+    "message": "Đăng nhập Bitwarden"
   },
   "enterTheCodeSentToYourEmail": {
-    "message": "Enter the code sent to your email"
+    "message": "Nhập mã được gửi về email của bạn"
   },
   "enterTheCodeFromYourAuthenticatorApp": {
-    "message": "Enter the code from your authenticator app"
+    "message": "Nhập mã từ ứng dụng xác thực của bạn"
   },
   "pressYourYubiKeyToAuthenticate": {
-    "message": "Press your YubiKey to authenticate"
+    "message": "Nhấn YubiKey của bạn để xác thực"
   },
   "authenticationTimeout": {
-    "message": "Authentication timeout"
+    "message": "Thời gian chờ xác thực"
   },
   "authenticationSessionTimedOut": {
-    "message": "The authentication session timed out. Please restart the login process."
+    "message": "Phiên xác thực đã hết thời gian chờ. Vui lòng đăng nhập lại từ đầu."
   },
   "verifyYourIdentity": {
-    "message": "Verify your Identity"
+    "message": "Xác minh danh tính của bạn"
   },
   "weDontRecognizeThisDevice": {
-    "message": "We don't recognize this device. Enter the code sent to your email to verify your identity."
+    "message": "Chúng tôi không nhận diện được thiết bị này. Nhập mã được gửi đến email để xác minh danh tính của bạn."
   },
   "continueLoggingIn": {
-    "message": "Continue logging in"
+    "message": "Tiếp tục đăng nhập"
   },
   "whatIsADevice": {
-    "message": "What is a device?"
+    "message": "Thiết bị là gì?"
   },
   "aDeviceIs": {
-    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+    "message": "Một thiết bị là một bản cài đặt duy nhất của ứng dụng Bitwarden mà bạn đã đăng nhập. Việc cài đặt lại ứng dụng, xóa dữ liệu ứng dụng hoặc xóa cookie có thể khiến thiết bị xuất hiện nhiều lần."
   },
   "logInInitiated": {
-    "message": "Log in initiated"
+    "message": "Bắt đầu đăng nhập"
   },
   "logInRequestSent": {
-    "message": "Request sent"
+    "message": "Đã gửi yêu cầu"
   },
   "submit": {
     "message": "Gửi"
@@ -1250,13 +1247,13 @@
     "message": "Gợi ý mật khẩu chính (tùy chọn)"
   },
   "newMasterPassHint": {
-    "message": "New master password hint (optional)"
+    "message": "Gợi ý mật khẩu chính mới (tùy chọn)"
   },
   "masterPassHintLabel": {
     "message": "Gợi ý mật khẩu chính"
   },
   "masterPassHintText": {
-    "message": "If you forget your password, the password hint can be sent to your email. $CURRENT$/$MAXIMUM$ character maximum.",
+    "message": "Nếu bạn quên mật khẩu, gợi ý mật khẩu có thể được gửi tới email của bạn. $CURRENT$/$MAXIMUM$ ký tự tối đa.",
     "placeholders": {
       "current": {
         "content": "$1",
@@ -1272,22 +1269,22 @@
     "message": "Cài đặt"
   },
   "accountEmail": {
-    "message": "Account email"
+    "message": "Email tài khoản"
   },
   "requestHint": {
-    "message": "Request hint"
+    "message": "Yêu cầu gợi ý"
   },
   "requestPasswordHint": {
-    "message": "Request password hint"
+    "message": "Yêu cầu gợi ý mật khẩu"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Enter your account email address and your password hint will be sent to you"
+    "message": "Nhập địa chỉ email tài khoản của bạn và gợi ý mật khẩu sẽ được gửi đến bạn"
   },
   "getMasterPasswordHint": {
     "message": "Nhận gợi ý mật khẩu chính"
   },
   "emailRequired": {
-    "message": "Yêu cầu có địa chỉ email."
+    "message": "Cần điền địa chỉ email."
   },
   "invalidEmail": {
     "message": "Địa chỉ email không hợp lệ."
@@ -1296,7 +1293,7 @@
     "message": "Yêu cầu mật khẩu chính."
   },
   "confirmMasterPasswordRequired": {
-    "message": "Yêu cầu nhập lại mật khẩu chính."
+    "message": "Cần nhập lại mật khẩu chính."
   },
   "masterPasswordMinlength": {
     "message": "Mật khẩu chính phải có ít nhất $VALUE$ kí tự.",
@@ -1315,10 +1312,10 @@
     "message": "Tài khoản của bạn đã được tạo! Bạn có thể đăng nhập ngay bây giờ."
   },
   "newAccountCreated2": {
-    "message": "Your new account has been created!"
+    "message": "Tài khoản của bạn đã được tạo thành công!"
   },
   "youHaveBeenLoggedIn": {
-    "message": "You have been logged in!"
+    "message": "Bạn đã đăng nhập thành công!"
   },
   "trialAccountCreated": {
     "message": "Đã tạo tài khoản thành công."
@@ -1330,7 +1327,7 @@
     "message": "Xảy ra một lỗi bất ngờ."
   },
   "expirationDateError": {
-    "message": "Please select an expiration date that is in the future."
+    "message": "Vui lòng chọn ngày hết hạn trong tương lai."
   },
   "emailAddress": {
     "message": "Địa chỉ email"
@@ -1339,7 +1336,7 @@
     "message": "Kho của bạn đã khóa"
   },
   "yourAccountIsLocked": {
-    "message": "Your account is locked"
+    "message": "Tài khoản của bạn đã bị khóa"
   },
   "uuid": {
     "message": "UUID"
@@ -1376,7 +1373,7 @@
     "message": "Bạn không có quyền xem tất cả mục trong bộ sưu tập này."
   },
   "youDoNotHavePermissions": {
-    "message": "You do not have permissions to this collection"
+    "message": "Bạn không có quyền truy cập vào bộ sưu tập này"
   },
   "noCollectionsInList": {
     "message": "Chưa có bộ sưu tập nào."
@@ -1403,13 +1400,13 @@
     "message": "Một thông báo đã được gửi đến thiết bị của bạn."
   },
   "notificationSentDevicePart1": {
-    "message": "Unlock Bitwarden on your device or on the "
+    "message": "Mở khóa Bitwarden trên thiết bị của bạn hoặc trên "
   },
   "areYouTryingToAccessYourAccount": {
-    "message": "Are you trying to access your account?"
+    "message": "Bạn đang cố gắng truy cập tài khoản của mình?"
   },
   "accessAttemptBy": {
-    "message": "Access attempt by $EMAIL$",
+    "message": "Cố gắng truy cập bởi $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1418,22 +1415,22 @@
     }
   },
   "confirmAccess": {
-    "message": "Confirm access"
+    "message": "Xác nhận truy cập"
   },
   "denyAccess": {
-    "message": "Deny access"
+    "message": "Từ chối truy cập"
   },
   "notificationSentDeviceAnchor": {
-    "message": "web app"
+    "message": "ứng dụng web"
   },
   "notificationSentDevicePart2": {
-    "message": "Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Hãy đảm bảo rằng cụm từ xác thực khớp với cụm từ bên dưới trước khi phê duyệt."
   },
   "notificationSentDeviceComplete": {
-    "message": "Unlock Bitwarden on your device. Make sure the Fingerprint phrase matches the one below before approving."
+    "message": "Mở khóa Bitwarden trên thiết bị của bạn. Hãy đảm bảo rằng cụm từ xác thực khớp với cụm từ bên dưới trước khi xác nhận."
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "A notification was sent to your device"
+    "message": "Một thông báo đã được gửi đến thiết bị của bạn"
   },
   "versionNumber": {
     "message": "Phiên bản $VERSION_NUMBER$",
@@ -1454,14 +1451,14 @@
     }
   },
   "dontAskAgainOnThisDeviceFor30Days": {
-    "message": "Don't ask again on this device for 30 days"
+    "message": "Không yêu cầu lại trên thiết bị này trong vòng 30 ngày"
   },
   "selectAnotherMethod": {
-    "message": "Select another method",
+    "message": "Chọn phương pháp khác",
     "description": "Select another two-step login method"
   },
   "useYourRecoveryCode": {
-    "message": "Use your recovery code"
+    "message": "Sử dụng mã khôi phục của bạn"
   },
   "insertU2f": {
     "message": "Cắm khóa bảo mật vào cổng USB trên máy tính bạn và bấm nút trên khóa, nếu có."
@@ -1479,7 +1476,7 @@
     "message": "Tùy chọn xác minh hai bước"
   },
   "selectTwoStepLoginMethod": {
-    "message": "Select two-step login method"
+    "message": "Chọn phương pháp đăng nhập hai bước"
   },
   "recoveryCodeDesc": {
     "message": "Bạn bị mất quyền truy cập vào tất cả các dịch vụ xác minh hai bước? Sử dụng mã phục hồi của bạn để tắt chúng trên tài khoản bạn."
@@ -1521,16 +1518,16 @@
     "message": "Sử dụng bất kỳ khóa bảo mật tương thích với WebAuthn nào để truy cập vào tài khoản của bạn."
   },
   "webAuthnMigrated": {
-    "message": "(Migrated from FIDO)"
+    "message": "(Được di chuyển từ FIDO)"
   },
   "openInNewTab": {
-    "message": "Open in new tab"
+    "message": "Mở trong tab mới"
   },
   "emailTitle": {
     "message": "Email"
   },
   "emailDescV2": {
-    "message": "Enter a code sent to your email."
+    "message": "Nhập mã được gửi về email của bạn."
   },
   "continue": {
     "message": "Tiếp tục"
@@ -1542,7 +1539,7 @@
     "message": "Tổ chức"
   },
   "moveToOrgDesc": {
-    "message": "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."
+    "message": "Chọn một tổ chức mà bạn muốn chuyển mục này tới. Việc di chuyển đến một tổ chức sẽ chuyển quyền sở hữu của mục sang tổ chức mà bạn chọn. Bạn sẽ không còn là chủ sở hữu trực tiếp của mục này một khi nó đã được chuyển."
   },
   "collectionsDesc": {
     "message": "Chỉnh sửa những bộ sưu tập mà bạn có chia sẻ mục này. Chỉ những thành viên của tổ chức có quyền quản lý những bộ sưu tập đó mới có thể xem được mục này."
@@ -1557,7 +1554,7 @@
     }
   },
   "deleteSelectedCollectionsDesc": {
-    "message": "$COUNT$ collection(s) will be permanently deleted.",
+    "message": "$COUNT$ bộ sưu tập sẽ bị xóa vĩnh viễn.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1569,7 +1566,7 @@
     "message": "Bạn có chắc chắn muốn tiếp tục không?"
   },
   "moveSelectedItemsDesc": {
-    "message": "Choose a folder that you would like to add the $COUNT$ selected item(s) to.",
+    "message": "Chọn thư mục mà bạn muốn thêm $COUNT$ mục đã chọn vào.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1587,10 +1584,10 @@
     "message": "Sao chép UUID"
   },
   "errorRefreshingAccessToken": {
-    "message": "Access Token Refresh Error"
+    "message": "Lỗi cập nhật token truy cập"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "No refresh token or API keys found. Please try logging out and logging back in."
+    "message": "Bạn có thể đã bị đăng xuất. Vui lòng đăng xuất và đăng nhập lại."
   },
   "warning": {
     "message": "Cảnh báo"
@@ -1605,13 +1602,13 @@
     "message": "Bản xuất này chứa dữ liệu kho bạn và không được mã hóa. Bạn không nên lưu trữ hay gửi tập tin đã xuất thông qua phương thức rủi ro (như email). Vui lòng xóa nó ngay lập tức khi bạn đã sử dụng xong."
   },
   "exportSecretsWarningDesc": {
-    "message": "This export contains your secrets data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it."
+    "message": "Tệp xuất này chứa dữ liệu bí mật của bạn ở định dạng không được mã hóa. Bạn không nên lưu trữ hoặc gửi tệp đã xuất qua các kênh không an toàn (như email). Hãy xóa nó ngay lập tức sau khi bạn hoàn tất việc sử dụng."
   },
   "encExportKeyWarningDesc": {
-    "message": "This export encrypts your data using your account's encryption key. If you ever rotate your account's encryption key you should export again since you will not be able to decrypt this export file."
+    "message": "Quá trình xuất này sẽ mã hóa dữ liệu của bạn bằng khóa mã hóa của tài khoản. Nếu bạn từng thay đổi mã hóa tài khoản của mình, bạn nên xuất lại vì bạn sẽ không thể giải mã tập tin xuất này."
   },
   "encExportAccountWarningDesc": {
-    "message": "Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account."
+    "message": "Khóa mã hóa tài khoản là duy nhất cho mỗi tài khoản Bitwarden, vì vậy bạn không thể nhập tệp xuất được mã hóa vào một tài khoản khác."
   },
   "export": {
     "message": "Xuất"
@@ -1623,22 +1620,22 @@
     "message": "Xuất kho"
   },
   "exportSecrets": {
-    "message": "Export secrets"
+    "message": "Xuất bí mật"
   },
   "fileFormat": {
     "message": "Định dạng tập tin"
   },
   "fileEncryptedExportWarningDesc": {
-    "message": "This file export will be password protected and require the file password to decrypt."
+    "message": "Tệp tin này sẽ được bảo vệ bằng mật khẩu và yêu cầu mật khẩu tệp tin để giải mã."
   },
   "exportPasswordDescription": {
-    "message": "This password will be used to export and import this file"
+    "message": "Mật khẩu này sẽ được dùng để xuất và nhập tập tin này"
   },
   "confirmMasterPassword": {
     "message": "Nhập lại mật khẩu chính"
   },
   "confirmFormat": {
-    "message": "Confirm format"
+    "message": "Xác nhận định dạng"
   },
   "filePassword": {
     "message": "Mật khẩu tập tin"
@@ -1647,13 +1644,13 @@
     "message": "Nhập lại mật khẩu tập tin"
   },
   "accountRestrictedOptionDescription": {
-    "message": "Use your account encryption key, derived from your account's username and Master Password, to encrypt the export and restrict import to only the current Bitwarden account."
+    "message": "Sử dụng khóa mã hóa tài khoản của bạn, được tạo từ tên đăng nhập và mật khẩu chính của bạn để mã hóa tệp xuất và giới hạn việc nhập chỉ cho tài khoản Bitwarden hiện tại."
   },
   "passwordProtectedOptionDescription": {
-    "message": "Set a file password to encrypt the export and import it to any Bitwarden account using the password for decryption."
+    "message": "Thiết lập mật khẩu cho tệp để mã hóa dữ liệu xuất và nhập nó vào bất kỳ tài khoản Bitwarden nào bằng cách sử dụng mật khẩu đó để giải mã."
   },
   "exportTypeHeading": {
-    "message": "Export type"
+    "message": "Xuất kiểu"
   },
   "accountRestricted": {
     "message": "Tài khoản bị hạn chế"
@@ -1691,7 +1688,7 @@
     "description": "deprecated. Use avoidAmbiguous instead."
   },
   "avoidAmbiguous": {
-    "message": "Avoid ambiguous characters",
+    "message": "Tránh các ký tự dễ nhầm lẫn",
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "length": {
@@ -1729,32 +1726,32 @@
     "message": "Bao gồm cả số"
   },
   "generatorPolicyInEffect": {
-    "message": "Enterprise policy requirements have been applied to your generator options.",
+    "message": "Các yêu cầu chính sách của doanh nghiệp đã được áp dụng cho các tùy chọn trình tạo của bạn.",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "passwordHistory": {
     "message": "Lịch sử mật khẩu"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "Lịch sử trình tạo"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "Dọn dẹp lịch sử trình tạo"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "Nếu bạn tiếp tục, tất cả các mục sẽ bị xóa vĩnh viễn khỏi lịch sử của trình tạo. Bạn có chắc chắn muốn tiếp tục không?"
   },
   "noPasswordsInList": {
     "message": "Chưa có mật khẩu."
   },
   "clearHistory": {
-    "message": "Clear history"
+    "message": "Xóa lịch sử"
   },
   "nothingToShow": {
-    "message": "Nothing to show"
+    "message": "Không có gì để hiển thị"
   },
   "nothingGeneratedRecently": {
-    "message": "You haven't generated anything recently"
+    "message": "Bạn chưa tạo gì gần đây"
   },
   "clear": {
     "message": "Xóa",
@@ -1767,7 +1764,7 @@
     "message": "Thay đổi địa chỉ email"
   },
   "changeEmailTwoFactorWarning": {
-    "message": "Proceeding will change your account email address. It will not change the email address used for two-step login authentication. You can change this email address in the two-step login settings."
+    "message": "Thao tác này sẽ thay đổi địa chỉ email tài khoản của bạn. Nó sẽ không thay đổi địa chỉ email được sử dụng cho xác thực đăng nhập hai bước. Bạn có thể thay đổi địa chỉ email này trong cài đặt xác thực đăng nhập hai bước."
   },
   "newEmail": {
     "message": "Địa chỉ email mới"
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "Sẽ đăng xuất bạn ra khỏi phiên hiện tại, sau đó cần đăng nhập lại. Những phiên trên các thiết bị khác sẽ tiếp tục có hiệu lực lên đến 1 tiếng."
   },
+  "changePasswordWarning": {
+    "message": "Sau khi thay đổi mật khẩu, bạn cần đăng nhập lại bằng mật khẩu mới. Các phiên đăng nhập đang hoạt động trên các thiết bị khác sẽ bị đăng xuất trong vòng một giờ."
+  },
   "emailChanged": {
     "message": "Đã thay đổi email"
   },
@@ -1794,10 +1794,10 @@
     "message": "Hãy đăng nhập lại."
   },
   "currentSession": {
-    "message": "Current session"
+    "message": "Phiên hiện tại"
   },
   "requestPending": {
-    "message": "Request pending"
+    "message": "Yêu cầu đang chờ xử lý"
   },
   "logBackInOthersToo": {
     "message": "Vui lòng đăng nhập lại. Nếu bạn đang dùng những ứng dụng Bitwarden khác, vui lòng đăng xuất and đăng nhập lại những ứng dụng đó."
@@ -1845,17 +1845,17 @@
     }
   },
   "kdfMemory": {
-    "message": "KDF memory (MB)",
+    "message": "Bộ nhớ KDF (MB)",
     "description": "Memory refers to computer memory (RAM). MB is short for megabytes."
   },
   "argon2Warning": {
-    "message": "Setting your KDF iterations, memory, and parallelism too high could result in poor performance when logging into (and unlocking) Bitwarden on slower or older devices. We recommend changing these individually in small increments and then test all of your devices."
+    "message": "Việc đặt giá trị số lần lặp (KDF iterations), bộ nhớ (memory) và song song (parallelism) quá cao có thể dẫn đến hiệu suất kém khi đăng nhập (và mở khóa) Bitwarden trên các thiết bị chậm hoặc đời cũ. Chúng tôi khuyên bạn nên thay đổi từng cài đặt một cách từ từ, sau đó kiểm tra trên tất cả các thiết bị của mình."
   },
   "kdfParallelism": {
-    "message": "KDF parallelism"
+    "message": "KDF song song"
   },
   "argon2Desc": {
-    "message": "Higher KDF iterations, memory, and parallelism can help protect your master password from being brute forced by an attacker."
+    "message": "Số lần lặp KDF cao hơn, bộ nhớ và khả năng song song có thể giúp bảo vệ mật khẩu chính của bạn khỏi bị tấn công bằng phương pháp dò tìm (brute force) từ phía kẻ tấn công."
   },
   "changeKdf": {
     "message": "Thay đổi KDF"
@@ -1876,31 +1876,31 @@
     "message": "Sẽ đăng xuất bạn ra khỏi phiên hiện tại, sau đó cần đăng nhập lại. Bạn cũng sẽ phải đăng nhập hai bước lại nếu bạn có đăng nhập hai bước. Những phiên đăng nhập trên các thiết bị khác sẽ tiếp tục có hiệu lực lên đến 1 tiếng."
   },
   "newDeviceLoginProtection": {
-    "message": "New device login"
+    "message": "Đăng nhập thiết bị mới"
   },
   "turnOffNewDeviceLoginProtection": {
-    "message": "Turn off new device login protection"
+    "message": "Tắt tính năng bảo vệ đăng nhập thiết bị mới"
   },
   "turnOnNewDeviceLoginProtection": {
-    "message": "Turn on new device login protection"
+    "message": "Bật tính năng bảo vệ đăng nhập thiết bị mới"
   },
   "turnOffNewDeviceLoginProtectionModalDesc": {
-    "message": "Proceed below to turn off the verification emails bitwarden sends when you login from a new device."
+    "message": "Tiếp tục bên dưới để tắt tính năng gửi email cảnh báo mà Bitwarden gửi khi bạn đăng nhập từ một thiết bị mới."
   },
   "turnOnNewDeviceLoginProtectionModalDesc": {
-    "message": "Proceed below to have bitwarden send you verification emails when you login from a new device."
+    "message": "Tiếp tục bên dưới để Bitwarden gửi cho bạn email cảnh báo khi bạn đăng nhập từ một thiết bị mới."
   },
   "turnOffNewDeviceLoginProtectionWarning": {
-    "message": "With new device login protection turned off, anyone with your master password can access your account from any device. To protect your account without verification emails, set up two-step login."
+    "message": "Khi tính năng bảo vệ đăng nhập thiết bị mới bị tắt, bất kỳ ai có mật khẩu chính của bạn đều có thể truy cập tài khoản của bạn từ bất kỳ thiết bị nào. Để bảo vệ tài khoản mà không cần cảnh báo qua email, hãy thiết lập tính năng đăng nhập hai bước."
   },
   "accountNewDeviceLoginProtectionSaved": {
-    "message": "New device login protection changes saved"
+    "message": "Các thay đổi về bảo vệ đăng nhập thiết bị mới đã được lưu."
   },
   "sessionsDeauthorized": {
     "message": "Tất cả phiên đăng nhập đã bị gỡ"
   },
   "accountIsOwnedMessage": {
-    "message": "This account is owned by $ORGANIZATIONNAME$",
+    "message": "Tài khoản này thuộc sở hữu của $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -1915,7 +1915,7 @@
     "message": "Đã xóa kho tổ chức."
   },
   "vaultAccessedByProvider": {
-    "message": "Vault accessed by Provider."
+    "message": "Kho lưu trữ được truy cập bởi Nhà cung cấp."
   },
   "purgeVaultDesc": {
     "message": "Tiếp tục để xóa hết tất cả mục và thư mục trong kho của bạn. Những mục thuộc về tổ chức mà bạn chia sẻ sẽ không bị xóa."
@@ -1942,10 +1942,10 @@
     "message": "Tài khoản đã được xóa"
   },
   "accountDeletedDesc": {
-    "message": "Đã đóng tài khoản của bạn và tất cả những dữ liệu liên quan cũng được xóa."
+    "message": "Đã đóng tài khoản của bạn và đã xóa tất cả những dữ liệu liên quan."
   },
   "deleteOrganizationWarning": {
-    "message": "Deleting your organization is permanent. It cannot be undone."
+    "message": "Tổ \u001d\u001d\u001dchức sẽ bị xóa vĩnh viễn và không thể hoàn tác."
   },
   "myAccount": {
     "message": "Tài khoản của tôi"
@@ -1957,30 +1957,30 @@
     "message": "Nhập dữ liệu"
   },
   "onboardingImportDataDetailsPartOne": {
-    "message": "If you don't have any data to import, you can create a ",
+    "message": "Nếu bạn không có dữ liệu nào để nhập, bạn có thể tạo một ",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsLink": {
-    "message": "new item",
+    "message": "mục mới",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsLoginLink": {
-    "message": "new login",
+    "message": "đăng nhập mới",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new login instead. (Optional second half: You may need to wait until your administrator confirms your organization membership.)"
   },
   "onboardingImportDataDetailsPartTwoNoOrgs": {
-    "message": " instead.",
+    "message": " thay thế.",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead."
   },
   "onboardingImportDataDetailsPartTwoWithOrgs": {
-    "message": " instead. You may need to wait until your administrator confirms your organization membership.",
+    "message": " thay thế. Bạn có thể cần phải chờ cho đến khi quản trị viên xác nhận tư cách thành viên của tổ chức của bạn.",
     "description": "This will be part of a larger sentence, that will read like this: If you don't have any data to import, you can create a new item instead. You may need to wait until your administrator confirms your organization membership."
   },
   "importError": {
     "message": "Lỗi nhập"
   },
   "importErrorDesc": {
-    "message": "There was a problem with the data you tried to import. Please resolve the errors listed below in your source file and try again."
+    "message": "Có vấn đề với dữ liệu bạn đang cố gắng nhập. Vui lòng khắc phục các lỗi được liệt kê bên dưới trong tệp nguồn của bạn và thử lại."
   },
   "importSuccess": {
     "message": "Dữ liệu đã được nhập vào kho thành công."
@@ -1998,7 +1998,7 @@
     "message": "Đã xuất dữ liệu thành công"
   },
   "importWarning": {
-    "message": "You are importing data to $ORGANIZATION$. Your data may be shared with members of this organization. Do you want to proceed?",
+    "message": "Bạn đang nhập dữ liệu vào $ORGANIZATION$. Dữ liệu của bạn có thể được chia sẻ với các thành viên của tổ chức này. Bạn có muốn tiếp tục không?",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -2013,22 +2013,22 @@
     "message": "Không có gì được nhập."
   },
   "importEncKeyError": {
-    "message": "Error decrypting the exported file. Your encryption key does not match the encryption key used export the data."
+    "message": "Lỗi giải mã tập tin đã xuất. Khóa mã hóa của bạn không khớp với khóa mã hóa được sử dụng để xuất dữ liệu."
   },
   "destination": {
-    "message": "Destination"
+    "message": "Đến"
   },
   "learnAboutImportOptions": {
-    "message": "Learn about your import options"
+    "message": "Tìm hiểu các tuỳ chọn nhập của bạn"
   },
   "selectImportFolder": {
-    "message": "Select a folder"
+    "message": "Chọn thư mục"
   },
   "selectImportCollection": {
-    "message": "Select a collection"
+    "message": "Chọn bộ sưu tập"
   },
   "importTargetHint": {
-    "message": "Select this option if you want the imported file contents moved to a $DESTINATION$",
+    "message": "Chọn tùy chọn này nếu bạn muốn nội dung của tệp đã nhập được di chuyển đến $DESTINATION$",
     "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.",
     "placeholders": {
       "destination": {
@@ -2038,7 +2038,7 @@
     }
   },
   "importUnassignedItemsError": {
-    "message": "File contains unassigned items."
+    "message": "Tập tin chứa các mục không xác định."
   },
   "selectFormat": {
     "message": "Chọn định dạng xuất"
@@ -2087,7 +2087,7 @@
     "message": "Hiện biểu tượng trang web"
   },
   "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+    "message": "Hiện logo trang web bên cạnh mỗi đăng nhập."
   },
   "default": {
     "message": "Mặc định"
@@ -2096,13 +2096,13 @@
     "message": "Quy tắc tên miền"
   },
   "domainRulesDesc": {
-    "message": "If you have the same login across multiple different website domains, you can mark the website as \"equivalent\". \"Global\" domains are ones already created for you by Bitwarden."
+    "message": "Nếu bạn sử dụng cùng một tài khoản đăng nhập trên nhiều tên miền website khác nhau, bạn có thể đánh dấu website đó là \"tương đương\". Các tên miền \"Toàn cầu\" là những tên miền đã được Bitwarden tạo sẵn cho bạn."
   },
   "globalEqDomains": {
-    "message": "Global equivalent domains"
+    "message": "Các tên miền tương đương toàn cầu"
   },
   "customEqDomains": {
-    "message": "Custom equivalent domains"
+    "message": "Tên miền tương đương tùy chỉnh"
   },
   "exclude": {
     "message": "Ngoại trừ"
@@ -2117,10 +2117,10 @@
     "message": "Tên miền tùy biến mới"
   },
   "newCustomDomainDesc": {
-    "message": "Enter a list of domains separated by commas. Only \"base\" domains are allowed. Do not enter subdomains. For example, enter \"google.com\" instead of \"www.google.com\". You can also enter \"androidapp://package.name\" to associate an android app with other website domains."
+    "message": "Nhập danh sách các tên miền cách nhau bằng dấu phẩy. Chỉ các tên miền \"cơ sở\" mới được phép. Không nhập các tên miền con. Ví dụ: nhập \"google.com\" thay vì \"www.google.com\". Bạn cũng có thể nhập \"androidapp://package.name\" để liên kết ứng dụng Android với các tên miền trang web khác."
   },
   "customDomainX": {
-    "message": "Custom domain $INDEX$",
+    "message": "Tên miền tùy chỉnh $INDEX$",
     "placeholders": {
       "index": {
         "content": "$1",
@@ -2135,32 +2135,44 @@
     "message": "Đăng nhập 2-bước"
   },
   "twoStepLoginEnforcement": {
-    "message": "Two-step Login Enforcement"
+    "message": "Bắt buộc đăng nhập hai bước"
   },
   "twoStepLoginDesc": {
     "message": "Bảo mật tài khoản bằng các phương pháp sau khi đăng nhập."
   },
   "twoStepLoginTeamsDesc": {
-    "message": "Enable two-step login for your organization."
+    "message": "Bật tính năng đăng nhập hai bước cho tổ chức của bạn."
   },
   "twoStepLoginEnterpriseDescStart": {
-    "message": "Enforce Bitwarden Two-step Login options for members by using the ",
+    "message": "Áp dụng các tùy chọn đăng nhập hai bước của Bitwarden cho thành viên bằng cách sử dụng ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enforce Bitwarden Two-step Login options for members by using the Two-step Login Policy.'"
   },
   "twoStepLoginPolicy": {
-    "message": "Two-step Login Policy"
+    "message": "Chính sách đăng nhập hai bước"
   },
   "twoStepLoginOrganizationDuoDesc": {
-    "message": "To enforce Two-step Login through Duo, use the options below."
+    "message": "Để áp dụng tính năng Đăng nhập hai bước thông qua Duo, hãy sử dụng các tùy chọn dưới đây."
   },
   "twoStepLoginOrganizationSsoDesc": {
-    "message": "If you have setup SSO or plan to, Two-step Login may already be enforced through your Identity Provider."
+    "message": "Nếu bạn đã thiết lập SSO hoặc có kế hoạch thiết lập, tính năng Đăng nhập hai bước có thể đã được áp dụng thông qua Nhà cung cấp danh tính của bạn."
   },
   "twoStepLoginRecoveryWarning": {
-    "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
+    "message": "Cài đặt đăng nhập hai bước có thể khiến bạn mất quyền truy cập vĩnh viễn tài khoản Bitwarden của mình. Mã khôi phục cho phép bạn truy cập tài khoản trong trường hợp bạn không thể sử dụng nhà cung cấp đăng nhập hai bước thông thường (ví dụ: bạn mất thiết bị). Bộ phận hỗ trợ Bitwarden sẽ không thể giúp bạn nếu bạn mất quyền truy cập vào tài khoản. Chúng tôi khuyên bạn nên ghi lại hoặc in mã khôi phục và giữ nó ở nơi an toàn."
+  },
+  "restrictedItemTypePolicy": {
+    "message": "Xóa loại mục thẻ"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Không cho phép thành viên tạo loại mục thẻ. Các thẻ hiện có sẽ bị xóa tự động."
+  },
+  "restrictCardTypeImport": {
+    "message": "Không thể nhập mục thẻ"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "Một chính sách được thiết lập bởi 1 hoặc nhiều tổ chức ngăn bạn nhập thẻ vào kho của mình."
   },
   "yourSingleUseRecoveryCode": {
-    "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
+    "message": "Mã khôi phục sử dụng một lần của bạn có thể được sử dụng để tắt tính năng đăng nhập hai bước trong trường hợp bạn mất quyền truy cập vào nhà cung cấp dịch vụ đăng nhập hai bước. Bitwarden khuyến nghị bạn ghi lại mã khôi phục và lưu trữ nó ở nơi an toàn."
   },
   "viewRecoveryCode": {
     "message": "Xem mã khôi phục"
@@ -2201,49 +2213,52 @@
     "message": "Quản lý"
   },
   "manageCollection": {
-    "message": "Manage collection"
+    "message": "Quản lý bộ sưu tập"
   },
   "viewItems": {
-    "message": "View items"
+    "message": "Xem mục"
   },
   "viewItemsHidePass": {
-    "message": "View items, hidden passwords"
+    "message": "Xem các mục, ẩn các mật khẩu"
   },
   "editItems": {
-    "message": "Edit items"
+    "message": "Chỉnh sửa mục"
   },
   "editItemsHidePass": {
-    "message": "Edit items, hidden passwords"
+    "message": "Sửa các mục, ẩn các mật khẩu"
   },
   "disable": {
     "message": "Vô hiệu hoá"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Không tìm thấy thông tin thành viên."
+  },
   "revokeAccess": {
     "message": "Thu hồi quyền truy cập"
   },
   "revoke": {
-    "message": "Revoke"
+    "message": "Thu hồi"
   },
   "twoStepLoginProviderEnabled": {
-    "message": "This two-step login provider is active on your account."
+    "message": "Nhà cung cấp đăng nhập hai bước này đang hoạt động trên tài khoản của bạn."
   },
   "twoStepLoginAuthDesc": {
     "message": "Vui lòng nhập mật khẩu chính để chỉnh sửa cài đặt đăng nhập hai bước."
   },
   "twoStepAuthenticatorInstructionPrefix": {
-    "message": "Download an authenticator app such as"
+    "message": "Tải xuống ứng dụng xác thực như"
   },
   "twoStepAuthenticatorInstructionInfix1": {
     "message": ","
   },
   "twoStepAuthenticatorInstructionInfix2": {
-    "message": "or"
+    "message": "hoặc"
   },
   "twoStepAuthenticatorInstructionSuffix": {
     "message": "."
   },
   "continueToExternalUrlTitle": {
-    "message": "Continue to $URL$?",
+    "message": "Đi đến $URL$?",
     "placeholders": {
       "url": {
         "content": "$1",
@@ -2252,25 +2267,25 @@
     }
   },
   "continueToExternalUrlDesc": {
-    "message": "You are leaving Bitwarden and launching an external website in a new window."
+    "message": "Bạn đang rời khỏi Bitwarden và mở một trang web bên ngoài trong một cửa sổ mới."
   },
   "twoStepContinueToBitwardenUrlTitle": {
-    "message": "Continue to bitwarden.com?"
+    "message": "Tiếp tục tới bitwarden.com?"
   },
   "twoStepContinueToBitwardenUrlDesc": {
-    "message": "Bitwarden Authenticator allows you to store authenticator keys and generate TOTP codes for 2-step verification flows. Learn more on the bitwarden.com website."
+    "message": "Trình xác thực Bitwarden cho phép bạn lưu trữ các khóa xác thực và tạo mã TOTP cho quy trình xác thực hai bước. Tìm hiểu thêm trên trang web bitwarden.com."
   },
   "twoStepAuthenticatorScanCodeV2": {
-    "message": "Scan the QR code below with your authenticator app or enter the key."
+    "message": "Quét mã QR bên dưới bằng ứng dụng xác thực của bạn hoặc nhập khóa."
   },
   "twoStepAuthenticatorQRCanvasError": {
-    "message": "Could not load QR code. Try again or use the key below."
+    "message": "Không thể tải mã QR. Vui lòng thử lại hoặc sử dụng khóa bên dưới."
   },
   "key": {
     "message": "Khóa"
   },
   "twoStepAuthenticatorEnterCodeV2": {
-    "message": "Verification code"
+    "message": "Mã xác minh"
   },
   "twoStepAuthenticatorReaddDesc": {
     "message": "Trong trường hợp bạn cần thêm thiết bị khác, ở dưới là mã QR (hoặc khóa) được yêu cầu bởi ứng dụng xác thực."
@@ -2288,7 +2303,7 @@
     "message": "Cắm khóa YubiKey vào cổng USB máy tính của bạn."
   },
   "twoFactorYubikeySelectKey": {
-    "message": "Select the first empty YubiKey input field below."
+    "message": "Chọn ô nhập liệu YubiKey trống đầu tiên bên dưới."
   },
   "twoFactorYubikeyTouchButton": {
     "message": "Chạm vào nút bấm trên YubiKey."
@@ -2300,7 +2315,7 @@
     "message": "Do giới hạn của hệ điều hành, YubiKey không thể xài hết được trên các ứng dụng Bitwarden. Bạn nên đăng ký thêm một phương pháp xác thực 2 bước khác khi mà YubiKey không xài được. Hỗ trợ hệ điều hành:"
   },
   "twoFactorYubikeySupportUsb": {
-    "message": "Web vault, desktop application, CLI, and all browser extensions on a device with a USB port that can accept your YubiKey."
+    "message": "Kho lưu trữ web, ứng dụng máy tính, giao diện dòng lệnh (CLI) và tất cả các tiện ích mở rộng trình duyệt trên thiết bị có cổng USB có thể chấp nhận YubiKey của bạn."
   },
   "twoFactorYubikeySupportMobile": {
     "message": "Ứng dụng di động trên thiết bị có khả năng NFC hoặc cổng USB có thể chấp nhận YubiKey của bạn."
@@ -2324,7 +2339,7 @@
     }
   },
   "webAuthnkeyX": {
-    "message": "WebAuthn Key $INDEX$",
+    "message": "Khóa WebAuthn $INDEX$",
     "placeholders": {
       "index": {
         "content": "$1",
@@ -2345,43 +2360,43 @@
     "message": "Đã cập nhật YubiKey"
   },
   "disableAllKeys": {
-    "message": "Deactivate all keys"
+    "message": "Vô hiệu hóa tất cả các khóa"
   },
   "twoFactorDuoDesc": {
-    "message": "Enter the Bitwarden application information from your Duo Admin panel."
+    "message": "Nhập thông tin ứng dụng Bitwarden từ bảng điều khiển Duo Admin của bạn."
   },
   "twoFactorDuoClientId": {
     "message": "Client Id"
   },
   "twoFactorDuoClientSecret": {
-    "message": "Client Secret"
+    "message": "Khóa bí mật của khách hàng"
   },
   "twoFactorDuoApiHostname": {
     "message": "API hostname"
   },
   "twoFactorEmailDesc": {
-    "message": "Follow these steps to set up two-step login with email:"
+    "message": "Làm theo hướng dẫn để thiết lập đăng nhập 2 bước với email:"
   },
   "twoFactorEmailEnterEmail": {
-    "message": "Enter the email that you wish to receive verification codes"
+    "message": "Nhập địa chỉ email mà bạn muốn nhận mã xác minh"
   },
   "twoFactorEmailEnterCode": {
-    "message": "Enter the resulting 6 digit verification code from the email"
+    "message": "Vui lòng nhập mã 6 chữ số được gửi về email"
   },
   "sendEmail": {
     "message": "Gửi email"
   },
   "twoFactorU2fAdd": {
-    "message": "Add a FIDO U2F security key to your account"
+    "message": "Thêm khóa bảo mật FIDO U2F vào tài khoản của bạn"
   },
   "removeU2fConfirmation": {
     "message": "Bạn có chắc muốn xóa khóa bảo mật này?"
   },
   "twoFactorWebAuthnAdd": {
-    "message": "Add a WebAuthn security key to your account"
+    "message": "Thêm khóa bảo mật WebAuthn vào tài khoản của bạn"
   },
   "readKey": {
-    "message": "Read key"
+    "message": "Đọc khóa"
   },
   "keyCompromised": {
     "message": "Khóa bị lộ."
@@ -2402,25 +2417,25 @@
     "message": "Do giới hạn của hệ điều hành, FIDO U2F không thể xài hết được trên các ứng dụng Bitwarden. Bạn nên đăng ký thêm một phương pháp xác thực 2 bước khác khi mà FIDO U2F không xài được. Hỗ trợ hệ điều hành:"
   },
   "twoFactorU2fSupportWeb": {
-    "message": "Web vault and browser extensions on a desktop/laptop with a U2F supported browser (Chrome, Opera, Vivaldi, or Firefox with FIDO U2F turned on)."
+    "message": "Kho lưu trữ web và tiện ích mở rộng trình duyệt trên máy tính để bàn/laptop sử dụng trình duyệt hỗ trợ U2F (Chrome, Opera, Vivaldi hoặc Firefox với tính năng FIDO U2F đã được kích hoạt)."
   },
   "twoFactorU2fWaiting": {
-    "message": "Waiting for you to touch the button on your security key"
+    "message": "Đang chờ bạn nhấn nút trên chìa khóa bảo mật của bạn"
   },
   "twoFactorU2fClickSave": {
-    "message": "Use the \"Save\" button below to activate this security key for two-step login."
+    "message": "Nhấn nút \"Lưu\" bên dưới để kích hoạt khóa bảo mật này cho tính năng đăng nhập hai bước."
   },
   "twoFactorU2fProblemReadingTryAgain": {
-    "message": "There was a problem reading the security key. Try again."
+    "message": "Có vấn đề khi đọc khóa bảo mật. Vui lòng thử lại."
   },
   "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
+    "message": "Do hạn chế của nền tảng, WebAuthn không thể sử dụng trên tất cả các ứng dụng Bitwarden. Bạn nên thiết lập một nhà cung cấp đăng nhập hai bước khác để có thể truy cập tài khoản của mình khi WebAuthn không thể sử dụng."
   },
   "twoFactorRecoveryYourCode": {
-    "message": "Your Bitwarden two-step login recovery code"
+    "message": "Mã khôi phục đăng nhập hai bước của Bitwarden"
   },
   "twoFactorRecoveryNoCode": {
-    "message": "You have not set up any two-step login providers yet. After you have set up a two-step login provider you can check back here for your recovery code."
+    "message": "Bạn chưa thiết lập bất kỳ nhà cung cấp xác thực hai bước nào. Sau khi thiết lập nhà cung cấp xác thực hai bước, bạn có thể quay lại đây để lấy mã khôi phục."
   },
   "printCode": {
     "message": "Mã in",
@@ -2430,24 +2445,24 @@
     "message": "Báo cáo"
   },
   "reportsDesc": {
-    "message": "Identify and close security gaps in your online accounts by clicking the reports below.",
+    "message": "Xác định và khắc phục các lỗ hổng bảo mật trong tài khoản trực tuyến của bạn bằng cách nhấp vào các báo cáo bên dưới.",
     "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization vault."
   },
   "orgsReportsDesc": {
-    "message": "Identify and close security gaps in your organization's accounts by clicking the reports below.",
+    "message": "Xác định và khắc phục các lỗ hổng bảo mật trong tài khoản của tổ chức bằng cách nhấp vào các báo cáo bên dưới.",
     "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization vault."
   },
   "unsecuredWebsitesReport": {
     "message": "Trang web không an toàn"
   },
   "unsecuredWebsitesReportDesc": {
-    "message": "URLs that start with http:// don’t use the best available encryption. Change the login URIs for these accounts to https:// for safer browsing."
+    "message": "Các URL bắt đầu bằng http:// không được mã hóa. Hãy thay đổi các URL đăng nhập cho các tài khoản này thành https:// để đảm bảo an toàn khi duyệt web."
   },
   "unsecuredWebsitesFound": {
     "message": "Tìm thấy trang web không an toàn"
   },
   "unsecuredWebsitesFoundReportDesc": {
-    "message": "We found $COUNT$ items in your $VAULT$ with unsecured URIs. You should change their URI scheme to https:// if the website allows it.",
+    "message": "Chúng tôi đã phát hiện $COUNT$ mục trong $VAULT$ của bạn có các đường dẫn không an toàn. Bạn nên thay đổi địa chỉ đường dẫn của chúng thành https:// nếu trang web cho phép.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2460,19 +2475,19 @@
     }
   },
   "noUnsecuredWebsites": {
-    "message": "No items in your vault have unsecured URIs."
+    "message": "Không có mục nào trong kho lưu trữ của bạn chứa các đường dẫn không bảo mật."
   },
   "inactive2faReport": {
-    "message": "Inactive two-step login"
+    "message": "Đăng nhập hai bước không hoạt động"
   },
   "inactive2faReportDesc": {
     "message": "Đăng nhập hai bước sẽ thêm một lớp bảo vệ cho tài khoản của bạn. Thiết lập đăng nhập hai bước bằng trình xác thực Bitwarden cho các tài khoản này hoặc sử dụng phương pháp thay thế."
   },
   "inactive2faFound": {
-    "message": "Logins without two-step login found"
+    "message": "Đăng nhập không sử dụng xác thực hai yếu tố đã được phát hiện"
   },
   "inactive2faFoundReportDesc": {
-    "message": "We found $COUNT$ website(s) in your $VAULT$ that may not be configured with two-step login (according to 2fa.directory). To further protect these accounts, you should set up two-step login.",
+    "message": "Chúng tôi đã tìm thấy $COUNT$ trang web trong $VAULT$ của bạn có thể chưa được cấu hình với tính năng đăng nhập hai bước (theo 2fa.directory). Để bảo vệ thêm cho các tài khoản này, bạn nên thiết lập tính năng đăng nhập hai bước.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2494,13 +2509,13 @@
     "message": "Mật khẩu bị rò rỉ"
   },
   "exposedPasswordsReportDesc": {
-    "message": "Passwords exposed in a data breach are easy targets for attackers. Change these passwords to prevent potential break-ins."
+    "message": "Mật khẩu bị lộ trong một vụ vi phạm dữ liệu là mục tiêu dễ dàng cho các tin tặc. Hãy thay đổi các mật khẩu này để ngăn chặn các cuộc tấn công tiềm ẩn."
   },
   "exposedPasswordsFound": {
     "message": "Phát hiện mật khẩu bị rò rĩ"
   },
   "exposedPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ items in your $VAULT$ that have passwords that were exposed in known data breaches. You should change them to use a new password.",
+    "message": "Chúng tôi đã phát hiện $COUNT$ mục trong $VAULT$ của bạn có mật khẩu bị lộ trong các vụ vi phạm dữ liệu đã biết. Bạn nên thay đổi chúng sang mật khẩu mới.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2513,16 +2528,16 @@
     }
   },
   "noExposedPasswords": {
-    "message": "No items in your vault have passwords that have been exposed in known data breaches."
+    "message": "Không có mục nào trong kho lưu trữ của bạn có mật khẩu bị lộ trong các vụ vi phạm dữ liệu đã được biết đến."
   },
   "checkExposedPasswords": {
     "message": "Kiểm tra mật khẩu bị rò rỉ"
   },
   "timesExposed": {
-    "message": "Times exposed"
+    "message": "Thời gian bị lộ"
   },
   "exposedXTimes": {
-    "message": "Exposed $COUNT$ time(s)",
+    "message": "Đã hiển thị $COUNT$ lần",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2540,7 +2555,7 @@
     "message": "Phát hiện mật khẩu yếu"
   },
   "weakPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ items in your $VAULT$ with passwords that are not strong. You should update them to use stronger passwords.",
+    "message": "Chúng tôi đã phát hiện $COUNT$ mục trong $VAULT$ của bạn có mật khẩu không đủ mạnh. Bạn nên cập nhật mật khẩu mạnh hơn cho chúng.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2553,22 +2568,22 @@
     }
   },
   "noWeakPasswords": {
-    "message": "No items in your vault have weak passwords."
+    "message": "Không có mục nào trong kho lưu trữ của bạn có mật khẩu yếu."
   },
   "weakness": {
-    "message": "Weakness"
+    "message": "Điểm yếu"
   },
   "reusedPasswordsReport": {
     "message": "Mật khẩu bị trùng"
   },
   "reusedPasswordsReportDesc": {
-    "message": "Reusing passwords makes it easier for attackers to break into multiple accounts. Change these passwords so that each is unique."
+    "message": "Sử dụng lại mật khẩu sẽ khiến tin tặc dễ dàng xâm nhập vào nhiều tài khoản. Hãy thay đổi các mật khẩu này sao cho mỗi mật khẩu là duy nhất."
   },
   "reusedPasswordsFound": {
     "message": "Phát hiện mật khẩu bị trùng"
   },
   "reusedPasswordsFoundReportDesc": {
-    "message": "We found $COUNT$ passwords that are being reused in your $VAULT$. You should change them to a unique value.",
+    "message": "Chúng tôi đã phát hiện $COUNT$ mật khẩu đang được sử dụng lại trong $VAULT$ của bạn. Bạn nên thay đổi chúng thành các giá trị duy nhất.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2581,13 +2596,13 @@
     }
   },
   "noReusedPasswords": {
-    "message": "No logins in your vault have passwords that are being reused."
+    "message": "Không có tài khoản nào trong kho lưu trữ của bạn sử dụng lại các mật khẩu."
   },
   "timesReused": {
-    "message": "Times reused"
+    "message": "Số lần sử dụng lại"
   },
   "reusedXTimes": {
-    "message": "Reused $COUNT$ times",
+    "message": "Sư dụng lại $COUNT$ lần",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2599,16 +2614,16 @@
     "message": "Dữ liệu bị rò rĩ"
   },
   "breachDesc": {
-    "message": "Breached accounts can expose your personal information. Secure breached accounts by enabling 2FA or creating a stronger password."
+    "message": "Tài khoản bị xâm phạm có thể lộ thông tin cá nhân của bạn. Hãy bảo vệ tài khoản bị xâm phạm bằng cách kích hoạt xác thực hai yếu tố (2FA) hoặc tạo mật khẩu mạnh hơn."
   },
   "breachCheckUsernameEmail": {
-    "message": "Check any usernames or email addresses that you use."
+    "message": "Kiểm tra các tên đăng nhập hoặc địa chỉ email mà bạn sử dụng."
   },
   "checkBreaches": {
-    "message": "Check breaches"
+    "message": "Kiểm tra các vi phạm"
   },
   "breachUsernameNotFound": {
-    "message": "$USERNAME$ was not found in any known data breaches.",
+    "message": "$USERNAME$ không được tìm thấy trong bất kỳ vụ rò rỉ dữ liệu nào đã biết.",
     "placeholders": {
       "username": {
         "content": "$1",
@@ -2621,7 +2636,7 @@
     "description": "ex. Good News, No Breached Accounts Found!"
   },
   "breachUsernameFound": {
-    "message": "$USERNAME$ was found in $COUNT$ different data breaches online.",
+    "message": "$USERNAME$ đã được phát hiện trong $COUNT$ vụ vi phạm dữ liệu trực tuyến khác nhau.",
     "placeholders": {
       "username": {
         "content": "$1",
@@ -2634,59 +2649,59 @@
     }
   },
   "breachFound": {
-    "message": "Breached accounts found"
+    "message": "Đã tìm thấy các tài khoản bị lộ thông tin"
   },
   "compromisedData": {
-    "message": "Compromised data"
+    "message": "Dữ liệu bị xâm phạm"
   },
   "website": {
     "message": "Trang web"
   },
   "affectedUsers": {
-    "message": "Affected users"
+    "message": "Người dùng bị ảnh hưởng"
   },
   "breachOccurred": {
-    "message": "Breach occurred"
+    "message": "Vụ vi phạm đã xảy ra"
   },
   "breachReported": {
-    "message": "Breach reported"
+    "message": "Sự cố vi phạm đã được báo cáo"
   },
   "reportError": {
-    "message": "An error occurred trying to load the report. Try again"
+    "message": "Đã xảy ra lỗi khi cố gắng tải báo cáo. Vui lòng thử lại"
   },
   "billing": {
     "message": "Hóa đơn"
   },
   "billingPlanLabel": {
-    "message": "Billing plan"
+    "message": "Kế hoạch thanh toán"
   },
   "paymentType": {
-    "message": "Payment type"
+    "message": "Phương thức thanh toán"
   },
   "accountCredit": {
-    "message": "Account credit",
+    "message": "Tín dụng tài khoản",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
   },
   "accountBalance": {
-    "message": "Account balance",
+    "message": "Số dư tài khoản",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
   },
   "addCredit": {
-    "message": "Add credit",
+    "message": "Thêm tín dụng",
     "description": "Add more credit to your account's balance."
   },
   "amount": {
-    "message": "Amount",
+    "message": "Số lượng",
     "description": "Dollar amount, or quantity."
   },
   "creditDelayed": {
-    "message": "Added credit will appear on your account after the payment has been fully processed. Some payment methods are delayed and can take longer to process than others."
+    "message": "Số tiền được cộng thêm sẽ hiển thị trên tài khoản của bạn sau khi giao dịch thanh toán được xử lý hoàn tất. Một số phương thức thanh toán có thể bị trì hoãn và mất nhiều thời gian hơn để xử lý so với các phương thức khác."
   },
   "makeSureEnoughCredit": {
-    "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
+    "message": "Vui lòng đảm bảo tài khoản của bạn có đủ số dư để thực hiện giao dịch này. Nếu tài khoản của bạn không đủ số dư, phương thức thanh toán mặc định đã đăng ký sẽ được sử dụng để thanh toán phần chênh lệch. Bạn có thể nạp tiền vào tài khoản từ trang Thanh toán."
   },
   "creditAppliedDesc": {
-    "message": "Your account's credit can be used to make purchases. Any available credit will be automatically applied towards invoices generated for this account."
+    "message": "Số dư trong tài khoản của bạn có thể được sử dụng để thực hiện các giao dịch mua hàng. Số dư khả dụng sẽ được tự động áp dụng cho các hóa đơn được tạo ra cho tài khoản này."
   },
   "goPremium": {
     "message": "Nâng cấp tài khoản",
@@ -2699,28 +2714,28 @@
     "message": "Nâng cấp tài khoản của bạn lên thành viên Cao Cấp và mở khóa một số tính năng bổ sung tuyệt vời."
   },
   "premiumSignUpStorage": {
-    "message": "1 GB encrypted storage for file attachments."
+    "message": "1GB bộ nhớ lưu trữ được mã hóa cho các tệp đính kèm."
   },
   "premiumSignUpTwoStepOptions": {
-    "message": "Proprietary two-step login options such as YubiKey and Duo."
+    "message": "Các tùy chọn xác minh hai bước như YubiKey và Duo."
   },
   "premiumSignUpEmergency": {
-    "message": "Emergency access"
+    "message": "Truy cập khẩn cấp"
   },
   "premiumSignUpReports": {
-    "message": "Password hygiene, account health, and data breach reports to keep your vault safe."
+    "message": "Thanh lọc mật khẩu, kiểm tra an toàn tài khoản và các báo cáo rò rỉ dữ liệu để bảo vệ kho dữ liệu của bạn."
   },
   "premiumSignUpTotp": {
     "message": "Mã xác nhận TOTP (2FA) để đăng nhập vào kho của bạn."
   },
   "premiumSignUpSupport": {
-    "message": "Priority customer support."
+    "message": "Hỗ trợ khách hàng ưu tiên."
   },
   "premiumSignUpFuture": {
-    "message": "All future Premium features. More coming soon!"
+    "message": "Tất cả các tính năng Cao cấp trong tương lai. Nó sẽ sớm xuất hiện!"
   },
   "premiumPrice": {
-    "message": "All for just $PRICE$ /year!",
+    "message": "Tất cả chỉ với $PRICE$/năm!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -2729,7 +2744,7 @@
     }
   },
   "premiumPriceWithFamilyPlan": {
-    "message": "Go premium for just $PRICE$ /year, or get premium accounts for $FAMILYPLANUSERCOUNT$ users and unlimited family sharing with a ",
+    "message": "Nâng cấp lên gói Cao cấp chỉ với $PRICE$ /năm, hoặc đăng ký gói Cao cấp cho $FAMILYPLANUSERCOUNT$ người dùng và chia sẻ không giới hạn cho gia đình với một ",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -2742,16 +2757,16 @@
     }
   },
   "bitwardenFamiliesPlan": {
-    "message": "Bitwarden Families plan."
+    "message": "Gói Bitwarden Gia Đình."
   },
   "addons": {
-    "message": "Add-ons"
+    "message": "Tiện ích bổ sung"
   },
   "premiumAccess": {
-    "message": "Premium access"
+    "message": "Quyền truy cập cao cấp"
   },
   "premiumAccessDesc": {
-    "message": "You can add Premium access to all members of your organization for $PRICE$ /$INTERVAL$.",
+    "message": "Bạn có thể thêm quyền truy cập Premium cho tất cả thành viên trong tổ chức của mình với giá $PRICE$ /$INTERVAL$.",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -2764,10 +2779,10 @@
     }
   },
   "additionalStorageGb": {
-    "message": "Additional storage (GB)"
+    "message": "Dung lượng lưu trữ bổ sung (GB)"
   },
   "additionalStorageGbDesc": {
-    "message": "# of additional GB"
+    "message": "Số GB bổ sung #"
   },
   "additionalStorageIntervalDesc": {
     "message": "Gói của bạn có $SIZE$ dung lượng lưu trữ tập tin mã hóa. Bạn có thể mua thêm dung lượng với giá $PRICE$ cho mỗi GB/$INTERVAL$.",
@@ -2787,7 +2802,7 @@
     }
   },
   "summary": {
-    "message": "Summary"
+    "message": "Tóm tắt"
   },
   "total": {
     "message": "Tổng"
@@ -2796,13 +2811,13 @@
     "message": "năm"
   },
   "yr": {
-    "message": "yr"
+    "message": "năm"
   },
   "month": {
     "message": "tháng"
   },
   "monthAbbr": {
-    "message": "mo.",
+    "message": "tháng.",
     "description": "Short abbreviation for 'month'"
   },
   "paymentChargedAnnually": {
@@ -2818,7 +2833,7 @@
     }
   },
   "paymentChargedWithUnpaidSubscription": {
-    "message": "Your payment method will be charged for any unpaid subscriptions."
+    "message": "Phương thức thanh toán của bạn sẽ bị tính phí cho bất kỳ gói đăng ký nào chưa thanh toán."
   },
   "paymentChargedWithTrial": {
     "message": "Gói của bạn đi kèm với 7 ngày dùng thử miễn phí. Phương thức thanh toán của bạn sẽ không bị tính phí cho đến khi hết thời gian dùng thử. Bạn có thể hủy bỏ bất cứ lúc nào."
@@ -2869,25 +2884,25 @@
     "message": "Đã hủy gói"
   },
   "neverExpires": {
-    "message": "Never expires"
+    "message": "Không bao giờ hết hạn"
   },
   "status": {
     "message": "Trạng thái"
   },
   "nextCharge": {
-    "message": "Next charge"
+    "message": "Lần thanh toán tiếp theo"
   },
   "details": {
-    "message": "Details"
+    "message": "Chi tiết"
   },
   "downloadLicense": {
-    "message": "Download license"
+    "message": "Tải về tệp giấy phép"
   },
   "viewBillingToken": {
-    "message": "View Billing Token"
+    "message": "Xem mã thanh toán"
   },
   "updateLicense": {
-    "message": "Update license"
+    "message": "Cập nhập giấy phép sử dụng"
   },
   "manageSubscription": {
     "message": "Quản lý gói"
@@ -2899,10 +2914,10 @@
     "message": "Lưu trữ"
   },
   "addStorage": {
-    "message": "Add storage"
+    "message": "Thêm dung lượng lưu trữ"
   },
   "removeStorage": {
-    "message": "Remove storage"
+    "message": "Xóa dung lượng lưu trữ"
   },
   "subscriptionStorage": {
     "message": "Thuê bao của bạn có tổng cộng $MAX_STORAGE$ GB dung lượng lưu trữ tập tin có mã hóa. Bạn đã dùng $USED_STORAGE$ rồi.",
@@ -2918,51 +2933,51 @@
     }
   },
   "paymentMethod": {
-    "message": "Payment method"
+    "message": "Phương thức thanh toán"
   },
   "noPaymentMethod": {
-    "message": "No payment method on file."
+    "message": "Không có phương thức thanh toán trong hồ sơ."
   },
   "addPaymentMethod": {
-    "message": "Add payment method"
+    "message": "Thêm phương thức thanh toán"
   },
   "changePaymentMethod": {
-    "message": "Change payment method"
+    "message": "Thay đổi phương pháp thanh toán"
   },
   "invoices": {
     "message": "Hóa đơn"
   },
   "noUnpaidInvoices": {
-    "message": "No unpaid invoices."
+    "message": "Không có hóa đơn chưa thanh toán."
   },
   "noPaidInvoices": {
-    "message": "No paid invoices."
+    "message": "Không có hóa đơn đã thanh toán."
   },
   "paid": {
-    "message": "Paid",
+    "message": "Đã thanh toán",
     "description": "Past tense status of an invoice. ex. Paid or unpaid."
   },
   "unpaid": {
-    "message": "Unpaid",
+    "message": "Chưa thanh toán",
     "description": "Past tense status of an invoice. ex. Paid or unpaid."
   },
   "transactions": {
-    "message": "Transactions",
+    "message": "Các giao dịch",
     "description": "Payment/credit transactions."
   },
   "noTransactions": {
-    "message": "No transactions."
+    "message": "Không có giao dịch."
   },
   "chargeNoun": {
-    "message": "Charge",
+    "message": "Phí",
     "description": "Noun. A charge from a payment method."
   },
   "refundNoun": {
-    "message": "Refund",
+    "message": "Hoàn tiền",
     "description": "Noun. A refunded payment that was charged."
   },
   "chargesStatement": {
-    "message": "Any charges will appear on your statement as $STATEMENT_NAME$.",
+    "message": "Mọi khoản phí sẽ hiển thị trên sao kê của bạn với tên $STATEMENT_NAME$.",
     "placeholders": {
       "statement_name": {
         "content": "$1",
@@ -2971,19 +2986,19 @@
     }
   },
   "gbStorageAdd": {
-    "message": "GB of storage to add"
+    "message": "Dung lượng lưu trữ (GB) cần thêm"
   },
   "gbStorageRemove": {
-    "message": "GB of storage to remove"
+    "message": "Dung lượng lưu trữ (GB) cần xóa"
   },
   "storageAddNote": {
-    "message": "Adding storage will result in adjustments to your billing totals and immediately charge your payment method on file. The first charge will be prorated for the remainder of the current billing cycle."
+    "message": "Thêm dung lượng lưu trữ sẽ điều chỉnh tổng số tiền thanh toán của bạn và ngay lập tức tính phí vào phương thức thanh toán đã đăng ký. Lần tính phí đầu tiên sẽ được tính theo tỷ lệ cho phần còn lại của chu kỳ thanh toán hiện tại."
   },
   "storageRemoveNote": {
-    "message": "Removing storage will result in adjustments to your billing totals that will be prorated as credits toward your next billing charge."
+    "message": "Việc hủy bỏ dịch vụ lưu trữ sẽ điều chỉnh tổng số tiền thanh toán của bạn, và số tiền này sẽ được tính theo tỷ lệ tương ứng và được ghi nhận dưới dạng tín dụng cho hóa đơn thanh toán tiếp theo của bạn."
   },
   "adjustedStorage": {
-    "message": "Adjusted $AMOUNT$ GB of storage.",
+    "message": "Đã điều chỉnh $AMOUNT$ GB dung lượng lưu trữ.",
     "placeholders": {
       "amount": {
         "content": "$1",
@@ -2992,22 +3007,22 @@
     }
   },
   "contactSupport": {
-    "message": "Contact customer support"
+    "message": "Liên hệ Hỗ trợ khách hàng"
   },
   "contactSupportShort": {
-    "message": "Contact Support"
+    "message": "Liên hệ hỗ trợ"
   },
   "updatedPaymentMethod": {
-    "message": "Updated payment method."
+    "message": "Cập nhật phương thức thanh toán."
   },
   "purchasePremium": {
-    "message": "Purchase Premium"
+    "message": "Mua bản Cao Cấp"
   },
   "licenseFile": {
-    "message": "License file"
+    "message": "Tệp bản quyền"
   },
   "licenseFileDesc": {
-    "message": "Your license file will be named something like $FILE_NAME$",
+    "message": "Tệp giấy phép của bạn sẽ có tên tương tự như $FILE_NAME$",
     "placeholders": {
       "file_name": {
         "content": "$1",
@@ -3016,37 +3031,37 @@
     }
   },
   "uploadLicenseFilePremium": {
-    "message": "To upgrade your account to a Premium membership you need to upload a valid license file."
+    "message": "Để nâng cấp tài khoản của bạn lên gói thành viên Premium, bạn cần tải lên tệp giấy phép hợp lệ."
   },
   "uploadLicenseFileOrg": {
-    "message": "To create an on-premises hosted organization you need to upload a valid license file."
+    "message": "Để tạo một tổ chức được lưu trữ tại chỗ, bạn cần tải lên tệp giấy phép hợp lệ."
   },
   "accountEmailMustBeVerified": {
-    "message": "Your account's email address must be verified."
+    "message": "Địa chỉ email của tài khoản của bạn phải được xác minh."
   },
   "newOrganizationDesc": {
-    "message": "Organizations allow you to share parts of your vault with others as well as manage related users for a specific entity such as a family, small team, or large company."
+    "message": "Các tổ chức cho phép bạn chia sẻ một phần kho lưu trữ của mình với người khác cũng như quản lý người dùng liên quan cho một thực thể cụ thể như gia đình, nhóm nhỏ hoặc công ty lớn."
   },
   "generalInformation": {
-    "message": "General information"
+    "message": "Thông tin chung"
   },
   "organizationName": {
-    "message": "Organization name"
+    "message": "Tên tổ chức"
   },
   "accountOwnedBusiness": {
-    "message": "This account is owned by a business."
+    "message": "Tài khoản này thuộc sở hữu của một doanh nghiệp."
   },
   "billingEmail": {
-    "message": "Billing email"
+    "message": "Email thanh toán"
   },
   "businessName": {
-    "message": "Business name"
+    "message": "Tên doanh nghiệp"
   },
   "chooseYourPlan": {
-    "message": "Choose your plan"
+    "message": "Chọn gói của bạn"
   },
   "users": {
-    "message": "Users"
+    "message": "Người dùng"
   },
   "userSeats": {
     "message": "User seats"
@@ -3291,10 +3306,10 @@
     "message": "Edit policy"
   },
   "groups": {
-    "message": "Groups"
+    "message": "Nhóm"
   },
   "newGroup": {
-    "message": "New group"
+    "message": "Nhóm mới"
   },
   "addGroup": {
     "message": "Thêm nhóm"
@@ -3306,7 +3321,7 @@
     "message": "Bạn có chắc muốn xóa nhóm này?"
   },
   "deleteMultipleGroupsConfirmation": {
-    "message": "Are you sure you want to delete the following $QUANTITY$ group(s)?",
+    "message": "Bạn có chắc chắn muốn xóa $QUANTITY$ nhóm sau đây không?",
     "placeholders": {
       "quantity": {
         "content": "$1",
@@ -3315,58 +3330,58 @@
     }
   },
   "removeUserConfirmation": {
-    "message": "Are you sure you want to remove this user?"
+    "message": "Bạn có chắc bạn muốn xóa người dùng này?"
   },
   "removeOrgUserConfirmation": {
-    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
+    "message": "Khi một thành viên bị loại bỏ, họ sẽ không còn quyền truy cập vào dữ liệu của tổ chức và hành động này là không thể đảo ngược. Để thêm thành viên trở lại tổ chức, họ phải được mời và đăng ký lại."
   },
   "revokeUserConfirmation": {
-    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
+    "message": "Khi một thành viên bị thu hồi quyền truy cập, họ sẽ không còn quyền truy cập vào dữ liệu của tổ chức. Để khôi phục quyền truy cập cho thành viên một cách nhanh chóng, hãy truy cập vào tab Thu hồi."
   },
   "removeUserConfirmationKeyConnector": {
-    "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently deactivate their account. This action cannot be undone. Do you want to proceed?"
+    "message": "Cảnh báo! Người dùng này cần Key Connector để quản lý mã hóa của họ. Việc xóa người dùng này khỏi tổ chức của bạn sẽ vô hiệu hóa vĩnh viễn tài khoản của họ. Hành động này không thể hoàn tác. Bạn có muốn tiếp tục không?"
   },
   "externalId": {
     "message": "External ID"
   },
   "externalIdDesc": {
-    "message": "External ID is an unencrypted reference used by the Bitwarden Directory Connector and API."
+    "message": "External ID là một tham chiếu không được mã hóa được sử dụng bởi Bitwarden Directory Connector và API."
   },
   "ssoExternalId": {
     "message": "SSO External ID"
   },
   "ssoExternalIdDesc": {
-    "message": "SSO External ID is an unencrypted reference between Bitwarden and your configured SSO provider."
+    "message": "SSO External ID là một tham chiếu không được mã hóa giữa Bitwarden và nhà cung cấp SSO đã được cấu hình của bạn."
   },
   "nestCollectionUnder": {
     "message": "Nest collection under"
   },
   "accessControl": {
-    "message": "Access control"
+    "message": "Kiểm soát truy cập"
   },
   "readOnly": {
-    "message": "Read only"
+    "message": "Chỉ đọc"
   },
   "newCollection": {
-    "message": "New collection"
+    "message": "Bộ sưu tập mới"
   },
   "addCollection": {
-    "message": "Add collection"
+    "message": "Thêm bộ sưu tập"
   },
   "editCollection": {
-    "message": "Edit collection"
+    "message": "Chỉnh sửa bộ sư tập"
   },
   "collectionInfo": {
-    "message": "Collection info"
+    "message": "Thông tin bộ sưu tập"
   },
   "deleteCollectionConfirmation": {
-    "message": "Are you sure you want to delete this collection?"
+    "message": "Bạn có chắc chắn muốn xóa bộ sưu tập này không?"
   },
   "editMember": {
-    "message": "Edit member"
+    "message": "Sửa thành viên"
   },
   "fieldOnTabRequiresAttention": {
-    "message": "A field on the '$TAB$' tab requires your attention.",
+    "message": "Một trường trên tab '$TAB$' cần sự chú ý của bạn.",
     "placeholders": {
       "tab": {
         "content": "$1",
@@ -3375,10 +3390,10 @@
     }
   },
   "inviteUserDesc": {
-    "message": "Invite a new user to your organization by entering their Bitwarden account email address below. If they do not have a Bitwarden account already, they will be prompted to create a new account."
+    "message": "Mời một người dùng mới tham gia tổ chức của bạn bằng cách nhập địa chỉ email tài khoản Bitwarden của họ vào ô bên dưới. Nếu họ chưa có tài khoản Bitwarden, họ sẽ được yêu cầu tạo tài khoản mới."
   },
   "inviteMultipleEmailDesc": {
-    "message": "Enter up to $COUNT$ emails by separating with a comma.",
+    "message": "Nhập tối đa $COUNT$ địa chỉ email bằng cách phân tách bằng dấu phẩy.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3387,91 +3402,91 @@
     }
   },
   "inviteSingleEmailDesc": {
-    "message": "You have 1 invite remaining."
+    "message": "Bạn còn 1 lượt mời còn lại."
   },
   "inviteZeroEmailDesc": {
-    "message": "You have 0 invites remaining."
+    "message": "Bạn còn 0 lượt mời."
   },
   "userUsingTwoStep": {
-    "message": "This user is using two-step login to protect their account."
+    "message": "Người dùng này đang sử dụng tính năng đăng nhập hai bước để bảo vệ tài khoản của mình."
   },
   "search": {
     "message": "Tìm kiếm"
   },
   "invited": {
-    "message": "Invited"
+    "message": "Đã mời"
   },
   "confirmed": {
-    "message": "Confirmed"
+    "message": "Đã xác nhận"
   },
   "clientOwnerEmail": {
-    "message": "Client owner email"
+    "message": "Email của chủ sở hữu tài khoản"
   },
   "owner": {
-    "message": "Owner"
+    "message": "Chủ sở hữu"
   },
   "ownerDesc": {
-    "message": "Manage all aspects of your organization, including billing and subscriptions"
+    "message": "Quản lý tất cả các khía cạnh của tổ chức của bạn, bao gồm thanh toán và đăng ký"
   },
   "clientOwnerDesc": {
-    "message": "This user should be independent of the Provider. If the Provider is disassociated with the organization, this user will maintain ownership of the organization."
+    "message": "Người dùng này nên độc lập với Nhà cung cấp. Nếu Nhà cung cấp không còn liên kết với tổ chức, người dùng này sẽ tiếp tục sở hữu tổ chức."
   },
   "admin": {
-    "message": "Admin"
+    "message": "Quản trị"
   },
   "adminDesc": {
-    "message": "Manage organization access, all collections, members, reporting, and security settings"
+    "message": "Quản lý quyền truy cập của tổ chức, tất cả bộ sưu tập, thành viên, báo cáo và cài đặt bảo mật"
   },
   "user": {
-    "message": "User"
+    "message": "Người dùng"
   },
   "userDesc": {
-    "message": "Access and add items to assigned collections"
+    "message": "Truy cập và thêm các mục vào các bộ sưu tập được chỉ định"
   },
   "all": {
-    "message": "All"
+    "message": "Tất cả"
   },
   "addAccess": {
-    "message": "Add Access"
+    "message": "Thêm quyền truy cập"
   },
   "addAccessFilter": {
-    "message": "Add Access Filter"
+    "message": "Thêm bộ lọc truy cập"
   },
   "refresh": {
-    "message": "Refresh"
+    "message": "Làm mới"
   },
   "timestamp": {
-    "message": "Timestamp"
+    "message": "Mốc thời gian"
   },
   "event": {
-    "message": "Event"
+    "message": "Sự kiện"
   },
   "unknown": {
-    "message": "Unknown"
+    "message": "Không xác định"
   },
   "loadMore": {
-    "message": "Load more"
+    "message": "Tải thêm"
   },
   "mobile": {
-    "message": "Mobile",
+    "message": "Di Động",
     "description": "Mobile app"
   },
   "extension": {
-    "message": "Extension",
+    "message": "Tiện ích mở rộng",
     "description": "Browser extension/addon"
   },
   "desktop": {
-    "message": "Desktop",
+    "message": "Máy tính",
     "description": "Desktop app"
   },
   "webVault": {
-    "message": "Web vault"
+    "message": "Kho web"
   },
   "cli": {
     "message": "CLI"
   },
   "bitWebVault": {
-    "message": "Bitwarden Web vault"
+    "message": "Trang web kho lưu trữ Bitwarden"
   },
   "bitSecretsManager": {
     "message": "Bitwarden Secrets Manager"
@@ -3480,47 +3495,47 @@
     "message": "Logged in"
   },
   "changedPassword": {
-    "message": "Changed account password"
+    "message": "Đã thay đổi mật khẩu tài khoản"
   },
   "enabledUpdated2fa": {
-    "message": "Two-step login saved"
+    "message": "Đăng nhập hai bước đã được kích hoạt"
   },
   "disabled2fa": {
     "message": "Đã tắt đăng nhập 2 bước"
   },
   "recovered2fa": {
-    "message": "Recovered account from two-step login."
+    "message": "Khôi phục tài khoản từ tính năng đăng nhập hai bước."
   },
   "failedLogin": {
-    "message": "Login attempt failed with incorrect password."
+    "message": "Đăng nhập thất bại do mật khẩu không chính xác."
   },
   "failedLogin2fa": {
-    "message": "Login attempt failed with incorrect two-step login."
+    "message": "Đăng nhập thất bại do sử dụng phương thức đăng nhập hai bước không chính xác."
   },
   "incorrectPassword": {
-    "message": "Incorrect password"
+    "message": "Mật khẩu không đúng"
   },
   "incorrectCode": {
-    "message": "Incorrect code"
+    "message": "Mã không đúng"
   },
   "incorrectPin": {
-    "message": "Incorrect PIN"
+    "message": "Mã PIN không đúng"
   },
   "pin": {
-    "message": "PIN",
+    "message": "Mã PIN",
     "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
   },
   "exportedVault": {
-    "message": "Vault exported"
+    "message": "Đã xuất kho lưu trữ"
   },
   "exportedOrganizationVault": {
-    "message": "Exported organization vault."
+    "message": "Đã xuất dữ liệu kho tổ chức."
   },
   "editedOrgSettings": {
-    "message": "Edited organization settings."
+    "message": "Đã chỉnh sửa cài đặt tổ chức."
   },
   "createdItemId": {
-    "message": "Created item $ID$.",
+    "message": "Đã tạo mục $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3529,7 +3544,7 @@
     }
   },
   "editedItemId": {
-    "message": "Edited item $ID$.",
+    "message": "Đã sửa mục $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3538,7 +3553,7 @@
     }
   },
   "deletedItemId": {
-    "message": "Sent item $ID$ to trash.",
+    "message": "Đã chuyển mục $ID$ vào thùng rác.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3547,7 +3562,7 @@
     }
   },
   "movedItemIdToOrg": {
-    "message": "Moved item $ID$ to an organization.",
+    "message": "Đã di chuyển mục $ID$ vào một tổ chức.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3556,13 +3571,13 @@
     }
   },
   "viewAllLogInOptions": {
-    "message": "View all log in options"
+    "message": "Xem tất cả tùy chọn đăng nhập"
   },
   "viewAllLoginOptions": {
-    "message": "View all log in options"
+    "message": "Xem tất cả tùy chọn đăng nhập"
   },
   "viewedItemId": {
-    "message": "Viewed item $ID$.",
+    "message": "Đã xem mục $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3571,7 +3586,7 @@
     }
   },
   "viewedPasswordItemId": {
-    "message": "Viewed password for item $ID$.",
+    "message": "Đã xem mật khẩu của $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3580,7 +3595,7 @@
     }
   },
   "viewedHiddenFieldItemId": {
-    "message": "Viewed hidden field for item $ID$.",
+    "message": "Xem trường ẩn của $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3589,7 +3604,7 @@
     }
   },
   "viewedCardNumberItemId": {
-    "message": "Viewed Card Number for item $ID$.",
+    "message": "Đã xem số thẻ của $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3598,7 +3613,7 @@
     }
   },
   "viewedSecurityCodeItemId": {
-    "message": "Viewed security code for item $ID$.",
+    "message": "Đã xem mã bảo mật của $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3607,7 +3622,7 @@
     }
   },
   "viewCollectionWithName": {
-    "message": "View collection - $NAME$",
+    "message": "Xem bộ sưu tập - $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -3616,7 +3631,7 @@
     }
   },
   "editItemWithName": {
-    "message": "Edit item - $NAME$",
+    "message": "Chỉnh sửa mục - $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -3625,7 +3640,7 @@
     }
   },
   "copiedPasswordItemId": {
-    "message": "Copied password for item $ID$.",
+    "message": "Đã sao chép mật khẩu của $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3634,7 +3649,7 @@
     }
   },
   "copiedHiddenFieldItemId": {
-    "message": "Copied hidden field for item $ID$.",
+    "message": "Đã sao chép trường ẩn của $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3643,7 +3658,7 @@
     }
   },
   "copiedSecurityCodeItemId": {
-    "message": "Copied security code for item $ID$.",
+    "message": "Đã sao chép mã bảo mật của $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3652,7 +3667,7 @@
     }
   },
   "autofilledItemId": {
-    "message": "Auto-filled item $ID$.",
+    "message": "Tự động điền cho $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3661,7 +3676,7 @@
     }
   },
   "createdCollectionId": {
-    "message": "Created collection $ID$.",
+    "message": "Đã tạo bộ sưu tập $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3670,7 +3685,7 @@
     }
   },
   "editedCollectionId": {
-    "message": "Edited collection $ID$.",
+    "message": "Đã sửa bộ sưu tập $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3679,10 +3694,10 @@
     }
   },
   "deletedCollections": {
-    "message": "Deleted collections"
+    "message": "Đã xóa các bộ sưu tập"
   },
   "deletedCollectionId": {
-    "message": "Deleted collection $ID$.",
+    "message": "Đã xóa bộ sưu tập $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3691,7 +3706,7 @@
     }
   },
   "editedPolicyId": {
-    "message": "Edited policy $ID$.",
+    "message": "Đã chỉnh sửa chính sách $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3700,7 +3715,7 @@
     }
   },
   "createdGroupId": {
-    "message": "Created group $ID$.",
+    "message": "Đã tạo nhóm $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3709,7 +3724,7 @@
     }
   },
   "editedGroupId": {
-    "message": "Edited group $ID$.",
+    "message": "Đã chỉnh sửa nhóm $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3718,7 +3733,7 @@
     }
   },
   "deletedGroupId": {
-    "message": "Deleted group $ID$.",
+    "message": "Đã xóa nhóm $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3727,7 +3742,7 @@
     }
   },
   "deletedManyGroups": {
-    "message": "Deleted $QUANTITY$ group(s).",
+    "message": "Đã xóa $QUANTITY$ nhóm.",
     "placeholders": {
       "quantity": {
         "content": "$1",
@@ -3736,7 +3751,7 @@
     }
   },
   "removedUserId": {
-    "message": "Removed user $ID$.",
+    "message": "Đã xóa người dùng $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3745,7 +3760,7 @@
     }
   },
   "removeUserIdAccess": {
-    "message": "Remove $ID$ access",
+    "message": "Xóa quyền truy cập $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3754,7 +3769,7 @@
     }
   },
   "revokedUserId": {
-    "message": "Revoked organization access for $ID$.",
+    "message": "Quyền truy cập của tổ chức của $ID$ đã bị thu hồi.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3763,7 +3778,7 @@
     }
   },
   "restoredUserId": {
-    "message": "Restored organization access for $ID$.",
+    "message": "Đã khôi phục quyền truy cập tổ chức của $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3772,7 +3787,7 @@
     }
   },
   "revokeUserId": {
-    "message": "Revoke $ID$ access",
+    "message": "Hủy quyền truy cập của $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3781,7 +3796,7 @@
     }
   },
   "createdAttachmentForItem": {
-    "message": "Created attachment for item $ID$.",
+    "message": "Đã tạo tệp đính kèm cho mục $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3790,7 +3805,7 @@
     }
   },
   "deletedAttachmentForItem": {
-    "message": "Deleted attachment for item $ID$.",
+    "message": "Đã xóa tệp đính kèm cho mục $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3799,7 +3814,7 @@
     }
   },
   "editedCollectionsForItem": {
-    "message": "Edited collections for item $ID$.",
+    "message": "Đã chỉnh sửa bộ sưu tập cho mục $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3808,7 +3823,7 @@
     }
   },
   "invitedUserId": {
-    "message": "Invited user $ID$.",
+    "message": "Đã mời người dùng $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3817,7 +3832,7 @@
     }
   },
   "confirmedUserId": {
-    "message": "Confirmed user $ID$.",
+    "message": "Người dùng đã xác nhận $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3826,7 +3841,7 @@
     }
   },
   "editedUserId": {
-    "message": "Edited user $ID$.",
+    "message": "Người dùng $ID$ đã được chỉnh sửa.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3835,7 +3850,7 @@
     }
   },
   "editedGroupsForUser": {
-    "message": "Edited groups for user $ID$.",
+    "message": "Nhóm đã chỉnh sửa cho người dùng $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3844,10 +3859,10 @@
     }
   },
   "unlinkedSso": {
-    "message": "Unlinked SSO."
+    "message": "SSO chưa liên kết."
   },
   "unlinkedSsoUser": {
-    "message": "Unlinked SSO for user $ID$.",
+    "message": "SSO không liên kết cho người dùng $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3856,7 +3871,7 @@
     }
   },
   "createdOrganizationId": {
-    "message": "Created organization $ID$.",
+    "message": "Tạo tổ chức $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3865,7 +3880,7 @@
     }
   },
   "addedOrganizationId": {
-    "message": "Added organization $ID$.",
+    "message": "Đã thêm tổ chức $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3874,7 +3889,7 @@
     }
   },
   "removedOrganizationId": {
-    "message": "Removed organization $ID$.",
+    "message": "Đã xóa tổ chức $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3883,7 +3898,7 @@
     }
   },
   "accessedClientVault": {
-    "message": "Accessed $ID$ organization vault.",
+    "message": "Đã truy cập kho lưu trữ của tổ chức $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3895,22 +3910,22 @@
     "message": "Thiết bị"
   },
   "loginStatus": {
-    "message": "Login status"
+    "message": "Trạng thái đăng nhập"
   },
   "firstLogin": {
-    "message": "First login"
+    "message": "Đăng nhập lần đầu"
   },
   "trusted": {
-    "message": "Trusted"
+    "message": "Tin tưởng"
   },
   "needsApproval": {
-    "message": "Needs approval"
+    "message": "Cần phê duyệt"
   },
   "areYouTryingtoLogin": {
-    "message": "Are you trying to log in?"
+    "message": "Bạn đang cố gắng đăng nhập?"
   },
   "logInAttemptBy": {
-    "message": "Login attempt by $EMAIL$",
+    "message": "Thao tác đăng nhập của $EMAIL$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3919,22 +3934,22 @@
     }
   },
   "deviceType": {
-    "message": "Device Type"
+    "message": "Loại thiết bị"
   },
   "ipAddress": {
-    "message": "IP Address"
+    "message": "Địa chỉ IP"
   },
   "confirmLogIn": {
-    "message": "Confirm login"
+    "message": "Xác nhận đăng nhập"
   },
   "denyLogIn": {
-    "message": "Deny login"
+    "message": "Từ chối đăng nhập"
   },
   "thisRequestIsNoLongerValid": {
-    "message": "This request is no longer valid."
+    "message": "Yêu cầu này không còn hiệu lực."
   },
   "logInConfirmedForEmailOnDevice": {
-    "message": "Login confirmed for $EMAIL$ on $DEVICE$",
+    "message": "Đã xác nhận đăng nhập cho $EMAIL$ trên $DEVICE$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3947,16 +3962,16 @@
     }
   },
   "youDeniedALogInAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this really was you, try to log in with the device again."
+    "message": "Bạn đã từ chối một lần đăng nhập từ thiết bị khác. Nếu thực sự là bạn, hãy thử đăng nhập lại bằng thiết bị đó."
   },
   "loginRequestHasAlreadyExpired": {
-    "message": "Login request has already expired."
+    "message": "Yêu cầu đăng nhập đã hết hạn."
   },
   "justNow": {
-    "message": "Just now"
+    "message": "Vừa xong"
   },
   "requestedXMinutesAgo": {
-    "message": "Requested $MINUTES$ minutes ago",
+    "message": "Đã yêu cầu $MINUTES$ phút trước",
     "placeholders": {
       "minutes": {
         "content": "$1",
@@ -3965,49 +3980,49 @@
     }
   },
   "creatingAccountOn": {
-    "message": "Creating account on"
+    "message": "Đang tạo tài khoản trên"
   },
   "checkYourEmail": {
-    "message": "Check your email"
+    "message": "Kiểm tra email của bạn"
   },
   "followTheLinkInTheEmailSentTo": {
-    "message": "Follow the link in the email sent to"
+    "message": "Nhấp vào liên kết được gửi đến trong email"
   },
   "andContinueCreatingYourAccount": {
-    "message": "and continue creating your account."
+    "message": "và tiếp tục tạo tài khoản của bạn."
   },
   "noEmail": {
-    "message": "No email?"
+    "message": "Không nhận được email?"
   },
   "goBack": {
-    "message": "Go back"
+    "message": "Quay lại"
   },
   "toEditYourEmailAddress": {
-    "message": "to edit your email address."
+    "message": "để chỉnh sửa địa chỉ email của bạn."
   },
   "view": {
-    "message": "View"
+    "message": "Xem"
   },
   "invalidDateRange": {
-    "message": "Invalid date range."
+    "message": "Phạm vi ngày không hợp lệ."
   },
   "errorOccurred": {
-    "message": "An error has occurred."
+    "message": "Đã xảy ra lỗi."
   },
   "userAccess": {
-    "message": "User access"
+    "message": "Quyền truy cập của người dùng"
   },
   "userType": {
-    "message": "User type"
+    "message": "Kiểu người dùng"
   },
   "groupAccess": {
-    "message": "Group access"
+    "message": "Quyền truy cập của nhóm"
   },
   "groupAccessUserDesc": {
-    "message": "Grant member access to collections by adding them to 1 or more groups."
+    "message": "Cho phép thành viên truy cập vào các bộ sưu tập bằng cách thêm họ vào 1 hoặc nhiều nhóm."
   },
   "invitedUsers": {
-    "message": "User(s) invited"
+    "message": "Người dùng đã mời"
   },
   "resendInvitation": {
     "message": "Gửi lại lời mời"
@@ -4016,7 +4031,7 @@
     "message": "Gửi lại email"
   },
   "hasBeenReinvited": {
-    "message": "$USER$ reinvited",
+    "message": "$USER$ đã được mời lại",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -4025,13 +4040,13 @@
     }
   },
   "confirm": {
-    "message": "Confirm"
+    "message": "Xác nhận"
   },
   "confirmUser": {
-    "message": "Confirm user"
+    "message": "Xác nhận người dùng"
   },
   "hasBeenConfirmed": {
-    "message": "$USER$ confirmed.",
+    "message": "$USER$ đã được xác nhận.",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -4040,61 +4055,61 @@
     }
   },
   "confirmUsers": {
-    "message": "Confirm members"
+    "message": "Xác nhận thành viên"
   },
   "usersNeedConfirmed": {
-    "message": "You have members that have accepted their invitation, but still need to be confirmed. Members will not have access to the organization until they are confirmed."
+    "message": "Bạn có các thành viên đã chấp nhận lời mời, nhưng vẫn cần được xác nhận. Các thành viên sẽ không có quyền truy cập vào tổ chức cho đến khi họ được xác nhận."
   },
   "startDate": {
-    "message": "Start date"
+    "message": "Ngày bắt đầu"
   },
   "endDate": {
-    "message": "End date"
+    "message": "Ngày kết thúc"
   },
   "verifyEmail": {
-    "message": "Verify email"
+    "message": "Xác nhận email"
   },
   "verifyEmailDesc": {
-    "message": "Verify your account's email address to unlock access to all features."
+    "message": "Xác minh địa chỉ email của tài khoản để mở khóa quyền truy cập vào tất cả các tính năng."
   },
   "verifyEmailFirst": {
-    "message": "Your account's email address first must be verified."
+    "message": "Địa chỉ email tài khoản của bạn trước tiên phải được xác minh."
   },
   "checkInboxForVerification": {
-    "message": "Check your email inbox for a verification link."
+    "message": "Kiểm tra hộp thư đến của bạn để tìm liên kết xác minh."
   },
   "emailVerified": {
-    "message": "Account email verified"
+    "message": "Địa chỉ email đã được xác minh"
   },
   "emailVerifiedV2": {
-    "message": "Email verified"
+    "message": "Đã xác minh email"
   },
   "emailVerifiedFailed": {
-    "message": "Unable to verify your email. Try sending a new verification email."
+    "message": "Không thể xác minh địa chỉ email của bạn. Vui lòng gửi lại email xác minh mới."
   },
   "emailVerificationRequired": {
-    "message": "Email verification required"
+    "message": "Yêu cầu xác minh danh tính qua email"
   },
   "emailVerificationRequiredDesc": {
-    "message": "You must verify your email to use this feature."
+    "message": "Bạn phải xác minh email của mình để sử dụng tính năng này."
   },
   "updateBrowser": {
-    "message": "Update browser"
+    "message": "Cập nhật trình duyệt"
   },
   "generatingYourRiskInsights": {
-    "message": "Generating your Risk Insights..."
+    "message": "Đang tạo báo cáo phân tích rủi ro của bạn..."
   },
   "updateBrowserDesc": {
-    "message": "You are using an unsupported web browser. The web vault may not function properly."
+    "message": "Bạn đang sử dụng trình duyệt web không được hỗ trợ. Kho lưu trữ web có thể không hoạt động đúng cách."
   },
   "youHaveAPendingLoginRequest": {
-    "message": "You have a pending login request from another device."
+    "message": "Bạn có một yêu cầu đăng nhập đang chờ xử lý từ một thiết bị khác."
   },
   "reviewLoginRequest": {
-    "message": "Review login request"
+    "message": "Xem xét yêu cầu đăng nhập"
   },
   "freeTrialEndPromptCount": {
-    "message": "Your free trial ends in $COUNT$ days.",
+    "message": "Thời gian dùng thử miễn phí của bạn sẽ kết thúc trong $COUNT$ ngày.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4103,7 +4118,7 @@
     }
   },
   "freeTrialEndPromptMultipleDays": {
-    "message": "$ORGANIZATION$, your free trial ends in $COUNT$ days.",
+    "message": "$ORGANIZATION$, thời gian dùng thử miễn phí của bạn sẽ kết thúc trong $COUNT$ ngày.",
     "placeholders": {
       "count": {
         "content": "$2",
@@ -4116,7 +4131,7 @@
     }
   },
   "freeTrialEndPromptTomorrow": {
-    "message": "$ORGANIZATION$, your free trial ends tomorrow.",
+    "message": "$ORGANIZATION$, thời gian dùng thử miễn phí của bạn sẽ kết thúc vào ngày mai.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4125,10 +4140,10 @@
     }
   },
   "freeTrialEndPromptTomorrowNoOrgName": {
-    "message": "Your free trial ends tomorrow."
+    "message": "Thời gian dùng thử miễn phí của bạn sẽ kết thúc vào ngày mai."
   },
   "freeTrialEndPromptToday": {
-    "message": "$ORGANIZATION$, your free trial ends today.",
+    "message": "$ORGANIZATION$, thời gian dùng thử miễn phí của bạn sẽ kết thúc vào hôm nay.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4137,16 +4152,16 @@
     }
   },
   "freeTrialEndingTodayWithoutOrgName": {
-    "message": "Your free trial ends today."
+    "message": "Thời gian dùng thử miễn phí của bạn sẽ kết thúc vào hôm nay."
   },
   "clickHereToAddPaymentMethod": {
-    "message": "Click here to add a payment method."
+    "message": "Nhấp vào đây để thêm phương thức thanh toán."
   },
   "joinOrganization": {
-    "message": "Join organization"
+    "message": "Tham gia tổ chức"
   },
   "joinOrganizationName": {
-    "message": "Join $ORGANIZATIONNAME$",
+    "message": "Tham gia $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -4155,25 +4170,25 @@
     }
   },
   "joinOrganizationDesc": {
-    "message": "You've been invited to join the organization listed above. To accept the invitation, you need to log in or create a new Bitwarden account."
+    "message": "Bạn đã được mời tham gia tổ chức bên trên. Để chấp nhận lời mời, bạn cần đăng nhập hoặc tạo tài khoản Bitwarden mới."
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Finish joining this organization by setting a master password."
+    "message": "Hoàn tất gia nhập tổ chức này bằng cách đặt một mật khẩu chính."
   },
   "inviteAccepted": {
-    "message": "Invitation accepted"
+    "message": "Đã chấp nhận lời mời"
   },
   "inviteAcceptedDesc": {
-    "message": "You can access this organization once an administrator confirms your membership. We'll send you an email when that happens."
+    "message": "Bạn có thể truy cập tổ chức này sau khi quản trị viên xác nhận tư cách thành viên của bạn. Chúng tôi sẽ gửi email cho bạn khi được xác nhận."
   },
   "inviteInitAcceptedDesc": {
-    "message": "You can now access this organization."
+    "message": "Bạn hiện có thể truy cập tổ chức này."
   },
   "inviteAcceptFailed": {
-    "message": "Unable to accept invitation. Ask an organization admin to send a new invitation."
+    "message": "Không thể chấp nhận lời mời. Vui lòng yêu cầu quản trị viên tổ chức gửi lời mời mới."
   },
   "inviteAcceptFailedShort": {
-    "message": "Unable to accept invitation. $DESCRIPTION$",
+    "message": "Không thể chấp nhận lời mời. $DESCRIPTION$",
     "placeholders": {
       "description": {
         "content": "$1",
@@ -4185,16 +4200,16 @@
     "message": "Ghi nhớ email"
   },
   "recoverAccountTwoStepDesc": {
-    "message": "If you cannot access your account through your normal two-step login methods, you can use your two-step login recovery code to turn off all two-step providers on your account."
+    "message": "Nếu bạn không thể truy cập tài khoản của mình thông qua các phương thức đăng nhập hai bước thông thường, bạn có thể sử dụng mã khôi phục đăng nhập hai bước để tắt tất cả các nhà cung cấp đăng nhập hai bước trên tài khoản của mình."
   },
   "logInBelowUsingYourSingleUseRecoveryCode": {
-    "message": "Log in below using your single-use recovery code. This will turn off all two-step providers on your account."
+    "message": "Đăng nhập bằng mã khôi phục sử dụng một lần của bạn. Điều này sẽ tắt tất cả các nhà cung cấp xác minh hai bước trên tài khoản của bạn."
   },
   "recoverAccountTwoStep": {
-    "message": "Recover account two-step login"
+    "message": "Khôi phục tài khoản đăng nhập hai bước"
   },
   "twoStepRecoverDisabled": {
-    "message": "Two-step login turned off on your account."
+    "message": "Tính năng đăng nhập hai bước đã bị tắt trên tài khoản của bạn."
   },
   "learnMore": {
     "message": "Tìm hiểu thêm"
@@ -4209,19 +4224,19 @@
     "message": "Bạn đã yêu cầu xóa tài khoản Bitwarden của mình. Nhấn vào nút bên dưới để xác nhận."
   },
   "deleteRecoverOrgConfirmDesc": {
-    "message": "You have requested to delete your Bitwarden organization."
+    "message": "Bạn đã yêu cầu xóa tổ chức Bitwarden của mình."
   },
   "myOrganization": {
-    "message": "My organization"
+    "message": "Tổ chức của tôi"
   },
   "organizationInfo": {
-    "message": "Organization info"
+    "message": "Thông tin tổ chức"
   },
   "deleteOrganization": {
-    "message": "Delete organization"
+    "message": "Xóa tổ chức"
   },
   "deletingOrganizationContentWarning": {
-    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "message": "Nhập mật khẩu chính để xác nhận việc xóa $ORGANIZATION$ và tất cả dữ liệu liên quan. Dữ liệu trong kho lưu trữ của $ORGANIZATION$ bao gồm:",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4230,10 +4245,10 @@
     }
   },
   "deletingOrganizationActiveUserAccountsWarning": {
-    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+    "message": "Tài khoản người dùng sẽ vẫn hoạt động sau khi bị xóa nhưng sẽ không còn liên kết với tổ chức này."
   },
   "deletingOrganizationIsPermanentWarning": {
-    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "message": "Việc xóa $ORGANIZATION$ là vĩnh viễn và không thể hoàn tác.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4242,13 +4257,13 @@
     }
   },
   "organizationDeleted": {
-    "message": "Organization deleted"
+    "message": "Tổ chức đã bị xóa"
   },
   "organizationDeletedDesc": {
-    "message": "The organization and all associated data has been deleted."
+    "message": "Tổ chức và tất cả dữ liệu liên quan đã bị xóa."
   },
   "organizationUpdated": {
-    "message": "Organization saved"
+    "message": "Tổ chức đã được lưu"
   },
   "taxInformation": {
     "message": "Thông tin thuế"
@@ -4288,22 +4303,22 @@
     "message": "Xác minh tài khoản ngân hàng"
   },
   "verifyBankAccountDesc": {
-    "message": "We have made two micro-deposits to your bank account (it may take 1-2 business days to show up). Enter these amounts to verify the bank account."
+    "message": "Chúng tôi đã thực hiện hai giao dịch chuyển khoản nhỏ vào tài khoản ngân hàng của quý khách (có thể mất 1-2 ngày làm việc để hiển thị). Vui lòng nhập các số tiền này để xác minh tài khoản ngân hàng."
   },
   "verifyBankAccountInitialDesc": {
-    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make two micro-deposits within the next 1-2 business days. Enter these amounts on the organization's billing page to verify the bank account."
+    "message": "Thanh toán bằng tài khoản ngân hàng chỉ áp dụng cho khách hàng tại Hoa Kỳ. Quý khách sẽ cần xác minh tài khoản ngân hàng của mình. Chúng tôi sẽ thực hiện hai giao dịch chuyển khoản nhỏ trong vòng 1-2 ngày làm việc tới. Vui lòng nhập các số tiền này vào trang thanh toán của tổ chức để xác minh tài khoản ngân hàng."
   },
   "verifyBankAccountFailureWarning": {
     "message": "Nếu không xác minh tài khoản ngân hàng, bạn có thể lỡ hạn thanh toán khiến cho gói bị tạm ngừng."
   },
   "verifiedBankAccount": {
-    "message": "Bank account verified"
+    "message": "Tài khoản ngân hàng đã được xác minh"
   },
   "bankAccount": {
-    "message": "Bank account"
+    "message": "Tài khoản ngân hàng"
   },
   "amountX": {
-    "message": "Amount $COUNT$",
+    "message": "Số tiền $COUNT$",
     "description": "Used in bank account verification of micro-deposits. Amount, as in a currency amount. Ex. Amount 1 is $2.00, Amount 2 is $1.50",
     "placeholders": {
       "count": {
@@ -4313,53 +4328,53 @@
     }
   },
   "routingNumber": {
-    "message": "Routing number",
+    "message": "Số định tuyến",
     "description": "Bank account routing number"
   },
   "accountNumber": {
-    "message": "Account number"
+    "message": "Số tài khoản"
   },
   "accountHolderName": {
-    "message": "Account holder name"
+    "message": "Tên chủ tài khoản"
   },
   "bankAccountType": {
     "message": "Loại tài khoản"
   },
   "bankAccountTypeCompany": {
-    "message": "Company (business)"
+    "message": "Công ty (doanh nghiệp)"
   },
   "bankAccountTypeIndividual": {
-    "message": "Individual (personal)"
+    "message": "Cá nhân (riêng lẻ)"
   },
   "enterInstallationId": {
-    "message": "Enter your installation id"
+    "message": "Nhập ID cài đặt của bạn"
   },
   "limitSubscriptionDesc": {
-    "message": "Set a seat limit for your subscription. Once this limit is reached, you will not be able to invite new members."
+    "message": "Đặt giới hạn số lượng thành viên cho gói đăng ký của bạn. Khi đạt đến giới hạn này, bạn sẽ không thể mời thêm thành viên mới."
   },
   "limitSmSubscriptionDesc": {
-    "message": "Set a seat limit for your Secrets Manager subscription. Once this limit is reached, you will not be able to invite new members."
+    "message": "Đặt giới hạn số lượng người dùng cho gói đăng ký Quản lý Bí mật của bạn. Khi đạt đến giới hạn này, bạn sẽ không thể mời thêm thành viên mới."
   },
   "maxSeatLimit": {
-    "message": "Seat Limit (optional)",
+    "message": "Giới hạn số ghế (tùy chọn)",
     "description": "Upper limit of seats to allow through autoscaling"
   },
   "maxSeatCost": {
-    "message": "Max potential seat cost"
+    "message": "Chi phí tối đa cho mỗi ghế"
   },
   "addSeats": {
-    "message": "Add seats",
+    "message": "Thêm ghế",
     "description": "Seat = User Seat"
   },
   "removeSeats": {
-    "message": "Remove seats",
+    "message": "Tháo ghế",
     "description": "Seat = User Seat"
   },
   "subscriptionDesc": {
-    "message": "Adjustments to your subscription will result in prorated changes to your billing totals. If newly invited users exceed your subscription seats, you will immediately receive a prorated charge for the additional users."
+    "message": "Các điều chỉnh đối với gói đăng ký của bạn sẽ dẫn đến việc điều chỉnh theo tỷ lệ tương ứng đối với tổng số tiền thanh toán. Nếu số lượng người dùng mới được mời vượt quá số lượng ghế trong gói đăng ký của bạn, bạn sẽ ngay lập tức nhận được khoản phí theo tỷ lệ tương ứng cho các người dùng thêm."
   },
   "subscriptionUserSeats": {
-    "message": "Your subscription allows for a total of $COUNT$ members.",
+    "message": "Gói đăng ký của bạn cho phép tối đa $COUNT$ thành viên.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4368,34 +4383,34 @@
     }
   },
   "limitSubscription": {
-    "message": "Limit subscription (optional)"
+    "message": "Giới hạn đăng ký (tùy chọn)"
   },
   "subscriptionSeats": {
-    "message": "Subscription seats"
+    "message": "Ghế đăng ký"
   },
   "subscriptionUpdated": {
     "message": "Đã cập nhật gói"
   },
   "subscribedToSecretsManager": {
-    "message": "Subscription updated. You now have access to Secrets Manager."
+    "message": "Gói đăng ký đã được cập nhật. Bạn hiện đã có quyền truy cập vào Quản lý Bí mật."
   },
   "additionalOptions": {
-    "message": "Additional options"
+    "message": "Tùy chọn bổ sung"
   },
   "additionalOptionsDesc": {
-    "message": "For additional help in managing your subscription, please contact Customer Support."
+    "message": "Để được hỗ trợ thêm trong việc quản lý gói đăng ký của bạn, vui lòng liên hệ với Bộ phận Hỗ trợ Khách hàng."
   },
   "subscriptionUserSeatsUnlimitedAutoscale": {
-    "message": "Adjustments to your subscription will result in prorated changes to your billing totals. If newly invited members exceed your subscription seats, you will immediately receive a prorated charge for the additional members."
+    "message": "Các điều chỉnh đối với gói đăng ký của bạn sẽ dẫn đến việc điều chỉnh theo tỷ lệ tương ứng đối với tổng số tiền thanh toán. Nếu số thành viên mới được mời vượt quá số ghế đăng ký của bạn, bạn sẽ ngay lập tức nhận được khoản phí theo tỷ lệ tương ứng cho các thành viên bổ sung."
   },
   "smStandaloneTrialSeatCountUpdateMessageFragment1": {
-    "message": "If you want to add additional"
+    "message": "Nếu bạn muốn thêm các tùy chọn bổ sung"
   },
   "smStandaloneTrialSeatCountUpdateMessageFragment2": {
-    "message": "seats without the bundled offer, please contact"
+    "message": "ghế mà không kèm theo gói ưu đãi, vui lòng liên hệ"
   },
   "subscriptionUserSeatsLimitedAutoscale": {
-    "message": "Adjustments to your subscription will result in prorated changes to your billing totals. If newly invited members exceed your subscription seats, you will immediately receive a prorated charge for the additional members until your $MAX$ seat limit is reached.",
+    "message": "Các điều chỉnh đối với gói đăng ký của bạn sẽ dẫn đến việc điều chỉnh theo tỷ lệ tương ứng đối với tổng số tiền thanh toán. Nếu số thành viên mới được mời vượt quá số ghế trong gói đăng ký của bạn, bạn sẽ ngay lập tức bị tính phí theo tỷ lệ tương ứng cho các thành viên thêm cho đến khi đạt đến giới hạn $MAX$ ghế.",
     "placeholders": {
       "max": {
         "content": "$1",
@@ -4404,7 +4419,7 @@
     }
   },
   "subscriptionUserSeatsWithoutAdditionalSeatsOption": {
-    "message": "You can invite up to $COUNT$ members for no additional charge. Contact Customer Support to upgrade your plan and invite more members.",
+    "message": "Bạn có thể mời tối đa $COUNT$ thành viên mà không phải trả thêm phí. Liên hệ với Bộ phận Hỗ trợ Khách hàng để nâng cấp gói dịch vụ và mời thêm thành viên.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4413,7 +4428,7 @@
     }
   },
   "subscriptionFreePlan": {
-    "message": "You cannot invite more than $COUNT$ members without upgrading your plan.",
+    "message": "Bạn không thể mời hơn $COUNT$ thành viên mà không nâng cấp gói dịch vụ của mình.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4422,7 +4437,7 @@
     }
   },
   "subscriptionUpgrade": {
-    "message": "You cannot invite more than $COUNT$ members without upgrading your plan.",
+    "message": "Bạn không thể mời hơn $COUNT$ thành viên mà không nâng cấp gói dịch vụ của mình.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4431,7 +4446,7 @@
     }
   },
   "subscriptionSponsoredFamiliesPlan": {
-    "message": "Your subscription allows for a total of $COUNT$ members. Your plan is sponsored and billed to an external organization.",
+    "message": "Gói đăng ký của bạn cho phép tối đa $COUNT$ thành viên. Gói đăng ký của bạn được tài trợ và thanh toán bởi một tổ chức bên ngoài.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4440,7 +4455,7 @@
     }
   },
   "subscriptionMaxReached": {
-    "message": "Adjustments to your subscription will result in prorated changes to your billing totals. You cannot invite more than $COUNT$ members without increasing your subscription seats.",
+    "message": "Các điều chỉnh đối với gói đăng ký của bạn sẽ dẫn đến việc điều chỉnh theo tỷ lệ tương ứng trên tổng số tiền thanh toán. Bạn không thể mời thêm hơn $COUNT$ thành viên mà không tăng số lượng ghế trong gói đăng ký của mình.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4449,7 +4464,7 @@
     }
   },
   "subscriptionSeatMaxReached": {
-    "message": "You cannot invite more than $COUNT$ members without increasing your subscription seats.",
+    "message": "Bạn không thể mời hơn $COUNT$ thành viên mà không tăng số lượng ghế đăng ký của mình.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4458,10 +4473,10 @@
     }
   },
   "seatsToAdd": {
-    "message": "Seats to add"
+    "message": "Số ghế cần thêm"
   },
   "seatsToRemove": {
-    "message": "Seats to remove"
+    "message": "Các ghế cần tháo"
   },
   "seatsAddNote": {
     "message": "Adding user seats will result in adjustments to your billing totals and immediately charge your payment method on file. The first charge will be prorated for the remainder of the current billing cycle."
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Không thể tiếp tục cập nhật khóa mã hóa"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "Khi cập nhật khóa mã hóa, các thư mục của bạn không thể được giải mã. Để tiếp tục cập nhật, các thư mục của bạn phải bị xóa. Sẽ không có mục nào bị xóa nếu bạn tiếp tục."
-  },
-  "keyUpdated": {
-    "message": "Key updated"
-  },
-  "updateEncryptionKey": {
-    "message": "Update encryption key"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "We've changed the encryption scheme to provide better security. Update your encryption key now by entering your master password below."
-  },
   "updateEncryptionKeyWarning": {
     "message": "After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you are currently using (such as the mobile app or browser extensions). Failure to log out and back in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out automatically, however, it may be delayed."
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "Gói"
   },
@@ -4724,88 +4727,88 @@
     "message": "This item has old file attachments that need to be fixed."
   },
   "attachmentFixDescription": {
-    "message": "This attachment uses outdated encryption. Select 'Fix' to download, re-encrypt, and re-upload the attachment."
+    "message": "Tệp đính kèm này sử dụng phương thức mã hóa đã lỗi thời. Chọn 'Sửa' để tải xuống, mã hóa lại và tải lên lại tệp đính kèm."
   },
   "fix": {
-    "message": "Fix",
+    "message": "Sửa",
     "description": "This is a verb. ex. 'Fix The Car'"
   },
   "oldAttachmentsNeedFixDesc": {
-    "message": "There are old file attachments in your vault that need to be fixed before you can rotate your account's encryption key."
+    "message": "Có một số tệp đính kèm cũ trong kho lưu trữ của bạn cần được sửa chữa trước khi bạn có thể thay đổi khóa mã hóa của tài khoản."
   },
   "yourAccountsFingerprint": {
-    "message": "Your account's fingerprint phrase",
+    "message": "Cụm từ xác thực tài khoản của bạn",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "fingerprintEnsureIntegrityVerify": {
-    "message": "To ensure the integrity of your encryption keys, please verify the user's fingerprint phrase before continuing.",
+    "message": "Để đảm bảo tính toàn vẹn các khóa mã hóa của bạn, vui lòng xác minh cụm từ xác thực của người dùng trước khi tiếp tục.",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "fingerprintMatchInfo": {
-    "message": "Please make sure your vault is unlocked and Fingerprint phrase matches the other device."
+    "message": "Vui lòng đảm bảo rằng bạn đã mở khoá kho và cụm từ xác thực khớp với thiết bị khác."
   },
   "fingerprintPhraseHeader": {
-    "message": "Fingerprint phrase"
+    "message": "Cụm từ xác thực"
   },
   "dontAskFingerprintAgain": {
-    "message": "Never prompt to verify fingerprint phrases for invited users (not recommended)",
+    "message": "Không yêu cầu xác minh cụm từ xác thực cho người dùng được mời (không được khuyến nghị)",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "You will be notified once the request is approved"
+    "message": "Bạn sẽ nhận được thông báo ngay sau khi yêu cầu được phê duyệt"
   },
   "free": {
     "message": "Miễn phí",
     "description": "Free, as in 'Free beer'"
   },
   "apiKey": {
-    "message": "API Key"
+    "message": "Khóa API"
   },
   "apiKeyDesc": {
-    "message": "Your API key can be used to authenticate to the Bitwarden public API."
+    "message": "Khóa API của bạn có thể được sử dụng để xác thực với API công khai của Bitwarden."
   },
   "apiKeyRotateDesc": {
-    "message": "Rotating the API key will invalidate the previous key. You can rotate your API key if you believe that the current key is no longer safe to use."
+    "message": "Việc thay đổi khóa API sẽ làm vô hiệu hóa khóa cũ. Bạn có thể thay đổi khóa API nếu cho rằng khóa hiện tại không còn an toàn để sử dụng."
   },
   "apiKeyWarning": {
-    "message": "Your API key has full access to the organization. It should be kept secret."
+    "message": "Khóa API của bạn có quyền truy cập đầy đủ vào tổ chức. Nó nên được giữ bí mật."
   },
   "userApiKeyDesc": {
-    "message": "Your API key can be used to authenticate in the Bitwarden CLI."
+    "message": "Khóa API của bạn có thể được sử dụng để xác thực trong Bitwarden CLI."
   },
   "userApiKeyWarning": {
-    "message": "Your API key is an alternative authentication mechanism. It should be kept secret."
+    "message": "Khóa API của bạn là một cơ chế xác thực thay thế. Nó cần được giữ bí mật."
   },
   "oauth2ClientCredentials": {
     "message": "OAuth 2.0 Client Credentials",
     "description": "'OAuth 2.0' is a programming protocol. It should probably not be translated."
   },
   "viewApiKey": {
-    "message": "View API key"
+    "message": "Xem khóa API"
   },
   "rotateApiKey": {
-    "message": "Rotate API key"
+    "message": "Xoay khóa API"
   },
   "selectOneCollection": {
-    "message": "You must select at least one collection."
+    "message": "Bạn phải chọn ít nhất một bộ sưu tập."
   },
   "couldNotChargeCardPayInvoice": {
-    "message": "We were not able to charge your card. Please view and pay the unpaid invoice listed below."
+    "message": "Chúng tôi không thể thực hiện giao dịch thanh toán bằng thẻ của quý khách. Vui lòng xem và thanh toán hóa đơn chưa thanh toán được liệt kê bên dưới."
   },
   "minLength": {
-    "message": "Minimum length"
+    "message": "Chiều dài tối thiểu"
   },
   "clone": {
     "message": "Tạo bản sao"
   },
   "masterPassPolicyTitle": {
-    "message": "Master password requirements"
+    "message": "Yêu cầu về mật khẩu chính"
   },
   "masterPassPolicyDesc": {
-    "message": "Set requirements for master password strength."
+    "message": "Đặt yêu cầu về độ mạnh của mật khẩu chính."
   },
   "passwordStrengthScore": {
-    "message": "Password strength score $SCORE$",
+    "message": "Độ mạnh của mật khẩu $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -4814,25 +4817,25 @@
     }
   },
   "twoStepLoginPolicyTitle": {
-    "message": "Require two-step login"
+    "message": "Yêu cầu đăng nhập hai bước"
   },
   "twoStepLoginPolicyDesc": {
-    "message": "Require members to set up two-step login."
+    "message": "Yêu cầu thành viên thiết lập đăng nhập hai bước."
   },
   "twoStepLoginPolicyWarning": {
-    "message": "Organization members who are not owners or admins and do not have two-step login setup for their account will be removed from the organization and will receive an email notifying them about the change."
+    "message": "Các thành viên tổ chức không phải là chủ sở hữu hoặc quản trị viên và không có cài đặt đăng nhập hai bước cho tài khoản của mình sẽ bị loại khỏi tổ chức và sẽ nhận được email thông báo về thay đổi này."
   },
   "twoStepLoginPolicyUserWarning": {
-    "message": "You are a member of an organization that requires two-step login to be setup on your user account. If you turn off all two-step login providers you will be automatically removed from these organizations."
+    "message": "Bạn là thành viên của một tổ chức yêu cầu phải thiết lập xác thực hai bước cho tài khoản người dùng của bạn. Nếu bạn tắt tất cả các nhà cung cấp xác thực hai bước, bạn sẽ tự động bị loại khỏi tổ chức này."
   },
   "passwordGeneratorPolicyDesc": {
-    "message": "Set requirements for password generator."
+    "message": "Đặt yêu cầu cho trình tạo mật khẩu."
   },
   "masterPasswordPolicyInEffect": {
-    "message": "One or more organization policies require your master password to meet the following requirements:"
+    "message": "Các chính sách của tổ chức yêu cầu mật khẩu chính của bạn phải đáp ứng các yêu cầu sau:"
   },
   "policyInEffectMinComplexity": {
-    "message": "Minimum complexity score of $SCORE$",
+    "message": "Độ mạnh tối thiểu $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -4841,7 +4844,7 @@
     }
   },
   "policyInEffectMinLength": {
-    "message": "Minimum length of $LENGTH$",
+    "message": "Độ dài tối thiểu là $LENGTH$",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -4850,16 +4853,16 @@
     }
   },
   "policyInEffectUppercase": {
-    "message": "Contain one or more uppercase characters"
+    "message": "Có chứa một hay nhiều ký tự viết hoa"
   },
   "policyInEffectLowercase": {
-    "message": "Contain one or more lowercase characters"
+    "message": "Có chứa một hay nhiều ký tự viết thường"
   },
   "policyInEffectNumbers": {
-    "message": "Contain one or more numbers"
+    "message": "Có chứa một hay nhiều chữ số"
   },
   "policyInEffectSpecial": {
-    "message": "Contain one or more of the following special characters $CHARS$",
+    "message": "Có chứa một hay nhiều ký tự đặc biệt sau $CHARS$",
     "placeholders": {
       "chars": {
         "content": "$1",
@@ -4868,26 +4871,26 @@
     }
   },
   "masterPasswordPolicyRequirementsNotMet": {
-    "message": "Your new master password does not meet the policy requirements."
+    "message": "Mật khẩu chính bạn chọn không đáp ứng yêu cầu."
   },
   "minimumNumberOfWords": {
-    "message": "Minimum number of words"
+    "message": "Số từ tối thiểu"
   },
   "overridePasswordTypePolicy": {
-    "message": "Password Type",
+    "message": "Loại mật khẩu",
     "description": "Name of the password generator policy that overrides the user's password/passphrase selection."
   },
   "userPreference": {
-    "message": "User preference"
+    "message": "Tùy chọn người dùng"
   },
   "vaultTimeoutAction": {
-    "message": "Vault timeout action"
+    "message": "Hành động sau khi đóng kho"
   },
   "vaultTimeoutActionLockDesc": {
-    "message": "Master password or other unlock method is required to access your vault again."
+    "message": "Bạn cần nhập mật khẩu chính hoặc phương thức mở khóa khác để truy cập lại vào kho lưu trữ."
   },
   "vaultTimeoutActionLogOutDesc": {
-    "message": "Re-authentication is required to access your vault again."
+    "message": "Bạn cần xác thực lại để mở khóa kho lưu trữ."
   },
   "lock": {
     "message": "Khóa",
@@ -4904,22 +4907,22 @@
     "message": "Xoá vĩnh viễn"
   },
   "permanentlyDeleteSelected": {
-    "message": "Permanently delete selected"
+    "message": "Xóa vĩnh viễn các mục đã chọn"
   },
   "permanentlyDeleteItem": {
-    "message": "Permanently delete item"
+    "message": "Xoá vĩnh viễn mục"
   },
   "permanentlyDeleteItemConfirmation": {
     "message": "Bạn có chắc muốn xóa vĩnh viễn mục này?"
   },
   "permanentlyDeletedItem": {
-    "message": "Item permanently deleted"
+    "message": "Đã xóa vĩnh viễn mục"
   },
   "permanentlyDeletedItems": {
-    "message": "Items permanently deleted"
+    "message": "Các mục đã bị xóa vĩnh viễn"
   },
   "permanentlyDeleteSelectedItemsDesc": {
-    "message": "You have selected $COUNT$ item(s) to permanently delete. Are you sure you want to permanently delete all of these items?",
+    "message": "Bạn đã chọn xóa vĩnh viễn $COUNT$ mục. Bạn có chắc chắn muốn xóa vĩnh viễn tất cả các mục này không?",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4928,7 +4931,7 @@
     }
   },
   "permanentlyDeletedItemId": {
-    "message": "Item $ID$ permanently deleted",
+    "message": "Mục $ID$ đã bị xóa vĩnh viễn",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4943,7 +4946,7 @@
     "message": "Khôi phục những mục đã chọn"
   },
   "restoredItem": {
-    "message": "Item restored"
+    "message": "Mục đã được khôi phục"
   },
   "restoredItems": {
     "message": "Items restored"
@@ -4961,7 +4964,7 @@
     "message": "Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
-    "message": "Timeout action confirmation"
+    "message": "Xác nhận hành động khi hết thời gian mở kho"
   },
   "hidePasswords": {
     "message": "Hide passwords"
@@ -5125,7 +5128,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createSend": {
-    "message": "Mục Gửi mới",
+    "message": "Tạo Send mới",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
@@ -5156,60 +5159,60 @@
     "message": "Deletion date"
   },
   "deletionDateDescV2": {
-    "message": "The Send will be permanently deleted on this date.",
+    "message": "Send sẽ được xóa vĩnh viễn vào ngày này.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
-    "message": "Expiration date"
+    "message": "Ngày hết hạn"
   },
   "expirationDateDesc": {
     "message": "Nếu được thiết lập, mục Gửi này sẽ hết hạn vào ngày và giờ được chỉ định.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "maxAccessCount": {
-    "message": "Maximum access count"
+    "message": "Số lượng truy cập tối đa"
   },
   "disabled": {
     "message": "Đã tắt"
   },
   "revoked": {
-    "message": "Revoked"
+    "message": "Đã thu hồi"
   },
   "sendLink": {
     "message": "Liên kết Gửi",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copyLink": {
-    "message": "Copy link"
+    "message": "Sao chép liên kết"
   },
   "copySendLink": {
     "message": "Sao chép liên kết mục Gửi",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "removePassword": {
-    "message": "Remove password"
+    "message": "Xóa mật khẩu"
   },
   "removedPassword": {
-    "message": "Password removed"
+    "message": "Đã xóa mật khẩu"
   },
   "removePasswordConfirmation": {
-    "message": "Are you sure you want to remove the password?"
+    "message": "Bạn có chắc chắn muốn xóa mật khẩu này không?"
   },
   "allSends": {
     "message": "Tất cả mục Gửi"
   },
   "maxAccessCountReached": {
-    "message": "Max access count reached",
+    "message": "Đã vượt số lần truy cập tối đa",
     "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "pendingDeletion": {
-    "message": "Pending deletion"
+    "message": "Đang chờ xóa"
   },
   "hideTextByDefault": {
-    "message": "Hide text by default"
+    "message": "Mặc định ẩn văn bản"
   },
   "expired": {
-    "message": "Expired"
+    "message": "Đã hết hạn"
   },
   "searchSends": {
     "message": "Tìm kiếm mục Gửi",
@@ -5220,22 +5223,22 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendProtectedPasswordDontKnow": {
-    "message": "Don't know the password? Ask the sender for the password needed to access this Send.",
+    "message": "Không biết mật khẩu? Hãy yêu cầu người gửi cung cấp mật khẩu cần thiết để truy cập vào Send này.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendHiddenByDefault": {
-    "message": "This Send is hidden by default. You can toggle its visibility using the button below.",
+    "message": "Send này sẽ bị ẩn theo mặc định. Bạn có thể bật/tắt tính năng này bằng cách nhấn vào nút bên dưới.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "downloadAttachments": {
     "message": "Tải xuống tập tin đính kèm"
   },
   "sendAccessUnavailable": {
-    "message": "The Send you are trying to access does not exist or is no longer available.",
+    "message": "Send mà bạn đang cố gắng truy cập không tồn tại hoặc không còn khả dụng.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "missingSendFile": {
-    "message": "The file associated with this Send could not be found.",
+    "message": "Không tìm thấy tập tin liên quan đến Send này.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "noSendsInList": {
@@ -5246,55 +5249,55 @@
     "message": "Truy cập khẩn cấp"
   },
   "emergencyAccessDesc": {
-    "message": "Grant and manage emergency access for trusted contacts. Trusted contacts may request access to either View or Takeover your account in case of an emergency. Visit our help page for more information and details into how zero knowledge sharing works."
+    "message": "Cấp quyền và quản lý quyền truy cập khẩn cấp cho các liên hệ tin cậy. Các liên hệ tin cậy có thể yêu cầu quyền truy cập để Xem hoặc Kiểm soát tài khoản của bạn trong trường hợp khẩn cấp. Truy cập trang hỗ trợ của chúng tôi để biết thêm thông tin chi tiết về cách thức hoạt động của cơ chế chia sẻ thông tin không tiết lộ."
   },
   "emergencyAccessOwnerWarning": {
-    "message": "You are an owner of one or more organizations. If you give takeover access to an emergency contact, they will be able to use all your permissions as owner after a takeover."
+    "message": "Bạn là chủ sở hữu của một hoặc nhiều tổ chức. Nếu bạn cấp quyền tiếp quản cho một liên hệ khẩn cấp, họ sẽ có thể sử dụng tất cả quyền hạn của bạn với tư cách là chủ sở hữu sau khi tiếp quản."
   },
   "trustedEmergencyContacts": {
-    "message": "Trusted emergency contacts"
+    "message": "Các liên hệ khẩn cấp đáng tin cậy"
   },
   "noTrustedContacts": {
-    "message": "You have not added any emergency contacts yet, invite a trusted contact to get started."
+    "message": "Bạn chưa thêm bất kỳ liên hệ khẩn cấp nào. Hãy mời một liên hệ đáng tin cậy để bắt đầu."
   },
   "addEmergencyContact": {
-    "message": "Add emergency contact"
+    "message": "Thêm liên hệ khẩn cấp"
   },
   "designatedEmergencyContacts": {
-    "message": "Designated as emergency contact"
+    "message": "Được chỉ định làm người liên hệ khẩn cấp"
   },
   "noGrantedAccess": {
-    "message": "You have not been designated as an emergency contact for anyone yet."
+    "message": "Bạn chưa được chỉ định làm người liên hệ khẩn cấp cho bất kỳ ai."
   },
   "inviteEmergencyContact": {
-    "message": "Invite emergency contact"
+    "message": "Mời liên hệ khẩn cấp"
   },
   "editEmergencyContact": {
-    "message": "Edit emergency contact"
+    "message": "Chỉnh sửa liên hệ khẩn cấp"
   },
   "inviteEmergencyContactDesc": {
-    "message": "Invite a new emergency contact by entering their Bitwarden account email address below. If they do not have a Bitwarden account already, they will be prompted to create a new account."
+    "message": "Mời một liên hệ khẩn cấp mới bằng cách nhập địa chỉ email tài khoản Bitwarden của họ vào ô bên dưới. Nếu họ chưa có tài khoản Bitwarden, họ sẽ được yêu cầu tạo tài khoản mới."
   },
   "emergencyAccessRecoveryInitiated": {
-    "message": "Emergency access initiated"
+    "message": "Đã kích hoạt quyền truy cập khẩn cấp"
   },
   "emergencyAccessRecoveryApproved": {
-    "message": "Emergency access approved"
+    "message": "Quyền truy cập khẩn cấp đã được phê duyệt"
   },
   "viewDesc": {
-    "message": "Can view all items in your own vault."
+    "message": "Bạn có thể xem tất cả các mục trong kho của mình."
   },
   "takeover": {
-    "message": "Takeover"
+    "message": "Kiểm soát"
   },
   "takeoverDesc": {
-    "message": "Can reset your account with a new master password."
+    "message": "Bạn có thể đặt lại tài khoản của mình bằng mật khẩu chính mới."
   },
   "waitTime": {
-    "message": "Wait time"
+    "message": "Thời gian chờ"
   },
   "waitTimeDesc": {
-    "message": "Time required before automatically granting access."
+    "message": "Thời gian cần thiết trước khi tự động cấp quyền truy cập."
   },
   "oneDay": {
     "message": "1 ngày"
@@ -5309,16 +5312,16 @@
     }
   },
   "invitedUser": {
-    "message": "Invited user."
+    "message": "Đã mời người dùng."
   },
   "acceptEmergencyAccess": {
-    "message": "You've been invited to become an emergency contact for the user listed above. To accept the invitation, you need to log in or create a new Bitwarden account."
+    "message": "Bạn đã được mời trở thành liên hệ khẩn cấp cho người dùng được liệt kê ở trên. Để chấp nhận lời mời, bạn cần đăng nhập hoặc tạo tài khoản Bitwarden mới."
   },
   "emergencyInviteAcceptFailed": {
-    "message": "Unable to accept invitation. Ask the user to send a new invitation."
+    "message": "Không thể chấp nhận lời mời. Yêu cầu người dùng gửi lời mời mới."
   },
   "emergencyInviteAcceptFailedShort": {
-    "message": "Unable to accept invitation. $DESCRIPTION$",
+    "message": "Không thể chấp nhận lời mời. $DESCRIPTION$",
     "placeholders": {
       "description": {
         "content": "$1",
@@ -5327,13 +5330,13 @@
     }
   },
   "emergencyInviteAcceptedDesc": {
-    "message": "You can access the emergency options for this user after your identity has been confirmed. We'll send you an email when that happens."
+    "message": "Bạn có thể truy cập các tùy chọn khẩn cấp cho người dùng này sau khi danh tính của bạn đã được xác minh. Chúng tôi sẽ gửi email cho bạn khi điều đó xảy ra."
   },
   "requestAccess": {
-    "message": "Request Access"
+    "message": "Yêu cầu truy cập"
   },
   "requestAccessConfirmation": {
-    "message": "Are you sure you want to request emergency access? You will be provided access after $WAITTIME$ day(s) or whenever the user manually approves the request.",
+    "message": "Bạn có chắc chắn muốn yêu cầu quyền truy cập khẩn cấp không? Quyền truy cập sẽ được cấp sau $WAITTIME$ ngày hoặc khi người dùng phê duyệt yêu cầu một cách thủ công.",
     "placeholders": {
       "waittime": {
         "content": "$1",
@@ -5342,7 +5345,7 @@
     }
   },
   "requestSent": {
-    "message": "Emergency access requested for $USER$. We'll notify you by email when it's possible to continue.",
+    "message": "Yêu cầu truy cập khẩn cấp cho $USER$. Chúng tôi sẽ thông báo cho bạn qua email khi có thể tiếp tục.",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -5357,7 +5360,7 @@
     "message": "Từ chối"
   },
   "approveAccessConfirmation": {
-    "message": "Are you sure you want to approve emergency access? This will allow $USER$ to $ACTION$ your account.",
+    "message": "Bạn có chắc chắn muốn phê duyệt quyền truy cập khẩn cấp không? Điều này sẽ cho phép $USER$ thực hiện $ACTION$ trên tài khoản của bạn.",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -5370,13 +5373,16 @@
     }
   },
   "emergencyApproved": {
-    "message": "Emergency access approved"
+    "message": "Đã phê duyệt quyền truy cập khẩn cấp"
   },
   "emergencyRejected": {
-    "message": "Emergency access rejected"
+    "message": "Truy cập khẩn cấp bị từ chối"
+  },
+  "grantorDetailsNotFound": {
+    "message": "Không tìm thấy thông tin về người cấp phép"
   },
   "passwordResetFor": {
-    "message": "Password reset for $USER$. You can now login using the new password.",
+    "message": "Đặt lại mật khẩu cho $USER$. Bạn có thể đăng nhập bằng mật khẩu mới.",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -5384,27 +5390,30 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Thực thi quyền sở hữu dữ liệu của tổ chức"
+  },
   "personalOwnership": {
-    "message": "Remove individual vault"
+    "message": "Xóa kho lưu trữ riêng lẻ"
   },
   "personalOwnershipPolicyDesc": {
-    "message": "Require members to save items to an organization by removing the individual vault option."
+    "message": "Yêu cầu thành viên lưu trữ các mục vào tổ chức bằng cách loại bỏ tùy chọn kho lưu trữ cá nhân."
   },
   "personalOwnershipExemption": {
-    "message": "Organization owners and administrators are exempt from this policy's enforcement."
+    "message": "Chủ sở hữu và quản trị viên của tổ chức được miễn trừ khỏi việc áp dụng chính sách này."
   },
   "personalOwnershipSubmitError": {
-    "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organization and choose from available collections."
+    "message": "Do chính sách của doanh nghiệp, bạn không thể lưu trữ các mục vào kho cá nhân của mình. Hãy thay đổi tùy chọn Quyền sở hữu thành tổ chức và chọn từ các bộ sưu tập có sẵn."
   },
   "disableSend": {
     "message": "Xóa Gửi"
   },
   "disableSendPolicyDesc": {
-    "message": "Do not allow members to create or edit Sends.",
+    "message": "Không cho phép thành viên tạo hoặc chỉnh sửa Sends.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "disableSendExemption": {
-    "message": "Organization members that can manage the organization's policies are exempt from this policy's enforcement."
+    "message": "Các thành viên tổ chức có quyền quản lý chính sách của tổ chức sẽ được miễn áp dụng chính sách này."
   },
   "sendDisabled": {
     "message": "Đã loại bỏ Gửi",
@@ -5415,22 +5424,22 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptions": {
-    "message": "Send options",
+    "message": "Tùy chọn Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsPolicyDesc": {
-    "message": "Set options for creating and editing Sends.",
+    "message": "Cài đặt tùy chọn cho việc tạo và chỉnh sửa Send.",
     "description": "'Sends' is a plural noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsExemption": {
-    "message": "Organization members that can manage the organization's policies are exempt from this policy's enforcement."
+    "message": "Các thành viên tổ chức có quyền quản lý chính sách của tổ chức sẽ được miễn áp dụng chính sách này."
   },
   "disableHideEmail": {
-    "message": "Always show member’s email address with recipients when creating or editing a Send.",
+    "message": "Luôn hiển thị địa chỉ email của thành viên cho người nhận khi tạo hoặc chỉnh sửa Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "modifiedPolicyId": {
-    "message": "Modified policy $ID$.",
+    "message": "Chính sách $ID$ đã được điều chỉnh.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -5439,19 +5448,19 @@
     }
   },
   "planPrice": {
-    "message": "Plan price"
+    "message": "Giá gói dịch vụ"
   },
   "estimatedTax": {
-    "message": "Estimated tax"
+    "message": "Thuế dự kiến"
   },
   "custom": {
-    "message": "Custom"
+    "message": "Tùy chỉnh"
   },
   "customDesc": {
-    "message": "Grant customized permissions to members"
+    "message": "Cấp quyền truy cập tùy chỉnh cho các thành viên"
   },
   "customDescNonEnterpriseStart": {
-    "message": "Custom roles is an ",
+    "message": "Vai trò tùy chỉnh là một ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Custom roles is an enterprise feature. Contact our support team to upgrade your subscription'"
   },
   "customDescNonEnterpriseLink": {
@@ -5463,55 +5472,55 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Custom roles is an enterprise feature. Contact our support team to upgrade your subscription'"
   },
   "customNonEnterpriseError": {
-    "message": "To enable custom permissions the organization must be on an Enterprise 2020 plan."
+    "message": "Để kích hoạt quyền truy cập tùy chỉnh, tổ chức phải sử dụng gói Enterprise 2020."
   },
   "permissions": {
-    "message": "Permissions"
+    "message": "Quyền truy cập"
   },
   "permission": {
-    "message": "Permission"
+    "message": "Quyền"
   },
   "accessEventLogs": {
-    "message": "Access event logs"
+    "message": "Truy cập nhật ký sự kiện"
   },
   "accessImportExport": {
-    "message": "Access import/export"
+    "message": "Truy cập nhập/xuất"
   },
   "accessReports": {
-    "message": "Access reports"
+    "message": "Truy cập báo cáo"
   },
   "missingPermissions": {
-    "message": "You lack the necessary permissions to perform this action."
+    "message": "Bạn không có quyền truy cập cần thiết để thực hiện thao tác này."
   },
   "manageAllCollections": {
-    "message": "Manage all collections"
+    "message": "Quản lý tất cả các bộ sưu tập"
   },
   "createNewCollections": {
-    "message": "Create new collections"
+    "message": "Tạo các bộ sưu tập mới"
   },
   "editAnyCollection": {
-    "message": "Edit any collection"
+    "message": "Chỉnh sửa bất kỳ bộ sưu tập nào"
   },
   "deleteAnyCollection": {
-    "message": "Delete any collection"
+    "message": "Xóa bất kỳ bộ sưu tập nào"
   },
   "manageGroups": {
-    "message": "Manage groups"
+    "message": "Quản lí các nhóm"
   },
   "managePolicies": {
-    "message": "Manage policies"
+    "message": "Quản lý các chính sách"
   },
   "manageSso": {
-    "message": "Manage SSO"
+    "message": "Quản lý SSO"
   },
   "manageUsers": {
     "message": "Quản lý người dùng"
   },
   "manageAccountRecovery": {
-    "message": "Manage account recovery"
+    "message": "Quản lý khôi phục tài khoản"
   },
   "disableRequiredError": {
-    "message": "You must manually turn the $POLICYNAME$ policy before this policy can be turned off.",
+    "message": "Bạn phải tắt chính sách $POLICYNAME$ theo cách thủ công trước khi có thể tắt chính sách này.",
     "placeholders": {
       "policyName": {
         "content": "$1",
@@ -5520,20 +5529,20 @@
     }
   },
   "personalOwnershipPolicyInEffect": {
-    "message": "An organization policy is affecting your ownership options."
+    "message": "Chính sách của tổ chức đang ảnh hưởng đến các tùy chọn quyền sở hữu của bạn."
   },
   "personalOwnershipPolicyInEffectImports": {
-    "message": "An organization policy has blocked importing items into your individual vault."
+    "message": "Chính sách của tổ chức đã chặn việc nhập các mục vào kho cá nhân của bạn."
   },
   "personalOwnershipCheckboxDesc": {
-    "message": "Remove individual ownership for organization users"
+    "message": "Loại bỏ quyền sở hữu cá nhân cho người dùng tổ chức"
   },
   "send": {
     "message": "Gửi",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendAccessTaglineProductDesc": {
-    "message": "Bitwarden Send transmits sensitive, temporary information to others easily and securely.",
+    "message": "Bitwarden Send cho phép truyền tải thông tin nhạy cảm và tạm thời đến người khác một cách dễ dàng và an toàn.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendAccessTaglineLearnMore": {
@@ -5541,7 +5550,7 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read '**Learn more about** Bitwarden Send or sign up to try it today.'"
   },
   "sendVaultCardProductDesc": {
-    "message": "Share text or files directly with anyone."
+    "message": "Chia sẻ văn bản hoặc tập tin trực tiếp với bất kỳ ai."
   },
   "sendVaultCardLearnMore": {
     "message": "Tìm hiểu thêm",
@@ -5764,10 +5773,19 @@
     }
   },
   "resetPassword": {
-    "message": "Reset password"
+    "message": "Đặt lại mật khẩu"
   },
   "resetPasswordLoggedOutWarning": {
-    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "message": "Quá trình này sẽ đăng xuất $NAME$ khỏi phiên làm việc hiện tại, yêu cầu họ phải đăng nhập lại. Các phiên làm việc đang hoạt động trên các thiết bị khác có thể tiếp tục duy trì trạng thái hoạt động trong tối đa một giờ.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Quá trình này sẽ đăng xuất $NAME$ khỏi phiên làm việc hiện tại, yêu cầu họ phải đăng nhập lại. Các phiên làm việc đang hoạt động trên các thiết bị khác có thể tiếp tục duy trì trạng thái hoạt động trong tối đa một giờ.",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -5776,76 +5794,79 @@
     }
   },
   "thisUser": {
-    "message": "this user"
+    "message": "người dùng này"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
-    "message": "One or more organization policies require the master password to meet the following requirements:"
+    "message": "Các chính sách của tổ chức yêu cầu mật khẩu chính phải đáp ứng các yêu cầu sau:"
+  },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "Các chính sách của tổ chức yêu cầu mật khẩu chính phải đáp ứng các yêu cầu sau:"
   },
   "resetPasswordSuccess": {
-    "message": "Password reset success!"
+    "message": "Đặt lại mật khẩu thành công!"
   },
   "resetPasswordEnrollmentWarning": {
-    "message": "Enrollment will allow organization administrators to change your master password"
+    "message": "Việc đăng ký sẽ cho phép quản trị viên tổ chức thay đổi mật khẩu chính của bạn"
   },
   "accountRecoveryPolicy": {
-    "message": "Account recovery administration"
+    "message": "Quản lý khôi phục tài khoản"
   },
   "accountRecoveryPolicyDesc": {
-    "message": "Based on the encryption method, recover accounts when master passwords or trusted devices are forgotten or lost."
+    "message": "Dựa trên phương pháp mã hóa, khôi phục tài khoản khi mật khẩu chính hoặc thiết bị tin cậy bị quên hoặc mất."
   },
   "accountRecoveryPolicyWarning": {
-    "message": "Existing accounts with master passwords will require members to self-enroll before administrators can recover their accounts. Automatic enrollment will turn on account recovery for new members."
+    "message": "Các tài khoản hiện có sử dụng mật khẩu chính sẽ yêu cầu thành viên tự đăng ký trước khi quản trị viên có thể khôi phục tài khoản của họ. Chức năng đăng ký tự động sẽ kích hoạt tính năng khôi phục tài khoản cho các thành viên mới."
   },
   "accountRecoverySingleOrgRequirementDesc": {
-    "message": "The single organization Enterprise policy must be turned on before activating this policy."
+    "message": "Chính sách Doanh nghiệp của tổ chức duy nhất phải được bật trước khi kích hoạt chính sách này."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic enrollment"
+    "message": "Đăng ký tự động"
   },
   "resetPasswordPolicyAutoEnrollCheckbox": {
-    "message": "Require new members to be enrolled automatically"
+    "message": "Yêu cầu các thành viên mới được đăng ký tự động"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an Enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Tổ chức này có chính sách doanh nghiệp sẽ tự động đặt lại mật khẩu chính cho bạn. Đăng ký sẽ cho phép quản trị viên tổ chức thay đổi mật khẩu chính của bạn."
   },
   "resetPasswordOrgKeysError": {
-    "message": "Organization keys response is null"
+    "message": "Phản hồi của khóa tổ chức là null"
   },
   "resetPasswordDetailsError": {
-    "message": "Reset password details response is null"
+    "message": "Phản hồi chi tiết về việc đặt lại mật khẩu là null"
   },
   "trashCleanupWarning": {
-    "message": "Items that have been in trash more than 30 days will be automatically deleted."
+    "message": "Các mục đã nằm trong thùng rác quá 30 ngày sẽ bị xóa tự động."
   },
   "trashCleanupWarningSelfHosted": {
-    "message": "Items that have been in trash for a while will be automatically deleted."
+    "message": "Các mục đã nằm trong thùng rác trong một thời gian dài sẽ được tự động xóa."
   },
   "passwordPrompt": {
-    "message": "Master password re-prompt"
+    "message": "Nhập lại mật khẩu chính"
   },
   "passwordConfirmation": {
-    "message": "Master password confirmation"
+    "message": "Xác nhận mật khẩu chính"
   },
   "passwordConfirmationDesc": {
-    "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
+    "message": "Hành động này được bảo vệ. Để tiếp tục, hãy nhập lại mật khẩu chính của bạn để xác minh danh tính."
   },
   "reinviteSelected": {
-    "message": "Resend invitations"
+    "message": "Gửi lại các lời mời"
   },
   "resendNotification": {
-    "message": "Resend notification"
+    "message": "Gửi lại thông báo"
   },
   "noSelectedUsersApplicable": {
-    "message": "This action is not applicable to any of the selected users."
+    "message": "Hành động này không áp dụng cho bất kỳ người dùng nào đã được chọn."
   },
   "removeUsersWarning": {
-    "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
+    "message": "Bạn có chắc chắn muốn xóa các tài khoản người dùng sau đây không? Quá trình này có thể mất vài giây để hoàn tất và không thể bị gián đoạn hoặc hủy bỏ."
   },
   "removeOrgUsersConfirmation": {
-    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
+    "message": "Khi (các) thành viên thành viên bị loại bỏ, họ sẽ không còn quyền truy cập vào dữ liệu của tổ chức và hành động này là không thể đảo ngược. Để thêm thành viên trở lại tổ chức, họ phải được mời và đăng ký lại. Quy trình này có thể mất vài giây để hoàn tất và không thể bị gián đoạn hoặc hủy bỏ."
   },
   "revokeUsersWarning": {
-    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
+    "message": "Khi (các) thành viên bị thu hồi quyền truy cập, họ sẽ không còn quyền truy cập vào dữ liệu của tổ chức. Để khôi phục quyền truy cập cho thành viên một cách nhanh chóng, hãy truy cập vào tab \"Thu hồi\". Quá trình này có thể mất vài giây để hoàn tất và không thể bị gián đoạn hoặc hủy bỏ."
   },
   "theme": {
     "message": "Chủ đề"
@@ -5863,72 +5884,72 @@
     "message": "Sáng"
   },
   "confirmSelected": {
-    "message": "Confirm selected"
+    "message": "Xác nhận lựa chọn"
   },
   "bulkConfirmStatus": {
-    "message": "Bulk action status"
+    "message": "Trạng thái thao tác hàng loạt"
   },
   "bulkConfirmMessage": {
-    "message": "Confirmed successfully"
+    "message": "Đã xác nhận thành công"
   },
   "bulkReinviteMessage": {
-    "message": "Reinvited successfully"
+    "message": "Đã mời lại thành côngvv"
   },
   "bulkRemovedMessage": {
-    "message": "Removed successfully"
+    "message": "Đã xóa thành công"
   },
   "bulkRevokedMessage": {
-    "message": "Revoked organization access successfully"
+    "message": "Quyền truy cập của tổ chức đã bị thu hồi thành công"
   },
   "bulkRestoredMessage": {
-    "message": "Restored organization access successfully"
+    "message": "Đã khôi phục quyền truy cập vào tổ chức thành công"
   },
   "bulkFilteredMessage": {
-    "message": "Excluded, not applicable for this action"
+    "message": "Không áp dụng cho hành động này"
   },
   "nonCompliantMembersTitle": {
-    "message": "Non-compliant members"
+    "message": "Các thành viên không tuân thủ chính sách"
   },
   "nonCompliantMembersError": {
-    "message": "Members that are non-compliant with the Single organization or Two-step login policy cannot be restored until they adhere to the policy requirements"
+    "message": "Thành viên không tuân thủ chính sách Tổ chức Đơn lẻ hoặc Đăng nhập hai bước không thể được khôi phục cho đến khi họ đáp ứng các yêu cầu của chính sách"
   },
   "fingerprint": {
-    "message": "Fingerprint"
+    "message": "Vân tay"
   },
   "fingerprintPhrase": {
-    "message": "Fingerprint phrase:"
+    "message": "Cụm từ xác thực:"
   },
   "error": {
-    "message": "Error"
+    "message": "Lỗi"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Lỗi giải mã"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "Bitwarden không thể giải mã các mục trong kho lưu trữ được liệt kê bên dưới."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "Liên hệ hỗ trợ khách hàng thành công",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "để tránh mất mát thêm dữ liệu.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "accountRecoveryManageUsers": {
-    "message": "Manage users must also be granted with the manage account recovery permission"
+    "message": "Người quản lý người dùng cũng phải được cấp quyền quản lý khôi phục tài khoản"
   },
   "setupProvider": {
-    "message": "Provider setup"
+    "message": "Cài đặt nhà cung cấp"
   },
   "setupProviderLoginDesc": {
-    "message": "You've been invited to setup a new Provider. To continue, you need to log in or create a new Bitwarden account."
+    "message": "Bạn đã được mời để thiết lập một nhà cung cấp mới. Để tiếp tục, bạn cần đăng nhập hoặc tạo tài khoản Bitwarden mới."
   },
   "setupProviderDesc": {
-    "message": "Please enter the details below to complete the Provider setup. Contact Customer Support if you have any questions."
+    "message": "Vui lòng nhập các thông tin bên dưới để hoàn tất quá trình thiết lập Nhà cung cấp. Liên hệ với Bộ phận Hỗ trợ Khách hàng nếu bạn có bất kỳ câu hỏi nào."
   },
   "providerName": {
-    "message": "Provider name"
+    "message": "Tên nhà cung cấp"
   },
   "providerSetup": {
     "message": "Provider successfully set up"
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "Add"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "Master password saved"
   },
   "updateMasterPassword": {
     "message": "Update master password"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
@@ -6121,7 +6151,7 @@
     }
   },
   "vaultTimeoutPolicyWithActionInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is $HOURS$ hour(s) and $MINUTES$ minute(s). Your vault timeout action is set to $ACTION$.",
+    "message": "Các chính sách của tổ chức bạn đang ảnh hưởng đến thời gian mở kho. Thời gian mở kho tối đa được phép là $HOURS$ giờ và $MINUTES$ phút. Kho sẽ $ACTION$ sau khi đóng kho.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -6138,7 +6168,7 @@
     }
   },
   "vaultTimeoutActionPolicyInEffect": {
-    "message": "Your organization policies have set your vault timeout action to $ACTION$.",
+    "message": "Tổ chức bạn đã thiết lập hành động sau khi đóng kho là $ACTION$.",
     "placeholders": {
       "action": {
         "content": "$1",
@@ -6147,46 +6177,46 @@
     }
   },
   "vaultTimeoutToLarge": {
-    "message": "Your vault timeout exceeds the restriction set by your organization."
+    "message": "Thời gian mở kho vượt quá giới hạn do tổ chức của bạn đặt ra."
   },
   "vaultCustomTimeoutMinimum": {
-    "message": "Minimum custom timeout is 1 minute."
+    "message": "Thời gian đóng kho tùy chỉnh tối thiểu là 1 phút."
   },
   "vaultTimeoutRangeError": {
-    "message": "Vault timeout is not within allowed range."
+    "message": "Thời gian chờ của kho lưu trữ không nằm trong phạm vi cho phép."
   },
   "disablePersonalVaultExport": {
-    "message": "Remove individual vault export"
+    "message": "Xóa xuất dữ liệu kho riêng lẻ"
   },
   "disablePersonalVaultExportDescription": {
-    "message": "Do not allow members to export data from their individual vault."
+    "message": "Không cho phép thành viên xuất dữ liệu từ kho lưu trữ cá nhân của họ."
   },
   "vaultExportDisabled": {
-    "message": "Vault export removed"
+    "message": "Đã hủy xuất kho"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your individual vault."
+    "message": "Các chính sách của tổ chức ngăn cản bạn xuất kho lưu trữ cá nhân của mình."
   },
   "activateAutofill": {
-    "message": "Activate auto-fill"
+    "message": "Bật tính năng tự động điền"
   },
   "activateAutofillPolicyDesc": {
-    "message": "Activate the auto-fill on page load setting on the browser extension for all existing and new members."
+    "message": "Bật tính năng tự động điền khi tải trang trên tiện ích mở rộng trình duyệt cho tất cả thành viên hiện tại và mới."
   },
   "experimentalFeature": {
-    "message": "Compromised or untrusted websites can exploit auto-fill on page load."
+    "message": "Các trang web bị xâm phạm hoặc không đáng tin cậy có thể khai thác tính năng tự động điền khi tải trang."
   },
   "learnMoreAboutAutofill": {
-    "message": "Learn more about auto-fill"
+    "message": "Tìm hiểu thêm về tự động điền"
   },
   "selectType": {
-    "message": "Select SSO type"
+    "message": "Chọn loại SSO"
   },
   "type": {
-    "message": "Type"
+    "message": "Loại"
   },
   "openIdConnectConfig": {
-    "message": "OpenID connect configuration"
+    "message": "Cấu hình OpenID Connect"
   },
   "samlSpConfig": {
     "message": "SAML service provider configuration"
@@ -6819,11 +6849,29 @@
     "description": "Short for 'credential generator'."
   },
   "generateUsername": {
-    "message": "Generate username"
+    "message": "Tạo tên đăng nhập"
   },
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "Tạo mật khẩu"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Tên đăng nhập được tạo tự động"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "Value must be between $MIN$ and $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6875,20 +6923,23 @@
     "message": "Use this email"
   },
   "random": {
-    "message": "Random",
+    "message": "Ngẫu nhiên",
     "description": "Generates domain-based username using random letters"
   },
   "randomWord": {
     "message": "Random word"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Trình tạo tên đăng nhập"
   },
   "useThisPassword": {
     "message": "Use this password"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
-    "message": "Use this username"
+    "message": "Dùng tên đăng nhập này"
   },
   "securePasswordGenerated": {
     "message": "Secure password generated! Don't forget to also update your password on the website."
@@ -7149,7 +7200,7 @@
     "message": "This API key has access to manage users within your organization. It should be kept secret."
   },
   "copyScimKey": {
-    "message": "Copy the SCIM API key to your clipboard",
+    "message": "Sao chép khóa API SCIM vào bảng nhớ tạm",
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "rotateScimKey": {
@@ -7168,7 +7219,7 @@
     "description": "the text, 'SCIM' and 'API', are acronyms and should not be translated."
   },
   "copyScimUrl": {
-    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "message": "Sao chép SCIM endpoint URL vào bảng nhớ tạm",
     "description": "the text, 'SCIM' and 'URL', are acronyms and should not be translated."
   },
   "scimUrl": {
@@ -7184,13 +7235,13 @@
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
   "inputRequired": {
-    "message": "Input is required."
+    "message": "Trường này là bắt buộc."
   },
   "inputEmail": {
-    "message": "Input is not an email address."
+    "message": "Dữ liệu nhập vào không phải là địa chỉ email."
   },
   "inputMinLength": {
-    "message": "Input must be at least $COUNT$ characters long.",
+    "message": "Dữ liệu nhập vào phải có độ dài ít nhất $COUNT$ ký tự.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7199,7 +7250,7 @@
     }
   },
   "inputMaxLength": {
-    "message": "Input must not exceed $COUNT$ characters in length.",
+    "message": "Độ dài của dữ liệu nhập vào không được vượt quá $COUNT$ ký tự.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -7208,7 +7259,7 @@
     }
   },
   "inputForbiddenCharacters": {
-    "message": "The following characters are not allowed: $CHARACTERS$",
+    "message": "Các ký tự sau không được phép sử dụng: $CHARACTERS$",
     "placeholders": {
       "characters": {
         "content": "$1",
@@ -7217,7 +7268,7 @@
     }
   },
   "inputMinValue": {
-    "message": "Input value must be at least $MIN$.",
+    "message": "Dữ liệu nhập vào phải ít nhất là $MIN$.",
     "placeholders": {
       "min": {
         "content": "$1",
@@ -7226,7 +7277,7 @@
     }
   },
   "inputMaxValue": {
-    "message": "Input value must not exceed $MAX$.",
+    "message": "Dữ liệu nhập vào không được vượt quá $MAX$.",
     "placeholders": {
       "max": {
         "content": "$1",
@@ -7235,7 +7286,7 @@
     }
   },
   "multipleInputEmails": {
-    "message": "1 or more emails are invalid"
+    "message": "Có ít nhất 1 địa chỉ email không hợp lệ"
   },
   "tooManyEmails": {
     "message": "You can only submit up to $COUNT$ emails at a time",
@@ -7385,11 +7436,11 @@
     "description": "Action to create a new secret."
   },
   "copySecretName": {
-    "message": "Copy secret name",
+    "message": "Sao chép tên bí mật",
     "description": "Action to copy the name of a secret to the system's clipboard."
   },
   "copySecretValue": {
-    "message": "Copy secret value",
+    "message": "Sao chép giá trị bí mật",
     "description": "Action to copy the value of a secret to the system's clipboard."
   },
   "deleteSecret": {
@@ -7411,7 +7462,7 @@
     "description": "A prompt explaining how secrets can be associated with projects."
   },
   "selectProjects": {
-    "message": "Select projects",
+    "message": "Chọn dự án",
     "description": "A label for a type-to-filter input field to choose projects."
   },
   "searchProjects": {
@@ -7605,9 +7656,9 @@
     "message": "Service account updated",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "Type or select projects or secrets",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "Type to filter",
@@ -7632,7 +7683,7 @@
     }
   },
   "deleteProjectInputLabel": {
-    "message": "Type \"$CONFIRM$\" to continue",
+    "message": "Nhập $CONFIRM$ để tiếp tục",
     "description": "Users are prompted to type 'confirm' to delete a project",
     "placeholders": {
       "confirm": {
@@ -7692,8 +7743,8 @@
     "message": "Access tokens",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "New access token",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -7725,7 +7776,7 @@
     "description": "Notification to inform the user that access tokens are only displayed once and cannot be retrieved again."
   },
   "copyToken": {
-    "message": "Copy token",
+    "message": "Sao chép token",
     "description": "Copies the generated access token to the user's clipboard."
   },
   "accessToken": {
@@ -7737,7 +7788,7 @@
     "description": "Error message indicating that an expiration date for the access token must be set."
   },
   "accessTokenCreatedAndCopied": {
-    "message": "Access token created and copied to clipboard",
+    "message": "Token truy cập đã được tạo và sao chép vào bảng nhớ tạm",
     "description": "Notification to inform the user that the access token has been created and copied to the clipboard."
   },
   "revokeAccessToken": {
@@ -7843,7 +7894,7 @@
     "message": "DNS TXT record"
   },
   "dnsTxtRecordInputHint": {
-    "message": "Copy and paste the TXT record into your DNS Provider."
+    "message": "Sao chép và dán bản ghi TXT vào nhà cung cấp DNS của bạn."
   },
   "removeDomain": {
     "message": "Remove domain"
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "Đã xảy ra lỗi khi cố đọc tập tin nhập"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "Accessed secret $SECRET_ID$.",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8321,7 +8408,7 @@
     }
   },
   "inputTrimValidator": {
-    "message": "Input must not contain only whitespace.",
+    "message": "Dữ liệu nhập vào không được chỉ chứa khoảng trắng.",
     "description": "Notification to inform the user that a form's input can't contain only whitespace."
   },
   "dismiss": {
@@ -8367,7 +8454,7 @@
     "message": "Remember this device"
   },
   "uncheckIfPublicDevice": {
-    "message": "Uncheck if using a public device"
+    "message": "Bỏ chọn nếu sử dụng thiết bị công cộng"
   },
   "approveFromYourOtherDevice": {
     "message": "Approve from your other device"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "Request admin approval"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "Trusted device encryption"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "Device trusted"
   },
-  "sendsNoItemsTitle": {
-    "message": "No active Sends",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "Invite Users"
   },
@@ -8837,6 +8922,30 @@
     "message": "Định dạng chung",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10249,7 +10358,7 @@
     "message": "Claim a domain to own all member accounts whose email address matches the domain. Members will be able to skip the SSO identifier when logging in. Administrators will also be able to delete member accounts."
   },
   "invalidDomainNameClaimMessage": {
-    "message": "Input is not a valid format. Format: mydomain.com. Subdomains require separate entries to be claimed."
+    "message": "Định dạng nhập vào không hợp lệ. Định dạng: mydomain.com. Các tên miền con yêu cầu các mục riêng biệt để được xác nhận."
   },
   "domainClaimedEvent": {
     "message": "$DOMAIN$ claimed",
@@ -10352,7 +10461,7 @@
     "message": "The SSH key type is not supported"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "Nhập khóa từ bảng nhớ tạm"
   },
   "sshKeyImported": {
     "message": "SSH key imported successfully"
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/zh_CN/messages.json b/apps/web/src/locales/zh_CN/messages.json
index eb186f11360..42157058174 100644
--- a/apps/web/src/locales/zh_CN/messages.json
+++ b/apps/web/src/locales/zh_CN/messages.json
@@ -12,7 +12,7 @@
     "message": "没有关键应用程序存在风险"
   },
   "accessIntelligence": {
-    "message": "智慧访问"
+    "message": "Access Intelligence"
   },
   "riskInsights": {
     "message": "风险洞察"
@@ -547,12 +547,6 @@
     "message": "切换折叠",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "生成密码"
-  },
-  "generatePassphrase": {
-    "message": "生成密码短语"
-  },
   "checkPassword": {
     "message": "检查密码是否已暴露。"
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "我"
   },
+  "myItems": {
+    "message": "我的项目"
+  },
   "myVault": {
     "message": "我的密码库"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
+  "changePasswordWarning": {
+    "message": "更改密码后，您需要使用新密码登录。 在其他设备上的活动会话将在一小时内注销。"
+  },
   "emailChanged": {
     "message": "电子邮箱已保存"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "启用两步登录可能会将您永久锁定在 Bitwarden 账户之外。当您无法使用常规的两步登录提供程序（例如您丢失了设备）时，可以使用恢复代码访问您的账户。如果您失去对您账户的访问，Bitwarden 支持也无法帮助您。我们建议您写下或打印恢复代码，并将其妥善保管。"
   },
+  "restrictedItemTypePolicy": {
+    "message": "禁用支付卡项目类型"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "不允许成员创建支付卡项目类型。现有支付卡将自动被移除。"
+  },
+  "restrictCardTypeImport": {
+    "message": "无法导入支付卡项目类型"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "由 1 个或多个组织设置的策略阻止您将支付卡导入密码库。"
+  },
   "yourSingleUseRecoveryCode": {
     "message": "当您无法访问两步登录提供程序时，您的一次性恢复代码可用于停用两步登录。Bitwarden 建议您写下恢复代码，并将其妥善保管。"
   },
@@ -2189,7 +2201,7 @@
     "message": "需要高级会员"
   },
   "premiumRequiredDesc": {
-    "message": "此功能需要高级会员资格。"
+    "message": "使用此功能需要高级会员资格。"
   },
   "youHavePremiumAccess": {
     "message": "您拥有高级访问权限"
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "停用"
   },
+  "orgUserDetailsNotFound": {
+    "message": "未找到成员详细信息。"
+  },
   "revokeAccess": {
     "message": "撤销访问权限"
   },
@@ -2608,7 +2623,7 @@
     "message": "检查泄漏情况"
   },
   "breachUsernameNotFound": {
-    "message": "在任何已知数据泄漏中找不到 $USERNAME$。",
+    "message": "没有在已知的数据泄露中发现 $USERNAME$。",
     "placeholders": {
       "username": {
         "content": "$1",
@@ -4082,7 +4097,7 @@
     "message": "更新浏览器"
   },
   "generatingYourRiskInsights": {
-    "message": "正在生成您的风险洞察..."
+    "message": "正在生成风险洞察..."
   },
   "updateBrowserDesc": {
     "message": "您使用的是不受支持的网页浏览器。网页密码库可能无法正常运行。"
@@ -4345,7 +4360,7 @@
     "description": "Upper limit of seats to allow through autoscaling"
   },
   "maxSeatCost": {
-    "message": "最大潜在席位费用"
+    "message": "最大潜在的席位费用"
   },
   "addSeats": {
     "message": "添加席位",
@@ -4383,7 +4398,7 @@
     "message": "附加选项"
   },
   "additionalOptionsDesc": {
-    "message": "如需更多管理您的订阅的帮助，请联系客服支持。"
+    "message": "如需更多管理您的订阅的帮助，请联系客户支持。"
   },
   "subscriptionUserSeatsUnlimitedAutoscale": {
     "message": "调整订阅将导致按比例调整您的计费总金额。如果新邀请的成员超过了您的订阅席位，您将立即收到按比例的附加成员费用。"
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "加密密钥更新无法继续"
-  },
   "editFieldLabel": {
     "message": "编辑 $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "更新加密密钥时，无法解密您的文件夹。要继续更新，必须删除文件夹。继续操作不会删除任何密码库项目。"
-  },
-  "keyUpdated": {
-    "message": "密钥已更新"
-  },
-  "updateEncryptionKey": {
-    "message": "更新加密密钥"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "为了提高安全性，我们更改了加密方案。请在下方输入您的主密码以立即更新您的加密密钥。"
-  },
   "updateEncryptionKeyWarning": {
     "message": "更新加密密钥后，您需要注销所有当前使用的 Bitwarden 应用程序（例如移动 App 或浏览器扩展）然后重新登录。注销或者重新登录（这将下载新的加密密钥）失败可能会导致数据损坏。我们会尝试自动为您注销，但可能会有所延迟。"
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "所有您已保存的账户限制的导出文件将失效。"
   },
+  "legacyEncryptionUnsupported": {
+    "message": "旧版加密方式已不再受支持。请联系客服恢复您的账户。"
+  },
   "subscription": {
     "message": "订阅"
   },
@@ -4576,7 +4579,7 @@
     "message": "已退款"
   },
   "nothingSelected": {
-    "message": "您尚未选择任何内容。"
+    "message": "您没有选择任何内容。"
   },
   "receiveMarketingEmailsV2": {
     "message": "获取来自 Bitwarden 的建议、公告和调研电子邮件。"
@@ -4724,7 +4727,7 @@
     "message": "此项目有需要修复的旧文件附件。"
   },
   "attachmentFixDescription": {
-    "message": "此附件使用了过时的加密方式。选择「修复」将下载、重新加密并重新上传此附件。"
+    "message": "此附件使用了过时的加密方式。请选择「修复」以下载、重新加密并重新上传附件。"
   },
   "fix": {
     "message": "修复",
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "紧急访问已拒绝"
   },
+  "grantorDetailsNotFound": {
+    "message": "未找到授予人详细信息"
+  },
   "passwordResetFor": {
     "message": "$USER$ 的密码已重置。您现在可以使用新密码登录了。",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "强制组织数据所有权"
+  },
   "personalOwnership": {
     "message": "禁用个人密码库"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "继续操作会将 $NAME$ 登出当前会话，要求他们重新登录。在其他设备上的活动会话可能继续活动长达一个小时。",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "此用户"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "一个或多个组织策略要求主密码满足以下要求："
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "一个或多个组织策略要求主密码满足以下要求："
+  },
   "resetPasswordSuccess": {
     "message": "密码重置成功！"
   },
@@ -5884,7 +5905,7 @@
     "message": "成功恢复组织的访问权限"
   },
   "bulkFilteredMessage": {
-    "message": "已拒绝，不适用于此操作"
+    "message": "已排除，不适用于此操作"
   },
   "nonCompliantMembersTitle": {
     "message": "不符合要求的成员"
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "添加"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "主密码设置成功"
+  },
   "updatedMasterPassword": {
     "message": "主密码已保存"
   },
   "updateMasterPassword": {
     "message": "更新主密码"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "更改您的主密码以完成账户恢复。"
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "您的主密码不符合本组织的要求。更改您的主密码以继续。"
+  },
   "updateMasterPasswordWarning": {
     "message": "您的主密码最近被您组织的管理员更改过。要访问密码库，必须立即更新您的主密码。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
@@ -6315,7 +6345,7 @@
     "message": "您的组织成员有资格获得免费的 Bitwarden 家庭计划。您可以为不是您的 Bitwarden 组织成员的员工赞助免费 Bitwarden 家庭。赞助非成员需要您的组织内有可用的席位。"
   },
   "sponsoredFamiliesRemoveActiveSponsorship": {
-    "message": "当您移除某个活动赞助时，该赞助席位将在被赞助组织的续费日期后释放给您的组织使用。"
+    "message": "当您移除某个活动赞助，在被赞助组织的续费日期之后，您的组织中将释放一个可用的席位。"
   },
   "sponsoredFamiliesEligible": {
     "message": "您和您的家人有资格获得免费的 Bitwarden 家庭版计划。使用您的个人电子邮箱兑换，即使您不在工作中，也能确保您的数据安全。"
@@ -6693,7 +6723,7 @@
     "message": "上面的 1 个字段需要您注意。"
   },
   "fieldRequiredError": {
-    "message": "$FIELDNAME$ 必填。",
+    "message": "必须填写 $FIELDNAME$。",
     "placeholders": {
       "fieldname": {
         "content": "$1",
@@ -6803,7 +6833,7 @@
     "description": "This is used by screen readers to indicate the organization that is currently being shown to the user."
   },
   "accountLoggedInAsName": {
-    "message": "账户：登录为 $NAME$",
+    "message": "账户：已登录为 $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "生成电子邮箱"
   },
+  "generatePassword": {
+    "message": "生成密码"
+  },
+  "generatePassphrase": {
+    "message": "生成密码短语"
+  },
+  "passwordGenerated": {
+    "message": "密码已生成"
+  },
+  "passphraseGenerated": {
+    "message": "密码短语已生成"
+  },
+  "usernameGenerated": {
+    "message": "用户名已生成"
+  },
+  "emailGenerated": {
+    "message": "电子邮箱已生成"
+  },
   "spinboxBoundariesHint": {
     "message": "值必须在 $MIN$ 和 $MAX$ 之间。",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "使用此密码"
   },
+  "useThisPassphrase": {
+    "message": "使用此密码短语"
+  },
   "useThisUsername": {
     "message": "使用此用户名"
   },
@@ -7605,9 +7656,9 @@
     "message": "服务账户已更新",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "输入或选择工程或机密",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "输入或选择工程",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "输入以筛选",
@@ -7692,8 +7743,8 @@
     "message": "访问令牌",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "新增访问令牌",
+  "createAccessToken": {
+    "message": "创建访问令牌",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "尝试读取导入的文件时出错"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "访问了机密 $SECRET_ID$。",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "请求管理员批准"
   },
+  "unableToCompleteLogin": {
+    "message": "无法完成登录"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "受信任设备加密"
   },
@@ -8427,7 +8520,7 @@
     }
   },
   "notFound": {
-    "message": "$RESOURCE$ 未找到",
+    "message": "未找到 $RESOURCE$",
     "placeholders": {
       "resource": {
         "content": "$1",
@@ -8446,7 +8539,7 @@
     "message": "用户更新了通过账户恢复颁发的密码。"
   },
   "activatedAccessToSecretsManager": {
-    "message": "已激活对机密管理器的访问权限",
+    "message": "激活了对机密管理器的访问权限",
     "description": "Confirmation message that one or more users gained access to Secrets Manager"
   },
   "activateAccess": {
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "设备已信任"
   },
-  "sendsNoItemsTitle": {
-    "message": "没有活跃的 Send",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "使用 Send 与任何人安全地分享加密信息。",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "邀请用户"
   },
@@ -8697,13 +8782,13 @@
     "message": "管理组织的集合行为"
   },
   "limitCollectionCreationDesc": {
-    "message": "限制为所有者和管理员可以创建集合"
+    "message": "仅限所有者和管理员可以创建集合"
   },
   "limitCollectionDeletionDesc": {
-    "message": "限制为所有者和管理员可以删除集合"
+    "message": "仅限所有者和管理员可以删除集合"
   },
   "limitItemDeletionDescription": {
-    "message": "限制为具有「管理集合」权限的成员可以删项目"
+    "message": "仅限具有「管理集合」权限的成员可以删除项目"
   },
   "allowAdminAccessToAllCollectionItemsDesc": {
     "message": "所有者和管理员可以管理所有集合和项目"
@@ -8733,7 +8818,7 @@
     "message": "服务账户限制（可选）"
   },
   "maxServiceAccountCost": {
-    "message": "最大潜在服务账户费用"
+    "message": "最大潜在的服务账户费用"
   },
   "loggedInExclamation": {
     "message": "已登录！"
@@ -8837,6 +8922,30 @@
     "message": "常规格式",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "更多关于匹配检测",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "高级选项",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "警告",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "要保留 $ORG$ 的订阅，",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -9712,7 +9821,7 @@
     "description": "A paragraph on the Billing History page of the Provider Portal letting users know they can download a CSV report for their invoices that does not include prorations."
   },
   "providerClientVaultPrivacyNotification": {
-    "message": "注意：本月晚些时候，客户密码库隐私将被改进，提供商成员将不再能够直接访问客户密码库项目。如有疑问，",
+    "message": "通知：本月晚些时候，客户密码库隐私将进行升级，提供商成员将不再能够直接访问客户密码库项目。如有疑问，",
     "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'Notice: Later this month, client vault privacy will be improved and provider members will no longer have direct access to client vault items. For questions, please contact Bitwarden support'."
   },
   "contactBitwardenSupport": {
@@ -10077,7 +10186,7 @@
     "message": "添加附件"
   },
   "maxFileSizeSansPunctuation": {
-    "message": "最大文件大小为 500 MB"
+    "message": "文件最大为 500 MB"
   },
   "permanentlyDeleteAttachmentConfirmation": {
     "message": "确定要永久删除此附件吗？"
@@ -10192,7 +10301,7 @@
     "message": "描述符代码"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "您无法删除仅具有「查看」权限的集合：$COLLECTIONS$",
+    "message": "您无法移除仅具有「查看」权限的集合：$COLLECTIONS$",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "新增业务单元"
   },
+  "sendsTitleNoItems": {
+    "message": "安全地发送敏感信息",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "在任何平台上安全地与任何人共享文件和数据。您的信息将在限制曝光的同时保持端到端加密。",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "快速创建密码"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "一键创建强大且唯一的密码",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "帮助您保持登录安全。",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "点击「生成密码」按钮，轻松创建强大且唯一的密码，帮助您保持登录安全。",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "使用自动填充节省时间"
   },
@@ -10602,13 +10736,123 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "有关开始使用 Bitwarden 的提示，请访问",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
-    "message": "重新启动"
+    "message": "重启"
   },
   "verifyProviderBankAccountWithStatementDescriptorWarning": {
     "message": "使用银行账户付款仅对美国用户开放。您将被要求验证您的银行账户。我们将在 1-2 个工作日内进行一笔小额转账，请在提供商的订阅页面输入该转账的对账单描述符代码以验证银行账户。验证银行账户失败将会错过支付，您的订阅将失效。"
   },
   "clickPayWithPayPal": {
     "message": "请点击「使用 PayPal 付款」按钮以添加您的付款方式。"
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "如果您移除 $EMAIL$，此家庭计划的赞助将结束。在被赞助组织的续费日期 $DATE$ 之后，您的组织中将释放一个可用席位，可供成员或赞助使用。",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "添加信用额度需要计费地址。",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/zh_TW/messages.json b/apps/web/src/locales/zh_TW/messages.json
index 2f5567308d2..3cdf7bd7944 100644
--- a/apps/web/src/locales/zh_TW/messages.json
+++ b/apps/web/src/locales/zh_TW/messages.json
@@ -547,12 +547,6 @@
     "message": "切換折疊",
     "description": "Toggling an expand/collapse state."
   },
-  "generatePassword": {
-    "message": "產生密碼"
-  },
-  "generatePassphrase": {
-    "message": "Generate passphrase"
-  },
   "checkPassword": {
     "message": "檢查密碼是否已暴露。"
   },
@@ -870,6 +864,9 @@
   "me": {
     "message": "我"
   },
+  "myItems": {
+    "message": "My Items"
+  },
   "myVault": {
     "message": "我的密碼庫"
   },
@@ -1787,6 +1784,9 @@
   "loggedOutWarning": {
     "message": "接下來會登出目前工作階段，並要求您重新登入帳戶。其他裝置上的工作階段最多會保持一個小時。"
   },
+  "changePasswordWarning": {
+    "message": "After changing your password, you will need to log in with your new password. Active sessions on other devices will be logged out within one hour."
+  },
   "emailChanged": {
     "message": "電子郵件已儲存"
   },
@@ -2159,6 +2159,18 @@
   "twoStepLoginRecoveryWarning": {
     "message": "啟用兩步驟登入可能會將您永久鎖定在您的 Bitwarden 帳戶外。如果您無法正常使用兩步驟登入方式（例如，您遺失了裝置），則可以使用復原碼存取您的帳戶。 如果您失去帳戶的存取權限，Bitwarden 也無法幫助您。所以我們建議您記下或列印復原碼，並將其妥善保存。"
   },
+  "restrictedItemTypePolicy": {
+    "message": "Remove card item type"
+  },
+  "restrictedItemTypePolicyDesc": {
+    "message": "Do not allow members to create card item types. Existing cards will be automatically removed."
+  },
+  "restrictCardTypeImport": {
+    "message": "Cannot import card item types"
+  },
+  "restrictCardTypeImportDesc": {
+    "message": "A policy set by 1 or more organizations prevents you from importing cards to your vaults."
+  },
   "yourSingleUseRecoveryCode": {
     "message": "Your single-use recovery code can be used to turn off two-step login in the event that you lose access to your two-step login provider. Bitwarden recommends you write down the recovery code and keep it in a safe place."
   },
@@ -2218,6 +2230,9 @@
   "disable": {
     "message": "停用"
   },
+  "orgUserDetailsNotFound": {
+    "message": "Member details not found."
+  },
   "revokeAccess": {
     "message": "撤銷存取權限"
   },
@@ -4478,9 +4493,6 @@
       }
     }
   },
-  "encryptionKeyUpdateCannotProceed": {
-    "message": "Encryption key update cannot proceed"
-  },
   "editFieldLabel": {
     "message": "Edit $LABEL$",
     "placeholders": {
@@ -4533,24 +4545,15 @@
       }
     }
   },
-  "keyUpdateFoldersFailed": {
-    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
-  },
-  "keyUpdated": {
-    "message": "金鑰已更新"
-  },
-  "updateEncryptionKey": {
-    "message": "更新加密金鑰"
-  },
-  "updateEncryptionSchemeDesc": {
-    "message": "我們變更了加密方法以加強安全性。請在下面輸入主密碼來更新您的加密金鑰。"
-  },
   "updateEncryptionKeyWarning": {
     "message": "更新加密金鑰後，您需要登出並重新登入目前使用的所有 Bitwarden 應用程式（如行動應用程式或瀏覽器擴充套件）。登出和重新登入（這會下載新的加密金鑰）失敗可能會導致資料損毀。我們將嘗試自動登出，但可能會有所延遲。"
   },
   "updateEncryptionKeyAccountExportWarning": {
     "message": "Any account restricted exports you have saved will become invalid."
   },
+  "legacyEncryptionUnsupported": {
+    "message": "Legacy encryption is no longer supported. Please contact support to recover your account."
+  },
   "subscription": {
     "message": "訂閱"
   },
@@ -5375,6 +5378,9 @@
   "emergencyRejected": {
     "message": "已拒絕緊急存取"
   },
+  "grantorDetailsNotFound": {
+    "message": "Grantor details not found"
+  },
   "passwordResetFor": {
     "message": "$USER$ 的密碼已重設。您現在可以使用新密碼登入了。",
     "placeholders": {
@@ -5384,6 +5390,9 @@
       }
     }
   },
+  "organizationDataOwnership": {
+    "message": "Enforce organization data ownership"
+  },
   "personalOwnership": {
     "message": "停用個人密碼庫"
   },
@@ -5775,12 +5784,24 @@
       }
     }
   },
+  "emergencyAccessLoggedOutWarning": {
+    "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Smith"
+      }
+    }
+  },
   "thisUser": {
     "message": "此使用者"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
     "message": "一個或多個組織原則要求主密碼須符合下列條件："
   },
+  "changePasswordDelegationMasterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require the master password to meet the following requirements:"
+  },
   "resetPasswordSuccess": {
     "message": "密碼重設成功！"
   },
@@ -6046,12 +6067,21 @@
   "add": {
     "message": "新增"
   },
+  "masterPasswordSuccessfullySet": {
+    "message": "Master password successfully set"
+  },
   "updatedMasterPassword": {
     "message": "主密碼已儲存"
   },
   "updateMasterPassword": {
     "message": "更新主密碼"
   },
+  "accountRecoveryUpdateMasterPasswordSubtitle": {
+    "message": "Change your master password to complete account recovery."
+  },
+  "updateMasterPasswordSubtitle": {
+    "message": "Your master password does not meet this organization’s requirements. Change your master password to continue."
+  },
   "updateMasterPasswordWarning": {
     "message": "您的主密碼最近被您的組織管理者變更過。您必須現在更新主密碼才能存取密碼庫。繼續操作會登出您目前的工作階段，並要求您重新登入帳戶。其他裝置上的活動工作階段最多會保持一個小時。"
   },
@@ -6824,6 +6854,24 @@
   "generateEmail": {
     "message": "Generate email"
   },
+  "generatePassword": {
+    "message": "產生密碼"
+  },
+  "generatePassphrase": {
+    "message": "Generate passphrase"
+  },
+  "passwordGenerated": {
+    "message": "Password generated"
+  },
+  "passphraseGenerated": {
+    "message": "Passphrase generated"
+  },
+  "usernameGenerated": {
+    "message": "Username generated"
+  },
+  "emailGenerated": {
+    "message": "Email generated"
+  },
   "spinboxBoundariesHint": {
     "message": "值必須介於 $MIN$ 及 $MAX$。",
     "description": "Explains spin box minimum and maximum values to the user",
@@ -6887,6 +6935,9 @@
   "useThisPassword": {
     "message": "使用此密碼"
   },
+  "useThisPassphrase": {
+    "message": "Use this passphrase"
+  },
   "useThisUsername": {
     "message": "使用此使用者名稱"
   },
@@ -7605,9 +7656,9 @@
     "message": "服務帳戶已更新",
     "description": "Notifies that a service account has been updated"
   },
-  "newSaSelectAccess": {
-    "message": "輸入或選擇專案或機密",
-    "description": "Instructions for selecting projects or secrets for a new service account"
+  "typeOrSelectProjects": {
+    "message": "Type or select projects",
+    "description": "Instructions for selecting projects for a service account"
   },
   "newSaTypeToFilter": {
     "message": "輸入以進行篩選",
@@ -7692,8 +7743,8 @@
     "message": "存取權杖",
     "description": "Title for the section displaying access tokens."
   },
-  "newAccessToken": {
-    "message": "新增存取權杖",
+  "createAccessToken": {
+    "message": "Create access token",
     "description": "Button label for creating a new access token."
   },
   "expires": {
@@ -8194,6 +8245,15 @@
   "errorReadingImportFile": {
     "message": "嘗試讀取匯入檔案時發生錯誤"
   },
+  "accessedSecretWithId": {
+    "message": "Accessed a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "accessedSecret": {
     "message": "存取了機密 $SECRET_ID$。",
     "placeholders": {
@@ -8203,6 +8263,33 @@
       }
     }
   },
+  "editedSecretWithId": {
+    "message": "Edited a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "deletedSecretWithId": {
+    "message": "Deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "createdSecretWithId": {
+    "message": "Created a new secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -8375,6 +8462,12 @@
   "requestAdminApproval": {
     "message": "要求管理員核准"
   },
+  "unableToCompleteLogin": {
+    "message": "Unable to complete login"
+  },
+  "loginOnTrustedDeviceOrAskAdminToAssignPassword": {
+    "message": "You need to log in on a trusted device or ask your administrator to assign you a password."
+  },
   "trustedDeviceEncryption": {
     "message": "可信任的裝置加密"
   },
@@ -8604,14 +8697,6 @@
   "deviceTrusted": {
     "message": "裝置已信任"
   },
-  "sendsNoItemsTitle": {
-    "message": "沒有可用的 Send",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
-  "sendsNoItemsMessage": {
-    "message": "使用 Send 可以與任何人安全地共用加密資訊。",
-    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
-  },
   "inviteUsers": {
     "message": "邀請使用者"
   },
@@ -8837,6 +8922,30 @@
     "message": "常見格式",
     "description": "Label indicating the most common import formats"
   },
+  "uriMatchDefaultStrategyHint": {
+    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+  },
+  "regExAdvancedOptionWarning": {
+    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'regular expression' matching strategy as a cipher match strategy"
+  },
+  "startsWithAdvancedOptionWarning": {
+    "message": "\"Starts with\" is an advanced option with increased risk of exposing credentials.",
+    "description": "Content for dialog which warns a user when selecting 'starts with' matching strategy as a cipher match strategy"
+  },
+  "uriMatchWarningDialogLink": {
+    "message": "More about match detection",
+    "description": "Link to match detection docs on warning dialog for advance match strategy"
+  },
+  "uriAdvancedOption": {
+    "message": "Advanced options",
+    "description": "Advanced option placeholder for uri option component"
+  },
+  "warningCapitalized": {
+    "message": "Warning",
+    "description": "Warning (should maintain locale-relevant capitalization)"
+  },
   "maintainYourSubscription": {
     "message": "To maintain your subscription for $ORG$, ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To maintain your subscription for $ORG$, add a payment method.'",
@@ -10553,6 +10662,31 @@
   "newBusinessUnit": {
     "message": "New business unit"
   },
+  "sendsTitleNoItems": {
+    "message": "Send sensitive information safely",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendsBodyNoItems": {
+    "message": "Share files and data securely with anyone, on any platform. Your information will remain end-to-end encrypted while limiting exposure.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "generatorNudgeTitle": {
+    "message": "Quickly create passwords"
+  },
+  "generatorNudgeBodyOne": {
+    "message": "Easily create strong and unique passwords by clicking on",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyTwo": {
+    "message": "to help you keep your logins secure.",
+    "description": "Two part message",
+    "example": "Easily create strong and unique passwords by clicking on {icon} to help you keep your logins secure."
+  },
+  "generatorNudgeBodyAria": {
+    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
+    "description": "Aria label for the body content of the generator nudge"
+  },
   "newLoginNudgeTitle": {
     "message": "Save time with autofill"
   },
@@ -10602,6 +10736,51 @@
     "description": "Two part message",
     "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
   },
+  "setupExtensionPageTitle": {
+    "message": "Autofill your passwords securely with one click"
+  },
+  "setupExtensionPageDescription": {
+    "message": "Get the Bitwarden browser extension and start autofilling today"
+  },
+  "getTheExtension": {
+    "message": "Get the extension"
+  },
+  "addItLater": {
+    "message": "Add it later"
+  },
+  "cannotAutofillPasswordsWithoutExtensionTitle": {
+    "message": "You can't autofill passwords without the browser extension"
+  },
+  "cannotAutofillPasswordsWithoutExtensionDesc": {
+    "message": "Are you sure you don't want to add the extension now?"
+  },
+  "skipToWebApp": {
+    "message": "Skip to web app"
+  },
+  "bitwardenExtensionInstalled": {
+    "message": "Bitwarden extension installed!"
+  },
+  "openExtensionToAutofill": {
+    "message": "Open the extension to log in and start autofilling."
+  },
+  "openBitwardenExtension": {
+    "message": "Open Bitwarden extension"
+  },
+  "gettingStartedWithBitwardenPart1": {
+    "message": "For tips on getting started with Bitwarden visit the",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart2": {
+    "message": "Learning Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "gettingStartedWithBitwardenPart3": {
+    "message": "Help Center",
+    "description": "This will be displayed as part of a larger sentence. The whole sentence reads: 'For tips on getting started with Bitwarden visit the Learning Center and Help Center'"
+  },
+  "setupExtensionContentAlt": {
+    "message": "With the Bitwarden browser extension you can easily create new logins, access your saved logins directly from your browser toolbar, and sign in to accounts quickly using Bitwarden autofill."
+  },
   "restart": {
     "message": "Restart"
   },
@@ -10610,5 +10789,70 @@
   },
   "clickPayWithPayPal": {
     "message": "Please click the Pay with PayPal button to add your payment method."
+  },
+  "revokeActiveSponsorshipConfirmation": {
+    "message": "If you remove $EMAIL$, the sponsorship for this Family plan will end. A seat within your organization will become available for members or sponsorships after the sponsored organization renewal date on $DATE$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "user@example.com"
+      },
+      "date": {
+        "content": "$2",
+        "example": "12/31/2024"
+      }
+    }
+  },
+  "billingAddressRequiredToAddCredit": {
+    "message": "Billing address required to add credit.",
+    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
+  },
+  "billingAddress": {
+    "message": "Billing address"
+  },
+  "addBillingAddress": {
+    "message": "Add billing address"
+  },
+  "editBillingAddress": {
+    "message": "Edit billing address"
+  },
+  "noBillingAddress": {
+    "message": "No address on file."
+  },
+  "billingAddressUpdated": {
+    "message": "Your billing address has been updated."
+  },
+  "paymentDetails": {
+    "message": "Payment details"
+  },
+  "paymentMethodUpdated": {
+    "message": "Your payment method has been updated."
+  },
+  "bankAccountVerified": {
+    "message": "Your bank account has been verified."
+  },
+  "availableCreditAppliedToInvoice": {
+    "message": "Any available credit will be automatically applied towards invoices generated for this account."
+  },
+  "mustBePositiveNumber": {
+    "message": "Must be a positive number"
+  },
+  "cardSecurityCode": {
+    "message": "Card security code"
+  },
+  "cardSecurityCodeDescription": {
+    "message": "Card security code, also known as CVV or CVC, is typically a 3 digit number printed on the back of your credit card or 4 digit number printed on the front above your card number."
+  },
+  "verifyBankAccountWarning": {
+    "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make a micro-deposit within the next 1-2 business days. Enter the statement descriptor code from this deposit on the Payment Details page to verify the bank account. Failure to verify the bank account will result in a missed payment and your subscription being suspended."
+  },
+  "taxId": {
+    "message": "Tax ID: $TAX_ID$",
+    "placeholders": {
+      "tax_id": {
+        "content": "$1",
+        "example": "12-3456789"
+      }
+    }
   }
 }
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index 3d62a30bc01..92cec0d6a2c 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -1,40 +1,5 @@
 {
-  "extends": "../../libs/shared/tsconfig",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "module": "ES2020",
-    "resolveJsonModule": true,
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
-      "@bitwarden/billing": ["../../libs/billing/src"],
-      "@bitwarden/bit-common/*": ["../../bitwarden_license/bit-common/src/*"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/components": ["../../libs/components/src"],
-      "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer-core": ["../../libs/importer/src"],
-      "@bitwarden/importer-ui": ["../../libs/importer/src/components"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
-      "@bitwarden/platform": ["../../libs/platform/src"],
-      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
-      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
-      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["../../libs/vault/src"],
-      "@bitwarden/web-vault/*": ["src/*"]
-    }
-  },
+  "extends": "../../tsconfig.base",
   "angularCompilerOptions": {
     "strictTemplates": true
   },
diff --git a/apps/web/tsconfig.spec.json b/apps/web/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/apps/web/tsconfig.spec.json
+++ b/apps/web/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/apps/web/webpack.config.js b/apps/web/webpack.config.js
index d8b9fd3dbee..a28052b98e3 100644
--- a/apps/web/webpack.config.js
+++ b/apps/web/webpack.config.js
@@ -112,7 +112,7 @@ const plugins = [
   new HtmlWebpackPlugin({
     template: "./src/connectors/webauthn-mobile.html",
     filename: "webauthn-mobile-connector.html",
-    chunks: ["connectors/webauthn"],
+    chunks: ["connectors/webauthn", "styles"],
   }),
   new HtmlWebpackPlugin({
     template: "./src/connectors/webauthn-fallback.html",
@@ -255,11 +255,11 @@ const devServer =
                   'self'
                   https://assets.braintreegateway.com
                   https://*.paypal.com
-                  'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='
-                  'sha256-JVRXyYPueLWdwGwY9m/7u4QlZ1xeQdqUj2t8OVIzZE4='
-                  'sha256-or0p3LaHetJ4FRq+flVORVFFNsOjQGWrDvX8Jf7ACWg='
-                  'sha256-jvLh2uL2/Pq/gpvNJMaEL4C+TNhBeGadLIUyPcVRZvY='
-                  'sha256-VZTcMoTEw3nbAHejvqlyyRm1Mdx+DVNgyKANjpWw0qg='
+                  ${"'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='" /* date input polyfill */}
+                  ${"'sha256-JVRXyYPueLWdwGwY9m/7u4QlZ1xeQdqUj2t8OVIzZE4='" /* date input polyfill */}
+                  ${"'sha256-EnIJNDxVnh0++RytXJOkU0sqtLDFt1nYUDOfeJ5SKxg='" /* ng-select */}
+                  ${"'sha256-dbBsIsz2pJ5loaLjhE6xWlmhYdjl6ghbwnGSCr4YObs='" /* cdk-virtual-scroll */}
+                  ${"'sha256-S+uMh1G1SNQDAMG3seBmknQ26Wh+KSEoKdsNiy0joEE='" /* cdk-visually-hidden */}
                 ;img-src
                   'self'
                   data:
@@ -268,6 +268,9 @@ const devServer =
                   https://www.paypalobjects.com
                   https://q.stripe.com
                   https://haveibeenpwned.com
+                ;media-src
+                  'self'
+                  https://assets.bitwarden.com
                 ;child-src
                   'self'
                   https://js.stripe.com
diff --git a/bitwarden_license/bit-cli/jest.config.js b/bitwarden_license/bit-cli/jest.config.js
index 30c9784c326..6a91ba706ed 100644
--- a/bitwarden_license/bit-cli/jest.config.js
+++ b/bitwarden_license/bit-cli/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.ts");
 
@@ -14,7 +14,7 @@ module.exports = {
     "@bitwarden/common/platform/services/sdk/default-sdk-client-factory":
       "<rootDir>/../../libs/common/spec/jest-sdk-client-factory",
     ...pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     }),
   },
 };
diff --git a/bitwarden_license/bit-cli/tsconfig.json b/bitwarden_license/bit-cli/tsconfig.json
index 4a972b540a7..6630021232f 100644
--- a/bitwarden_license/bit-cli/tsconfig.json
+++ b/bitwarden_license/bit-cli/tsconfig.json
@@ -1,40 +1,3 @@
 {
-  "compilerOptions": {
-    "pretty": true,
-    "moduleResolution": "node",
-    "target": "ES2016",
-    "module": "ES2020",
-    "noImplicitAny": true,
-    "allowSyntheticDefaultImports": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowJs": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "paths": {
-      "@bitwarden/cli/*": ["../../apps/cli/src/*"],
-      "@bitwarden/common/spec": ["../../libs/common/spec"],
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
-      "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/importer-core": ["../../libs/importer/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/node/*": ["../../libs/node/src/*"],
-      "@bitwarden/bit-common/*": ["../../bitwarden_license/bit-common/src/*"]
-    },
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ]
-  },
-  "include": ["src", "src/**/*.spec.ts"]
+  "extends": "../../apps/cli/tsconfig"
 }
diff --git a/bitwarden_license/bit-common/jest.config.js b/bitwarden_license/bit-common/jest.config.js
index ab31a4c26ca..31f15253ebd 100644
--- a/bitwarden_license/bit-common/jest.config.js
+++ b/bitwarden_license/bit-common/jest.config.js
@@ -1,5 +1,5 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
 /** @type {import('jest').Config} */
@@ -9,13 +9,13 @@ module.exports = {
   testEnvironment: "jsdom",
   moduleNameMapper: pathsToModuleNameMapper(
     {
-      "@bitwarden/common/spec": ["../../libs/common/spec"],
-      "@bitwarden/common": ["../../libs/common/src/*"],
-      "@bitwarden/admin-console/common": ["<rootDir>/libs/admin-console/src/common"],
+      "@bitwarden/common/spec": ["libs/common/spec"],
+      "@bitwarden/common": ["libs/common/src/*"],
+      "@bitwarden/admin-console/common": ["libs/admin-console/src/common"],
       ...(compilerOptions?.paths ?? {}),
     },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/password-health.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/password-health.ts
index d24d8386ecd..62eb0122dca 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/password-health.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/password-health.ts
@@ -32,13 +32,18 @@ export type ApplicationHealthReportDetail = {
   atRiskMemberCount: number;
   memberDetails: MemberDetailsFlat[];
   atRiskMemberDetails: MemberDetailsFlat[];
-  cipher: CipherView;
+  cipherIds: string[];
 };
 
 export type ApplicationHealthReportDetailWithCriticalFlag = ApplicationHealthReportDetail & {
   isMarkedAsCritical: boolean;
 };
 
+export type ApplicationHealthReportDetailWithCriticalFlagAndCipher =
+  ApplicationHealthReportDetailWithCriticalFlag & {
+    ciphers: CipherView[];
+  };
+
 /**
  * Breaks the cipher health info out by uri and passes
  * along the password health and member info
@@ -97,6 +102,7 @@ export type ExposedPasswordDetail = {
  * organization member to a cipher
  */
 export type MemberDetailsFlat = {
+  userGuid: string;
   userName: string;
   email: string;
   cipherId: string;
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/response/member-cipher-details.response.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/response/member-cipher-details.response.ts
index fcf5ada4b2c..7aa52330663 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/response/member-cipher-details.response.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/response/member-cipher-details.response.ts
@@ -1,6 +1,7 @@
 import { BaseResponse } from "@bitwarden/common/models/response/base.response";
 
 export class MemberCipherDetailsResponse extends BaseResponse {
+  userGuid: string;
   userName: string;
   email: string;
   useKeyConnector: boolean;
@@ -8,6 +9,7 @@ export class MemberCipherDetailsResponse extends BaseResponse {
 
   constructor(response: any) {
     super(response);
+    this.userGuid = this.getResponseProperty("UserGuid");
     this.userName = this.getResponseProperty("UserName");
     this.email = this.getResponseProperty("Email");
     this.useKeyConnector = this.getResponseProperty("UseKeyConnector");
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps.service.ts
index b879ef94705..6ad1cb71051 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps.service.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/critical-apps.service.ts
@@ -141,6 +141,11 @@ export class CriticalAppsService {
           const uri = await this.encryptService.decryptString(encrypted, key);
           return { id: r.id, organizationId: r.organizationId, uri: uri };
         });
+
+        if (results.length === 0) {
+          return of([]); // emits an empty array immediately
+        }
+
         return forkJoin(results);
       }),
       first(),
diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-report.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-report.service.ts
index 6fdab58115d..182e8aa6882 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-report.service.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/risk-insights-report.service.ts
@@ -20,6 +20,7 @@ import {
   MemberDetailsFlat,
   WeakPasswordDetail,
   WeakPasswordScore,
+  ApplicationHealthReportDetailWithCriticalFlagAndCipher,
 } from "../models/password-health";
 
 import { MemberCipherDetailsApiService } from "./member-cipher-details-api.service";
@@ -48,7 +49,9 @@ export class RiskInsightsReportService {
     const results$ = zip(allCiphers$, memberCiphers$).pipe(
       map(([allCiphers, memberCiphers]) => {
         const details: MemberDetailsFlat[] = memberCiphers.flatMap((dtl) =>
-          dtl.cipherIds.map((c) => this.getMemberDetailsFlat(dtl.userName, dtl.email, c)),
+          dtl.cipherIds.map((c) =>
+            this.getMemberDetailsFlat(dtl.userGuid, dtl.userName, dtl.email, c),
+          ),
         );
         return [allCiphers, details] as const;
       }),
@@ -162,6 +165,22 @@ export class RiskInsightsReportService {
     };
   }
 
+  async identifyCiphers(
+    data: ApplicationHealthReportDetail[],
+    organizationId: string,
+  ): Promise<ApplicationHealthReportDetailWithCriticalFlagAndCipher[]> {
+    const cipherViews = await this.cipherService.getAllFromApiForOrganization(organizationId);
+
+    const dataWithCiphers = data.map(
+      (app, index) =>
+        ({
+          ...app,
+          ciphers: cipherViews.filter((c) => app.cipherIds.some((a) => a === c.id)),
+        }) as ApplicationHealthReportDetailWithCriticalFlagAndCipher,
+    );
+    return dataWithCiphers;
+  }
+
   /**
    * Associates the members with the ciphers they have access to. Calculates the password health.
    * Finds the trimmed uris.
@@ -356,7 +375,9 @@ export class RiskInsightsReportService {
       atRiskPasswordCount: existingUriDetail ? existingUriDetail.atRiskPasswordCount : 0,
       atRiskCipherIds: existingUriDetail ? existingUriDetail.atRiskCipherIds : [],
       atRiskMemberCount: existingUriDetail ? existingUriDetail.atRiskMemberDetails.length : 0,
-      cipher: newUriDetail.cipher,
+      cipherIds: existingUriDetail
+        ? existingUriDetail.cipherIds.concat(newUriDetail.cipherId)
+        : [newUriDetail.cipherId],
     } as ApplicationHealthReportDetail;
 
     if (isAtRisk) {
@@ -408,11 +429,13 @@ export class RiskInsightsReportService {
   }
 
   private getMemberDetailsFlat(
+    userGuid: string,
     userName: string,
     email: string,
     cipherId: string,
   ): MemberDetailsFlat {
     return {
+      userGuid: userGuid,
       userName: userName,
       email: email,
       cipherId: cipherId,
diff --git a/bitwarden_license/bit-common/tsconfig.json b/bitwarden_license/bit-common/tsconfig.json
index 641b0ac6aa9..9c607a26b09 100644
--- a/bitwarden_license/bit-common/tsconfig.json
+++ b/bitwarden_license/bit-common/tsconfig.json
@@ -1,34 +1,5 @@
 {
-  "extends": "../../libs/shared/tsconfig",
+  "extends": "../../tsconfig.base",
   "include": ["src", "spec"],
-  "exclude": ["node_modules", "dist"],
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/auth": ["../../libs/auth/src"],
-      "@bitwarden/billing": ["../../libs/billing/src"],
-      "@bitwarden/bit-common/*": ["../bit-common/src/*"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/components": ["../../libs/components/src"],
-      "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/platform": ["../../libs/platform/src"],
-      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
-      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
-      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault": ["../../libs/vault/src"],
-      "@bitwarden/web-vault/*": ["../../apps/web/src/*"]
-    }
-  }
+  "exclude": ["node_modules", "dist"]
 }
diff --git a/bitwarden_license/bit-web/jest.config.js b/bitwarden_license/bit-web/jest.config.js
index 9c9c61b2402..5934882e731 100644
--- a/bitwarden_license/bit-web/jest.config.js
+++ b/bitwarden_license/bit-web/jest.config.js
@@ -1,23 +1,22 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
 /** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["../../apps/web/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
     {
-      "@bitwarden/common/spec": ["../../libs/common/spec"],
-      "@bitwarden/common": ["../../libs/common/src/*"],
-      "@bitwarden/admin-console/common": ["<rootDir>/libs/admin-console/src/common"],
+      "@bitwarden/common/spec": ["libs/common/spec"],
+      "@bitwarden/common": ["libs/common/src/*"],
+      "@bitwarden/admin-console/common": ["libs/admin-console/src/common"],
       ...(compilerOptions?.paths ?? {}),
     },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
 };
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
index 83f23089c59..08c7f181308 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
@@ -26,7 +26,6 @@ import { SharedModule } from "@bitwarden/web-vault/app/shared/shared.module";
 @Component({
   selector: "app-org-device-approvals",
   templateUrl: "./device-approvals.component.html",
-  standalone: true,
   providers: [
     safeProvider({
       provide: OrganizationAuthRequestApiService,
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts
index f63140a8b23..35659d05dce 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts
@@ -79,6 +79,7 @@ const routes: Routes = [
       },
       {
         path: "access-intelligence",
+        canActivate: [organizationPermissionsGuard((org) => org.canAccessReports)],
         loadChildren: () =>
           import("../../dirt/access-intelligence/access-intelligence.module").then(
             (m) => m.AccessIntelligenceModule,
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts
index f830b149db4..130f1f2c482 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts
@@ -43,7 +43,6 @@ const DisallowedPlanTypes = [
 
 @Component({
   templateUrl: "clients.component.html",
-  standalone: true,
   imports: [
     SharedOrganizationModule,
     HeaderModule,
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts
index 7bfac8f4b32..7696742277a 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts
@@ -3,12 +3,12 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute, Params, Router } from "@angular/router";
 
-import { BitwardenLogo } from "@bitwarden/auth/angular";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { ProviderUserAcceptRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-accept.request";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { Icons } from "@bitwarden/components";
 import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept.component";
 
 @Component({
@@ -17,7 +17,7 @@ import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept
   standalone: false,
 })
 export class AcceptProviderComponent extends BaseAcceptComponent {
-  protected logo = BitwardenLogo;
+  protected logo = Icons.BitwardenLogo;
   providerName: string;
   providerId: string;
   providerUserId: string;
@@ -54,6 +54,8 @@ export class AcceptProviderComponent extends BaseAcceptComponent {
       this.i18nService.t("providerInviteAcceptedDesc"),
       { timeout: 10000 },
     );
+    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.router.navigate(["/vault"]);
   }
 
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.html
index 66c42678442..f203b7a934a 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.html
@@ -55,7 +55,7 @@
     >
       {{ "providerUsersNeedConfirmed" | i18n }}
     </bit-callout>
-    <cdk-virtual-scroll-viewport scrollWindow [itemSize]="rowHeight" class="tw-pb-8">
+    <cdk-virtual-scroll-viewport bitScrollLayout [itemSize]="rowHeight" class="tw-pb-8">
       <bit-table [dataSource]="dataSource">
         <ng-container header>
           <tr>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html
index 8266b20b306..0a084848dbe 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html
@@ -31,6 +31,12 @@
       *ngIf="canAccessBilling$ | async"
     >
       <bit-nav-item [text]="'subscription' | i18n" route="billing/subscription"></bit-nav-item>
+      @if (managePaymentDetailsOutsideCheckout$ | async) {
+        <bit-nav-item
+          [text]="'paymentDetails' | i18n"
+          route="billing/payment-details"
+        ></bit-nav-item>
+      }
       <bit-nav-item [text]="'billingHistory' | i18n" route="billing/history"></bit-nav-item>
     </bit-nav-group>
     <bit-nav-item
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts
index bbd25d6dbe2..d6f9af9805d 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts
@@ -10,6 +10,8 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { ProviderStatusType, ProviderType } from "@bitwarden/common/admin-console/enums";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { Icon, IconModule } from "@bitwarden/components";
 import { BusinessUnitPortalLogo } from "@bitwarden/web-vault/app/admin-console/icons/business-unit-portal-logo.icon";
 import { ProviderPortalLogo } from "@bitwarden/web-vault/app/admin-console/icons/provider-portal-logo";
@@ -18,7 +20,6 @@ import { WebLayoutModule } from "@bitwarden/web-vault/app/layouts/web-layout.mod
 @Component({
   selector: "providers-layout",
   templateUrl: "providers-layout.component.html",
-  standalone: true,
   imports: [CommonModule, RouterModule, JslibModule, WebLayoutModule, IconModule],
 })
 export class ProvidersLayoutComponent implements OnInit, OnDestroy {
@@ -33,10 +34,12 @@ export class ProvidersLayoutComponent implements OnInit, OnDestroy {
   protected canAccessBilling$: Observable<boolean>;
 
   protected clientsTranslationKey$: Observable<string>;
+  protected managePaymentDetailsOutsideCheckout$: Observable<boolean>;
 
   constructor(
     private route: ActivatedRoute,
     private providerService: ProviderService,
+    private configService: ConfigService,
   ) {}
 
   ngOnInit() {
@@ -70,6 +73,10 @@ export class ProvidersLayoutComponent implements OnInit, OnDestroy {
         provider.providerType === ProviderType.BusinessUnit ? "businessUnits" : "clients",
       ),
     );
+
+    this.managePaymentDetailsOutsideCheckout$ = this.configService.getFeatureFlag$(
+      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
+    );
   }
 
   ngOnDestroy() {
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts
index 9be09c295ae..7a554275f08 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts
@@ -2,8 +2,8 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
 import { authGuard } from "@bitwarden/angular/auth/guards";
-import { AnonLayoutWrapperComponent } from "@bitwarden/auth/angular";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
+import { AnonLayoutWrapperComponent } from "@bitwarden/components";
 import { FrontendLayoutComponent } from "@bitwarden/web-vault/app/layouts/frontend-layout.component";
 import { UserLayoutComponent } from "@bitwarden/web-vault/app/layouts/user-layout.component";
 
@@ -13,6 +13,7 @@ import {
   hasConsolidatedBilling,
   ProviderBillingHistoryComponent,
 } from "../../billing/providers";
+import { ProviderPaymentDetailsComponent } from "../../billing/providers/payment-details/provider-payment-details.component";
 import { SetupBusinessUnitComponent } from "../../billing/providers/setup/setup-business-unit.component";
 
 import { ClientsComponent } from "./clients/clients.component";
@@ -142,6 +143,14 @@ const routes: Routes = [
                   titleId: "subscription",
                 },
               },
+              {
+                path: "payment-details",
+                component: ProviderPaymentDetailsComponent,
+                canActivate: [providerPermissionsGuard()],
+                data: {
+                  titleId: "paymentDetails",
+                },
+              },
               {
                 path: "history",
                 component: ProviderBillingHistoryComponent,
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
index 597acb0d4f0..01f1facfc15 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
@@ -4,7 +4,7 @@ import { NgModule } from "@angular/core";
 import { FormsModule } from "@angular/forms";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { CardComponent, SearchModule } from "@bitwarden/components";
+import { CardComponent, ScrollLayoutDirective, SearchModule } from "@bitwarden/components";
 import { DangerZoneComponent } from "@bitwarden/web-vault/app/auth/settings/account/danger-zone.component";
 import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing";
 import { PaymentComponent } from "@bitwarden/web-vault/app/billing/shared/payment/payment.component";
@@ -53,6 +53,7 @@ import { VerifyRecoverDeleteProviderComponent } from "./verify-recover-delete-pr
     ScrollingModule,
     VerifyBankAccountComponent,
     CardComponent,
+    ScrollLayoutDirective,
     PaymentComponent,
   ],
   declarations: [
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts
index 473380ff288..47c30490af3 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { Params } from "@angular/router";
 
-import { BitwardenLogo } from "@bitwarden/auth/angular";
+import { Icons } from "@bitwarden/components";
 import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept.component";
 
 @Component({
@@ -10,13 +10,15 @@ import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept
   standalone: false,
 })
 export class SetupProviderComponent extends BaseAcceptComponent {
-  protected logo = BitwardenLogo;
+  protected logo = Icons.BitwardenLogo;
   failedShortMessage = "inviteAcceptFailedShort";
   failedMessage = "inviteAcceptFailed";
 
   requiredParameters = ["providerId", "email", "token"];
 
   async authedHandler(qParams: Params) {
+    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.router.navigate(["/providers/setup"], { queryParams: qParams });
   }
 
@@ -25,6 +27,8 @@ export class SetupProviderComponent extends BaseAcceptComponent {
   }
 
   login() {
+    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.router.navigate(["/login"], { queryParams: { email: this.email } });
   }
 }
diff --git a/bitwarden_license/bit-web/src/app/app-routing.module.ts b/bitwarden_license/bit-web/src/app/app-routing.module.ts
index 3f2803695eb..dc6f417c290 100644
--- a/bitwarden_license/bit-web/src/app/app-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/app-routing.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
 import { unauthGuardFn } from "@bitwarden/angular/auth/guards";
-import { AnonLayoutWrapperComponent } from "@bitwarden/auth/angular";
+import { AnonLayoutWrapperComponent } from "@bitwarden/components";
 import { deepLinkGuard } from "@bitwarden/web-vault/app/auth/guards/deep-link/deep-link.guard";
 import { RouteDataProperties } from "@bitwarden/web-vault/app/core";
 
diff --git a/bitwarden_license/bit-web/src/app/app.component.ts b/bitwarden_license/bit-web/src/app/app.component.ts
index 2d0dfd967a1..ca6a5ea8f62 100644
--- a/bitwarden_license/bit-web/src/app/app.component.ts
+++ b/bitwarden_license/bit-web/src/app/app.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit } from "@angular/core";
 
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { AppComponent as BaseAppComponent } from "@bitwarden/web-vault/app/app.component";
 
 import { ActivateAutofillPolicy } from "./admin-console/policies/activate-autofill.component";
@@ -25,13 +24,8 @@ export class AppComponent extends BaseAppComponent implements OnInit {
       new ActivateAutofillPolicy(),
     ]);
 
-    this.configService.getFeatureFlag(FeatureFlag.IdpAutoSubmitLogin).then((enabled) => {
-      if (
-        enabled &&
-        !this.policyListService.getPolicies().some((p) => p instanceof AutomaticAppLoginPolicy)
-      ) {
-        this.policyListService.addPolicies([new AutomaticAppLoginPolicy()]);
-      }
-    });
+    if (!this.policyListService.getPolicies().some((p) => p instanceof AutomaticAppLoginPolicy)) {
+      this.policyListService.addPolicies([new AutomaticAppLoginPolicy()]);
+    }
   }
 }
diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts
index f0761757c65..fd56e7d4afc 100644
--- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts
+++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts
@@ -65,8 +65,8 @@ export class SsoComponent implements OnInit, OnDestroy {
 
   readonly samlSigningAlgorithms = [
     "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256",
-    "http://www.w3.org/2000/09/xmldsig#rsa-sha384",
-    "http://www.w3.org/2000/09/xmldsig#rsa-sha512",
+    "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384",
+    "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512",
   ];
 
   readonly samlSigningAlgorithmOptions: SelectOptions[] = this.samlSigningAlgorithms.map(
diff --git a/bitwarden_license/bit-web/src/app/billing/policies/free-families-sponsorship.component.ts b/bitwarden_license/bit-web/src/app/billing/policies/free-families-sponsorship.component.ts
index 53d2b0ab66c..dd808300988 100644
--- a/bitwarden_license/bit-web/src/app/billing/policies/free-families-sponsorship.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/policies/free-families-sponsorship.component.ts
@@ -14,7 +14,7 @@ export class FreeFamiliesSponsorshipPolicy extends BasePolicy {
 }
 
 @Component({
-  selector: "policy-personal-ownership",
+  selector: "policy-free-families-sponsorship",
   templateUrl: "free-families-sponsorship.component.html",
   standalone: false,
 })
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts
index e74682f64fe..c7d82c3ec09 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.ts
@@ -1,4 +1,3 @@
-import { BasePortalOutlet } from "@angular/cdk/portal";
 import { Component, Inject, OnInit } from "@angular/core";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 
@@ -33,8 +32,7 @@ export const openCreateClientDialog = (
   dialogService: DialogService,
   dialogConfig: DialogConfig<
     CreateClientDialogParams,
-    DialogRef<CreateClientDialogResultType, unknown>,
-    BasePortalOutlet
+    DialogRef<CreateClientDialogResultType, unknown>
   >,
 ) =>
   dialogService.open<CreateClientDialogResultType, CreateClientDialogParams>(
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
index a57e6351349..de9e63cd509 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
@@ -51,7 +51,6 @@ import { ReplacePipe } from "./replace.pipe";
 
 @Component({
   templateUrl: "manage-clients.component.html",
-  standalone: true,
   imports: [
     AvatarModule,
     TableModule,
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts
index 7e4323d7603..768f22c5738 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts
@@ -24,7 +24,6 @@ const gearIcon = svgIcon`
 
 @Component({
   selector: "app-no-clients",
-  standalone: true,
   imports: [SharedOrganizationModule],
   template: `<div class="tw-flex tw-flex-col tw-items-center tw-text-info">
     <bit-icon [icon]="icon"></bit-icon>
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/replace.pipe.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/replace.pipe.ts
index 4a06e85f533..ad8c6a8940c 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/replace.pipe.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/replace.pipe.ts
@@ -2,7 +2,6 @@ import { Pipe, PipeTransform } from "@angular/core";
 
 @Pipe({
   name: "replace",
-  standalone: true,
 })
 export class ReplacePipe implements PipeTransform {
   transform(value: string, pattern: string, replacement: string): string {
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/payment-details/provider-payment-details.component.html b/bitwarden_license/bit-web/src/app/billing/providers/payment-details/provider-payment-details.component.html
new file mode 100644
index 00000000000..375faab8d34
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/billing/providers/payment-details/provider-payment-details.component.html
@@ -0,0 +1,33 @@
+<app-header></app-header>
+<bit-container>
+  @let view = view$ | async;
+  @if (!view) {
+    <ng-container>
+      <i
+        class="bwi bwi-spinner bwi-spin tw-text-muted"
+        title="{{ 'loading' | i18n }}"
+        aria-hidden="true"
+      ></i>
+      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
+    </ng-container>
+  } @else {
+    <ng-container>
+      <app-display-payment-method
+        [owner]="view.provider"
+        [paymentMethod]="view.paymentMethod"
+        (updated)="setPaymentMethod($event)"
+      ></app-display-payment-method>
+
+      <app-display-billing-address
+        [owner]="view.provider"
+        [billingAddress]="view.billingAddress"
+        (updated)="setBillingAddress($event)"
+      ></app-display-billing-address>
+
+      <app-display-account-credit
+        [owner]="view.provider"
+        [credit]="view.credit"
+      ></app-display-account-credit>
+    </ng-container>
+  }
+</bit-container>
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/payment-details/provider-payment-details.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/payment-details/provider-payment-details.component.ts
new file mode 100644
index 00000000000..dbf948518a2
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/billing/providers/payment-details/provider-payment-details.component.ts
@@ -0,0 +1,133 @@
+import { Component } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  BehaviorSubject,
+  EMPTY,
+  filter,
+  from,
+  map,
+  merge,
+  Observable,
+  shareReplay,
+  switchMap,
+  tap,
+} from "rxjs";
+import { catchError } from "rxjs/operators";
+
+import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import {
+  DisplayAccountCreditComponent,
+  DisplayBillingAddressComponent,
+  DisplayPaymentMethodComponent,
+} from "@bitwarden/web-vault/app/billing/payment/components";
+import {
+  BillingAddress,
+  MaskedPaymentMethod,
+} from "@bitwarden/web-vault/app/billing/payment/types";
+import { BillingClient } from "@bitwarden/web-vault/app/billing/services";
+import { BillableEntity, providerToBillableEntity } from "@bitwarden/web-vault/app/billing/types";
+import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
+import { SharedModule } from "@bitwarden/web-vault/app/shared";
+
+class RedirectError {
+  constructor(
+    public path: string[],
+    public relativeTo: ActivatedRoute,
+  ) {}
+}
+
+type View = {
+  provider: BillableEntity;
+  paymentMethod: MaskedPaymentMethod | null;
+  billingAddress: BillingAddress | null;
+  credit: number | null;
+};
+
+@Component({
+  templateUrl: "./provider-payment-details.component.html",
+  standalone: true,
+  imports: [
+    DisplayBillingAddressComponent,
+    DisplayAccountCreditComponent,
+    DisplayPaymentMethodComponent,
+    HeaderModule,
+    SharedModule,
+  ],
+  providers: [BillingClient],
+})
+export class ProviderPaymentDetailsComponent {
+  private viewState$ = new BehaviorSubject<View | null>(null);
+
+  private load$: Observable<View> = this.activatedRoute.params.pipe(
+    switchMap(({ providerId }) => this.providerService.get$(providerId)),
+    switchMap((provider) =>
+      this.configService
+        .getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout)
+        .pipe(
+          map((managePaymentDetailsOutsideCheckout) => {
+            if (!managePaymentDetailsOutsideCheckout) {
+              throw new RedirectError(["../subscription"], this.activatedRoute);
+            }
+            return provider;
+          }),
+        ),
+    ),
+    providerToBillableEntity,
+    switchMap(async (provider) => {
+      const [paymentMethod, billingAddress, credit] = await Promise.all([
+        this.billingClient.getPaymentMethod(provider),
+        this.billingClient.getBillingAddress(provider),
+        this.billingClient.getCredit(provider),
+      ]);
+
+      return {
+        provider,
+        paymentMethod,
+        billingAddress,
+        credit,
+      };
+    }),
+    shareReplay({ bufferSize: 1, refCount: false }),
+    catchError((error: unknown) => {
+      if (error instanceof RedirectError) {
+        return from(this.router.navigate(error.path, { relativeTo: error.relativeTo })).pipe(
+          switchMap(() => EMPTY),
+        );
+      }
+      throw error;
+    }),
+  );
+
+  view$: Observable<View> = merge(
+    this.load$.pipe(tap((view) => this.viewState$.next(view))),
+    this.viewState$.pipe(filter((view): view is View => view !== null)),
+  ).pipe(shareReplay({ bufferSize: 1, refCount: true }));
+
+  constructor(
+    private activatedRoute: ActivatedRoute,
+    private billingClient: BillingClient,
+    private configService: ConfigService,
+    private providerService: ProviderService,
+    private router: Router,
+  ) {}
+
+  setBillingAddress = (billingAddress: BillingAddress) => {
+    if (this.viewState$.value) {
+      this.viewState$.next({
+        ...this.viewState$.value,
+        billingAddress,
+      });
+    }
+  };
+
+  setPaymentMethod = (paymentMethod: MaskedPaymentMethod) => {
+    if (this.viewState$.value) {
+      this.viewState$.next({
+        ...this.viewState$.value,
+        paymentMethod,
+      });
+    }
+  };
+}
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/setup/setup-business-unit.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/setup/setup-business-unit.component.ts
index 056339b6fb7..0634c891a05 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/setup/setup-business-unit.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/setup/setup-business-unit.component.ts
@@ -3,7 +3,6 @@ import { ActivatedRoute, Params, Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 import { filter, map, switchMap } from "rxjs/operators";
 
-import { BitwardenLogo } from "@bitwarden/auth/angular";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { OrganizationBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/organizations/organization-billing-api.service.abstraction";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
@@ -13,6 +12,7 @@ import { StateProvider } from "@bitwarden/common/platform/state";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { ProviderKey } from "@bitwarden/common/types/key";
+import { Icons } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 import { BillingNotificationService } from "@bitwarden/web-vault/app/billing/services/billing-notification.service";
 import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept.component";
@@ -22,7 +22,7 @@ import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept
   standalone: false,
 })
 export class SetupBusinessUnitComponent extends BaseAcceptComponent {
-  protected bitwardenLogo = BitwardenLogo;
+  protected bitwardenLogo = Icons.BitwardenLogo;
 
   failedMessage = "emergencyInviteAcceptFailed";
   failedShortMessage = "emergencyInviteAcceptFailedShort";
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html
index f2f72fa5bb4..0205d2838d1 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html
+++ b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html
@@ -62,49 +62,51 @@
         </bit-table>
       </div>
     </ng-container>
-    <!-- Account Credit -->
-    <bit-section>
-      <h2 bitTypography="h2">
-        {{ "accountCredit" | i18n }}
-      </h2>
-      <p class="tw-text-lg tw-font-bold">{{ subscription.accountCredit | currency: "$" }}</p>
-      <p bitTypography="body1">{{ "creditAppliedDesc" | i18n }}</p>
-    </bit-section>
-    <!-- Payment Method -->
-    <bit-section *ngIf="allowProviderPaymentMethod$ | async">
-      <h2 bitTypography="h2">{{ "paymentMethod" | i18n }}</h2>
-      <p *ngIf="!subscription.paymentSource" bitTypography="body1">
-        {{ "noPaymentMethod" | i18n }}
-      </p>
-      <ng-container *ngIf="subscription.paymentSource">
-        <app-verify-bank-account
-          *ngIf="subscription.paymentSource.needsVerification"
-          [onSubmit]="verifyBankAccount"
-          (submitted)="load()"
-        >
-        </app-verify-bank-account>
-        <p>
-          <i class="bwi bwi-fw" [ngClass]="paymentSourceClasses"></i>
-          {{ subscription.paymentSource.description }}
-          <span *ngIf="subscription.paymentSource.needsVerification"
-            >- {{ "unverified" | i18n }}</span
-          >
+    @if (!managePaymentDetailsOutsideCheckout) {
+      <!-- Account Credit -->
+      <bit-section>
+        <h2 bitTypography="h2">
+          {{ "accountCredit" | i18n }}
+        </h2>
+        <p class="tw-text-lg tw-font-bold">{{ subscription.accountCredit | currency: "$" }}</p>
+        <p bitTypography="body1">{{ "creditAppliedDesc" | i18n }}</p>
+      </bit-section>
+      <!-- Payment Method -->
+      <bit-section>
+        <h2 bitTypography="h2">{{ "paymentMethod" | i18n }}</h2>
+        <p *ngIf="!subscription.paymentSource" bitTypography="body1">
+          {{ "noPaymentMethod" | i18n }}
         </p>
-      </ng-container>
-      <button type="button" bitButton buttonType="secondary" [bitAction]="updatePaymentMethod">
-        {{ updatePaymentSourceButtonText }}
-      </button>
-    </bit-section>
-    <!-- Tax Information -->
-    <bit-section>
-      <h2 bitTypography="h2" class="tw-mt-16">{{ "taxInformation" | i18n }}</h2>
-      <p>{{ "taxInformationDesc" | i18n }}</p>
-      <app-manage-tax-information
-        *ngIf="subscription.taxInformation"
-        [startWith]="TaxInformation.from(subscription.taxInformation)"
-        [onSubmit]="updateTaxInformation"
-        (taxInformationUpdated)="load()"
-      />
-    </bit-section>
+        <ng-container *ngIf="subscription.paymentSource">
+          <app-verify-bank-account
+            *ngIf="subscription.paymentSource.needsVerification"
+            [onSubmit]="verifyBankAccount"
+            (submitted)="load()"
+          >
+          </app-verify-bank-account>
+          <p>
+            <i class="bwi bwi-fw" [ngClass]="paymentSourceClasses"></i>
+            {{ subscription.paymentSource.description }}
+            <span *ngIf="subscription.paymentSource.needsVerification"
+              >- {{ "unverified" | i18n }}</span
+            >
+          </p>
+        </ng-container>
+        <button type="button" bitButton buttonType="secondary" [bitAction]="updatePaymentMethod">
+          {{ updatePaymentSourceButtonText }}
+        </button>
+      </bit-section>
+      <!-- Tax Information -->
+      <bit-section>
+        <h2 bitTypography="h2" class="tw-mt-16">{{ "taxInformation" | i18n }}</h2>
+        <p>{{ "taxInformationDesc" | i18n }}</p>
+        <app-manage-tax-information
+          *ngIf="subscription.taxInformation"
+          [startWith]="TaxInformation.from(subscription.taxInformation)"
+          [onSubmit]="updateTaxInformation"
+          (taxInformationUpdated)="load()"
+        />
+      </bit-section>
+    }
   </ng-container>
 </bit-container>
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.ts
index 74368ef7839..83a23760d80 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.ts
@@ -36,13 +36,10 @@ export class ProviderSubscriptionComponent implements OnInit, OnDestroy {
   protected loading: boolean;
   private destroy$ = new Subject<void>();
   protected totalCost: number;
+  protected managePaymentDetailsOutsideCheckout: boolean;
 
   protected readonly TaxInformation = TaxInformation;
 
-  protected readonly allowProviderPaymentMethod$ = this.configService.getFeatureFlag$(
-    FeatureFlag.PM18794_ProviderPaymentMethod,
-  );
-
   constructor(
     private billingApiService: BillingApiServiceAbstraction,
     private i18nService: I18nService,
@@ -58,6 +55,9 @@ export class ProviderSubscriptionComponent implements OnInit, OnDestroy {
       .pipe(
         concatMap(async (params) => {
           this.providerId = params.providerId;
+          this.managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
+            FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
+          );
           await this.load();
           this.firstLoaded = true;
         }),
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence-routing.module.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence-routing.module.ts
index 6df0f01bc8b..2e3c53d8d9f 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence-routing.module.ts
@@ -9,7 +9,9 @@ const routes: Routes = [
   { path: "", pathMatch: "full", redirectTo: "risk-insights" },
   {
     path: "risk-insights",
-    canActivate: [organizationPermissionsGuard((org) => org.useRiskInsights)],
+    canActivate: [
+      organizationPermissionsGuard((org) => org.useRiskInsights && org.canAccessReports),
+    ],
     component: RiskInsightsComponent,
     data: {
       titleId: "RiskInsights",
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html
index 6f8e738fdc3..d383d1153c7 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html
@@ -26,7 +26,7 @@
 <div class="tw-mt-4 tw-flex tw-flex-col" *ngIf="!(isLoading$ | async) && dataSource.data.length">
   <h2 class="tw-mb-6" bitTypography="h2">{{ "allApplications" | i18n }}</h2>
   <div class="tw-flex tw-gap-6">
-    <tools-card
+    <dirt-card
       #allAppsOrgAtRiskMembers
       class="tw-flex-1 tw-cursor-pointer"
       [ngClass]="{ 'tw-bg-primary-100': dataService.drawerInvokerId === 'allAppsOrgAtRiskMembers' }"
@@ -35,8 +35,8 @@
       [maxValue]="applicationSummary.totalMemberCount"
       (click)="showOrgAtRiskMembers('allAppsOrgAtRiskMembers')"
     >
-    </tools-card>
-    <tools-card
+    </dirt-card>
+    <dirt-card
       #allAppsOrgAtRiskApplications
       class="tw-flex-1 tw-cursor-pointer"
       [ngClass]="{
@@ -47,7 +47,7 @@
       [maxValue]="applicationSummary.totalApplicationCount"
       (click)="showOrgAtRiskApps('allAppsOrgAtRiskApplications')"
     >
-    </tools-card>
+    </dirt-card>
   </div>
   <div class="tw-flex tw-mt-8 tw-mb-4 tw-gap-4">
     <bit-search
@@ -59,7 +59,6 @@
       type="button"
       [buttonType]="'primary'"
       bitButton
-      *ngIf="isCriticalAppsFeatureEnabled"
       [disabled]="!selectedUrls.size"
       [loading]="markingAsCritical"
       (click)="markAppsAsCritical()"
@@ -74,7 +73,6 @@
     [showRowCheckBox]="true"
     [showRowMenuForCriticalApps]="false"
     [selectedUrls]="selectedUrls"
-    [isCriticalAppsFeatureEnabled]="isCriticalAppsFeatureEnabled"
     [isDrawerIsOpenForThisRecord]="isDrawerOpenForTableRow"
     [checkboxChange]="onCheckboxChange"
     [showAppAtRiskMembers]="showAppAtRiskMembers"
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts
index c586882a1e0..ee08ec6661e 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts
@@ -2,7 +2,7 @@ import { Component, DestroyRef, inject, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
-import { combineLatest, debounceTime, firstValueFrom, map, Observable, of, skipWhile } from "rxjs";
+import { combineLatest, debounceTime, firstValueFrom, map, Observable, of, switchMap } from "rxjs";
 
 import {
   CriticalAppsService,
@@ -12,6 +12,7 @@ import {
 import {
   ApplicationHealthReportDetail,
   ApplicationHealthReportDetailWithCriticalFlag,
+  ApplicationHealthReportDetailWithCriticalFlagAndCipher,
   ApplicationHealthReportSummary,
 } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/password-health";
 import {
@@ -21,7 +22,6 @@ import {
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -33,7 +33,7 @@ import {
   TableDataSource,
   ToastService,
 } from "@bitwarden/components";
-import { CardComponent } from "@bitwarden/tools-card";
+import { CardComponent } from "@bitwarden/dirt-card";
 import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
 import { SharedModule } from "@bitwarden/web-vault/app/shared";
 import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
@@ -42,7 +42,6 @@ import { AppTableRowScrollableComponent } from "./app-table-row-scrollable.compo
 import { ApplicationsLoadingComponent } from "./risk-insights-loading.component";
 
 @Component({
-  standalone: true,
   selector: "tools-all-applications",
   templateUrl: "./all-applications.component.html",
   imports: [
@@ -58,7 +57,8 @@ import { ApplicationsLoadingComponent } from "./risk-insights-loading.component"
   ],
 })
 export class AllApplicationsComponent implements OnInit {
-  protected dataSource = new TableDataSource<ApplicationHealthReportDetailWithCriticalFlag>();
+  protected dataSource =
+    new TableDataSource<ApplicationHealthReportDetailWithCriticalFlagAndCipher>();
   protected selectedUrls: Set<string> = new Set<string>();
   protected searchControl = new FormControl("", { nonNullable: true });
   protected loading = true;
@@ -74,14 +74,9 @@ export class AllApplicationsComponent implements OnInit {
 
   destroyRef = inject(DestroyRef);
   isLoading$: Observable<boolean> = of(false);
-  isCriticalAppsFeatureEnabled = false;
 
   async ngOnInit() {
-    this.isCriticalAppsFeatureEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.CriticalApps,
-    );
-
-    const organizationId = this.activatedRoute.snapshot.paramMap.get("organizationId") ?? "";
+    const organizationId = this.activatedRoute.snapshot.paramMap.get("organizationId");
     const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
 
     if (organizationId) {
@@ -96,14 +91,32 @@ export class AllApplicationsComponent implements OnInit {
       ])
         .pipe(
           takeUntilDestroyed(this.destroyRef),
-          skipWhile(([_, __, organization]) => !organization),
           map(([applications, criticalApps, organization]) => {
-            const criticalUrls = criticalApps.map((ca) => ca.uri);
-            const data = applications?.map((app) => ({
-              ...app,
-              isMarkedAsCritical: criticalUrls.includes(app.applicationName),
-            })) as ApplicationHealthReportDetailWithCriticalFlag[];
-            return { data, organization };
+            if (applications && applications.length === 0 && criticalApps && criticalApps) {
+              const criticalUrls = criticalApps.map((ca) => ca.uri);
+              const data = applications?.map((app) => ({
+                ...app,
+                isMarkedAsCritical: criticalUrls.includes(app.applicationName),
+              })) as ApplicationHealthReportDetailWithCriticalFlag[];
+              return { data, organization };
+            }
+
+            return { data: applications, organization };
+          }),
+          switchMap(async ({ data, organization }) => {
+            if (data && organization) {
+              const dataWithCiphers = await this.reportService.identifyCiphers(
+                data,
+                organization.id,
+              );
+
+              return {
+                data: dataWithCiphers,
+                organization,
+              };
+            }
+
+            return { data: [], organization };
           }),
         )
         .subscribe(({ data, organization }) => {
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
index 10dbb179519..97c5b187ef9 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
@@ -1,7 +1,7 @@
 <ng-container>
   <bit-table-scroll [dataSource]="dataSource" [rowSize]="53">
     <ng-container header>
-      <th *ngIf="isCriticalAppsFeatureEnabled"></th>
+      <th></th>
       <th bitCell></th>
       <th bitSortable="applicationName" bitCell>{{ "application" | i18n }}</th>
       <th bitSortable="atRiskPasswordCount" bitCell>{{ "atRiskPasswords" | i18n }}</th>
@@ -12,7 +12,7 @@
     <ng-template bitRowDef let-row>
       <td
         bitCell
-        *ngIf="isCriticalAppsFeatureEnabled && showRowCheckBox"
+        *ngIf="showRowCheckBox"
         [ngClass]="{ 'tw-bg-primary-100': isDrawerIsOpenForThisRecord(row.applicationName) }"
       >
         <input
@@ -32,7 +32,7 @@
         <i class="bwi bwi-star-f" *ngIf="row.isMarkedAsCritical"></i>
       </td>
       <td bitCell>
-        <app-vault-icon [cipher]="row.cipher"></app-vault-icon>
+        <app-vault-icon *ngIf="row.ciphers.length > 0" [cipher]="row.ciphers[0]"></app-vault-icon>
       </td>
       <td
         class="tw-cursor-pointer"
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.ts
index 052288013c4..a729f21158f 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.ts
@@ -2,23 +2,21 @@ import { CommonModule } from "@angular/common";
 import { Component, Input } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { ApplicationHealthReportDetailWithCriticalFlag } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/password-health";
+import { ApplicationHealthReportDetailWithCriticalFlagAndCipher } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/password-health";
 import { MenuModule, TableDataSource, TableModule } from "@bitwarden/components";
 import { SharedModule } from "@bitwarden/web-vault/app/shared";
 import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
 
 @Component({
   selector: "app-table-row-scrollable",
-  standalone: true,
   imports: [CommonModule, JslibModule, TableModule, SharedModule, PipesModule, MenuModule],
   templateUrl: "./app-table-row-scrollable.component.html",
 })
 export class AppTableRowScrollableComponent {
-  @Input() dataSource!: TableDataSource<ApplicationHealthReportDetailWithCriticalFlag>;
+  @Input() dataSource!: TableDataSource<ApplicationHealthReportDetailWithCriticalFlagAndCipher>;
   @Input() showRowMenuForCriticalApps: boolean = false;
   @Input() showRowCheckBox: boolean = false;
   @Input() selectedUrls: Set<string> = new Set<string>();
-  @Input() isCriticalAppsFeatureEnabled: boolean = false;
   @Input() isDrawerIsOpenForThisRecord!: (applicationName: string) => boolean;
   @Input() showAppAtRiskMembers!: (applicationName: string) => void;
   @Input() unmarkAsCriticalApp!: (applicationName: string) => void;
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html
index d9ad4dce0ff..4e2b4e5c404 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html
@@ -45,7 +45,7 @@
     </button>
   </div>
   <div class="tw-flex tw-gap-6">
-    <tools-card
+    <dirt-card
       #criticalAppsAtRiskMembers
       class="tw-flex-1 tw-cursor-pointer"
       [ngClass]="{
@@ -56,8 +56,8 @@
       [maxValue]="applicationSummary.totalMemberCount"
       (click)="showOrgAtRiskMembers('criticalAppsAtRiskMembers')"
     >
-    </tools-card>
-    <tools-card
+    </dirt-card>
+    <dirt-card
       #criticalAppsAtRiskApplications
       class="tw-flex-1 tw-cursor-pointer"
       [ngClass]="{
@@ -68,7 +68,7 @@
       [maxValue]="applicationSummary.totalApplicationCount"
       (click)="showOrgAtRiskApps('criticalAppsAtRiskApplications')"
     >
-    </tools-card>
+    </dirt-card>
   </div>
   <div class="tw-flex tw-mt-8 tw-mb-4 tw-gap-4">
     <bit-search
@@ -82,7 +82,6 @@
     [dataSource]="dataSource"
     [showRowCheckBox]="false"
     [showRowMenuForCriticalApps]="true"
-    [isCriticalAppsFeatureEnabled]="true"
     [isDrawerIsOpenForThisRecord]="isDrawerOpenForTableRow"
     [showAppAtRiskMembers]="showAppAtRiskMembers"
     [unmarkAsCriticalApp]="unmarkAsCriticalApp"
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts
index 926941d985f..fcca568da6e 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts
@@ -4,7 +4,7 @@ import { Component, DestroyRef, inject, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
-import { combineLatest, debounceTime, map } from "rxjs";
+import { combineLatest, debounceTime, map, switchMap } from "rxjs";
 
 import {
   CriticalAppsService,
@@ -13,6 +13,7 @@ import {
 } from "@bitwarden/bit-common/dirt/reports/risk-insights";
 import {
   ApplicationHealthReportDetailWithCriticalFlag,
+  ApplicationHealthReportDetailWithCriticalFlagAndCipher,
   ApplicationHealthReportSummary,
 } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/password-health";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
@@ -27,7 +28,7 @@ import {
   TableDataSource,
   ToastService,
 } from "@bitwarden/components";
-import { CardComponent } from "@bitwarden/tools-card";
+import { CardComponent } from "@bitwarden/dirt-card";
 import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
 import { SharedModule } from "@bitwarden/web-vault/app/shared";
 import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
@@ -39,7 +40,6 @@ import { AppTableRowScrollableComponent } from "./app-table-row-scrollable.compo
 import { RiskInsightsTabType } from "./risk-insights.component";
 
 @Component({
-  standalone: true,
   selector: "tools-critical-applications",
   templateUrl: "./critical-applications.component.html",
   imports: [
@@ -54,7 +54,8 @@ import { RiskInsightsTabType } from "./risk-insights.component";
   providers: [DefaultAdminTaskService],
 })
 export class CriticalApplicationsComponent implements OnInit {
-  protected dataSource = new TableDataSource<ApplicationHealthReportDetailWithCriticalFlag>();
+  protected dataSource =
+    new TableDataSource<ApplicationHealthReportDetailWithCriticalFlagAndCipher>();
   protected selectedIds: Set<number> = new Set<number>();
   protected searchControl = new FormControl("", { nonNullable: true });
   private destroyRef = inject(DestroyRef);
@@ -69,7 +70,9 @@ export class CriticalApplicationsComponent implements OnInit {
     this.isNotificationsFeatureEnabled = await this.configService.getFeatureFlag(
       FeatureFlag.EnableRiskInsightsNotifications,
     );
+
     this.organizationId = this.activatedRoute.snapshot.paramMap.get("organizationId") ?? "";
+
     combineLatest([
       this.dataService.applications$,
       this.criticalAppsService.getAppsListForOrg(this.organizationId),
@@ -84,6 +87,16 @@ export class CriticalApplicationsComponent implements OnInit {
           })) as ApplicationHealthReportDetailWithCriticalFlag[];
           return data?.filter((app) => app.isMarkedAsCritical);
         }),
+        switchMap(async (data) => {
+          if (data) {
+            const dataWithCiphers = await this.reportService.identifyCiphers(
+              data,
+              this.organizationId,
+            );
+            return dataWithCiphers;
+          }
+          return null;
+        }),
       )
       .subscribe((applications) => {
         if (applications) {
@@ -131,8 +144,10 @@ export class CriticalApplicationsComponent implements OnInit {
     const apps = this.dataSource.data;
     const cipherIds = apps
       .filter((_) => _.atRiskPasswordCount > 0)
-      .flatMap((app) => app.atRiskMemberDetails.map((member) => member.cipherId));
+      .flatMap((app) => app.atRiskCipherIds);
+
     const distinctCipherIds = Array.from(new Set(cipherIds));
+
     const tasks: CreateTasksRequest[] = distinctCipherIds.map((cipherId) => ({
       cipherId: cipherId as CipherId,
       type: SecurityTaskType.UpdateAtRiskCredential,
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.ts
index d50436061cb..15dc80a1b00 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.ts
@@ -5,7 +5,6 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { TableDataSource, TableModule } from "@bitwarden/components";
 
 @Component({
-  standalone: true,
   selector: "tools-notified-members-table",
   templateUrl: "./notified-members-table.component.html",
   imports: [CommonModule, JslibModule, TableModule],
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.html
deleted file mode 100644
index 936d92d8701..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<bit-container>
-  <p>{{ "passwordsReportDesc" | i18n }}</p>
-  <div *ngIf="loading">
-    <i
-      class="bwi bwi-spinner bwi-spin tw-text-muted"
-      title="{{ 'loading' | i18n }}"
-      aria-hidden="true"
-    ></i>
-    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
-  </div>
-  <div class="tw-mt-4" *ngIf="!loading">
-    <bit-table-scroll [dataSource]="dataSource" [rowSize]="53">
-      <ng-container header>
-        <th bitCell bitSortable="hostURI">{{ "application" | i18n }}</th>
-        <th bitCell class="tw-text-right">{{ "weakness" | i18n }}</th>
-        <th bitCell class="tw-text-right">{{ "timesReused" | i18n }}</th>
-        <th bitCell class="tw-text-right">{{ "timesExposed" | i18n }}</th>
-        <th bitCell class="tw-text-right">{{ "totalMembers" | i18n }}</th>
-      </ng-container>
-      <ng-template bitRowDef let-row>
-        <td bitCell>
-          <ng-container>
-            <span>{{ row.hostURI }}</span>
-          </ng-container>
-        </td>
-        <td bitCell class="tw-text-right">
-          <span
-            bitBadge
-            *ngIf="passwordStrengthMap.has(row.id)"
-            [variant]="passwordStrengthMap.get(row.id)[1]"
-          >
-            {{ passwordStrengthMap.get(row.id)[0] | i18n }}
-          </span>
-        </td>
-        <td bitCell class="tw-text-right">
-          <span bitBadge *ngIf="passwordUseMap.has(row.login.password)" variant="warning">
-            {{ "reusedXTimes" | i18n: passwordUseMap.get(row.login.password) }}
-          </span>
-        </td>
-        <td bitCell class="tw-text-right">
-          <span bitBadge *ngIf="exposedPasswordMap.has(row.id)" variant="warning">
-            {{ "exposedXTimes" | i18n: exposedPasswordMap.get(row.id) }}
-          </span>
-        </td>
-        <td bitCell class="tw-text-right" data-testid="total-membership">
-          {{ totalMembersMap.get(row.id) || 0 }}
-        </td>
-      </ng-template>
-    </bit-table-scroll>
-  </div>
-</bit-container>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.spec.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.spec.ts
deleted file mode 100644
index e827f884ead..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.spec.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { ActivatedRoute, convertToParamMap } from "@angular/router";
-import { mock, MockProxy } from "jest-mock-extended";
-import { of } from "rxjs";
-
-import {
-  MemberCipherDetailsApiService,
-  PasswordHealthService,
-} from "@bitwarden/bit-common/dirt/reports/risk-insights";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { mockAccountServiceWith } from "@bitwarden/common/spec";
-import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
-import { UserId } from "@bitwarden/common/types/guid";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { TableModule } from "@bitwarden/components";
-import { LooseComponentsModule } from "@bitwarden/web-vault/app/shared";
-import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
-
-import { PasswordHealthMembersURIComponent } from "./password-health-members-uri.component";
-
-describe("PasswordHealthMembersUriComponent", () => {
-  let component: PasswordHealthMembersURIComponent;
-  let fixture: ComponentFixture<PasswordHealthMembersURIComponent>;
-  let cipherServiceMock: MockProxy<CipherService>;
-  const passwordHealthServiceMock = mock<PasswordHealthService>();
-  const userId = Utils.newGuid() as UserId;
-
-  const activeRouteParams = convertToParamMap({ organizationId: "orgId" });
-
-  beforeEach(async () => {
-    cipherServiceMock = mock<CipherService>();
-    await TestBed.configureTestingModule({
-      imports: [PasswordHealthMembersURIComponent, PipesModule, TableModule, LooseComponentsModule],
-      providers: [
-        { provide: CipherService, useValue: cipherServiceMock },
-        { provide: I18nService, useValue: mock<I18nService>() },
-        { provide: AuditService, useValue: mock<AuditService>() },
-        { provide: OrganizationService, useValue: mock<OrganizationService>() },
-        { provide: AccountService, useValue: mockAccountServiceWith(userId) },
-        {
-          provide: PasswordStrengthServiceAbstraction,
-          useValue: mock<PasswordStrengthServiceAbstraction>(),
-        },
-        { provide: PasswordHealthService, useValue: passwordHealthServiceMock },
-        {
-          provide: ActivatedRoute,
-          useValue: {
-            paramMap: of(activeRouteParams),
-            url: of([]),
-          },
-        },
-        {
-          provide: MemberCipherDetailsApiService,
-          useValue: mock<MemberCipherDetailsApiService>(),
-        },
-        {
-          provide: ApiService,
-          useValue: mock<ApiService>(),
-        },
-      ],
-    }).compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PasswordHealthMembersURIComponent);
-    component = fixture.componentInstance;
-  });
-
-  it("should initialize component", () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.ts
deleted file mode 100644
index 9e377f93ef9..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { CommonModule } from "@angular/common";
-import { Component, DestroyRef, inject, OnInit } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { ActivatedRoute } from "@angular/router";
-import { map } from "rxjs";
-
-import { JslibModule } from "@bitwarden/angular/jslib.module";
-import {
-  MemberCipherDetailsApiService,
-  PasswordHealthService,
-} from "@bitwarden/bit-common/dirt/reports/risk-insights";
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import {
-  BadgeModule,
-  BadgeVariant,
-  ContainerComponent,
-  TableDataSource,
-  TableModule,
-} from "@bitwarden/components";
-import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
-import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
-
-@Component({
-  standalone: true,
-  selector: "tools-password-health-members-uri",
-  templateUrl: "password-health-members-uri.component.html",
-  imports: [
-    BadgeModule,
-    CommonModule,
-    ContainerComponent,
-    PipesModule,
-    JslibModule,
-    HeaderModule,
-    TableModule,
-  ],
-  providers: [PasswordHealthService, MemberCipherDetailsApiService],
-})
-export class PasswordHealthMembersURIComponent implements OnInit {
-  passwordStrengthMap = new Map<string, [string, BadgeVariant]>();
-
-  weakPasswordCiphers: CipherView[] = [];
-
-  passwordUseMap = new Map<string, number>();
-
-  exposedPasswordMap = new Map<string, number>();
-
-  totalMembersMap = new Map<string, number>();
-
-  dataSource = new TableDataSource<CipherView>();
-
-  reportCiphers: (CipherView & { hostURI: string })[] = [];
-  reportCipherURIs: string[] = [];
-
-  organization: Organization;
-
-  loading = true;
-
-  private destroyRef = inject(DestroyRef);
-
-  constructor(
-    protected cipherService: CipherService,
-    protected passwordStrengthService: PasswordStrengthServiceAbstraction,
-    protected organizationService: OrganizationService,
-    protected auditService: AuditService,
-    protected i18nService: I18nService,
-    protected activatedRoute: ActivatedRoute,
-    protected memberCipherDetailsApiService: MemberCipherDetailsApiService,
-  ) {}
-
-  ngOnInit() {
-    this.activatedRoute.paramMap
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        map(async (params) => {
-          const organizationId = params.get("organizationId");
-          await this.setCiphers(organizationId);
-        }),
-      )
-      .subscribe();
-  }
-
-  async setCiphers(organizationId: string) {
-    const passwordHealthService = new PasswordHealthService(
-      this.passwordStrengthService,
-      this.auditService,
-      this.cipherService,
-      this.memberCipherDetailsApiService,
-      organizationId,
-    );
-
-    await passwordHealthService.generateReport();
-
-    this.dataSource.data = passwordHealthService.groupCiphersByLoginUri();
-    this.exposedPasswordMap = passwordHealthService.exposedPasswordMap;
-    this.passwordStrengthMap = passwordHealthService.passwordStrengthMap;
-    this.passwordUseMap = passwordHealthService.passwordUseMap;
-    this.totalMembersMap = passwordHealthService.totalMembersMap;
-    this.loading = false;
-  }
-}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members.component.html
deleted file mode 100644
index 5c980f75a81..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members.component.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<p>{{ "passwordsReportDesc" | i18n }}</p>
-<div *ngIf="loading">
-  <i
-    class="bwi bwi-spinner bwi-spin tw-text-muted"
-    title="{{ 'loading' | i18n }}"
-    aria-hidden="true"
-  ></i>
-  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
-</div>
-<div class="tw-flex tw-flex-col" *ngIf="!loading && dataSource.data.length">
-  <bit-table-scroll [dataSource]="dataSource" [rowSize]="74">
-    <ng-container header>
-      <th bitCell></th>
-      <th bitCell bitSortable="name">{{ "name" | i18n }}</th>
-      <th bitCell class="tw-text-right">{{ "weakness" | i18n }}</th>
-      <th bitCell class="tw-text-right">{{ "timesReused" | i18n }}</th>
-      <th bitCell class="tw-text-right">{{ "timesExposed" | i18n }}</th>
-      <th bitCell class="tw-text-right">{{ "totalMembers" | i18n }}</th>
-    </ng-container>
-    <ng-template bitRowDef let-row>
-      <td bitCell>
-        <input
-          bitCheckbox
-          type="checkbox"
-          [checked]="selectedIds.has(row.id)"
-          (change)="onCheckboxChange(row.id, $event)"
-        />
-      </td>
-      <td bitCell>
-        <ng-container>
-          <span>{{ row.name }}</span>
-        </ng-container>
-        <br />
-        <small>{{ row.subTitle }}</small>
-      </td>
-      <td bitCell class="tw-text-right">
-        <span
-          bitBadge
-          *ngIf="passwordStrengthMap.has(row.id)"
-          [variant]="passwordStrengthMap.get(row.id)[1]"
-        >
-          {{ passwordStrengthMap.get(row.id)[0] | i18n }}
-        </span>
-      </td>
-      <td bitCell class="tw-text-right">
-        <span bitBadge *ngIf="passwordUseMap.has(row.login.password)" variant="warning">
-          {{ "reusedXTimes" | i18n: passwordUseMap.get(row.login.password) }}
-        </span>
-      </td>
-      <td bitCell class="tw-text-right">
-        <span bitBadge *ngIf="exposedPasswordMap.has(row.id)" variant="warning">
-          {{ "exposedXTimes" | i18n: exposedPasswordMap.get(row.id) }}
-        </span>
-      </td>
-      <td bitCell class="tw-text-right" data-testid="total-membership">
-        {{ totalMembersMap.get(row.id) || 0 }}
-      </td>
-    </ng-template>
-  </bit-table-scroll>
-</div>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members.component.ts
deleted file mode 100644
index 114d582c363..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members.component.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, DestroyRef, inject, OnInit } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { FormControl, FormsModule } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
-import { debounceTime, map } from "rxjs";
-
-import {
-  MemberCipherDetailsApiService,
-  PasswordHealthService,
-} from "@bitwarden/bit-common/dirt/reports/risk-insights";
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import {
-  BadgeVariant,
-  SearchModule,
-  TableDataSource,
-  TableModule,
-  ToastService,
-} from "@bitwarden/components";
-import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
-import { SharedModule } from "@bitwarden/web-vault/app/shared";
-import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
-
-@Component({
-  standalone: true,
-  selector: "tools-password-health-members",
-  templateUrl: "password-health-members.component.html",
-  imports: [PipesModule, HeaderModule, SearchModule, FormsModule, SharedModule, TableModule],
-  providers: [PasswordHealthService, MemberCipherDetailsApiService],
-})
-export class PasswordHealthMembersComponent implements OnInit {
-  passwordStrengthMap = new Map<string, [string, BadgeVariant]>();
-
-  passwordUseMap = new Map<string, number>();
-
-  exposedPasswordMap = new Map<string, number>();
-
-  totalMembersMap = new Map<string, number>();
-
-  dataSource = new TableDataSource<CipherView>();
-
-  loading = true;
-
-  selectedIds: Set<number> = new Set<number>();
-
-  protected searchControl = new FormControl("", { nonNullable: true });
-
-  private destroyRef = inject(DestroyRef);
-
-  constructor(
-    protected cipherService: CipherService,
-    protected passwordStrengthService: PasswordStrengthServiceAbstraction,
-    protected auditService: AuditService,
-    protected i18nService: I18nService,
-    protected activatedRoute: ActivatedRoute,
-    protected toastService: ToastService,
-    protected memberCipherDetailsApiService: MemberCipherDetailsApiService,
-  ) {
-    this.searchControl.valueChanges
-      .pipe(debounceTime(200), takeUntilDestroyed())
-      .subscribe((v) => (this.dataSource.filter = v));
-  }
-
-  ngOnInit() {
-    this.activatedRoute.paramMap
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        map(async (params) => {
-          const organizationId = params.get("organizationId");
-          await this.setCiphers(organizationId);
-        }),
-      )
-      .subscribe();
-  }
-
-  async setCiphers(organizationId: string) {
-    const passwordHealthService = new PasswordHealthService(
-      this.passwordStrengthService,
-      this.auditService,
-      this.cipherService,
-      this.memberCipherDetailsApiService,
-      organizationId,
-    );
-
-    await passwordHealthService.generateReport();
-
-    this.dataSource.data = passwordHealthService.reportCiphers;
-
-    this.exposedPasswordMap = passwordHealthService.exposedPasswordMap;
-    this.passwordStrengthMap = passwordHealthService.passwordStrengthMap;
-    this.passwordUseMap = passwordHealthService.passwordUseMap;
-    this.totalMembersMap = passwordHealthService.totalMembersMap;
-    this.loading = false;
-  }
-
-  markAppsAsCritical = async () => {
-    // TODO: Send to API once implemented
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        this.selectedIds.clear();
-        this.toastService.showToast({
-          variant: "success",
-          title: null,
-          message: this.i18nService.t("appsMarkedAsCritical"),
-        });
-        resolve(true);
-      }, 1000);
-    });
-  };
-
-  trackByFunction(_: number, item: CipherView) {
-    return item.id;
-  }
-
-  onCheckboxChange(id: number, event: Event) {
-    const isChecked = (event.target as HTMLInputElement).checked;
-    if (isChecked) {
-      this.selectedIds.add(id);
-    } else {
-      this.selectedIds.delete(id);
-    }
-  }
-}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.html
deleted file mode 100644
index b798a75ab3a..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<bit-container>
-  <p>{{ "passwordsReportDesc" | i18n }}</p>
-  <div *ngIf="loading">
-    <i
-      class="bwi bwi-spinner bwi-spin tw-text-muted"
-      title="{{ 'loading' | i18n }}"
-      aria-hidden="true"
-    ></i>
-    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
-  </div>
-  <div class="tw-mt-4" *ngIf="!loading && dataSource.data.length">
-    <bit-table-scroll [dataSource]="dataSource" [rowSize]="53">
-      <ng-container header>
-        <th bitCell></th>
-        <th bitCell bitSortable="name">{{ "name" | i18n }}</th>
-        <th bitCell class="tw-text-right">{{ "weakness" | i18n }}</th>
-        <th bitCell class="tw-text-right">{{ "timesReused" | i18n }}</th>
-        <th bitCell class="tw-text-right">{{ "timesExposed" | i18n }}</th>
-      </ng-container>
-      <ng-template bitRowDef let-row>
-        <td bitCell>
-          <app-vault-icon [cipher]="row"></app-vault-icon>
-        </td>
-        <td bitCell>
-          <ng-container>
-            <span>{{ row.name }}</span>
-          </ng-container>
-          <br />
-          <small>{{ row.subTitle }}</small>
-        </td>
-        <td bitCell class="tw-text-right">
-          <span
-            bitBadge
-            *ngIf="row.weakPasswordDetail"
-            [variant]="row.weakPasswordDetail?.detailValue.badgeVariant"
-          >
-            {{ row.weakPasswordDetail?.detailValue.label | i18n }}
-          </span>
-        </td>
-        <td bitCell class="tw-text-right">
-          <span bitBadge *ngIf="passwordUseMap.has(row.login.password)" variant="warning">
-            {{ "reusedXTimes" | i18n: passwordUseMap.get(row.login.password) }}
-          </span>
-        </td>
-        <td bitCell class="tw-text-right">
-          <span bitBadge variant="warning" *ngIf="row.exposedPasswordDetail">
-            {{ "exposedXTimes" | i18n: row.exposedPasswordDetail?.exposedXTimes }}
-          </span>
-        </td>
-      </ng-template>
-    </bit-table-scroll>
-  </div>
-</bit-container>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.spec.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.spec.ts
deleted file mode 100644
index f7c821f123a..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.spec.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { ActivatedRoute, convertToParamMap } from "@angular/router";
-import { mock } from "jest-mock-extended";
-import { of } from "rxjs";
-
-import { RiskInsightsReportService } from "@bitwarden/bit-common/dirt/reports/risk-insights";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { TableModule } from "@bitwarden/components";
-import { LooseComponentsModule } from "@bitwarden/web-vault/app/shared";
-import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
-
-import { PasswordHealthComponent } from "./password-health.component";
-
-describe("PasswordHealthComponent", () => {
-  let component: PasswordHealthComponent;
-  let fixture: ComponentFixture<PasswordHealthComponent>;
-  const activeRouteParams = convertToParamMap({ organizationId: "orgId" });
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [PasswordHealthComponent, PipesModule, TableModule, LooseComponentsModule],
-      declarations: [],
-      providers: [
-        { provide: RiskInsightsReportService, useValue: mock<RiskInsightsReportService>() },
-        { provide: I18nService, useValue: mock<I18nService>() },
-        {
-          provide: ActivatedRoute,
-          useValue: {
-            paramMap: of(activeRouteParams),
-            url: of([]),
-          },
-        },
-      ],
-    }).compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PasswordHealthComponent);
-    component = fixture.componentInstance;
-
-    fixture.detectChanges();
-  });
-
-  it("should initialize component", () => {
-    expect(component).toBeTruthy();
-  });
-
-  it("should call generateReport on init", () => {});
-});
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.ts
deleted file mode 100644
index aa8f6731ecf..00000000000
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { CommonModule } from "@angular/common";
-import { Component, DestroyRef, inject, OnInit } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { ActivatedRoute } from "@angular/router";
-import { firstValueFrom, map } from "rxjs";
-
-import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { RiskInsightsReportService } from "@bitwarden/bit-common/dirt/reports/risk-insights";
-import { CipherHealthReportDetail } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/password-health";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import {
-  BadgeModule,
-  ContainerComponent,
-  TableDataSource,
-  TableModule,
-} from "@bitwarden/components";
-import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
-import { OrganizationBadgeModule } from "@bitwarden/web-vault/app/vault/individual-vault/organization-badge/organization-badge.module";
-import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
-
-@Component({
-  standalone: true,
-  selector: "tools-password-health",
-  templateUrl: "password-health.component.html",
-  imports: [
-    BadgeModule,
-    OrganizationBadgeModule,
-    CommonModule,
-    ContainerComponent,
-    PipesModule,
-    JslibModule,
-    HeaderModule,
-    TableModule,
-  ],
-})
-export class PasswordHealthComponent implements OnInit {
-  passwordUseMap = new Map<string, number>();
-  dataSource = new TableDataSource<CipherHealthReportDetail>();
-
-  loading = true;
-
-  private destroyRef = inject(DestroyRef);
-
-  constructor(
-    protected riskInsightsReportService: RiskInsightsReportService,
-    protected i18nService: I18nService,
-    protected activatedRoute: ActivatedRoute,
-  ) {}
-
-  ngOnInit() {
-    this.activatedRoute.paramMap
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        map(async (params) => {
-          const organizationId = params.get("organizationId");
-          await this.setCiphers(organizationId);
-        }),
-      )
-      .subscribe();
-  }
-
-  async setCiphers(organizationId: string) {
-    this.dataSource.data = await firstValueFrom(
-      this.riskInsightsReportService.generateRawDataReport$(organizationId),
-    );
-    this.loading = false;
-  }
-}
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.ts
index 1cafa62c608..af61c9a35c8 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.ts
@@ -5,7 +5,6 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 
 @Component({
   selector: "tools-risk-insights-loading",
-  standalone: true,
   imports: [CommonModule, JslibModule],
   templateUrl: "./risk-insights-loading.component.html",
 })
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html
index f759e483bd0..89ea600f6e0 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html
@@ -1,149 +1,138 @@
 <ng-container>
-  <bit-layout>
-    <h1 bitTypography="h1">{{ "riskInsights" | i18n }}</h1>
-    <div class="tw-text-main tw-max-w-4xl tw-mb-2">
-      {{ "reviewAtRiskPasswords" | i18n }}
-    </div>
-    <div
-      *ngIf="dataLastUpdated$ | async"
-      class="tw-bg-primary-100 tw-rounded-lg tw-w-full tw-px-8 tw-py-4 tw-my-4 tw-flex tw-items-center"
-    >
-      <i
-        class="bwi bwi-exclamation-triangle bwi-lg tw-text-[1.2rem] tw-text-muted"
-        aria-hidden="true"
-      ></i>
-      <span class="tw-mx-4">{{
-        "dataLastUpdated" | i18n: (dataLastUpdated$ | async | date: "MMMM d, y 'at' h:mm a")
-      }}</span>
-      <span class="tw-flex tw-justify-center tw-w-16">
-        <a
-          *ngIf="!(isRefreshing$ | async)"
-          bitButton
-          buttonType="unstyled"
-          class="tw-border-none !tw-font-normal tw-cursor-pointer !tw-py-0"
-          [bitAction]="refreshData.bind(this)"
-        >
-          {{ "refresh" | i18n }}
-        </a>
-        <span>
-          <i
-            *ngIf="isRefreshing$ | async"
-            class="bwi bwi-spinner bwi-spin tw-text-muted tw-text-[1.2rem]"
-            aria-hidden="true"
-          ></i>
-        </span>
+  <h1 bitTypography="h1">{{ "riskInsights" | i18n }}</h1>
+  <div class="tw-text-main tw-max-w-4xl tw-mb-2">
+    {{ "reviewAtRiskPasswords" | i18n }}
+  </div>
+  <div
+    *ngIf="dataLastUpdated$ | async"
+    class="tw-bg-primary-100 tw-rounded-lg tw-w-full tw-px-8 tw-py-4 tw-my-4 tw-flex tw-items-center"
+  >
+    <i
+      class="bwi bwi-exclamation-triangle bwi-lg tw-text-[1.2rem] tw-text-muted"
+      aria-hidden="true"
+    ></i>
+    <span class="tw-mx-4">{{
+      "dataLastUpdated" | i18n: (dataLastUpdated$ | async | date: "MMMM d, y 'at' h:mm a")
+    }}</span>
+    <span class="tw-flex tw-justify-center tw-w-16">
+      <a
+        *ngIf="!(isRefreshing$ | async)"
+        bitButton
+        buttonType="unstyled"
+        class="tw-border-none !tw-font-normal tw-cursor-pointer !tw-py-0"
+        [bitAction]="refreshData.bind(this)"
+      >
+        {{ "refresh" | i18n }}
+      </a>
+      <span>
+        <i
+          *ngIf="isRefreshing$ | async"
+          class="bwi bwi-spinner bwi-spin tw-text-muted tw-text-[1.2rem]"
+          aria-hidden="true"
+        ></i>
       </span>
-    </div>
-    <bit-tab-group [(selectedIndex)]="tabIndex" (selectedIndexChange)="onTabChange($event)">
-      <bit-tab label="{{ 'allApplicationsWithCount' | i18n: appsCount }}">
-        <tools-all-applications></tools-all-applications>
-      </bit-tab>
-      <bit-tab *ngIf="isCriticalAppsFeatureEnabled">
-        <ng-template bitTabLabel>
-          <i class="bwi bwi-star"></i>
-          {{ "criticalApplicationsWithCount" | i18n: (criticalApps$ | async)?.length ?? 0 }}
-        </ng-template>
-        <tools-critical-applications></tools-critical-applications>
-      </bit-tab>
-      <bit-tab *ngIf="showDebugTabs" label="Raw Data">
-        <tools-password-health></tools-password-health>
-      </bit-tab>
-      <bit-tab *ngIf="showDebugTabs" label="Raw Data + members">
-        <tools-password-health-members></tools-password-health-members>
-      </bit-tab>
-      <bit-tab *ngIf="showDebugTabs" label="Raw Data + uri">
-        <tools-password-health-members-uri></tools-password-health-members-uri>
-      </bit-tab>
-    </bit-tab-group>
+    </span>
+  </div>
+  <bit-tab-group [(selectedIndex)]="tabIndex" (selectedIndexChange)="onTabChange($event)">
+    <bit-tab label="{{ 'allApplicationsWithCount' | i18n: appsCount }}">
+      <tools-all-applications></tools-all-applications>
+    </bit-tab>
+    <bit-tab>
+      <ng-template bitTabLabel>
+        <i class="bwi bwi-star"></i>
+        {{ "criticalApplicationsWithCount" | i18n: (criticalApps$ | async)?.length ?? 0 }}
+      </ng-template>
+      <tools-critical-applications></tools-critical-applications>
+    </bit-tab>
+  </bit-tab-group>
 
-    <bit-drawer
-      style="width: 30%"
-      [(open)]="dataService.openDrawer"
-      (openChange)="dataService.closeDrawer()"
-    >
-      <ng-container *ngIf="dataService.isActiveDrawerType(drawerTypes.OrgAtRiskMembers)">
-        <bit-drawer-header
-          title="{{ 'atRiskMembersWithCount' | i18n: dataService.atRiskMemberDetails.length }}"
-        >
-        </bit-drawer-header>
-        <bit-drawer-body>
-          <span bitTypography="body1" class="tw-text-muted tw-text-sm">{{
-            (dataService.atRiskMemberDetails.length > 0
-              ? "atRiskMembersDescription"
-              : "atRiskMembersDescriptionNone"
-            ) | i18n
-          }}</span>
-          <ng-container *ngIf="dataService.atRiskMemberDetails.length > 0">
-            <div class="tw-flex tw-justify-between tw-mt-2 tw-text-muted">
-              <div bitTypography="body2" class="tw-text-sm tw-font-bold">{{ "email" | i18n }}</div>
-              <div bitTypography="body2" class="tw-text-sm tw-font-bold">
-                {{ "atRiskPasswords" | i18n }}
-              </div>
+  <bit-drawer
+    style="width: 30%"
+    [(open)]="dataService.openDrawer"
+    (openChange)="dataService.closeDrawer()"
+  >
+    <ng-container *ngIf="dataService.isActiveDrawerType(drawerTypes.OrgAtRiskMembers)">
+      <bit-drawer-header
+        title="{{ 'atRiskMembersWithCount' | i18n: dataService.atRiskMemberDetails.length }}"
+      >
+      </bit-drawer-header>
+      <bit-drawer-body>
+        <span bitTypography="body1" class="tw-text-muted tw-text-sm">{{
+          (dataService.atRiskMemberDetails.length > 0
+            ? "atRiskMembersDescription"
+            : "atRiskMembersDescriptionNone"
+          ) | i18n
+        }}</span>
+        <ng-container *ngIf="dataService.atRiskMemberDetails.length > 0">
+          <div class="tw-flex tw-justify-between tw-mt-2 tw-text-muted">
+            <div bitTypography="body2" class="tw-text-sm tw-font-bold">{{ "email" | i18n }}</div>
+            <div bitTypography="body2" class="tw-text-sm tw-font-bold">
+              {{ "atRiskPasswords" | i18n }}
             </div>
-            <ng-container *ngFor="let member of dataService.atRiskMemberDetails">
-              <div class="tw-flex tw-justify-between tw-mt-2">
-                <div>{{ member.email }}</div>
-                <div>{{ member.atRiskPasswordCount }}</div>
-              </div>
-            </ng-container>
-          </ng-container>
-        </bit-drawer-body>
-      </ng-container>
-
-      <ng-container *ngIf="dataService.isActiveDrawerType(drawerTypes.AppAtRiskMembers)">
-        <bit-drawer-header title="{{ dataService.appAtRiskMembers.applicationName }}">
-        </bit-drawer-header>
-        <bit-drawer-body>
-          <div bitTypography="body1" class="tw-mb-2">
-            {{ "atRiskMembersWithCount" | i18n: dataService.appAtRiskMembers.members.length }}
           </div>
-          <div bitTypography="body1" class="tw-text-muted tw-text-sm tw-mb-2">
-            {{
-              (dataService.appAtRiskMembers.members.length > 0
-                ? "atRiskMembersDescriptionWithApp"
-                : "atRiskMembersDescriptionWithAppNone"
-              ) | i18n: dataService.appAtRiskMembers.applicationName
-            }}
-          </div>
-          <div class="tw-mt-1">
-            <ng-container *ngFor="let member of dataService.appAtRiskMembers.members">
+          <ng-container *ngFor="let member of dataService.atRiskMemberDetails">
+            <div class="tw-flex tw-justify-between tw-mt-2">
               <div>{{ member.email }}</div>
-            </ng-container>
-          </div>
-        </bit-drawer-body>
-      </ng-container>
-
-      <ng-container *ngIf="dataService.isActiveDrawerType(drawerTypes.OrgAtRiskApps)">
-        <bit-drawer-header
-          title="{{ 'atRiskApplicationsWithCount' | i18n: dataService.atRiskAppDetails.length }}"
-        >
-        </bit-drawer-header>
-
-        <bit-drawer-body>
-          <span bitTypography="body2" class="tw-text-muted tw-text-sm">{{
-            (dataService.atRiskAppDetails.length > 0
-              ? "atRiskApplicationsDescription"
-              : "atRiskApplicationsDescriptionNone"
-            ) | i18n
-          }}</span>
-          <ng-container *ngIf="dataService.atRiskAppDetails.length > 0">
-            <div class="tw-flex tw-justify-between tw-mt-2 tw-text-muted">
-              <div bitTypography="body2" class="tw-text-sm tw-font-bold">
-                {{ "application" | i18n }}
-              </div>
-              <div bitTypography="body2" class="tw-text-sm tw-font-bold">
-                {{ "atRiskPasswords" | i18n }}
-              </div>
+              <div>{{ member.atRiskPasswordCount }}</div>
             </div>
-            <ng-container *ngFor="let app of dataService.atRiskAppDetails">
-              <div class="tw-flex tw-justify-between tw-mt-2">
-                <div>{{ app.applicationName }}</div>
-                <div>{{ app.atRiskPasswordCount }}</div>
-              </div>
-            </ng-container>
           </ng-container>
-        </bit-drawer-body>
-      </ng-container>
-    </bit-drawer>
-  </bit-layout>
+        </ng-container>
+      </bit-drawer-body>
+    </ng-container>
+
+    <ng-container *ngIf="dataService.isActiveDrawerType(drawerTypes.AppAtRiskMembers)">
+      <bit-drawer-header title="{{ dataService.appAtRiskMembers.applicationName }}">
+      </bit-drawer-header>
+      <bit-drawer-body>
+        <div bitTypography="body1" class="tw-mb-2">
+          {{ "atRiskMembersWithCount" | i18n: dataService.appAtRiskMembers.members.length }}
+        </div>
+        <div bitTypography="body1" class="tw-text-muted tw-text-sm tw-mb-2">
+          {{
+            (dataService.appAtRiskMembers.members.length > 0
+              ? "atRiskMembersDescriptionWithApp"
+              : "atRiskMembersDescriptionWithAppNone"
+            ) | i18n: dataService.appAtRiskMembers.applicationName
+          }}
+        </div>
+        <div class="tw-mt-1">
+          <ng-container *ngFor="let member of dataService.appAtRiskMembers.members">
+            <div>{{ member.email }}</div>
+          </ng-container>
+        </div>
+      </bit-drawer-body>
+    </ng-container>
+
+    <ng-container *ngIf="dataService.isActiveDrawerType(drawerTypes.OrgAtRiskApps)">
+      <bit-drawer-header
+        title="{{ 'atRiskApplicationsWithCount' | i18n: dataService.atRiskAppDetails.length }}"
+      >
+      </bit-drawer-header>
+
+      <bit-drawer-body>
+        <span bitTypography="body2" class="tw-text-muted tw-text-sm">{{
+          (dataService.atRiskAppDetails.length > 0
+            ? "atRiskApplicationsDescription"
+            : "atRiskApplicationsDescriptionNone"
+          ) | i18n
+        }}</span>
+        <ng-container *ngIf="dataService.atRiskAppDetails.length > 0">
+          <div class="tw-flex tw-justify-between tw-mt-2 tw-text-muted">
+            <div bitTypography="body2" class="tw-text-sm tw-font-bold">
+              {{ "application" | i18n }}
+            </div>
+            <div bitTypography="body2" class="tw-text-sm tw-font-bold">
+              {{ "atRiskPasswords" | i18n }}
+            </div>
+          </div>
+          <ng-container *ngFor="let app of dataService.atRiskAppDetails">
+            <div class="tw-flex tw-justify-between tw-mt-2">
+              <div>{{ app.applicationName }}</div>
+              <div>{{ app.atRiskPasswordCount }}</div>
+            </div>
+          </ng-container>
+        </ng-container>
+      </bit-drawer-body>
+    </ng-container>
+  </bit-drawer>
 </ng-container>
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts
index e47e1851099..5f94db0ee3c 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts
@@ -15,9 +15,7 @@ import {
   DrawerType,
   PasswordHealthReportApplicationsResponse,
 } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/password-health";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { devFlagEnabled } from "@bitwarden/common/platform/misc/flags";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import {
   AsyncActionsModule,
@@ -25,16 +23,12 @@ import {
   DrawerBodyComponent,
   DrawerComponent,
   DrawerHeaderComponent,
-  LayoutComponent,
   TabsModule,
 } from "@bitwarden/components";
 import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
 
 import { AllApplicationsComponent } from "./all-applications.component";
 import { CriticalApplicationsComponent } from "./critical-applications.component";
-import { PasswordHealthMembersURIComponent } from "./password-health-members-uri.component";
-import { PasswordHealthMembersComponent } from "./password-health-members.component";
-import { PasswordHealthComponent } from "./password-health.component";
 
 // FIXME: update to use a const object instead of a typescript enum
 // eslint-disable-next-line @bitwarden/platform/no-enums
@@ -45,7 +39,6 @@ export enum RiskInsightsTabType {
 }
 
 @Component({
-  standalone: true,
   templateUrl: "./risk-insights.component.html",
   imports: [
     AllApplicationsComponent,
@@ -55,14 +48,10 @@ export enum RiskInsightsTabType {
     CriticalApplicationsComponent,
     JslibModule,
     HeaderModule,
-    PasswordHealthComponent,
-    PasswordHealthMembersComponent,
-    PasswordHealthMembersURIComponent,
     TabsModule,
     DrawerComponent,
     DrawerBodyComponent,
     DrawerHeaderComponent,
-    LayoutComponent,
   ],
 })
 export class RiskInsightsComponent implements OnInit {
@@ -70,9 +59,7 @@ export class RiskInsightsComponent implements OnInit {
 
   dataLastUpdated: Date = new Date();
 
-  isCriticalAppsFeatureEnabled: boolean = false;
   criticalApps$: Observable<PasswordHealthReportApplicationsResponse[]> = new Observable();
-  showDebugTabs: boolean = false;
 
   appsCount: number = 0;
   criticalAppsCount: number = 0;
@@ -100,12 +87,6 @@ export class RiskInsightsComponent implements OnInit {
   }
 
   async ngOnInit() {
-    this.isCriticalAppsFeatureEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.CriticalApps,
-    );
-
-    this.showDebugTabs = devFlagEnabled("showRiskInsightsDebug");
-
     this.route.paramMap
       .pipe(
         takeUntilDestroyed(this.destroyRef),
diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.html b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.html
index 31eb54d6110..0200e206327 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.html
@@ -36,7 +36,7 @@
 </ng-container>
 <bit-table-scroll *ngIf="!(isLoading$ | async)" [dataSource]="dataSource" [rowSize]="53">
   <ng-container header>
-    <th bitCell bitSortable="name" default>{{ "members" | i18n }}</th>
+    <th bitCell bitSortable="email" default>{{ "members" | i18n }}</th>
     <th bitCell bitSortable="groupsCount" class="tw-w-[278px]">{{ "groups" | i18n }}</th>
     <th bitCell bitSortable="collectionsCount" class="tw-w-[278px]">{{ "collections" | i18n }}</th>
     <th bitCell bitSortable="itemsCount" class="tw-w-[278px]">{{ "items" | i18n }}</th>
diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.ts b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.ts
index da78fd29379..b9cab679560 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/member-access-report.component.ts
@@ -41,7 +41,6 @@ import { MemberAccessReportView } from "./view/member-access-report.view";
       deps: [MemberAccessReportApiService, I18nService],
     }),
   ],
-  standalone: true,
 })
 export class MemberAccessReportComponent implements OnInit {
   protected dataSource = new TableDataSource<MemberAccessReportView>();
diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/response/member-access-report.response.ts b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/response/member-access-report.response.ts
index 959b70b9729..c500c6c0aec 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/response/member-access-report.response.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/response/member-access-report.response.ts
@@ -2,7 +2,15 @@ import { BaseResponse } from "@bitwarden/common/models/response/base.response";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { Guid } from "@bitwarden/common/types/guid";
 
-export class MemberAccessDetails extends BaseResponse {
+export class MemberAccessResponse extends BaseResponse {
+  userName: string;
+  email: string;
+  twoFactorEnabled: boolean;
+  accountRecoveryEnabled: boolean;
+  userGuid: Guid;
+  usesKeyConnector: boolean;
+
+  cipherIds: Guid[] = [];
   collectionId: string;
   groupId: string;
   groupName: string;
@@ -14,6 +22,14 @@ export class MemberAccessDetails extends BaseResponse {
 
   constructor(response: any) {
     super(response);
+    this.userName = this.getResponseProperty("UserName");
+    this.email = this.getResponseProperty("Email");
+    this.twoFactorEnabled = this.getResponseProperty("TwoFactorEnabled");
+    this.accountRecoveryEnabled = this.getResponseProperty("AccountRecoveryEnabled");
+    this.userGuid = this.getResponseProperty("UserGuid");
+    this.usesKeyConnector = this.getResponseProperty("UsesKeyConnector");
+
+    this.cipherIds = this.getResponseProperty("CipherIds") || [];
     this.groupId = this.getResponseProperty("GroupId");
     this.collectionId = this.getResponseProperty("CollectionId");
     this.groupName = this.getResponseProperty("GroupName");
@@ -24,34 +40,3 @@ export class MemberAccessDetails extends BaseResponse {
     this.manage = this.getResponseProperty("Manage");
   }
 }
-
-export class MemberAccessResponse extends BaseResponse {
-  userName: string;
-  email: string;
-  twoFactorEnabled: boolean;
-  accountRecoveryEnabled: boolean;
-  collectionsCount: number;
-  groupsCount: number;
-  totalItemCount: number;
-  accessDetails: MemberAccessDetails[] = [];
-  userGuid: Guid;
-  usesKeyConnector: boolean;
-
-  constructor(response: any) {
-    super(response);
-    this.userName = this.getResponseProperty("UserName");
-    this.email = this.getResponseProperty("Email");
-    this.twoFactorEnabled = this.getResponseProperty("TwoFactorEnabled");
-    this.accountRecoveryEnabled = this.getResponseProperty("AccountRecoveryEnabled");
-    this.collectionsCount = this.getResponseProperty("CollectionsCount");
-    this.groupsCount = this.getResponseProperty("GroupsCount");
-    this.totalItemCount = this.getResponseProperty("TotalItemCount");
-    this.userGuid = this.getResponseProperty("UserGuid");
-    this.usesKeyConnector = this.getResponseProperty("UsesKeyConnector");
-
-    const details = this.getResponseProperty("AccessDetails");
-    if (details != null) {
-      this.accessDetails = details.map((o: any) => new MemberAccessDetails(o));
-    }
-  }
-}
diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.mock.ts b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.mock.ts
index b07e4946ca7..ebf2b9abfc8 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.mock.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.mock.ts
@@ -1,9 +1,7 @@
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { Guid } from "@bitwarden/common/types/guid";
 
-import {
-  MemberAccessDetails,
-  MemberAccessResponse,
-} from "../response/member-access-report.response";
+import { MemberAccessResponse } from "../response/member-access-report.response";
 
 export const memberAccessReportsMock: MemberAccessResponse[] = [
   {
@@ -11,223 +9,290 @@ export const memberAccessReportsMock: MemberAccessResponse[] = [
     email: "sjohnson@email.com",
     twoFactorEnabled: true,
     accountRecoveryEnabled: true,
-    groupsCount: 2,
-    collectionsCount: 4,
-    totalItemCount: 20,
-    userGuid: "1234",
+    userGuid: "1001" as Guid,
     usesKeyConnector: false,
-    accessDetails: [
-      {
-        groupId: "",
-        collectionId: "c1",
-        collectionName: new EncString("Collection 1"),
-        groupName: "",
-        itemCount: 10,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "",
-        collectionId: "c2",
-        collectionName: new EncString("Collection 2"),
-        groupName: "",
-        itemCount: 20,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "",
-        collectionId: "c3",
-        collectionName: new EncString("Collection 3"),
-        groupName: "",
-        itemCount: 30,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "g1",
-        collectionId: "c1",
-        collectionName: new EncString("Collection 1"),
-        groupName: "Group 1",
-        itemCount: 30,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "g1",
-        collectionId: "c2",
-        collectionName: new EncString("Collection 2"),
-        groupName: "Group 1",
-        itemCount: 20,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-    ],
-  } as MemberAccessResponse,
+    groupId: "",
+    collectionId: "c1",
+    collectionName: new EncString("Collection 1"),
+    groupName: "",
+    itemCount: 10,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "Sarah Johnson",
+    email: "sjohnson@email.com",
+    twoFactorEnabled: true,
+    accountRecoveryEnabled: true,
+    userGuid: "1001" as Guid,
+    usesKeyConnector: false,
+    groupId: "",
+    collectionId: "c2",
+    collectionName: new EncString("Collection 2"),
+    groupName: "",
+    itemCount: 20,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "Sarah Johnson",
+    email: "sjohnson@email.com",
+    twoFactorEnabled: true,
+    accountRecoveryEnabled: true,
+    userGuid: "1001" as Guid,
+    usesKeyConnector: false,
+    groupId: "",
+    collectionId: "c3",
+    collectionName: new EncString("Collection 3"),
+    groupName: "",
+    itemCount: 30,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "Sarah Johnson",
+    email: "sjohnson@email.com",
+    twoFactorEnabled: true,
+    accountRecoveryEnabled: true,
+    userGuid: "1001",
+    usesKeyConnector: false,
+    groupId: "g1",
+    collectionId: "c1",
+    collectionName: new EncString("Collection 1"),
+    groupName: "Group 1",
+    itemCount: 30,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "Sarah Johnson",
+    email: "sjohnson@email.com",
+    twoFactorEnabled: true,
+    accountRecoveryEnabled: true,
+    userGuid: "1001",
+    usesKeyConnector: false,
+    groupId: "g1",
+    collectionId: "c2",
+    collectionName: new EncString("Collection 2"),
+    groupName: "Group 1",
+    itemCount: 20,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
   {
     userName: "James Lull",
     email: "jlull@email.com",
     twoFactorEnabled: false,
     accountRecoveryEnabled: false,
-    groupsCount: 2,
-    collectionsCount: 4,
-    totalItemCount: 20,
-    userGuid: "1234",
+    userGuid: "2001",
     usesKeyConnector: false,
-    accessDetails: [
-      {
-        groupId: "g4",
-        collectionId: "c4",
-        groupName: "Group 4",
-        collectionName: new EncString("Collection 4"),
-        itemCount: 5,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "g4",
-        collectionId: "c5",
-        groupName: "Group 4",
-        collectionName: new EncString("Collection 5"),
-        itemCount: 15,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "",
-        collectionId: "c4",
-        groupName: "",
-        collectionName: new EncString("Collection 4"),
-        itemCount: 5,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "",
-        collectionId: "c5",
-        groupName: "",
-        collectionName: new EncString("Collection 5"),
-        itemCount: 15,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-    ],
-  } as MemberAccessResponse,
+    groupId: "g4",
+    collectionId: "c4",
+    groupName: "Group 4",
+    collectionName: new EncString("Collection 4"),
+    itemCount: 5,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "James Lull",
+    email: "jlull@email.com",
+    twoFactorEnabled: false,
+    accountRecoveryEnabled: false,
+    userGuid: "2001",
+    usesKeyConnector: false,
+    groupId: "g4",
+    collectionId: "c5",
+    groupName: "Group 4",
+    collectionName: new EncString("Collection 5"),
+    itemCount: 15,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "James Lull",
+    email: "jlull@email.com",
+    twoFactorEnabled: false,
+    accountRecoveryEnabled: false,
+    userGuid: "2001",
+    usesKeyConnector: false,
+    groupId: "",
+    collectionId: "c4",
+    groupName: "",
+    collectionName: new EncString("Collection 4"),
+    itemCount: 5,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "James Lull",
+    email: "jlull@email.com",
+    twoFactorEnabled: false,
+    accountRecoveryEnabled: false,
+    userGuid: "2001",
+    usesKeyConnector: false,
+    groupId: "",
+    collectionId: "c5",
+    groupName: "",
+    collectionName: new EncString("Collection 5"),
+    itemCount: 15,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
   {
     userName: "Beth Williams",
     email: "bwilliams@email.com",
     twoFactorEnabled: true,
     accountRecoveryEnabled: true,
-    groupsCount: 2,
-    collectionsCount: 4,
-    totalItemCount: 20,
-    userGuid: "1234",
+    userGuid: "3001",
     usesKeyConnector: false,
-    accessDetails: [
-      {
-        groupId: "",
-        collectionId: "c6",
-        groupName: "",
-        collectionName: new EncString("Collection 6"),
-        itemCount: 25,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "g6",
-        collectionId: "c4",
-        groupName: "Group 6",
-        collectionName: new EncString("Collection 4"),
-        itemCount: 35,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-    ],
-  } as MemberAccessResponse,
+    groupId: "",
+    collectionId: "c6",
+    groupName: "",
+    collectionName: new EncString("Collection 6"),
+    itemCount: 25,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "Beth Williams",
+    email: "bwilliams@email.com",
+    twoFactorEnabled: true,
+    accountRecoveryEnabled: true,
+    userGuid: "3001",
+    usesKeyConnector: false,
+    groupId: "g6",
+    collectionId: "c4",
+    groupName: "Group 6",
+    collectionName: new EncString("Collection 4"),
+    itemCount: 35,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
   {
     userName: "Ray Williams",
     email: "rwilliams@email.com",
     twoFactorEnabled: false,
     accountRecoveryEnabled: false,
-    groupsCount: 2,
-    collectionsCount: 4,
-    totalItemCount: 20,
-    userGuid: "1234",
+    userGuid: "4000",
     usesKeyConnector: false,
-    accessDetails: [
-      {
-        groupId: "",
-        collectionId: "c7",
-        groupName: "",
-        collectionName: new EncString("Collection 7"),
-        itemCount: 8,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "",
-        collectionId: "c8",
-        groupName: "",
-        collectionName: new EncString("Collection 8"),
-        itemCount: 12,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "",
-        collectionId: "c9",
-        groupName: "",
-        collectionName: new EncString("Collection 9"),
-        itemCount: 16,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "g9",
-        collectionId: "c7",
-        groupName: "Group 9",
-        collectionName: new EncString("Collection 7"),
-        itemCount: 8,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "g10",
-        collectionId: "c8",
-        groupName: "Group 10",
-        collectionName: new EncString("Collection 8"),
-        itemCount: 12,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-      {
-        groupId: "g11",
-        collectionId: "c9",
-        groupName: "Group 11",
-        collectionName: new EncString("Collection 9"),
-        itemCount: 16,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-    ],
-  } as MemberAccessResponse,
+    groupId: "",
+    collectionId: "c7",
+    groupName: "",
+    collectionName: new EncString("Collection 7"),
+    itemCount: 8,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "Ray Williams",
+    email: "rwilliams@email.com",
+    twoFactorEnabled: false,
+    accountRecoveryEnabled: false,
+    userGuid: "4000",
+    usesKeyConnector: false,
+    groupId: "",
+    collectionId: "c8",
+    groupName: "",
+    collectionName: new EncString("Collection 8"),
+    itemCount: 12,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "Ray Williams",
+    email: "rwilliams@email.com",
+    twoFactorEnabled: false,
+    accountRecoveryEnabled: false,
+    userGuid: "4000",
+    usesKeyConnector: false,
+    groupId: "",
+    collectionId: "c9",
+    groupName: "",
+    collectionName: new EncString("Collection 9"),
+    itemCount: 16,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "Ray Williams",
+    email: "rwilliams@email.com",
+    twoFactorEnabled: false,
+    accountRecoveryEnabled: false,
+    userGuid: "4000",
+    usesKeyConnector: false,
+    groupId: "g9",
+    collectionId: "c7",
+    groupName: "Group 9",
+    collectionName: new EncString("Collection 7"),
+    itemCount: 8,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "Ray Williams",
+    email: "rwilliams@email.com",
+    twoFactorEnabled: false,
+    accountRecoveryEnabled: false,
+    userGuid: "4000",
+    usesKeyConnector: false,
+    groupId: "g10",
+    collectionId: "c8",
+    groupName: "Group 10",
+    collectionName: new EncString("Collection 8"),
+    itemCount: 12,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
+  {
+    userName: "Ray Williams",
+    email: "rwilliams@email.com",
+    twoFactorEnabled: false,
+    accountRecoveryEnabled: false,
+    userGuid: "4000",
+    usesKeyConnector: false,
+    groupId: "g11",
+    collectionId: "c9",
+    groupName: "Group 11",
+    collectionName: new EncString("Collection 9"),
+    itemCount: 16,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
 ];
 
 export const memberAccessWithoutAccessDetailsReportsMock: MemberAccessResponse[] = [
@@ -236,34 +301,33 @@ export const memberAccessWithoutAccessDetailsReportsMock: MemberAccessResponse[]
     email: "asmith@email.com",
     twoFactorEnabled: true,
     accountRecoveryEnabled: true,
-    groupsCount: 2,
-    collectionsCount: 4,
-    totalItemCount: 20,
-    userGuid: "1234",
+    userGuid: "1234" as Guid,
     usesKeyConnector: false,
-    accessDetails: [
-      {
-        groupId: "",
-        collectionId: "c1",
-        collectionName: new EncString("Collection 1"),
-        groupName: "Alice Group 1",
-        itemCount: 10,
-        readOnly: false,
-        hidePasswords: false,
-        manage: false,
-      } as MemberAccessDetails,
-    ],
-  } as MemberAccessResponse,
+    groupId: "",
+    collectionId: "c1",
+    collectionName: new EncString("Collection 1"),
+    groupName: "Alice Group 1",
+    itemCount: 10,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
   {
     userName: "Robert Brown",
     email: "rbrown@email.com",
     twoFactorEnabled: false,
     accountRecoveryEnabled: false,
-    groupsCount: 2,
-    collectionsCount: 4,
-    totalItemCount: 20,
-    userGuid: "5678",
+    userGuid: "5678" as Guid,
     usesKeyConnector: false,
-    accessDetails: [] as MemberAccessDetails[],
-  } as MemberAccessResponse,
+    groupId: "",
+    collectionId: "c1",
+    collectionName: new EncString("Collection 1"),
+    groupName: "",
+    itemCount: 10,
+    readOnly: false,
+    hidePasswords: false,
+    manage: false,
+    cipherIds: [],
+  } as unknown as MemberAccessResponse,
 ];
diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.spec.ts b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.spec.ts
index e6efac83616..ad388cfed04 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.spec.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.spec.ts
@@ -35,36 +35,36 @@ describe("ImportService", () => {
         {
           name: "Sarah Johnson",
           email: "sjohnson@email.com",
-          collectionsCount: 4,
-          groupsCount: 2,
-          itemsCount: 20,
+          collectionsCount: 3,
+          groupsCount: 1,
+          itemsCount: 0,
           userGuid: expect.any(String),
           usesKeyConnector: expect.any(Boolean),
         },
         {
           name: "James Lull",
           email: "jlull@email.com",
-          collectionsCount: 4,
-          groupsCount: 2,
-          itemsCount: 20,
+          collectionsCount: 2,
+          groupsCount: 1,
+          itemsCount: 0,
           userGuid: expect.any(String),
           usesKeyConnector: expect.any(Boolean),
         },
         {
           name: "Beth Williams",
           email: "bwilliams@email.com",
-          collectionsCount: 4,
-          groupsCount: 2,
-          itemsCount: 20,
+          collectionsCount: 2,
+          groupsCount: 1,
+          itemsCount: 0,
           userGuid: expect.any(String),
           usesKeyConnector: expect.any(Boolean),
         },
         {
           name: "Ray Williams",
           email: "rwilliams@email.com",
-          collectionsCount: 4,
-          groupsCount: 2,
-          itemsCount: 20,
+          collectionsCount: 3,
+          groupsCount: 3,
+          itemsCount: 0,
           userGuid: expect.any(String),
           usesKeyConnector: expect.any(Boolean),
         },
@@ -82,8 +82,8 @@ describe("ImportService", () => {
           (item) =>
             (item.name === "Sarah Johnson" &&
               item.group === "Group 1" &&
-              item.totalItems === "20") ||
-            (item.name === "James Lull" && item.group === "Group 4" && item.totalItems === "5"),
+              item.totalItems === "0") ||
+            (item.name === "James Lull" && item.group === "Group 4" && item.totalItems === "0"),
         )
         .map((item) => ({
           name: item.name,
@@ -102,7 +102,7 @@ describe("ImportService", () => {
             twoStepLogin: "memberAccessReportTwoFactorEnabledTrue",
             accountRecovery: "memberAccessReportAuthenticationEnabledTrue",
             group: "Group 1",
-            totalItems: "20",
+            totalItems: "0",
           }),
           expect.objectContaining({
             email: "jlull@email.com",
@@ -110,7 +110,7 @@ describe("ImportService", () => {
             twoStepLogin: "memberAccessReportTwoFactorEnabledFalse",
             accountRecovery: "memberAccessReportAuthenticationEnabledFalse",
             group: "Group 4",
-            totalItems: "5",
+            totalItems: "0",
           }),
         ]),
       );
@@ -131,7 +131,7 @@ describe("ImportService", () => {
             twoStepLogin: "memberAccessReportTwoFactorEnabledTrue",
             accountRecovery: "memberAccessReportAuthenticationEnabledTrue",
             group: "Alice Group 1",
-            totalItems: "10",
+            totalItems: "0",
           }),
           expect.objectContaining({
             email: "rbrown@email.com",
diff --git a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.ts b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.ts
index 029dce8a404..0039788709e 100644
--- a/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/reports/member-access-report/services/member-access-report.service.ts
@@ -5,13 +5,13 @@ import { Injectable } from "@angular/core";
 import { CollectionAccessSelectionView } from "@bitwarden/admin-console/common";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
-import { OrganizationId } from "@bitwarden/common/types/guid";
+import { Guid, OrganizationId } from "@bitwarden/common/types/guid";
 import {
   getPermissionList,
   convertToPermission,
 } from "@bitwarden/web-vault/app/admin-console/organizations/shared/components/access-selector";
 
-import { MemberAccessDetails } from "../response/member-access-report.response";
+import { MemberAccessResponse } from "../response/member-access-report.response";
 import { MemberAccessExportItem } from "../view/member-access-export.view";
 import { MemberAccessReportView } from "../view/member-access-report.view";
 
@@ -34,15 +34,44 @@ export class MemberAccessReportService {
     organizationId: OrganizationId,
   ): Promise<MemberAccessReportView[]> {
     const memberAccessData = await this.reportApiService.getMemberAccessData(organizationId);
-    const memberAccessReportViewCollection = memberAccessData.map((userData) => ({
-      name: userData.userName,
-      email: userData.email,
-      collectionsCount: userData.collectionsCount,
-      groupsCount: userData.groupsCount,
-      itemsCount: userData.totalItemCount,
-      userGuid: userData.userGuid,
-      usesKeyConnector: userData.usesKeyConnector,
-    }));
+
+    // group member access data by userGuid
+    const userMap = new Map<Guid, MemberAccessResponse[]>();
+    memberAccessData.forEach((userData) => {
+      const userGuid = userData.userGuid;
+      if (!userMap.has(userGuid)) {
+        userMap.set(userGuid, []);
+      }
+      userMap.get(userGuid)?.push(userData);
+    });
+
+    // aggregate user data
+    const memberAccessReportViewCollection: MemberAccessReportView[] = [];
+    userMap.forEach((userDataArray, userGuid) => {
+      const collectionCount = this.getDistinctCount<string>(
+        userDataArray.map((data) => data.collectionId).filter((id) => !!id),
+      );
+      const groupCount = this.getDistinctCount<string>(
+        userDataArray.map((data) => data.groupId).filter((id) => !!id),
+      );
+      const itemsCount = this.getDistinctCount<Guid>(
+        userDataArray
+          .flatMap((data) => data.cipherIds)
+          .filter((id) => id !== "00000000-0000-0000-0000-000000000000"),
+      );
+      const aggregatedData = {
+        userGuid: userGuid,
+        name: userDataArray[0].userName,
+        email: userDataArray[0].email,
+        collectionsCount: collectionCount,
+        groupsCount: groupCount,
+        itemsCount: itemsCount,
+        usesKeyConnector: userDataArray.some((data) => data.usesKeyConnector),
+      };
+
+      memberAccessReportViewCollection.push(aggregatedData);
+    });
+
     return memberAccessReportViewCollection;
   }
 
@@ -50,13 +79,8 @@ export class MemberAccessReportService {
     organizationId: OrganizationId,
   ): Promise<MemberAccessExportItem[]> {
     const memberAccessReports = await this.reportApiService.getMemberAccessData(organizationId);
-    const collectionNames = memberAccessReports.flatMap((item) =>
-      item.accessDetails.map((dtl) => {
-        if (dtl.collectionName) {
-          return dtl.collectionName.encryptedString;
-        }
-      }),
-    );
+    const collectionNames = memberAccessReports.map((item) => item.collectionName.encryptedString);
+
     const collectionNameMap = new Map(collectionNames.map((col) => [col, ""]));
     for await (const key of collectionNameMap.keys()) {
       const decrypted = new EncString(key);
@@ -64,56 +88,35 @@ export class MemberAccessReportService {
       collectionNameMap.set(key, decrypted.decryptedValue);
     }
 
-    const exportItems = memberAccessReports.flatMap((report) => {
-      // to include users without access details
-      // which means a user has no groups, collections or items
-      if (report.accessDetails.length === 0) {
-        return [
-          {
-            email: report.email,
-            name: report.userName,
-            twoStepLogin: report.twoFactorEnabled
-              ? this.i18nService.t("memberAccessReportTwoFactorEnabledTrue")
-              : this.i18nService.t("memberAccessReportTwoFactorEnabledFalse"),
-            accountRecovery: report.accountRecoveryEnabled
-              ? this.i18nService.t("memberAccessReportAuthenticationEnabledTrue")
-              : this.i18nService.t("memberAccessReportAuthenticationEnabledFalse"),
-            group: this.i18nService.t("memberAccessReportNoGroup"),
-            collection: this.i18nService.t("memberAccessReportNoCollection"),
-            collectionPermission: this.i18nService.t("memberAccessReportNoCollectionPermission"),
-            totalItems: "0",
-          },
-        ];
-      }
-      const userDetails = report.accessDetails.map((detail) => {
-        const collectionName = collectionNameMap.get(detail.collectionName.encryptedString);
-        return {
-          email: report.email,
-          name: report.userName,
-          twoStepLogin: report.twoFactorEnabled
-            ? this.i18nService.t("memberAccessReportTwoFactorEnabledTrue")
-            : this.i18nService.t("memberAccessReportTwoFactorEnabledFalse"),
-          accountRecovery: report.accountRecoveryEnabled
-            ? this.i18nService.t("memberAccessReportAuthenticationEnabledTrue")
-            : this.i18nService.t("memberAccessReportAuthenticationEnabledFalse"),
-          group: detail.groupName
-            ? detail.groupName
-            : this.i18nService.t("memberAccessReportNoGroup"),
-          collection: collectionName
-            ? collectionName
-            : this.i18nService.t("memberAccessReportNoCollection"),
-          collectionPermission: detail.collectionId
-            ? this.getPermissionText(detail)
-            : this.i18nService.t("memberAccessReportNoCollectionPermission"),
-          totalItems: detail.itemCount.toString(),
-        };
-      });
-      return userDetails;
+    const exportItems = memberAccessReports.map((report) => {
+      const collectionName = collectionNameMap.get(report.collectionName.encryptedString);
+      return {
+        email: report.email,
+        name: report.userName,
+        twoStepLogin: report.twoFactorEnabled
+          ? this.i18nService.t("memberAccessReportTwoFactorEnabledTrue")
+          : this.i18nService.t("memberAccessReportTwoFactorEnabledFalse"),
+        accountRecovery: report.accountRecoveryEnabled
+          ? this.i18nService.t("memberAccessReportAuthenticationEnabledTrue")
+          : this.i18nService.t("memberAccessReportAuthenticationEnabledFalse"),
+        group: report.groupName
+          ? report.groupName
+          : this.i18nService.t("memberAccessReportNoGroup"),
+        collection: collectionName
+          ? collectionName
+          : this.i18nService.t("memberAccessReportNoCollection"),
+        collectionPermission: report.collectionId
+          ? this.getPermissionText(report)
+          : this.i18nService.t("memberAccessReportNoCollectionPermission"),
+        totalItems: report.cipherIds
+          .filter((_) => _ != "00000000-0000-0000-0000-000000000000")
+          .length.toString(),
+      };
     });
     return exportItems.flat();
   }
 
-  private getPermissionText(accessDetails: MemberAccessDetails): string {
+  private getPermissionText(accessDetails: MemberAccessResponse): string {
     const permissionList = getPermissionList();
     const collectionSelectionView = new CollectionAccessSelectionView({
       id: accessDetails.groupId ?? accessDetails.collectionId,
@@ -125,4 +128,9 @@ export class MemberAccessReportService {
       permissionList.find((p) => p.perm === convertToPermission(collectionSelectionView))?.labelId,
     );
   }
+
+  private getDistinctCount<T>(items: T[]): number {
+    const uniqueItems = new Set(items);
+    return uniqueItems.size;
+  }
 }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts
index 1eef528b639..24da000f213 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts
@@ -22,7 +22,7 @@ import {
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { SecretsManagerLogo } from "@bitwarden/web-vault/app/layouts/secrets-manager-logo";
+import { SecretsManagerLogo } from "@bitwarden/components";
 
 import { OrganizationCounts } from "../models/view/counts.view";
 import { ProjectService } from "../projects/project.service";
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
index a96f9a08919..ca17ea3bc94 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
@@ -20,7 +20,6 @@ import {
   from,
 } from "rxjs";
 
-import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import {
   getOrganizationById,
@@ -30,6 +29,8 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -100,7 +101,6 @@ export class OverviewComponent implements OnInit, OnDestroy {
   protected loading = true;
   protected organizationEnabled = false;
   protected organization: Organization;
-  protected i18n: I18nPipe;
   protected onboardingTasks$: Observable<SMOnboardingTasks>;
 
   protected view$: Observable<{
@@ -131,6 +131,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
     private trialFlowService: TrialFlowService,
     private organizationBillingService: OrganizationBillingServiceAbstraction,
     private billingNotificationService: BillingNotificationService,
+    private configService: ConfigService,
   ) {}
 
   ngOnInit() {
@@ -252,12 +253,13 @@ export class OverviewComponent implements OnInit, OnDestroy {
   }
 
   async navigateToPaymentMethod() {
-    await this.router.navigate(
-      ["organizations", `${this.organizationId}`, "billing", "payment-method"],
-      {
-        state: { launchPaymentModalAutomatically: true },
-      },
+    const managePaymentDetailsOutsideCheckout = await this.configService.getFeatureFlag(
+      FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout,
     );
+    const route = managePaymentDetailsOutsideCheckout ? "payment-details" : "payment-method";
+    await this.router.navigate(["organizations", `${this.organizationId}`, "billing", route], {
+      state: { launchPaymentModalAutomatically: true },
+    });
   }
 
   ngOnDestroy(): void {
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-people.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-people.component.html
index 3f107486e27..cbac54fd7c6 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-people.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-people.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit" *ngIf="!loading; else spinner">
-  <div class="tw-w-2/5">
+  <div class="tw-w-full tw-max-w-[1200px]">
     <p class="tw-mt-8" *ngIf="!loading">
       {{ "projectPeopleDescription" | i18n }}
     </p>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-service-accounts.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-service-accounts.component.html
index 5d22358277f..a3914ac9cf2 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-service-accounts.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-service-accounts.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit" *ngIf="!loading; else spinner">
-  <div class="tw-w-2/5">
+  <div class="tw-w-full tw-max-w-[1200px]">
     <p class="tw-mt-8" *ngIf="!loading">
       {{ "projectMachineAccountsDescription" | i18n }}
     </p>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html
index 0c5a49cd35b..fbb0dd8888a 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html
@@ -13,7 +13,7 @@
     (click)="newAccessTokenEvent.emit()"
   >
     <i class="bwi bwi-plus" aria-hidden="true"></i>
-    {{ "newAccessToken" | i18n }}
+    {{ "createAccessToken" | i18n }}
   </button>
 </bit-no-items>
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.html
index d843887a392..65de06617a9 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <bit-dialog dialogSize="default">
     <ng-container bitDialogTitle>
-      <span>{{ "newAccessToken" | i18n }}</span>
+      <span>{{ "createAccessToken" | i18n }}</span>
       <span class="tw-text-sm tw-normal-case tw-text-muted">
         {{ data.serviceAccountView.name }}
       </span>
@@ -21,7 +21,7 @@
 
     <ng-container bitDialogFooter>
       <button class="tw-normal-case" type="submit" bitButton buttonType="primary" bitFormButton>
-        {{ "newAccessToken" | i18n }}
+        {{ "createAccessToken" | i18n }}
       </button>
       <button type="button" bitButton buttonType="secondary" bitFormButton bitDialogClose>
         {{ "cancel" | i18n }}
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.html
index 3d653710a46..ffdb53b3b1b 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.html
@@ -1,4 +1,4 @@
-<bit-dialog dialogSize="default" [title]="'newAccessToken' | i18n" [subtitle]="data.subTitle">
+<bit-dialog dialogSize="default" [title]="'createAccessToken' | i18n" [subtitle]="data.subTitle">
   <div bitDialogContent>
     <bit-callout type="info" [title]="'accessTokenCallOutTitle' | i18n">
       {{ "downloadAccessToken" | i18n }}<br />
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/config/config.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/config/config.component.ts
index e796c4758ea..f85cde90306 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/config/config.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/config/config.component.ts
@@ -1,10 +1,13 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Component, OnDestroy, OnInit } from "@angular/core";
-import { ActivatedRoute, Params } from "@angular/router";
-import { Subject, concatMap, takeUntil } from "rxjs";
+import { ActivatedRoute } from "@angular/router";
+import { Subject, combineLatest, from, switchMap, takeUntil } from "rxjs";
 
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import {
+  Environment,
+  EnvironmentService,
+} from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ToastService } from "@bitwarden/components";
@@ -48,11 +51,11 @@ export class ServiceAccountConfigComponent implements OnInit, OnDestroy {
   ) {}
 
   async ngOnInit() {
-    this.route.params
+    combineLatest([this.route.params, this.environmentService.environment$])
       .pipe(
-        concatMap(async (params: Params) => {
-          return await this.load(params.organizationId, params.serviceAccountId);
-        }),
+        switchMap(([params, env]) =>
+          from(this.load(env, params.organizationId, params.serviceAccountId)),
+        ),
         takeUntil(this.destroy$),
       )
       .subscribe((smConfig) => {
@@ -67,9 +70,11 @@ export class ServiceAccountConfigComponent implements OnInit, OnDestroy {
       });
   }
 
-  async load(organizationId: string, serviceAccountId: string): Promise<ServiceAccountConfig> {
-    const environment = await this.environmentService.getEnvironment();
-
+  private async load(
+    environment: Environment,
+    organizationId: string,
+    serviceAccountId: string,
+  ): Promise<ServiceAccountConfig> {
     const allProjects = await this.projectService.getProjects(organizationId);
     const policies = await this.accessPolicyService.getServiceAccountGrantedPolicies(
       organizationId,
@@ -88,11 +93,11 @@ export class ServiceAccountConfigComponent implements OnInit, OnDestroy {
     });
 
     return {
-      organizationId: organizationId,
-      serviceAccountId: serviceAccountId,
+      organizationId,
+      serviceAccountId,
       identityUrl: environment.getIdentityUrl(),
       apiUrl: environment.getApiUrl(),
-      projects: projects,
+      projects,
     } as ServiceAccountConfig;
   }
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
index 815ea1dc60c..250e0870ecf 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
@@ -2,9 +2,9 @@
 // @ts-strict-ignore
 import { Component, Inject, OnInit } from "@angular/core";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { Router } from "@angular/router";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogRef, DIALOG_DATA, BitValidators, ToastService } from "@bitwarden/components";
 
 import { ServiceAccountView } from "../../models/view/service-account.view";
@@ -46,8 +46,8 @@ export class ServiceAccountDialogComponent implements OnInit {
     @Inject(DIALOG_DATA) private data: ServiceAccountOperation,
     private serviceAccountService: ServiceAccountService,
     private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
     private toastService: ToastService,
+    private router: Router,
   ) {}
 
   async ngOnInit() {
@@ -87,8 +87,17 @@ export class ServiceAccountDialogComponent implements OnInit {
     let serviceAccountMessage: string;
 
     if (this.data.operation == OperationType.Add) {
-      await this.serviceAccountService.create(this.data.organizationId, serviceAccountView);
+      const newServiceAccount = await this.serviceAccountService.create(
+        this.data.organizationId,
+        serviceAccountView,
+      );
       serviceAccountMessage = this.i18nService.t("machineAccountCreated");
+      await this.router.navigate([
+        "sm",
+        this.data.organizationId,
+        "machine-accounts",
+        newServiceAccount.id,
+      ]);
     } else {
       await this.serviceAccountService.update(
         this.data.serviceAccountId,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html
index 458320a8a2a..a895ab058ec 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html
@@ -1,5 +1,4 @@
 <div class="tw-mb-4">
-  <h1>{{ "eventLogs" | i18n }}</h1>
   <div class="tw-mt-4 tw-flex tw-items-center" [formGroup]="eventsForm">
     <bit-form-field>
       <bit-label>{{ "from" | i18n }}</bit-label>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.html
index 96f7ae4d2bf..49cafeccc3b 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit" *ngIf="!loading; else spinner">
-  <div class="tw-w-2/5">
+  <div class="tw-w-full tw-max-w-[1200px]">
     <p class="tw-mt-8" *ngIf="!loading">
       {{ "machineAccountPeopleDescription" | i18n }}
     </p>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.html
index 623542bd33d..ab7d90ef078 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit" *ngIf="!loading; else spinner">
-  <div class="tw-w-2/5">
+  <div class="tw-w-full tw-max-w-[1200px]">
     <p class="tw-mt-8" *ngIf="!loading">
       {{ "machineAccountProjectsDescription" | i18n }}
     </p>
@@ -9,7 +9,7 @@
       [addButtonMode]="true"
       [items]="potentialGrantees"
       [label]="'projects' | i18n"
-      [hint]="'newSaSelectAccess' | i18n"
+      [hint]="'typeOrSelectProjects' | i18n"
       [columnTitle]="'projects' | i18n"
       [emptyMessage]="'serviceAccountEmptyProjectAccesspolicies' | i18n"
     >
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html
index 392bfcb806b..416a3d7b44d 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html
@@ -39,7 +39,7 @@
     (click)="openNewAccessTokenDialog()"
   >
     <i class="bwi bwi-plus" aria-hidden="true"></i>
-    {{ "newAccessToken" | i18n }}
+    {{ "createAccessToken" | i18n }}
   </button>
 </app-header>
 <router-outlet></router-outlet>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts
index c5d4f979ef4..19382793673 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts
@@ -91,7 +91,10 @@ export class ServiceAccountService {
     );
   }
 
-  async create(organizationId: string, serviceAccountView: ServiceAccountView) {
+  async create(
+    organizationId: string,
+    serviceAccountView: ServiceAccountView,
+  ): Promise<ServiceAccountView> {
     const orgKey = await this.getOrganizationKey(organizationId);
     const request = await this.getServiceAccountRequest(orgKey, serviceAccountView);
     const r = await this.apiService.send(
@@ -101,9 +104,14 @@ export class ServiceAccountService {
       true,
       true,
     );
-    this._serviceAccount.next(
-      await this.createServiceAccountView(orgKey, new ServiceAccountResponse(r)),
+
+    const serviceAccount = await this.createServiceAccountView(
+      orgKey,
+      new ServiceAccountResponse(r),
     );
+    this._serviceAccount.next(serviceAccount);
+
+    return serviceAccount;
   }
 
   async delete(serviceAccounts: ServiceAccountView[]): Promise<BulkOperationStatus[]> {
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
index a7ee818a01f..18ac0a80454 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
@@ -180,22 +180,4 @@ export class SecretsListComponent implements OnDestroy {
       i18nService.t("valueCopied", i18nService.t("uuid")),
     );
   }
-
-  /**
-   * TODO: Remove in favor of updating `PlatformUtilsService.copyToClipboard`
-   */
-  private static copyToClipboardAsync(
-    text: Promise<string>,
-    platformUtilsService: PlatformUtilsService,
-  ) {
-    if (platformUtilsService.isSafari()) {
-      return navigator.clipboard.write([
-        new ClipboardItem({
-          ["text/plain"]: text,
-        }),
-      ]);
-    }
-
-    return text.then((t) => platformUtilsService.copyToClipboard(t));
-  }
 }
diff --git a/bitwarden_license/bit-web/src/app/vault/services/abstractions/admin-task.abstraction.ts b/bitwarden_license/bit-web/src/app/vault/services/abstractions/admin-task.abstraction.ts
index 6f5963c3321..f6b0239272f 100644
--- a/bitwarden_license/bit-web/src/app/vault/services/abstractions/admin-task.abstraction.ts
+++ b/bitwarden_license/bit-web/src/app/vault/services/abstractions/admin-task.abstraction.ts
@@ -8,7 +8,7 @@ import { SecurityTask, SecurityTaskStatus, SecurityTaskType } from "@bitwarden/c
  */
 export type CreateTasksRequest = Readonly<{
   cipherId?: CipherId;
-  type: SecurityTaskType.UpdateAtRiskCredential;
+  type: typeof SecurityTaskType.UpdateAtRiskCredential;
 }>;
 
 export abstract class AdminTaskService {
diff --git a/bitwarden_license/bit-web/tsconfig.json b/bitwarden_license/bit-web/tsconfig.json
index 679513a656f..7ec0441f4c1 100644
--- a/bitwarden_license/bit-web/tsconfig.json
+++ b/bitwarden_license/bit-web/tsconfig.json
@@ -1,41 +1,5 @@
 {
   "extends": "../../apps/web/tsconfig",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "module": "ES2020",
-    "resolveJsonModule": true,
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
-      "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
-      "@bitwarden/billing": ["../../libs/billing/src"],
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/components": ["../../libs/components/src"],
-      "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/importer-core": ["../../libs/importer/src"],
-      "@bitwarden/importer-ui": ["../../libs/importer/src/components"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"],
-      "@bitwarden/platform": ["../../libs/platform/src"],
-      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"],
-      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
-      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
-      "@bitwarden/vault": ["../../libs/vault/src"],
-      "@bitwarden/web-vault/*": ["../../apps/web/src/*"],
-
-      "@bitwarden/bit-common/*": ["../bit-common/src/*"]
-    }
-  },
   "files": [
     "../../apps/web/src/polyfills.ts",
     "../../apps/web/src/main.ts",
diff --git a/bitwarden_license/bit-web/tsconfig.spec.json b/bitwarden_license/bit-web/tsconfig.spec.json
index 6ac7373f389..6ae1ce91a43 100644
--- a/bitwarden_license/bit-web/tsconfig.spec.json
+++ b/bitwarden_license/bit-web/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["../../apps/web/test.setup.ts"]
 }
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 5a4874457a0..f08523d5878 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -70,6 +70,7 @@ export default tseslint.config(
       "@angular-eslint/no-output-on-prefix": 0,
       "@angular-eslint/no-output-rename": 0,
       "@angular-eslint/no-outputs-metadata-property": 0,
+      "@angular-eslint/prefer-standalone": 0,
       "@angular-eslint/use-lifecycle-interface": "error",
       "@angular-eslint/use-pipe-transform-interface": 0,
       "@bitwarden/platform/required-using": "error",
@@ -278,6 +279,37 @@ export default tseslint.config(
       ]),
     },
   },
+  // Browser background and content scripts are not allowed to import from the popup directory
+  {
+    files: ["apps/browser/src/**/*.ts"],
+    rules: {
+      "no-restricted-imports": buildNoRestrictedImports([
+        "@angular",
+        "bitwarden_license/**",
+        "@bitwarden/bit-common/*",
+        "@bitwarden/bit-web/*",
+
+        "**/popup/*",
+      ]),
+    },
+  },
+  // This removes the previous rule forbidding imports from the popup directory
+  {
+    files: ["apps/browser/src/**/popup/**/*.ts"],
+    rules: {
+      "no-restricted-imports": buildNoRestrictedImports([
+        "bitwarden_license/**",
+        "@bitwarden/bit-common/*",
+        "@bitwarden/bit-web/*",
+      ]),
+    },
+  },
+  {
+    files: ["libs/nx-plugin/**/*.ts", "libs/nx-plugin/**/*.js"],
+    rules: {
+      "no-console": "off",
+    },
+  },
   /// Bandaids for keeping existing circular dependencies from getting worse and new ones from being created
   /// Will be removed after Nx is implemented and existing circular dependencies are removed.
   {
@@ -603,6 +635,7 @@ export default tseslint.config(
       "libs/components/tailwind.config.js",
 
       "scripts/*.js",
+      "jest.preset.js",
     ],
   },
 );
diff --git a/jest.config.js b/jest.config.js
index e8815f92ffb..b0ffd2382ca 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("./tsconfig.base");
 
 /** @type {import('jest').Config} */
 module.exports = {
diff --git a/jest.preset.js b/jest.preset.js
new file mode 100644
index 00000000000..0640263d2c6
--- /dev/null
+++ b/jest.preset.js
@@ -0,0 +1,3 @@
+const nxPreset = require("@nx/jest/preset").default;
+
+module.exports = { ...nxPreset };
diff --git a/libs/admin-console/jest.config.js b/libs/admin-console/jest.config.js
index 5131753964c..48f498a2d7f 100644
--- a/libs/admin-console/jest.config.js
+++ b/libs/admin-console/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
@@ -8,13 +8,12 @@ const sharedConfig = require("../../libs/shared/jest.config.angular");
 module.exports = {
   ...sharedConfig,
   displayName: "libs/admin-console tests",
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
     // lets us use @bitwarden/common/spec in tests
-    { "@bitwarden/common/spec": ["../common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
 };
diff --git a/libs/admin-console/src/common/collections/models/collection.data.ts b/libs/admin-console/src/common/collections/models/collection.data.ts
index 4a2b78543a5..b28a066509c 100644
--- a/libs/admin-console/src/common/collections/models/collection.data.ts
+++ b/libs/admin-console/src/common/collections/models/collection.data.ts
@@ -2,6 +2,7 @@ import { Jsonify } from "type-fest";
 
 import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
 
+import { CollectionType } from "./collection";
 import { CollectionDetailsResponse } from "./collection.response";
 
 export class CollectionData {
@@ -12,6 +13,7 @@ export class CollectionData {
   readOnly: boolean;
   manage: boolean;
   hidePasswords: boolean;
+  type: CollectionType;
 
   constructor(response: CollectionDetailsResponse) {
     this.id = response.id;
@@ -21,6 +23,7 @@ export class CollectionData {
     this.readOnly = response.readOnly;
     this.manage = response.manage;
     this.hidePasswords = response.hidePasswords;
+    this.type = response.type;
   }
 
   static fromJSON(obj: Jsonify<CollectionData>) {
diff --git a/libs/admin-console/src/common/collections/models/collection.response.ts b/libs/admin-console/src/common/collections/models/collection.response.ts
index e2b8bfd08f6..c9b8ccf0456 100644
--- a/libs/admin-console/src/common/collections/models/collection.response.ts
+++ b/libs/admin-console/src/common/collections/models/collection.response.ts
@@ -2,11 +2,14 @@ import { SelectionReadOnlyResponse } from "@bitwarden/common/admin-console/model
 import { BaseResponse } from "@bitwarden/common/models/response/base.response";
 import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
 
+import { CollectionType } from "./collection";
+
 export class CollectionResponse extends BaseResponse {
   id: CollectionId;
   organizationId: OrganizationId;
   name: string;
   externalId: string;
+  type: CollectionType;
 
   constructor(response: any) {
     super(response);
@@ -14,6 +17,7 @@ export class CollectionResponse extends BaseResponse {
     this.organizationId = this.getResponseProperty("OrganizationId");
     this.name = this.getResponseProperty("Name");
     this.externalId = this.getResponseProperty("ExternalId");
+    this.type = this.getResponseProperty("Type");
   }
 }
 
diff --git a/libs/admin-console/src/common/collections/models/collection.spec.ts b/libs/admin-console/src/common/collections/models/collection.spec.ts
index a21ce573512..925490d22b9 100644
--- a/libs/admin-console/src/common/collections/models/collection.spec.ts
+++ b/libs/admin-console/src/common/collections/models/collection.spec.ts
@@ -2,7 +2,7 @@ import { makeSymmetricCryptoKey, mockEnc } from "@bitwarden/common/spec";
 import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
 import { OrgKey } from "@bitwarden/common/types/key";
 
-import { Collection } from "./collection";
+import { Collection, CollectionTypes } from "./collection";
 import { CollectionData } from "./collection.data";
 
 describe("Collection", () => {
@@ -17,6 +17,7 @@ describe("Collection", () => {
       readOnly: true,
       manage: true,
       hidePasswords: true,
+      type: CollectionTypes.DefaultUserCollection,
     };
   });
 
@@ -32,6 +33,7 @@ describe("Collection", () => {
       organizationId: null,
       readOnly: null,
       manage: null,
+      type: null,
     });
   });
 
@@ -46,6 +48,7 @@ describe("Collection", () => {
       readOnly: true,
       manage: true,
       hidePasswords: true,
+      type: CollectionTypes.DefaultUserCollection,
     });
   });
 
@@ -58,6 +61,7 @@ describe("Collection", () => {
     collection.readOnly = false;
     collection.hidePasswords = false;
     collection.manage = true;
+    collection.type = CollectionTypes.DefaultUserCollection;
 
     const key = makeSymmetricCryptoKey<OrgKey>();
 
@@ -72,6 +76,7 @@ describe("Collection", () => {
       readOnly: false,
       manage: true,
       assigned: true,
+      type: CollectionTypes.DefaultUserCollection,
     });
   });
 });
diff --git a/libs/admin-console/src/common/collections/models/collection.ts b/libs/admin-console/src/common/collections/models/collection.ts
index 5b6f1a6fb7a..4d87130c162 100644
--- a/libs/admin-console/src/common/collections/models/collection.ts
+++ b/libs/admin-console/src/common/collections/models/collection.ts
@@ -7,6 +7,13 @@ import { OrgKey } from "@bitwarden/common/types/key";
 import { CollectionData } from "./collection.data";
 import { CollectionView } from "./collection.view";
 
+export const CollectionTypes = {
+  SharedCollection: 0,
+  DefaultUserCollection: 1,
+} as const;
+
+export type CollectionType = (typeof CollectionTypes)[keyof typeof CollectionTypes];
+
 export class Collection extends Domain {
   id: string;
   organizationId: string;
@@ -15,6 +22,7 @@ export class Collection extends Domain {
   readOnly: boolean;
   hidePasswords: boolean;
   manage: boolean;
+  type: CollectionType;
 
   constructor(obj?: CollectionData) {
     super();
@@ -33,8 +41,9 @@ export class Collection extends Domain {
         readOnly: null,
         hidePasswords: null,
         manage: null,
+        type: null,
       },
-      ["id", "organizationId", "readOnly", "hidePasswords", "manage"],
+      ["id", "organizationId", "readOnly", "hidePasswords", "manage", "type"],
     );
   }
 
diff --git a/libs/admin-console/src/common/collections/models/collection.view.ts b/libs/admin-console/src/common/collections/models/collection.view.ts
index 1ce76608df1..7baf2e2b718 100644
--- a/libs/admin-console/src/common/collections/models/collection.view.ts
+++ b/libs/admin-console/src/common/collections/models/collection.view.ts
@@ -6,7 +6,7 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { View } from "@bitwarden/common/models/view/view";
 import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 
-import { Collection } from "./collection";
+import { Collection, CollectionType } from "./collection";
 import { CollectionAccessDetailsResponse } from "./collection.response";
 
 export const NestingDelimiter = "/";
@@ -21,6 +21,7 @@ export class CollectionView implements View, ITreeNodeObject {
   hidePasswords: boolean = null;
   manage: boolean = null;
   assigned: boolean = null;
+  type: CollectionType = null;
 
   constructor(c?: Collection | CollectionAccessDetailsResponse) {
     if (!c) {
@@ -39,6 +40,7 @@ export class CollectionView implements View, ITreeNodeObject {
     if (c instanceof CollectionAccessDetailsResponse) {
       this.assigned = c.assigned;
     }
+    this.type = c.type;
   }
 
   canEditItems(org: Organization): boolean {
diff --git a/libs/admin-console/src/common/organization-user/abstractions/organization-user-api.service.ts b/libs/admin-console/src/common/organization-user/abstractions/organization-user-api.service.ts
index 3186bdaa84b..ff422231a12 100644
--- a/libs/admin-console/src/common/organization-user/abstractions/organization-user-api.service.ts
+++ b/libs/admin-console/src/common/organization-user/abstractions/organization-user-api.service.ts
@@ -37,13 +37,6 @@ export abstract class OrganizationUserApiService {
     },
   ): Promise<OrganizationUserDetailsResponse>;
 
-  /**
-   * Retrieve a list of groups Ids the specified organization user belongs to
-   * @param organizationId - Identifier for the user's organization
-   * @param id - Organization user identifier
-   */
-  abstract getOrganizationUserGroups(organizationId: string, id: string): Promise<string[]>;
-
   /**
    * Retrieve full details of all users that belong to the specified organization.
    * This is only accessible to privileged users, if you need a simple listing of basic details, use
diff --git a/libs/admin-console/src/common/organization-user/models/requests/organization-user-confirm.request.ts b/libs/admin-console/src/common/organization-user/models/requests/organization-user-confirm.request.ts
index 62988801424..104ea7fd472 100644
--- a/libs/admin-console/src/common/organization-user/models/requests/organization-user-confirm.request.ts
+++ b/libs/admin-console/src/common/organization-user/models/requests/organization-user-confirm.request.ts
@@ -1,5 +1,6 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
+import { EncryptedString } from "@bitwarden/common/platform/models/domain/enc-string";
+
 export class OrganizationUserConfirmRequest {
-  key: string;
+  key: EncryptedString | undefined;
+  defaultUserCollectionName: EncryptedString | undefined;
 }
diff --git a/libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts b/libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts
index 7289f41d7e7..c16fba258ec 100644
--- a/libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts
+++ b/libs/admin-console/src/common/organization-user/services/default-organization-user-api.service.ts
@@ -48,17 +48,6 @@ export class DefaultOrganizationUserApiService implements OrganizationUserApiSer
     return new OrganizationUserDetailsResponse(r);
   }
 
-  async getOrganizationUserGroups(organizationId: string, id: string): Promise<string[]> {
-    const r = await this.apiService.send(
-      "GET",
-      "/organizations/" + organizationId + "/users/" + id + "/groups",
-      null,
-      true,
-      true,
-    );
-    return r;
-  }
-
   async getAllUsers(
     organizationId: string,
     options?: {
diff --git a/libs/admin-console/tsconfig.json b/libs/admin-console/tsconfig.json
index 4f057fd6af0..72e2a434344 100644
--- a/libs/admin-console/tsconfig.json
+++ b/libs/admin-console/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/key-management": ["../key-management/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
   "include": ["src", "spec", "../../libs/common/custom-matchers.d.ts"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/admin-console/tsconfig.spec.json b/libs/admin-console/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/libs/admin-console/tsconfig.spec.json
+++ b/libs/admin-console/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/libs/angular/jest.config.js b/libs/angular/jest.config.js
index 5e73614eb8e..e94ae5e9af4 100644
--- a/libs/angular/jest.config.js
+++ b/libs/angular/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
@@ -8,13 +8,12 @@ const sharedConfig = require("../../libs/shared/jest.config.angular");
 module.exports = {
   ...sharedConfig,
   displayName: "libs/angular tests",
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
     // lets us use @bitwarden/common/spec in tests
-    { "@bitwarden/common/spec": ["../common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
 };
diff --git a/libs/angular/src/admin-console/components/collections.component.ts b/libs/angular/src/admin-console/components/collections.component.ts
deleted file mode 100644
index 9d36ab4619f..00000000000
--- a/libs/angular/src/admin-console/components/collections.component.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
-import { firstValueFrom, map } from "rxjs";
-
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { UserId } from "@bitwarden/common/types/guid";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { ToastService } from "@bitwarden/components";
-
-@Directive()
-export class CollectionsComponent implements OnInit {
-  @Input() cipherId: string;
-  @Input() allowSelectNone = false;
-  @Output() onSavedCollections = new EventEmitter();
-
-  formPromise: Promise<any>;
-  cipher: CipherView;
-  collectionIds: string[];
-  collections: CollectionView[] = [];
-  organization: Organization;
-
-  protected cipherDomain: Cipher;
-
-  constructor(
-    protected collectionService: CollectionService,
-    protected platformUtilsService: PlatformUtilsService,
-    protected i18nService: I18nService,
-    protected cipherService: CipherService,
-    protected organizationService: OrganizationService,
-    private logService: LogService,
-    private accountService: AccountService,
-    private toastService: ToastService,
-  ) {}
-
-  async ngOnInit() {
-    await this.load();
-  }
-
-  async load() {
-    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    this.cipherDomain = await this.loadCipher(activeUserId);
-    this.collectionIds = this.loadCipherCollections();
-    this.cipher = await this.cipherService.decrypt(this.cipherDomain, activeUserId);
-    this.collections = await this.loadCollections();
-
-    this.collections.forEach((c) => ((c as any).checked = false));
-    if (this.collectionIds != null) {
-      this.collections.forEach((c) => {
-        (c as any).checked = this.collectionIds != null && this.collectionIds.indexOf(c.id) > -1;
-      });
-    }
-
-    if (this.organization == null) {
-      this.organization = await firstValueFrom(
-        this.organizationService
-          .organizations$(activeUserId)
-          .pipe(
-            map((organizations) =>
-              organizations.find((org) => org.id === this.cipher.organizationId),
-            ),
-          ),
-      );
-    }
-  }
-
-  async submit(): Promise<boolean> {
-    const selectedCollectionIds = this.collections
-      .filter((c) => {
-        if (this.organization.canEditAllCiphers) {
-          return !!(c as any).checked;
-        } else {
-          return !!(c as any).checked && !c.readOnly;
-        }
-      })
-      .map((c) => c.id);
-    if (!this.allowSelectNone && selectedCollectionIds.length === 0) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("selectOneCollection"),
-      });
-      return false;
-    }
-    this.cipherDomain.collectionIds = selectedCollectionIds;
-    try {
-      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      this.formPromise = this.saveCollections(activeUserId);
-      await this.formPromise;
-      this.onSavedCollections.emit();
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("editedItem"),
-      });
-      return true;
-    } catch (e) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: e.message,
-      });
-      return false;
-    }
-  }
-
-  protected loadCipher(userId: UserId) {
-    return this.cipherService.get(this.cipherId, userId);
-  }
-
-  protected loadCipherCollections() {
-    return this.cipherDomain.collectionIds;
-  }
-
-  protected async loadCollections() {
-    const allCollections = await this.collectionService.getAllDecrypted();
-    return allCollections.filter(
-      (c) => !c.readOnly && c.organizationId === this.cipher.organizationId,
-    );
-  }
-
-  protected saveCollections(userId: UserId) {
-    return this.cipherService.saveCollectionsWithServer(this.cipherDomain, userId);
-  }
-}
diff --git a/libs/angular/src/auth/components/authentication-timeout.component.ts b/libs/angular/src/auth/components/authentication-timeout.component.ts
index 1a5d398a291..940798de9e7 100644
--- a/libs/angular/src/auth/components/authentication-timeout.component.ts
+++ b/libs/angular/src/auth/components/authentication-timeout.component.ts
@@ -11,7 +11,6 @@ import { ButtonModule } from "@bitwarden/components";
  */
 @Component({
   selector: "app-authentication-timeout",
-  standalone: true,
   imports: [CommonModule, JslibModule, ButtonModule, RouterModule],
   template: `
     <p class="tw-text-center">
diff --git a/libs/angular/src/auth/components/change-password.component.ts b/libs/angular/src/auth/components/change-password.component.ts
index ca81f741b23..6adb684681c 100644
--- a/libs/angular/src/auth/components/change-password.component.ts
+++ b/libs/angular/src/auth/components/change-password.component.ts
@@ -37,15 +37,15 @@ export class ChangePasswordComponent implements OnInit, OnDestroy {
   protected destroy$ = new Subject<void>();
 
   constructor(
+    protected accountService: AccountService,
+    protected dialogService: DialogService,
     protected i18nService: I18nService,
+    protected kdfConfigService: KdfConfigService,
     protected keyService: KeyService,
+    protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
     protected messagingService: MessagingService,
     protected platformUtilsService: PlatformUtilsService,
     protected policyService: PolicyService,
-    protected dialogService: DialogService,
-    protected kdfConfigService: KdfConfigService,
-    protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
-    protected accountService: AccountService,
     protected toastService: ToastService,
   ) {}
 
diff --git a/libs/angular/src/auth/components/set-password.component.ts b/libs/angular/src/auth/components/set-password.component.ts
index 53f6abaa33c..1550b648734 100644
--- a/libs/angular/src/auth/components/set-password.component.ts
+++ b/libs/angular/src/auth/components/set-password.component.ts
@@ -14,7 +14,6 @@ import {
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import { InternalUserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
@@ -58,38 +57,37 @@ export class SetPasswordComponent extends BaseChangePasswordComponent implements
   ForceSetPasswordReason = ForceSetPasswordReason;
 
   constructor(
-    accountService: AccountService,
-    masterPasswordService: InternalMasterPasswordServiceAbstraction,
-    i18nService: I18nService,
-    keyService: KeyService,
-    messagingService: MessagingService,
-    platformUtilsService: PlatformUtilsService,
-    private policyApiService: PolicyApiServiceAbstraction,
-    policyService: PolicyService,
+    protected accountService: AccountService,
+    protected dialogService: DialogService,
+    protected encryptService: EncryptService,
+    protected i18nService: I18nService,
+    protected kdfConfigService: KdfConfigService,
+    protected keyService: KeyService,
+    protected masterPasswordApiService: MasterPasswordApiService,
+    protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
+    protected messagingService: MessagingService,
+    protected organizationApiService: OrganizationApiServiceAbstraction,
+    protected organizationUserApiService: OrganizationUserApiService,
+    protected platformUtilsService: PlatformUtilsService,
+    protected policyApiService: PolicyApiServiceAbstraction,
+    protected policyService: PolicyService,
+    protected route: ActivatedRoute,
     protected router: Router,
-    private masterPasswordApiService: MasterPasswordApiService,
-    private apiService: ApiService,
-    private syncService: SyncService,
-    private route: ActivatedRoute,
-    private organizationApiService: OrganizationApiServiceAbstraction,
-    private organizationUserApiService: OrganizationUserApiService,
-    private userDecryptionOptionsService: InternalUserDecryptionOptionsServiceAbstraction,
-    private ssoLoginService: SsoLoginServiceAbstraction,
-    dialogService: DialogService,
-    kdfConfigService: KdfConfigService,
-    private encryptService: EncryptService,
+    protected ssoLoginService: SsoLoginServiceAbstraction,
+    protected syncService: SyncService,
     protected toastService: ToastService,
+    protected userDecryptionOptionsService: InternalUserDecryptionOptionsServiceAbstraction,
   ) {
     super(
+      accountService,
+      dialogService,
       i18nService,
+      kdfConfigService,
       keyService,
+      masterPasswordService,
       messagingService,
       platformUtilsService,
       policyService,
-      dialogService,
-      kdfConfigService,
-      masterPasswordService,
-      accountService,
       toastService,
     );
   }
diff --git a/libs/angular/src/auth/components/update-password.component.ts b/libs/angular/src/auth/components/update-password.component.ts
index 47affbecdf2..839c3b24ebf 100644
--- a/libs/angular/src/auth/components/update-password.component.ts
+++ b/libs/angular/src/auth/components/update-password.component.ts
@@ -52,15 +52,15 @@ export class UpdatePasswordComponent extends BaseChangePasswordComponent {
     toastService: ToastService,
   ) {
     super(
+      accountService,
+      dialogService,
       i18nService,
+      kdfConfigService,
       keyService,
+      masterPasswordService,
       messagingService,
       platformUtilsService,
       policyService,
-      dialogService,
-      kdfConfigService,
-      masterPasswordService,
-      accountService,
       toastService,
     );
   }
diff --git a/libs/angular/src/auth/components/update-temp-password.component.ts b/libs/angular/src/auth/components/update-temp-password.component.ts
index db2f319998a..87db26a6b59 100644
--- a/libs/angular/src/auth/components/update-temp-password.component.ts
+++ b/libs/angular/src/auth/components/update-temp-password.component.ts
@@ -64,15 +64,15 @@ export class UpdateTempPasswordComponent extends BaseChangePasswordComponent imp
     toastService: ToastService,
   ) {
     super(
+      accountService,
+      dialogService,
       i18nService,
+      kdfConfigService,
       keyService,
+      masterPasswordService,
       messagingService,
       platformUtilsService,
       policyService,
-      dialogService,
-      kdfConfigService,
-      masterPasswordService,
-      accountService,
       toastService,
     );
   }
diff --git a/libs/angular/src/auth/guards/active-auth.guard.spec.ts b/libs/angular/src/auth/guards/active-auth.guard.spec.ts
index 566b2abc72a..de1bf40be11 100644
--- a/libs/angular/src/auth/guards/active-auth.guard.spec.ts
+++ b/libs/angular/src/auth/guards/active-auth.guard.spec.ts
@@ -13,7 +13,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 
 import { activeAuthGuard } from "./active-auth.guard";
 
-@Component({ template: "" })
+@Component({ template: "", standalone: false })
 class EmptyComponent {}
 
 describe("activeAuthGuard", () => {
diff --git a/libs/angular/src/auth/guards/auth.guard.spec.ts b/libs/angular/src/auth/guards/auth.guard.spec.ts
index db08553749a..1681fa2b4ea 100644
--- a/libs/angular/src/auth/guards/auth.guard.spec.ts
+++ b/libs/angular/src/auth/guards/auth.guard.spec.ts
@@ -13,8 +13,10 @@ import {
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { UserId } from "@bitwarden/common/types/guid";
 
@@ -25,12 +27,14 @@ describe("AuthGuard", () => {
     authStatus: AuthenticationStatus,
     forceSetPasswordReason: ForceSetPasswordReason,
     keyConnectorServiceRequiresAccountConversion: boolean = false,
+    featureFlag: FeatureFlag | null = null,
   ) => {
     const authService: MockProxy<AuthService> = mock<AuthService>();
     authService.getAuthStatus.mockResolvedValue(authStatus);
     const messagingService: MockProxy<MessagingService> = mock<MessagingService>();
     const keyConnectorService: MockProxy<KeyConnectorService> = mock<KeyConnectorService>();
     keyConnectorService.convertAccountRequired$ = of(keyConnectorServiceRequiresAccountConversion);
+    const configService: MockProxy<ConfigService> = mock<ConfigService>();
     const accountService: MockProxy<AccountService> = mock<AccountService>();
     const activeAccountSubject = new BehaviorSubject<Account | null>(null);
     accountService.activeAccount$ = activeAccountSubject;
@@ -45,6 +49,12 @@ describe("AuthGuard", () => {
       ),
     );
 
+    if (featureFlag) {
+      configService.getFeatureFlag.mockResolvedValue(true);
+    } else {
+      configService.getFeatureFlag.mockResolvedValue(false);
+    }
+
     const forceSetPasswordReasonSubject = new BehaviorSubject<ForceSetPasswordReason>(
       forceSetPasswordReason,
     );
@@ -59,8 +69,11 @@ describe("AuthGuard", () => {
           { path: "guarded-route", component: EmptyComponent, canActivate: [authGuard] },
           { path: "lock", component: EmptyComponent },
           { path: "set-password", component: EmptyComponent },
-          { path: "update-temp-password", component: EmptyComponent },
-          { path: "remove-password", component: EmptyComponent },
+          { path: "set-password-jit", component: EmptyComponent },
+          { path: "set-initial-password", component: EmptyComponent, canActivate: [authGuard] },
+          { path: "update-temp-password", component: EmptyComponent, canActivate: [authGuard] },
+          { path: "change-password", component: EmptyComponent },
+          { path: "remove-password", component: EmptyComponent, canActivate: [authGuard] },
         ]),
       ],
       providers: [
@@ -69,6 +82,7 @@ describe("AuthGuard", () => {
         { provide: KeyConnectorService, useValue: keyConnectorService },
         { provide: AccountService, useValue: accountService },
         { provide: MasterPasswordServiceAbstraction, useValue: masterPasswordService },
+        { provide: ConfigService, useValue: configService },
       ],
     });
 
@@ -110,70 +124,175 @@ describe("AuthGuard", () => {
     expect(router.url).toBe("/remove-password");
   });
 
-  it("should redirect to set-password when user is TDE user without password and has password reset permission", async () => {
-    const { router } = setup(
-      AuthenticationStatus.Unlocked,
-      ForceSetPasswordReason.TdeUserWithoutPasswordHasPasswordResetPermission,
-    );
+  describe("given user is Locked", () => {
+    describe("given the PM16117_SetInitialPasswordRefactor feature flag is ON", () => {
+      it("should redirect to /set-initial-password when the user has ForceSetPasswordReaason.TdeOffboardingUntrustedDevice", async () => {
+        const { router } = setup(
+          AuthenticationStatus.Locked,
+          ForceSetPasswordReason.TdeOffboardingUntrustedDevice,
+          false,
+          FeatureFlag.PM16117_SetInitialPasswordRefactor,
+        );
 
-    await router.navigate(["guarded-route"]);
-    expect(router.url).toContain("/set-password");
+        await router.navigate(["guarded-route"]);
+        expect(router.url).toBe("/set-initial-password");
+      });
+
+      it("should allow navigation to continue to /set-initial-password when the user has ForceSetPasswordReason.TdeOffboardingUntrustedDevice", async () => {
+        const { router } = setup(
+          AuthenticationStatus.Unlocked,
+          ForceSetPasswordReason.TdeOffboardingUntrustedDevice,
+          false,
+          FeatureFlag.PM16117_SetInitialPasswordRefactor,
+        );
+
+        await router.navigate(["/set-initial-password"]);
+        expect(router.url).toContain("/set-initial-password");
+      });
+    });
   });
 
-  it("should redirect to update-temp-password when user has force set password reason", async () => {
-    const { router } = setup(
-      AuthenticationStatus.Unlocked,
-      ForceSetPasswordReason.AdminForcePasswordReset,
-    );
+  describe("given user is Unlocked", () => {
+    describe("given the PM16117_SetInitialPasswordRefactor feature flag is ON", () => {
+      const tests = [
+        ForceSetPasswordReason.TdeUserWithoutPasswordHasPasswordResetPermission,
+        ForceSetPasswordReason.TdeOffboarding,
+      ];
 
-    await router.navigate(["guarded-route"]);
-    expect(router.url).toContain("/update-temp-password");
-  });
+      describe("given user attempts to navigate to an auth guarded route", () => {
+        tests.forEach((reason) => {
+          it(`should redirect to /set-initial-password when the user has ForceSetPasswordReason.${ForceSetPasswordReason[reason]}`, async () => {
+            const { router } = setup(
+              AuthenticationStatus.Unlocked,
+              reason,
+              false,
+              FeatureFlag.PM16117_SetInitialPasswordRefactor,
+            );
 
-  it("should redirect to update-temp-password when user has weak password", async () => {
-    const { router } = setup(
-      AuthenticationStatus.Unlocked,
-      ForceSetPasswordReason.WeakMasterPassword,
-    );
+            await router.navigate(["guarded-route"]);
+            expect(router.url).toContain("/set-initial-password");
+          });
+        });
+      });
 
-    await router.navigate(["guarded-route"]);
-    expect(router.url).toContain("/update-temp-password");
-  });
+      describe("given user attempts to navigate to /set-initial-password", () => {
+        tests.forEach((reason) => {
+          it(`should allow navigation to continue to /set-initial-password when the user has ForceSetPasswordReason.${ForceSetPasswordReason[reason]}`, async () => {
+            const { router } = setup(
+              AuthenticationStatus.Unlocked,
+              reason,
+              false,
+              FeatureFlag.PM16117_SetInitialPasswordRefactor,
+            );
 
-  it("should allow navigation to set-password when the user is unlocked, is a TDE user without password, and has password reset permission", async () => {
-    const { router } = setup(
-      AuthenticationStatus.Unlocked,
-      ForceSetPasswordReason.TdeUserWithoutPasswordHasPasswordResetPermission,
-    );
+            await router.navigate(["/set-initial-password"]);
+            expect(router.url).toContain("/set-initial-password");
+          });
+        });
+      });
+    });
 
-    await router.navigate(["/set-password"]);
-    expect(router.url).toContain("/set-password");
-  });
+    describe("given the PM16117_SetInitialPasswordRefactor feature flag is OFF", () => {
+      const tests = [
+        {
+          reason: ForceSetPasswordReason.TdeUserWithoutPasswordHasPasswordResetPermission,
+          url: "/set-password",
+        },
+        {
+          reason: ForceSetPasswordReason.TdeOffboarding,
+          url: "/update-temp-password",
+        },
+      ];
 
-  it("should allow navigation to update-temp-password when the user is unlocked and has admin force password reset permission", async () => {
-    const { router } = setup(
-      AuthenticationStatus.Unlocked,
-      ForceSetPasswordReason.AdminForcePasswordReset,
-    );
+      describe("given user attempts to navigate to an auth guarded route", () => {
+        tests.forEach(({ reason, url }) => {
+          it(`should redirect to ${url} when user has ForceSetPasswordReason.${ForceSetPasswordReason[reason]}`, async () => {
+            const { router } = setup(AuthenticationStatus.Unlocked, reason);
 
-    await router.navigate(["/update-temp-password"]);
-    expect(router.url).toContain("/update-temp-password");
-  });
+            await router.navigate(["/guarded-route"]);
+            expect(router.url).toContain(url);
+          });
+        });
+      });
 
-  it("should allow navigation to update-temp-password when the user is unlocked and has weak password", async () => {
-    const { router } = setup(
-      AuthenticationStatus.Unlocked,
-      ForceSetPasswordReason.WeakMasterPassword,
-    );
+      describe("given user attempts to navigate to the set- or update- password route itself", () => {
+        tests.forEach(({ reason, url }) => {
+          it(`should allow navigation to continue to ${url} when user has ForceSetPasswordReason.${ForceSetPasswordReason[reason]}`, async () => {
+            const { router } = setup(AuthenticationStatus.Unlocked, reason);
 
-    await router.navigate(["/update-temp-password"]);
-    expect(router.url).toContain("/update-temp-password");
-  });
+            await router.navigate([url]);
+            expect(router.url).toContain(url);
+          });
+        });
+      });
+    });
 
-  it("should allow navigation to remove-password when the user is unlocked and has 'none' password reset permission", async () => {
-    const { router } = setup(AuthenticationStatus.Unlocked, ForceSetPasswordReason.None);
+    describe("given the PM16117_ChangeExistingPasswordRefactor feature flag is ON", () => {
+      const tests = [
+        ForceSetPasswordReason.AdminForcePasswordReset,
+        ForceSetPasswordReason.WeakMasterPassword,
+      ];
 
-    await router.navigate(["/remove-password"]);
-    expect(router.url).toContain("/remove-password");
+      describe("given user attempts to navigate to an auth guarded route", () => {
+        tests.forEach((reason) => {
+          it(`should redirect to /change-password when user has ForceSetPasswordReason.${ForceSetPasswordReason[reason]}`, async () => {
+            const { router } = setup(
+              AuthenticationStatus.Unlocked,
+              reason,
+              false,
+              FeatureFlag.PM16117_ChangeExistingPasswordRefactor,
+            );
+
+            await router.navigate(["guarded-route"]);
+            expect(router.url).toContain("/change-password");
+          });
+        });
+      });
+
+      describe("given user attempts to navigate to /change-password", () => {
+        tests.forEach((reason) => {
+          it(`should allow navigation to /change-password when user has ForceSetPasswordReason.${ForceSetPasswordReason[reason]}`, async () => {
+            const { router } = setup(
+              AuthenticationStatus.Unlocked,
+              ForceSetPasswordReason.AdminForcePasswordReset,
+              false,
+              FeatureFlag.PM16117_ChangeExistingPasswordRefactor,
+            );
+
+            await router.navigate(["/change-password"]);
+            expect(router.url).toContain("/change-password");
+          });
+        });
+      });
+    });
+
+    describe("given the PM16117_ChangeExistingPasswordRefactor feature flag is OFF", () => {
+      const tests = [
+        ForceSetPasswordReason.AdminForcePasswordReset,
+        ForceSetPasswordReason.WeakMasterPassword,
+      ];
+
+      describe("given user attempts to navigate to an auth guarded route", () => {
+        tests.forEach((reason) => {
+          it(`should redirect to /update-temp-password when user has ForceSetPasswordReason.${ForceSetPasswordReason[reason]}`, async () => {
+            const { router } = setup(AuthenticationStatus.Unlocked, reason);
+
+            await router.navigate(["guarded-route"]);
+            expect(router.url).toContain("/update-temp-password");
+          });
+        });
+      });
+
+      describe("given user attempts to navigate to /update-temp-password", () => {
+        tests.forEach((reason) => {
+          it(`should allow navigation to continue to /update-temp-password when user has ForceSetPasswordReason.${ForceSetPasswordReason[reason]}`, async () => {
+            const { router } = setup(AuthenticationStatus.Unlocked, reason);
+
+            await router.navigate(["/update-temp-password"]);
+            expect(router.url).toContain("/update-temp-password");
+          });
+        });
+      });
+    });
   });
 });
diff --git a/libs/angular/src/auth/guards/auth.guard.ts b/libs/angular/src/auth/guards/auth.guard.ts
index 690db37d090..3722a7c802a 100644
--- a/libs/angular/src/auth/guards/auth.guard.ts
+++ b/libs/angular/src/auth/guards/auth.guard.ts
@@ -14,8 +14,10 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 
 export const authGuard: CanActivateFn = async (
@@ -28,6 +30,7 @@ export const authGuard: CanActivateFn = async (
   const keyConnectorService = inject(KeyConnectorService);
   const accountService = inject(AccountService);
   const masterPasswordService = inject(MasterPasswordServiceAbstraction);
+  const configService = inject(ConfigService);
 
   const authStatus = await authService.getAuthStatus();
 
@@ -36,7 +39,42 @@ export const authGuard: CanActivateFn = async (
     return false;
   }
 
-  if (authStatus === AuthenticationStatus.Locked) {
+  const userId = (await firstValueFrom(accountService.activeAccount$)).id;
+  const forceSetPasswordReason = await firstValueFrom(
+    masterPasswordService.forceSetPasswordReason$(userId),
+  );
+
+  const isSetInitialPasswordFlagOn = await configService.getFeatureFlag(
+    FeatureFlag.PM16117_SetInitialPasswordRefactor,
+  );
+
+  // User JIT provisioned into a master-password-encryption org
+  if (
+    authStatus === AuthenticationStatus.Locked &&
+    forceSetPasswordReason === ForceSetPasswordReason.SsoNewJitProvisionedUser &&
+    !routerState.url.includes("set-initial-password") &&
+    isSetInitialPasswordFlagOn
+  ) {
+    return router.createUrlTree(["/set-initial-password"]);
+  }
+
+  // TDE Offboarding on untrusted device
+  if (
+    authStatus === AuthenticationStatus.Locked &&
+    forceSetPasswordReason === ForceSetPasswordReason.TdeOffboardingUntrustedDevice &&
+    !routerState.url.includes("set-initial-password") &&
+    isSetInitialPasswordFlagOn
+  ) {
+    return router.createUrlTree(["/set-initial-password"]);
+  }
+
+  // We must add exemptions for the SsoNewJitProvisionedUser and TdeOffboardingUntrustedDevice scenarios as
+  // the "set-initial-password" route is guarded by the authGuard.
+  if (
+    authStatus === AuthenticationStatus.Locked &&
+    forceSetPasswordReason !== ForceSetPasswordReason.SsoNewJitProvisionedUser &&
+    forceSetPasswordReason !== ForceSetPasswordReason.TdeOffboardingUntrustedDevice
+  ) {
     if (routerState != null) {
       messagingService.send("lockedUrl", { url: routerState.url });
     }
@@ -52,24 +90,40 @@ export const authGuard: CanActivateFn = async (
     return router.createUrlTree(["/remove-password"]);
   }
 
-  const userId = (await firstValueFrom(accountService.activeAccount$)).id;
-  const forceSetPasswordReason = await firstValueFrom(
-    masterPasswordService.forceSetPasswordReason$(userId),
-  );
-
+  // TDE org user has "manage account recovery" permission
   if (
     forceSetPasswordReason ===
       ForceSetPasswordReason.TdeUserWithoutPasswordHasPasswordResetPermission &&
-    !routerState.url.includes("set-password")
+    !routerState.url.includes("set-password") &&
+    !routerState.url.includes("set-initial-password")
   ) {
-    return router.createUrlTree(["/set-password"]);
+    const route = isSetInitialPasswordFlagOn ? "/set-initial-password" : "/set-password";
+    return router.createUrlTree([route]);
   }
 
+  // TDE Offboarding on trusted device
   if (
-    forceSetPasswordReason !== ForceSetPasswordReason.None &&
-    !routerState.url.includes("update-temp-password")
+    forceSetPasswordReason === ForceSetPasswordReason.TdeOffboarding &&
+    !routerState.url.includes("update-temp-password") &&
+    !routerState.url.includes("set-initial-password")
   ) {
-    return router.createUrlTree(["/update-temp-password"]);
+    const route = isSetInitialPasswordFlagOn ? "/set-initial-password" : "/update-temp-password";
+    return router.createUrlTree([route]);
+  }
+
+  const isChangePasswordFlagOn = await configService.getFeatureFlag(
+    FeatureFlag.PM16117_ChangeExistingPasswordRefactor,
+  );
+
+  // Post- Account Recovery or Weak Password on login
+  if (
+    (forceSetPasswordReason === ForceSetPasswordReason.AdminForcePasswordReset ||
+      forceSetPasswordReason === ForceSetPasswordReason.WeakMasterPassword) &&
+    !routerState.url.includes("update-temp-password") &&
+    !routerState.url.includes("change-password")
+  ) {
+    const route = isChangePasswordFlagOn ? "/change-password" : "/update-temp-password";
+    return router.createUrlTree([route]);
   }
 
   return true;
diff --git a/libs/angular/src/auth/guards/index.ts b/libs/angular/src/auth/guards/index.ts
index 026848c4b08..8a4d0be8167 100644
--- a/libs/angular/src/auth/guards/index.ts
+++ b/libs/angular/src/auth/guards/index.ts
@@ -1,6 +1,6 @@
 export * from "./auth.guard";
 export * from "./active-auth.guard";
 export * from "./lock.guard";
-export * from "./redirect.guard";
+export * from "./redirect/redirect.guard";
 export * from "./tde-decryption-required.guard";
 export * from "./unauth.guard";
diff --git a/libs/angular/src/auth/guards/lock.guard.spec.ts b/libs/angular/src/auth/guards/lock.guard.spec.ts
index 32b8ecbb9dd..2085e0f3486 100644
--- a/libs/angular/src/auth/guards/lock.guard.spec.ts
+++ b/libs/angular/src/auth/guards/lock.guard.spec.ts
@@ -44,7 +44,7 @@ describe("lockGuard", () => {
 
     const keyService: MockProxy<KeyService> = mock<KeyService>();
     keyService.isLegacyUser.mockResolvedValue(setupParams.isLegacyUser);
-    keyService.everHadUserKey$ = of(setupParams.everHadUserKey);
+    keyService.everHadUserKey$.mockReturnValue(of(setupParams.everHadUserKey));
 
     const platformUtilService: MockProxy<PlatformUtilsService> = mock<PlatformUtilsService>();
     platformUtilService.getClientType.mockReturnValue(setupParams.clientType);
@@ -79,7 +79,6 @@ describe("lockGuard", () => {
           { path: "", component: EmptyComponent },
           { path: "lock", component: EmptyComponent, canActivate: [lockGuard()] },
           { path: "non-lock-route", component: EmptyComponent },
-          { path: "migrate-legacy-encryption", component: EmptyComponent },
         ]),
       ],
       providers: [
@@ -182,18 +181,6 @@ describe("lockGuard", () => {
     expect(messagingService.send).toHaveBeenCalledWith("logout");
   });
 
-  it("should send the user to migrate-legacy-encryption if they are a legacy user on a web client", async () => {
-    const { router } = setup({
-      authStatus: AuthenticationStatus.Locked,
-      canLock: true,
-      isLegacyUser: true,
-      clientType: ClientType.Web,
-    });
-
-    await router.navigate(["lock"]);
-    expect(router.url).toBe("/migrate-legacy-encryption");
-  });
-
   it("should allow navigation to the lock route when device trust is supported, the user has a MP, and the user is coming from the login-initiated page", async () => {
     const { router } = setup({
       authStatus: AuthenticationStatus.Locked,
diff --git a/libs/angular/src/auth/guards/lock.guard.ts b/libs/angular/src/auth/guards/lock.guard.ts
index 10ad4917f32..4b09ddeee18 100644
--- a/libs/angular/src/auth/guards/lock.guard.ts
+++ b/libs/angular/src/auth/guards/lock.guard.ts
@@ -11,11 +11,9 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { ClientType } from "@bitwarden/common/enums";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { KeyService } from "@bitwarden/key-management";
 
 /**
@@ -33,7 +31,6 @@ export function lockGuard(): CanActivateFn {
     const authService = inject(AuthService);
     const keyService = inject(KeyService);
     const deviceTrustService = inject(DeviceTrustServiceAbstraction);
-    const platformUtilService = inject(PlatformUtilsService);
     const messagingService = inject(MessagingService);
     const router = inject(Router);
     const userVerificationService = inject(UserVerificationService);
@@ -59,12 +56,7 @@ export function lockGuard(): CanActivateFn {
       return false;
     }
 
-    // If legacy user on web, redirect to migration page
     if (await keyService.isLegacyUser()) {
-      if (platformUtilService.getClientType() === ClientType.Web) {
-        return router.createUrlTree(["migrate-legacy-encryption"]);
-      }
-      // Log out legacy users on other clients
       messagingService.send("logout");
       return false;
     }
@@ -84,7 +76,7 @@ export function lockGuard(): CanActivateFn {
     }
 
     // If authN user with TDE directly navigates to lock, reject that navigation
-    const everHadUserKey = await firstValueFrom(keyService.everHadUserKey$);
+    const everHadUserKey = await firstValueFrom(keyService.everHadUserKey$(activeUser.id));
     if (tdeEnabled && !everHadUserKey) {
       return false;
     }
diff --git a/libs/angular/src/auth/guards/redirect/README.md b/libs/angular/src/auth/guards/redirect/README.md
new file mode 100644
index 00000000000..b7977a553b1
--- /dev/null
+++ b/libs/angular/src/auth/guards/redirect/README.md
@@ -0,0 +1,53 @@
+# Redirect Guard
+
+The `redirectGuard` redirects the user based on their `AuthenticationStatus`. It is applied to the root route (`/`).
+
+<br>
+
+### Order of Operations
+
+The `redirectGuard` will redirect the user based on the following checks, _in order_:
+
+- **`AuthenticationStatus.LoggedOut`** &rarr; redirect to `/login`
+- **`AuthenticationStatus.Unlocked`** &rarr; redirect to `/vault`
+- **`AuthenticationStatus.Locked`**
+  - **TDE Locked State** &rarr; redirect to `/login-initiated`
+    - A user is in a TDE Locked State if they meet all 3 of the following conditions
+      1. Auth status is `Locked`
+      2. TDE is enabled
+      3. User has never had a user key (that is, user has not unlocked/decrypted yet)
+  - **Standard Locked State** &rarr; redirect to `/lock`
+
+<br>
+
+| Order | AuthenticationStatus                                                            | Redirect To        |
+| ----- | ------------------------------------------------------------------------------- | ------------------ |
+| 1     | `LoggedOut`                                                                     | `/login`           |
+| 2     | `Unlocked`                                                                      | `/vault`           |
+| 3     | **TDE Locked State** <br> `Locked` + <br> `tdeEnabled` + <br> `!everHadUserKey` | `/login-initiated` |
+| 4     | **Standard Locked State** <br> `Locked`                                         | `/lock`            |
+
+<br>
+
+### Default Routes and Route Overrides
+
+The default redirect routes are mapped to object properties:
+
+```typescript
+const defaultRoutes: RedirectRoutes = {
+  loggedIn: "/vault",
+  loggedOut: "/login",
+  locked: "/lock",
+  notDecrypted: "/login-initiated",
+};
+```
+
+But when applying the guard to the root route, the developer can override specific redirect routes by passing in a custom object. This is useful for subtle differences in client-specific routing:
+
+```typescript
+// app-routing.module.ts (Browser Extension)
+{
+    path: "",
+    canActivate: [redirectGuard({ loggedIn: "/tabs/current"})],
+}
+```
diff --git a/libs/angular/src/auth/guards/redirect.guard.ts b/libs/angular/src/auth/guards/redirect/redirect.guard.ts
similarity index 76%
rename from libs/angular/src/auth/guards/redirect.guard.ts
rename to libs/angular/src/auth/guards/redirect/redirect.guard.ts
index 00dd20c9909..45e552639c8 100644
--- a/libs/angular/src/auth/guards/redirect.guard.ts
+++ b/libs/angular/src/auth/guards/redirect/redirect.guard.ts
@@ -2,8 +2,10 @@ import { inject } from "@angular/core";
 import { CanActivateFn, Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { KeyService } from "@bitwarden/key-management";
@@ -23,33 +25,42 @@ const defaultRoutes: RedirectRoutes = {
 };
 
 /**
- * Guard that consolidates all redirection logic, should be applied to root route.
+ * Redirects the user to the appropriate route based on their `AuthenticationStatus`.
+ * This guard should be applied to the root route.
  *
  * TODO: This should return Observable<boolean | UrlTree> once we can get rid of all the promises
  */
 export function redirectGuard(overrides: Partial<RedirectRoutes> = {}): CanActivateFn {
   const routes = { ...defaultRoutes, ...overrides };
+
   return async (route) => {
     const authService = inject(AuthService);
     const keyService = inject(KeyService);
     const deviceTrustService = inject(DeviceTrustServiceAbstraction);
+    const accountService = inject(AccountService);
     const logService = inject(LogService);
     const router = inject(Router);
 
     const authStatus = await authService.getAuthStatus();
 
+    // Logged Out
     if (authStatus === AuthenticationStatus.LoggedOut) {
       return router.createUrlTree([routes.loggedOut], { queryParams: route.queryParams });
     }
 
+    // Unlocked
     if (authStatus === AuthenticationStatus.Unlocked) {
       return router.createUrlTree([routes.loggedIn], { queryParams: route.queryParams });
     }
 
-    // If locked, TDE is enabled, and the user hasn't decrypted yet, then redirect to the
-    // login decryption options component.
+    // Locked: TDE Locked State
+    //  - If user meets all 3 of the following conditions:
+    //    1. Auth status is Locked
+    //    2. TDE is enabled
+    //    3. User has never had a user key (has not decrypted yet)
     const tdeEnabled = await firstValueFrom(deviceTrustService.supportsDeviceTrust$);
-    const everHadUserKey = await firstValueFrom(keyService.everHadUserKey$);
+    const userId = await firstValueFrom(accountService.activeAccount$.pipe(getUserId));
+    const everHadUserKey = await firstValueFrom(keyService.everHadUserKey$(userId));
     if (authStatus === AuthenticationStatus.Locked && tdeEnabled && !everHadUserKey) {
       logService.info(
         "Sending user to TDE decryption options. AuthStatus is %s. TDE support is %s. Ever had user key is %s.",
@@ -60,6 +71,7 @@ export function redirectGuard(overrides: Partial<RedirectRoutes> = {}): CanActiv
       return router.createUrlTree([routes.notDecrypted], { queryParams: route.queryParams });
     }
 
+    // Locked: Standard Locked State
     if (authStatus === AuthenticationStatus.Locked) {
       return router.createUrlTree([routes.locked], { queryParams: route.queryParams });
     }
diff --git a/libs/angular/src/auth/guards/tde-decryption-required.guard.spec.ts b/libs/angular/src/auth/guards/tde-decryption-required.guard.spec.ts
new file mode 100644
index 00000000000..4408452a2a2
--- /dev/null
+++ b/libs/angular/src/auth/guards/tde-decryption-required.guard.spec.ts
@@ -0,0 +1,107 @@
+import { TestBed } from "@angular/core/testing";
+import { Router, provideRouter } from "@angular/router";
+import { mock } from "jest-mock-extended";
+import { BehaviorSubject, of } from "rxjs";
+
+import { EmptyComponent } from "@bitwarden/angular/platform/guard/feature-flag.guard.spec";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { UserId } from "@bitwarden/common/types/guid";
+import { KeyService } from "@bitwarden/key-management";
+
+import { tdeDecryptionRequiredGuard } from "./tde-decryption-required.guard";
+
+describe("tdeDecryptionRequiredGuard", () => {
+  const activeUser: Account = {
+    id: "fake_user_id" as UserId,
+    email: "test@email.com",
+    emailVerified: true,
+    name: "Test User",
+  };
+
+  const setup = (
+    activeUser: Account | null,
+    authStatus: AuthenticationStatus | null = null,
+    tdeEnabled: boolean = false,
+    everHadUserKey: boolean = false,
+  ) => {
+    const accountService = mock<AccountService>();
+    const authService = mock<AuthService>();
+    const keyService = mock<KeyService>();
+    const deviceTrustService = mock<DeviceTrustServiceAbstraction>();
+    const logService = mock<LogService>();
+
+    accountService.activeAccount$ = new BehaviorSubject<Account | null>(activeUser);
+    if (authStatus !== null) {
+      authService.getAuthStatus.mockResolvedValue(authStatus);
+    }
+    keyService.everHadUserKey$.mockReturnValue(of(everHadUserKey));
+    deviceTrustService.supportsDeviceTrust$ = of(tdeEnabled);
+
+    const testBed = TestBed.configureTestingModule({
+      providers: [
+        { provide: AccountService, useValue: accountService },
+        { provide: AuthService, useValue: authService },
+        { provide: KeyService, useValue: keyService },
+        { provide: DeviceTrustServiceAbstraction, useValue: deviceTrustService },
+        { provide: LogService, useValue: logService },
+        provideRouter([
+          { path: "", component: EmptyComponent },
+          {
+            path: "protected-route",
+            component: EmptyComponent,
+            canActivate: [tdeDecryptionRequiredGuard()],
+          },
+        ]),
+      ],
+    });
+
+    return {
+      router: testBed.inject(Router),
+    };
+  };
+
+  it("redirects to root when the active account is null", async () => {
+    const { router } = setup(null, null);
+    await router.navigate(["protected-route"]);
+    expect(router.url).toBe("/");
+  });
+
+  test.each([AuthenticationStatus.Unlocked, AuthenticationStatus.LoggedOut])(
+    "redirects to root when the user isn't locked",
+    async (authStatus) => {
+      const { router } = setup(activeUser, authStatus);
+
+      await router.navigate(["protected-route"]);
+
+      expect(router.url).toBe("/");
+    },
+  );
+
+  it("redirects to root when TDE is not enabled", async () => {
+    const { router } = setup(activeUser, AuthenticationStatus.Locked, false, true);
+
+    await router.navigate(["protected-route"]);
+
+    expect(router.url).toBe("/");
+  });
+
+  it("redirects to root when user has had a user key", async () => {
+    const { router } = setup(activeUser, AuthenticationStatus.Locked, true, true);
+
+    await router.navigate(["protected-route"]);
+
+    expect(router.url).toBe("/");
+  });
+
+  it("allows access when user is locked, TDE is enabled, and user has never had a user key", async () => {
+    const { router } = setup(activeUser, AuthenticationStatus.Locked, true, false);
+
+    const result = await router.navigate(["protected-route"]);
+    expect(result).toBe(true);
+    expect(router.url).toBe("/protected-route");
+  });
+});
diff --git a/libs/angular/src/auth/guards/tde-decryption-required.guard.ts b/libs/angular/src/auth/guards/tde-decryption-required.guard.ts
index 1d98b1fa740..13e7c6d04e1 100644
--- a/libs/angular/src/auth/guards/tde-decryption-required.guard.ts
+++ b/libs/angular/src/auth/guards/tde-decryption-required.guard.ts
@@ -5,8 +5,9 @@ import {
   RouterStateSnapshot,
   CanActivateFn,
 } from "@angular/router";
-import { firstValueFrom } from "rxjs";
+import { firstValueFrom, map } from "rxjs";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
@@ -24,12 +25,18 @@ export function tdeDecryptionRequiredGuard(): CanActivateFn {
     const authService = inject(AuthService);
     const keyService = inject(KeyService);
     const deviceTrustService = inject(DeviceTrustServiceAbstraction);
+    const accountService = inject(AccountService);
     const logService = inject(LogService);
     const router = inject(Router);
 
+    const userId = await firstValueFrom(accountService.activeAccount$.pipe(map((a) => a?.id)));
+    if (userId == null) {
+      return router.createUrlTree(["/"]);
+    }
+
     const authStatus = await authService.getAuthStatus();
     const tdeEnabled = await firstValueFrom(deviceTrustService.supportsDeviceTrust$);
-    const everHadUserKey = await firstValueFrom(keyService.everHadUserKey$);
+    const everHadUserKey = await firstValueFrom(keyService.everHadUserKey$(userId));
 
     // We need to determine if we should bypass the decryption options and send the user to the vault.
     // The ONLY time that we want to send a user to the decryption options is when:
diff --git a/libs/angular/src/auth/guards/unauth.guard.spec.ts b/libs/angular/src/auth/guards/unauth.guard.spec.ts
index ad0ce680a1f..c696b849558 100644
--- a/libs/angular/src/auth/guards/unauth.guard.spec.ts
+++ b/libs/angular/src/auth/guards/unauth.guard.spec.ts
@@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing";
 import { Router } from "@angular/router";
 import { RouterTestingModule } from "@angular/router/testing";
 import { MockProxy, mock } from "jest-mock-extended";
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, of } from "rxjs";
 
 import { EmptyComponent } from "@bitwarden/angular/platform/guard/feature-flag.guard.spec";
 import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -43,7 +43,7 @@ describe("UnauthGuard", () => {
       authService.authStatusFor$.mockReturnValue(activeAccountStatusObservable);
     }
 
-    keyService.everHadUserKey$ = new BehaviorSubject<boolean>(everHadUserKey);
+    keyService.everHadUserKey$.mockReturnValue(of(everHadUserKey));
     deviceTrustService.supportsDeviceTrustByUserId$.mockReturnValue(
       new BehaviorSubject<boolean>(tdeEnabled),
     );
diff --git a/libs/angular/src/auth/guards/unauth.guard.ts b/libs/angular/src/auth/guards/unauth.guard.ts
index 6764b46843e..3fcfd38349b 100644
--- a/libs/angular/src/auth/guards/unauth.guard.ts
+++ b/libs/angular/src/auth/guards/unauth.guard.ts
@@ -50,7 +50,7 @@ async function unauthGuard(
   const tdeEnabled = await firstValueFrom(
     deviceTrustService.supportsDeviceTrustByUserId$(activeUser.id),
   );
-  const everHadUserKey = await firstValueFrom(keyService.everHadUserKey$);
+  const everHadUserKey = await firstValueFrom(keyService.everHadUserKey$(activeUser.id));
 
   // If locked, TDE is enabled, and the user hasn't decrypted yet, then redirect to the
   // login decryption options component.
diff --git a/libs/angular/src/auth/password-management/README.md b/libs/angular/src/auth/password-management/README.md
new file mode 100644
index 00000000000..ca5a6355fcb
--- /dev/null
+++ b/libs/angular/src/auth/password-management/README.md
@@ -0,0 +1,216 @@
+# Master Password Management Flows
+
+The Auth Team manages several components that allow a user to either:
+
+1. Set an initial master password
+2. Change an existing master password
+
+This document maps all of our password management flows to the components that handle them.
+
+<br>
+
+**Table of Contents**
+
+> - [The Base `InputPasswordComponent`](#the-base-inputpasswordcomponent)
+> - [Set Initial Password Flows](#set-initial-password-flows)
+> - [Change Password Flows](#change-password-flows)
+
+<br>
+
+**Acronyms**
+
+<ul>
+  <li>MP = "master password"</li>
+  <li>MPE = "master password encryption"</li>
+  <li>TDE = "trusted device encryption"</li>
+  <li>JIT provision = "just-in-time provision"</li>
+</ul>
+
+<br>
+
+## The Base `InputPasswordComponent`
+
+Central to our master password management flows is the base [InputPasswordComponent](https://components.bitwarden.com/?path=/docs/auth-input-password--docs), which is responsible for displaying the appropriate form fields in the UI, performing form validation, and generating appropriate cryptographic properties for each flow. This keeps our UI, validation, and key generation consistent across all master password management flows.
+
+<br>
+
+## Set Initial Password Flows
+
+<table>
+  <thead>
+    <tr>
+      <td><strong>Flow</strong></td>
+      <td><strong>Route</strong><br><small>(on which user sets MP)</small></td>
+      <td><strong>Component(s)</strong></td>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>
+        <br>
+        <strong>Account Registration</strong>
+        <br><br>
+        <ol>
+            <li>Standard Flow</li>
+            <br>
+            <li>Self Hosted Flow</li>
+            <br>
+            <li>Email Invite Flows <small>(🌐 web only)</small></li>
+            <br>
+        </ol>
+      </td>
+      <td><code>/finish-signup</code></td>
+      <td>
+        <code>RegistrationFinishComponent</code>
+        <br>
+        <small>- embeds <code>InputPasswordComponent</code></small>
+    </tr>
+    <tr>
+      <td>
+        <strong>Trial Initiation</strong> <small>(🌐 web only)</small>
+      </td>
+      <td><code>/trial-initiation</code> or<br> <code>/secrets-manager-trial-initiation</code></td>
+      <td>
+        <code>CompleteTrialInitiationComponent</code>
+        <br>
+        <small>- embeds <code>InputPasswordComponent</code></small>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <br>
+        <strong>Upon Authentication</strong> (an existing authed user)
+        <br><br>
+        <ol>
+          <li><strong>User JIT provisions<small>*</small> into an MPE org</strong></li>
+          <br>
+          <li>
+            <strong>User JIT provisions<small>*</small> into a TDE org with the "manage account recovery" permission</strong>
+            <p>That is, the user was given this permission on invitation or by the time they JIT provision.</p>
+          </li>
+          <br>
+          <li>
+            <strong>TDE user permissions upgraded</strong>
+            <p>TDE user authenticates after permissions were upgraded to include "manage account recovery".</p>
+          </li>
+          <br>
+          <li>
+            <strong>TDE offboarding</strong>
+            <p>User authenticates after their org offboarded from TDE and is now a MPE org.</p>
+            <p>User must be on a trusted device to set MP, otherwise user must go through Account Recovery.</p>
+          </li>
+        </ol>
+      </td>
+      <td><code>/set-initial-password</code></td>
+      <td>
+        <code>SetInitialPasswordComponent</code>
+        <br>
+        <small>- embeds <code>InputPasswordComponent</code></small>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+\* A note on JIT provisioned user flows:
+
+- Even though a JIT provisioned user is a brand-new user who was “just” created, we consider them to be an “existing authed user” _from the perspective of the set initial password flow_. This is because at the time they set their initial password, their account already exists in the database (before setting their password) and they have already authenticated via SSO.
+- The same is not true in the _Account Registration_ flows above—that is, during account registration when a user reaches the `/finish-signup` or `/trial-initiation` page to set their initial password, their account does not yet exist in the database, and will only be created once they set an initial password.
+
+<br>
+
+## Change Password Flows
+
+<table>
+  <thead>
+    <tr>
+      <td><strong>Flow</strong></td>
+      <td><strong>Route</strong><br><small>(on which user changes MP)</small></td>
+      <td><strong>Component(s)</strong></td>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>
+        <br>
+        <strong>Account Settings</strong>
+        (<small><a href="https://bitwarden.com/help/master-password/#change-master-password">Docs</a></small>)
+        <br>
+        <small>(🌐 web only)</small>
+        <br><br>
+        <p>User changes MP via account settings.</p>
+        <br>
+      </td>
+      <td>
+        <code>/settings/security/password</code>
+        <br>(<code>security-routing.module.ts</code>)
+      </td>
+      <td>
+        <code>PasswordSettingsComponent</code>
+        <br><small>- embeds <code>ChangePasswordComponent</code></small>
+        <br><small>- embeds <code>InputPasswordComponent</code></small>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <br>
+        <strong>Upon Authentication</strong>
+        <br><br>
+        <ol>
+          <li>
+            <strong>Login with non-compliant MP after email accept</strong> <small>(🌐 web only)</small>
+            <p>User clicks an org email invite link and logs in with their MP that does not meet the org’s policy requirements.</p>
+          </li>
+          <br>
+          <li>
+            <strong>Login with non-compliant MP</strong>
+            <p>Existing org user logs in with their MP that does not meet updated org policy requirements.</p>
+          </li>
+          <br>
+          <li>
+            <strong>Login after Account Recovery</strong>
+            <p>User logs in after their MP was reset via Account Recovery.</p>
+          </li>
+        </ol>
+      </td>
+      <td><code>/change-password</code></td>
+      <td>
+        <code>ChangePasswordComponent</code>
+        <br><small>- embeds <code>InputPasswordComponent</code></small>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <br>
+        <strong>Emergency Access Takeover</strong>
+        <small>(<a href="https://bitwarden.com/help/emergency-access/">Docs</a>)</small>
+        <br>
+        <small>(🌐 web only)</small>
+        <br><br>
+        <p>Emergency access Grantee changes the MP for the Grantor.</p>
+        <br>
+      </td>
+      <td>Grantee opens dialog while on <code>/settings/emergency-access</code></td>
+      <td>
+        <code>EmergencyAccessTakeoverDialogComponent</code>
+        <br><small>- embeds <code>InputPasswordComponent</code></small>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <br>
+        <strong>Account Recovery</strong>
+        <small>(<a href="https://bitwarden.com/help/account-recovery/">Docs</a>)</small>
+        <br>
+        <small>(🌐 web only)</small>
+        <br><br>
+        <p>Org member with "manage account recovery" permission changes the MP for another org user via Account Recovery.</p>
+        <br>
+      </td>
+      <td>Org member opens dialog while on <code>/organizations/{org-id}/members</code></td>
+      <td>
+        <code>AccountRecoveryDialogComponent</code>
+        <br><small>- embeds <code>InputPasswordComponent</code></small>
+      </td>
+    </tr>
+  </tbody>
+</table>
diff --git a/libs/auth/src/angular/change-password/change-password.component.html b/libs/angular/src/auth/password-management/change-password/change-password.component.html
similarity index 67%
rename from libs/auth/src/angular/change-password/change-password.component.html
rename to libs/angular/src/auth/password-management/change-password/change-password.component.html
index fff873225be..7604ffacea7 100644
--- a/libs/auth/src/angular/change-password/change-password.component.html
+++ b/libs/angular/src/auth/password-management/change-password/change-password.component.html
@@ -6,6 +6,12 @@
   ></i>
   <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 } @else {
+  <bit-callout
+    *ngIf="this.forceSetPasswordReason !== ForceSetPasswordReason.AdminForcePasswordReset"
+    type="warning"
+    >{{ "changePasswordWarning" | i18n }}</bit-callout
+  >
+
   <auth-input-password
     [flow]="inputPasswordFlow"
     [email]="email"
@@ -15,6 +21,8 @@
     [inlineButtons]="true"
     [primaryButtonText]="{ key: 'changeMasterPassword' }"
     (onPasswordFormSubmit)="handlePasswordFormSubmit($event)"
+    [secondaryButtonText]="secondaryButtonText()"
+    (onSecondaryButtonClick)="logOut()"
   >
   </auth-input-password>
 }
diff --git a/libs/angular/src/auth/password-management/change-password/change-password.component.ts b/libs/angular/src/auth/password-management/change-password/change-password.component.ts
new file mode 100644
index 00000000000..78128962384
--- /dev/null
+++ b/libs/angular/src/auth/password-management/change-password/change-password.component.ts
@@ -0,0 +1,202 @@
+import { Component, Input, OnInit } from "@angular/core";
+import { firstValueFrom } from "rxjs";
+
+// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+// eslint-disable-next-line no-restricted-imports
+import {
+  InputPasswordComponent,
+  InputPasswordFlow,
+  PasswordInputResult,
+} from "@bitwarden/auth/angular";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { SyncService } from "@bitwarden/common/platform/sync";
+import { UserId } from "@bitwarden/common/types/guid";
+import {
+  AnonLayoutWrapperDataService,
+  DialogService,
+  ToastService,
+  Icons,
+  CalloutComponent,
+} from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+
+import { ChangePasswordService } from "./change-password.service.abstraction";
+
+/**
+ * Change Password Component
+ *
+ * NOTE: The change password component uses the input-password component which will show the
+ * current password input form in some flows, although it could be left off. This is intentional
+ * and by design to maintain a strong security posture as some flows could have the user
+ * end up at a change password without having one before.
+ */
+@Component({
+  selector: "auth-change-password",
+  templateUrl: "change-password.component.html",
+  imports: [InputPasswordComponent, I18nPipe, CalloutComponent],
+})
+export class ChangePasswordComponent implements OnInit {
+  @Input() inputPasswordFlow: InputPasswordFlow = InputPasswordFlow.ChangePassword;
+
+  activeAccount: Account | null = null;
+  email?: string;
+  userId?: UserId;
+  masterPasswordPolicyOptions?: MasterPasswordPolicyOptions;
+  initializing = true;
+  submitting = false;
+  formPromise?: Promise<any>;
+  forceSetPasswordReason: ForceSetPasswordReason = ForceSetPasswordReason.None;
+
+  protected readonly ForceSetPasswordReason = ForceSetPasswordReason;
+
+  constructor(
+    private accountService: AccountService,
+    private changePasswordService: ChangePasswordService,
+    private i18nService: I18nService,
+    private masterPasswordService: InternalMasterPasswordServiceAbstraction,
+    private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
+    private organizationInviteService: OrganizationInviteService,
+    private messagingService: MessagingService,
+    private policyService: PolicyService,
+    private toastService: ToastService,
+    private syncService: SyncService,
+    private dialogService: DialogService,
+    private logService: LogService,
+  ) {}
+
+  async ngOnInit() {
+    this.activeAccount = await firstValueFrom(this.accountService.activeAccount$);
+
+    if (!this.activeAccount) {
+      throw new Error("No active active account found while trying to change passwords.");
+    }
+
+    this.userId = this.activeAccount.id;
+    this.email = this.activeAccount.email;
+
+    if (!this.userId) {
+      throw new Error("userId not found");
+    }
+
+    this.masterPasswordPolicyOptions = await firstValueFrom(
+      this.policyService.masterPasswordPolicyOptions$(this.userId),
+    );
+
+    this.forceSetPasswordReason = await firstValueFrom(
+      this.masterPasswordService.forceSetPasswordReason$(this.userId),
+    );
+
+    if (this.forceSetPasswordReason === ForceSetPasswordReason.AdminForcePasswordReset) {
+      this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
+        pageIcon: Icons.LockIcon,
+        pageTitle: { key: "updateMasterPassword" },
+        pageSubtitle: { key: "accountRecoveryUpdateMasterPasswordSubtitle" },
+      });
+    } else if (this.forceSetPasswordReason === ForceSetPasswordReason.WeakMasterPassword) {
+      this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
+        pageIcon: Icons.LockIcon,
+        pageTitle: { key: "updateMasterPassword" },
+        pageSubtitle: { key: "updateMasterPasswordSubtitle" },
+        maxWidth: "lg",
+      });
+    }
+
+    this.initializing = false;
+  }
+
+  async logOut() {
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "logOut" },
+      content: { key: "logOutConfirmation" },
+      acceptButtonText: { key: "logOut" },
+      type: "warning",
+    });
+
+    if (confirmed) {
+      await this.organizationInviteService.clearOrganizationInvitation();
+
+      if (this.changePasswordService.clearDeeplinkState) {
+        await this.changePasswordService.clearDeeplinkState();
+      }
+
+      // TODO: PM-23515 eventually use the logout service instead of messaging service once it is available without circular dependencies
+      this.messagingService.send("logout");
+    }
+  }
+
+  async handlePasswordFormSubmit(passwordInputResult: PasswordInputResult) {
+    this.submitting = true;
+
+    try {
+      if (passwordInputResult.rotateUserKey) {
+        if (this.activeAccount == null) {
+          throw new Error("activeAccount not found");
+        }
+
+        if (
+          passwordInputResult.currentPassword == null ||
+          passwordInputResult.newPasswordHint == null
+        ) {
+          throw new Error("currentPassword or newPasswordHint not found");
+        }
+
+        await this.syncService.fullSync(true);
+
+        await this.changePasswordService.rotateUserKeyMasterPasswordAndEncryptedData(
+          passwordInputResult.currentPassword,
+          passwordInputResult.newPassword,
+          this.activeAccount,
+          passwordInputResult.newPasswordHint,
+        );
+      } else {
+        if (!this.userId) {
+          throw new Error("userId not found");
+        }
+
+        if (this.forceSetPasswordReason === ForceSetPasswordReason.AdminForcePasswordReset) {
+          await this.changePasswordService.changePasswordForAccountRecovery(
+            passwordInputResult,
+            this.userId,
+          );
+        } else {
+          await this.changePasswordService.changePassword(passwordInputResult, this.userId);
+        }
+
+        this.toastService.showToast({
+          variant: "success",
+          message: this.i18nService.t("masterPasswordChanged"),
+        });
+
+        // TODO: PM-23515 eventually use the logout service instead of messaging service once it is available without circular dependencies
+        this.messagingService.send("logout");
+      }
+    } catch (error) {
+      this.logService.error(error);
+      this.toastService.showToast({
+        variant: "error",
+        title: "",
+        message: this.i18nService.t("errorOccurred"),
+      });
+    } finally {
+      this.submitting = false;
+    }
+  }
+
+  /**
+   * Shows the logout button in the case of admin force reset password or weak password upon login.
+   */
+  protected secondaryButtonText(): { key: string } | undefined {
+    return this.forceSetPasswordReason === ForceSetPasswordReason.AdminForcePasswordReset ||
+      this.forceSetPasswordReason === ForceSetPasswordReason.WeakMasterPassword
+      ? { key: "logOut" }
+      : undefined;
+  }
+}
diff --git a/libs/auth/src/angular/change-password/change-password.service.abstraction.ts b/libs/angular/src/auth/password-management/change-password/change-password.service.abstraction.ts
similarity index 56%
rename from libs/auth/src/angular/change-password/change-password.service.abstraction.ts
rename to libs/angular/src/auth/password-management/change-password/change-password.service.abstraction.ts
index b036db439f8..2fd3bbae67a 100644
--- a/libs/auth/src/angular/change-password/change-password.service.abstraction.ts
+++ b/libs/angular/src/auth/password-management/change-password/change-password.service.abstraction.ts
@@ -1,3 +1,5 @@
+// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+// eslint-disable-next-line no-restricted-imports
 import { PasswordInputResult } from "@bitwarden/auth/angular";
 import { Account } from "@bitwarden/common/auth/abstractions/account.service";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -32,5 +34,29 @@ export abstract class ChangePasswordService {
    * @param userId the `userId`
    * @throws if the `userId`, `currentMasterKey`, or `currentServerMasterKeyHash` is not found
    */
-  abstract changePassword(passwordInputResult: PasswordInputResult, userId: UserId): Promise<void>;
+  abstract changePassword(
+    passwordInputResult: PasswordInputResult,
+    userId: UserId | null,
+  ): Promise<void>;
+
+  /**
+   * Changes the user's password and re-encrypts the user key with the `newMasterKey`.
+   * - Specifically, this method uses credentials from the `passwordInputResult` to:
+   *   1. Decrypt the user key with the `currentMasterKey`
+   *   2. Re-encrypt that user key with the `newMasterKey`, resulting in a `newMasterKeyEncryptedUserKey`
+   *   3. Build a `PasswordRequest` object that gets PUTed to `"/accounts/update-temp-password"` so that the
+   *        ForcePasswordReset gets set to false.
+   * @param passwordInputResult
+   * @param userId
+   */
+  abstract changePasswordForAccountRecovery(
+    passwordInputResult: PasswordInputResult,
+    userId: UserId,
+  ): Promise<void>;
+
+  /**
+   * Optional method that will clear up any deep link state.
+   * - Currently only used on the web change password service.
+   */
+  clearDeeplinkState?: () => Promise<void>;
 }
diff --git a/libs/auth/src/angular/change-password/default-change-password.service.spec.ts b/libs/angular/src/auth/password-management/change-password/default-change-password.service.spec.ts
similarity index 75%
rename from libs/auth/src/angular/change-password/default-change-password.service.spec.ts
rename to libs/angular/src/auth/password-management/change-password/default-change-password.service.spec.ts
index ab993859d70..78969c61610 100644
--- a/libs/auth/src/angular/change-password/default-change-password.service.spec.ts
+++ b/libs/angular/src/auth/password-management/change-password/default-change-password.service.spec.ts
@@ -1,5 +1,8 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
+// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+// eslint-disable-next-line no-restricted-imports
+import { PasswordInputResult } from "@bitwarden/auth/angular";
 import { Account } from "@bitwarden/common/auth/abstractions/account.service";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
@@ -9,8 +12,6 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { MasterKey, UserKey } from "@bitwarden/common/types/key";
 import { KeyService, PBKDF2KdfConfig } from "@bitwarden/key-management";
 
-import { PasswordInputResult } from "../input-password/password-input-result";
-
 import { ChangePasswordService } from "./change-password.service.abstraction";
 import { DefaultChangePasswordService } from "./default-change-password.service";
 
@@ -109,28 +110,28 @@ describe("DefaultChangePasswordService", () => {
     it("should throw if a currentMasterKey was not found", async () => {
       // Arrange
       const incorrectPasswordInputResult = { ...passwordInputResult };
-      incorrectPasswordInputResult.currentMasterKey = null;
+      incorrectPasswordInputResult.currentMasterKey = undefined;
 
       // Act
       const testFn = sut.changePassword(incorrectPasswordInputResult, userId);
 
       // Assert
       await expect(testFn).rejects.toThrow(
-        "currentMasterKey or currentServerMasterKeyHash not found",
+        "invalid PasswordInputResult credentials, could not change password",
       );
     });
 
     it("should throw if a currentServerMasterKeyHash was not found", async () => {
       // Arrange
       const incorrectPasswordInputResult = { ...passwordInputResult };
-      incorrectPasswordInputResult.currentServerMasterKeyHash = null;
+      incorrectPasswordInputResult.currentServerMasterKeyHash = undefined;
 
       // Act
       const testFn = sut.changePassword(incorrectPasswordInputResult, userId);
 
       // Assert
       await expect(testFn).rejects.toThrow(
-        "currentMasterKey or currentServerMasterKeyHash not found",
+        "invalid PasswordInputResult credentials, could not change password",
       );
     });
 
@@ -174,4 +175,43 @@ describe("DefaultChangePasswordService", () => {
       );
     });
   });
+
+  describe("changePasswordForAccountRecovery()", () => {
+    it("should call the putUpdateTempPassword() API method with the correct UpdateTempPasswordRequest credentials", async () => {
+      // Act
+      await sut.changePasswordForAccountRecovery(passwordInputResult, userId);
+
+      // Assert
+      expect(masterPasswordApiService.putUpdateTempPassword).toHaveBeenCalledWith(
+        expect.objectContaining({
+          newMasterPasswordHash: passwordInputResult.newServerMasterKeyHash,
+          masterPasswordHint: passwordInputResult.newPasswordHint,
+          key: newMasterKeyEncryptedUserKey[1].encryptedString,
+        }),
+      );
+    });
+
+    it("should throw an error if user key decryption fails", async () => {
+      // Arrange
+      masterPasswordService.decryptUserKeyWithMasterKey.mockResolvedValue(null);
+
+      // Act
+      const testFn = sut.changePasswordForAccountRecovery(passwordInputResult, userId);
+
+      // Assert
+      await expect(testFn).rejects.toThrow("Could not decrypt user key");
+    });
+
+    it("should throw an error if putUpdateTempPassword() fails", async () => {
+      // Arrange
+      masterPasswordApiService.putUpdateTempPassword.mockRejectedValueOnce(new Error("error"));
+
+      // Act
+      const testFn = sut.changePasswordForAccountRecovery(passwordInputResult, userId);
+
+      // Assert
+      await expect(testFn).rejects.toThrow("Could not change password");
+      expect(masterPasswordApiService.putUpdateTempPassword).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/libs/angular/src/auth/password-management/change-password/default-change-password.service.ts b/libs/angular/src/auth/password-management/change-password/default-change-password.service.ts
new file mode 100644
index 00000000000..888799d863a
--- /dev/null
+++ b/libs/angular/src/auth/password-management/change-password/default-change-password.service.ts
@@ -0,0 +1,112 @@
+// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+// eslint-disable-next-line no-restricted-imports
+import { PasswordInputResult } from "@bitwarden/auth/angular";
+import { Account } from "@bitwarden/common/auth/abstractions/account.service";
+import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
+import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request";
+import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { UserId } from "@bitwarden/common/types/guid";
+import { UserKey } from "@bitwarden/common/types/key";
+import { KeyService } from "@bitwarden/key-management";
+
+import { ChangePasswordService } from "./change-password.service.abstraction";
+
+export class DefaultChangePasswordService implements ChangePasswordService {
+  constructor(
+    protected keyService: KeyService,
+    protected masterPasswordApiService: MasterPasswordApiService,
+    protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
+  ) {}
+
+  async rotateUserKeyMasterPasswordAndEncryptedData(
+    currentPassword: string,
+    newPassword: string,
+    user: Account,
+    hint: string,
+  ): Promise<void> {
+    throw new Error("rotateUserKeyMasterPasswordAndEncryptedData() is only implemented in Web");
+  }
+
+  private async preparePasswordChange(
+    passwordInputResult: PasswordInputResult,
+    userId: UserId | null,
+    request: PasswordRequest | UpdateTempPasswordRequest,
+  ): Promise<[UserKey, EncString]> {
+    if (!userId) {
+      throw new Error("userId not found");
+    }
+    if (
+      !passwordInputResult.currentMasterKey ||
+      !passwordInputResult.currentServerMasterKeyHash ||
+      !passwordInputResult.newMasterKey ||
+      !passwordInputResult.newServerMasterKeyHash ||
+      passwordInputResult.newPasswordHint == null
+    ) {
+      throw new Error("invalid PasswordInputResult credentials, could not change password");
+    }
+
+    const decryptedUserKey = await this.masterPasswordService.decryptUserKeyWithMasterKey(
+      passwordInputResult.currentMasterKey,
+      userId,
+    );
+
+    if (decryptedUserKey == null) {
+      throw new Error("Could not decrypt user key");
+    }
+
+    const newKeyValue = await this.keyService.encryptUserKeyWithMasterKey(
+      passwordInputResult.newMasterKey,
+      decryptedUserKey,
+    );
+
+    if (request instanceof PasswordRequest) {
+      request.masterPasswordHash = passwordInputResult.currentServerMasterKeyHash;
+      request.newMasterPasswordHash = passwordInputResult.newServerMasterKeyHash;
+      request.masterPasswordHint = passwordInputResult.newPasswordHint;
+    } else if (request instanceof UpdateTempPasswordRequest) {
+      request.newMasterPasswordHash = passwordInputResult.newServerMasterKeyHash;
+      request.masterPasswordHint = passwordInputResult.newPasswordHint;
+    }
+
+    return newKeyValue;
+  }
+
+  async changePassword(passwordInputResult: PasswordInputResult, userId: UserId | null) {
+    const request = new PasswordRequest();
+
+    const newMasterKeyEncryptedUserKey = await this.preparePasswordChange(
+      passwordInputResult,
+      userId,
+      request,
+    );
+
+    request.key = newMasterKeyEncryptedUserKey[1].encryptedString as string;
+
+    try {
+      await this.masterPasswordApiService.postPassword(request);
+    } catch {
+      throw new Error("Could not change password");
+    }
+  }
+
+  async changePasswordForAccountRecovery(passwordInputResult: PasswordInputResult, userId: UserId) {
+    const request = new UpdateTempPasswordRequest();
+
+    const newMasterKeyEncryptedUserKey = await this.preparePasswordChange(
+      passwordInputResult,
+      userId,
+      request,
+    );
+
+    request.key = newMasterKeyEncryptedUserKey[1].encryptedString as string;
+
+    try {
+      // TODO: PM-23047 will look to consolidate this into the change password endpoint.
+      await this.masterPasswordApiService.putUpdateTempPassword(request);
+    } catch {
+      throw new Error("Could not change password");
+    }
+  }
+}
diff --git a/libs/angular/src/auth/password-management/change-password/index.ts b/libs/angular/src/auth/password-management/change-password/index.ts
new file mode 100644
index 00000000000..32734d39bc0
--- /dev/null
+++ b/libs/angular/src/auth/password-management/change-password/index.ts
@@ -0,0 +1,3 @@
+export * from "./change-password.component";
+export * from "./change-password.service.abstraction";
+export * from "./default-change-password.service";
diff --git a/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts b/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts
new file mode 100644
index 00000000000..dd81f560939
--- /dev/null
+++ b/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts
@@ -0,0 +1,290 @@
+import { firstValueFrom } from "rxjs";
+
+// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+// eslint-disable-next-line no-restricted-imports
+import {
+  OrganizationUserApiService,
+  OrganizationUserResetPasswordEnrollmentRequest,
+} from "@bitwarden/admin-console/common";
+// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+// eslint-disable-next-line no-restricted-imports
+import { InternalUserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
+import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
+import { SetPasswordRequest } from "@bitwarden/common/auth/models/request/set-password.request";
+import { UpdateTdeOffboardingPasswordRequest } from "@bitwarden/common/auth/models/request/update-tde-offboarding-password.request";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { KeysRequest } from "@bitwarden/common/models/request/keys.request";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { UserId } from "@bitwarden/common/types/guid";
+import { MasterKey, UserKey } from "@bitwarden/common/types/key";
+import { KdfConfigService, KeyService, KdfConfig } from "@bitwarden/key-management";
+
+import {
+  SetInitialPasswordService,
+  SetInitialPasswordCredentials,
+  SetInitialPasswordUserType,
+  SetInitialPasswordTdeOffboardingCredentials,
+} from "./set-initial-password.service.abstraction";
+
+export class DefaultSetInitialPasswordService implements SetInitialPasswordService {
+  constructor(
+    protected apiService: ApiService,
+    protected encryptService: EncryptService,
+    protected i18nService: I18nService,
+    protected kdfConfigService: KdfConfigService,
+    protected keyService: KeyService,
+    protected masterPasswordApiService: MasterPasswordApiService,
+    protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
+    protected organizationApiService: OrganizationApiServiceAbstraction,
+    protected organizationUserApiService: OrganizationUserApiService,
+    protected userDecryptionOptionsService: InternalUserDecryptionOptionsServiceAbstraction,
+  ) {}
+
+  async setInitialPassword(
+    credentials: SetInitialPasswordCredentials,
+    userType: SetInitialPasswordUserType,
+    userId: UserId,
+  ): Promise<void> {
+    const {
+      newMasterKey,
+      newServerMasterKeyHash,
+      newLocalMasterKeyHash,
+      newPasswordHint,
+      kdfConfig,
+      orgSsoIdentifier,
+      orgId,
+      resetPasswordAutoEnroll,
+    } = credentials;
+
+    for (const [key, value] of Object.entries(credentials)) {
+      if (value == null) {
+        throw new Error(`${key} not found. Could not set password.`);
+      }
+    }
+    if (userId == null) {
+      throw new Error("userId not found. Could not set password.");
+    }
+    if (userType == null) {
+      throw new Error("userType not found. Could not set password.");
+    }
+
+    const masterKeyEncryptedUserKey = await this.makeMasterKeyEncryptedUserKey(
+      newMasterKey,
+      userId,
+    );
+    if (masterKeyEncryptedUserKey == null || !masterKeyEncryptedUserKey[1].encryptedString) {
+      throw new Error("masterKeyEncryptedUserKey not found. Could not set password.");
+    }
+
+    let keyPair: [string, EncString] | null = null;
+    let keysRequest: KeysRequest | null = null;
+
+    if (userType === SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER) {
+      /**
+       * A user being JIT provisioned into a MP encryption org does not yet have a user
+       * asymmetric key pair, so we create it for them here.
+       *
+       * Sidenote:
+       *   In the case of a TDE user whose permissions require that they have a MP - that user
+       *   will already have a user asymmetric key pair by this point, so we skip this if-block
+       *   so that we don't create a new key pair for them.
+       */
+
+      // Extra safety check (see description on https://github.com/bitwarden/clients/pull/10180):
+      //   In case we have have a local private key and are not sure whether it has been posted to the server,
+      //   we post the local private key instead of generating a new one
+      const existingUserPrivateKey = (await firstValueFrom(
+        this.keyService.userPrivateKey$(userId),
+      )) as Uint8Array;
+
+      const existingUserPublicKey = await firstValueFrom(this.keyService.userPublicKey$(userId));
+
+      if (existingUserPrivateKey != null && existingUserPublicKey != null) {
+        const existingUserPublicKeyB64 = Utils.fromBufferToB64(existingUserPublicKey);
+
+        // Existing key pair
+        keyPair = [
+          existingUserPublicKeyB64,
+          await this.encryptService.wrapDecapsulationKey(
+            existingUserPrivateKey,
+            masterKeyEncryptedUserKey[0],
+          ),
+        ];
+      } else {
+        // New key pair
+        keyPair = await this.keyService.makeKeyPair(masterKeyEncryptedUserKey[0]);
+      }
+
+      if (keyPair == null) {
+        throw new Error("keyPair not found. Could not set password.");
+      }
+      if (!keyPair[1].encryptedString) {
+        throw new Error("encrypted private key not found. Could not set password.");
+      }
+
+      keysRequest = new KeysRequest(keyPair[0], keyPair[1].encryptedString);
+    }
+
+    const request = new SetPasswordRequest(
+      newServerMasterKeyHash,
+      masterKeyEncryptedUserKey[1].encryptedString,
+      newPasswordHint,
+      orgSsoIdentifier,
+      keysRequest,
+      kdfConfig.kdfType,
+      kdfConfig.iterations,
+    );
+
+    await this.masterPasswordApiService.setPassword(request);
+
+    // Clear force set password reason to allow navigation back to vault.
+    await this.masterPasswordService.setForceSetPasswordReason(ForceSetPasswordReason.None, userId);
+
+    // User now has a password so update account decryption options in state
+    await this.updateAccountDecryptionProperties(
+      newMasterKey,
+      kdfConfig,
+      masterKeyEncryptedUserKey,
+      userId,
+    );
+
+    /**
+     * Set the private key only for new JIT provisioned users in MP encryption orgs.
+     * (Existing TDE users will have their private key set on sync or on login.)
+     */
+    if (keyPair != null && userType === SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER) {
+      if (!keyPair[1].encryptedString) {
+        throw new Error("encrypted private key not found. Could not set private key in state.");
+      }
+      await this.keyService.setPrivateKey(keyPair[1].encryptedString, userId);
+    }
+
+    await this.masterPasswordService.setMasterKeyHash(newLocalMasterKeyHash, userId);
+
+    if (resetPasswordAutoEnroll) {
+      await this.handleResetPasswordAutoEnroll(newServerMasterKeyHash, orgId, userId);
+    }
+  }
+
+  private async makeMasterKeyEncryptedUserKey(
+    masterKey: MasterKey,
+    userId: UserId,
+  ): Promise<[UserKey, EncString]> {
+    let masterKeyEncryptedUserKey: [UserKey, EncString] | null = null;
+
+    const userKey = await firstValueFrom(this.keyService.userKey$(userId));
+
+    if (userKey == null) {
+      masterKeyEncryptedUserKey = await this.keyService.makeUserKey(masterKey);
+    } else {
+      masterKeyEncryptedUserKey = await this.keyService.encryptUserKeyWithMasterKey(masterKey);
+    }
+
+    return masterKeyEncryptedUserKey;
+  }
+
+  private async updateAccountDecryptionProperties(
+    masterKey: MasterKey,
+    kdfConfig: KdfConfig,
+    masterKeyEncryptedUserKey: [UserKey, EncString],
+    userId: UserId,
+  ) {
+    const userDecryptionOpts = await firstValueFrom(
+      this.userDecryptionOptionsService.userDecryptionOptions$,
+    );
+    userDecryptionOpts.hasMasterPassword = true;
+    await this.userDecryptionOptionsService.setUserDecryptionOptions(userDecryptionOpts);
+    await this.kdfConfigService.setKdfConfig(userId, kdfConfig);
+    await this.masterPasswordService.setMasterKey(masterKey, userId);
+    await this.keyService.setUserKey(masterKeyEncryptedUserKey[0], userId);
+  }
+
+  private async handleResetPasswordAutoEnroll(
+    masterKeyHash: string,
+    orgId: string,
+    userId: UserId,
+  ) {
+    const organizationKeys = await this.organizationApiService.getKeys(orgId);
+
+    if (organizationKeys == null) {
+      throw new Error(
+        "Organization keys response is null. Could not handle reset password auto enroll.",
+      );
+    }
+
+    const orgPublicKey = Utils.fromB64ToArray(organizationKeys.publicKey);
+    const userKey = await firstValueFrom(this.keyService.userKey$(userId));
+
+    if (userKey == null) {
+      throw new Error("userKey not found. Could not handle reset password auto enroll.");
+    }
+
+    // RSA encrypt user key with organization public key
+    const orgPublicKeyEncryptedUserKey = await this.encryptService.encapsulateKeyUnsigned(
+      userKey,
+      orgPublicKey,
+    );
+
+    if (orgPublicKeyEncryptedUserKey == null || !orgPublicKeyEncryptedUserKey.encryptedString) {
+      throw new Error(
+        "orgPublicKeyEncryptedUserKey not found. Could not handle reset password auto enroll.",
+      );
+    }
+
+    const enrollmentRequest = new OrganizationUserResetPasswordEnrollmentRequest();
+    enrollmentRequest.masterPasswordHash = masterKeyHash;
+    enrollmentRequest.resetPasswordKey = orgPublicKeyEncryptedUserKey.encryptedString;
+
+    await this.organizationUserApiService.putOrganizationUserResetPasswordEnrollment(
+      orgId,
+      userId,
+      enrollmentRequest,
+    );
+  }
+
+  async setInitialPasswordTdeOffboarding(
+    credentials: SetInitialPasswordTdeOffboardingCredentials,
+    userId: UserId,
+  ) {
+    const { newMasterKey, newServerMasterKeyHash, newPasswordHint } = credentials;
+    for (const [key, value] of Object.entries(credentials)) {
+      if (value == null) {
+        throw new Error(`${key} not found. Could not set password.`);
+      }
+    }
+
+    if (userId == null) {
+      throw new Error("userId not found. Could not set password.");
+    }
+
+    const userKey = await firstValueFrom(this.keyService.userKey$(userId));
+    if (userKey == null) {
+      throw new Error("userKey not found. Could not set password.");
+    }
+
+    const newMasterKeyEncryptedUserKey = await this.keyService.encryptUserKeyWithMasterKey(
+      newMasterKey,
+      userKey,
+    );
+
+    if (!newMasterKeyEncryptedUserKey[1].encryptedString) {
+      throw new Error("newMasterKeyEncryptedUserKey not found. Could not set password.");
+    }
+
+    const request = new UpdateTdeOffboardingPasswordRequest();
+    request.key = newMasterKeyEncryptedUserKey[1].encryptedString;
+    request.newMasterPasswordHash = newServerMasterKeyHash;
+    request.masterPasswordHint = newPasswordHint;
+
+    await this.masterPasswordApiService.putUpdateTdeOffboardingPassword(request);
+
+    // Clear force set password reason to allow navigation back to vault.
+    await this.masterPasswordService.setForceSetPasswordReason(ForceSetPasswordReason.None, userId);
+  }
+}
diff --git a/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.spec.ts b/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.spec.ts
new file mode 100644
index 00000000000..979dc5ee82f
--- /dev/null
+++ b/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.spec.ts
@@ -0,0 +1,745 @@
+import { MockProxy, mock } from "jest-mock-extended";
+import { BehaviorSubject, of } from "rxjs";
+
+// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+// eslint-disable-next-line no-restricted-imports
+import {
+  OrganizationUserApiService,
+  OrganizationUserResetPasswordEnrollmentRequest,
+} from "@bitwarden/admin-console/common";
+// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+// eslint-disable-next-line no-restricted-imports
+import {
+  FakeUserDecryptionOptions as UserDecryptionOptions,
+  InternalUserDecryptionOptionsServiceAbstraction,
+} from "@bitwarden/auth/common";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { OrganizationKeysResponse } from "@bitwarden/common/admin-console/models/response/organization-keys.response";
+import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
+import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
+import { SetPasswordRequest } from "@bitwarden/common/auth/models/request/set-password.request";
+import { UpdateTdeOffboardingPasswordRequest } from "@bitwarden/common/auth/models/request/update-tde-offboarding-password.request";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { KeysRequest } from "@bitwarden/common/models/request/keys.request";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { EncryptedString, EncString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { CsprngArray } from "@bitwarden/common/types/csprng";
+import { UserId } from "@bitwarden/common/types/guid";
+import { MasterKey, UserKey, UserPrivateKey, UserPublicKey } from "@bitwarden/common/types/key";
+import { DEFAULT_KDF_CONFIG, KdfConfigService, KeyService } from "@bitwarden/key-management";
+
+import { DefaultSetInitialPasswordService } from "./default-set-initial-password.service.implementation";
+import {
+  SetInitialPasswordCredentials,
+  SetInitialPasswordService,
+  SetInitialPasswordTdeOffboardingCredentials,
+  SetInitialPasswordUserType,
+} from "./set-initial-password.service.abstraction";
+
+describe("DefaultSetInitialPasswordService", () => {
+  let sut: SetInitialPasswordService;
+
+  let apiService: MockProxy<ApiService>;
+  let encryptService: MockProxy<EncryptService>;
+  let i18nService: MockProxy<I18nService>;
+  let kdfConfigService: MockProxy<KdfConfigService>;
+  let keyService: MockProxy<KeyService>;
+  let masterPasswordApiService: MockProxy<MasterPasswordApiService>;
+  let masterPasswordService: MockProxy<InternalMasterPasswordServiceAbstraction>;
+  let organizationApiService: MockProxy<OrganizationApiServiceAbstraction>;
+  let organizationUserApiService: MockProxy<OrganizationUserApiService>;
+  let userDecryptionOptionsService: MockProxy<InternalUserDecryptionOptionsServiceAbstraction>;
+
+  let userId: UserId;
+  let userKey: UserKey;
+  let userKeyEncString: EncString;
+  let masterKeyEncryptedUserKey: [UserKey, EncString];
+
+  beforeEach(() => {
+    apiService = mock<ApiService>();
+    encryptService = mock<EncryptService>();
+    i18nService = mock<I18nService>();
+    kdfConfigService = mock<KdfConfigService>();
+    keyService = mock<KeyService>();
+    masterPasswordApiService = mock<MasterPasswordApiService>();
+    masterPasswordService = mock<InternalMasterPasswordServiceAbstraction>();
+    organizationApiService = mock<OrganizationApiServiceAbstraction>();
+    organizationUserApiService = mock<OrganizationUserApiService>();
+    userDecryptionOptionsService = mock<InternalUserDecryptionOptionsServiceAbstraction>();
+
+    userId = "userId" as UserId;
+    userKey = new SymmetricCryptoKey(new Uint8Array(64).buffer as CsprngArray) as UserKey;
+    userKeyEncString = new EncString("masterKeyEncryptedUserKey");
+    masterKeyEncryptedUserKey = [userKey, userKeyEncString];
+
+    sut = new DefaultSetInitialPasswordService(
+      apiService,
+      encryptService,
+      i18nService,
+      kdfConfigService,
+      keyService,
+      masterPasswordApiService,
+      masterPasswordService,
+      organizationApiService,
+      organizationUserApiService,
+      userDecryptionOptionsService,
+    );
+  });
+
+  it("should instantiate", () => {
+    expect(sut).not.toBeFalsy();
+  });
+
+  describe("setInitialPassword(...)", () => {
+    // Mock function parameters
+    let credentials: SetInitialPasswordCredentials;
+    let userType: SetInitialPasswordUserType;
+
+    // Mock other function data
+    let existingUserPublicKey: UserPublicKey;
+    let existingUserPrivateKey: UserPrivateKey;
+    let userKeyEncryptedPrivateKey: EncString;
+
+    let keyPair: [string, EncString];
+    let keysRequest: KeysRequest;
+
+    let organizationKeys: OrganizationKeysResponse;
+    let orgPublicKeyEncryptedUserKey: EncString;
+
+    let userDecryptionOptions: UserDecryptionOptions;
+    let userDecryptionOptionsSubject: BehaviorSubject<UserDecryptionOptions>;
+    let setPasswordRequest: SetPasswordRequest;
+
+    let enrollmentRequest: OrganizationUserResetPasswordEnrollmentRequest;
+
+    beforeEach(() => {
+      // Mock function parameters
+      credentials = {
+        newMasterKey: new SymmetricCryptoKey(new Uint8Array(32).buffer as CsprngArray) as MasterKey,
+        newServerMasterKeyHash: "newServerMasterKeyHash",
+        newLocalMasterKeyHash: "newLocalMasterKeyHash",
+        newPasswordHint: "newPasswordHint",
+        kdfConfig: DEFAULT_KDF_CONFIG,
+        orgSsoIdentifier: "orgSsoIdentifier",
+        orgId: "orgId",
+        resetPasswordAutoEnroll: false,
+      };
+      userType = SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER;
+
+      // Mock other function data
+      existingUserPublicKey = Utils.fromB64ToArray("existingUserPublicKey") as UserPublicKey;
+      existingUserPrivateKey = Utils.fromB64ToArray("existingUserPrivateKey") as UserPrivateKey;
+      userKeyEncryptedPrivateKey = new EncString("userKeyEncryptedPrivateKey");
+
+      keyPair = ["publicKey", new EncString("privateKey")];
+      keysRequest = new KeysRequest(keyPair[0], keyPair[1].encryptedString);
+
+      organizationKeys = {
+        privateKey: "orgPrivateKey",
+        publicKey: "orgPublicKey",
+      } as OrganizationKeysResponse;
+      orgPublicKeyEncryptedUserKey = new EncString("orgPublicKeyEncryptedUserKey");
+
+      userDecryptionOptions = new UserDecryptionOptions({ hasMasterPassword: true });
+      userDecryptionOptionsSubject = new BehaviorSubject(userDecryptionOptions);
+      userDecryptionOptionsService.userDecryptionOptions$ = userDecryptionOptionsSubject;
+
+      setPasswordRequest = new SetPasswordRequest(
+        credentials.newServerMasterKeyHash,
+        masterKeyEncryptedUserKey[1].encryptedString,
+        credentials.newPasswordHint,
+        credentials.orgSsoIdentifier,
+        keysRequest,
+        credentials.kdfConfig.kdfType,
+        credentials.kdfConfig.iterations,
+      );
+
+      enrollmentRequest = new OrganizationUserResetPasswordEnrollmentRequest();
+      enrollmentRequest.masterPasswordHash = credentials.newServerMasterKeyHash;
+      enrollmentRequest.resetPasswordKey = orgPublicKeyEncryptedUserKey.encryptedString;
+    });
+
+    interface MockConfig {
+      userType: SetInitialPasswordUserType;
+      userHasUserKey: boolean;
+      userHasLocalKeyPair: boolean;
+      resetPasswordAutoEnroll: boolean;
+    }
+
+    const defaultMockConfig: MockConfig = {
+      userType: SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER,
+      userHasUserKey: true,
+      userHasLocalKeyPair: false,
+      resetPasswordAutoEnroll: false,
+    };
+
+    function setupMocks(config: MockConfig = defaultMockConfig) {
+      // Mock makeMasterKeyEncryptedUserKey() values
+      if (config.userHasUserKey) {
+        keyService.userKey$.mockReturnValue(of(userKey));
+        keyService.encryptUserKeyWithMasterKey.mockResolvedValue(masterKeyEncryptedUserKey);
+      } else {
+        keyService.userKey$.mockReturnValue(of(null));
+        keyService.makeUserKey.mockResolvedValue(masterKeyEncryptedUserKey);
+      }
+
+      // Mock keyPair values
+      if (config.userType === SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER) {
+        if (config.userHasLocalKeyPair) {
+          keyService.userPrivateKey$.mockReturnValue(of(existingUserPrivateKey));
+          keyService.userPublicKey$.mockReturnValue(of(existingUserPublicKey));
+          encryptService.wrapDecapsulationKey.mockResolvedValue(userKeyEncryptedPrivateKey);
+        } else {
+          keyService.userPrivateKey$.mockReturnValue(of(null));
+          keyService.userPublicKey$.mockReturnValue(of(null));
+          keyService.makeKeyPair.mockResolvedValue(keyPair);
+        }
+      }
+
+      // Mock handleResetPasswordAutoEnroll() values
+      if (config.resetPasswordAutoEnroll) {
+        organizationApiService.getKeys.mockResolvedValue(organizationKeys);
+        encryptService.encapsulateKeyUnsigned.mockResolvedValue(orgPublicKeyEncryptedUserKey);
+        keyService.userKey$.mockReturnValue(of(userKey));
+      }
+    }
+
+    describe("general error handling", () => {
+      [
+        "newMasterKey",
+        "newServerMasterKeyHash",
+        "newLocalMasterKeyHash",
+        "newPasswordHint",
+        "kdfConfig",
+        "orgSsoIdentifier",
+        "orgId",
+        "resetPasswordAutoEnroll",
+      ].forEach((key) => {
+        it(`should throw if ${key} is not provided on the SetInitialPasswordCredentials object`, async () => {
+          // Arrange
+          const invalidCredentials: SetInitialPasswordCredentials = {
+            ...credentials,
+            [key]: null,
+          };
+
+          // Act
+          const promise = sut.setInitialPassword(invalidCredentials, userType, userId);
+
+          // Assert
+          await expect(promise).rejects.toThrow(`${key} not found. Could not set password.`);
+        });
+      });
+
+      ["userId", "userType"].forEach((param) => {
+        it(`should throw if ${param} was not passed in`, async () => {
+          // Arrange & Act
+          const promise = sut.setInitialPassword(
+            credentials,
+            param === "userType" ? null : userType,
+            param === "userId" ? null : userId,
+          );
+
+          // Assert
+          await expect(promise).rejects.toThrow(`${param} not found. Could not set password.`);
+        });
+      });
+    });
+
+    describe("given SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER", () => {
+      beforeEach(() => {
+        userType = SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER;
+      });
+
+      describe("given the user has an existing local key pair", () => {
+        it("should NOT create a brand new key pair for the user", async () => {
+          // Arrange
+          setPasswordRequest.keys = {
+            encryptedPrivateKey: userKeyEncryptedPrivateKey.encryptedString,
+            publicKey: Utils.fromBufferToB64(existingUserPublicKey),
+          };
+
+          setupMocks({ ...defaultMockConfig, userHasLocalKeyPair: true });
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+          expect(keyService.userPrivateKey$).toHaveBeenCalledWith(userId);
+          expect(keyService.userPublicKey$).toHaveBeenCalledWith(userId);
+          expect(encryptService.wrapDecapsulationKey).toHaveBeenCalledWith(
+            existingUserPrivateKey,
+            masterKeyEncryptedUserKey[0],
+          );
+          expect(keyService.makeKeyPair).not.toHaveBeenCalled();
+        });
+      });
+
+      describe("given the user has a userKey", () => {
+        it("should successfully set an initial password", async () => {
+          // Arrange
+          setupMocks();
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+        });
+      });
+
+      describe("given the user does NOT have a userKey", () => {
+        it("should successfully set an initial password", async () => {
+          // Arrange
+          setupMocks({ ...defaultMockConfig, userHasUserKey: false });
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+        });
+      });
+
+      it("should throw if a key pair is not found", async () => {
+        // Arrange
+        keyPair = null;
+
+        setupMocks();
+
+        // Act
+        const promise = sut.setInitialPassword(credentials, userType, userId);
+
+        // Assert
+        await expect(promise).rejects.toThrow("keyPair not found. Could not set password.");
+        expect(masterPasswordApiService.setPassword).not.toHaveBeenCalled();
+      });
+
+      it("should throw if an encrypted private key is not found", async () => {
+        // Arrange
+        keyPair[1].encryptedString = "" as EncryptedString;
+
+        setupMocks();
+
+        // Act
+        const promise = sut.setInitialPassword(credentials, userType, userId);
+
+        // Assert
+        await expect(promise).rejects.toThrow(
+          "encrypted private key not found. Could not set password.",
+        );
+        expect(masterPasswordApiService.setPassword).not.toHaveBeenCalled();
+      });
+
+      describe("given the initial password has been successfully set", () => {
+        it("should clear the ForceSetPasswordReason by setting it to None", async () => {
+          // Arrange
+          setupMocks();
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+          expect(masterPasswordService.setForceSetPasswordReason).toHaveBeenCalledWith(
+            ForceSetPasswordReason.None,
+            userId,
+          );
+        });
+
+        it("should update account decryption properties", async () => {
+          // Arrange
+          setupMocks();
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+          expect(userDecryptionOptionsService.setUserDecryptionOptions).toHaveBeenCalledWith(
+            userDecryptionOptions,
+          );
+          expect(kdfConfigService.setKdfConfig).toHaveBeenCalledWith(userId, credentials.kdfConfig);
+          expect(masterPasswordService.setMasterKey).toHaveBeenCalledWith(
+            credentials.newMasterKey,
+            userId,
+          );
+          expect(keyService.setUserKey).toHaveBeenCalledWith(masterKeyEncryptedUserKey[0], userId);
+        });
+
+        it("should set the private key to state", async () => {
+          // Arrange
+          setupMocks();
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+          expect(keyService.setPrivateKey).toHaveBeenCalledWith(keyPair[1].encryptedString, userId);
+        });
+
+        it("should set the local master key hash to state", async () => {
+          // Arrange
+          setupMocks();
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+          expect(masterPasswordService.setMasterKeyHash).toHaveBeenCalledWith(
+            credentials.newLocalMasterKeyHash,
+            userId,
+          );
+        });
+
+        describe("given resetPasswordAutoEnroll is true", () => {
+          it(`should handle reset password (account recovery) auto enroll`, async () => {
+            // Arrange
+            credentials.resetPasswordAutoEnroll = true;
+
+            setupMocks({ ...defaultMockConfig, resetPasswordAutoEnroll: true });
+
+            // Act
+            await sut.setInitialPassword(credentials, userType, userId);
+
+            // Assert
+            expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+            expect(
+              organizationUserApiService.putOrganizationUserResetPasswordEnrollment,
+            ).toHaveBeenCalledWith(credentials.orgId, userId, enrollmentRequest);
+          });
+
+          it("should throw if organization keys are not found", async () => {
+            // Arrange
+            credentials.resetPasswordAutoEnroll = true;
+            organizationKeys = null;
+
+            setupMocks({ ...defaultMockConfig, resetPasswordAutoEnroll: true });
+
+            // Act
+            const promise = sut.setInitialPassword(credentials, userType, userId);
+
+            // Assert
+            await expect(promise).rejects.toThrow(
+              "Organization keys response is null. Could not handle reset password auto enroll.",
+            );
+            expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+            expect(
+              organizationUserApiService.putOrganizationUserResetPasswordEnrollment,
+            ).not.toHaveBeenCalled();
+          });
+
+          ["orgPublicKeyEncryptedUserKey", "orgPublicKeyEncryptedUserKey.encryptedString"].forEach(
+            (property) => {
+              it("should throw if orgPublicKeyEncryptedUserKey is not found", async () => {
+                // Arrange
+                credentials.resetPasswordAutoEnroll = true;
+
+                if (property === "orgPublicKeyEncryptedUserKey") {
+                  orgPublicKeyEncryptedUserKey = null;
+                } else {
+                  orgPublicKeyEncryptedUserKey.encryptedString = "" as EncryptedString;
+                }
+
+                setupMocks({ ...defaultMockConfig, resetPasswordAutoEnroll: true });
+
+                // Act
+                const promise = sut.setInitialPassword(credentials, userType, userId);
+
+                // Assert
+                await expect(promise).rejects.toThrow(
+                  "orgPublicKeyEncryptedUserKey not found. Could not handle reset password auto enroll.",
+                );
+                expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(
+                  setPasswordRequest,
+                );
+                expect(
+                  organizationUserApiService.putOrganizationUserResetPasswordEnrollment,
+                ).not.toHaveBeenCalled();
+              });
+            },
+          );
+        });
+
+        describe("given resetPasswordAutoEnroll is false", () => {
+          it(`should NOT handle reset password (account recovery) auto enroll`, async () => {
+            // Arrange
+            credentials.resetPasswordAutoEnroll = false;
+
+            setupMocks();
+
+            // Act
+            await sut.setInitialPassword(credentials, userType, userId);
+
+            // Assert
+            expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+            expect(
+              organizationUserApiService.putOrganizationUserResetPasswordEnrollment,
+            ).not.toHaveBeenCalled();
+          });
+        });
+      });
+    });
+
+    describe("given SetInitialPasswordUserType.TDE_ORG_USER_RESET_PASSWORD_PERMISSION_REQUIRES_MP", () => {
+      beforeEach(() => {
+        userType = SetInitialPasswordUserType.TDE_ORG_USER_RESET_PASSWORD_PERMISSION_REQUIRES_MP;
+        setPasswordRequest.keys = null;
+      });
+
+      it("should NOT generate a keyPair", async () => {
+        // Arrange
+        setupMocks({ ...defaultMockConfig, userType });
+
+        // Act
+        await sut.setInitialPassword(credentials, userType, userId);
+
+        // Assert
+        expect(keyService.userPrivateKey$).not.toHaveBeenCalled();
+        expect(keyService.userPublicKey$).not.toHaveBeenCalled();
+        expect(encryptService.wrapDecapsulationKey).not.toHaveBeenCalled();
+        expect(keyService.makeKeyPair).not.toHaveBeenCalled();
+      });
+
+      describe("given the user has a userKey", () => {
+        it("should successfully set an initial password", async () => {
+          // Arrange
+          setupMocks({ ...defaultMockConfig, userType });
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+        });
+      });
+
+      describe("given the user does NOT have a userKey", () => {
+        it("should successfully set an initial password", async () => {
+          // Arrange
+          setupMocks({ ...defaultMockConfig, userType });
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+        });
+      });
+
+      describe("given the initial password has been successfully set", () => {
+        it("should clear the ForceSetPasswordReason by setting it to None", async () => {
+          // Arrange
+          setupMocks({ ...defaultMockConfig, userType });
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+          expect(masterPasswordService.setForceSetPasswordReason).toHaveBeenCalledWith(
+            ForceSetPasswordReason.None,
+            userId,
+          );
+        });
+
+        it("should update account decryption properties", async () => {
+          // Arrange
+          setupMocks({ ...defaultMockConfig, userType });
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+          expect(userDecryptionOptionsService.setUserDecryptionOptions).toHaveBeenCalledWith(
+            userDecryptionOptions,
+          );
+          expect(kdfConfigService.setKdfConfig).toHaveBeenCalledWith(userId, credentials.kdfConfig);
+          expect(masterPasswordService.setMasterKey).toHaveBeenCalledWith(
+            credentials.newMasterKey,
+            userId,
+          );
+          expect(keyService.setUserKey).toHaveBeenCalledWith(masterKeyEncryptedUserKey[0], userId);
+        });
+
+        it("should NOT set the private key to state", async () => {
+          // Arrange
+          setupMocks({ ...defaultMockConfig, userType });
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+          expect(keyService.setPrivateKey).not.toHaveBeenCalled();
+        });
+
+        it("should set the local master key hash to state", async () => {
+          // Arrange
+          setupMocks({ ...defaultMockConfig, userType });
+
+          // Act
+          await sut.setInitialPassword(credentials, userType, userId);
+
+          // Assert
+          expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+          expect(masterPasswordService.setMasterKeyHash).toHaveBeenCalledWith(
+            credentials.newLocalMasterKeyHash,
+            userId,
+          );
+        });
+
+        describe("given resetPasswordAutoEnroll is true", () => {
+          it(`should handle reset password (account recovery) auto enroll`, async () => {
+            // Arrange
+            credentials.resetPasswordAutoEnroll = true;
+
+            setupMocks({ ...defaultMockConfig, userType, resetPasswordAutoEnroll: true });
+
+            // Act
+            await sut.setInitialPassword(credentials, userType, userId);
+
+            // Assert
+            expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+            expect(
+              organizationUserApiService.putOrganizationUserResetPasswordEnrollment,
+            ).toHaveBeenCalledWith(credentials.orgId, userId, enrollmentRequest);
+          });
+        });
+
+        describe("given resetPasswordAutoEnroll is false", () => {
+          it(`should NOT handle reset password (account recovery) auto enroll`, async () => {
+            // Arrange
+            setupMocks({ ...defaultMockConfig, userType });
+
+            // Act
+            await sut.setInitialPassword(credentials, userType, userId);
+
+            // Assert
+            expect(masterPasswordApiService.setPassword).toHaveBeenCalledWith(setPasswordRequest);
+            expect(
+              organizationUserApiService.putOrganizationUserResetPasswordEnrollment,
+            ).not.toHaveBeenCalled();
+          });
+        });
+      });
+    });
+  });
+
+  describe("setInitialPasswordTdeOffboarding(...)", () => {
+    // Mock function parameters
+    let credentials: SetInitialPasswordTdeOffboardingCredentials;
+
+    beforeEach(() => {
+      // Mock function parameters
+      credentials = {
+        newMasterKey: new SymmetricCryptoKey(new Uint8Array(32).buffer as CsprngArray) as MasterKey,
+        newServerMasterKeyHash: "newServerMasterKeyHash",
+        newPasswordHint: "newPasswordHint",
+      };
+    });
+
+    function setupTdeOffboardingMocks() {
+      keyService.userKey$.mockReturnValue(of(userKey));
+      keyService.encryptUserKeyWithMasterKey.mockResolvedValue(masterKeyEncryptedUserKey);
+    }
+
+    it("should successfully set an initial password for the TDE offboarding user", async () => {
+      // Arrange
+      setupTdeOffboardingMocks();
+
+      const request = new UpdateTdeOffboardingPasswordRequest();
+      request.key = masterKeyEncryptedUserKey[1].encryptedString;
+      request.newMasterPasswordHash = credentials.newServerMasterKeyHash;
+      request.masterPasswordHint = credentials.newPasswordHint;
+
+      // Act
+      await sut.setInitialPasswordTdeOffboarding(credentials, userId);
+
+      // Assert
+      expect(masterPasswordApiService.putUpdateTdeOffboardingPassword).toHaveBeenCalledTimes(1);
+      expect(masterPasswordApiService.putUpdateTdeOffboardingPassword).toHaveBeenCalledWith(
+        request,
+      );
+    });
+
+    describe("given the initial password has been successfully set", () => {
+      it("should clear the ForceSetPasswordReason by setting it to None", async () => {
+        // Arrange
+        setupTdeOffboardingMocks();
+
+        // Act
+        await sut.setInitialPasswordTdeOffboarding(credentials, userId);
+
+        // Assert
+        expect(masterPasswordApiService.putUpdateTdeOffboardingPassword).toHaveBeenCalledTimes(1);
+        expect(masterPasswordService.setForceSetPasswordReason).toHaveBeenCalledWith(
+          ForceSetPasswordReason.None,
+          userId,
+        );
+      });
+    });
+
+    describe("general error handling", () => {
+      ["newMasterKey", "newServerMasterKeyHash", "newPasswordHint"].forEach((key) => {
+        it(`should throw if ${key} is not provided on the SetInitialPasswordTdeOffboardingCredentials object`, async () => {
+          // Arrange
+          const invalidCredentials: SetInitialPasswordTdeOffboardingCredentials = {
+            ...credentials,
+            [key]: null,
+          };
+
+          // Act
+          const promise = sut.setInitialPasswordTdeOffboarding(invalidCredentials, userId);
+
+          // Assert
+          await expect(promise).rejects.toThrow(`${key} not found. Could not set password.`);
+        });
+      });
+
+      it(`should throw if the userId was not passed in`, async () => {
+        // Arrange
+        userId = null;
+
+        // Act
+        const promise = sut.setInitialPasswordTdeOffboarding(credentials, userId);
+
+        // Assert
+        await expect(promise).rejects.toThrow("userId not found. Could not set password.");
+      });
+
+      it(`should throw if the userKey was not found`, async () => {
+        // Arrange
+        keyService.userKey$.mockReturnValue(of(null));
+
+        // Act
+        const promise = sut.setInitialPasswordTdeOffboarding(credentials, userId);
+
+        // Assert
+        await expect(promise).rejects.toThrow("userKey not found. Could not set password.");
+      });
+
+      it(`should throw if a newMasterKeyEncryptedUserKey was not returned`, async () => {
+        // Arrange
+        masterKeyEncryptedUserKey[1].encryptedString = "" as EncryptedString;
+
+        setupTdeOffboardingMocks();
+
+        // Act
+        const promise = sut.setInitialPasswordTdeOffboarding(credentials, userId);
+
+        // Assert
+        await expect(promise).rejects.toThrow(
+          "newMasterKeyEncryptedUserKey not found. Could not set password.",
+        );
+      });
+    });
+  });
+});
diff --git a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.html b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.html
new file mode 100644
index 00000000000..8033d2022f4
--- /dev/null
+++ b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.html
@@ -0,0 +1,44 @@
+@if (initializing) {
+  <div class="tw-flex tw-items-center tw-justify-center">
+    <i
+      class="bwi bwi-spinner bwi-spin bwi-3x"
+      title="{{ 'loading' | i18n }}"
+      aria-hidden="true"
+    ></i>
+  </div>
+} @else {
+  @if (userType === SetInitialPasswordUserType.OFFBOARDED_TDE_ORG_USER_UNTRUSTED_DEVICE) {
+    <div class="tw-mt-4"></div>
+    <bit-callout type="warning">
+      {{ "loginOnTrustedDeviceOrAskAdminToAssignPassword" | i18n }}
+    </bit-callout>
+    <button type="button" bitButton block buttonType="secondary" (click)="logout()">
+      {{ "logOut" | i18n }}
+    </button>
+  } @else {
+    <bit-callout
+      *ngIf="resetPasswordAutoEnroll"
+      type="warning"
+      title="{{ 'resetPasswordPolicyAutoEnroll' | i18n }}"
+    >
+      {{ "resetPasswordAutoEnrollInviteWarning" | i18n }}
+    </bit-callout>
+
+    <auth-input-password
+      [flow]="inputPasswordFlow"
+      [email]="email"
+      [userId]="userId"
+      [loading]="submitting"
+      [masterPasswordPolicyOptions]="masterPasswordPolicyOptions"
+      [primaryButtonText]="{
+        key:
+          userType === SetInitialPasswordUserType.OFFBOARDED_TDE_ORG_USER
+            ? 'setPassword'
+            : 'createAccount',
+      }"
+      [secondaryButtonText]="{ key: 'logOut' }"
+      (onPasswordFormSubmit)="handlePasswordFormSubmit($event)"
+      (onSecondaryButtonClick)="logout()"
+    ></auth-input-password>
+  }
+}
diff --git a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts
new file mode 100644
index 00000000000..27d4c11f692
--- /dev/null
+++ b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts
@@ -0,0 +1,318 @@
+import { CommonModule } from "@angular/common";
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+// import { NoAccess } from "libs/components/src/icon/icons";
+import { firstValueFrom } from "rxjs";
+
+// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+// eslint-disable-next-line no-restricted-imports
+import {
+  InputPasswordComponent,
+  InputPasswordFlow,
+  PasswordInputResult,
+} from "@bitwarden/auth/angular";
+// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+// eslint-disable-next-line no-restricted-imports
+import { LogoutService } from "@bitwarden/auth/common";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
+import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
+import { assertTruthy, assertNonNullish } from "@bitwarden/common/auth/utils";
+import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
+import { SyncService } from "@bitwarden/common/platform/sync";
+import { UserId } from "@bitwarden/common/types/guid";
+import {
+  AnonLayoutWrapperDataService,
+  ButtonModule,
+  CalloutComponent,
+  DialogService,
+  ToastService,
+  Icons,
+} from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+
+import {
+  SetInitialPasswordCredentials,
+  SetInitialPasswordService,
+  SetInitialPasswordTdeOffboardingCredentials,
+  SetInitialPasswordUserType,
+} from "./set-initial-password.service.abstraction";
+
+@Component({
+  standalone: true,
+  templateUrl: "set-initial-password.component.html",
+  imports: [ButtonModule, CalloutComponent, CommonModule, InputPasswordComponent, I18nPipe],
+})
+export class SetInitialPasswordComponent implements OnInit {
+  protected inputPasswordFlow = InputPasswordFlow.SetInitialPasswordAuthedUser;
+
+  protected email?: string;
+  protected forceSetPasswordReason?: ForceSetPasswordReason;
+  protected initializing = true;
+  protected masterPasswordPolicyOptions: MasterPasswordPolicyOptions | null = null;
+  protected orgId?: string;
+  protected orgSsoIdentifier?: string;
+  protected resetPasswordAutoEnroll?: boolean;
+  protected submitting = false;
+  protected userId?: UserId;
+  protected userType?: SetInitialPasswordUserType;
+  protected SetInitialPasswordUserType = SetInitialPasswordUserType;
+
+  constructor(
+    private accountService: AccountService,
+    private activatedRoute: ActivatedRoute,
+    private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
+    private dialogService: DialogService,
+    private i18nService: I18nService,
+    private logoutService: LogoutService,
+    private logService: LogService,
+    private masterPasswordService: InternalMasterPasswordServiceAbstraction,
+    private messagingService: MessagingService,
+    private organizationApiService: OrganizationApiServiceAbstraction,
+    private policyApiService: PolicyApiServiceAbstraction,
+    private policyService: PolicyService,
+    private router: Router,
+    private setInitialPasswordService: SetInitialPasswordService,
+    private ssoLoginService: SsoLoginServiceAbstraction,
+    private syncService: SyncService,
+    private toastService: ToastService,
+    private validationService: ValidationService,
+  ) {}
+
+  async ngOnInit() {
+    await this.syncService.fullSync(true);
+
+    const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
+    this.userId = activeAccount?.id;
+    this.email = activeAccount?.email;
+
+    await this.establishUserType();
+    await this.getOrgInfo();
+
+    this.initializing = false;
+  }
+
+  private async establishUserType() {
+    if (!this.userId) {
+      throw new Error("userId not found. Could not determine user type.");
+    }
+
+    this.forceSetPasswordReason = await firstValueFrom(
+      this.masterPasswordService.forceSetPasswordReason$(this.userId),
+    );
+
+    if (this.forceSetPasswordReason === ForceSetPasswordReason.TdeOffboardingUntrustedDevice) {
+      this.userType = SetInitialPasswordUserType.OFFBOARDED_TDE_ORG_USER_UNTRUSTED_DEVICE;
+      this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
+        pageTitle: { key: "unableToCompleteLogin" },
+        pageIcon: Icons.NoAccess,
+      });
+    }
+
+    if (this.forceSetPasswordReason === ForceSetPasswordReason.SsoNewJitProvisionedUser) {
+      this.userType = SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER;
+      this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
+        pageTitle: { key: "joinOrganization" },
+        pageSubtitle: { key: "finishJoiningThisOrganizationBySettingAMasterPassword" },
+      });
+    }
+
+    if (
+      this.forceSetPasswordReason ===
+      ForceSetPasswordReason.TdeUserWithoutPasswordHasPasswordResetPermission
+    ) {
+      this.userType = SetInitialPasswordUserType.TDE_ORG_USER_RESET_PASSWORD_PERMISSION_REQUIRES_MP;
+      this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
+        pageTitle: { key: "setMasterPassword" },
+        pageSubtitle: { key: "orgPermissionsUpdatedMustSetPassword" },
+      });
+    }
+
+    if (this.forceSetPasswordReason === ForceSetPasswordReason.TdeOffboarding) {
+      this.userType = SetInitialPasswordUserType.OFFBOARDED_TDE_ORG_USER;
+      this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
+        pageTitle: { key: "setMasterPassword" },
+        pageSubtitle: { key: "tdeDisabledMasterPasswordRequired" },
+      });
+    }
+
+    // If we somehow end up here without a reason, navigate to root
+    if (this.forceSetPasswordReason === ForceSetPasswordReason.None) {
+      await this.router.navigate(["/"]);
+    }
+  }
+
+  private async getOrgInfo() {
+    if (!this.userId) {
+      throw new Error("userId not found. Could not handle query params.");
+    }
+
+    if (this.userType === SetInitialPasswordUserType.OFFBOARDED_TDE_ORG_USER) {
+      this.masterPasswordPolicyOptions =
+        (await firstValueFrom(this.policyService.masterPasswordPolicyOptions$(this.userId))) ??
+        null;
+
+      return;
+    }
+
+    const qParams = await firstValueFrom(this.activatedRoute.queryParams);
+
+    this.orgSsoIdentifier =
+      qParams.identifier ??
+      (await this.ssoLoginService.getActiveUserOrganizationSsoIdentifier(this.userId));
+
+    if (this.orgSsoIdentifier != null) {
+      try {
+        const autoEnrollStatus = await this.organizationApiService.getAutoEnrollStatus(
+          this.orgSsoIdentifier,
+        );
+        this.orgId = autoEnrollStatus.id;
+        this.resetPasswordAutoEnroll = autoEnrollStatus.resetPasswordEnabled;
+        this.masterPasswordPolicyOptions =
+          await this.policyApiService.getMasterPasswordPolicyOptsForOrgUser(this.orgId);
+      } catch {
+        this.toastService.showToast({
+          variant: "error",
+          title: "",
+          message: this.i18nService.t("errorOccurred"),
+        });
+      }
+    }
+  }
+
+  protected async handlePasswordFormSubmit(passwordInputResult: PasswordInputResult) {
+    this.submitting = true;
+
+    switch (this.userType) {
+      case SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER:
+      case SetInitialPasswordUserType.TDE_ORG_USER_RESET_PASSWORD_PERMISSION_REQUIRES_MP:
+        await this.setInitialPassword(passwordInputResult);
+        break;
+      case SetInitialPasswordUserType.OFFBOARDED_TDE_ORG_USER:
+        await this.setInitialPasswordTdeOffboarding(passwordInputResult);
+        break;
+      default:
+        this.logService.error(
+          `Unexpected user type: ${this.userType}. Could not set initial password.`,
+        );
+        this.validationService.showError("Unexpected user type. Could not set initial password.");
+    }
+  }
+
+  private async setInitialPassword(passwordInputResult: PasswordInputResult) {
+    const ctx = "Could not set initial password.";
+    assertTruthy(passwordInputResult.newMasterKey, "newMasterKey", ctx);
+    assertTruthy(passwordInputResult.newServerMasterKeyHash, "newServerMasterKeyHash", ctx);
+    assertTruthy(passwordInputResult.newLocalMasterKeyHash, "newLocalMasterKeyHash", ctx);
+    assertTruthy(passwordInputResult.kdfConfig, "kdfConfig", ctx);
+    assertTruthy(this.orgSsoIdentifier, "orgSsoIdentifier", ctx);
+    assertTruthy(this.orgId, "orgId", ctx);
+    assertTruthy(this.userType, "userType", ctx);
+    assertTruthy(this.userId, "userId", ctx);
+    assertNonNullish(passwordInputResult.newPasswordHint, "newPasswordHint", ctx); // can have an empty string as a valid value, so check non-nullish
+    assertNonNullish(this.resetPasswordAutoEnroll, "resetPasswordAutoEnroll", ctx); // can have `false` as a valid value, so check non-nullish
+
+    try {
+      const credentials: SetInitialPasswordCredentials = {
+        newMasterKey: passwordInputResult.newMasterKey,
+        newServerMasterKeyHash: passwordInputResult.newServerMasterKeyHash,
+        newLocalMasterKeyHash: passwordInputResult.newLocalMasterKeyHash,
+        newPasswordHint: passwordInputResult.newPasswordHint,
+        kdfConfig: passwordInputResult.kdfConfig,
+        orgSsoIdentifier: this.orgSsoIdentifier,
+        orgId: this.orgId,
+        resetPasswordAutoEnroll: this.resetPasswordAutoEnroll,
+      };
+
+      await this.setInitialPasswordService.setInitialPassword(
+        credentials,
+        this.userType,
+        this.userId,
+      );
+
+      this.showSuccessToastByUserType();
+
+      this.submitting = false;
+      await this.router.navigate(["vault"]);
+    } catch (e) {
+      this.logService.error("Error setting initial password", e);
+      this.validationService.showError(e);
+      this.submitting = false;
+    }
+  }
+
+  private async setInitialPasswordTdeOffboarding(passwordInputResult: PasswordInputResult) {
+    const ctx = "Could not set initial password.";
+    assertTruthy(passwordInputResult.newMasterKey, "newMasterKey", ctx);
+    assertTruthy(passwordInputResult.newServerMasterKeyHash, "newServerMasterKeyHash", ctx);
+    assertTruthy(this.userId, "userId", ctx);
+    assertNonNullish(passwordInputResult.newPasswordHint, "newPasswordHint", ctx); // can have an empty string as a valid value, so check non-nullish
+
+    try {
+      const credentials: SetInitialPasswordTdeOffboardingCredentials = {
+        newMasterKey: passwordInputResult.newMasterKey,
+        newServerMasterKeyHash: passwordInputResult.newServerMasterKeyHash,
+        newPasswordHint: passwordInputResult.newPasswordHint,
+      };
+
+      await this.setInitialPasswordService.setInitialPasswordTdeOffboarding(
+        credentials,
+        this.userId,
+      );
+
+      this.showSuccessToastByUserType();
+
+      await this.logoutService.logout(this.userId);
+      // navigate to root so redirect guard can properly route next active user or null user to correct page
+      await this.router.navigate(["/"]);
+    } catch (e) {
+      this.logService.error("Error setting initial password during TDE offboarding", e);
+      this.validationService.showError(e);
+    } finally {
+      this.submitting = false;
+    }
+  }
+
+  private showSuccessToastByUserType() {
+    if (this.userType === SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER) {
+      this.toastService.showToast({
+        variant: "success",
+        title: "",
+        message: this.i18nService.t("accountSuccessfullyCreated"),
+      });
+
+      this.toastService.showToast({
+        variant: "success",
+        title: "",
+        message: this.i18nService.t("inviteAccepted"),
+      });
+    } else {
+      this.toastService.showToast({
+        variant: "success",
+        title: "",
+        message: this.i18nService.t("masterPasswordSuccessfullySet"),
+      });
+    }
+  }
+
+  protected async logout() {
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "logOut" },
+      content: { key: "logOutConfirmation" },
+      acceptButtonText: { key: "logOut" },
+      type: "warning",
+    });
+
+    if (confirmed) {
+      this.messagingService.send("logout");
+    }
+  }
+}
diff --git a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.service.abstraction.ts b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.service.abstraction.ts
new file mode 100644
index 00000000000..c1f6ba1a5ec
--- /dev/null
+++ b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.service.abstraction.ts
@@ -0,0 +1,95 @@
+import { UserId } from "@bitwarden/common/types/guid";
+import { MasterKey } from "@bitwarden/common/types/key";
+import { KdfConfig } from "@bitwarden/key-management";
+
+export const _SetInitialPasswordUserType = {
+  /**
+   * A user being "just-in-time" (JIT) provisioned into a master-password-encryption org
+   */
+  JIT_PROVISIONED_MP_ORG_USER: "jit_provisioned_mp_org_user",
+
+  /**
+   * Could be one of two scenarios:
+   *  1. A user being "just-in-time" (JIT) provisioned into a trusted-device-encryption org
+   *     with the reset password permission granted ("manage account recovery"), which requires
+   *     that the user sets a master password
+   *  2. An user in a trusted-device-encryption org whose permissions were upgraded to include
+   *     the reset password permission ("manage account recovery"), which requires that the user
+   *     sets a master password
+   */
+  TDE_ORG_USER_RESET_PASSWORD_PERMISSION_REQUIRES_MP:
+    "tde_org_user_reset_password_permission_requires_mp",
+
+  /**
+   * A user in an org that offboarded from trusted device encryption and is now a
+   * master-password-encryption org. User is on a trusted device.
+   */
+  OFFBOARDED_TDE_ORG_USER: "offboarded_tde_org_user",
+
+  /**
+   * A user in an org that offboarded from trusted device encryption and is now a
+   * master-password-encryption org. User is on an untrusted device.
+   */
+  OFFBOARDED_TDE_ORG_USER_UNTRUSTED_DEVICE: "offboarded_tde_org_user_untrusted_device",
+} as const;
+
+type _SetInitialPasswordUserType = typeof _SetInitialPasswordUserType;
+
+export type SetInitialPasswordUserType =
+  _SetInitialPasswordUserType[keyof _SetInitialPasswordUserType];
+export const SetInitialPasswordUserType: Readonly<{
+  [K in keyof typeof _SetInitialPasswordUserType]: SetInitialPasswordUserType;
+}> = Object.freeze(_SetInitialPasswordUserType);
+
+export interface SetInitialPasswordCredentials {
+  newMasterKey: MasterKey;
+  newServerMasterKeyHash: string;
+  newLocalMasterKeyHash: string;
+  newPasswordHint: string;
+  kdfConfig: KdfConfig;
+  orgSsoIdentifier: string;
+  orgId: string;
+  resetPasswordAutoEnroll: boolean;
+}
+
+export interface SetInitialPasswordTdeOffboardingCredentials {
+  newMasterKey: MasterKey;
+  newServerMasterKeyHash: string;
+  newPasswordHint: string;
+}
+
+/**
+ * Handles setting an initial password for an existing authed user.
+ *
+ * To see the different scenarios where an existing authed user needs to set an
+ * initial password, see {@link SetInitialPasswordUserType}
+ */
+export abstract class SetInitialPasswordService {
+  /**
+   * Sets an initial password for an existing authed user who is either:
+   * - {@link SetInitialPasswordUserType.JIT_PROVISIONED_MP_ORG_USER}
+   * - {@link SetInitialPasswordUserType.TDE_ORG_USER_RESET_PASSWORD_PERMISSION_REQUIRES_MP}
+   *
+   * @param credentials An object of the credentials needed to set the initial password
+   * @throws If any property on the `credentials` object is null or undefined, or if a
+   *         masterKeyEncryptedUserKey or newKeyPair could not be created.
+   */
+  abstract setInitialPassword: (
+    credentials: SetInitialPasswordCredentials,
+    userType: SetInitialPasswordUserType,
+    userId: UserId,
+  ) => Promise<void>;
+
+  /**
+   * Sets an initial password for a user who logs in after their org offboarded from
+   * trusted device encryption and is now a master-password-encryption org:
+   * - {@link SetInitialPasswordUserType.OFFBOARDED_TDE_ORG_USER}
+   *
+   * @param passwordInputResult credentials object received from the `InputPasswordComponent`
+   * @param userId the account `userId`
+   */
+  abstract setInitialPasswordTdeOffboarding: (
+    credentials: SetInitialPasswordTdeOffboardingCredentials,
+    userId: UserId,
+  ) => Promise<void>;
+}
diff --git a/libs/angular/src/components/share.component.ts b/libs/angular/src/components/share.component.ts
deleted file mode 100644
index 51827bfb9f2..00000000000
--- a/libs/angular/src/components/share.component.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Directive, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
-import { firstValueFrom, map, Observable, Subject, takeUntil } from "rxjs";
-
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { Checkable, isChecked } from "@bitwarden/common/types/checkable";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-
-@Directive()
-export class ShareComponent implements OnInit, OnDestroy {
-  @Input() cipherId: string;
-  @Input() organizationId: string;
-  @Output() onSharedCipher = new EventEmitter();
-
-  formPromise: Promise<void>;
-  cipher: CipherView;
-  collections: Checkable<CollectionView>[] = [];
-  organizations$: Observable<Organization[]>;
-
-  protected writeableCollections: Checkable<CollectionView>[] = [];
-
-  private _destroy = new Subject<void>();
-
-  constructor(
-    protected collectionService: CollectionService,
-    protected platformUtilsService: PlatformUtilsService,
-    protected i18nService: I18nService,
-    protected cipherService: CipherService,
-    private logService: LogService,
-    protected organizationService: OrganizationService,
-    protected accountService: AccountService,
-  ) {}
-
-  async ngOnInit() {
-    await this.load();
-  }
-
-  ngOnDestroy(): void {
-    this._destroy.next();
-    this._destroy.complete();
-  }
-
-  async load() {
-    const allCollections = await this.collectionService.getAllDecrypted();
-    this.writeableCollections = allCollections.map((c) => c).filter((c) => !c.readOnly);
-
-    const userId = await firstValueFrom(
-      this.accountService.activeAccount$.pipe(map((account) => account?.id)),
-    );
-
-    this.organizations$ = this.organizationService.memberOrganizations$(userId).pipe(
-      map((orgs) => {
-        return orgs
-          .filter((o) => o.enabled && o.status === OrganizationUserStatusType.Confirmed)
-          .sort(Utils.getSortFunction(this.i18nService, "name"));
-      }),
-    );
-
-    this.organizations$.pipe(takeUntil(this._destroy)).subscribe((orgs) => {
-      if (this.organizationId == null && orgs.length > 0) {
-        this.organizationId = orgs[0].id;
-        this.filterCollections();
-      }
-    });
-
-    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    const cipherDomain = await this.cipherService.get(this.cipherId, activeUserId);
-    this.cipher = await this.cipherService.decrypt(cipherDomain, activeUserId);
-  }
-
-  filterCollections() {
-    this.writeableCollections.forEach((c) => (c.checked = false));
-    if (this.organizationId == null || this.writeableCollections.length === 0) {
-      this.collections = [];
-    } else {
-      this.collections = this.writeableCollections.filter(
-        (c) => c.organizationId === this.organizationId,
-      );
-    }
-  }
-
-  async submit(): Promise<boolean> {
-    const selectedCollectionIds = this.collections.filter(isChecked).map((c) => c.id);
-    if (selectedCollectionIds.length === 0) {
-      this.platformUtilsService.showToast(
-        "error",
-        this.i18nService.t("errorOccurred"),
-        this.i18nService.t("selectOneCollection"),
-      );
-      return;
-    }
-
-    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    const cipherDomain = await this.cipherService.get(this.cipherId, activeUserId);
-    const cipherView = await this.cipherService.decrypt(cipherDomain, activeUserId);
-    const orgs = await firstValueFrom(this.organizations$);
-    const orgName =
-      orgs.find((o) => o.id === this.organizationId)?.name ?? this.i18nService.t("organization");
-
-    try {
-      this.formPromise = this.cipherService
-        .shareWithServer(cipherView, this.organizationId, selectedCollectionIds, activeUserId)
-        .then(async () => {
-          this.onSharedCipher.emit();
-          this.platformUtilsService.showToast(
-            "success",
-            null,
-            this.i18nService.t("movedItemToOrg", cipherView.name, orgName),
-          );
-        });
-      await this.formPromise;
-      return true;
-    } catch (e) {
-      this.logService.error(e);
-    }
-    return false;
-  }
-
-  get canSave() {
-    if (this.collections != null) {
-      for (let i = 0; i < this.collections.length; i++) {
-        if (this.collections[i].checked) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-}
diff --git a/libs/angular/src/directives/if-feature.directive.spec.ts b/libs/angular/src/directives/if-feature.directive.spec.ts
index 456220b7911..d7c49994045 100644
--- a/libs/angular/src/directives/if-feature.directive.spec.ts
+++ b/libs/angular/src/directives/if-feature.directive.spec.ts
@@ -27,6 +27,7 @@ const testStringFeatureValue = "test-value";
       </div>
     </div>
   `,
+  standalone: false,
 })
 class TestComponent {
   testBooleanFeature = testBooleanFeature;
diff --git a/libs/angular/src/directives/text-drag.directive.ts b/libs/angular/src/directives/text-drag.directive.ts
index 443fbdac157..6202c552a87 100644
--- a/libs/angular/src/directives/text-drag.directive.ts
+++ b/libs/angular/src/directives/text-drag.directive.ts
@@ -2,7 +2,6 @@ import { Directive, HostListener, Input } from "@angular/core";
 
 @Directive({
   selector: "[appTextDrag]",
-  standalone: true,
   host: {
     draggable: "true",
     class: "tw-cursor-move",
diff --git a/libs/angular/src/jslib.module.ts b/libs/angular/src/jslib.module.ts
index 6ef2cf1d4da..89e6cfeacb7 100644
--- a/libs/angular/src/jslib.module.ts
+++ b/libs/angular/src/jslib.module.ts
@@ -85,11 +85,11 @@ import { IconComponent } from "./vault/components/icon.component";
     TextDragDirective,
     CopyClickDirective,
     A11yTitleDirective,
+    AutofocusDirective,
   ],
   declarations: [
     A11yInvalidDirective,
     ApiActionDirective,
-    AutofocusDirective,
     BoxRowDirective,
     DeprecatedCalloutComponent,
     CopyTextDirective,
diff --git a/libs/angular/src/pipes/pluralize.pipe.ts b/libs/angular/src/pipes/pluralize.pipe.ts
index cc3aa3e0aa7..882cc637bf1 100644
--- a/libs/angular/src/pipes/pluralize.pipe.ts
+++ b/libs/angular/src/pipes/pluralize.pipe.ts
@@ -2,7 +2,6 @@ import { Pipe, PipeTransform } from "@angular/core";
 
 @Pipe({
   name: "pluralize",
-  standalone: true,
 })
 export class PluralizePipe implements PipeTransform {
   transform(count: number, singular: string, plural: string): string {
diff --git a/libs/angular/src/platform/guard/feature-flag.guard.spec.ts b/libs/angular/src/platform/guard/feature-flag.guard.spec.ts
index d39e071a693..3bc8b085a7d 100644
--- a/libs/angular/src/platform/guard/feature-flag.guard.spec.ts
+++ b/libs/angular/src/platform/guard/feature-flag.guard.spec.ts
@@ -12,7 +12,7 @@ import { I18nMockService, ToastService } from "@bitwarden/components/src";
 
 import { canAccessFeature } from "./feature-flag.guard";
 
-@Component({ template: "" })
+@Component({ template: "", standalone: false })
 export class EmptyComponent {}
 
 describe("canAccessFeature", () => {
diff --git a/libs/angular/src/platform/i18n/document-lang.setter.spec.ts b/libs/angular/src/platform/i18n/document-lang.setter.spec.ts
new file mode 100644
index 00000000000..84a046ac8bf
--- /dev/null
+++ b/libs/angular/src/platform/i18n/document-lang.setter.spec.ts
@@ -0,0 +1,36 @@
+import { mock } from "jest-mock-extended";
+import { Subject } from "rxjs";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
+import { DocumentLangSetter } from "./document-lang.setter";
+
+describe("DocumentLangSetter", () => {
+  const document = mock<Document>();
+  const i18nService = mock<I18nService>();
+
+  const sut = new DocumentLangSetter(document, i18nService);
+
+  describe("start", () => {
+    it("reacts to locale changes while start called with a non-closed subscription", async () => {
+      const localeSubject = new Subject<string>();
+      i18nService.locale$ = localeSubject;
+
+      localeSubject.next("en");
+
+      expect(document.documentElement.lang).toBeFalsy();
+
+      const sub = sut.start();
+
+      localeSubject.next("es");
+
+      expect(document.documentElement.lang).toBe("es");
+
+      sub.unsubscribe();
+
+      localeSubject.next("ar");
+
+      expect(document.documentElement.lang).toBe("es");
+    });
+  });
+});
diff --git a/libs/angular/src/platform/i18n/document-lang.setter.ts b/libs/angular/src/platform/i18n/document-lang.setter.ts
new file mode 100644
index 00000000000..f576e72d082
--- /dev/null
+++ b/libs/angular/src/platform/i18n/document-lang.setter.ts
@@ -0,0 +1,26 @@
+import { Subscription } from "rxjs";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
+/**
+ * A service for managing the setting of the `lang="<locale>" attribute on the
+ * main document for the application.
+ */
+export class DocumentLangSetter {
+  constructor(
+    private readonly document: Document,
+    private readonly i18nService: I18nService,
+  ) {}
+
+  /**
+   * Starts listening to an upstream source for the best locale for the user
+   * and applies it to the application document.
+   * @returns A subscription that can be unsubscribed if you wish to stop
+   * applying lang attribute updates to the application document.
+   */
+  start(): Subscription {
+    return this.i18nService.locale$.subscribe((locale) => {
+      this.document.documentElement.lang = locale;
+    });
+  }
+}
diff --git a/libs/angular/src/platform/i18n/index.ts b/libs/angular/src/platform/i18n/index.ts
new file mode 100644
index 00000000000..259bdca65d0
--- /dev/null
+++ b/libs/angular/src/platform/i18n/index.ts
@@ -0,0 +1 @@
+export { DocumentLangSetter } from "./document-lang.setter";
diff --git a/libs/angular/src/platform/view-cache/README.md b/libs/angular/src/platform/view-cache/README.md
index c1f80da5800..d98222c4bde 100644
--- a/libs/angular/src/platform/view-cache/README.md
+++ b/libs/angular/src/platform/view-cache/README.md
@@ -43,12 +43,9 @@ on any component.
 The persistence layer ensures that the popup will open at the same route as was active when it
 closed, provided that none of the lifetime expiration events have occurred.
 
-:::tip Excluding a route
-
-If a particular route should be excluded from the history and not persisted, add
-`doNotSaveUrl: true` to the `data` property on the route.
-
-:::
+> [!TIP]
+> If a particular route should be excluded from the history and not persisted, add
+> `doNotSaveUrl: true` to the `data` property on the route.
 
 ### View data persistence
 
@@ -85,13 +82,10 @@ const mySignal = this.viewCacheService.signal({
 mySignal.set("value")
 ```
 
-:::note Equality comparison
-
-By default, signals use `Object.is` to determine equality, and `set()` will only trigger updates if
-the updated value is not equal to the current signal state. See documentation
-[here](https://angular.dev/guide/signals#signal-equality-functions).
-
-:::
+> [!NOTE]
+> By default, signals use `Object.is` to determine equality, and `set()` will only trigger updates if
+> the updated value is not equal to the current signal state. See documentation
+> [here](https://angular.dev/guide/signals#signal-equality-functions).
 
 Putting this together, the most common implementation pattern would be:
 
diff --git a/libs/angular/src/services/injection-tokens.ts b/libs/angular/src/services/injection-tokens.ts
index 4c29abe680a..2122506890a 100644
--- a/libs/angular/src/services/injection-tokens.ts
+++ b/libs/angular/src/services/injection-tokens.ts
@@ -21,6 +21,7 @@ import { SafeInjectionToken } from "@bitwarden/ui-common";
 export { SafeInjectionToken } from "@bitwarden/ui-common";
 
 export const WINDOW = new SafeInjectionToken<Window>("WINDOW");
+export const DOCUMENT = new SafeInjectionToken<Document>("DOCUMENT");
 export const OBSERVABLE_MEMORY_STORAGE = new SafeInjectionToken<
   AbstractStorageService & ObservableStorageService
 >("OBSERVABLE_MEMORY_STORAGE");
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 08bcaa2165c..391c20b30d6 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -11,37 +11,36 @@ import {
   DefaultOrganizationUserApiService,
   OrganizationUserApiService,
 } from "@bitwarden/admin-console/common";
+import {
+  ChangePasswordService,
+  DefaultChangePasswordService,
+} from "@bitwarden/angular/auth/password-management/change-password";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import {
-  AnonLayoutWrapperDataService,
-  DefaultAnonLayoutWrapperDataService,
   DefaultLoginApprovalComponentService,
   DefaultLoginComponentService,
   DefaultLoginDecryptionOptionsService,
   DefaultRegistrationFinishService,
   DefaultSetPasswordJitService,
   DefaultTwoFactorAuthComponentService,
-  DefaultTwoFactorAuthEmailComponentService,
   DefaultTwoFactorAuthWebAuthnComponentService,
   LoginComponentService,
   LoginDecryptionOptionsService,
   RegistrationFinishService as RegistrationFinishServiceAbstraction,
   SetPasswordJitService,
   TwoFactorAuthComponentService,
-  TwoFactorAuthEmailComponentService,
   TwoFactorAuthWebAuthnComponentService,
-  ChangePasswordService,
-  DefaultChangePasswordService,
 } from "@bitwarden/auth/angular";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import {
-  AuthRequestApiService,
+  AuthRequestApiServiceAbstraction,
   AuthRequestService,
   AuthRequestServiceAbstraction,
   DefaultAuthRequestApiService,
   DefaultLoginSuccessHandlerService,
+  DefaultLogoutService,
   InternalUserDecryptionOptionsServiceAbstraction,
   LoginApprovalComponentServiceAbstraction,
   LoginEmailService,
@@ -50,6 +49,7 @@ import {
   LoginStrategyServiceAbstraction,
   LoginSuccessHandlerService,
   LogoutReason,
+  LogoutService,
   PinService,
   PinServiceAbstraction,
   UserDecryptionOptionsService,
@@ -59,7 +59,6 @@ import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstracti
 import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
-import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import {
   InternalOrganizationServiceAbstraction,
@@ -116,6 +115,8 @@ import { AvatarService } from "@bitwarden/common/auth/services/avatar.service";
 import { DevicesServiceImplementation } from "@bitwarden/common/auth/services/devices/devices.service.implementation";
 import { DevicesApiServiceImplementation } from "@bitwarden/common/auth/services/devices-api.service.implementation";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/services/master-password/master-password-api.service.implementation";
+import { DefaultOrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/default-organization-invite.service";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
 import { PasswordResetEnrollmentServiceImplementation } from "@bitwarden/common/auth/services/password-reset-enrollment.service.implementation";
 import { SsoLoginService } from "@bitwarden/common/auth/services/sso-login.service";
 import { TokenService } from "@bitwarden/common/auth/services/token.service";
@@ -168,6 +169,10 @@ import {
   MasterPasswordServiceAbstraction,
 } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { MasterPasswordService } from "@bitwarden/common/key-management/master-password/services/master-password.service";
+import {
+  SendPasswordService,
+  DefaultSendPasswordService,
+} from "@bitwarden/common/key-management/sends";
 import {
   DefaultVaultTimeoutService,
   DefaultVaultTimeoutSettingsService,
@@ -257,7 +262,6 @@ import { ApiService } from "@bitwarden/common/services/api.service";
 import { AuditService } from "@bitwarden/common/services/audit.service";
 import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
-import { SearchService } from "@bitwarden/common/services/search.service";
 import {
   PasswordStrengthService,
   PasswordStrengthServiceAbstraction,
@@ -279,6 +283,7 @@ import {
   FolderService as FolderServiceAbstraction,
   InternalFolderService,
 } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/vault/abstractions/search.service";
 import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/vault/abstractions/totp.service";
 import { VaultSettingsService as VaultSettingsServiceAbstraction } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
 import {
@@ -294,10 +299,16 @@ import { DefaultCipherEncryptionService } from "@bitwarden/common/vault/services
 import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service";
 import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
 import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { SearchService } from "@bitwarden/common/vault/services/search.service";
 import { TotpService } from "@bitwarden/common/vault/services/totp.service";
 import { VaultSettingsService } from "@bitwarden/common/vault/services/vault-settings/vault-settings.service";
 import { DefaultTaskService, TaskService } from "@bitwarden/common/vault/tasks";
-import { ToastService } from "@bitwarden/components";
+import {
+  AnonLayoutWrapperDataService,
+  DefaultAnonLayoutWrapperDataService,
+  ToastService,
+} from "@bitwarden/components";
 import {
   GeneratorHistoryService,
   LocalGeneratorHistoryService,
@@ -334,9 +345,12 @@ import {
   VaultExportServiceAbstraction,
 } from "@bitwarden/vault-export-core";
 
+import { DefaultSetInitialPasswordService } from "../auth/password-management/set-initial-password/default-set-initial-password.service.implementation";
+import { SetInitialPasswordService } from "../auth/password-management/set-initial-password/set-initial-password.service.abstraction";
 import { DeviceTrustToastService as DeviceTrustToastServiceAbstraction } from "../auth/services/device-trust-toast.service.abstraction";
 import { DeviceTrustToastService } from "../auth/services/device-trust-toast.service.implementation";
 import { FormValidationErrorsService as FormValidationErrorsServiceAbstraction } from "../platform/abstractions/form-validation-errors.service";
+import { DocumentLangSetter } from "../platform/i18n";
 import { FormValidationErrorsService } from "../platform/services/form-validation-errors.service";
 import { LoggingErrorHandler } from "../platform/services/logging-error-handler";
 import { AngularThemingService } from "../platform/services/theming/angular-theming.service";
@@ -349,6 +363,7 @@ import { NoopViewCacheService } from "../platform/view-cache/internal";
 import {
   CLIENT_TYPE,
   DEFAULT_VAULT_TIMEOUT,
+  DOCUMENT,
   ENV_ADDITIONAL_REGIONS,
   HTTP_OPERATIONS,
   INTRAPROCESS_MESSAGING_SUBJECT,
@@ -378,6 +393,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider(ModalService),
   safeProvider(PasswordRepromptService),
   safeProvider({ provide: WINDOW, useValue: window }),
+  safeProvider({ provide: DOCUMENT, useValue: document }),
   safeProvider({
     provide: LOCALE_ID as SafeInjectionToken<string>,
     useFactory: (i18nService: I18nServiceAbstraction) => i18nService.translationLocale,
@@ -402,6 +418,7 @@ const safeProviders: SafeProvider[] = [
     provide: STATE_FACTORY,
     useValue: new StateFactory(GlobalState, Account),
   }),
+  // TODO: PM-21212 - Deprecate LogoutCallback in favor of LogoutService
   safeProvider({
     provide: LOGOUT_CALLBACK,
     useFactory:
@@ -487,6 +504,7 @@ const safeProviders: SafeProvider[] = [
       VaultTimeoutSettingsService,
       KdfConfigService,
       TaskSchedulerService,
+      ConfigService,
     ],
   }),
   safeProvider({
@@ -672,6 +690,11 @@ const safeProviders: SafeProvider[] = [
       KdfConfigService,
     ],
   }),
+  safeProvider({
+    provide: RestrictedItemTypesService,
+    useClass: RestrictedItemTypesService,
+    deps: [ConfigService, AccountService, OrganizationServiceAbstraction, PolicyServiceAbstraction],
+  }),
   safeProvider({
     provide: PasswordStrengthServiceAbstraction,
     useClass: PasswordStrengthService,
@@ -877,6 +900,7 @@ const safeProviders: SafeProvider[] = [
       KdfConfigService,
       AccountServiceAbstraction,
       ApiServiceAbstraction,
+      RestrictedItemTypesService,
     ],
   }),
   safeProvider({
@@ -892,6 +916,7 @@ const safeProviders: SafeProvider[] = [
       CollectionService,
       KdfConfigService,
       AccountServiceAbstraction,
+      RestrictedItemTypesService,
     ],
   }),
   safeProvider({
@@ -1165,6 +1190,11 @@ const safeProviders: SafeProvider[] = [
     useClass: DevicesServiceImplementation,
     deps: [DevicesApiServiceAbstraction, AppIdServiceAbstraction],
   }),
+  safeProvider({
+    provide: AuthRequestApiServiceAbstraction,
+    useClass: DefaultAuthRequestApiService,
+    deps: [ApiServiceAbstraction, LogService],
+  }),
   safeProvider({
     provide: DeviceTrustServiceAbstraction,
     useClass: DeviceTrustService,
@@ -1189,12 +1219,12 @@ const safeProviders: SafeProvider[] = [
     useClass: AuthRequestService,
     deps: [
       AppIdServiceAbstraction,
-      AccountServiceAbstraction,
       InternalMasterPasswordServiceAbstraction,
       KeyService,
       EncryptService,
       ApiServiceAbstraction,
       StateProvider,
+      AuthRequestApiServiceAbstraction,
     ],
   }),
   safeProvider({
@@ -1293,7 +1323,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: AutofillSettingsServiceAbstraction,
     useClass: AutofillSettingsService,
-    deps: [StateProvider, PolicyServiceAbstraction, AccountService],
+    deps: [StateProvider, PolicyServiceAbstraction, AccountService, RestrictedItemTypesService],
   }),
   safeProvider({
     provide: BadgeSettingsServiceAbstraction,
@@ -1308,7 +1338,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: VaultSettingsServiceAbstraction,
     useClass: VaultSettingsService,
-    deps: [StateProvider],
+    deps: [StateProvider, RestrictedItemTypesService],
   }),
   safeProvider({
     provide: MigrationRunner,
@@ -1382,16 +1412,36 @@ const safeProviders: SafeProvider[] = [
     useClass: DefaultKdfConfigService,
     deps: [StateProvider],
   }),
+  safeProvider({
+    provide: OrganizationInviteService,
+    useClass: DefaultOrganizationInviteService,
+    deps: [],
+  }),
   safeProvider({
     provide: SetPasswordJitService,
     useClass: DefaultSetPasswordJitService,
     deps: [
-      ApiServiceAbstraction,
-      MasterPasswordApiServiceAbstraction,
-      KeyService,
       EncryptService,
       I18nServiceAbstraction,
       KdfConfigService,
+      KeyService,
+      MasterPasswordApiServiceAbstraction,
+      InternalMasterPasswordServiceAbstraction,
+      OrganizationApiServiceAbstraction,
+      OrganizationUserApiService,
+      InternalUserDecryptionOptionsServiceAbstraction,
+    ],
+  }),
+  safeProvider({
+    provide: SetInitialPasswordService,
+    useClass: DefaultSetInitialPasswordService,
+    deps: [
+      ApiServiceAbstraction,
+      EncryptService,
+      I18nServiceAbstraction,
+      KdfConfigService,
+      KeyService,
+      MasterPasswordApiServiceAbstraction,
       InternalMasterPasswordServiceAbstraction,
       OrganizationApiServiceAbstraction,
       OrganizationUserApiService,
@@ -1423,11 +1473,6 @@ const safeProviders: SafeProvider[] = [
     useClass: DefaultTwoFactorAuthWebAuthnComponentService,
     deps: [],
   }),
-  safeProvider({
-    provide: TwoFactorAuthEmailComponentService,
-    useClass: DefaultTwoFactorAuthEmailComponentService,
-    deps: [],
-  }),
   safeProvider({
     provide: ViewCacheService,
     useExisting: NoopViewCacheService,
@@ -1459,17 +1504,12 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: CipherAuthorizationService,
     useClass: DefaultCipherAuthorizationService,
-    deps: [
-      CollectionService,
-      OrganizationServiceAbstraction,
-      AccountServiceAbstraction,
-      ConfigService,
-    ],
+    deps: [CollectionService, OrganizationServiceAbstraction, AccountServiceAbstraction],
   }),
   safeProvider({
-    provide: AuthRequestApiService,
-    useClass: DefaultAuthRequestApiService,
-    deps: [ApiServiceAbstraction, LogService],
+    provide: SendPasswordService,
+    useClass: DefaultSendPasswordService,
+    deps: [CryptoFunctionServiceAbstraction],
   }),
   safeProvider({
     provide: LoginApprovalComponentServiceAbstraction,
@@ -1511,7 +1551,6 @@ const safeProviders: SafeProvider[] = [
       StateProvider,
       ApiServiceAbstraction,
       OrganizationServiceAbstraction,
-      ConfigService,
       AuthServiceAbstraction,
       NotificationsService,
       MessageListener,
@@ -1543,6 +1582,16 @@ const safeProviders: SafeProvider[] = [
     useClass: MasterPasswordApiService,
     deps: [ApiServiceAbstraction, LogService],
   }),
+  safeProvider({
+    provide: LogoutService,
+    useClass: DefaultLogoutService,
+    deps: [MessagingServiceAbstraction],
+  }),
+  safeProvider({
+    provide: DocumentLangSetter,
+    useClass: DocumentLangSetter,
+    deps: [DOCUMENT, I18nServiceAbstraction],
+  }),
   safeProvider({
     provide: CipherEncryptionService,
     useClass: DefaultCipherEncryptionService,
diff --git a/libs/angular/src/tools/password-strength/password-strength-v2.component.ts b/libs/angular/src/tools/password-strength/password-strength-v2.component.ts
index 8d9fc458384..c8a3b071746 100644
--- a/libs/angular/src/tools/password-strength/password-strength-v2.component.ts
+++ b/libs/angular/src/tools/password-strength/password-strength-v2.component.ts
@@ -20,7 +20,6 @@ type BackgroundTypes = "danger" | "primary" | "success" | "warning";
 @Component({
   selector: "tools-password-strength",
   templateUrl: "password-strength-v2.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, ProgressModule],
 })
 export class PasswordStrengthV2Component implements OnChanges {
diff --git a/libs/angular/src/tools/send/add-edit.component.ts b/libs/angular/src/tools/send/add-edit.component.ts
index 0289664c365..221b751528a 100644
--- a/libs/angular/src/tools/send/add-edit.component.ts
+++ b/libs/angular/src/tools/send/add-edit.component.ts
@@ -148,14 +148,6 @@ export class AddEditComponent implements OnInit, OnDestroy {
     return null;
   }
 
-  get isSafari() {
-    return this.platformUtilsService.isSafari();
-  }
-
-  get isDateTimeLocalSupported(): boolean {
-    return !(this.platformUtilsService.isFirefox() || this.platformUtilsService.isSafari());
-  }
-
   async ngOnInit() {
     this.accountService.activeAccount$
       .pipe(
diff --git a/libs/angular/src/tools/send/send.component.ts b/libs/angular/src/tools/send/send.component.ts
index 5dbf3686b7d..e96bdd8e31a 100644
--- a/libs/angular/src/tools/send/send.component.ts
+++ b/libs/angular/src/tools/send/send.component.ts
@@ -12,7 +12,6 @@ import {
   combineLatest,
 } from "rxjs";
 
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -25,6 +24,7 @@ import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
 @Directive()
diff --git a/libs/angular/src/vault/abstractions/deprecated-vault-filter.service.ts b/libs/angular/src/vault/abstractions/deprecated-vault-filter.service.ts
index 3e82641fe90..9a1a31b6068 100644
--- a/libs/angular/src/vault/abstractions/deprecated-vault-filter.service.ts
+++ b/libs/angular/src/vault/abstractions/deprecated-vault-filter.service.ts
@@ -6,6 +6,7 @@ import { Observable } from "rxjs";
 // eslint-disable-next-line no-restricted-imports
 import { CollectionView } from "@bitwarden/admin-console/common";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { UserId } from "@bitwarden/common/types/guid";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
 import { DynamicTreeNode } from "../vault-filter/models/dynamic-tree-node.model";
@@ -14,11 +15,14 @@ import { DynamicTreeNode } from "../vault-filter/models/dynamic-tree-node.model"
  * @deprecated August 30 2022: Use new VaultFilterService with observables
  */
 export abstract class DeprecatedVaultFilterService {
-  buildOrganizations: () => Promise<Organization[]>;
-  buildNestedFolders: (organizationId?: string) => Observable<DynamicTreeNode<FolderView>>;
-  buildCollections: (organizationId?: string) => Promise<DynamicTreeNode<CollectionView>>;
-  buildCollapsedFilterNodes: () => Promise<Set<string>>;
-  storeCollapsedFilterNodes: (collapsedFilterNodes: Set<string>) => Promise<void>;
-  checkForSingleOrganizationPolicy: () => Promise<boolean>;
-  checkForPersonalOwnershipPolicy: () => Promise<boolean>;
+  abstract buildOrganizations(): Promise<Organization[]>;
+  abstract buildNestedFolders(organizationId?: string): Observable<DynamicTreeNode<FolderView>>;
+  abstract buildCollections(organizationId?: string): Promise<DynamicTreeNode<CollectionView>>;
+  abstract buildCollapsedFilterNodes(userId: UserId): Promise<Set<string>>;
+  abstract storeCollapsedFilterNodes(
+    collapsedFilterNodes: Set<string>,
+    userId: UserId,
+  ): Promise<void>;
+  abstract checkForSingleOrganizationPolicy(): Promise<boolean>;
+  abstract checkForOrganizationDataOwnershipPolicy(): Promise<boolean>;
 }
diff --git a/libs/angular/src/vault/components/add-edit-custom-fields.component.ts b/libs/angular/src/vault/components/add-edit-custom-fields.component.ts
deleted file mode 100644
index 9f774ca3c24..00000000000
--- a/libs/angular/src/vault/components/add-edit-custom-fields.component.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { CdkDragDrop, moveItemInArray } from "@angular/cdk/drag-drop";
-import { Directive, Input, OnChanges, SimpleChanges } from "@angular/core";
-
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { EventType } from "@bitwarden/common/enums";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
-
-@Directive()
-export class AddEditCustomFieldsComponent implements OnChanges {
-  @Input() cipher: CipherView;
-  @Input() thisCipherType: CipherType;
-  @Input() editMode: boolean;
-
-  addFieldType: FieldType = FieldType.Text;
-  addFieldTypeOptions: any[];
-  addFieldLinkedTypeOption: any;
-  linkedFieldOptions: any[] = [];
-
-  cipherType = CipherType;
-  fieldType = FieldType;
-  eventType = EventType;
-
-  constructor(
-    private i18nService: I18nService,
-    private eventCollectionService: EventCollectionService,
-  ) {
-    this.addFieldTypeOptions = [
-      { name: i18nService.t("cfTypeText"), value: FieldType.Text },
-      { name: i18nService.t("cfTypeHidden"), value: FieldType.Hidden },
-      { name: i18nService.t("cfTypeBoolean"), value: FieldType.Boolean },
-    ];
-    this.addFieldLinkedTypeOption = {
-      name: this.i18nService.t("cfTypeLinked"),
-      value: FieldType.Linked,
-    };
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes.thisCipherType != null) {
-      this.setLinkedFieldOptions();
-
-      if (!changes.thisCipherType.firstChange) {
-        this.resetCipherLinkedFields();
-      }
-    }
-  }
-
-  addField() {
-    if (this.cipher.fields == null) {
-      this.cipher.fields = [];
-    }
-
-    const f = new FieldView();
-    f.type = this.addFieldType;
-    f.newField = true;
-
-    if (f.type === FieldType.Linked) {
-      f.linkedId = this.linkedFieldOptions[0].value;
-    }
-
-    this.cipher.fields.push(f);
-  }
-
-  removeField(field: FieldView) {
-    const i = this.cipher.fields.indexOf(field);
-    if (i > -1) {
-      this.cipher.fields.splice(i, 1);
-    }
-  }
-
-  toggleFieldValue(field: FieldView) {
-    const f = field as any;
-    f.showValue = !f.showValue;
-    if (this.editMode && f.showValue) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.eventCollectionService.collect(
-        EventType.Cipher_ClientToggledHiddenFieldVisible,
-        this.cipher.id,
-      );
-    }
-  }
-
-  trackByFunction(index: number, item: any) {
-    return index;
-  }
-
-  drop(event: CdkDragDrop<string[]>) {
-    moveItemInArray(this.cipher.fields, event.previousIndex, event.currentIndex);
-  }
-
-  private setLinkedFieldOptions() {
-    if (this.cipher.linkedFieldOptions == null) {
-      return;
-    }
-
-    const options: any = [];
-    this.cipher.linkedFieldOptions.forEach((linkedFieldOption, id) =>
-      options.push({ name: this.i18nService.t(linkedFieldOption.i18nKey), value: id }),
-    );
-    this.linkedFieldOptions = options.sort(Utils.getSortFunction(this.i18nService, "name"));
-  }
-
-  private resetCipherLinkedFields() {
-    if (this.cipher.fields == null || this.cipher.fields.length === 0) {
-      return;
-    }
-
-    // Delete any Linked custom fields if the item type does not support them
-    if (this.cipher.linkedFieldOptions == null) {
-      this.cipher.fields = this.cipher.fields.filter((f) => f.type !== FieldType.Linked);
-      return;
-    }
-
-    this.cipher.fields
-      .filter((f) => f.type === FieldType.Linked)
-      .forEach((f) => (f.linkedId = this.linkedFieldOptions[0].value));
-  }
-}
diff --git a/libs/angular/src/vault/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts
deleted file mode 100644
index 8175372cae5..00000000000
--- a/libs/angular/src/vault/components/add-edit.component.ts
+++ /dev/null
@@ -1,864 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { DatePipe } from "@angular/common";
-import { Directive, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
-import { concatMap, firstValueFrom, map, Observable, Subject, switchMap, takeUntil } from "rxjs";
-
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { OrganizationUserStatusType, PolicyType } from "@bitwarden/common/admin-console/enums";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { normalizeExpiryYearFormat } from "@bitwarden/common/autofill/utils";
-import { EventType } from "@bitwarden/common/enums";
-import { UriMatchStrategy } from "@bitwarden/common/models/domain/domain-service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { CollectionId, UserId } from "@bitwarden/common/types/guid";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { CipherType, SecureNoteType } from "@bitwarden/common/vault/enums";
-import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
-import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
-import { CardView } from "@bitwarden/common/vault/models/view/card.view";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
-import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
-import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
-import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
-import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view";
-import { SshKeyView } from "@bitwarden/common/vault/models/view/ssh-key.view";
-import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
-import { DialogService, ToastService } from "@bitwarden/components";
-import { generate_ssh_key } from "@bitwarden/sdk-internal";
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { PasswordRepromptService, SshImportPromptService } from "@bitwarden/vault";
-
-@Directive()
-export class AddEditComponent implements OnInit, OnDestroy {
-  @Input() cloneMode = false;
-  @Input() folderId: string = null;
-  @Input() cipherId: string;
-  @Input() type: CipherType;
-  @Input() collectionIds: string[];
-  @Input() organizationId: string = null;
-  @Input() collectionId: string = null;
-  @Output() onSavedCipher = new EventEmitter<CipherView>();
-  @Output() onDeletedCipher = new EventEmitter<CipherView>();
-  @Output() onRestoredCipher = new EventEmitter<CipherView>();
-  @Output() onCancelled = new EventEmitter<CipherView>();
-  @Output() onEditAttachments = new EventEmitter<CipherView>();
-  @Output() onShareCipher = new EventEmitter<CipherView>();
-  @Output() onEditCollections = new EventEmitter<CipherView>();
-  @Output() onGeneratePassword = new EventEmitter();
-  @Output() onGenerateUsername = new EventEmitter();
-
-  canDeleteCipher$: Observable<boolean>;
-
-  editMode = false;
-  cipher: CipherView;
-  folders$: Observable<FolderView[]>;
-  collections: CollectionView[] = [];
-  title: string;
-  formPromise: Promise<any>;
-  deletePromise: Promise<any>;
-  restorePromise: Promise<any>;
-  checkPasswordPromise: Promise<number>;
-  showPassword = false;
-  showPrivateKey = false;
-  showTotpSeed = false;
-  showCardNumber = false;
-  showCardCode = false;
-  cipherType = CipherType;
-  typeOptions: any[];
-  cardBrandOptions: any[];
-  cardExpMonthOptions: any[];
-  identityTitleOptions: any[];
-  uriMatchOptions: any[];
-  ownershipOptions: any[] = [];
-  autofillOnPageLoadOptions: any[];
-  currentDate = new Date();
-  allowPersonal = true;
-  reprompt = false;
-  canUseReprompt = true;
-  organization: Organization;
-  /**
-   * Flag to determine if the action is being performed from the admin console.
-   */
-  isAdminConsoleAction: boolean = false;
-
-  protected componentName = "";
-  protected destroy$ = new Subject<void>();
-  protected writeableCollections: CollectionView[];
-  private personalOwnershipPolicyAppliesToActiveUser: boolean;
-  private previousCipherId: string;
-
-  get fido2CredentialCreationDateValue(): string {
-    const dateCreated = this.i18nService.t("dateCreated");
-    const creationDate = this.datePipe.transform(
-      this.cipher?.login?.fido2Credentials?.[0]?.creationDate,
-      "short",
-    );
-    return `${dateCreated} ${creationDate}`;
-  }
-
-  constructor(
-    protected cipherService: CipherService,
-    protected folderService: FolderService,
-    protected i18nService: I18nService,
-    protected platformUtilsService: PlatformUtilsService,
-    protected auditService: AuditService,
-    protected accountService: AccountService,
-    protected collectionService: CollectionService,
-    protected messagingService: MessagingService,
-    protected eventCollectionService: EventCollectionService,
-    protected policyService: PolicyService,
-    protected logService: LogService,
-    protected passwordRepromptService: PasswordRepromptService,
-    private organizationService: OrganizationService,
-    protected dialogService: DialogService,
-    protected win: Window,
-    protected datePipe: DatePipe,
-    protected configService: ConfigService,
-    protected cipherAuthorizationService: CipherAuthorizationService,
-    protected toastService: ToastService,
-    protected sdkService: SdkService,
-    private sshImportPromptService: SshImportPromptService,
-  ) {
-    this.typeOptions = [
-      { name: i18nService.t("typeLogin"), value: CipherType.Login },
-      { name: i18nService.t("typeCard"), value: CipherType.Card },
-      { name: i18nService.t("typeIdentity"), value: CipherType.Identity },
-      { name: i18nService.t("typeSecureNote"), value: CipherType.SecureNote },
-    ];
-
-    this.cardBrandOptions = [
-      { name: "-- " + i18nService.t("select") + " --", value: null },
-      { name: "Visa", value: "Visa" },
-      { name: "Mastercard", value: "Mastercard" },
-      { name: "American Express", value: "Amex" },
-      { name: "Discover", value: "Discover" },
-      { name: "Diners Club", value: "Diners Club" },
-      { name: "JCB", value: "JCB" },
-      { name: "Maestro", value: "Maestro" },
-      { name: "UnionPay", value: "UnionPay" },
-      { name: "RuPay", value: "RuPay" },
-      { name: i18nService.t("other"), value: "Other" },
-    ];
-    this.cardExpMonthOptions = [
-      { name: "-- " + i18nService.t("select") + " --", value: null },
-      { name: "01 - " + i18nService.t("january"), value: "1" },
-      { name: "02 - " + i18nService.t("february"), value: "2" },
-      { name: "03 - " + i18nService.t("march"), value: "3" },
-      { name: "04 - " + i18nService.t("april"), value: "4" },
-      { name: "05 - " + i18nService.t("may"), value: "5" },
-      { name: "06 - " + i18nService.t("june"), value: "6" },
-      { name: "07 - " + i18nService.t("july"), value: "7" },
-      { name: "08 - " + i18nService.t("august"), value: "8" },
-      { name: "09 - " + i18nService.t("september"), value: "9" },
-      { name: "10 - " + i18nService.t("october"), value: "10" },
-      { name: "11 - " + i18nService.t("november"), value: "11" },
-      { name: "12 - " + i18nService.t("december"), value: "12" },
-    ];
-    this.identityTitleOptions = [
-      { name: "-- " + i18nService.t("select") + " --", value: null },
-      { name: i18nService.t("mr"), value: i18nService.t("mr") },
-      { name: i18nService.t("mrs"), value: i18nService.t("mrs") },
-      { name: i18nService.t("ms"), value: i18nService.t("ms") },
-      { name: i18nService.t("mx"), value: i18nService.t("mx") },
-      { name: i18nService.t("dr"), value: i18nService.t("dr") },
-    ];
-    this.uriMatchOptions = [
-      { name: i18nService.t("defaultMatchDetection"), value: null },
-      { name: i18nService.t("baseDomain"), value: UriMatchStrategy.Domain },
-      { name: i18nService.t("host"), value: UriMatchStrategy.Host },
-      { name: i18nService.t("startsWith"), value: UriMatchStrategy.StartsWith },
-      { name: i18nService.t("regEx"), value: UriMatchStrategy.RegularExpression },
-      { name: i18nService.t("exact"), value: UriMatchStrategy.Exact },
-      { name: i18nService.t("never"), value: UriMatchStrategy.Never },
-    ];
-    this.autofillOnPageLoadOptions = [
-      { name: i18nService.t("autoFillOnPageLoadUseDefault"), value: null },
-      { name: i18nService.t("autoFillOnPageLoadYes"), value: true },
-      { name: i18nService.t("autoFillOnPageLoadNo"), value: false },
-    ];
-  }
-
-  async ngOnInit() {
-    this.accountService.activeAccount$
-      .pipe(
-        getUserId,
-        switchMap((userId) =>
-          this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
-        ),
-        concatMap(async (policyAppliesToActiveUser) => {
-          this.personalOwnershipPolicyAppliesToActiveUser = policyAppliesToActiveUser;
-          await this.init();
-        }),
-        takeUntil(this.destroy$),
-      )
-      .subscribe();
-
-    this.writeableCollections = await this.loadCollections();
-    this.canUseReprompt = await this.passwordRepromptService.enabled();
-
-    this.typeOptions.push({ name: this.i18nService.t("typeSshKey"), value: CipherType.SshKey });
-  }
-
-  ngOnDestroy() {
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
-
-  async init() {
-    if (this.ownershipOptions.length) {
-      this.ownershipOptions = [];
-    }
-    if (this.personalOwnershipPolicyAppliesToActiveUser) {
-      this.allowPersonal = false;
-    } else {
-      const myEmail = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((a) => a?.email)),
-      );
-      this.ownershipOptions.push({ name: myEmail, value: null });
-    }
-
-    const userId = await firstValueFrom(
-      this.accountService.activeAccount$.pipe(map((account) => account?.id)),
-    );
-    const orgs = await firstValueFrom(this.organizationService.organizations$(userId));
-    orgs
-      .filter((org) => org.isMember)
-      .sort(Utils.getSortFunction(this.i18nService, "name"))
-      .forEach((o) => {
-        if (o.enabled && o.status === OrganizationUserStatusType.Confirmed) {
-          this.ownershipOptions.push({ name: o.name, value: o.id });
-        }
-      });
-    if (!this.allowPersonal && this.organizationId == undefined) {
-      this.organizationId = this.defaultOwnerId;
-    }
-  }
-
-  async load() {
-    this.editMode = this.cipherId != null;
-    if (this.editMode) {
-      this.editMode = true;
-      if (this.cloneMode) {
-        this.cloneMode = true;
-        this.title = this.i18nService.t("addItem");
-      } else {
-        this.title = this.i18nService.t("editItem");
-      }
-    } else {
-      this.title = this.i18nService.t("addItem");
-    }
-
-    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-
-    const loadedAddEditCipherInfo = await this.loadAddEditCipherInfo(activeUserId);
-
-    if (this.cipher == null) {
-      if (this.editMode) {
-        const cipher = await this.loadCipher(activeUserId);
-        this.cipher = await this.cipherService.decrypt(cipher, activeUserId);
-
-        // Adjust Cipher Name if Cloning
-        if (this.cloneMode) {
-          this.cipher.name += " - " + this.i18nService.t("clone");
-          // If not allowing personal ownership, update cipher's org Id to prompt downstream changes
-          if (this.cipher.organizationId == null && !this.allowPersonal) {
-            this.cipher.organizationId = this.organizationId;
-          }
-        }
-      } else {
-        this.cipher = new CipherView();
-        this.cipher.organizationId = this.organizationId == null ? null : this.organizationId;
-        this.cipher.folderId = this.folderId;
-        this.cipher.type = this.type == null ? CipherType.Login : this.type;
-        this.cipher.login = new LoginView();
-        this.cipher.login.uris = [new LoginUriView()];
-        this.cipher.card = new CardView();
-        this.cipher.identity = new IdentityView();
-        this.cipher.secureNote = new SecureNoteView();
-        this.cipher.secureNote.type = SecureNoteType.Generic;
-        this.cipher.sshKey = new SshKeyView();
-        this.cipher.reprompt = CipherRepromptType.None;
-      }
-    }
-
-    if (this.cipher != null && (!this.editMode || loadedAddEditCipherInfo || this.cloneMode)) {
-      await this.organizationChanged();
-      if (
-        this.collectionIds != null &&
-        this.collectionIds.length > 0 &&
-        this.collections.length > 0
-      ) {
-        this.collections.forEach((c) => {
-          if (this.collectionIds.indexOf(c.id) > -1) {
-            (c as any).checked = true;
-          }
-        });
-      }
-    }
-    // Only Admins can clone a cipher to different owner
-    if (this.cloneMode && this.cipher.organizationId != null) {
-      const activeUserId = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-      );
-
-      const cipherOrg = (
-        await firstValueFrom(this.organizationService.memberOrganizations$(activeUserId))
-      ).find((o) => o.id === this.cipher.organizationId);
-
-      if (cipherOrg != null && !cipherOrg.isAdmin && !cipherOrg.permissions.editAnyCollection) {
-        this.ownershipOptions = [{ name: cipherOrg.name, value: cipherOrg.id }];
-      }
-    }
-
-    // We don't want to copy passkeys when we clone a cipher
-    if (this.cloneMode && this.cipher?.login?.hasFido2Credentials) {
-      this.cipher.login.fido2Credentials = null;
-    }
-
-    this.folders$ = this.folderService.folderViews$(activeUserId);
-
-    if (this.editMode && this.previousCipherId !== this.cipherId) {
-      void this.eventCollectionService.collectMany(EventType.Cipher_ClientViewed, [this.cipher]);
-    }
-    this.previousCipherId = this.cipherId;
-    this.reprompt = this.cipher.reprompt !== CipherRepromptType.None;
-    if (this.reprompt) {
-      this.cipher.login.autofillOnPageLoad = this.autofillOnPageLoadOptions[2].value;
-    }
-
-    this.canDeleteCipher$ = this.cipherAuthorizationService.canDeleteCipher$(
-      this.cipher,
-      [this.collectionId as CollectionId],
-      this.isAdminConsoleAction,
-    );
-
-    if (!this.editMode || this.cloneMode) {
-      // Creating an ssh key directly while filtering to the ssh key category
-      // must force a key to be set. SSH keys must never be created with an empty private key field
-      if (
-        this.cipher.type === CipherType.SshKey &&
-        (this.cipher.sshKey.privateKey == null || this.cipher.sshKey.privateKey === "")
-      ) {
-        await this.generateSshKey(false);
-      }
-    }
-  }
-
-  async submit(): Promise<boolean> {
-    if (this.cipher.isDeleted) {
-      return this.restore();
-    }
-
-    // normalize card expiry year on save
-    if (this.cipher.type === this.cipherType.Card) {
-      this.cipher.card.expYear = normalizeExpiryYearFormat(this.cipher.card.expYear);
-    }
-
-    // trim whitespace from the TOTP field
-    if (this.cipher.type === this.cipherType.Login && this.cipher.login.totp) {
-      this.cipher.login.totp = this.cipher.login.totp.trim();
-    }
-
-    if (this.cipher.name == null || this.cipher.name === "") {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("nameRequired"),
-      });
-      return false;
-    }
-
-    if (
-      (!this.editMode || this.cloneMode) &&
-      !this.allowPersonal &&
-      this.cipher.organizationId == null
-    ) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("personalOwnershipSubmitError"),
-      });
-      return false;
-    }
-
-    if (
-      (!this.editMode || this.cloneMode) &&
-      this.cipher.type === CipherType.Login &&
-      this.cipher.login.uris != null &&
-      this.cipher.login.uris.length === 1 &&
-      (this.cipher.login.uris[0].uri == null || this.cipher.login.uris[0].uri === "")
-    ) {
-      this.cipher.login.uris = [];
-    }
-
-    // Allows saving of selected collections during "Add" and "Clone" flows
-    if ((!this.editMode || this.cloneMode) && this.cipher.organizationId != null) {
-      this.cipher.collectionIds =
-        this.collections == null
-          ? []
-          : this.collections.filter((c) => (c as any).checked).map((c) => c.id);
-    }
-
-    // Clear current Cipher Id if exists to trigger "Add" cipher flow
-    if (this.cloneMode) {
-      this.cipher.id = null;
-    }
-
-    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    const cipher = await this.encryptCipher(activeUserId);
-
-    try {
-      this.formPromise = this.saveCipher(cipher);
-      const savedCipher = await this.formPromise;
-
-      // Reset local cipher from the saved cipher returned from the server
-      this.cipher = await savedCipher.decrypt(
-        await this.cipherService.getKeyForCipherKeyDecryption(savedCipher, activeUserId),
-      );
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t(this.editMode && !this.cloneMode ? "editedItem" : "addedItem"),
-      });
-      this.onSavedCipher.emit(this.cipher);
-      this.messagingService.send(this.editMode && !this.cloneMode ? "editedCipher" : "addedCipher");
-      return true;
-    } catch (e) {
-      this.logService.error(e);
-    }
-
-    return false;
-  }
-
-  addUri() {
-    if (this.cipher.type !== CipherType.Login) {
-      return;
-    }
-
-    if (this.cipher.login.uris == null) {
-      this.cipher.login.uris = [];
-    }
-
-    this.cipher.login.uris.push(new LoginUriView());
-  }
-
-  removeUri(uri: LoginUriView) {
-    if (this.cipher.type !== CipherType.Login || this.cipher.login.uris == null) {
-      return;
-    }
-
-    const i = this.cipher.login.uris.indexOf(uri);
-    if (i > -1) {
-      this.cipher.login.uris.splice(i, 1);
-    }
-  }
-
-  removePasskey() {
-    if (this.cipher.type !== CipherType.Login || this.cipher.login.fido2Credentials == null) {
-      return;
-    }
-
-    this.cipher.login.fido2Credentials = null;
-  }
-
-  onCardNumberChange(): void {
-    this.cipher.card.brand = CardView.getCardBrandByPatterns(this.cipher.card.number);
-  }
-
-  getCardExpMonthDisplay() {
-    return this.cardExpMonthOptions.find((x) => x.value == this.cipher.card.expMonth)?.name;
-  }
-
-  trackByFunction(index: number, item: any) {
-    return index;
-  }
-
-  cancel() {
-    this.onCancelled.emit(this.cipher);
-  }
-
-  attachments() {
-    this.onEditAttachments.emit(this.cipher);
-  }
-
-  share() {
-    this.onShareCipher.emit(this.cipher);
-  }
-
-  editCollections() {
-    this.onEditCollections.emit(this.cipher);
-  }
-
-  async delete(): Promise<boolean> {
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: { key: "deleteItem" },
-      content: {
-        key: this.cipher.isDeleted ? "permanentlyDeleteItemConfirmation" : "deleteItemConfirmation",
-      },
-      type: "warning",
-    });
-
-    if (!confirmed) {
-      return false;
-    }
-
-    try {
-      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      this.deletePromise = this.deleteCipher(activeUserId);
-      await this.deletePromise;
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t(
-          this.cipher.isDeleted ? "permanentlyDeletedItem" : "deletedItem",
-        ),
-      });
-      this.onDeletedCipher.emit(this.cipher);
-      this.messagingService.send(
-        this.cipher.isDeleted ? "permanentlyDeletedCipher" : "deletedCipher",
-      );
-    } catch (e) {
-      this.logService.error(e);
-    }
-
-    return true;
-  }
-
-  async restore(): Promise<boolean> {
-    if (!this.cipher.isDeleted) {
-      return false;
-    }
-
-    try {
-      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      this.restorePromise = this.restoreCipher(activeUserId);
-      await this.restorePromise;
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("restoredItem"),
-      });
-      this.onRestoredCipher.emit(this.cipher);
-      this.messagingService.send("restoredCipher");
-    } catch (e) {
-      this.logService.error(e);
-    }
-
-    return true;
-  }
-
-  async generateUsername(): Promise<boolean> {
-    if (this.cipher.login?.username?.length) {
-      const confirmed = await this.dialogService.openSimpleDialog({
-        title: { key: "overwriteUsername" },
-        content: { key: "overwriteUsernameConfirmation" },
-        type: "warning",
-      });
-
-      if (!confirmed) {
-        return false;
-      }
-    }
-
-    this.onGenerateUsername.emit();
-    return true;
-  }
-
-  async generatePassword(): Promise<boolean> {
-    if (this.cipher.login?.password?.length) {
-      const confirmed = await this.dialogService.openSimpleDialog({
-        title: { key: "overwritePassword" },
-        content: { key: "overwritePasswordConfirmation" },
-        type: "warning",
-      });
-
-      if (!confirmed) {
-        return false;
-      }
-    }
-
-    this.onGeneratePassword.emit();
-    return true;
-  }
-
-  togglePassword() {
-    this.showPassword = !this.showPassword;
-
-    if (this.editMode && this.showPassword) {
-      document.getElementById("loginPassword")?.focus();
-
-      void this.eventCollectionService.collectMany(EventType.Cipher_ClientToggledPasswordVisible, [
-        this.cipher,
-      ]);
-    }
-  }
-
-  toggleTotpSeed() {
-    this.showTotpSeed = !this.showTotpSeed;
-
-    if (this.editMode && this.showTotpSeed) {
-      document.getElementById("loginTotp")?.focus();
-
-      void this.eventCollectionService.collectMany(EventType.Cipher_ClientToggledTOTPSeedVisible, [
-        this.cipher,
-      ]);
-    }
-  }
-
-  async toggleCardNumber() {
-    this.showCardNumber = !this.showCardNumber;
-    if (this.showCardNumber) {
-      void this.eventCollectionService.collectMany(
-        EventType.Cipher_ClientToggledCardNumberVisible,
-        [this.cipher],
-      );
-    }
-  }
-
-  toggleCardCode() {
-    this.showCardCode = !this.showCardCode;
-    document.getElementById("cardCode").focus();
-    if (this.editMode && this.showCardCode) {
-      void this.eventCollectionService.collectMany(EventType.Cipher_ClientToggledCardCodeVisible, [
-        this.cipher,
-      ]);
-    }
-  }
-
-  togglePrivateKey() {
-    this.showPrivateKey = !this.showPrivateKey;
-  }
-
-  toggleUriOptions(uri: LoginUriView) {
-    const u = uri as any;
-    u.showOptions = u.showOptions == null && uri.match != null ? false : !u.showOptions;
-  }
-
-  loginUriMatchChanged(uri: LoginUriView) {
-    const u = uri as any;
-    u.showOptions = u.showOptions == null ? true : u.showOptions;
-  }
-
-  async organizationChanged() {
-    if (this.writeableCollections != null) {
-      this.writeableCollections.forEach((c) => ((c as any).checked = false));
-    }
-    if (this.cipher.organizationId != null) {
-      this.collections = this.writeableCollections?.filter(
-        (c) => c.organizationId === this.cipher.organizationId,
-      );
-      // If there's only one collection, check it by default
-      if (this.collections.length === 1) {
-        (this.collections[0] as any).checked = true;
-      }
-      const activeUserId = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-      );
-
-      const org = (
-        await firstValueFrom(this.organizationService.organizations$(activeUserId))
-      ).find((org) => org.id === this.cipher.organizationId);
-      if (org != null) {
-        this.cipher.organizationUseTotp = org.useTotp;
-      }
-    } else {
-      this.collections = [];
-    }
-  }
-
-  async checkPassword() {
-    if (this.checkPasswordPromise != null) {
-      return;
-    }
-
-    if (
-      this.cipher.login == null ||
-      this.cipher.login.password == null ||
-      this.cipher.login.password === ""
-    ) {
-      return;
-    }
-
-    this.checkPasswordPromise = this.auditService.passwordLeaked(this.cipher.login.password);
-    const matches = await this.checkPasswordPromise;
-    this.checkPasswordPromise = null;
-
-    if (matches > 0) {
-      this.toastService.showToast({
-        variant: "warning",
-        title: null,
-        message: this.i18nService.t("passwordExposed", matches.toString()),
-      });
-    } else {
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("passwordSafe"),
-      });
-    }
-  }
-
-  repromptChanged() {
-    this.reprompt = !this.reprompt;
-    if (this.reprompt) {
-      this.cipher.reprompt = CipherRepromptType.Password;
-      this.cipher.login.autofillOnPageLoad = this.autofillOnPageLoadOptions[2].value;
-    } else {
-      this.cipher.reprompt = CipherRepromptType.None;
-      this.cipher.login.autofillOnPageLoad = this.autofillOnPageLoadOptions[0].value;
-    }
-  }
-
-  protected async loadCollections() {
-    const allCollections = await this.collectionService.getAllDecrypted();
-    return allCollections.filter((c) => !c.readOnly);
-  }
-
-  protected loadCipher(userId: UserId) {
-    return this.cipherService.get(this.cipherId, userId);
-  }
-
-  protected encryptCipher(userId: UserId) {
-    return this.cipherService.encrypt(this.cipher, userId);
-  }
-
-  protected saveCipher(cipher: Cipher) {
-    let orgAdmin = this.organization?.canEditAllCiphers;
-
-    // if a cipher is unassigned we want to check if they are an admin or have permission to edit any collection
-    if (!cipher.collectionIds) {
-      orgAdmin = this.organization?.canEditUnassignedCiphers;
-    }
-
-    return this.cipher.id == null
-      ? this.cipherService.createWithServer(cipher, orgAdmin)
-      : this.cipherService.updateWithServer(cipher, orgAdmin);
-  }
-
-  protected deleteCipher(userId: UserId) {
-    return this.cipher.isDeleted
-      ? this.cipherService.deleteWithServer(this.cipher.id, userId, this.asAdmin)
-      : this.cipherService.softDeleteWithServer(this.cipher.id, userId, this.asAdmin);
-  }
-
-  protected restoreCipher(userId: UserId) {
-    return this.cipherService.restoreWithServer(this.cipher.id, userId, this.asAdmin);
-  }
-
-  /**
-   * Determines if a cipher must be deleted as an admin by belonging to an organization and being unassigned to a collection.
-   */
-  get asAdmin(): boolean {
-    return (
-      this.cipher.organizationId !== null &&
-      this.cipher.organizationId.length > 0 &&
-      (this.organization?.canEditAllCiphers ||
-        !this.cipher.collectionIds ||
-        this.cipher.collectionIds.length === 0)
-    );
-  }
-
-  get defaultOwnerId(): string | null {
-    return this.ownershipOptions[0].value;
-  }
-
-  async loadAddEditCipherInfo(userId: UserId): Promise<boolean> {
-    const addEditCipherInfo: any = await firstValueFrom(
-      this.cipherService.addEditCipherInfo$(userId),
-    );
-    const loadedSavedInfo = addEditCipherInfo != null;
-
-    if (loadedSavedInfo) {
-      this.cipher = addEditCipherInfo.cipher;
-      this.collectionIds = addEditCipherInfo.collectionIds;
-
-      if (!this.editMode && !this.allowPersonal && this.cipher.organizationId == null) {
-        // This is a new cipher and personal ownership isn't allowed, so we need to set the default owner
-        this.cipher.organizationId = this.defaultOwnerId;
-      }
-    }
-
-    await this.cipherService.setAddEditCipherInfo(null, userId);
-
-    return loadedSavedInfo;
-  }
-
-  async copy(value: string, typeI18nKey: string, aType: string): Promise<boolean> {
-    if (value == null) {
-      return false;
-    }
-
-    const copyOptions = this.win != null ? { window: this.win } : null;
-    this.platformUtilsService.copyToClipboard(value, copyOptions);
-    this.toastService.showToast({
-      variant: "info",
-      title: null,
-      message: this.i18nService.t("valueCopied", this.i18nService.t(typeI18nKey)),
-    });
-
-    if (typeI18nKey === "password") {
-      void this.eventCollectionService.collectMany(EventType.Cipher_ClientCopiedPassword, [
-        this.cipher,
-      ]);
-    } else if (typeI18nKey === "securityCode") {
-      void this.eventCollectionService.collectMany(EventType.Cipher_ClientCopiedCardCode, [
-        this.cipher,
-      ]);
-    } else if (aType === "H_Field") {
-      void this.eventCollectionService.collectMany(EventType.Cipher_ClientCopiedHiddenField, [
-        this.cipher,
-      ]);
-    }
-
-    return true;
-  }
-
-  async importSshKeyFromClipboard() {
-    const key = await this.sshImportPromptService.importSshKeyFromClipboard();
-    if (key != null) {
-      this.cipher.sshKey.privateKey = key.privateKey;
-      this.cipher.sshKey.publicKey = key.publicKey;
-      this.cipher.sshKey.keyFingerprint = key.keyFingerprint;
-    }
-  }
-
-  private async generateSshKey(showNotification: boolean = true) {
-    await firstValueFrom(this.sdkService.client$);
-    const sshKey = generate_ssh_key("Ed25519");
-    this.cipher.sshKey.privateKey = sshKey.privateKey;
-    this.cipher.sshKey.publicKey = sshKey.publicKey;
-    this.cipher.sshKey.keyFingerprint = sshKey.fingerprint;
-
-    if (showNotification) {
-      this.toastService.showToast({
-        variant: "success",
-        title: "",
-        message: this.i18nService.t("sshKeyGenerated"),
-      });
-    }
-  }
-
-  async typeChange() {
-    if (this.cipher.type === CipherType.SshKey) {
-      await this.generateSshKey();
-    }
-  }
-}
diff --git a/libs/angular/src/vault/components/attachments.component.ts b/libs/angular/src/vault/components/attachments.component.ts
deleted file mode 100644
index e4b01d3aac1..00000000000
--- a/libs/angular/src/vault/components/attachments.component.ts
+++ /dev/null
@@ -1,354 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
-import { firstValueFrom } from "rxjs";
-
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
-import { CipherId, UserId } from "@bitwarden/common/types/guid";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
-import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
-import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { DialogService, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
-
-@Directive()
-export class AttachmentsComponent implements OnInit {
-  @Input() cipherId: string;
-  @Input() viewOnly: boolean;
-  @Output() onUploadedAttachment = new EventEmitter<CipherView>();
-  @Output() onDeletedAttachment = new EventEmitter();
-  @Output() onReuploadedAttachment = new EventEmitter();
-
-  cipher: CipherView;
-  cipherDomain: Cipher;
-  canAccessAttachments: boolean;
-  formPromise: Promise<any>;
-  deletePromises: { [id: string]: Promise<CipherData> } = {};
-  reuploadPromises: { [id: string]: Promise<any> } = {};
-  emergencyAccessId?: string = null;
-  protected componentName = "";
-
-  constructor(
-    protected cipherService: CipherService,
-    protected i18nService: I18nService,
-    protected keyService: KeyService,
-    protected encryptService: EncryptService,
-    protected platformUtilsService: PlatformUtilsService,
-    protected apiService: ApiService,
-    protected win: Window,
-    protected logService: LogService,
-    protected stateService: StateService,
-    protected fileDownloadService: FileDownloadService,
-    protected dialogService: DialogService,
-    protected billingAccountProfileStateService: BillingAccountProfileStateService,
-    protected accountService: AccountService,
-    protected toastService: ToastService,
-    protected configService: ConfigService,
-  ) {}
-
-  async ngOnInit() {
-    await this.init();
-  }
-
-  async submit() {
-    const fileEl = document.getElementById("file") as HTMLInputElement;
-    const files = fileEl.files;
-    if (files == null || files.length === 0) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("selectFile"),
-      });
-      return;
-    }
-
-    if (files[0].size > 524288000) {
-      // 500 MB
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("errorOccurred"),
-        message: this.i18nService.t("maxFileSize"),
-      });
-      return;
-    }
-
-    try {
-      const activeUserId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-      this.formPromise = this.saveCipherAttachment(files[0], activeUserId);
-      this.cipherDomain = await this.formPromise;
-      this.cipher = await this.cipherService.decrypt(this.cipherDomain, activeUserId);
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("attachmentSaved"),
-      });
-      this.onUploadedAttachment.emit(this.cipher);
-    } catch (e) {
-      this.logService.error(e);
-    }
-
-    // reset file input
-    // ref: https://stackoverflow.com/a/20552042
-    fileEl.type = "";
-    fileEl.type = "file";
-    fileEl.value = "";
-  }
-
-  async delete(attachment: AttachmentView) {
-    if (this.deletePromises[attachment.id] != null) {
-      return;
-    }
-
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: { key: "deleteAttachment" },
-      content: { key: "deleteAttachmentConfirmation" },
-      type: "warning",
-    });
-
-    if (!confirmed) {
-      return;
-    }
-
-    try {
-      const activeUserId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-
-      this.deletePromises[attachment.id] = this.deleteCipherAttachment(attachment.id, activeUserId);
-      const updatedCipher = await this.deletePromises[attachment.id];
-
-      const cipher = new Cipher(updatedCipher);
-      this.cipher = await this.cipherService.decrypt(cipher, activeUserId);
-
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("deletedAttachment"),
-      });
-      const i = this.cipher.attachments.indexOf(attachment);
-      if (i > -1) {
-        this.cipher.attachments.splice(i, 1);
-      }
-    } catch (e) {
-      this.logService.error(e);
-    }
-
-    this.deletePromises[attachment.id] = null;
-    this.onDeletedAttachment.emit(this.cipher);
-  }
-
-  async download(attachment: AttachmentView) {
-    const a = attachment as any;
-    if (a.downloading) {
-      return;
-    }
-
-    if (!this.canAccessAttachments) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("premiumRequired"),
-        message: this.i18nService.t("premiumRequiredDesc"),
-      });
-      return;
-    }
-
-    let url: string;
-    try {
-      const attachmentDownloadResponse = await this.apiService.getAttachmentData(
-        this.cipher.id,
-        attachment.id,
-        this.emergencyAccessId,
-      );
-      url = attachmentDownloadResponse.url;
-    } catch (e) {
-      if (e instanceof ErrorResponse && (e as ErrorResponse).statusCode === 404) {
-        url = attachment.url;
-      } else if (e instanceof ErrorResponse) {
-        throw new Error((e as ErrorResponse).getSingleMessage());
-      } else {
-        throw e;
-      }
-    }
-
-    a.downloading = true;
-    const response = await fetch(new Request(url, { cache: "no-store" }));
-    if (response.status !== 200) {
-      this.toastService.showToast({
-        variant: "error",
-        title: null,
-        message: this.i18nService.t("errorOccurred"),
-      });
-      a.downloading = false;
-      return;
-    }
-
-    try {
-      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      const decBuf = await this.cipherService.getDecryptedAttachmentBuffer(
-        this.cipherDomain.id as CipherId,
-        attachment,
-        response,
-        activeUserId,
-      );
-
-      this.fileDownloadService.download({
-        fileName: attachment.fileName,
-        blobData: decBuf,
-      });
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("fileSavedToDevice"),
-      });
-      // FIXME: Remove when updating file. Eslint update
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    } catch (e) {
-      this.toastService.showToast({
-        variant: "error",
-        title: null,
-        message: this.i18nService.t("errorOccurred"),
-      });
-    }
-
-    a.downloading = false;
-  }
-
-  protected async init() {
-    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    this.cipherDomain = await this.loadCipher(activeUserId);
-    this.cipher = await this.cipherService.decrypt(this.cipherDomain, activeUserId);
-
-    const canAccessPremium = await firstValueFrom(
-      this.billingAccountProfileStateService.hasPremiumFromAnySource$(activeUserId),
-    );
-    this.canAccessAttachments = canAccessPremium || this.cipher.organizationId != null;
-
-    if (!this.canAccessAttachments) {
-      const confirmed = await this.dialogService.openSimpleDialog({
-        title: { key: "premiumRequired" },
-        content: { key: "premiumRequiredDesc" },
-        acceptButtonText: { key: "learnMore" },
-        type: "success",
-      });
-
-      if (confirmed) {
-        this.platformUtilsService.launchUri(
-          "https://vault.bitwarden.com/#/settings/subscription/premium",
-        );
-      }
-    }
-  }
-
-  protected async reuploadCipherAttachment(attachment: AttachmentView, admin: boolean) {
-    const a = attachment as any;
-    if (attachment.key != null || a.downloading || this.reuploadPromises[attachment.id] != null) {
-      return;
-    }
-
-    try {
-      this.reuploadPromises[attachment.id] = Promise.resolve().then(async () => {
-        // 1. Download
-        a.downloading = true;
-        const response = await fetch(new Request(attachment.url, { cache: "no-store" }));
-        if (response.status !== 200) {
-          this.toastService.showToast({
-            variant: "error",
-            title: null,
-            message: this.i18nService.t("errorOccurred"),
-          });
-          a.downloading = false;
-          return;
-        }
-
-        try {
-          // 2. Resave
-          const activeUserId = await firstValueFrom(
-            this.accountService.activeAccount$.pipe(getUserId),
-          );
-
-          const decBuf = await this.cipherService.getDecryptedAttachmentBuffer(
-            this.cipherDomain.id as CipherId,
-            attachment,
-            response,
-            activeUserId,
-          );
-
-          this.cipherDomain = await this.cipherService.saveAttachmentRawWithServer(
-            this.cipherDomain,
-            attachment.fileName,
-            decBuf,
-            activeUserId,
-            admin,
-          );
-          this.cipher = await this.cipherService.decrypt(this.cipherDomain, activeUserId);
-
-          // 3. Delete old
-          this.deletePromises[attachment.id] = this.deleteCipherAttachment(
-            attachment.id,
-            activeUserId,
-          );
-          await this.deletePromises[attachment.id];
-          const foundAttachment = this.cipher.attachments.filter((a2) => a2.id === attachment.id);
-          if (foundAttachment.length > 0) {
-            const i = this.cipher.attachments.indexOf(foundAttachment[0]);
-            if (i > -1) {
-              this.cipher.attachments.splice(i, 1);
-            }
-          }
-
-          this.toastService.showToast({
-            variant: "success",
-            title: null,
-            message: this.i18nService.t("attachmentSaved"),
-          });
-          this.onReuploadedAttachment.emit();
-          // FIXME: Remove when updating file. Eslint update
-          // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        } catch (e) {
-          this.toastService.showToast({
-            variant: "error",
-            title: null,
-            message: this.i18nService.t("errorOccurred"),
-          });
-        }
-
-        a.downloading = false;
-      });
-      await this.reuploadPromises[attachment.id];
-    } catch (e) {
-      this.logService.error(e);
-    }
-  }
-
-  protected loadCipher(userId: UserId) {
-    return this.cipherService.get(this.cipherId, userId);
-  }
-
-  protected saveCipherAttachment(file: File, userId: UserId) {
-    return this.cipherService.saveAttachmentWithServer(this.cipherDomain, file, userId);
-  }
-
-  protected deleteCipherAttachment(attachmentId: string, userId: UserId) {
-    return this.cipherService.deleteAttachmentWithServer(
-      this.cipher.id,
-      attachmentId,
-      userId,
-      false,
-    );
-  }
-
-  protected async reupload(attachment: AttachmentView) {
-    // TODO: This should be removed but is needed since we re-use the same template
-  }
-}
diff --git a/libs/angular/src/vault/components/password-history.component.ts b/libs/angular/src/vault/components/password-history.component.ts
deleted file mode 100644
index acb89b82191..00000000000
--- a/libs/angular/src/vault/components/password-history.component.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Directive, OnInit } from "@angular/core";
-import { firstValueFrom } from "rxjs";
-
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { PasswordHistoryView } from "@bitwarden/common/vault/models/view/password-history.view";
-import { ToastService } from "@bitwarden/components";
-
-@Directive()
-export class PasswordHistoryComponent implements OnInit {
-  cipherId: string;
-  history: PasswordHistoryView[] = [];
-
-  constructor(
-    protected cipherService: CipherService,
-    protected platformUtilsService: PlatformUtilsService,
-    protected i18nService: I18nService,
-    protected accountService: AccountService,
-    private win: Window,
-    private toastService: ToastService,
-  ) {}
-
-  async ngOnInit() {
-    await this.init();
-  }
-
-  copy(password: string) {
-    const copyOptions = this.win != null ? { window: this.win } : null;
-    this.platformUtilsService.copyToClipboard(password, copyOptions);
-    this.toastService.showToast({
-      variant: "info",
-      title: null,
-      message: this.i18nService.t("valueCopied", this.i18nService.t("password")),
-    });
-  }
-
-  protected async init() {
-    const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    const cipher = await this.cipherService.get(this.cipherId, activeUserId);
-    const decCipher = await this.cipherService.decrypt(cipher, activeUserId);
-    this.history = decCipher.passwordHistory == null ? [] : decCipher.passwordHistory;
-  }
-}
diff --git a/libs/angular/src/vault/components/spotlight/spotlight.component.ts b/libs/angular/src/vault/components/spotlight/spotlight.component.ts
index a2e2a13a468..3c64318a900 100644
--- a/libs/angular/src/vault/components/spotlight/spotlight.component.ts
+++ b/libs/angular/src/vault/components/spotlight/spotlight.component.ts
@@ -7,7 +7,6 @@ import { I18nPipe } from "@bitwarden/ui-common";
 @Component({
   selector: "bit-spotlight",
   templateUrl: "spotlight.component.html",
-  standalone: true,
   imports: [ButtonModule, CommonModule, IconButtonModule, I18nPipe, TypographyModule],
 })
 export class SpotlightComponent {
diff --git a/libs/angular/src/vault/components/vault-items.component.ts b/libs/angular/src/vault/components/vault-items.component.ts
index c34816994be..cf017899774 100644
--- a/libs/angular/src/vault/components/vault-items.component.ts
+++ b/libs/angular/src/vault/components/vault-items.component.ts
@@ -8,18 +8,22 @@ import {
   combineLatest,
   filter,
   from,
+  map,
   of,
+  shareReplay,
   switchMap,
   takeUntil,
 } from "rxjs";
 
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { CIPHER_MENU_ITEMS } from "@bitwarden/common/vault/types/cipher-menu-items";
 
 @Directive()
 export class VaultItemsComponent implements OnInit, OnDestroy {
@@ -35,6 +39,19 @@ export class VaultItemsComponent implements OnInit, OnDestroy {
   organization: Organization;
   CipherType = CipherType;
 
+  protected itemTypes$ = this.restrictedItemTypesService.restricted$.pipe(
+    map((restrictedItemTypes) =>
+      // Filter out restricted item types
+      CIPHER_MENU_ITEMS.filter(
+        (itemType) =>
+          !restrictedItemTypes.some(
+            (restrictedType) => restrictedType.cipherType === itemType.type,
+          ),
+      ),
+    ),
+    shareReplay({ bufferSize: 1, refCount: true }),
+  );
+
   protected searchPending = false;
 
   /** Construct filters as an observable so it can be appended to the cipher stream. */
@@ -62,6 +79,7 @@ export class VaultItemsComponent implements OnInit, OnDestroy {
     protected searchService: SearchService,
     protected cipherService: CipherService,
     protected accountService: AccountService,
+    protected restrictedItemTypesService: RestrictedItemTypesService,
   ) {
     this.subscribeToCiphers();
   }
@@ -143,18 +161,22 @@ export class VaultItemsComponent implements OnInit, OnDestroy {
             this._searchText$,
             this._filter$,
             of(userId),
+            this.restrictedItemTypesService.restricted$,
           ]),
         ),
-        switchMap(([indexedCiphers, failedCiphers, searchText, filter, userId]) => {
+        switchMap(([indexedCiphers, failedCiphers, searchText, filter, userId, restricted]) => {
           let allCiphers = indexedCiphers ?? [];
           const _failedCiphers = failedCiphers ?? [];
 
           allCiphers = [..._failedCiphers, ...allCiphers];
 
+          const restrictedTypeFilter = (cipher: CipherView) =>
+            !this.restrictedItemTypesService.isCipherRestricted(cipher, restricted);
+
           return this.searchService.searchCiphers(
             userId,
             searchText,
-            [filter, this.deletedFilter],
+            [filter, this.deletedFilter, restrictedTypeFilter],
             allCiphers,
           );
         }),
diff --git a/libs/angular/src/vault/components/view-custom-fields.component.ts b/libs/angular/src/vault/components/view-custom-fields.component.ts
deleted file mode 100644
index d991a0260c1..00000000000
--- a/libs/angular/src/vault/components/view-custom-fields.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Directive, Input } from "@angular/core";
-
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { EventType } from "@bitwarden/common/enums";
-import { FieldType } from "@bitwarden/common/vault/enums";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
-
-@Directive()
-export class ViewCustomFieldsComponent {
-  @Input() cipher: CipherView;
-  @Input() promptPassword: () => Promise<boolean>;
-  @Input() copy: (value: string, typeI18nKey: string, aType: string) => void;
-
-  fieldType = FieldType;
-
-  constructor(private eventCollectionService: EventCollectionService) {}
-
-  async toggleFieldValue(field: FieldView) {
-    if (!(await this.promptPassword())) {
-      return;
-    }
-
-    const f = field as any;
-    f.showValue = !f.showValue;
-    f.showCount = false;
-    if (f.showValue) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.eventCollectionService.collect(
-        EventType.Cipher_ClientToggledHiddenFieldVisible,
-        this.cipher.id,
-      );
-    }
-  }
-
-  async toggleFieldCount(field: FieldView) {
-    if (!field.showValue) {
-      return;
-    }
-
-    field.showCount = !field.showCount;
-  }
-
-  setTextDataOnDrag(event: DragEvent, data: string) {
-    event.dataTransfer.setData("text", data);
-  }
-}
diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts
deleted file mode 100644
index ac14c092490..00000000000
--- a/libs/angular/src/vault/components/view.component.ts
+++ /dev/null
@@ -1,570 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { DatePipe } from "@angular/common";
-import {
-  ChangeDetectorRef,
-  Directive,
-  EventEmitter,
-  Input,
-  NgZone,
-  OnDestroy,
-  OnInit,
-  Output,
-} from "@angular/core";
-import {
-  BehaviorSubject,
-  combineLatest,
-  filter,
-  firstValueFrom,
-  map,
-  Observable,
-  of,
-  switchMap,
-  tap,
-} from "rxjs";
-
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { EventType } from "@bitwarden/common/enums";
-import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
-import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
-import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
-import { CipherId, CollectionId, UserId } from "@bitwarden/common/types/guid";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
-import { CipherType, FieldType } from "@bitwarden/common/vault/enums";
-import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
-import { Launchable } from "@bitwarden/common/vault/interfaces/launchable";
-import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
-import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
-import { TotpInfo } from "@bitwarden/common/vault/services/totp.service";
-import { DialogService, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { PasswordRepromptService } from "@bitwarden/vault";
-
-const BroadcasterSubscriptionId = "BaseViewComponent";
-
-@Directive()
-export class ViewComponent implements OnDestroy, OnInit {
-  /** Observable of cipherId$ that will update each time the `Input` updates */
-  private _cipherId$ = new BehaviorSubject<string>(null);
-
-  @Input()
-  set cipherId(value: string) {
-    this._cipherId$.next(value);
-  }
-
-  get cipherId(): string {
-    return this._cipherId$.getValue();
-  }
-
-  @Input() collectionId: string;
-  @Output() onEditCipher = new EventEmitter<CipherView>();
-  @Output() onCloneCipher = new EventEmitter<CipherView>();
-  @Output() onShareCipher = new EventEmitter<CipherView>();
-  @Output() onDeletedCipher = new EventEmitter<CipherView>();
-  @Output() onRestoredCipher = new EventEmitter<CipherView>();
-
-  canDeleteCipher$: Observable<boolean>;
-  canRestoreCipher$: Observable<boolean>;
-  cipher: CipherView;
-  showPassword: boolean;
-  showPasswordCount: boolean;
-  showCardNumber: boolean;
-  showCardCode: boolean;
-  showPrivateKey: boolean;
-  canAccessPremium: boolean;
-  showPremiumRequiredTotp: boolean;
-  fieldType = FieldType;
-  checkPasswordPromise: Promise<number>;
-  folder: FolderView;
-  cipherType = CipherType;
-
-  private previousCipherId: string;
-  protected passwordReprompted = false;
-
-  /**
-   * Represents TOTP information including display formatting and timing
-   */
-  protected totpInfo$: Observable<TotpInfo> | undefined;
-
-  get fido2CredentialCreationDateValue(): string {
-    const dateCreated = this.i18nService.t("dateCreated");
-    const creationDate = this.datePipe.transform(
-      this.cipher?.login?.fido2Credentials?.[0]?.creationDate,
-      "short",
-    );
-    return `${dateCreated} ${creationDate}`;
-  }
-
-  constructor(
-    protected cipherService: CipherService,
-    protected folderService: FolderService,
-    protected totpService: TotpService,
-    protected tokenService: TokenService,
-    protected i18nService: I18nService,
-    protected keyService: KeyService,
-    protected encryptService: EncryptService,
-    protected platformUtilsService: PlatformUtilsService,
-    protected auditService: AuditService,
-    protected win: Window,
-    protected broadcasterService: BroadcasterService,
-    protected ngZone: NgZone,
-    protected changeDetectorRef: ChangeDetectorRef,
-    protected eventCollectionService: EventCollectionService,
-    protected apiService: ApiService,
-    protected passwordRepromptService: PasswordRepromptService,
-    private logService: LogService,
-    protected stateService: StateService,
-    protected fileDownloadService: FileDownloadService,
-    protected dialogService: DialogService,
-    protected datePipe: DatePipe,
-    protected accountService: AccountService,
-    private billingAccountProfileStateService: BillingAccountProfileStateService,
-    protected toastService: ToastService,
-    private cipherAuthorizationService: CipherAuthorizationService,
-    protected configService: ConfigService,
-  ) {}
-
-  ngOnInit() {
-    this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.ngZone.run(async () => {
-        switch (message.command) {
-          case "syncCompleted":
-            if (message.successfully) {
-              this.changeDetectorRef.detectChanges();
-            }
-            break;
-        }
-      });
-    });
-
-    // Set up the subscription to the activeAccount$ and cipherId$ observables
-    combineLatest([this.accountService.activeAccount$.pipe(getUserId), this._cipherId$])
-      .pipe(
-        tap(() => this.cleanUp()),
-        switchMap(([userId, cipherId]) => {
-          const cipher$ = this.cipherService.cipherViews$(userId).pipe(
-            map((ciphers) => ciphers?.find((c) => c.id === cipherId)),
-            filter((cipher) => !!cipher),
-          );
-          return combineLatest([of(userId), cipher$]);
-        }),
-      )
-      .subscribe(([userId, cipher]) => {
-        this.cipher = cipher;
-
-        void this.constructCipherDetails(userId);
-      });
-  }
-
-  ngOnDestroy() {
-    this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
-    this.cleanUp();
-  }
-
-  async edit() {
-    this.onEditCipher.emit(this.cipher);
-  }
-
-  async clone() {
-    if (this.cipher.login?.hasFido2Credentials) {
-      const confirmed = await this.dialogService.openSimpleDialog({
-        title: { key: "passkeyNotCopied" },
-        content: { key: "passkeyNotCopiedAlert" },
-        type: "info",
-      });
-
-      if (!confirmed) {
-        return false;
-      }
-    }
-
-    if (await this.promptPassword()) {
-      this.onCloneCipher.emit(this.cipher);
-      return true;
-    }
-
-    return false;
-  }
-
-  async share() {
-    if (await this.promptPassword()) {
-      this.onShareCipher.emit(this.cipher);
-      return true;
-    }
-
-    return false;
-  }
-
-  async delete(): Promise<boolean> {
-    if (!(await this.promptPassword())) {
-      return;
-    }
-
-    const confirmed = await this.dialogService.openSimpleDialog({
-      title: { key: "deleteItem" },
-      content: {
-        key: this.cipher.isDeleted ? "permanentlyDeleteItemConfirmation" : "deleteItemConfirmation",
-      },
-      type: "warning",
-    });
-
-    if (!confirmed) {
-      return false;
-    }
-
-    try {
-      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      await this.deleteCipher(activeUserId);
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t(
-          this.cipher.isDeleted ? "permanentlyDeletedItem" : "deletedItem",
-        ),
-      });
-      this.onDeletedCipher.emit(this.cipher);
-    } catch (e) {
-      this.logService.error(e);
-    }
-
-    return true;
-  }
-
-  async restore(): Promise<boolean> {
-    if (!this.cipher.isDeleted) {
-      return false;
-    }
-
-    try {
-      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      await this.restoreCipher(activeUserId);
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("restoredItem"),
-      });
-      this.onRestoredCipher.emit(this.cipher);
-    } catch (e) {
-      this.logService.error(e);
-    }
-
-    return true;
-  }
-
-  async togglePassword() {
-    if (!(await this.promptPassword())) {
-      return;
-    }
-
-    this.showPassword = !this.showPassword;
-    this.showPasswordCount = false;
-    if (this.showPassword) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.eventCollectionService.collect(
-        EventType.Cipher_ClientToggledPasswordVisible,
-        this.cipherId,
-      );
-    }
-  }
-
-  async togglePasswordCount() {
-    if (!this.showPassword) {
-      return;
-    }
-
-    this.showPasswordCount = !this.showPasswordCount;
-  }
-
-  async toggleCardNumber() {
-    if (!(await this.promptPassword())) {
-      return;
-    }
-
-    this.showCardNumber = !this.showCardNumber;
-    if (this.showCardNumber) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.eventCollectionService.collect(
-        EventType.Cipher_ClientToggledCardNumberVisible,
-        this.cipherId,
-      );
-    }
-  }
-
-  async toggleCardCode() {
-    if (!(await this.promptPassword())) {
-      return;
-    }
-
-    this.showCardCode = !this.showCardCode;
-    if (this.showCardCode) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.eventCollectionService.collect(
-        EventType.Cipher_ClientToggledCardCodeVisible,
-        this.cipherId,
-      );
-    }
-  }
-
-  togglePrivateKey() {
-    this.showPrivateKey = !this.showPrivateKey;
-  }
-
-  async checkPassword() {
-    if (
-      this.cipher.login == null ||
-      this.cipher.login.password == null ||
-      this.cipher.login.password === ""
-    ) {
-      return;
-    }
-
-    this.checkPasswordPromise = this.auditService.passwordLeaked(this.cipher.login.password);
-    const matches = await this.checkPasswordPromise;
-
-    if (matches > 0) {
-      this.toastService.showToast({
-        variant: "warning",
-        title: null,
-        message: this.i18nService.t("passwordExposed", matches.toString()),
-      });
-    } else {
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("passwordSafe"),
-      });
-    }
-  }
-
-  async launch(uri: Launchable, cipherId?: string) {
-    if (!uri.canLaunch) {
-      return;
-    }
-
-    if (cipherId) {
-      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      await this.cipherService.updateLastLaunchedDate(cipherId, activeUserId);
-    }
-
-    this.platformUtilsService.launchUri(uri.launchUri);
-  }
-
-  async copy(value: string, typeI18nKey: string, aType: string): Promise<boolean> {
-    if (value == null) {
-      return false;
-    }
-
-    if (
-      this.passwordRepromptService.protectedFields().includes(aType) &&
-      !(await this.promptPassword())
-    ) {
-      return false;
-    }
-
-    const copyOptions = this.win != null ? { window: this.win } : null;
-    this.platformUtilsService.copyToClipboard(value, copyOptions);
-    this.toastService.showToast({
-      variant: "info",
-      title: null,
-      message: this.i18nService.t("valueCopied", this.i18nService.t(typeI18nKey)),
-    });
-
-    if (typeI18nKey === "password") {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.eventCollectionService.collect(EventType.Cipher_ClientCopiedPassword, this.cipherId);
-    } else if (typeI18nKey === "securityCode") {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.eventCollectionService.collect(EventType.Cipher_ClientCopiedCardCode, this.cipherId);
-    } else if (aType === "H_Field") {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.eventCollectionService.collect(EventType.Cipher_ClientCopiedHiddenField, this.cipherId);
-    }
-
-    return true;
-  }
-
-  setTextDataOnDrag(event: DragEvent, data: string) {
-    event.dataTransfer.setData("text", data);
-  }
-
-  async downloadAttachment(attachment: AttachmentView) {
-    if (!(await this.promptPassword())) {
-      return;
-    }
-    const a = attachment as any;
-    if (a.downloading) {
-      return;
-    }
-
-    if (this.cipher.organizationId == null && !this.canAccessPremium) {
-      this.toastService.showToast({
-        variant: "error",
-        title: this.i18nService.t("premiumRequired"),
-        message: this.i18nService.t("premiumRequiredDesc"),
-      });
-      return;
-    }
-
-    let url: string;
-    try {
-      const attachmentDownloadResponse = await this.apiService.getAttachmentData(
-        this.cipher.id,
-        attachment.id,
-      );
-      url = attachmentDownloadResponse.url;
-    } catch (e) {
-      if (e instanceof ErrorResponse && (e as ErrorResponse).statusCode === 404) {
-        url = attachment.url;
-      } else if (e instanceof ErrorResponse) {
-        throw new Error((e as ErrorResponse).getSingleMessage());
-      } else {
-        throw e;
-      }
-    }
-
-    a.downloading = true;
-    const response = await fetch(new Request(url, { cache: "no-store" }));
-    if (response.status !== 200) {
-      this.toastService.showToast({
-        variant: "error",
-        title: null,
-        message: this.i18nService.t("errorOccurred"),
-      });
-      a.downloading = false;
-      return;
-    }
-
-    try {
-      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-      const decBuf = await this.cipherService.getDecryptedAttachmentBuffer(
-        this.cipher.id as CipherId,
-        attachment,
-        response,
-        activeUserId,
-      );
-
-      this.fileDownloadService.download({
-        fileName: attachment.fileName,
-        blobData: decBuf,
-      });
-    } catch {
-      this.toastService.showToast({
-        variant: "error",
-        title: null,
-        message: this.i18nService.t("errorOccurred"),
-      });
-    }
-
-    a.downloading = false;
-  }
-
-  protected deleteCipher(userId: UserId) {
-    return this.cipher.isDeleted
-      ? this.cipherService.deleteWithServer(this.cipher.id, userId)
-      : this.cipherService.softDeleteWithServer(this.cipher.id, userId);
-  }
-
-  protected restoreCipher(userId: UserId) {
-    return this.cipherService.restoreWithServer(this.cipher.id, userId);
-  }
-
-  protected async promptPassword() {
-    if (this.cipher.reprompt === CipherRepromptType.None || this.passwordReprompted) {
-      return true;
-    }
-
-    return (this.passwordReprompted = await this.passwordRepromptService.showPasswordPrompt());
-  }
-
-  private cleanUp() {
-    this.cipher = null;
-    this.folder = null;
-    this.showPassword = false;
-    this.showCardNumber = false;
-    this.showCardCode = false;
-    this.passwordReprompted = false;
-  }
-
-  /**
-   * When a cipher is viewed, construct all details for the view that are not directly
-   * available from the cipher object itself.
-   */
-  private async constructCipherDetails(userId: UserId) {
-    this.canAccessPremium = await firstValueFrom(
-      this.billingAccountProfileStateService.hasPremiumFromAnySource$(userId),
-    );
-    this.showPremiumRequiredTotp =
-      this.cipher.login.totp && !this.canAccessPremium && !this.cipher.organizationUseTotp;
-    this.canDeleteCipher$ = this.cipherAuthorizationService.canDeleteCipher$(this.cipher, [
-      this.collectionId as CollectionId,
-    ]);
-    this.canRestoreCipher$ = this.cipherAuthorizationService.canRestoreCipher$(this.cipher);
-
-    if (this.cipher.folderId) {
-      this.folder = await (
-        await firstValueFrom(this.folderService.folderViews$(userId))
-      ).find((f) => f.id == this.cipher.folderId);
-    }
-
-    const canGenerateTotp =
-      this.cipher.type === CipherType.Login &&
-      this.cipher.login.totp &&
-      (this.cipher.organizationUseTotp || this.canAccessPremium);
-
-    this.totpInfo$ = canGenerateTotp
-      ? this.totpService.getCode$(this.cipher.login.totp).pipe(
-          map((response) => {
-            const epoch = Math.round(new Date().getTime() / 1000.0);
-            const mod = epoch % response.period;
-
-            // Format code
-            const totpCodeFormatted =
-              response.code.length > 4
-                ? `${response.code.slice(0, Math.floor(response.code.length / 2))} ${response.code.slice(Math.floor(response.code.length / 2))}`
-                : response.code;
-
-            return {
-              totpCode: response.code,
-              totpCodeFormatted,
-              totpDash: +(Math.round(((78.6 / response.period) * mod + "e+2") as any) + "e-2"),
-              totpSec: response.period - mod,
-              totpLow: response.period - mod <= 7,
-            } as TotpInfo;
-          }),
-        )
-      : undefined;
-
-    if (this.previousCipherId !== this.cipherId) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.eventCollectionService.collect(EventType.Cipher_ClientViewed, this.cipherId);
-    }
-    this.previousCipherId = this.cipherId;
-  }
-}
diff --git a/libs/angular/src/vault/services/custom-nudges-services/account-security-nudge.service.ts b/libs/angular/src/vault/services/custom-nudges-services/account-security-nudge.service.ts
index 30bbd153c5e..99d7f3934ff 100644
--- a/libs/angular/src/vault/services/custom-nudges-services/account-security-nudge.service.ts
+++ b/libs/angular/src/vault/services/custom-nudges-services/account-security-nudge.service.ts
@@ -1,14 +1,18 @@
 import { Injectable, inject } from "@angular/core";
 import { Observable, combineLatest, from, of } from "rxjs";
-import { catchError, map } from "rxjs/operators";
+import { catchError, switchMap } from "rxjs/operators";
 
 import { VaultProfileService } from "@bitwarden/angular/vault/services/vault-profile.service";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import { PinServiceAbstraction } from "@bitwarden/auth/common";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { UserId } from "@bitwarden/common/types/guid";
+import { BiometricStateService } from "@bitwarden/key-management";
 
 import { DefaultSingleNudgeService } from "../default-single-nudge.service";
 import { NudgeStatus, NudgeType } from "../nudges.service";
@@ -21,6 +25,9 @@ export class AccountSecurityNudgeService extends DefaultSingleNudgeService {
   private logService = inject(LogService);
   private pinService = inject(PinServiceAbstraction);
   private vaultTimeoutSettingsService = inject(VaultTimeoutSettingsService);
+  private biometricStateService = inject(BiometricStateService);
+  private policyService = inject(PolicyService);
+  private organizationService = inject(OrganizationService);
 
   nudgeStatus$(nudgeType: NudgeType, userId: UserId): Observable<NudgeStatus> {
     const profileDate$ = from(this.vaultProfileService.getProfileCreationDate(userId)).pipe(
@@ -36,16 +43,45 @@ export class AccountSecurityNudgeService extends DefaultSingleNudgeService {
       this.getNudgeStatus$(nudgeType, userId),
       of(Date.now() - THIRTY_DAYS_MS),
       from(this.pinService.isPinSet(userId)),
-      from(this.vaultTimeoutSettingsService.isBiometricLockSet(userId)),
+      this.biometricStateService.biometricUnlockEnabled$,
+      this.organizationService.organizations$(userId),
+      this.policyService.policiesByType$(PolicyType.RemoveUnlockWithPin, userId),
     ]).pipe(
-      map(([profileCreationDate, status, profileCutoff, isPinSet, isBiometricLockSet]) => {
-        const profileOlderThanCutoff = profileCreationDate.getTime() < profileCutoff;
-        const hideNudge = profileOlderThanCutoff || isPinSet || isBiometricLockSet;
-        return {
-          hasBadgeDismissed: status.hasBadgeDismissed || hideNudge,
-          hasSpotlightDismissed: status.hasSpotlightDismissed || hideNudge,
-        };
-      }),
+      switchMap(
+        async ([
+          profileCreationDate,
+          status,
+          profileCutoff,
+          isPinSet,
+          biometricUnlockEnabled,
+          organizations,
+          policies,
+        ]) => {
+          const profileOlderThanCutoff = profileCreationDate.getTime() < profileCutoff;
+
+          const hasOrgWithRemovePinPolicyOn = organizations.some((org) => {
+            return policies.some(
+              (p) => p.type === PolicyType.RemoveUnlockWithPin && p.organizationId === org.id,
+            );
+          });
+
+          const hideNudge =
+            profileOlderThanCutoff ||
+            isPinSet ||
+            biometricUnlockEnabled ||
+            hasOrgWithRemovePinPolicyOn;
+
+          const acctSecurityNudgeStatus = {
+            hasBadgeDismissed: status.hasBadgeDismissed || hideNudge,
+            hasSpotlightDismissed: status.hasSpotlightDismissed || hideNudge,
+          };
+
+          if (isPinSet || biometricUnlockEnabled || hasOrgWithRemovePinPolicyOn) {
+            await this.setNudgeStatus(nudgeType, acctSecurityNudgeStatus, userId);
+          }
+          return acctSecurityNudgeStatus;
+        },
+      ),
     );
   }
 }
diff --git a/libs/angular/src/vault/services/custom-nudges-services/download-bitwarden-nudge.service.ts b/libs/angular/src/vault/services/custom-nudges-services/download-bitwarden-nudge.service.ts
deleted file mode 100644
index 706b23437a1..00000000000
--- a/libs/angular/src/vault/services/custom-nudges-services/download-bitwarden-nudge.service.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Injectable, inject } from "@angular/core";
-import { Observable, combineLatest, from, of } from "rxjs";
-import { catchError, map } from "rxjs/operators";
-
-import { VaultProfileService } from "@bitwarden/angular/vault/services/vault-profile.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { UserId } from "@bitwarden/common/types/guid";
-
-import { DefaultSingleNudgeService } from "../default-single-nudge.service";
-import { NudgeStatus, NudgeType } from "../nudges.service";
-
-const THIRTY_DAYS_MS = 30 * 24 * 60 * 60 * 1000;
-
-@Injectable({ providedIn: "root" })
-export class DownloadBitwardenNudgeService extends DefaultSingleNudgeService {
-  private vaultProfileService = inject(VaultProfileService);
-  private logService = inject(LogService);
-
-  nudgeStatus$(nudgeType: NudgeType, userId: UserId): Observable<NudgeStatus> {
-    const profileDate$ = from(this.vaultProfileService.getProfileCreationDate(userId)).pipe(
-      catchError(() => {
-        this.logService.error("Failed to load profile date:");
-        // Default to today to ensure the nudge is shown
-        return of(new Date());
-      }),
-    );
-
-    return combineLatest([
-      profileDate$,
-      this.getNudgeStatus$(nudgeType, userId),
-      of(Date.now() - THIRTY_DAYS_MS),
-    ]).pipe(
-      map(([profileCreationDate, status, profileCutoff]) => {
-        const profileOlderThanCutoff = profileCreationDate.getTime() < profileCutoff;
-        return {
-          hasBadgeDismissed: status.hasBadgeDismissed || profileOlderThanCutoff,
-          hasSpotlightDismissed: status.hasSpotlightDismissed || profileOlderThanCutoff,
-        };
-      }),
-    );
-  }
-}
diff --git a/libs/angular/src/vault/services/custom-nudges-services/empty-vault-nudge.service.ts b/libs/angular/src/vault/services/custom-nudges-services/empty-vault-nudge.service.ts
index d579f8b1bb2..3122bdac2e0 100644
--- a/libs/angular/src/vault/services/custom-nudges-services/empty-vault-nudge.service.ts
+++ b/libs/angular/src/vault/services/custom-nudges-services/empty-vault-nudge.service.ts
@@ -30,10 +30,7 @@ export class EmptyVaultNudgeService extends DefaultSingleNudgeService {
       this.collectionService.decryptedCollections$,
     ]).pipe(
       switchMap(([nudgeStatus, ciphers, orgs, collections]) => {
-        const filteredCiphers = ciphers?.filter((cipher) => {
-          return cipher.deletedDate == null;
-        });
-        const vaultHasContents = !(filteredCiphers == null || filteredCiphers.length === 0);
+        const vaultHasContents = !(ciphers == null || ciphers.length === 0);
         if (orgs == null || orgs.length === 0) {
           return nudgeStatus.hasBadgeDismissed || nudgeStatus.hasSpotlightDismissed
             ? of(nudgeStatus)
@@ -47,18 +44,22 @@ export class EmptyVaultNudgeService extends DefaultSingleNudgeService {
         const hasManageCollections = collections.some(
           (c) => c.manage && orgIds.has(c.organizationId),
         );
-        // Do not show nudge when
-        // user has previously dismissed nudge
-        // OR
-        // user belongs to an organization and cannot create collections || manage collections
-        if (
-          nudgeStatus.hasBadgeDismissed ||
-          nudgeStatus.hasSpotlightDismissed ||
-          hasManageCollections ||
-          canCreateCollections
-        ) {
+
+        // When the user has dismissed the nudge or spotlight, return the nudge status directly
+        if (nudgeStatus.hasBadgeDismissed || nudgeStatus.hasSpotlightDismissed) {
           return of(nudgeStatus);
         }
+
+        // When the user belongs to an organization and cannot create collections or manage collections,
+        // hide the nudge and spotlight
+        if (!hasManageCollections && !canCreateCollections) {
+          return of({
+            hasSpotlightDismissed: true,
+            hasBadgeDismissed: true,
+          });
+        }
+
+        // Otherwise, return the nudge status based on the vault contents
         return of({
           hasSpotlightDismissed: vaultHasContents,
           hasBadgeDismissed: vaultHasContents,
diff --git a/libs/angular/src/vault/services/custom-nudges-services/index.ts b/libs/angular/src/vault/services/custom-nudges-services/index.ts
index e94b8bf71e5..f60592b9c71 100644
--- a/libs/angular/src/vault/services/custom-nudges-services/index.ts
+++ b/libs/angular/src/vault/services/custom-nudges-services/index.ts
@@ -1,6 +1,6 @@
-export * from "./autofill-nudge.service";
 export * from "./account-security-nudge.service";
 export * from "./has-items-nudge.service";
-export * from "./download-bitwarden-nudge.service";
 export * from "./empty-vault-nudge.service";
+export * from "./vault-settings-import-nudge.service";
 export * from "./new-item-nudge.service";
+export * from "./new-account-nudge.service";
diff --git a/libs/angular/src/vault/services/custom-nudges-services/autofill-nudge.service.ts b/libs/angular/src/vault/services/custom-nudges-services/new-account-nudge.service.ts
similarity index 84%
rename from libs/angular/src/vault/services/custom-nudges-services/autofill-nudge.service.ts
rename to libs/angular/src/vault/services/custom-nudges-services/new-account-nudge.service.ts
index 0a04fb2be47..39af9a2e4aa 100644
--- a/libs/angular/src/vault/services/custom-nudges-services/autofill-nudge.service.ts
+++ b/libs/angular/src/vault/services/custom-nudges-services/new-account-nudge.service.ts
@@ -12,16 +12,16 @@ import { NudgeStatus, NudgeType } from "../nudges.service";
 const THIRTY_DAYS_MS = 30 * 24 * 60 * 60 * 1000;
 
 /**
- * Custom Nudge Service to use for the Autofill Nudge in the Vault
+ * Custom Nudge Service to check if account is older than 30 days
  */
 @Injectable({
   providedIn: "root",
 })
-export class AutofillNudgeService extends DefaultSingleNudgeService {
+export class NewAccountNudgeService extends DefaultSingleNudgeService {
   vaultProfileService = inject(VaultProfileService);
   logService = inject(LogService);
 
-  nudgeStatus$(_: NudgeType, userId: UserId): Observable<NudgeStatus> {
+  nudgeStatus$(nudgeType: NudgeType, userId: UserId): Observable<NudgeStatus> {
     const profileDate$ = from(this.vaultProfileService.getProfileCreationDate(userId)).pipe(
       catchError(() => {
         this.logService.error("Error getting profile creation date");
@@ -32,7 +32,7 @@ export class AutofillNudgeService extends DefaultSingleNudgeService {
 
     return combineLatest([
       profileDate$,
-      this.getNudgeStatus$(NudgeType.AutofillNudge, userId),
+      this.getNudgeStatus$(nudgeType, userId),
       of(Date.now() - THIRTY_DAYS_MS),
     ]).pipe(
       map(([profileCreationDate, status, profileCutoff]) => {
diff --git a/libs/angular/src/vault/services/custom-nudges-services/vault-settings-import-nudge.service.ts b/libs/angular/src/vault/services/custom-nudges-services/vault-settings-import-nudge.service.ts
new file mode 100644
index 00000000000..2d86c76dff7
--- /dev/null
+++ b/libs/angular/src/vault/services/custom-nudges-services/vault-settings-import-nudge.service.ts
@@ -0,0 +1,74 @@
+import { inject, Injectable } from "@angular/core";
+import { combineLatest, Observable, of, switchMap } from "rxjs";
+
+// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+// eslint-disable-next-line no-restricted-imports
+import { CollectionService } from "@bitwarden/admin-console/common";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { UserId } from "@bitwarden/common/types/guid";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+
+import { DefaultSingleNudgeService } from "../default-single-nudge.service";
+import { NudgeStatus, NudgeType } from "../nudges.service";
+
+/**
+ * Custom Nudge Service for the vault settings import badge.
+ */
+@Injectable({
+  providedIn: "root",
+})
+export class VaultSettingsImportNudgeService extends DefaultSingleNudgeService {
+  cipherService = inject(CipherService);
+  organizationService = inject(OrganizationService);
+  collectionService = inject(CollectionService);
+
+  nudgeStatus$(nudgeType: NudgeType, userId: UserId): Observable<NudgeStatus> {
+    return combineLatest([
+      this.getNudgeStatus$(nudgeType, userId),
+      this.cipherService.cipherViews$(userId),
+      this.organizationService.organizations$(userId),
+      this.collectionService.decryptedCollections$,
+    ]).pipe(
+      switchMap(([nudgeStatus, ciphers, orgs, collections]) => {
+        const vaultHasMoreThanOneItem = (ciphers?.length ?? 0) > 1;
+        const { hasBadgeDismissed, hasSpotlightDismissed } = nudgeStatus;
+
+        // When the user has no organizations, return the nudge status directly
+        if ((orgs?.length ?? 0) === 0) {
+          return hasBadgeDismissed || hasSpotlightDismissed
+            ? of(nudgeStatus)
+            : of({
+                hasSpotlightDismissed: vaultHasMoreThanOneItem,
+                hasBadgeDismissed: vaultHasMoreThanOneItem,
+              });
+        }
+
+        const orgIds = new Set(orgs.map((org) => org.id));
+        const canCreateCollections = orgs.some((org) => org.canCreateNewCollections);
+        const hasManageCollections = collections.some(
+          (c) => c.manage && orgIds.has(c.organizationId),
+        );
+
+        // When the user has dismissed the nudge or spotlight, return the nudge status directly
+        if (hasBadgeDismissed || hasSpotlightDismissed) {
+          return of(nudgeStatus);
+        }
+
+        // When the user belongs to an organization and cannot create collections or manage collections,
+        // hide the nudge and spotlight
+        if (!hasManageCollections && !canCreateCollections) {
+          return of({
+            hasSpotlightDismissed: true,
+            hasBadgeDismissed: true,
+          });
+        }
+
+        // Otherwise, return the nudge status based on the vault contents
+        return of({
+          hasSpotlightDismissed: vaultHasMoreThanOneItem,
+          hasBadgeDismissed: vaultHasMoreThanOneItem,
+        });
+      }),
+    );
+  }
+}
diff --git a/libs/angular/src/vault/services/nudges.service.spec.ts b/libs/angular/src/vault/services/nudges.service.spec.ts
index 30e2ada6007..bf84674c669 100644
--- a/libs/angular/src/vault/services/nudges.service.spec.ts
+++ b/libs/angular/src/vault/services/nudges.service.spec.ts
@@ -6,6 +6,8 @@ import { firstValueFrom, of } from "rxjs";
 // eslint-disable-next-line no-restricted-imports
 import { PinServiceAbstraction } from "@bitwarden/auth/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
@@ -13,13 +15,15 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { BiometricStateService } from "@bitwarden/key-management";
 
 import { FakeStateProvider, mockAccountServiceWith } from "../../../../../libs/common/spec";
 
 import {
   HasItemsNudgeService,
   EmptyVaultNudgeService,
-  DownloadBitwardenNudgeService,
+  NewAccountNudgeService,
+  VaultSettingsImportNudgeService,
 } from "./custom-nudges-services";
 import { DefaultSingleNudgeService } from "./default-single-nudge.service";
 import { NudgesService, NudgeType } from "./nudges.service";
@@ -33,7 +37,7 @@ describe("Vault Nudges Service", () => {
     getFeatureFlag: jest.fn().mockReturnValue(true),
   };
 
-  const nudgeServices = [EmptyVaultNudgeService, DownloadBitwardenNudgeService];
+  const nudgeServices = [EmptyVaultNudgeService, NewAccountNudgeService];
 
   beforeEach(async () => {
     fakeStateProvider = new FakeStateProvider(mockAccountServiceWith("user-id" as UserId));
@@ -57,13 +61,17 @@ describe("Vault Nudges Service", () => {
           useValue: mock<HasItemsNudgeService>(),
         },
         {
-          provide: DownloadBitwardenNudgeService,
-          useValue: mock<DownloadBitwardenNudgeService>(),
+          provide: NewAccountNudgeService,
+          useValue: mock<NewAccountNudgeService>(),
         },
         {
           provide: EmptyVaultNudgeService,
           useValue: mock<EmptyVaultNudgeService>(),
         },
+        {
+          provide: VaultSettingsImportNudgeService,
+          useValue: mock<VaultSettingsImportNudgeService>(),
+        },
         {
           provide: ApiService,
           useValue: mock<ApiService>(),
@@ -86,6 +94,18 @@ describe("Vault Nudges Service", () => {
           provide: VaultTimeoutSettingsService,
           useValue: mock<VaultTimeoutSettingsService>(),
         },
+        {
+          provide: BiometricStateService,
+          useValue: mock<BiometricStateService>(),
+        },
+        {
+          provide: PolicyService,
+          useValue: mock<PolicyService>(),
+        },
+        {
+          provide: OrganizationService,
+          useValue: mock<OrganizationService>(),
+        },
       ],
     });
   });
diff --git a/libs/angular/src/vault/services/nudges.service.ts b/libs/angular/src/vault/services/nudges.service.ts
index 006f568f33e..6cb7ae4abf1 100644
--- a/libs/angular/src/vault/services/nudges.service.ts
+++ b/libs/angular/src/vault/services/nudges.service.ts
@@ -5,14 +5,15 @@ import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { UserKeyDefinition, NUDGES_DISK } from "@bitwarden/common/platform/state";
 import { UserId } from "@bitwarden/common/types/guid";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 
 import {
+  NewAccountNudgeService,
   HasItemsNudgeService,
   EmptyVaultNudgeService,
-  AutofillNudgeService,
-  DownloadBitwardenNudgeService,
   NewItemNudgeService,
   AccountSecurityNudgeService,
+  VaultSettingsImportNudgeService,
 } from "./custom-nudges-services";
 import { DefaultSingleNudgeService, SingleNudgeService } from "./default-single-nudge.service";
 
@@ -24,25 +25,23 @@ export type NudgeStatus = {
 /**
  * Enum to list the various nudge types, to be used by components/badges to show/hide the nudge
  */
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum NudgeType {
-  /** Nudge to show when user has no items in their vault
-   * Add future nudges here
-   */
-  EmptyVaultNudge = "empty-vault-nudge",
-  HasVaultItems = "has-vault-items",
-  AutofillNudge = "autofill-nudge",
-  AccountSecurity = "account-security",
-  DownloadBitwarden = "download-bitwarden",
-  NewLoginItemStatus = "new-login-item-status",
-  NewCardItemStatus = "new-card-item-status",
-  NewIdentityItemStatus = "new-identity-item-status",
-  NewNoteItemStatus = "new-note-item-status",
-  NewSshItemStatus = "new-ssh-item-status",
-  GeneratorNudgeStatus = "generator-nudge-status",
-  SendNudgeStatus = "send-nudge-status",
-}
+export const NudgeType = {
+  /** Nudge to show when user has no items in their vault */
+  EmptyVaultNudge: "empty-vault-nudge",
+  VaultSettingsImportNudge: "vault-settings-import-nudge",
+  HasVaultItems: "has-vault-items",
+  AutofillNudge: "autofill-nudge",
+  AccountSecurity: "account-security",
+  DownloadBitwarden: "download-bitwarden",
+  NewLoginItemStatus: "new-login-item-status",
+  NewCardItemStatus: "new-card-item-status",
+  NewIdentityItemStatus: "new-identity-item-status",
+  NewNoteItemStatus: "new-note-item-status",
+  NewSshItemStatus: "new-ssh-item-status",
+  GeneratorNudgeStatus: "generator-nudge-status",
+} as const;
+
+export type NudgeType = UnionOfValues<typeof NudgeType>;
 
 export const NUDGE_DISMISSED_DISK_KEY = new UserKeyDefinition<
   Partial<Record<NudgeType, NudgeStatus>>
@@ -56,6 +55,7 @@ export const NUDGE_DISMISSED_DISK_KEY = new UserKeyDefinition<
 })
 export class NudgesService {
   private newItemNudgeService = inject(NewItemNudgeService);
+  private newAcctNudgeService = inject(NewAccountNudgeService);
 
   /**
    * Custom nudge services to use for specific nudge types
@@ -65,9 +65,11 @@ export class NudgesService {
   private customNudgeServices: Partial<Record<NudgeType, SingleNudgeService>> = {
     [NudgeType.HasVaultItems]: inject(HasItemsNudgeService),
     [NudgeType.EmptyVaultNudge]: inject(EmptyVaultNudgeService),
+    [NudgeType.VaultSettingsImportNudge]: inject(VaultSettingsImportNudgeService),
     [NudgeType.AccountSecurity]: inject(AccountSecurityNudgeService),
-    [NudgeType.AutofillNudge]: inject(AutofillNudgeService),
-    [NudgeType.DownloadBitwarden]: inject(DownloadBitwardenNudgeService),
+    [NudgeType.AutofillNudge]: this.newAcctNudgeService,
+    [NudgeType.DownloadBitwarden]: this.newAcctNudgeService,
+    [NudgeType.GeneratorNudgeStatus]: this.newAcctNudgeService,
     [NudgeType.NewLoginItemStatus]: this.newItemNudgeService,
     [NudgeType.NewCardItemStatus]: this.newItemNudgeService,
     [NudgeType.NewIdentityItemStatus]: this.newItemNudgeService,
@@ -157,7 +159,11 @@ export class NudgesService {
    */
   hasActiveBadges$(userId: UserId): Observable<boolean> {
     // Add more nudge types here if they have the settings badge feature
-    const nudgeTypes = [NudgeType.EmptyVaultNudge, NudgeType.DownloadBitwarden];
+    const nudgeTypes = [
+      NudgeType.EmptyVaultNudge,
+      NudgeType.DownloadBitwarden,
+      NudgeType.AutofillNudge,
+    ];
 
     const nudgeTypesWithBadge$ = nudgeTypes.map((nudge) => {
       return this.getNudgeService(nudge)
diff --git a/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts b/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts
index c0042dcfdff..45198d2bcc5 100644
--- a/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts
@@ -15,7 +15,7 @@ export class OrganizationFilterComponent {
   @Input() collapsedFilterNodes: Set<string>;
   @Input() organizations: Organization[];
   @Input() activeFilter: VaultFilter;
-  @Input() activePersonalOwnershipPolicy: boolean;
+  @Input() activeOrganizationDataOwnership: boolean;
   @Input() activeSingleOrganizationPolicy: boolean;
 
   @Output() onNodeCollapseStateChange: EventEmitter<ITreeNodeObject> =
@@ -26,12 +26,12 @@ export class OrganizationFilterComponent {
     let displayMode: DisplayMode = "organizationMember";
     if (this.organizations == null || this.organizations.length < 1) {
       displayMode = "noOrganizations";
-    } else if (this.activePersonalOwnershipPolicy && !this.activeSingleOrganizationPolicy) {
-      displayMode = "personalOwnershipPolicy";
-    } else if (!this.activePersonalOwnershipPolicy && this.activeSingleOrganizationPolicy) {
+    } else if (this.activeOrganizationDataOwnership && !this.activeSingleOrganizationPolicy) {
+      displayMode = "organizationDataOwnershipPolicy";
+    } else if (!this.activeOrganizationDataOwnership && this.activeSingleOrganizationPolicy) {
       displayMode = "singleOrganizationPolicy";
-    } else if (this.activePersonalOwnershipPolicy && this.activeSingleOrganizationPolicy) {
-      displayMode = "singleOrganizationAndPersonalOwnershipPolicies";
+    } else if (this.activeOrganizationDataOwnership && this.activeSingleOrganizationPolicy) {
+      displayMode = "singleOrganizationAndOrganizatonDataOwnershipPolicies";
     }
 
     return displayMode;
diff --git a/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts b/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts
index 83304f8eae9..0b0cb14bbb8 100644
--- a/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts
+++ b/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts
@@ -7,6 +7,9 @@ import { firstValueFrom, Observable } from "rxjs";
 // eslint-disable-next-line no-restricted-imports
 import { CollectionView } from "@bitwarden/admin-console/common";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { UserId } from "@bitwarden/common/types/guid";
 import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
@@ -29,26 +32,34 @@ export class VaultFilterComponent implements OnInit {
   @Output() onAddFolder = new EventEmitter<never>();
   @Output() onEditFolder = new EventEmitter<FolderView>();
 
+  private activeUserId: UserId;
+
   isLoaded = false;
   collapsedFilterNodes: Set<string>;
   organizations: Organization[];
-  activePersonalOwnershipPolicy: boolean;
+  activeOrganizationDataOwnershipPolicy: boolean;
   activeSingleOrganizationPolicy: boolean;
   collections: DynamicTreeNode<CollectionView>;
   folders$: Observable<DynamicTreeNode<FolderView>>;
 
-  constructor(protected vaultFilterService: DeprecatedVaultFilterService) {}
+  constructor(
+    protected vaultFilterService: DeprecatedVaultFilterService,
+    protected accountService: AccountService,
+  ) {}
 
   get displayCollections() {
     return this.collections?.fullList != null && this.collections.fullList.length > 0;
   }
 
   async ngOnInit(): Promise<void> {
-    this.collapsedFilterNodes = await this.vaultFilterService.buildCollapsedFilterNodes();
+    this.activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    this.collapsedFilterNodes = await this.vaultFilterService.buildCollapsedFilterNodes(
+      this.activeUserId,
+    );
     this.organizations = await this.vaultFilterService.buildOrganizations();
     if (this.organizations != null && this.organizations.length > 0) {
-      this.activePersonalOwnershipPolicy =
-        await this.vaultFilterService.checkForPersonalOwnershipPolicy();
+      this.activeOrganizationDataOwnershipPolicy =
+        await this.vaultFilterService.checkForOrganizationDataOwnershipPolicy();
       this.activeSingleOrganizationPolicy =
         await this.vaultFilterService.checkForSingleOrganizationPolicy();
     }
@@ -68,7 +79,10 @@ export class VaultFilterComponent implements OnInit {
     } else {
       this.collapsedFilterNodes.add(node.id);
     }
-    await this.vaultFilterService.storeCollapsedFilterNodes(this.collapsedFilterNodes);
+    await this.vaultFilterService.storeCollapsedFilterNodes(
+      this.collapsedFilterNodes,
+      this.activeUserId,
+    );
   }
 
   async applyFilter(filter: VaultFilter) {
@@ -88,8 +102,8 @@ export class VaultFilterComponent implements OnInit {
 
   async reloadOrganizations() {
     this.organizations = await this.vaultFilterService.buildOrganizations();
-    this.activePersonalOwnershipPolicy =
-      await this.vaultFilterService.checkForPersonalOwnershipPolicy();
+    this.activeOrganizationDataOwnershipPolicy =
+      await this.vaultFilterService.checkForOrganizationDataOwnershipPolicy();
     this.activeSingleOrganizationPolicy =
       await this.vaultFilterService.checkForSingleOrganizationPolicy();
   }
diff --git a/libs/angular/src/vault/vault-filter/models/display-mode.ts b/libs/angular/src/vault/vault-filter/models/display-mode.ts
index 3395df4fbe2..e55d41e5486 100644
--- a/libs/angular/src/vault/vault-filter/models/display-mode.ts
+++ b/libs/angular/src/vault/vault-filter/models/display-mode.ts
@@ -2,5 +2,5 @@ export type DisplayMode =
   | "noOrganizations"
   | "organizationMember"
   | "singleOrganizationPolicy"
-  | "personalOwnershipPolicy"
-  | "singleOrganizationAndPersonalOwnershipPolicies";
+  | "organizationDataOwnershipPolicy"
+  | "singleOrganizationAndOrganizatonDataOwnershipPolicies";
diff --git a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts
index 9e3312b38ef..fea57743055 100644
--- a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts
+++ b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts
@@ -1,18 +1,23 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Injectable } from "@angular/core";
 import { firstValueFrom, from, map, mergeMap, Observable, switchMap, take } from "rxjs";
 
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
-import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
+import {
+  CollectionService,
+  CollectionTypes,
+  CollectionView,
+} from "@bitwarden/admin-console/common";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { ActiveUserState, StateProvider } from "@bitwarden/common/platform/state";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SingleUserState, StateProvider } from "@bitwarden/common/platform/state";
 import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
@@ -28,10 +33,9 @@ const NestingDelimiter = "/";
 
 @Injectable()
 export class VaultFilterService implements DeprecatedVaultFilterServiceAbstraction {
-  private collapsedGroupingsState: ActiveUserState<string[]> =
-    this.stateProvider.getActive(COLLAPSED_GROUPINGS);
-  private readonly collapsedGroupings$: Observable<Set<string>> =
-    this.collapsedGroupingsState.state$.pipe(map((c) => new Set(c)));
+  private collapsedGroupingsState(userId: UserId): SingleUserState<string[]> {
+    return this.stateProvider.getUser(userId, COLLAPSED_GROUPINGS);
+  }
 
   constructor(
     protected organizationService: OrganizationService,
@@ -41,14 +45,21 @@ export class VaultFilterService implements DeprecatedVaultFilterServiceAbstracti
     protected policyService: PolicyService,
     protected stateProvider: StateProvider,
     protected accountService: AccountService,
+    protected configService: ConfigService,
+    protected i18nService: I18nService,
   ) {}
 
-  async storeCollapsedFilterNodes(collapsedFilterNodes: Set<string>): Promise<void> {
-    await this.collapsedGroupingsState.update(() => Array.from(collapsedFilterNodes));
+  async storeCollapsedFilterNodes(
+    collapsedFilterNodes: Set<string>,
+    userId: UserId,
+  ): Promise<void> {
+    await this.collapsedGroupingsState(userId).update(() => Array.from(collapsedFilterNodes));
   }
 
-  async buildCollapsedFilterNodes(): Promise<Set<string>> {
-    return await firstValueFrom(this.collapsedGroupings$);
+  async buildCollapsedFilterNodes(userId: UserId): Promise<Set<string>> {
+    return await firstValueFrom(
+      this.collapsedGroupingsState(userId).state$.pipe(map((c) => new Set(c))),
+    );
   }
 
   async buildOrganizations(): Promise<Organization[]> {
@@ -99,12 +110,20 @@ export class VaultFilterService implements DeprecatedVaultFilterServiceAbstracti
 
   async buildCollections(organizationId?: string): Promise<DynamicTreeNode<CollectionView>> {
     const storedCollections = await this.collectionService.getAllDecrypted();
-    let collections: CollectionView[];
-    if (organizationId != null) {
-      collections = storedCollections.filter((c) => c.organizationId === organizationId);
-    } else {
-      collections = storedCollections;
+    const orgs = await this.buildOrganizations();
+    const defaulCollectionsFlagEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.CreateDefaultLocation,
+    );
+
+    let collections =
+      organizationId == null
+        ? storedCollections
+        : storedCollections.filter((c) => c.organizationId === organizationId);
+
+    if (defaulCollectionsFlagEnabled) {
+      collections = sortDefaultCollections(collections, orgs, this.i18nService.collator);
     }
+
     const nestedCollections = await this.collectionService.getAllNested(collections);
     return new DynamicTreeNode<CollectionView>({
       fullList: collections,
@@ -123,12 +142,12 @@ export class VaultFilterService implements DeprecatedVaultFilterServiceAbstracti
     );
   }
 
-  async checkForPersonalOwnershipPolicy(): Promise<boolean> {
+  async checkForOrganizationDataOwnershipPolicy(): Promise<boolean> {
     return await firstValueFrom(
       this.accountService.activeAccount$.pipe(
         getUserId,
         switchMap((userId) =>
-          this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
+          this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
         ),
       ),
     );
@@ -141,7 +160,7 @@ export class VaultFilterService implements DeprecatedVaultFilterServiceAbstracti
       folderCopy.id = f.id;
       folderCopy.revisionDate = f.revisionDate;
       const parts = f.name != null ? f.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter) : [];
-      ServiceUtils.nestedTraverse(nodes, 0, parts, folderCopy, null, NestingDelimiter);
+      ServiceUtils.nestedTraverse(nodes, 0, parts, folderCopy, undefined, NestingDelimiter);
     });
     return nodes;
   }
@@ -154,3 +173,28 @@ export class VaultFilterService implements DeprecatedVaultFilterServiceAbstracti
     return ServiceUtils.getTreeNodeObjectFromList(folders, id) as TreeNode<FolderView>;
   }
 }
+
+/**
+ * Sorts collections with default user collections at the top, sorted by organization name.
+ * Remaining collections are sorted by name.
+ * @param collections - The list of collections to sort.
+ * @param orgs - The list of organizations to use for sorting default user collections.
+ * @returns Sorted list of collections.
+ */
+export function sortDefaultCollections(
+  collections: CollectionView[],
+  orgs: Organization[] = [],
+  collator: Intl.Collator,
+): CollectionView[] {
+  const sortedDefaultCollectionTypes = collections
+    .filter((c) => c.type === CollectionTypes.DefaultUserCollection)
+    .sort((a, b) => {
+      const aName = orgs.find((o) => o.id === a.organizationId)?.name ?? a.organizationId;
+      const bName = orgs.find((o) => o.id === b.organizationId)?.name ?? b.organizationId;
+      return collator.compare(aName, bName);
+    });
+  return [
+    ...sortedDefaultCollectionTypes,
+    ...collections.filter((c) => c.type !== CollectionTypes.DefaultUserCollection),
+  ];
+}
diff --git a/libs/angular/tsconfig.json b/libs/angular/tsconfig.json
index d77e56d778e..9c607a26b09 100644
--- a/libs/angular/tsconfig.json
+++ b/libs/angular/tsconfig.json
@@ -1,27 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/angular": ["../auth/src/angular"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/components": ["../components/src"],
-      "@bitwarden/generator-components": ["../tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer/core": ["../importer/src"],
-      "@bitwarden/importer-ui": ["../importer/src/components"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault": ["../vault/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/angular/tsconfig.spec.json b/libs/angular/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/libs/angular/tsconfig.spec.json
+++ b/libs/angular/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/libs/auth/jest.config.js b/libs/auth/jest.config.js
index 121d423be17..815ac5c30c2 100644
--- a/libs/auth/jest.config.js
+++ b/libs/auth/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
@@ -8,13 +8,12 @@ const sharedConfig = require("../../libs/shared/jest.config.angular");
 module.exports = {
   ...sharedConfig,
   displayName: "libs/auth tests",
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
     // lets us use @bitwarden/common/spec in tests
-    { "@bitwarden/common/spec": ["../common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
 };
diff --git a/libs/auth/src/angular/anon-layout/anon-layout.stories.ts b/libs/auth/src/angular/anon-layout/anon-layout.stories.ts
deleted file mode 100644
index 34d561d5210..00000000000
--- a/libs/auth/src/angular/anon-layout/anon-layout.stories.ts
+++ /dev/null
@@ -1,231 +0,0 @@
-import { ActivatedRoute, RouterModule } from "@angular/router";
-import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
-import { BehaviorSubject, of } from "rxjs";
-
-import { ClientType } from "@bitwarden/common/enums";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { ButtonModule } from "../../../../components/src/button";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { I18nMockService } from "../../../../components/src/utils/i18n-mock.service";
-import { LockIcon } from "../icons";
-
-import { AnonLayoutComponent } from "./anon-layout.component";
-
-class MockPlatformUtilsService implements Partial<PlatformUtilsService> {
-  getApplicationVersion = () => Promise.resolve("Version 2024.1.1");
-  getClientType = () => ClientType.Web;
-}
-
-export default {
-  title: "Auth/Anon Layout",
-  component: AnonLayoutComponent,
-  decorators: [
-    moduleMetadata({
-      imports: [ButtonModule, RouterModule],
-      providers: [
-        {
-          provide: PlatformUtilsService,
-          useClass: MockPlatformUtilsService,
-        },
-        {
-          provide: I18nService,
-          useFactory: () => {
-            return new I18nMockService({
-              accessing: "Accessing",
-            });
-          },
-        },
-        {
-          provide: EnvironmentService,
-          useValue: {
-            environment$: new BehaviorSubject({
-              getHostname() {
-                return "bitwarden.com";
-              },
-            }).asObservable(),
-          },
-        },
-        {
-          provide: ActivatedRoute,
-          useValue: { queryParams: of({}) },
-        },
-      ],
-    }),
-  ],
-  args: {
-    title: "The Page Title",
-    subtitle: "The subtitle (optional)",
-    showReadonlyHostname: true,
-    icon: LockIcon,
-    hideLogo: false,
-  },
-} as Meta;
-
-type Story = StoryObj<AnonLayoutComponent>;
-
-export const WithPrimaryContent: Story = {
-  render: (args) => ({
-    props: args,
-    template:
-      // Projected content (the <div>) and styling is just a sample and can be replaced with any content/styling.
-      `
-      <auth-anon-layout [title]="title" [subtitle]="subtitle" [showReadonlyHostname]="showReadonlyHostname" [hideLogo]="hideLogo" >
-        <div>
-          <div class="tw-font-bold">Primary Projected Content Area (customizable)</div>
-          <div>Lorem ipsum dolor sit amet consectetur adipisicing elit. Necessitatibus illum vero, placeat recusandae esse ratione eius minima veniam nemo, quas beatae! Impedit molestiae alias sapiente explicabo. Sapiente corporis ipsa numquam?</div>
-        </div>
-      </auth-anon-layout>
-    `,
-  }),
-};
-
-export const WithSecondaryContent: Story = {
-  render: (args) => ({
-    props: args,
-    template:
-      // Projected content (the <div>'s) and styling is just a sample and can be replaced with any content/styling.
-      // Notice that slot="secondary" is requred to project any secondary content.
-      `
-      <auth-anon-layout [title]="title" [subtitle]="subtitle" [showReadonlyHostname]="showReadonlyHostname" [hideLogo]="hideLogo" >
-        <div>
-          <div class="tw-font-bold">Primary Projected Content Area (customizable)</div>
-          <div>Lorem ipsum dolor sit amet consectetur adipisicing elit. Necessitatibus illum vero, placeat recusandae esse ratione eius minima veniam nemo, quas beatae! Impedit molestiae alias sapiente explicabo. Sapiente corporis ipsa numquam?</div>
-        </div>
-
-        <div slot="secondary" class="text-center">
-          <div class="tw-font-bold tw-mb-2">Secondary Projected Content (optional)</div>
-          <button bitButton>Perform Action</button>
-        </div>
-      </auth-anon-layout>
-    `,
-  }),
-};
-
-export const WithLongContent: Story = {
-  render: (args) => ({
-    props: args,
-    template:
-      // Projected content (the <div>'s) and styling is just a sample and can be replaced with any content/styling.
-      `
-      <auth-anon-layout title="Page Title lorem ipsum dolor consectetur sit amet expedita quod est" subtitle="Subtitle here Lorem ipsum dolor sit amet consectetur adipisicing elit. Expedita, quod est?" [showReadonlyHostname]="showReadonlyHostname" [hideLogo]="hideLogo" >
-        <div>
-          <div class="tw-font-bold">Primary Projected Content Area (customizable)</div>
-          <div>Lorem ipsum dolor sit amet consectetur adipisicing elit. Necessitatibus illum vero, placeat recusandae esse ratione eius minima veniam nemo, quas beatae! Impedit molestiae alias sapiente explicabo. Sapiente corporis ipsa numquam? Lorem ipsum dolor sit amet consectetur adipisicing elit. Lorem ipsum dolor sit amet consectetur adipisicing elit. Lorem ipsum dolor sit amet consectetur adipisicing elit. Lorem ipsum dolor sit amet consectetur adipisicing elit. Lorem ipsum dolor sit amet consectetur adipisicing elit. Lorem ipsum dolor sit amet consectetur adipisicing elit. Lorem ipsum dolor sit amet consectetur adipisicing elit. Lorem ipsum dolor sit amet consectetur adipisicing elit. Lorem ipsum dolor sit amet consectetur adipisicing elit.</div>
-        </div>
-
-        <div slot="secondary" class="text-center">
-          <div class="tw-font-bold tw-mb-2">Secondary Projected Content (optional)</div>
-          <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Molestias laborum nostrum natus. Lorem ipsum dolor sit amet consectetur adipisicing elit. Molestias laborum nostrum natus. Expedita, quod est?          </p>
-          <button bitButton>Perform Action</button>
-        </div>
-      </auth-anon-layout>
-    `,
-  }),
-};
-
-export const WithThinPrimaryContent: Story = {
-  render: (args) => ({
-    props: args,
-    template:
-      // Projected content (the <div>'s) and styling is just a sample and can be replaced with any content/styling.
-      `
-      <auth-anon-layout [title]="title" [subtitle]="subtitle" [showReadonlyHostname]="showReadonlyHostname" [hideLogo]="hideLogo" >
-        <div class="text-center">Lorem ipsum</div>
-
-        <div slot="secondary" class="text-center">
-          <div class="tw-font-bold tw-mb-2">Secondary Projected Content (optional)</div>
-          <button bitButton>Perform Action</button>
-        </div>
-      </auth-anon-layout>
-    `,
-  }),
-};
-
-export const WithCustomIcon: Story = {
-  render: (args) => ({
-    props: args,
-    template:
-      // Projected content (the <div>) and styling is just a sample and can be replaced with any content/styling.
-      `
-      <auth-anon-layout [title]="title" [subtitle]="subtitle" [icon]="icon" [showReadonlyHostname]="showReadonlyHostname">
-        <div>
-          <div class="tw-font-bold">Primary Projected Content Area (customizable)</div>
-          <div>Lorem ipsum dolor sit amet consectetur adipisicing elit. Necessitatibus illum vero, placeat recusandae esse ratione eius minima veniam nemo, quas beatae! Impedit molestiae alias sapiente explicabo. Sapiente corporis ipsa numquam?</div>
-        </div>
-      </auth-anon-layout>
-    `,
-  }),
-};
-
-export const HideIcon: Story = {
-  render: (args) => ({
-    props: args,
-    template:
-      // Projected content (the <div>) and styling is just a sample and can be replaced with any content/styling.
-      `
-      <auth-anon-layout [title]="title" [subtitle]="subtitle" [showReadonlyHostname]="showReadonlyHostname" [hideIcon]="true" >
-        <div>
-          <div class="tw-font-bold">Primary Projected Content Area (customizable)</div>
-          <div>Lorem ipsum dolor sit amet consectetur adipisicing elit. Necessitatibus illum vero, placeat recusandae esse ratione eius minima veniam nemo, quas beatae! Impedit molestiae alias sapiente explicabo. Sapiente corporis ipsa numquam?</div>
-        </div>
-      </auth-anon-layout>
-    `,
-  }),
-};
-
-export const HideLogo: Story = {
-  render: (args) => ({
-    props: args,
-    template:
-      // Projected content (the <div>) and styling is just a sample and can be replaced with any content/styling.
-      `
-      <auth-anon-layout [title]="title" [subtitle]="subtitle" [showReadonlyHostname]="showReadonlyHostname" [hideLogo]="true" >
-        <div>
-          <div class="tw-font-bold">Primary Projected Content Area (customizable)</div>
-          <div>Lorem ipsum dolor sit amet consectetur adipisicing elit. Necessitatibus illum vero, placeat recusandae esse ratione eius minima veniam nemo, quas beatae! Impedit molestiae alias sapiente explicabo. Sapiente corporis ipsa numquam?</div>
-        </div>
-      </auth-anon-layout>
-    `,
-  }),
-};
-
-export const HideFooter: Story = {
-  render: (args) => ({
-    props: args,
-    template:
-      // Projected content (the <div>) and styling is just a sample and can be replaced with any content/styling.
-      `
-      <auth-anon-layout [title]="title" [subtitle]="subtitle" [showReadonlyHostname]="showReadonlyHostname" [hideFooter]="true" [hideLogo]="hideLogo" >
-        <div>
-          <div class="tw-font-bold">Primary Projected Content Area (customizable)</div>
-          <div>Lorem ipsum dolor sit amet consectetur adipisicing elit. Necessitatibus illum vero, placeat recusandae esse ratione eius minima veniam nemo, quas beatae! Impedit molestiae alias sapiente explicabo. Sapiente corporis ipsa numquam?</div>
-        </div>
-      </auth-anon-layout>
-    `,
-  }),
-};
-
-export const WithTitleAreaMaxWidth: Story = {
-  render: (args) => ({
-    props: {
-      ...args,
-      title: "This is a very long long title to demonstrate titleAreaMaxWidth set to 'md'",
-      subtitle:
-        "This is a very long subtitle that demonstrates how the max width container handles longer text content with the titleAreaMaxWidth input set to 'md'. Lorem ipsum dolor sit amet consectetur adipisicing elit. Expedita, quod est?",
-    },
-    template: `
-      <auth-anon-layout [title]="title" [subtitle]="subtitle" [showReadonlyHostname]="showReadonlyHostname" [hideLogo]="hideLogo" [titleAreaMaxWidth]="'md'">
-        <div>
-          <div class="tw-font-bold">Primary Projected Content Area (customizable)</div>
-          <div>Lorem ipsum dolor sit amet consectetur adipisicing elit. Necessitatibus illum vero, placeat recusandae esse ratione eius minima veniam nemo, quas beatae! Impedit molestiae alias sapiente explicabo. Sapiente corporis ipsa numquam?</div>
-        </div>
-      </auth-anon-layout>
-    `,
-  }),
-};
diff --git a/libs/auth/src/angular/change-password/change-password.component.ts b/libs/auth/src/angular/change-password/change-password.component.ts
deleted file mode 100644
index 86b7c884e92..00000000000
--- a/libs/auth/src/angular/change-password/change-password.component.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { Component, Input, OnInit } from "@angular/core";
-import { firstValueFrom } from "rxjs";
-
-import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
-import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { SyncService } from "@bitwarden/common/platform/sync";
-import { UserId } from "@bitwarden/common/types/guid";
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { ToastService } from "@bitwarden/components";
-import { I18nPipe } from "@bitwarden/ui-common";
-
-import {
-  InputPasswordComponent,
-  InputPasswordFlow,
-} from "../input-password/input-password.component";
-import { PasswordInputResult } from "../input-password/password-input-result";
-
-import { ChangePasswordService } from "./change-password.service.abstraction";
-
-@Component({
-  standalone: true,
-  selector: "auth-change-password",
-  templateUrl: "change-password.component.html",
-  imports: [InputPasswordComponent, I18nPipe],
-})
-export class ChangePasswordComponent implements OnInit {
-  @Input() inputPasswordFlow: InputPasswordFlow = InputPasswordFlow.ChangePassword;
-
-  activeAccount: Account | null = null;
-  email?: string;
-  userId?: UserId;
-  masterPasswordPolicyOptions?: MasterPasswordPolicyOptions;
-  initializing = true;
-  submitting = false;
-
-  constructor(
-    private accountService: AccountService,
-    private changePasswordService: ChangePasswordService,
-    private i18nService: I18nService,
-    private messagingService: MessagingService,
-    private policyService: PolicyService,
-    private toastService: ToastService,
-    private syncService: SyncService,
-  ) {}
-
-  async ngOnInit() {
-    this.activeAccount = await firstValueFrom(this.accountService.activeAccount$);
-    this.userId = this.activeAccount?.id;
-    this.email = this.activeAccount?.email;
-
-    if (!this.userId) {
-      throw new Error("userId not found");
-    }
-
-    this.masterPasswordPolicyOptions = await firstValueFrom(
-      this.policyService.masterPasswordPolicyOptions$(this.userId),
-    );
-
-    this.initializing = false;
-  }
-
-  async handlePasswordFormSubmit(passwordInputResult: PasswordInputResult) {
-    this.submitting = true;
-
-    try {
-      if (passwordInputResult.rotateUserKey) {
-        if (this.activeAccount == null) {
-          throw new Error("activeAccount not found");
-        }
-
-        if (passwordInputResult.currentPassword == null) {
-          throw new Error("currentPassword not found");
-        }
-
-        await this.syncService.fullSync(true);
-
-        await this.changePasswordService.rotateUserKeyMasterPasswordAndEncryptedData(
-          passwordInputResult.currentPassword,
-          passwordInputResult.newPassword,
-          this.activeAccount,
-          passwordInputResult.newPasswordHint,
-        );
-      } else {
-        if (!this.userId) {
-          throw new Error("userId not found");
-        }
-
-        await this.changePasswordService.changePassword(passwordInputResult, this.userId);
-
-        this.toastService.showToast({
-          variant: "success",
-          title: this.i18nService.t("masterPasswordChanged"),
-          message: this.i18nService.t("masterPasswordChangedDesc"),
-        });
-
-        this.messagingService.send("logout");
-      }
-    } catch {
-      this.toastService.showToast({
-        variant: "error",
-        title: "",
-        message: this.i18nService.t("errorOccurred"),
-      });
-    } finally {
-      this.submitting = false;
-    }
-  }
-}
diff --git a/libs/auth/src/angular/change-password/default-change-password.service.ts b/libs/auth/src/angular/change-password/default-change-password.service.ts
deleted file mode 100644
index 315f979aad9..00000000000
--- a/libs/auth/src/angular/change-password/default-change-password.service.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { PasswordInputResult, ChangePasswordService } from "@bitwarden/auth/angular";
-import { Account } from "@bitwarden/common/auth/abstractions/account.service";
-import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
-import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request";
-import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
-import { UserId } from "@bitwarden/common/types/guid";
-import { KeyService } from "@bitwarden/key-management";
-
-export class DefaultChangePasswordService implements ChangePasswordService {
-  constructor(
-    protected keyService: KeyService,
-    protected masterPasswordApiService: MasterPasswordApiService,
-    protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
-  ) {}
-
-  async rotateUserKeyMasterPasswordAndEncryptedData(
-    currentPassword: string,
-    newPassword: string,
-    user: Account,
-    hint: string,
-  ): Promise<void> {
-    throw new Error("rotateUserKeyMasterPasswordAndEncryptedData() is only implemented in Web");
-  }
-
-  async changePassword(passwordInputResult: PasswordInputResult, userId: UserId) {
-    if (!userId) {
-      throw new Error("userId not found");
-    }
-    if (!passwordInputResult.currentMasterKey || !passwordInputResult.currentServerMasterKeyHash) {
-      throw new Error("currentMasterKey or currentServerMasterKeyHash not found");
-    }
-
-    const decryptedUserKey = await this.masterPasswordService.decryptUserKeyWithMasterKey(
-      passwordInputResult.currentMasterKey,
-      userId,
-    );
-
-    if (decryptedUserKey == null) {
-      throw new Error("Could not decrypt user key");
-    }
-
-    const newMasterKeyEncryptedUserKey = await this.keyService.encryptUserKeyWithMasterKey(
-      passwordInputResult.newMasterKey,
-      decryptedUserKey,
-    );
-
-    const request = new PasswordRequest();
-    request.masterPasswordHash = passwordInputResult.currentServerMasterKeyHash;
-    request.newMasterPasswordHash = passwordInputResult.newServerMasterKeyHash;
-    request.masterPasswordHint = passwordInputResult.newPasswordHint;
-    request.key = newMasterKeyEncryptedUserKey[1].encryptedString as string;
-
-    try {
-      await this.masterPasswordApiService.postPassword(request);
-    } catch {
-      throw new Error("Could not change password");
-    }
-  }
-}
diff --git a/libs/auth/src/angular/fingerprint-dialog/fingerprint-dialog.component.ts b/libs/auth/src/angular/fingerprint-dialog/fingerprint-dialog.component.ts
index 17d7b343db9..1769a57319c 100644
--- a/libs/auth/src/angular/fingerprint-dialog/fingerprint-dialog.component.ts
+++ b/libs/auth/src/angular/fingerprint-dialog/fingerprint-dialog.component.ts
@@ -11,7 +11,6 @@ export type FingerprintDialogData = {
 
 @Component({
   templateUrl: "fingerprint-dialog.component.html",
-  standalone: true,
   imports: [JslibModule, ButtonModule, DialogModule],
 })
 export class FingerprintDialogComponent {
diff --git a/libs/auth/src/angular/icons/index.ts b/libs/auth/src/angular/icons/index.ts
index 0ec92d54547..078e7f764c5 100644
--- a/libs/auth/src/angular/icons/index.ts
+++ b/libs/auth/src/angular/icons/index.ts
@@ -1,8 +1,4 @@
-export * from "./bitwarden-logo.icon";
-export * from "./bitwarden-shield.icon";
 export * from "./devices.icon";
-export * from "./lock.icon";
-export * from "./registration-check-email.icon";
 export * from "./user-lock.icon";
 export * from "./user-verification-biometrics-fingerprint.icon";
 export * from "./wave.icon";
diff --git a/libs/auth/src/angular/index.ts b/libs/auth/src/angular/index.ts
index f4f6cc71a42..aa0041c7ec3 100644
--- a/libs/auth/src/angular/index.ts
+++ b/libs/auth/src/angular/index.ts
@@ -2,17 +2,6 @@
  * This barrel file should only contain Angular exports
  */
 
-// anon layout
-export * from "./anon-layout/anon-layout.component";
-export * from "./anon-layout/anon-layout-wrapper.component";
-export * from "./anon-layout/anon-layout-wrapper-data.service";
-export * from "./anon-layout/default-anon-layout-wrapper-data.service";
-
-// change password
-export * from "./change-password/change-password.component";
-export * from "./change-password/change-password.service.abstraction";
-export * from "./change-password/default-change-password.service";
-
 // fingerprint dialog
 export * from "./fingerprint-dialog/fingerprint-dialog.component";
 
diff --git a/libs/auth/src/angular/input-password/input-password.component.html b/libs/auth/src/angular/input-password/input-password.component.html
index 8955a7b40b1..bf3a51b98bb 100644
--- a/libs/auth/src/angular/input-password/input-password.component.html
+++ b/libs/auth/src/angular/input-password/input-password.component.html
@@ -1,6 +1,11 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <auth-password-callout
     *ngIf="masterPasswordPolicyOptions"
+    [message]="
+      flow === InputPasswordFlow.ChangePasswordDelegation
+        ? 'changePasswordDelegationMasterPasswordPolicyInEffect'
+        : 'masterPasswordPolicyInEffect'
+    "
     [policy]="masterPasswordPolicyOptions"
   ></auth-password-callout>
 
@@ -27,7 +32,7 @@
   </bit-form-field>
 
   <div class="tw-mb-6">
-    <bit-form-field>
+    <bit-form-field [disableMargin]="true">
       <bit-label>{{ "newMasterPass" | i18n }}</bit-label>
       <input
         id="input-password-form_new-password"
@@ -35,6 +40,22 @@
         type="password"
         formControlName="newPassword"
       />
+      <button
+        *ngIf="flow === InputPasswordFlow.ChangePasswordDelegation"
+        type="button"
+        bitIconButton="bwi-generate"
+        bitSuffix
+        [appA11yTitle]="'generatePassword' | i18n"
+        (click)="generatePassword()"
+      ></button>
+      <button
+        *ngIf="flow === InputPasswordFlow.ChangePasswordDelegation"
+        type="button"
+        bitSuffix
+        bitIconButton="bwi-clone"
+        appA11yTitle="{{ 'copyPassword' | i18n }}"
+        (click)="copy()"
+      ></button>
       <button
         type="button"
         bitIconButton
@@ -42,7 +63,7 @@
         bitPasswordInputToggle
         [(toggled)]="showPassword"
       ></button>
-      <bit-hint>
+      <bit-hint *ngIf="flow !== InputPasswordFlow.ChangePasswordDelegation">
         <span class="tw-font-bold">{{ "important" | i18n }} </span>
         {{ "masterPassImportant" | i18n }}
         {{ minPasswordLengthMsg }}.
@@ -74,26 +95,32 @@
     ></button>
   </bit-form-field>
 
-  <bit-form-field>
-    <bit-label>{{ "masterPassHintLabel" | i18n }}</bit-label>
-    <input id="input-password-form_new-password-hint" bitInput formControlName="newPasswordHint" />
-    <bit-hint>
-      {{
-        "masterPassHintText"
-          | i18n: formGroup.value.newPasswordHint.length : maxHintLength.toString()
-      }}
-    </bit-hint>
-  </bit-form-field>
+  <ng-container *ngIf="flow !== InputPasswordFlow.ChangePasswordDelegation">
+    <bit-form-field>
+      <bit-label>{{ "masterPassHintLabel" | i18n }}</bit-label>
+      <input
+        id="input-password-form_new-password-hint"
+        bitInput
+        formControlName="newPasswordHint"
+      />
+      <bit-hint>
+        {{
+          "masterPassHintText"
+            | i18n: formGroup.value.newPasswordHint.length.toString() : maxHintLength.toString()
+        }}
+      </bit-hint>
+    </bit-form-field>
 
-  <bit-form-control>
-    <input
-      id="input-password-form_check-for-breaches"
-      type="checkbox"
-      bitCheckbox
-      formControlName="checkForBreaches"
-    />
-    <bit-label>{{ "checkForBreaches" | i18n }}</bit-label>
-  </bit-form-control>
+    <bit-form-control>
+      <input
+        id="input-password-form_check-for-breaches"
+        type="checkbox"
+        bitCheckbox
+        formControlName="checkForBreaches"
+      />
+      <bit-label>{{ "checkForBreaches" | i18n }}</bit-label>
+    </bit-form-control>
+  </ng-container>
 
   <bit-form-control *ngIf="flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation">
     <input
@@ -116,7 +143,11 @@
     </bit-label>
   </bit-form-control>
 
-  <div class="tw-flex tw-gap-2" [ngClass]="inlineButtons ? 'tw-flex-row' : 'tw-flex-col'">
+  <div
+    *ngIf="flow !== InputPasswordFlow.ChangePasswordDelegation"
+    class="tw-flex tw-gap-2"
+    [ngClass]="inlineButtons ? 'tw-flex-row' : 'tw-flex-col'"
+  >
     <button type="submit" bitButton bitFormButton buttonType="primary" [loading]="loading">
       {{ primaryButtonTextStr || ("setMasterPassword" | i18n) }}
     </button>
diff --git a/libs/auth/src/angular/input-password/input-password.component.ts b/libs/auth/src/angular/input-password/input-password.component.ts
index 8b0b6e4c159..5438674a4e2 100644
--- a/libs/auth/src/angular/input-password/input-password.component.ts
+++ b/libs/auth/src/angular/input-password/input-password.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from "@angular/core";
 import { ReactiveFormsModule, FormBuilder, Validators, FormControl } from "@angular/forms";
 import { firstValueFrom } from "rxjs";
 
@@ -13,6 +13,7 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/mod
 import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { HashPurpose } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -30,6 +31,7 @@ import {
   ToastService,
   Translation,
 } from "@bitwarden/components";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 import {
   DEFAULT_KDF_CONFIG,
   KdfConfig,
@@ -53,36 +55,50 @@ import { PasswordInputResult } from "./password-input-result";
 // eslint-disable-next-line @bitwarden/platform/no-enums
 export enum InputPasswordFlow {
   /**
-   * Form elements displayed:
-   * - [Input] New password
-   * - [Input] New password confirm
-   * - [Input] New password hint
-   * - [Checkbox] Check for breaches
+   * Form Fields: `[newPassword, newPasswordConfirm, newPasswordHint, checkForBreaches]`
+   *
+   * Note: this flow does not receive an active account `userId` as an `@Input`
+   */
+  SetInitialPasswordAccountRegistration,
+  /**
+   * Form Fields: `[newPassword, newPasswordConfirm, newPasswordHint, checkForBreaches]`
    */
-  AccountRegistration, // important: this flow does not involve an activeAccount/userId
   SetInitialPasswordAuthedUser,
-  /*
-   * All form elements above, plus: [Input] Current password (as the first element in the UI)
+  /**
+   * Form Fields: `[currentPassword, newPassword, newPasswordConfirm, newPasswordHint, checkForBreaches]`
    */
   ChangePassword,
   /**
-   * All form elements above, plus: [Checkbox] Rotate account encryption key (as the last element in the UI)
+   * Form Fields: `[currentPassword, newPassword, newPasswordConfirm, newPasswordHint, checkForBreaches, rotateUserKey]`
    */
   ChangePasswordWithOptionalUserKeyRotation,
+  /**
+   * This flow is used when a user changes the password for another user's account, such as:
+   * - Emergency Access Takeover
+   * - Account Recovery
+   *
+   * Since both of those processes use a dialog, the `InputPasswordComponent` will not display
+   * buttons for `ChangePasswordDelegation` because the dialog will have its own buttons.
+   *
+   * Form Fields: `[newPassword, newPasswordConfirm]`
+   *
+   * Note: this flow does not receive an active account `userId` or `email` as `@Input`s
+   */
+  ChangePasswordDelegation,
 }
 
 interface InputPasswordForm {
+  currentPassword?: FormControl<string>;
+
   newPassword: FormControl<string>;
   newPasswordConfirm: FormControl<string>;
-  newPasswordHint: FormControl<string>;
-  checkForBreaches: FormControl<boolean>;
+  newPasswordHint?: FormControl<string>;
 
-  currentPassword?: FormControl<string>;
+  checkForBreaches?: FormControl<boolean>;
   rotateUserKey?: FormControl<boolean>;
 }
 
 @Component({
-  standalone: true,
   selector: "auth-input-password",
   templateUrl: "./input-password.component.html",
   imports: [
@@ -92,23 +108,28 @@ interface InputPasswordForm {
     FormFieldModule,
     IconButtonModule,
     InputModule,
-    ReactiveFormsModule,
-    SharedModule,
+    JslibModule,
     PasswordCalloutComponent,
     PasswordStrengthV2Component,
-    JslibModule,
+    ReactiveFormsModule,
+    SharedModule,
   ],
 })
 export class InputPasswordComponent implements OnInit {
+  @ViewChild(PasswordStrengthV2Component) passwordStrengthComponent:
+    | PasswordStrengthV2Component
+    | undefined = undefined;
+
   @Output() onPasswordFormSubmit = new EventEmitter<PasswordInputResult>();
   @Output() onSecondaryButtonClick = new EventEmitter<void>();
+  @Output() isSubmitting = new EventEmitter<boolean>();
 
   @Input({ required: true }) flow!: InputPasswordFlow;
-  @Input({ required: true, transform: (val: string) => val.trim().toLowerCase() }) email!: string;
 
+  @Input({ transform: (val: string) => val?.trim().toLowerCase() }) email?: string;
   @Input() userId?: UserId;
   @Input() loading = false;
-  @Input() masterPasswordPolicyOptions: MasterPasswordPolicyOptions | null = null;
+  @Input() masterPasswordPolicyOptions?: MasterPasswordPolicyOptions;
 
   @Input() inlineButtons = false;
   @Input() primaryButtonText?: Translation;
@@ -133,11 +154,6 @@ export class InputPasswordComponent implements OnInit {
         Validators.minLength(this.minPasswordLength),
       ]),
       newPasswordConfirm: this.formBuilder.nonNullable.control("", Validators.required),
-      newPasswordHint: this.formBuilder.nonNullable.control("", [
-        Validators.minLength(this.minHintLength),
-        Validators.maxLength(this.maxHintLength),
-      ]),
-      checkForBreaches: this.formBuilder.nonNullable.control(true),
     },
     {
       validators: [
@@ -147,19 +163,13 @@ export class InputPasswordComponent implements OnInit {
           "newPasswordConfirm",
           this.i18nService.t("masterPassDoesntMatch"),
         ),
-        compareInputs(
-          ValidationGoal.InputsShouldNotMatch,
-          "newPassword",
-          "newPasswordHint",
-          this.i18nService.t("hintEqualsPassword"),
-        ),
       ],
     },
   );
 
   protected get minPasswordLengthMsg() {
     if (
-      this.masterPasswordPolicyOptions != null &&
+      this.masterPasswordPolicyOptions != undefined &&
       this.masterPasswordPolicyOptions.minLength > 0
     ) {
       return this.i18nService.t("characterMinimum", this.masterPasswordPolicyOptions.minLength);
@@ -177,9 +187,11 @@ export class InputPasswordComponent implements OnInit {
     private kdfConfigService: KdfConfigService,
     private keyService: KeyService,
     private masterPasswordService: MasterPasswordServiceAbstraction,
+    private passwordGenerationService: PasswordGenerationServiceAbstraction,
     private platformUtilsService: PlatformUtilsService,
     private policyService: PolicyService,
     private toastService: ToastService,
+    private validationService: ValidationService,
   ) {}
 
   ngOnInit(): void {
@@ -188,6 +200,27 @@ export class InputPasswordComponent implements OnInit {
   }
 
   private addFormFieldsIfNecessary() {
+    if (this.flow !== InputPasswordFlow.ChangePasswordDelegation) {
+      this.formGroup.addControl(
+        "newPasswordHint",
+        this.formBuilder.nonNullable.control("", [
+          Validators.minLength(this.minHintLength),
+          Validators.maxLength(this.maxHintLength),
+        ]),
+      );
+
+      this.formGroup.addValidators([
+        compareInputs(
+          ValidationGoal.InputsShouldNotMatch,
+          "newPassword",
+          "newPasswordHint",
+          this.i18nService.t("hintEqualsPassword"),
+        ),
+      ]);
+
+      this.formGroup.addControl("checkForBreaches", this.formBuilder.nonNullable.control(true));
+    }
+
     if (
       this.flow === InputPasswordFlow.ChangePassword ||
       this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
@@ -228,180 +261,227 @@ export class InputPasswordComponent implements OnInit {
     }
   }
 
-  protected submit = async () => {
-    this.verifyFlowAndUserId();
+  submit = async (): Promise<PasswordInputResult | undefined> => {
+    try {
+      this.isSubmitting.emit(true);
 
-    this.formGroup.markAllAsTouched();
+      this.verifyFlow();
 
-    if (this.formGroup.invalid) {
-      this.showErrorSummary = true;
-      return;
-    }
+      this.formGroup.markAllAsTouched();
 
-    if (!this.email) {
-      throw new Error("Email is required to create master key.");
-    }
-
-    const currentPassword = this.formGroup.controls.currentPassword?.value ?? "";
-    const newPassword = this.formGroup.controls.newPassword.value;
-    const newPasswordHint = this.formGroup.controls.newPasswordHint.value;
-    const checkForBreaches = this.formGroup.controls.checkForBreaches.value;
-
-    // 1. Determine kdfConfig
-    if (this.flow === InputPasswordFlow.AccountRegistration) {
-      this.kdfConfig = DEFAULT_KDF_CONFIG;
-    } else {
-      if (!this.userId) {
-        throw new Error("userId not passed down");
-      }
-      this.kdfConfig = await firstValueFrom(this.kdfConfigService.getKdfConfig$(this.userId));
-    }
-
-    if (this.kdfConfig == null) {
-      throw new Error("KdfConfig is required to create master key.");
-    }
-
-    // 2. Verify current password is correct (if necessary)
-    if (
-      this.flow === InputPasswordFlow.ChangePassword ||
-      this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
-    ) {
-      const currentPasswordVerified = await this.verifyCurrentPassword(
-        currentPassword,
-        this.kdfConfig,
-      );
-      if (!currentPasswordVerified) {
+      if (this.formGroup.invalid) {
+        this.showErrorSummary = true;
         return;
       }
+
+      const currentPassword = this.formGroup.controls.currentPassword?.value ?? "";
+      const newPassword = this.formGroup.controls.newPassword.value;
+      const newPasswordHint = this.formGroup.controls.newPasswordHint?.value ?? "";
+      const checkForBreaches = this.formGroup.controls.checkForBreaches?.value ?? true;
+
+      if (this.flow === InputPasswordFlow.ChangePasswordDelegation) {
+        return await this.handleChangePasswordDelegationFlow(newPassword);
+      }
+
+      if (!this.email) {
+        throw new Error("Email is required to create master key.");
+      }
+
+      // 1. Determine kdfConfig
+      if (this.flow === InputPasswordFlow.SetInitialPasswordAccountRegistration) {
+        this.kdfConfig = DEFAULT_KDF_CONFIG;
+      } else {
+        if (!this.userId) {
+          throw new Error("userId not passed down");
+        }
+        this.kdfConfig = await firstValueFrom(this.kdfConfigService.getKdfConfig$(this.userId));
+      }
+
+      if (this.kdfConfig == null) {
+        throw new Error("KdfConfig is required to create master key.");
+      }
+
+      // 2. Verify current password is correct (if necessary)
+      if (
+        this.flow === InputPasswordFlow.ChangePassword ||
+        this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
+      ) {
+        const currentPasswordVerified = await this.verifyCurrentPassword(
+          currentPassword,
+          this.kdfConfig,
+        );
+        if (!currentPasswordVerified) {
+          return;
+        }
+      }
+
+      // 3. Verify new password
+      const newPasswordVerified = await this.verifyNewPassword(
+        newPassword,
+        this.passwordStrengthScore,
+        checkForBreaches,
+      );
+      if (!newPasswordVerified) {
+        return;
+      }
+
+      // 4. Create cryptographic keys and build a PasswordInputResult object
+      const newMasterKey = await this.keyService.makeMasterKey(
+        newPassword,
+        this.email,
+        this.kdfConfig,
+      );
+
+      const newServerMasterKeyHash = await this.keyService.hashMasterKey(
+        newPassword,
+        newMasterKey,
+        HashPurpose.ServerAuthorization,
+      );
+
+      const newLocalMasterKeyHash = await this.keyService.hashMasterKey(
+        newPassword,
+        newMasterKey,
+        HashPurpose.LocalAuthorization,
+      );
+
+      const passwordInputResult: PasswordInputResult = {
+        newPassword,
+        newMasterKey,
+        newServerMasterKeyHash,
+        newLocalMasterKeyHash,
+        newPasswordHint,
+        kdfConfig: this.kdfConfig,
+      };
+
+      if (
+        this.flow === InputPasswordFlow.ChangePassword ||
+        this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
+      ) {
+        const currentMasterKey = await this.keyService.makeMasterKey(
+          currentPassword,
+          this.email,
+          this.kdfConfig,
+        );
+
+        const currentServerMasterKeyHash = await this.keyService.hashMasterKey(
+          currentPassword,
+          currentMasterKey,
+          HashPurpose.ServerAuthorization,
+        );
+
+        const currentLocalMasterKeyHash = await this.keyService.hashMasterKey(
+          currentPassword,
+          currentMasterKey,
+          HashPurpose.LocalAuthorization,
+        );
+
+        passwordInputResult.currentPassword = currentPassword;
+        passwordInputResult.currentMasterKey = currentMasterKey;
+        passwordInputResult.currentServerMasterKeyHash = currentServerMasterKeyHash;
+        passwordInputResult.currentLocalMasterKeyHash = currentLocalMasterKeyHash;
+      }
+
+      if (this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation) {
+        passwordInputResult.rotateUserKey = this.formGroup.controls.rotateUserKey?.value;
+      }
+
+      // 5. Emit cryptographic keys and other password related properties
+      this.onPasswordFormSubmit.emit(passwordInputResult);
+      return passwordInputResult;
+    } catch (e) {
+      this.validationService.showError(e);
+    } finally {
+      this.isSubmitting.emit(false);
+    }
+  };
+
+  /**
+   * We cannot mark the `userId` or `email` `@Input`s as required because some flows
+   * require them, and some do not. This method enforces that:
+   * - Certain flows MUST have a `userId` and/or `email` passed down
+   * - Certain flows must NOT have a `userId` and/or `email` passed down
+   */
+  private verifyFlow() {
+    /** UserId checks */
+
+    // These flows require that an active account userId must NOT be passed down
+    if (
+      this.flow === InputPasswordFlow.SetInitialPasswordAccountRegistration ||
+      this.flow === InputPasswordFlow.ChangePasswordDelegation
+    ) {
+      if (this.userId) {
+        throw new Error("There should be no active account userId passed down in a this flow.");
+      }
     }
 
-    // 3. Verify new password
+    // All other flows require that an active account userId MUST be passed down
+    if (
+      this.flow !== InputPasswordFlow.SetInitialPasswordAccountRegistration &&
+      this.flow !== InputPasswordFlow.ChangePasswordDelegation
+    ) {
+      if (!this.userId) {
+        throw new Error("This flow requires that an active account userId be passed down.");
+      }
+    }
+
+    /** Email checks */
+
+    // This flow requires that an email must NOT be passed down
+    if (this.flow === InputPasswordFlow.ChangePasswordDelegation) {
+      if (this.email) {
+        throw new Error("There should be no email passed down in this flow.");
+      }
+    }
+
+    // All other flows require that an email MUST be passed down
+    if (this.flow !== InputPasswordFlow.ChangePasswordDelegation) {
+      if (!this.email) {
+        throw new Error("This flow requires that an email be passed down.");
+      }
+    }
+  }
+
+  private async handleChangePasswordDelegationFlow(
+    newPassword: string,
+  ): Promise<PasswordInputResult | undefined> {
     const newPasswordVerified = await this.verifyNewPassword(
       newPassword,
       this.passwordStrengthScore,
-      checkForBreaches,
+      false,
     );
     if (!newPasswordVerified) {
       return;
     }
 
-    // 4. Create cryptographic keys and build a PasswordInputResult object
-    const newMasterKey = await this.keyService.makeMasterKey(
-      newPassword,
-      this.email,
-      this.kdfConfig,
-    );
-
-    const newServerMasterKeyHash = await this.keyService.hashMasterKey(
-      newPassword,
-      newMasterKey,
-      HashPurpose.ServerAuthorization,
-    );
-
-    const newLocalMasterKeyHash = await this.keyService.hashMasterKey(
-      newPassword,
-      newMasterKey,
-      HashPurpose.LocalAuthorization,
-    );
-
     const passwordInputResult: PasswordInputResult = {
       newPassword,
-      newMasterKey,
-      newServerMasterKeyHash,
-      newLocalMasterKeyHash,
-      newPasswordHint,
-      kdfConfig: this.kdfConfig,
     };
 
-    if (
-      this.flow === InputPasswordFlow.ChangePassword ||
-      this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
-    ) {
-      const currentMasterKey = await this.keyService.makeMasterKey(
-        currentPassword,
-        this.email,
-        this.kdfConfig,
-      );
-
-      const currentServerMasterKeyHash = await this.keyService.hashMasterKey(
-        currentPassword,
-        currentMasterKey,
-        HashPurpose.ServerAuthorization,
-      );
-
-      const currentLocalMasterKeyHash = await this.keyService.hashMasterKey(
-        currentPassword,
-        currentMasterKey,
-        HashPurpose.LocalAuthorization,
-      );
-
-      passwordInputResult.currentPassword = currentPassword;
-      passwordInputResult.currentMasterKey = currentMasterKey;
-      passwordInputResult.currentServerMasterKeyHash = currentServerMasterKeyHash;
-      passwordInputResult.currentLocalMasterKeyHash = currentLocalMasterKeyHash;
-    }
-
-    if (this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation) {
-      passwordInputResult.rotateUserKey = this.formGroup.controls.rotateUserKey?.value;
-    }
-
-    // 5. Emit cryptographic keys and other password related properties
     this.onPasswordFormSubmit.emit(passwordInputResult);
-  };
-
-  /**
-   * This method prevents a dev from passing down the wrong `InputPasswordFlow`
-   * from the parent component or from failing to pass down a `userId` for flows
-   * that require it.
-   *
-   * We cannot mark the `userId` `@Input` as required because in an account registration
-   * flow we will not have an active account `userId` to pass down.
-   */
-  private verifyFlowAndUserId() {
-    /**
-     * There can be no active account (and thus no userId) in an account registration
-     * flow. If there is a userId, it means the dev passed down the wrong InputPasswordFlow
-     * from the parent component.
-     */
-    if (this.flow === InputPasswordFlow.AccountRegistration) {
-      if (this.userId) {
-        throw new Error(
-          "There can be no userId in an account registration flow. Please pass down the appropriate InputPasswordFlow from the parent component.",
-        );
-      }
-    }
-
-    /**
-     * There MUST be an active account (and thus a userId) in all other flows.
-     * If no userId is passed down, it means the dev either:
-     *  (a) passed down the wrong InputPasswordFlow, or
-     *  (b) passed down the correct InputPasswordFlow but failed to pass down a userId
-     */
-    if (this.flow !== InputPasswordFlow.AccountRegistration) {
-      if (!this.userId) {
-        throw new Error("The selected InputPasswordFlow requires that a userId be passed down");
-      }
-    }
+    return passwordInputResult;
   }
 
   /**
    * Returns `true` if the current password is correct (it can be used to successfully decrypt
-   * the masterKeyEncrypedUserKey), `false` otherwise
+   * the masterKeyEncryptedUserKey), `false` otherwise
    */
   private async verifyCurrentPassword(
     currentPassword: string,
     kdfConfig: KdfConfig,
   ): Promise<boolean> {
+    if (!this.email) {
+      throw new Error("Email is required to verify current password.");
+    }
+    if (!this.userId) {
+      throw new Error("userId is required to verify current password.");
+    }
+
     const currentMasterKey = await this.keyService.makeMasterKey(
       currentPassword,
       this.email,
       kdfConfig,
     );
 
-    if (!this.userId) {
-      throw new Error("userId not passed down");
-    }
-
     const decryptedUserKey = await this.masterPasswordService.decryptUserKeyWithMasterKey(
       currentMasterKey,
       this.userId,
@@ -550,4 +630,33 @@ export class InputPasswordComponent implements OnInit {
   protected getPasswordStrengthScore(score: PasswordStrengthScore) {
     this.passwordStrengthScore = score;
   }
+
+  protected async generatePassword() {
+    const options = (await this.passwordGenerationService.getOptions())?.[0] ?? {};
+    this.formGroup.patchValue({
+      newPassword: await this.passwordGenerationService.generatePassword(options),
+    });
+
+    if (!this.passwordStrengthComponent) {
+      throw new Error("PasswordStrengthComponent is not initialized");
+    }
+
+    this.passwordStrengthComponent.updatePasswordStrength(
+      this.formGroup.controls.newPassword.value,
+    );
+  }
+
+  protected copy() {
+    const value = this.formGroup.value.newPassword;
+    if (value == null) {
+      return;
+    }
+
+    this.platformUtilsService.copyToClipboard(value, { window: window });
+    this.toastService.showToast({
+      variant: "info",
+      title: "",
+      message: this.i18nService.t("valueCopied", this.i18nService.t("password")),
+    });
+  }
 }
diff --git a/libs/auth/src/angular/input-password/input-password.mdx b/libs/auth/src/angular/input-password/input-password.mdx
index b0b05a810ba..e272044a215 100644
--- a/libs/auth/src/angular/input-password/input-password.mdx
+++ b/libs/auth/src/angular/input-password/input-password.mdx
@@ -6,14 +6,20 @@ import * as stories from "./input-password.stories.ts";
 
 # InputPassword Component
 
-The `InputPasswordComponent` allows a user to enter master password related credentials. On form
-submission, the component creates cryptographic properties (`newMasterKey`,
-`newServerMasterKeyHash`, etc.) and emits those properties to the parent (along with the other
-values defined in `PasswordInputResult`).
+The `InputPasswordComponent` allows a user to enter master password related credentials.
+Specifically, it does the following:
 
-The component is intended for re-use in different scenarios throughout the application. Therefore it
-is mostly presentational and simply emits values rather than acting on them itself. It is the job of
-the parent component to act on those values as needed.
+1. Displays form fields in the UI
+2. Validates form fields
+3. Generates cryptographic properties based on the form inputs (e.g. `newMasterKey`,
+   `newServerMasterKeyHash`, etc.)
+4. Emits the generated properties to the parent component
+
+The `InputPasswordComponent` is central to our set/change password flows, allowing us to keep our
+form UI and validation logic consistent. As such, it is intended for re-use in different set/change
+password scenarios throughout the Bitwarden application. It is mostly presentational and simply
+emits values rather than acting on them itself. It is the job of the parent component to act on
+those values as needed.
 
 <br />
 
@@ -22,11 +28,13 @@ the parent component to act on those values as needed.
 - [@Inputs](#inputs)
 - [@Outputs](#outputs)
 - [The InputPasswordFlow](#the-inputpasswordflow)
+  - [Use Cases](#use-cases)
   - [HTML - Form Fields](#html---form-fields)
   - [TypeScript - Credential Generation](#typescript---credential-generation)
-  - [Difference between AccountRegistration and SetInitialPasswordAuthedUser](#difference-between-accountregistration-and-setinitialpasswordautheduser)
+  - [Difference between SetInitialPasswordAccountRegistration and SetInitialPasswordAuthedUser](#difference-between-setinitialpasswordaccountregistration-and-setinitialpasswordautheduser)
 - [Validation](#validation)
 - [Submit Logic](#submit-logic)
+- [Submitting From a Parent Dialog Component](#submitting-from-a-parent-dialog-component)
 - [Example](#example)
 
 <br />
@@ -37,12 +45,24 @@ the parent component to act on those values as needed.
 
 - `flow` - the parent component must provide an `InputPasswordFlow`, which is used to determine
   which form input elements will be displayed in the UI and which cryptographic keys will be created
-  and emitted.
-- `email` - the parent component must provide an email so that the `InputPasswordComponent` can
-  create a master key.
+  and emitted. [Click here](#the-inputpasswordflow) to learn more about the different
+  `InputPasswordFlow` options.
+
+**Optional (sometimes)**
+
+These two `@Inputs` are optional on some flows, but required on others. Therefore these `@Inputs`
+are not marked as `{ required: true }`, but there _is_ component logic that ensures (requires) that
+the `email` and/or `userId` is present in certain flows, while not present in other flows.
+
+- `email` - allows the `InputPasswordComponent` to generate a master key
+- `userId` - allows the `InputPasswordComponent` to do things like get the user's `kdfConfig`,
+  verify that a current password is correct, and perform validation prior to user key rotation on
+  the parent
 
 **Optional**
 
+These `@Inputs` are truly optional.
+
 - `loading` - a boolean used to indicate that the parent component is performing some
   long-running/async operation and that the form should be disabled until the operation is complete.
   The primary button will also show a spinner if `loading` is true.
@@ -57,6 +77,7 @@ the parent component to act on those values as needed.
 ## `@Output()`'s
 
 - `onPasswordFormSubmit` - on form submit, emits a `PasswordInputResult` object
+  ([see more below](#submit-logic)).
 - `onSecondaryButtonClick` - on click, emits a notice that the secondary button has been clicked.
   The parent component can listen for this event and take some custom action as needed (go back,
   cancel, logout, etc.)
@@ -66,79 +87,100 @@ the parent component to act on those values as needed.
 ## The `InputPasswordFlow`
 
 The `InputPasswordFlow` is a crucial and required `@Input` that influences both the HTML and the
-credential generation logic of the component.
+credential generation logic of the component. It is important for the dev to understand when to use
+each flow.
 
-<br />
+### Use Cases
+
+**`SetInitialPasswordAccountRegistration`**
+
+Used in scenarios where we have no existing user, and thus NO active account `userId`:
+
+- Standard Account Registration
+- Email Invite Account Registration
+- Trial Initiation Account registration<br /><br />
+
+**`SetInitialPasswordAuthedUser`**
+
+Used in scenarios where we do have an existing and authed user, and thus an active account `userId`:
+
+- A "just-in-time" (JIT) provisioned user joins a master password (MP) encryption org and must set
+  their initial password
+- A "just-in-time" (JIT) provisioned user joins a trusted device encryption (TDE) org with a
+  starting role that requires them to have/set their initial password
+  - A note on JIT provisioned user flows:
+    - Even though a JIT provisioned user is a brand-new user who was “just” created, we consider
+      them to be an “existing authed user” _from the perspective of the set-password flow_. This is
+      because at the time they set their initial password, their account already exists in the
+      database (before setting their password) and they have already authenticated via SSO.
+    - The same is not true in the account registration flows above&mdash;that is, during account
+      registration when a user reaches the `/finish-signup` or `/trial-initiation` page to set their
+      initial password, their account does not yet exist in the database, and will only be created
+      once they set an initial password.
+- An existing user in a TDE org logs in after the org admin upgraded the user to a role that now
+  requires them to have/set their initial password
+- An existing user logs in after their org admin offboarded the org from TDE, and the user must now
+  have/set their initial password<br /><br />
+
+**`ChangePassword`**
+
+Used in scenarios where we simply want to offer the user the ability to change their password:
+
+- User clicks an org email invite link an logs in with their password which does not meet the org's
+  policy requirements
+- User logs in with password that does not meet the org's policy requirements
+- User logs in after their password was reset via Account Recovery (and now they must change their
+  password)<br /><br />
+
+**`ChangePasswordWithOptionalUserKeyRotation`**
+
+Used in scenarios where we want to offer users the additional option of rotating their user key:
+
+- Account Settings (Web) - change password screen
+
+Note that the user key rotation itself does not happen on the `InputPasswordComponent`, but rather
+on the parent component. The `InputPasswordComponent` simply emits a boolean value that indicates
+whether or not the user key should be rotated.<br /><br />
+
+**`ChangePasswordDelegation`**
+
+Used in scenarios where one user changes the password for another user's account:
+
+- Emergency Access Takeover
+- Account Recovery<br /><br />
 
 ### HTML - Form Fields
 
-The `InputPasswordFlow` determines which form fields get displayed in the UI.
-
-**`InputPasswordFlow.AccountRegistration`** and **`InputPasswordFlow.SetInitialPasswordAuthedUser`**
-
-- Input: New password
-- Input: Confirm new password
-- Input: Hint
-- Checkbox: Check for breaches
-
-**`InputPasswordFlow.ChangePassword`**
-
-Includes everything above, plus:
-
-- Input: Current password (as the first element in the UI)
-
-**`InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation`**
-
-Includes everything above, plus:
-
-- Checkbox: Rotate account encryption key (as the last element in the UI)
+Click through the individual Stories in Storybook to see how the `InputPassswordFlow` determines
+which form field UI elements get displayed.
 
 <br />
 
 ### TypeScript - Credential Generation
 
-- The `AccountRegistration` and `SetInitialPasswordAuthedUser` flows involve a user setting their
-  password for the first time. Therefore on submit the component will only generate new credentials
-  (`newMasterKey`) and not current credentials (`currentMasterKey`).
-- The `ChangePassword` and `ChangePasswordWithOptionalUserKeyRotation` flows both require the user
-  to enter a current password along with a new password. Therefore on submit the component will
-  generate current credentials (`currentMasterKey`) along with new credentials (`newMasterKey`).
+- **`SetInitialPasswordAccountRegistration`** and **`SetInitialPasswordAuthedUser`**
+  - These flows involve a user setting their password for the first time. Therefore on submit the
+    component will only generate new credentials (`newMasterKey`) and not current credentials
+    (`currentMasterKey`).<br /><br />
+- **`ChangePassword`** and **`ChangePasswordWithOptionalUserKeyRotation`**
+  - These flows both require the user to enter a current password along with a new password.
+    Therefore on submit the component will generate current credentials (`currentMasterKey`) along
+    with new credentials (`newMasterKey`).<br /><br />
+- **`ChangePasswordDelegation`**
+  - This flow does not generate any credentials, but simply validates the new password and emits it
+    up to the parent.
 
 <br />
 
-### Difference between `AccountRegistration` and `SetInitialPasswordAuthedUser`
+### Difference between `SetInitialPasswordAccountRegistration` and `SetInitialPasswordAuthedUser`
 
 These two flows are similar in that they display the same form fields and only generate new
 credentials, but we need to keep them separate for the following reasons:
 
-- `AccountRegistration` involves scenarios where we have no existing user, and **thus NO active
-  account `userId`**:
-
-  - Standard Account Registration
-  - Email Invite Account Registration
-  - Trial Initiation Account Registration
-
-<br />
-
+- `SetInitialPasswordAccountRegistration` involves scenarios where we have no existing user, and
+  **thus NO active account `userId`**:
 - `SetInitialPasswordAuthedUser` involves scenarios where we do have an existing and authed user,
   and **thus an active account `userId`**:
-  - A "just-in-time" (JIT) provisioned user joins a master password (MP) encryption org and must set
-    their initial password
-  - A "just-in-time" (JIT) provisioned user joins a trusted device encryption (TDE) org with a
-    starting role that requires them to have/set their initial password
-    - A note on JIT provisioned user flows:
-      - Even though a JIT provisioned user is a brand-new user who was “just” created, we consider
-        them to be an “existing authed user” _from the perspective of the set-password flow_. This
-        is because at the time they set their initial password, their account already exists in the
-        database (before setting their password) and they have already authenticated via SSO.
-      - The same is not true in the account registration flows above&mdash;that is, during account
-        registration when a user reaches the `/finish-signup` or `/trial-initiation` page to set
-        their initial password, their account does not yet exist in the database, and will only be
-        created once they set an initial password.
-  - An existing user in a TDE org logs in after the org admin upgraded the user to a role that now
-    requires them to have/set their initial password
-  - An existing user logs in after their org admin offboarded the org from TDE, and the user must
-    now have/set their initial password
 
 The presence or absence of an active account `userId` is important because it determines how we get
 the correct `kdfConfig` prior to key generation:
@@ -148,12 +190,12 @@ the correct `kdfConfig` prior to key generation:
   `userId`
 
 That said, we cannot mark the `userId` as a required via `@Input({ required: true })` because
-`AccountRegistration` flows will not have a `userId`. But we still want to require a `userId` in a
-`SetInitialPasswordAuthedUser` flow. Therefore the `InputPasswordComponent` has init logic that
-ensures the following:
+`SetInitialPasswordAccountRegistration` flows will not have a `userId`. But we still want to require
+a `userId` in a `SetInitialPasswordAuthedUser` flow. Therefore the `InputPasswordComponent` has init
+logic that ensures the following:
 
-- If the passed down flow is `AccountRegistration`, require that the parent **MUST NOT** have passed
-  down a `userId`
+- If the passed down flow is `SetInitialPasswordAccountRegistration`, require that the parent **MUST
+  NOT** have passed down a `userId`
 - If the passed down flow is `SetInitialPasswordAuthedUser` require that the parent must also have
   passed down a `userId`
 
@@ -169,11 +211,6 @@ Form validators ensure that:
 - The new password and confirmed new password are the same
 - The new password and password hint are NOT the same
 
-Additional submit logic validation ensures that:
-
-- The new password adheres to any enforced master password policy options (that were passed down
-  from the parent)
-
 <br />
 
 ## Submit Logic
@@ -182,9 +219,10 @@ When the form is submitted, the `InputPasswordComponent` does the following in o
 
 1. Verifies inputs:
    - Checks that the current password is correct (if it was required in the flow)
-   - Checks if the new password is found in a breach and warns the user if so (if the user selected
-     the checkbox)
-   - Checks that the new password meets any master password policy requirements enforced by an org
+   - Checks that the new password is not weak or found in any breaches (if the user selected the
+     checkbox)
+   - Checks that the new password adheres to any enforced master password policies that were
+     optionally passed down by the parent
 2. Uses the form inputs to create cryptographic properties (`newMasterKey`,
    `newServerMasterKeyHash`, etc.)
 3. Emits those cryptographic properties up to the parent (along with other values defined in
@@ -192,23 +230,83 @@ When the form is submitted, the `InputPasswordComponent` does the following in o
 
 ```typescript
 export interface PasswordInputResult {
-  // Properties starting with "current..." are included if the flow is ChangePassword or ChangePasswordWithOptionalUserKeyRotation
   currentPassword?: string;
   currentMasterKey?: MasterKey;
   currentServerMasterKeyHash?: string;
   currentLocalMasterKeyHash?: string;
 
   newPassword: string;
-  newPasswordHint: string;
-  newMasterKey: MasterKey;
-  newServerMasterKeyHash: string;
-  newLocalMasterKeyHash: string;
+  newPasswordHint?: string;
+  newMasterKey?: MasterKey;
+  newServerMasterKeyHash?: string;
+  newLocalMasterKeyHash?: string;
 
-  kdfConfig: KdfConfig;
-  rotateUserKey?: boolean; // included if the flow is ChangePasswordWithOptionalUserKeyRotation
+  kdfConfig?: KdfConfig;
+  rotateUserKey?: boolean;
 }
 ```
 
+## Submitting From a Parent Dialog Component
+
+Some of our set/change password flows use dialogs, such as Emergency Access Takeover and Account
+Recovery. These are covered by the `ChangePasswordDelegation` flow. Because dialogs have their own
+buttons, we don't want to display an additional Submit button in the `InputPasswordComponent` when
+embedded in a dialog.
+
+Therefore we do the following:
+
+- The `InputPasswordComponent` hides the button in the UI and exposes its `submit()` method as a
+  public method.
+- The parent dialog component can then access this method via `@ViewChild()`.
+- When the user clicks the primary button on the parent dialog, we call the `submit()` method on the
+  `InputPasswordComponent`.
+
+```html
+<!-- emergency-access-takeover-dialog.component.html -->
+
+<bit-dialog dialogSize="large">
+  <span bitDialogTitle><!-- ... --></span>
+
+  <div bitDialogContent>
+    <auth-input-password
+      [flow]="inputPasswordFlow"
+      [masterPasswordPolicyOptions]="masterPasswordPolicyOptions"
+      (onPasswordFormSubmit)="handlePasswordFormSubmit($event)"
+    ></auth-input-password>
+  </div>
+
+  <ng-container bitDialogFooter>
+    <button type="button" bitButton buttonType="primary" (click)="handlePrimaryButtonClick()">
+      {{ "save" | i18n }}
+    </button>
+    <button type="button" bitButton buttonType="secondary" bitDialogClose>
+      {{ "cancel" | i18n }}
+    </button>
+  </ng-container>
+</bit-dialog>
+```
+
+```typescript
+// emergency-access-takeover-dialog.component.ts
+
+export class EmergencyAccessTakeoverDialogComponent implements OnInit {
+  @ViewChild(InputPasswordComponent)
+  inputPasswordComponent: InputPasswordComponent;
+
+  // ...
+
+  handlePrimaryButtonClick = async () => {
+    await this.inputPasswordComponent.submit();
+  };
+
+  async handlePasswordFormSubmit(passwordInputResult: PasswordInputResult) {
+    // ... run logic that handles the `PasswordInputResult` object emission
+  }
+}
+```
+
+<br />
+
 # Example
 
 **`InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation`**
diff --git a/libs/auth/src/angular/input-password/input-password.stories.ts b/libs/auth/src/angular/input-password/input-password.stories.ts
index 708b74b9925..4ffd0e202ee 100644
--- a/libs/auth/src/angular/input-password/input-password.stories.ts
+++ b/libs/auth/src/angular/input-password/input-password.stories.ts
@@ -11,12 +11,14 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/mod
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
 import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import { DialogService, ToastService } from "@bitwarden/components";
+import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 import { DEFAULT_KDF_CONFIG, KdfConfigService, KeyService } from "@bitwarden/key-management";
 
 // FIXME: remove `/apps` import from `/libs`
@@ -73,6 +75,7 @@ export default {
           provide: PlatformUtilsService,
           useValue: {
             launchUri: () => Promise.resolve(true),
+            copyToClipboard: () => true,
           },
         },
         {
@@ -125,16 +128,31 @@ export default {
             showToast: action("ToastService.showToast"),
           } as Partial<ToastService>,
         },
+        {
+          provide: PasswordGenerationServiceAbstraction,
+          useValue: {
+            getOptions: () => ({}),
+            generatePassword: () => "generated-password",
+          },
+        },
+        {
+          provide: ValidationService,
+          useValue: {
+            showError: () => ["validation error"],
+          },
+        },
       ],
     }),
   ],
   args: {
     InputPasswordFlow: {
-      AccountRegistration: InputPasswordFlow.AccountRegistration,
+      SetInitialPasswordAccountRegistration:
+        InputPasswordFlow.SetInitialPasswordAccountRegistration,
       SetInitialPasswordAuthedUser: InputPasswordFlow.SetInitialPasswordAuthedUser,
       ChangePassword: InputPasswordFlow.ChangePassword,
       ChangePasswordWithOptionalUserKeyRotation:
         InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation,
+      ChangePasswordDelegation: InputPasswordFlow.ChangePasswordDelegation,
     },
     userId: "1" as UserId,
     email: "user@email.com",
@@ -154,12 +172,12 @@ export default {
 
 type Story = StoryObj<InputPasswordComponent>;
 
-export const AccountRegistration: Story = {
+export const SetInitialPasswordAccountRegistration: Story = {
   render: (args) => ({
     props: args,
     template: `
       <auth-input-password
-        [flow]="InputPasswordFlow.AccountRegistration"
+        [flow]="InputPasswordFlow.SetInitialPasswordAccountRegistration"
         [email]="email"
       ></auth-input-password>
     `,
@@ -205,14 +223,24 @@ export const ChangePasswordWithOptionalUserKeyRotation: Story = {
   }),
 };
 
+export const ChangePasswordDelegation: Story = {
+  render: (args) => ({
+    props: args,
+    template: `
+      <auth-input-password [flow]="InputPasswordFlow.ChangePasswordDelegation"></auth-input-password>
+      <br />
+      <div>Note: no buttons here as this flow is expected to be used in a dialog, which will have its own buttons</div>
+    `,
+  }),
+};
+
 export const WithPolicies: Story = {
   render: (args) => ({
     props: args,
     template: `
       <auth-input-password
-        [flow]="InputPasswordFlow.SetInitialPasswordAuthedUser"
+        [flow]="InputPasswordFlow.SetInitialPasswordAccountRegistration"
         [email]="email"
-        [userId]="userId"
         [masterPasswordPolicyOptions]="masterPasswordPolicyOptions"
       ></auth-input-password>
     `,
@@ -224,7 +252,7 @@ export const SecondaryButton: Story = {
     props: args,
     template: `
       <auth-input-password
-        [flow]="InputPasswordFlow.AccountRegistration"
+        [flow]="InputPasswordFlow.SetInitialPasswordAccountRegistration"
         [email]="email"
         [secondaryButtonText]="{ key: 'cancel' }"
         (onSecondaryButtonClick)="onSecondaryButtonClick()"
@@ -238,7 +266,7 @@ export const SecondaryButtonWithPlaceHolderText: Story = {
     props: args,
     template: `
       <auth-input-password
-        [flow]="InputPasswordFlow.AccountRegistration"
+        [flow]="InputPasswordFlow.SetInitialPasswordAccountRegistration"
         [email]="email"
         [secondaryButtonText]="{ key: 'backTo', placeholders: ['homepage'] }"
         (onSecondaryButtonClick)="onSecondaryButtonClick()"
@@ -252,7 +280,7 @@ export const InlineButton: Story = {
     props: args,
     template: `
       <auth-input-password
-        [flow]="InputPasswordFlow.AccountRegistration"
+        [flow]="InputPasswordFlow.SetInitialPasswordAccountRegistration"
         [email]="email"
         [inlineButtons]="true"
       ></auth-input-password>
@@ -265,7 +293,7 @@ export const InlineButtons: Story = {
     props: args,
     template: `
       <auth-input-password
-        [flow]="InputPasswordFlow.AccountRegistration"
+        [flow]="InputPasswordFlow.SetInitialPasswordAccountRegistration"
         [email]="email"
         [secondaryButtonText]="{ key: 'cancel' }"
         [inlineButtons]="true"
diff --git a/libs/auth/src/angular/input-password/password-input-result.ts b/libs/auth/src/angular/input-password/password-input-result.ts
index b6f2af69469..37f337291e5 100644
--- a/libs/auth/src/angular/input-password/password-input-result.ts
+++ b/libs/auth/src/angular/input-password/password-input-result.ts
@@ -8,11 +8,11 @@ export interface PasswordInputResult {
   currentLocalMasterKeyHash?: string;
 
   newPassword: string;
-  newPasswordHint: string;
-  newMasterKey: MasterKey;
-  newServerMasterKeyHash: string;
-  newLocalMasterKeyHash: string;
+  newPasswordHint?: string;
+  newMasterKey?: MasterKey;
+  newServerMasterKeyHash?: string;
+  newLocalMasterKeyHash?: string;
 
-  kdfConfig: KdfConfig;
+  kdfConfig?: KdfConfig;
   rotateUserKey?: boolean;
 }
diff --git a/libs/auth/src/angular/login-approval/login-approval.component.ts b/libs/auth/src/angular/login-approval/login-approval.component.ts
index 784bd93002e..285bdd0ddf0 100644
--- a/libs/auth/src/angular/login-approval/login-approval.component.ts
+++ b/libs/auth/src/angular/login-approval/login-approval.component.ts
@@ -40,7 +40,6 @@ export interface LoginApprovalDialogParams {
 @Component({
   selector: "login-approval",
   templateUrl: "login-approval.component.html",
-  standalone: true,
   imports: [CommonModule, AsyncActionsModule, ButtonModule, DialogModule, JslibModule],
 })
 export class LoginApprovalComponent implements OnInit, OnDestroy {
@@ -101,6 +100,8 @@ export class LoginApprovalComponent implements OnInit, OnDestroy {
         this.updateTimeText();
       }, RequestTimeUpdate);
 
+      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.loginApprovalComponentService.showLoginRequestedAlertIfWindowNotVisible(this.email);
 
       this.loading = false;
diff --git a/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts b/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
index c49e54f8c19..bbdc0106786 100644
--- a/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
+++ b/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
@@ -10,6 +10,7 @@ import { catchError, defer, firstValueFrom, from, map, of, switchMap, throwError
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import {
   LoginEmailServiceAbstraction,
+  LogoutService,
   UserDecryptionOptions,
   UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
@@ -29,6 +30,7 @@ import { UserId } from "@bitwarden/common/types/guid";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import {
+  AnonLayoutWrapperDataService,
   AsyncActionsModule,
   ButtonModule,
   CheckboxModule,
@@ -39,8 +41,6 @@ import {
 } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 
-import { AnonLayoutWrapperDataService } from "../anon-layout/anon-layout-wrapper-data.service";
-
 import { LoginDecryptionOptionsService } from "./login-decryption-options.service";
 
 // FIXME: update to use a const object instead of a typescript enum
@@ -51,7 +51,6 @@ enum State {
 }
 
 @Component({
-  standalone: true,
   templateUrl: "./login-decryption-options.component.html",
   imports: [
     AsyncActionsModule,
@@ -110,6 +109,7 @@ export class LoginDecryptionOptionsComponent implements OnInit {
     private toastService: ToastService,
     private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
     private validationService: ValidationService,
+    private logoutService: LogoutService,
   ) {
     this.clientType = this.platformUtilsService.getClientType();
   }
@@ -157,19 +157,17 @@ export class LoginDecryptionOptionsComponent implements OnInit {
   }
 
   private async handleMissingEmail() {
+    // TODO: PM-15174 - the solution for this bug will allow us to show the toast on app re-init after
+    // the user has been logged out and the process reload has occurred.
     this.toastService.showToast({
       variant: "error",
       title: null,
       message: this.i18nService.t("activeUserEmailNotFoundLoggingYouOut"),
     });
 
-    setTimeout(async () => {
-      // We can't simply redirect to `/login` because the user is authed and the unauthGuard
-      // will prevent navigation. We must logout the user first via messagingService, which
-      // redirects to `/`, which will be handled by the redirectGuard to navigate the user to `/login`.
-      // The timeout just gives the user a chance to see the error toast before process reload runs on logout.
-      await this.loginDecryptionOptionsService.logOut();
-    }, 5000);
+    await this.logoutService.logout(this.activeAccountId);
+    // navigate to root so redirect guard can properly route next active user or null user to correct page
+    await this.router.navigate(["/"]);
   }
 
   private observeAndPersistRememberDeviceValueChanges() {
@@ -313,7 +311,9 @@ export class LoginDecryptionOptionsComponent implements OnInit {
 
     const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
     if (confirmed) {
-      this.messagingService.send("logout", { userId: userId });
+      await this.logoutService.logout(userId);
+      // navigate to root so redirect guard can properly route next active user or null user to correct page
+      await this.router.navigate(["/"]);
     }
   }
 }
diff --git a/libs/auth/src/angular/login-decryption-options/login-decryption-options.service.ts b/libs/auth/src/angular/login-decryption-options/login-decryption-options.service.ts
index d81d56d6393..3eb96470ed3 100644
--- a/libs/auth/src/angular/login-decryption-options/login-decryption-options.service.ts
+++ b/libs/auth/src/angular/login-decryption-options/login-decryption-options.service.ts
@@ -3,8 +3,4 @@ export abstract class LoginDecryptionOptionsService {
    * Handles client-specific logic that runs after a user was successfully created
    */
   abstract handleCreateUserSuccess(): Promise<void | null>;
-  /**
-   * Logs the user out
-   */
-  abstract logOut(): Promise<void>;
 }
diff --git a/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.ts b/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.ts
index f23d49f0015..5e410c538f0 100644
--- a/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.ts
+++ b/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.ts
@@ -39,7 +39,7 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { ButtonModule, LinkModule, ToastService } from "@bitwarden/components";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
-import { AuthRequestApiService } from "../../common/abstractions/auth-request-api.service";
+import { AuthRequestApiServiceAbstraction } from "../../common/abstractions/auth-request-api.service";
 import { LoginViaAuthRequestCacheService } from "../../common/services/auth-request/default-login-via-auth-request-cache.service";
 
 // FIXME: update to use a const object instead of a typescript enum
@@ -57,7 +57,6 @@ const matchOptions: IsActiveMatchOptions = {
 };
 
 @Component({
-  standalone: true,
   templateUrl: "./login-via-auth-request.component.html",
   imports: [ButtonModule, CommonModule, JslibModule, LinkModule, RouterModule],
   providers: [{ provide: LoginViaAuthRequestCacheService }],
@@ -86,7 +85,7 @@ export class LoginViaAuthRequestComponent implements OnInit, OnDestroy {
     private accountService: AccountService,
     private anonymousHubService: AnonymousHubService,
     private appIdService: AppIdService,
-    private authRequestApiService: AuthRequestApiService,
+    private authRequestApiService: AuthRequestApiServiceAbstraction,
     private authRequestService: AuthRequestServiceAbstraction,
     private authService: AuthService,
     private cryptoFunctionService: CryptoFunctionService,
diff --git a/libs/auth/src/angular/login/login-secondary-content.component.ts b/libs/auth/src/angular/login/login-secondary-content.component.ts
index fba5e70d93c..9cd4cfd2502 100644
--- a/libs/auth/src/angular/login/login-secondary-content.component.ts
+++ b/libs/auth/src/angular/login/login-secondary-content.component.ts
@@ -9,7 +9,6 @@ import { DefaultServerSettingsService } from "@bitwarden/common/platform/service
 import { LinkModule } from "@bitwarden/components";
 
 @Component({
-  standalone: true,
   imports: [CommonModule, JslibModule, LinkModule, RouterModule],
   template: `
     <div class="tw-text-center" *ngIf="!(isUserRegistrationDisabled$ | async)">
diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts
index 8674453cf10..b3509850ac0 100644
--- a/libs/auth/src/angular/login/login.component.ts
+++ b/libs/auth/src/angular/login/login.component.ts
@@ -18,9 +18,12 @@ import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { DevicesApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices-api.service.abstraction";
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { ClientType, HttpStatusCode } from "@bitwarden/common/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -32,6 +35,7 @@ import { UserId } from "@bitwarden/common/types/guid";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import {
+  AnonLayoutWrapperDataService,
   AsyncActionsModule,
   ButtonModule,
   CheckboxModule,
@@ -41,7 +45,6 @@ import {
   ToastService,
 } from "@bitwarden/components";
 
-import { AnonLayoutWrapperDataService } from "../anon-layout/anon-layout-wrapper-data.service";
 import { VaultIcon, WaveIcon } from "../icons";
 
 import { LoginComponentService, PasswordPolicies } from "./login-component.service";
@@ -56,7 +59,6 @@ export enum LoginUiState {
 }
 
 @Component({
-  standalone: true,
   templateUrl: "./login.component.html",
   imports: [
     AsyncActionsModule,
@@ -123,6 +125,8 @@ export class LoginComponent implements OnInit, OnDestroy {
     private logService: LogService,
     private validationService: ValidationService,
     private loginSuccessHandlerService: LoginSuccessHandlerService,
+    private masterPasswordService: MasterPasswordServiceAbstraction,
+    private configService: ConfigService,
   ) {
     this.clientType = this.platformUtilsService.getClientType();
   }
@@ -226,7 +230,29 @@ export class LoginComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const credentials = new PasswordLoginCredentials(email, masterPassword);
+    let credentials: PasswordLoginCredentials;
+
+    if (
+      await this.configService.getFeatureFlag(FeatureFlag.PM16117_ChangeExistingPasswordRefactor)
+    ) {
+      // Try to retrieve any org policies from an org invite now so we can send it to the
+      // login strategies. Since it is optional and we only want to be doing this on the
+      // web we will only send in content in the right context.
+      const orgPoliciesFromInvite = this.loginComponentService.getOrgPoliciesFromOrgInvite
+        ? await this.loginComponentService.getOrgPoliciesFromOrgInvite()
+        : null;
+
+      const orgMasterPasswordPolicyOptions = orgPoliciesFromInvite?.enforcedPasswordPolicyOptions;
+
+      credentials = new PasswordLoginCredentials(
+        email,
+        masterPassword,
+        undefined,
+        orgMasterPasswordPolicyOptions,
+      );
+    } else {
+      credentials = new PasswordLoginCredentials(email, masterPassword);
+    }
 
     try {
       const authResult = await this.loginStrategyService.logIn(credentials);
@@ -282,16 +308,12 @@ export class LoginComponent implements OnInit, OnDestroy {
   private async handleAuthResult(authResult: AuthResult): Promise<void> {
     if (authResult.requiresEncryptionKeyMigration) {
       /* Legacy accounts used the master key to encrypt data.
-         Migration is required but only performed on Web. */
-      if (this.clientType === ClientType.Web) {
-        await this.router.navigate(["migrate-legacy-encryption"]);
-      } else {
-        this.toastService.showToast({
-          variant: "error",
-          title: this.i18nService.t("errorOccured"),
-          message: this.i18nService.t("encryptionKeyMigrationRequired"),
-        });
-      }
+         This is now unsupported and requires a downgraded client */
+      this.toastService.showToast({
+        variant: "error",
+        title: this.i18nService.t("errorOccurred"),
+        message: this.i18nService.t("legacyEncryptionUnsupported"),
+      });
       return;
     }
 
@@ -330,7 +352,13 @@ export class LoginComponent implements OnInit, OnDestroy {
           orgPolicies.enforcedPasswordPolicyOptions,
         );
         if (isPasswordChangeRequired) {
-          await this.router.navigate(["update-password"]);
+          const changePasswordFeatureFlagOn = await this.configService.getFeatureFlag(
+            FeatureFlag.PM16117_ChangeExistingPasswordRefactor,
+          );
+
+          await this.router.navigate(
+            changePasswordFeatureFlagOn ? ["change-password"] : ["update-password"],
+          );
           return;
         }
       }
@@ -342,9 +370,15 @@ export class LoginComponent implements OnInit, OnDestroy {
       await this.router.navigate(["vault"]);
     }
   }
+
   /**
    * Checks if the master password meets the enforced policy requirements
    * and if the user is required to change their password.
+   *
+   * TODO: This is duplicate checking that we want to only do in the password login strategy.
+   *       Once we no longer need the policies state being set to reference later in change password
+   *       via using the Admin Console's new policy endpoint changes we can remove this. Consult
+   *       PM-23001 for details.
    */
   private async isPasswordChangeRequiredByOrgPolicy(
     enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions,
diff --git a/libs/auth/src/angular/new-device-verification/new-device-verification.component.ts b/libs/auth/src/angular/new-device-verification/new-device-verification.component.ts
index 5d3ecc1751d..4325b4bcbc1 100644
--- a/libs/auth/src/angular/new-device-verification/new-device-verification.component.ts
+++ b/libs/auth/src/angular/new-device-verification/new-device-verification.component.ts
@@ -2,11 +2,17 @@ import { CommonModule } from "@angular/common";
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { FormBuilder, ReactiveFormsModule, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
-import { Subject, takeUntil } from "rxjs";
+import { firstValueFrom, Subject, takeUntil } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { LoginSuccessHandlerService } from "@bitwarden/auth/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { MasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
@@ -25,7 +31,6 @@ import { LoginStrategyServiceAbstraction } from "../../common/abstractions/login
  * Component for verifying a new device via a one-time password (OTP).
  */
 @Component({
-  standalone: true,
   selector: "app-new-device-verification",
   templateUrl: "./new-device-verification.component.html",
   imports: [
@@ -62,6 +67,9 @@ export class NewDeviceVerificationComponent implements OnInit, OnDestroy {
     private logService: LogService,
     private i18nService: I18nService,
     private loginSuccessHandlerService: LoginSuccessHandlerService,
+    private configService: ConfigService,
+    private accountService: AccountService,
+    private masterPasswordService: MasterPasswordServiceAbstraction,
   ) {}
 
   async ngOnInit() {
@@ -138,10 +146,33 @@ export class NewDeviceVerificationComponent implements OnInit, OnDestroy {
         return;
       }
 
+      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.loginSuccessHandlerService.run(authResult.userId);
 
-      // If verification succeeds, navigate to vault
-      await this.router.navigate(["/vault"]);
+      // TODO: PM-22663 use the new service to handle routing.
+      if (
+        await this.configService.getFeatureFlag(FeatureFlag.PM16117_ChangeExistingPasswordRefactor)
+      ) {
+        const activeUserId = await firstValueFrom(
+          this.accountService.activeAccount$.pipe(getUserId),
+        );
+
+        const forceSetPasswordReason = await firstValueFrom(
+          this.masterPasswordService.forceSetPasswordReason$(activeUserId),
+        );
+
+        if (
+          forceSetPasswordReason === ForceSetPasswordReason.WeakMasterPassword ||
+          forceSetPasswordReason === ForceSetPasswordReason.AdminForcePasswordReset
+        ) {
+          await this.router.navigate(["/change-password"]);
+        } else {
+          await this.router.navigate(["/vault"]);
+        }
+      } else {
+        await this.router.navigate(["/vault"]);
+      }
     } catch (e) {
       this.logService.error(e);
       let errorMessage =
diff --git a/libs/auth/src/angular/password-callout/password-callout.component.ts b/libs/auth/src/angular/password-callout/password-callout.component.ts
index 03fba52336f..7a28700f109 100644
--- a/libs/auth/src/angular/password-callout/password-callout.component.ts
+++ b/libs/auth/src/angular/password-callout/password-callout.component.ts
@@ -13,7 +13,6 @@ import { CalloutModule } from "@bitwarden/components";
 @Component({
   selector: "auth-password-callout",
   templateUrl: "password-callout.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, CalloutModule],
 })
 export class PasswordCalloutComponent {
diff --git a/libs/auth/src/angular/password-hint/password-hint.component.ts b/libs/auth/src/angular/password-hint/password-hint.component.ts
index 99eb06293e0..3189bf8f187 100644
--- a/libs/auth/src/angular/password-hint/password-hint.component.ts
+++ b/libs/auth/src/angular/password-hint/password-hint.component.ts
@@ -23,7 +23,6 @@ import {
 } from "@bitwarden/components";
 
 @Component({
-  standalone: true,
   templateUrl: "./password-hint.component.html",
   imports: [
     AsyncActionsModule,
diff --git a/libs/auth/src/angular/registration/registration-env-selector/registration-env-selector.component.ts b/libs/auth/src/angular/registration/registration-env-selector/registration-env-selector.component.ts
index 8aac5f73ffe..93ddd00fdd6 100644
--- a/libs/auth/src/angular/registration/registration-env-selector/registration-env-selector.component.ts
+++ b/libs/auth/src/angular/registration/registration-env-selector/registration-env-selector.component.ts
@@ -26,7 +26,6 @@ import { SelfHostedEnvConfigDialogComponent } from "../../self-hosted-env-config
  * Outputs the selected region to the parent component so it can respond as necessary.
  */
 @Component({
-  standalone: true,
   selector: "auth-registration-env-selector",
   templateUrl: "registration-env-selector.component.html",
   imports: [CommonModule, JslibModule, ReactiveFormsModule, FormFieldModule, SelectModule],
diff --git a/libs/auth/src/angular/registration/registration-finish/default-registration-finish.service.ts b/libs/auth/src/angular/registration/registration-finish/default-registration-finish.service.ts
index 5510cbe9f30..b116a62dd4d 100644
--- a/libs/auth/src/angular/registration/registration-finish/default-registration-finish.service.ts
+++ b/libs/auth/src/angular/registration/registration-finish/default-registration-finish.service.ts
@@ -25,6 +25,10 @@ export class DefaultRegistrationFinishService implements RegistrationFinishServi
     return null;
   }
 
+  determineLoginSuccessRoute(): Promise<string> {
+    return Promise.resolve("/vault");
+  }
+
   async finishRegistration(
     email: string,
     passwordInputResult: PasswordInputResult,
diff --git a/libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts b/libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts
index 353e3772c41..1d1a2d8f892 100644
--- a/libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts
+++ b/libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts
@@ -10,20 +10,21 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/mod
 import { AccountApiService } from "@bitwarden/common/auth/abstractions/account-api.service";
 import { RegisterVerificationEmailClickedRequest } from "@bitwarden/common/auth/models/request/registration/register-verification-email-clicked.request";
 import { HttpStatusCode } from "@bitwarden/common/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
-import { ToastService } from "@bitwarden/components";
+import { AnonLayoutWrapperDataService, ToastService } from "@bitwarden/components";
 
 import {
   LoginStrategyServiceAbstraction,
   LoginSuccessHandlerService,
   PasswordLoginCredentials,
 } from "../../../common";
-import { AnonLayoutWrapperDataService } from "../../anon-layout/anon-layout-wrapper-data.service";
 import {
   InputPasswordComponent,
   InputPasswordFlow,
@@ -33,7 +34,6 @@ import { PasswordInputResult } from "../../input-password/password-input-result"
 import { RegistrationFinishService } from "./registration-finish.service";
 
 @Component({
-  standalone: true,
   selector: "auth-registration-finish",
   templateUrl: "./registration-finish.component.html",
   imports: [CommonModule, JslibModule, RouterModule, InputPasswordComponent],
@@ -41,7 +41,7 @@ import { RegistrationFinishService } from "./registration-finish.service";
 export class RegistrationFinishComponent implements OnInit, OnDestroy {
   private destroy$ = new Subject<void>();
 
-  inputPasswordFlow = InputPasswordFlow.AccountRegistration;
+  inputPasswordFlow = InputPasswordFlow.SetInitialPasswordAccountRegistration;
   loading = true;
   submitting = false;
   email: string;
@@ -79,6 +79,7 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
     private logService: LogService,
     private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
     private loginSuccessHandlerService: LoginSuccessHandlerService,
+    private configService: ConfigService,
   ) {}
 
   async ngOnInit() {
@@ -188,15 +189,23 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
         return;
       }
 
-      this.toastService.showToast({
-        variant: "success",
-        title: null,
-        message: this.i18nService.t("youHaveBeenLoggedIn"),
-      });
+      const endUserActivationFlagEnabled = await this.configService.getFeatureFlag(
+        FeatureFlag.PM19315EndUserActivationMvp,
+      );
+
+      if (!endUserActivationFlagEnabled) {
+        // Only show the toast when the end user activation feature flag is _not_ enabled
+        this.toastService.showToast({
+          variant: "success",
+          title: null,
+          message: this.i18nService.t("youHaveBeenLoggedIn"),
+        });
+      }
 
       await this.loginSuccessHandlerService.run(authenticationResult.userId);
 
-      await this.router.navigate(["/vault"]);
+      const successRoute = await this.registrationFinishService.determineLoginSuccessRoute();
+      await this.router.navigate([successRoute]);
     } catch (e) {
       // If login errors, redirect to login page per product. Don't show error
       this.logService.error("Error logging in after registration: ", e.message);
diff --git a/libs/auth/src/angular/registration/registration-finish/registration-finish.service.ts b/libs/auth/src/angular/registration/registration-finish/registration-finish.service.ts
index 5f3c04e5155..523a4c79c54 100644
--- a/libs/auth/src/angular/registration/registration-finish/registration-finish.service.ts
+++ b/libs/auth/src/angular/registration/registration-finish/registration-finish.service.ts
@@ -16,6 +16,11 @@ export abstract class RegistrationFinishService {
    */
   abstract getMasterPasswordPolicyOptsFromOrgInvite(): Promise<MasterPasswordPolicyOptions | null>;
 
+  /**
+   * Returns the route the user is redirected to after a successful login.
+   */
+  abstract determineLoginSuccessRoute(): Promise<string>;
+
   /**
    * Finishes the registration process by creating a new user account.
    *
diff --git a/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts b/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts
index d4ecade52fe..f98b711aeb8 100644
--- a/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts
+++ b/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts
@@ -21,7 +21,6 @@ export interface RegistrationLinkExpiredComponentData {
 }
 
 @Component({
-  standalone: true,
   selector: "auth-registration-link-expired",
   templateUrl: "./registration-link-expired.component.html",
   imports: [CommonModule, JslibModule, RouterModule, IconModule, ButtonModule],
diff --git a/libs/auth/src/angular/registration/registration-start/registration-start-secondary.component.ts b/libs/auth/src/angular/registration/registration-start/registration-start-secondary.component.ts
index bc873593a83..f30dc8a3822 100644
--- a/libs/auth/src/angular/registration/registration-start/registration-start-secondary.component.ts
+++ b/libs/auth/src/angular/registration/registration-start/registration-start-secondary.component.ts
@@ -19,7 +19,6 @@ export interface RegistrationStartSecondaryComponentData {
 }
 
 @Component({
-  standalone: true,
   selector: "auth-registration-start-secondary",
   templateUrl: "./registration-start-secondary.component.html",
   imports: [CommonModule, JslibModule, RouterModule, LinkModule],
diff --git a/libs/auth/src/angular/registration/registration-start/registration-start.component.ts b/libs/auth/src/angular/registration/registration-start/registration-start.component.ts
index ea756c967c6..2545f86f665 100644
--- a/libs/auth/src/angular/registration/registration-start/registration-start.component.ts
+++ b/libs/auth/src/angular/registration/registration-start/registration-start.component.ts
@@ -14,18 +14,18 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import {
+  AnonLayoutWrapperDataService,
   AsyncActionsModule,
   ButtonModule,
   CheckboxModule,
   FormFieldModule,
+  Icons,
   IconModule,
   LinkModule,
 } from "@bitwarden/components";
 
 import { LoginEmailService } from "../../../common";
-import { AnonLayoutWrapperDataService } from "../../anon-layout/anon-layout-wrapper-data.service";
 import { RegistrationUserAddIcon } from "../../icons";
-import { RegistrationCheckEmailIcon } from "../../icons/registration-check-email.icon";
 import { RegistrationEnvSelectorComponent } from "../registration-env-selector/registration-env-selector.component";
 
 // FIXME: update to use a const object instead of a typescript enum
@@ -42,7 +42,6 @@ const DEFAULT_MARKETING_EMAILS_PREF_BY_REGION: Record<Region, boolean> = {
 };
 
 @Component({
-  standalone: true,
   selector: "auth-registration-start",
   templateUrl: "./registration-start.component.html",
   imports: [
@@ -171,7 +170,7 @@ export class RegistrationStartComponent implements OnInit, OnDestroy {
       pageTitle: {
         key: "checkYourEmail",
       },
-      pageIcon: RegistrationCheckEmailIcon,
+      pageIcon: Icons.RegistrationCheckEmailIcon,
     });
     this.registrationStartStateChange.emit(this.state);
   };
diff --git a/libs/auth/src/angular/registration/registration-start/registration-start.stories.ts b/libs/auth/src/angular/registration/registration-start/registration-start.stories.ts
index e54e59a988a..d0f0343960a 100644
--- a/libs/auth/src/angular/registration/registration-start/registration-start.stories.ts
+++ b/libs/auth/src/angular/registration/registration-start/registration-start.stories.ts
@@ -18,6 +18,8 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import {
+  AnonLayoutWrapperData,
+  AnonLayoutWrapperDataService,
   AsyncActionsModule,
   ButtonModule,
   DialogModule,
@@ -34,8 +36,6 @@ import {
 // eslint-disable-next-line import/no-restricted-paths, no-restricted-imports
 import { PreloadedEnglishI18nModule } from "../../../../../../apps/web/src/app/core/tests";
 import { LoginEmailService } from "../../../common";
-import { AnonLayoutWrapperDataService } from "../../anon-layout/anon-layout-wrapper-data.service";
-import { AnonLayoutWrapperData } from "../../anon-layout/anon-layout-wrapper.component";
 
 import { RegistrationStartComponent } from "./registration-start.component";
 
diff --git a/libs/auth/src/angular/self-hosted-env-config-dialog/self-hosted-env-config-dialog.component.ts b/libs/auth/src/angular/self-hosted-env-config-dialog/self-hosted-env-config-dialog.component.ts
index 189c669423d..a7ffca9163c 100644
--- a/libs/auth/src/angular/self-hosted-env-config-dialog/self-hosted-env-config-dialog.component.ts
+++ b/libs/auth/src/angular/self-hosted-env-config-dialog/self-hosted-env-config-dialog.component.ts
@@ -55,7 +55,6 @@ function selfHostedEnvSettingsFormValidator(): ValidatorFn {
  * Dialog for configuring self-hosted environment settings.
  */
 @Component({
-  standalone: true,
   selector: "self-hosted-env-config-dialog",
   templateUrl: "self-hosted-env-config-dialog.component.html",
   imports: [
diff --git a/libs/auth/src/angular/set-password-jit/default-set-password-jit.service.spec.ts b/libs/auth/src/angular/set-password-jit/default-set-password-jit.service.spec.ts
index 95d54d589bc..2fd01f79ca9 100644
--- a/libs/auth/src/angular/set-password-jit/default-set-password-jit.service.spec.ts
+++ b/libs/auth/src/angular/set-password-jit/default-set-password-jit.service.spec.ts
@@ -8,7 +8,6 @@ import {
   FakeUserDecryptionOptions as UserDecryptionOptions,
   InternalUserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationKeysResponse } from "@bitwarden/common/admin-console/models/response/organization-keys.response";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
@@ -33,7 +32,6 @@ import { SetPasswordCredentials } from "./set-password-jit.service.abstraction";
 describe("DefaultSetPasswordJitService", () => {
   let sut: DefaultSetPasswordJitService;
 
-  let apiService: MockProxy<ApiService>;
   let masterPasswordApiService: MockProxy<MasterPasswordApiService>;
   let keyService: MockProxy<KeyService>;
   let encryptService: MockProxy<EncryptService>;
@@ -45,7 +43,6 @@ describe("DefaultSetPasswordJitService", () => {
   let userDecryptionOptionsService: MockProxy<InternalUserDecryptionOptionsServiceAbstraction>;
 
   beforeEach(() => {
-    apiService = mock<ApiService>();
     masterPasswordApiService = mock<MasterPasswordApiService>();
     keyService = mock<KeyService>();
     encryptService = mock<EncryptService>();
@@ -57,12 +54,11 @@ describe("DefaultSetPasswordJitService", () => {
     userDecryptionOptionsService = mock<InternalUserDecryptionOptionsServiceAbstraction>();
 
     sut = new DefaultSetPasswordJitService(
-      apiService,
-      masterPasswordApiService,
-      keyService,
       encryptService,
       i18nService,
       kdfConfigService,
+      keyService,
+      masterPasswordApiService,
       masterPasswordService,
       organizationApiService,
       organizationUserApiService,
@@ -122,7 +118,11 @@ describe("DefaultSetPasswordJitService", () => {
       };
 
       credentials = {
-        ...passwordInputResult,
+        newMasterKey: passwordInputResult.newMasterKey,
+        newServerMasterKeyHash: passwordInputResult.newServerMasterKeyHash,
+        newLocalMasterKeyHash: passwordInputResult.newLocalMasterKeyHash,
+        newPasswordHint: passwordInputResult.newPasswordHint,
+        kdfConfig: passwordInputResult.kdfConfig,
         orgSsoIdentifier,
         orgId,
         resetPasswordAutoEnroll,
diff --git a/libs/auth/src/angular/set-password-jit/default-set-password-jit.service.ts b/libs/auth/src/angular/set-password-jit/default-set-password-jit.service.ts
index ec274b9c4af..7d228fccb9b 100644
--- a/libs/auth/src/angular/set-password-jit/default-set-password-jit.service.ts
+++ b/libs/auth/src/angular/set-password-jit/default-set-password-jit.service.ts
@@ -9,7 +9,6 @@ import {
   OrganizationUserResetPasswordEnrollmentRequest,
 } from "@bitwarden/admin-console/common";
 import { InternalUserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
@@ -31,12 +30,11 @@ import {
 
 export class DefaultSetPasswordJitService implements SetPasswordJitService {
   constructor(
-    protected apiService: ApiService,
-    protected masterPasswordApiService: MasterPasswordApiService,
-    protected keyService: KeyService,
     protected encryptService: EncryptService,
     protected i18nService: I18nService,
     protected kdfConfigService: KdfConfigService,
+    protected keyService: KeyService,
+    protected masterPasswordApiService: MasterPasswordApiService,
     protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
     protected organizationApiService: OrganizationApiServiceAbstraction,
     protected organizationUserApiService: OrganizationUserApiService,
diff --git a/libs/auth/src/angular/set-password-jit/set-password-jit.component.ts b/libs/auth/src/angular/set-password-jit/set-password-jit.component.ts
index a28ffdbb343..1a2674cd3d4 100644
--- a/libs/auth/src/angular/set-password-jit/set-password-jit.component.ts
+++ b/libs/auth/src/angular/set-password-jit/set-password-jit.component.ts
@@ -30,7 +30,6 @@ import {
 } from "./set-password-jit.service.abstraction";
 
 @Component({
-  standalone: true,
   selector: "auth-set-password-jit",
   templateUrl: "set-password-jit.component.html",
   imports: [CommonModule, InputPasswordComponent, JslibModule],
@@ -98,7 +97,11 @@ export class SetPasswordJitComponent implements OnInit {
     this.submitting = true;
 
     const credentials: SetPasswordCredentials = {
-      ...passwordInputResult,
+      newMasterKey: passwordInputResult.newMasterKey,
+      newServerMasterKeyHash: passwordInputResult.newServerMasterKeyHash,
+      newLocalMasterKeyHash: passwordInputResult.newLocalMasterKeyHash,
+      newPasswordHint: passwordInputResult.newPasswordHint,
+      kdfConfig: passwordInputResult.kdfConfig,
       orgSsoIdentifier: this.orgSsoIdentifier,
       orgId: this.orgId,
       resetPasswordAutoEnroll: this.resetPasswordAutoEnroll,
diff --git a/libs/auth/src/angular/sso/sso.component.ts b/libs/auth/src/angular/sso/sso.component.ts
index f5a138af584..07b59ac661f 100644
--- a/libs/auth/src/angular/sso/sso.component.ts
+++ b/libs/auth/src/angular/sso/sso.component.ts
@@ -23,10 +23,12 @@ import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
 import { SsoPreValidateResponse } from "@bitwarden/common/auth/models/response/sso-pre-validate.response";
 import { ClientType, HttpStatusCode } from "@bitwarden/common/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -62,7 +64,6 @@ interface QueryParams {
  * This component handles the SSO flow.
  */
 @Component({
-  standalone: true,
   templateUrl: "sso.component.html",
   imports: [
     AsyncActionsModule,
@@ -117,6 +118,7 @@ export class SsoComponent implements OnInit {
     private toastService: ToastService,
     private ssoComponentService: SsoComponentService,
     private loginSuccessHandlerService: LoginSuccessHandlerService,
+    private configService: ConfigService,
   ) {
     environmentService.environment$.pipe(takeUntilDestroyed()).subscribe((env) => {
       this.redirectUri = env.getWebVaultUrl() + "/sso-connector.html";
@@ -532,7 +534,12 @@ export class SsoComponent implements OnInit {
   }
 
   private async handleChangePasswordRequired(orgIdentifier: string) {
-    await this.router.navigate(["set-password-jit"], {
+    const isSetInitialPasswordRefactorFlagOn = await this.configService.getFeatureFlag(
+      FeatureFlag.PM16117_SetInitialPasswordRefactor,
+    );
+    const route = isSetInitialPasswordRefactorFlagOn ? "set-initial-password" : "set-password-jit";
+
+    await this.router.navigate([route], {
       queryParams: {
         identifier: orgIdentifier,
       },
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/index.ts b/libs/auth/src/angular/two-factor-auth/child-components/index.ts
index 429da3f14b3..d48cb8a6921 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/index.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/index.ts
@@ -1,3 +1,2 @@
-export * from "./two-factor-auth-email";
 export * from "./two-factor-auth-duo";
 export * from "./two-factor-auth-webauthn";
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator.component.html b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator/two-factor-auth-authenticator.component.html
similarity index 100%
rename from libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator.component.html
rename to libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator/two-factor-auth-authenticator.component.html
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator.component.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator/two-factor-auth-authenticator.component.ts
similarity index 98%
rename from libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator.component.ts
rename to libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator/two-factor-auth-authenticator.component.ts
index cd4df5aee68..c53bffe2496 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-authenticator/two-factor-auth-authenticator.component.ts
@@ -15,7 +15,6 @@ import {
 } from "@bitwarden/components";
 
 @Component({
-  standalone: true,
   selector: "app-two-factor-auth-authenticator",
   templateUrl: "two-factor-auth-authenticator.component.html",
   imports: [
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-duo/two-factor-auth-duo.component.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-duo/two-factor-auth-duo.component.ts
index 22d3906bb48..5ad70d3792d 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-duo/two-factor-auth-duo.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-duo/two-factor-auth-duo.component.ts
@@ -26,7 +26,6 @@ import {
 } from "./two-factor-auth-duo-component.service";
 
 @Component({
-  standalone: true,
   selector: "app-two-factor-auth-duo",
   template: "",
   imports: [
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/default-two-factor-auth-email-component.service.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/default-two-factor-auth-email-component.service.ts
deleted file mode 100644
index caae13acc38..00000000000
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/default-two-factor-auth-email-component.service.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { TwoFactorAuthEmailComponentService } from "./two-factor-auth-email-component.service";
-
-export class DefaultTwoFactorAuthEmailComponentService
-  implements TwoFactorAuthEmailComponentService {
-  // no default implementation
-}
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/index.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/index.ts
deleted file mode 100644
index 91f11b0b7dd..00000000000
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./default-two-factor-auth-email-component.service";
-export * from "./two-factor-auth-email-component.service";
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-component-email-cache.service.spec.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-component-email-cache.service.spec.ts
deleted file mode 100644
index d2d86710b72..00000000000
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-component-email-cache.service.spec.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-import { TestBed } from "@angular/core/testing";
-import { mock, MockProxy } from "jest-mock-extended";
-import { BehaviorSubject } from "rxjs";
-
-import { ViewCacheService } from "@bitwarden/angular/platform/view-cache";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-
-import {
-  TwoFactorAuthEmailComponentCache,
-  TwoFactorAuthEmailComponentCacheService,
-} from "./two-factor-auth-email-component-cache.service";
-
-describe("TwoFactorAuthEmailCache", () => {
-  describe("fromJSON", () => {
-    it("returns null when input is null", () => {
-      const result = TwoFactorAuthEmailComponentCache.fromJSON(null as any);
-      expect(result).toBeNull();
-    });
-
-    it("creates a TwoFactorAuthEmailCache instance from valid JSON", () => {
-      const jsonData = { emailSent: true };
-      const result = TwoFactorAuthEmailComponentCache.fromJSON(jsonData);
-
-      expect(result).not.toBeNull();
-      expect(result).toBeInstanceOf(TwoFactorAuthEmailComponentCache);
-      expect(result?.emailSent).toBe(true);
-    });
-  });
-});
-
-describe("TwoFactorAuthEmailComponentCacheService", () => {
-  let service: TwoFactorAuthEmailComponentCacheService;
-  let mockViewCacheService: MockProxy<ViewCacheService>;
-  let mockConfigService: MockProxy<ConfigService>;
-  let cacheData: BehaviorSubject<TwoFactorAuthEmailComponentCache | null>;
-  let mockSignal: any;
-
-  beforeEach(() => {
-    mockViewCacheService = mock<ViewCacheService>();
-    mockConfigService = mock<ConfigService>();
-    cacheData = new BehaviorSubject<TwoFactorAuthEmailComponentCache | null>(null);
-    mockSignal = jest.fn(() => cacheData.getValue());
-    mockSignal.set = jest.fn((value: TwoFactorAuthEmailComponentCache | null) =>
-      cacheData.next(value),
-    );
-    mockViewCacheService.signal.mockReturnValue(mockSignal);
-
-    TestBed.configureTestingModule({
-      providers: [
-        TwoFactorAuthEmailComponentCacheService,
-        { provide: ViewCacheService, useValue: mockViewCacheService },
-        { provide: ConfigService, useValue: mockConfigService },
-      ],
-    });
-
-    service = TestBed.inject(TwoFactorAuthEmailComponentCacheService);
-  });
-
-  it("creates the service", () => {
-    expect(service).toBeTruthy();
-  });
-
-  describe("init", () => {
-    it("sets featureEnabled to true when flag is enabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-
-      await service.init();
-
-      expect(mockConfigService.getFeatureFlag).toHaveBeenCalledWith(
-        FeatureFlag.PM9115_TwoFactorExtensionDataPersistence,
-      );
-
-      service.cacheData({ emailSent: true });
-      expect(mockSignal.set).toHaveBeenCalled();
-    });
-
-    it("sets featureEnabled to false when flag is disabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-
-      await service.init();
-
-      expect(mockConfigService.getFeatureFlag).toHaveBeenCalledWith(
-        FeatureFlag.PM9115_TwoFactorExtensionDataPersistence,
-      );
-
-      service.cacheData({ emailSent: true });
-      expect(mockSignal.set).not.toHaveBeenCalled();
-    });
-  });
-
-  describe("cacheData", () => {
-    beforeEach(async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-      await service.init();
-    });
-
-    it("caches email sent state when feature is enabled", () => {
-      service.cacheData({ emailSent: true });
-
-      expect(mockSignal.set).toHaveBeenCalledWith({
-        emailSent: true,
-      });
-    });
-
-    it("does not cache data when feature is disabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-      await service.init();
-
-      service.cacheData({ emailSent: true });
-
-      expect(mockSignal.set).not.toHaveBeenCalled();
-    });
-  });
-
-  describe("clearCachedData", () => {
-    beforeEach(async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-      await service.init();
-    });
-
-    it("clears cached data when feature is enabled", () => {
-      service.clearCachedData();
-
-      expect(mockSignal.set).toHaveBeenCalledWith(null);
-    });
-
-    it("does not clear cached data when feature is disabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-      await service.init();
-
-      service.clearCachedData();
-
-      expect(mockSignal.set).not.toHaveBeenCalled();
-    });
-  });
-
-  describe("getCachedData", () => {
-    beforeEach(async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-      await service.init();
-    });
-
-    it("returns cached data when feature is enabled", () => {
-      const testData = new TwoFactorAuthEmailComponentCache();
-      testData.emailSent = true;
-      cacheData.next(testData);
-
-      const result = service.getCachedData();
-
-      expect(result).toEqual(testData);
-      expect(mockSignal).toHaveBeenCalled();
-    });
-
-    it("returns null when feature is disabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-      await service.init();
-
-      const result = service.getCachedData();
-
-      expect(result).toBeNull();
-      expect(mockSignal).not.toHaveBeenCalled();
-    });
-  });
-});
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component-cache.service.spec.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component-cache.service.spec.ts
index 36d99ee56ac..e5ab04b51ad 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component-cache.service.spec.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component-cache.service.spec.ts
@@ -3,7 +3,6 @@ import { mock, MockProxy } from "jest-mock-extended";
 import { BehaviorSubject } from "rxjs";
 
 import { ViewCacheService } from "@bitwarden/angular/platform/view-cache";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 import {
@@ -61,87 +60,26 @@ describe("TwoFactorAuthEmailComponentCacheService", () => {
     expect(service).toBeTruthy();
   });
 
-  describe("init", () => {
-    it("sets featureEnabled to true when flag is enabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-
-      await service.init();
-
-      expect(mockConfigService.getFeatureFlag).toHaveBeenCalledWith(
-        FeatureFlag.PM9115_TwoFactorExtensionDataPersistence,
-      );
-
-      service.cacheData({ emailSent: true });
-      expect(mockSignal.set).toHaveBeenCalled();
-    });
-
-    it("sets featureEnabled to false when flag is disabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-
-      await service.init();
-
-      expect(mockConfigService.getFeatureFlag).toHaveBeenCalledWith(
-        FeatureFlag.PM9115_TwoFactorExtensionDataPersistence,
-      );
-
-      service.cacheData({ emailSent: true });
-      expect(mockSignal.set).not.toHaveBeenCalled();
-    });
-  });
-
   describe("cacheData", () => {
-    beforeEach(async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-      await service.init();
-    });
-
-    it("caches email sent state when feature is enabled", () => {
+    it("caches email sent state", () => {
       service.cacheData({ emailSent: true });
 
       expect(mockSignal.set).toHaveBeenCalledWith({
         emailSent: true,
       });
     });
-
-    it("does not cache data when feature is disabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-      await service.init();
-
-      service.cacheData({ emailSent: true });
-
-      expect(mockSignal.set).not.toHaveBeenCalled();
-    });
   });
 
   describe("clearCachedData", () => {
-    beforeEach(async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-      await service.init();
-    });
-
-    it("clears cached data when feature is enabled", () => {
+    it("clears cached data", () => {
       service.clearCachedData();
 
       expect(mockSignal.set).toHaveBeenCalledWith(null);
     });
-
-    it("does not clear cached data when feature is disabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-      await service.init();
-
-      service.clearCachedData();
-
-      expect(mockSignal.set).not.toHaveBeenCalled();
-    });
   });
 
   describe("getCachedData", () => {
-    beforeEach(async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-      await service.init();
-    });
-
-    it("returns cached data when feature is enabled", () => {
+    it("returns cached data", () => {
       const testData = new TwoFactorAuthEmailComponentCache();
       testData.emailSent = true;
       cacheData.next(testData);
@@ -151,15 +89,5 @@ describe("TwoFactorAuthEmailComponentCacheService", () => {
       expect(result).toEqual(testData);
       expect(mockSignal).toHaveBeenCalled();
     });
-
-    it("returns null when feature is disabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-      await service.init();
-
-      const result = service.getCachedData();
-
-      expect(result).toBeNull();
-      expect(mockSignal).not.toHaveBeenCalled();
-    });
   });
 });
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component-cache.service.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component-cache.service.ts
index d274b8003d7..d98387e1cf5 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component-cache.service.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component-cache.service.ts
@@ -2,8 +2,6 @@ import { inject, Injectable, WritableSignal } from "@angular/core";
 import { Jsonify } from "type-fest";
 
 import { ViewCacheService } from "@bitwarden/angular/platform/view-cache";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 /**
  * The key for the email two factor auth component cache.
@@ -34,10 +32,6 @@ export class TwoFactorAuthEmailComponentCache {
 @Injectable()
 export class TwoFactorAuthEmailComponentCacheService {
   private viewCacheService: ViewCacheService = inject(ViewCacheService);
-  private configService: ConfigService = inject(ConfigService);
-
-  /** True when the feature flag is enabled */
-  private featureEnabled: boolean = false;
 
   /**
    * Signal for the cached email state.
@@ -49,23 +43,10 @@ export class TwoFactorAuthEmailComponentCacheService {
       deserializer: TwoFactorAuthEmailComponentCache.fromJSON,
     });
 
-  /**
-   * Must be called once before interacting with the cached data.
-   */
-  async init() {
-    this.featureEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.PM9115_TwoFactorExtensionDataPersistence,
-    );
-  }
-
   /**
    * Cache the email sent state.
    */
   cacheData(data: { emailSent: boolean }): void {
-    if (!this.featureEnabled) {
-      return;
-    }
-
     this.emailCache.set({
       emailSent: data.emailSent,
     } as TwoFactorAuthEmailComponentCache);
@@ -75,10 +56,6 @@ export class TwoFactorAuthEmailComponentCacheService {
    * Clear the cached email data.
    */
   clearCachedData(): void {
-    if (!this.featureEnabled) {
-      return;
-    }
-
     this.emailCache.set(null);
   }
 
@@ -86,10 +63,6 @@ export class TwoFactorAuthEmailComponentCacheService {
    * Get whether the email has been sent.
    */
   getCachedData(): TwoFactorAuthEmailComponentCache | null {
-    if (!this.featureEnabled) {
-      return null;
-    }
-
     return this.emailCache();
   }
 }
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component.service.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component.service.ts
deleted file mode 100644
index fa96b6b96c2..00000000000
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email-component.service.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * A service that manages all cross client functionality for the email 2FA component.
- */
-export abstract class TwoFactorAuthEmailComponentService {
-  /**
-   * Optionally shows a warning to the user that they might need to popout the
-   * window to complete email 2FA.
-   */
-  abstract openPopoutIfApprovedForEmail2fa?(): Promise<void>;
-}
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email.component.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email.component.ts
index 2fff77b720e..9b402f3a956 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-email/two-factor-auth-email.component.ts
@@ -25,10 +25,8 @@ import {
 } from "@bitwarden/components";
 
 import { TwoFactorAuthEmailComponentCacheService } from "./two-factor-auth-email-component-cache.service";
-import { TwoFactorAuthEmailComponentService } from "./two-factor-auth-email-component.service";
 
 @Component({
-  standalone: true,
   selector: "app-two-factor-auth-email",
   templateUrl: "two-factor-auth-email.component.html",
   imports: [
@@ -67,14 +65,10 @@ export class TwoFactorAuthEmailComponent implements OnInit {
     protected apiService: ApiService,
     protected appIdService: AppIdService,
     private toastService: ToastService,
-    private twoFactorAuthEmailComponentService: TwoFactorAuthEmailComponentService,
     private cacheService: TwoFactorAuthEmailComponentCacheService,
   ) {}
 
   async ngOnInit(): Promise<void> {
-    await this.twoFactorAuthEmailComponentService.openPopoutIfApprovedForEmail2fa?.();
-    await this.cacheService.init();
-
     // Check if email was already sent
     const cachedData = this.cacheService.getCachedData();
     if (cachedData?.emailSent) {
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-webauthn/two-factor-auth-webauthn.component.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-webauthn/two-factor-auth-webauthn.component.ts
index a8b435375db..710d5dc4de0 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-webauthn/two-factor-auth-webauthn.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-webauthn/two-factor-auth-webauthn.component.ts
@@ -33,7 +33,6 @@ export interface WebAuthnResult {
 }
 
 @Component({
-  standalone: true,
   selector: "app-two-factor-auth-webauthn",
   templateUrl: "two-factor-auth-webauthn.component.html",
   imports: [
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey.component.html b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey/two-factor-auth-yubikey.component.html
similarity index 100%
rename from libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey.component.html
rename to libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey/two-factor-auth-yubikey.component.html
diff --git a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey.component.ts b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey/two-factor-auth-yubikey.component.ts
similarity index 98%
rename from libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey.component.ts
rename to libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey/two-factor-auth-yubikey.component.ts
index abcbd557e0f..7218bee056c 100644
--- a/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/child-components/two-factor-auth-yubikey/two-factor-auth-yubikey.component.ts
@@ -15,7 +15,6 @@ import {
 } from "@bitwarden/components";
 
 @Component({
-  standalone: true,
   selector: "app-two-factor-auth-yubikey",
   templateUrl: "two-factor-auth-yubikey.component.html",
   imports: [
diff --git a/libs/auth/src/angular/two-factor-auth/default-two-factor-auth-component.service.ts b/libs/auth/src/angular/two-factor-auth/default-two-factor-auth-component.service.ts
index f68c1d34515..1ce0cba5afb 100644
--- a/libs/auth/src/angular/two-factor-auth/default-two-factor-auth-component.service.ts
+++ b/libs/auth/src/angular/two-factor-auth/default-two-factor-auth-component.service.ts
@@ -1,6 +1,5 @@
 import {
   DuoLaunchAction,
-  LegacyKeyMigrationAction,
   TwoFactorAuthComponentService,
 } from "./two-factor-auth-component.service";
 
@@ -9,10 +8,6 @@ export class DefaultTwoFactorAuthComponentService implements TwoFactorAuthCompon
     return false;
   }
 
-  determineLegacyKeyMigrationAction() {
-    return LegacyKeyMigrationAction.PREVENT_LOGIN_AND_SHOW_REQUIRE_MIGRATION_WARNING;
-  }
-
   determineDuoLaunchAction(): DuoLaunchAction {
     return DuoLaunchAction.DIRECT_LAUNCH;
   }
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-auth-component-cache.service.spec.ts b/libs/auth/src/angular/two-factor-auth/two-factor-auth-component-cache.service.spec.ts
index 5b5d486556b..24cd18d43e5 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-auth-component-cache.service.spec.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-auth-component-cache.service.spec.ts
@@ -4,8 +4,6 @@ import { BehaviorSubject } from "rxjs";
 
 import { ViewCacheService } from "@bitwarden/angular/platform/view-cache";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 import {
   TwoFactorAuthComponentCache,
@@ -40,13 +38,11 @@ describe("TwoFactorAuthCache", () => {
 describe("TwoFactorAuthComponentCacheService", () => {
   let service: TwoFactorAuthComponentCacheService;
   let mockViewCacheService: MockProxy<ViewCacheService>;
-  let mockConfigService: MockProxy<ConfigService>;
   let cacheData: BehaviorSubject<TwoFactorAuthComponentCache | null>;
   let mockSignal: any;
 
   beforeEach(() => {
     mockViewCacheService = mock<ViewCacheService>();
-    mockConfigService = mock<ConfigService>();
     cacheData = new BehaviorSubject<TwoFactorAuthComponentCache | null>(null);
     mockSignal = jest.fn(() => cacheData.getValue());
     mockSignal.set = jest.fn((value: TwoFactorAuthComponentCache | null) => cacheData.next(value));
@@ -56,7 +52,6 @@ describe("TwoFactorAuthComponentCacheService", () => {
       providers: [
         TwoFactorAuthComponentCacheService,
         { provide: ViewCacheService, useValue: mockViewCacheService },
-        { provide: ConfigService, useValue: mockConfigService },
       ],
     });
 
@@ -67,41 +62,8 @@ describe("TwoFactorAuthComponentCacheService", () => {
     expect(service).toBeTruthy();
   });
 
-  describe("init", () => {
-    it("sets featureEnabled to true when flag is enabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-
-      await service.init();
-
-      expect(mockConfigService.getFeatureFlag).toHaveBeenCalledWith(
-        FeatureFlag.PM9115_TwoFactorExtensionDataPersistence,
-      );
-
-      service.cacheData({ token: "123456" });
-      expect(mockSignal.set).toHaveBeenCalled();
-    });
-
-    it("sets featureEnabled to false when flag is disabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-
-      await service.init();
-
-      expect(mockConfigService.getFeatureFlag).toHaveBeenCalledWith(
-        FeatureFlag.PM9115_TwoFactorExtensionDataPersistence,
-      );
-
-      service.cacheData({ token: "123456" });
-      expect(mockSignal.set).not.toHaveBeenCalled();
-    });
-  });
-
   describe("cacheData", () => {
-    beforeEach(async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-      await service.init();
-    });
-
-    it("caches complete data when feature is enabled", () => {
+    it("caches complete data", () => {
       const testData: TwoFactorAuthComponentData = {
         token: "123456",
         remember: true,
@@ -117,7 +79,7 @@ describe("TwoFactorAuthComponentCacheService", () => {
       });
     });
 
-    it("caches partial data when feature is enabled", () => {
+    it("caches partial data", () => {
       service.cacheData({ token: "123456" });
 
       expect(mockSignal.set).toHaveBeenCalledWith({
@@ -126,46 +88,18 @@ describe("TwoFactorAuthComponentCacheService", () => {
         selectedProviderType: undefined,
       });
     });
-
-    it("does not cache data when feature is disabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-      await service.init();
-
-      service.cacheData({ token: "123456" });
-
-      expect(mockSignal.set).not.toHaveBeenCalled();
-    });
   });
 
   describe("clearCachedData", () => {
-    beforeEach(async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-      await service.init();
-    });
-
-    it("clears cached data when feature is enabled", () => {
+    it("clears cached data", () => {
       service.clearCachedData();
 
       expect(mockSignal.set).toHaveBeenCalledWith(null);
     });
-
-    it("does not clear cached data when feature is disabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-      await service.init();
-
-      service.clearCachedData();
-
-      expect(mockSignal.set).not.toHaveBeenCalled();
-    });
   });
 
   describe("getCachedData", () => {
-    beforeEach(async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(true);
-      await service.init();
-    });
-
-    it("returns cached data when feature is enabled", () => {
+    it("returns cached data", () => {
       const testData = new TwoFactorAuthComponentCache();
       testData.token = "123456";
       testData.remember = true;
@@ -177,15 +111,5 @@ describe("TwoFactorAuthComponentCacheService", () => {
       expect(result).toEqual(testData);
       expect(mockSignal).toHaveBeenCalled();
     });
-
-    it("returns null when feature is disabled", async () => {
-      mockConfigService.getFeatureFlag.mockResolvedValue(false);
-      await service.init();
-
-      const result = service.getCachedData();
-
-      expect(result).toBeNull();
-      expect(mockSignal).not.toHaveBeenCalled();
-    });
   });
 });
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-auth-component-cache.service.ts b/libs/auth/src/angular/two-factor-auth/two-factor-auth-component-cache.service.ts
index 2d9fcaa5633..33aa76680e4 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-auth-component-cache.service.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-auth-component-cache.service.ts
@@ -3,8 +3,6 @@ import { Jsonify } from "type-fest";
 
 import { ViewCacheService } from "@bitwarden/angular/platform/view-cache";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 const TWO_FACTOR_AUTH_COMPONENT_CACHE_KEY = "two-factor-auth-component-cache";
 
@@ -40,10 +38,6 @@ export interface TwoFactorAuthComponentData {
 @Injectable()
 export class TwoFactorAuthComponentCacheService {
   private viewCacheService: ViewCacheService = inject(ViewCacheService);
-  private configService: ConfigService = inject(ConfigService);
-
-  /** True when the `PM9115_TwoFactorExtensionDataPersistence` flag is enabled */
-  private featureEnabled: boolean = false;
 
   /**
    * Signal for the cached TwoFactorAuthData.
@@ -57,23 +51,10 @@ export class TwoFactorAuthComponentCacheService {
 
   constructor() {}
 
-  /**
-   * Must be called once before interacting with the cached data.
-   */
-  async init() {
-    this.featureEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.PM9115_TwoFactorExtensionDataPersistence,
-    );
-  }
-
   /**
    * Update the cache with the new TwoFactorAuthData.
    */
   cacheData(data: TwoFactorAuthComponentData): void {
-    if (!this.featureEnabled) {
-      return;
-    }
-
     this.twoFactorAuthComponentCache.set({
       token: data.token,
       remember: data.remember,
@@ -85,10 +66,6 @@ export class TwoFactorAuthComponentCacheService {
    * Clears the cached TwoFactorAuthData.
    */
   clearCachedData(): void {
-    if (!this.featureEnabled) {
-      return;
-    }
-
     this.twoFactorAuthComponentCache.set(null);
   }
 
@@ -96,10 +73,6 @@ export class TwoFactorAuthComponentCacheService {
    * Returns the cached TwoFactorAuthData (when available).
    */
   getCachedData(): TwoFactorAuthComponentCache | null {
-    if (!this.featureEnabled) {
-      return null;
-    }
-
     return this.twoFactorAuthComponentCache();
   }
 }
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-auth-component.service.ts b/libs/auth/src/angular/two-factor-auth/two-factor-auth-component.service.ts
index c99722fb8e4..2d2cdba3a10 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-auth-component.service.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-auth-component.service.ts
@@ -1,12 +1,5 @@
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum LegacyKeyMigrationAction {
-  PREVENT_LOGIN_AND_SHOW_REQUIRE_MIGRATION_WARNING,
-  NAVIGATE_TO_MIGRATION_COMPONENT,
-}
-
 // FIXME: update to use a const object instead of a typescript enum
 // eslint-disable-next-line @bitwarden/platform/no-enums
 export enum DuoLaunchAction {
@@ -38,18 +31,6 @@ export abstract class TwoFactorAuthComponentService {
    */
   abstract removePopupWidthExtension?(): void;
 
-  /**
-   * We used to use the user's master key to encrypt their data. We deprecated that approach
-   * and now use a user key. This method should be called if we detect that the user
-   * is still using the old master key encryption scheme (server sends down a flag to
-   * indicate this). This method then determines what action to take based on the client.
-   *
-   * We have two possible actions:
-   * 1. Prevent the user from logging in and show a warning that they need to migrate their key on the web client today.
-   * 2. Navigate the user to the key migration component on the web client.
-   */
-  abstract determineLegacyKeyMigrationAction(): LegacyKeyMigrationAction;
-
   /**
    * Optionally closes any single action popouts (extension only).
    * @returns true if we are in a single action popout and it was closed, false otherwise.
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.spec.ts b/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.spec.ts
index a2769e37c87..e7678102360 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.spec.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.spec.ts
@@ -27,6 +27,7 @@ import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/ide
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { FakeMasterPasswordService } from "@bitwarden/common/key-management/master-password/services/fake-master-password.service";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -36,15 +37,13 @@ import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/sp
 import { UserId } from "@bitwarden/common/types/guid";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
-import { DialogService, ToastService } from "@bitwarden/components";
-
-import { AnonLayoutWrapperDataService } from "../anon-layout/anon-layout-wrapper-data.service";
+import { DialogService, ToastService, AnonLayoutWrapperDataService } from "@bitwarden/components";
 
 import { TwoFactorAuthComponentCacheService } from "./two-factor-auth-component-cache.service";
 import { TwoFactorAuthComponentService } from "./two-factor-auth-component.service";
 import { TwoFactorAuthComponent } from "./two-factor-auth.component";
 
-@Component({})
+@Component({ standalone: false })
 class TestTwoFactorComponent extends TwoFactorAuthComponent {}
 
 describe("TwoFactorAuthComponent", () => {
@@ -77,6 +76,7 @@ describe("TwoFactorAuthComponent", () => {
   let mockLoginSuccessHandlerService: MockProxy<LoginSuccessHandlerService>;
   let mockTwoFactorAuthCompCacheService: MockProxy<TwoFactorAuthComponentCacheService>;
   let mockAuthService: MockProxy<AuthService>;
+  let mockConfigService: MockProxy<ConfigService>;
 
   let mockUserDecryptionOpts: {
     noMasterPassword: UserDecryptionOptions;
@@ -112,6 +112,7 @@ describe("TwoFactorAuthComponent", () => {
     mockToastService = mock<ToastService>();
     mockTwoFactorAuthCompService = mock<TwoFactorAuthComponentService>();
     mockAuthService = mock<AuthService>();
+    mockConfigService = mock<ConfigService>();
 
     mockEnvService = mock<EnvironmentService>();
     mockLoginSuccessHandlerService = mock<LoginSuccessHandlerService>();
@@ -120,7 +121,6 @@ describe("TwoFactorAuthComponent", () => {
 
     mockTwoFactorAuthCompCacheService = mock<TwoFactorAuthComponentCacheService>();
     mockTwoFactorAuthCompCacheService.getCachedData.mockReturnValue(null);
-    mockTwoFactorAuthCompCacheService.init.mockResolvedValue();
 
     mockUserDecryptionOpts = {
       noMasterPassword: new UserDecryptionOptions({
@@ -211,6 +211,7 @@ describe("TwoFactorAuthComponent", () => {
           useValue: mockTwoFactorAuthCompCacheService,
         },
         { provide: AuthService, useValue: mockAuthService },
+        { provide: ConfigService, useValue: mockConfigService },
       ],
     });
 
@@ -227,22 +228,6 @@ describe("TwoFactorAuthComponent", () => {
     expect(component).toBeTruthy();
   });
 
-  // Shared tests
-  const testChangePasswordOnSuccessfulLogin = () => {
-    it("navigates to the component's defined change password route when user doesn't have a MP and key connector isn't enabled", async () => {
-      // Act
-      await component.submit("testToken");
-
-      // Assert
-      expect(mockRouter.navigate).toHaveBeenCalledTimes(1);
-      expect(mockRouter.navigate).toHaveBeenCalledWith(["set-password"], {
-        queryParams: {
-          identifier: component.orgSsoIdentifier,
-        },
-      });
-    });
-  };
-
   describe("Standard 2FA scenarios", () => {
     describe("submit", () => {
       const token = "testToken";
@@ -282,20 +267,76 @@ describe("TwoFactorAuthComponent", () => {
             selectedUserDecryptionOptions.next(mockUserDecryptionOpts.noMasterPassword);
           });
 
-          testChangePasswordOnSuccessfulLogin();
+          describe("Given the PM16117_SetInitialPasswordRefactor feature flag is ON", () => {
+            it("navigates to the /set-initial-password route when user doesn't have a MP and key connector isn't enabled", async () => {
+              // Arrange
+              mockConfigService.getFeatureFlag.mockResolvedValue(true);
+
+              // Act
+              await component.submit("testToken");
+
+              // Assert
+              expect(mockRouter.navigate).toHaveBeenCalledTimes(1);
+              expect(mockRouter.navigate).toHaveBeenCalledWith(["set-initial-password"], {
+                queryParams: {
+                  identifier: component.orgSsoIdentifier,
+                },
+              });
+            });
+          });
+
+          describe("Given the PM16117_SetInitialPasswordRefactor feature flag is OFF", () => {
+            it("navigates to the /set-password route when user doesn't have a MP and key connector isn't enabled", async () => {
+              // Arrange
+              mockConfigService.getFeatureFlag.mockResolvedValue(false);
+
+              // Act
+              await component.submit("testToken");
+
+              // Assert
+              expect(mockRouter.navigate).toHaveBeenCalledTimes(1);
+              expect(mockRouter.navigate).toHaveBeenCalledWith(["set-password"], {
+                queryParams: {
+                  identifier: component.orgSsoIdentifier,
+                },
+              });
+            });
+          });
         });
 
-        it("does not navigate to the change password route when the user has key connector even if user has no master password", async () => {
-          selectedUserDecryptionOptions.next(
-            mockUserDecryptionOpts.noMasterPasswordWithKeyConnector,
-          );
+        describe("Given the PM16117_SetInitialPasswordRefactor feature flag is ON", () => {
+          it("does not navigate to the /set-initial-password route when the user has key connector even if user has no master password", async () => {
+            mockConfigService.getFeatureFlag.mockResolvedValue(true);
 
-          await component.submit(token, remember);
+            selectedUserDecryptionOptions.next(
+              mockUserDecryptionOpts.noMasterPasswordWithKeyConnector,
+            );
 
-          expect(mockRouter.navigate).not.toHaveBeenCalledWith(["set-password"], {
-            queryParams: {
-              identifier: component.orgSsoIdentifier,
-            },
+            await component.submit(token, remember);
+
+            expect(mockRouter.navigate).not.toHaveBeenCalledWith(["set-initial-password"], {
+              queryParams: {
+                identifier: component.orgSsoIdentifier,
+              },
+            });
+          });
+        });
+
+        describe("Given the PM16117_SetInitialPasswordRefactor feature flag is OFF", () => {
+          it("does not navigate to the /set-password route when the user has key connector even if user has no master password", async () => {
+            mockConfigService.getFeatureFlag.mockResolvedValue(false);
+
+            selectedUserDecryptionOptions.next(
+              mockUserDecryptionOpts.noMasterPasswordWithKeyConnector,
+            );
+
+            await component.submit(token, remember);
+
+            expect(mockRouter.navigate).not.toHaveBeenCalledWith(["set-password"], {
+              queryParams: {
+                identifier: component.orgSsoIdentifier,
+              },
+            });
           });
         });
       });
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts b/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts
index 57637fe9118..50cc2d88d6a 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts
@@ -32,7 +32,9 @@ import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-p
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
 import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -41,6 +43,7 @@ import { UserId } from "@bitwarden/common/types/guid";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import {
+  AnonLayoutWrapperDataService,
   AsyncActionsModule,
   ButtonModule,
   CheckboxModule,
@@ -49,7 +52,6 @@ import {
   ToastService,
 } from "@bitwarden/components";
 
-import { AnonLayoutWrapperDataService } from "../anon-layout/anon-layout-wrapper-data.service";
 import {
   TwoFactorAuthAuthenticatorIcon,
   TwoFactorAuthEmailIcon,
@@ -58,18 +60,17 @@ import {
   TwoFactorAuthDuoIcon,
 } from "../icons/two-factor-auth";
 
-import { TwoFactorAuthAuthenticatorComponent } from "./child-components/two-factor-auth-authenticator.component";
+import { TwoFactorAuthAuthenticatorComponent } from "./child-components/two-factor-auth-authenticator/two-factor-auth-authenticator.component";
 import { TwoFactorAuthDuoComponent } from "./child-components/two-factor-auth-duo/two-factor-auth-duo.component";
 import { TwoFactorAuthEmailComponent } from "./child-components/two-factor-auth-email/two-factor-auth-email.component";
 import { TwoFactorAuthWebAuthnComponent } from "./child-components/two-factor-auth-webauthn/two-factor-auth-webauthn.component";
-import { TwoFactorAuthYubikeyComponent } from "./child-components/two-factor-auth-yubikey.component";
+import { TwoFactorAuthYubikeyComponent } from "./child-components/two-factor-auth-yubikey/two-factor-auth-yubikey.component";
 import {
   TwoFactorAuthComponentCacheService,
   TwoFactorAuthComponentData,
 } from "./two-factor-auth-component-cache.service";
 import {
   DuoLaunchAction,
-  LegacyKeyMigrationAction,
   TwoFactorAuthComponentService,
 } from "./two-factor-auth-component.service";
 import {
@@ -78,7 +79,6 @@ import {
 } from "./two-factor-options.component";
 
 @Component({
-  standalone: true,
   selector: "app-two-factor-auth",
   templateUrl: "two-factor-auth.component.html",
   imports: [
@@ -171,6 +171,7 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
     private loginSuccessHandlerService: LoginSuccessHandlerService,
     private twoFactorAuthComponentCacheService: TwoFactorAuthComponentCacheService,
     private authService: AuthService,
+    private configService: ConfigService,
   ) {}
 
   async ngOnInit() {
@@ -179,9 +180,6 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
 
     this.listenForAuthnSessionTimeout();
 
-    // Initialize the cache
-    await this.twoFactorAuthComponentCacheService.init();
-
     // Load cached form data if available
     let loadedCachedProviderType = false;
     const cachedData = this.twoFactorAuthComponentCacheService.getCachedData();
@@ -267,6 +265,8 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
   private listenForAuthnSessionTimeout() {
     this.loginStrategyService.authenticationSessionTimeout$
       .pipe(takeUntilDestroyed(this.destroyRef))
+      // TODO: Fix this!
+      // eslint-disable-next-line rxjs/no-async-subscribe
       .subscribe(async (expired) => {
         if (!expired) {
           return;
@@ -388,22 +388,12 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
     if (!result.requiresEncryptionKeyMigration) {
       return false;
     }
-    // Migration is forced so prevent login via return
-    const legacyKeyMigrationAction: LegacyKeyMigrationAction =
-      this.twoFactorAuthComponentService.determineLegacyKeyMigrationAction();
 
-    switch (legacyKeyMigrationAction) {
-      case LegacyKeyMigrationAction.NAVIGATE_TO_MIGRATION_COMPONENT:
-        await this.router.navigate(["migrate-legacy-encryption"]);
-        break;
-      case LegacyKeyMigrationAction.PREVENT_LOGIN_AND_SHOW_REQUIRE_MIGRATION_WARNING:
-        this.toastService.showToast({
-          variant: "error",
-          title: this.i18nService.t("errorOccured"),
-          message: this.i18nService.t("encryptionKeyMigrationRequired"),
-        });
-        break;
-    }
+    this.toastService.showToast({
+      variant: "error",
+      title: this.i18nService.t("errorOccurred"),
+      message: this.i18nService.t("legacyEncryptionUnsupported"),
+    });
     return true;
   }
 
@@ -501,7 +491,7 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const defaultSuccessRoute = await this.determineDefaultSuccessRoute();
+    const defaultSuccessRoute = await this.determineDefaultSuccessRoute(authResult.userId);
 
     await this.router.navigate([defaultSuccessRoute], {
       queryParams: {
@@ -510,12 +500,28 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
     });
   }
 
-  private async determineDefaultSuccessRoute(): Promise<string> {
+  private async determineDefaultSuccessRoute(userId: UserId): Promise<string> {
     const activeAccountStatus = await firstValueFrom(this.authService.activeAccountStatus$);
     if (activeAccountStatus === AuthenticationStatus.Locked) {
       return "lock";
     }
 
+    // TODO: PM-22663 use the new service to handle routing.
+    if (
+      await this.configService.getFeatureFlag(FeatureFlag.PM16117_ChangeExistingPasswordRefactor)
+    ) {
+      const forceSetPasswordReason = await firstValueFrom(
+        this.masterPasswordService.forceSetPasswordReason$(userId),
+      );
+
+      if (
+        forceSetPasswordReason === ForceSetPasswordReason.WeakMasterPassword ||
+        forceSetPasswordReason === ForceSetPasswordReason.AdminForcePasswordReset
+      ) {
+        return "change-password";
+      }
+    }
+
     return "vault";
   }
 
@@ -569,7 +575,12 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
   }
 
   private async handleChangePasswordRequired(orgIdentifier: string | undefined) {
-    await this.router.navigate(["set-password"], {
+    const isSetInitialPasswordRefactorFlagOn = await this.configService.getFeatureFlag(
+      FeatureFlag.PM16117_SetInitialPasswordRefactor,
+    );
+    const route = isSetInitialPasswordRefactorFlagOn ? "set-initial-password" : "set-password";
+
+    await this.router.navigate([route], {
       queryParams: {
         identifier: orgIdentifier,
       },
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-auth.guard.spec.ts b/libs/auth/src/angular/two-factor-auth/two-factor-auth.guard.spec.ts
index 22cfe0820ef..06b998c5725 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-auth.guard.spec.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-auth.guard.spec.ts
@@ -11,7 +11,7 @@ import { LoginStrategyServiceAbstraction } from "../../common";
 
 import { TwoFactorAuthGuard } from "./two-factor-auth.guard";
 
-@Component({ template: "" })
+@Component({ template: "", standalone: true })
 export class EmptyComponent {}
 
 describe("TwoFactorAuthGuard", () => {
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-options.component.ts b/libs/auth/src/angular/two-factor-auth/two-factor-options.component.ts
index fb0d7101cad..4a5d6dfedf2 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-options.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-options.component.ts
@@ -32,7 +32,6 @@ export type TwoFactorOptionsDialogResult = {
 };
 
 @Component({
-  standalone: true,
   selector: "app-two-factor-options",
   templateUrl: "two-factor-options.component.html",
   imports: [
diff --git a/libs/auth/src/angular/user-verification/user-verification-dialog.component.ts b/libs/auth/src/angular/user-verification/user-verification-dialog.component.ts
index 8bb2f987d77..4dfb7a6a995 100644
--- a/libs/auth/src/angular/user-verification/user-verification-dialog.component.ts
+++ b/libs/auth/src/angular/user-verification/user-verification-dialog.component.ts
@@ -32,7 +32,6 @@ import { UserVerificationFormInputComponent } from "./user-verification-form-inp
 
 @Component({
   templateUrl: "user-verification-dialog.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     ReactiveFormsModule,
diff --git a/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts b/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
index 7ea191ba2f9..a14b0ef3103 100644
--- a/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
+++ b/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
@@ -56,7 +56,6 @@ import { ActiveClientVerificationOption } from "./active-client-verification-opt
       transition(":enter", [style({ opacity: 0 }), animate("100ms", style({ opacity: 1 }))]),
     ]),
   ],
-  standalone: true,
   imports: [
     CommonModule,
     ReactiveFormsModule,
diff --git a/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.ts b/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.ts
index c9f83902fe2..b5d87c60882 100644
--- a/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.ts
+++ b/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.ts
@@ -47,7 +47,6 @@ type VaultTimeoutFormValue = VaultTimeoutForm["value"];
 @Component({
   selector: "auth-vault-timeout-input",
   templateUrl: "vault-timeout-input.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, ReactiveFormsModule, FormFieldModule, SelectModule],
   providers: [
     {
diff --git a/libs/auth/src/common/abstractions/auth-request-api.service.ts b/libs/auth/src/common/abstractions/auth-request-api.service.ts
index 1b0befc0df4..6a6358fa2c2 100644
--- a/libs/auth/src/common/abstractions/auth-request-api.service.ts
+++ b/libs/auth/src/common/abstractions/auth-request-api.service.ts
@@ -1,7 +1,16 @@
 import { AuthRequest } from "@bitwarden/common/auth/models/request/auth.request";
 import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
+
+export abstract class AuthRequestApiServiceAbstraction {
+  /**
+   * Gets a list of pending auth requests based on the user. There will only be one AuthRequest per device and the
+   * AuthRequest will be the most recent pending request.
+   *
+   * @returns A promise that resolves to a list response containing auth request responses.
+   */
+  abstract getPendingAuthRequests(): Promise<ListResponse<AuthRequestResponse>>;
 
-export abstract class AuthRequestApiService {
   /**
    * Gets an auth request by its ID.
    *
diff --git a/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts b/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts
index 75bb8686163..7e480c3a69c 100644
--- a/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts
+++ b/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts
@@ -41,6 +41,18 @@ export abstract class AuthRequestServiceAbstraction {
    * @throws If `userId` is not provided.
    */
   abstract clearAdminAuthRequest: (userId: UserId) => Promise<void>;
+  /**
+   * Gets a list of standard pending auth requests for the user.
+   * @returns An observable of an array of auth request.
+   * The array will be empty if there are no pending auth requests.
+   */
+  abstract getPendingAuthRequests$(): Observable<Array<AuthRequestResponse>>;
+  /**
+   * Get the most recent AuthRequest for the logged in user
+   * @returns An observable of an auth request. If there are no auth requests
+   * the result will be null.
+   */
+  abstract getLatestPendingAuthRequest$(): Observable<AuthRequestResponse> | null;
   /**
    * Approve or deny an auth request.
    * @param approve True to approve, false to deny.
diff --git a/libs/auth/src/common/abstractions/index.ts b/libs/auth/src/common/abstractions/index.ts
index c0dc500ddb9..937b79e5ba0 100644
--- a/libs/auth/src/common/abstractions/index.ts
+++ b/libs/auth/src/common/abstractions/index.ts
@@ -6,3 +6,4 @@ export * from "./user-decryption-options.service.abstraction";
 export * from "./auth-request.service.abstraction";
 export * from "./login-approval-component.service.abstraction";
 export * from "./login-success-handler.service";
+export * from "./logout.service";
diff --git a/libs/auth/src/common/abstractions/logout.service.ts b/libs/auth/src/common/abstractions/logout.service.ts
new file mode 100644
index 00000000000..16ea3746df2
--- /dev/null
+++ b/libs/auth/src/common/abstractions/logout.service.ts
@@ -0,0 +1,19 @@
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+import { UserId } from "@bitwarden/common/types/guid";
+
+import { LogoutReason } from "../types";
+
+export interface NewActiveUser {
+  userId: UserId;
+  authenticationStatus: AuthenticationStatus;
+}
+
+export abstract class LogoutService {
+  /**
+   * Logs out the user.
+   * @param userId The user id.
+   * @param logoutReason The optional reason for logging out.
+   * @returns The new active user or undefined if there isn't a new active account.
+   */
+  abstract logout(userId: UserId, logoutReason?: LogoutReason): Promise<NewActiveUser | undefined>;
+}
diff --git a/libs/auth/src/common/login-strategies/auth-request-login.strategy.spec.ts b/libs/auth/src/common/login-strategies/auth-request-login.strategy.spec.ts
index 842dfb3f4e3..0b19fecdc4e 100644
--- a/libs/auth/src/common/login-strategies/auth-request-login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/auth-request-login.strategy.spec.ts
@@ -14,6 +14,7 @@ import {
   VaultTimeoutSettingsService,
 } from "@bitwarden/common/key-management/vault-timeout";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -55,6 +56,7 @@ describe("AuthRequestLoginStrategy", () => {
   let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
   let kdfConfigService: MockProxy<KdfConfigService>;
   let environmentService: MockProxy<EnvironmentService>;
+  let configService: MockProxy<ConfigService>;
 
   const mockUserId = Utils.newGuid() as UserId;
   let accountService: FakeAccountService;
@@ -91,6 +93,7 @@ describe("AuthRequestLoginStrategy", () => {
     vaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
     kdfConfigService = mock<KdfConfigService>();
     environmentService = mock<EnvironmentService>();
+    configService = mock<ConfigService>();
 
     accountService = mockAccountServiceWith(mockUserId);
     masterPasswordService = new FakeMasterPasswordService();
@@ -121,6 +124,7 @@ describe("AuthRequestLoginStrategy", () => {
       vaultTimeoutSettingsService,
       kdfConfigService,
       environmentService,
+      configService,
     );
 
     tokenResponse = identityTokenResponseFactory();
@@ -166,7 +170,7 @@ describe("AuthRequestLoginStrategy", () => {
       decMasterKeyHash,
       mockUserId,
     );
-    expect(keyService.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
+    expect(masterPasswordService.mock.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
       tokenResponse.key,
       mockUserId,
     );
@@ -194,7 +198,7 @@ describe("AuthRequestLoginStrategy", () => {
     expect(masterPasswordService.mock.setMasterKeyHash).not.toHaveBeenCalled();
 
     // setMasterKeyEncryptedUserKey, setUserKey, and setPrivateKey should still be called
-    expect(keyService.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
+    expect(masterPasswordService.mock.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
       tokenResponse.key,
       mockUserId,
     );
diff --git a/libs/auth/src/common/login-strategies/auth-request-login.strategy.ts b/libs/auth/src/common/login-strategies/auth-request-login.strategy.ts
index 8581ca74465..7337b6733f8 100644
--- a/libs/auth/src/common/login-strategies/auth-request-login.strategy.ts
+++ b/libs/auth/src/common/login-strategies/auth-request-login.strategy.ts
@@ -95,7 +95,9 @@ export class AuthRequestLoginStrategy extends LoginStrategy {
     const authRequestCredentials = this.cache.value.authRequestCredentials;
     // User now may or may not have a master password
     // but set the master key encrypted user key if it exists regardless
-    await this.keyService.setMasterKeyEncryptedUserKey(response.key, userId);
+    if (response.key) {
+      await this.masterPasswordService.setMasterKeyEncryptedUserKey(response.key, userId);
+    }
 
     if (authRequestCredentials.decryptedUserKey) {
       await this.keyService.setUserKey(authRequestCredentials.decryptedUserKey, userId);
diff --git a/libs/auth/src/common/login-strategies/login.strategy.spec.ts b/libs/auth/src/common/login-strategies/login.strategy.spec.ts
index a0ccba649b6..cc9cae20b5c 100644
--- a/libs/auth/src/common/login-strategies/login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/login.strategy.spec.ts
@@ -24,6 +24,7 @@ import {
   VaultTimeoutSettingsService,
 } from "@bitwarden/common/key-management/vault-timeout";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -123,6 +124,7 @@ describe("LoginStrategy", () => {
   let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
   let kdfConfigService: MockProxy<KdfConfigService>;
   let environmentService: MockProxy<EnvironmentService>;
+  let configService: MockProxy<ConfigService>;
 
   let passwordLoginStrategy: PasswordLoginStrategy;
   let credentials: PasswordLoginCredentials;
@@ -148,6 +150,7 @@ describe("LoginStrategy", () => {
     passwordStrengthService = mock<PasswordStrengthService>();
     billingAccountProfileStateService = mock<BillingAccountProfileStateService>();
     environmentService = mock<EnvironmentService>();
+    configService = mock<ConfigService>();
 
     vaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
 
@@ -177,6 +180,7 @@ describe("LoginStrategy", () => {
       vaultTimeoutSettingsService,
       kdfConfigService,
       environmentService,
+      configService,
     );
     credentials = new PasswordLoginCredentials(email, masterPassword);
   });
@@ -491,6 +495,7 @@ describe("LoginStrategy", () => {
         vaultTimeoutSettingsService,
         kdfConfigService,
         environmentService,
+        configService,
       );
 
       apiService.postIdentityToken.mockResolvedValue(identityTokenResponseFactory());
@@ -551,6 +556,7 @@ describe("LoginStrategy", () => {
         vaultTimeoutSettingsService,
         kdfConfigService,
         environmentService,
+        configService,
       );
 
       const result = await passwordLoginStrategy.logIn(credentials);
diff --git a/libs/auth/src/common/login-strategies/login.strategy.ts b/libs/auth/src/common/login-strategies/login.strategy.ts
index 6e66d65b654..463ea676163 100644
--- a/libs/auth/src/common/login-strategies/login.strategy.ts
+++ b/libs/auth/src/common/login-strategies/login.strategy.ts
@@ -17,7 +17,6 @@ import { IdentityDeviceVerificationResponse } from "@bitwarden/common/auth/model
 import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/identity-token.response";
 import { IdentityTwoFactorResponse } from "@bitwarden/common/auth/models/response/identity-two-factor.response";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { ClientType } from "@bitwarden/common/enums";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import {
@@ -26,6 +25,7 @@ import {
 } from "@bitwarden/common/key-management/vault-timeout";
 import { KeysRequest } from "@bitwarden/common/models/request/keys.request";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -92,6 +92,7 @@ export abstract class LoginStrategy {
     protected vaultTimeoutSettingsService: VaultTimeoutSettingsService,
     protected KdfConfigService: KdfConfigService,
     protected environmentService: EnvironmentService,
+    protected configService: ConfigService,
   ) {}
 
   abstract exportCache(): CacheData;
@@ -254,13 +255,10 @@ export abstract class LoginStrategy {
   protected async processTokenResponse(response: IdentityTokenResponse): Promise<AuthResult> {
     const result = new AuthResult();
 
-    // Old encryption keys must be migrated, but is currently only available on web.
-    // Other clients shouldn't continue the login process.
+    // Encryption key migration of legacy users (with no userkey) is not supported anymore
     if (this.encryptionKeyMigrationRequired(response)) {
       result.requiresEncryptionKeyMigration = true;
-      if (this.platformUtilsService.getClientType() !== ClientType.Web) {
-        return result;
-      }
+      return result;
     }
 
     // Must come before setting keys, user key needs email to update additional keys.
@@ -269,8 +267,6 @@ export abstract class LoginStrategy {
 
     result.resetMasterPassword = response.resetMasterPassword;
 
-    await this.processForceSetPasswordReason(response.forcePasswordReset, userId);
-
     if (response.twoFactorToken != null) {
       // note: we can read email from access token b/c it was saved in saveAccountInformation
       const userEmail = await this.tokenService.getEmail();
@@ -282,6 +278,9 @@ export abstract class LoginStrategy {
     await this.setUserKey(response, userId);
     await this.setPrivateKey(response, userId);
 
+    // This needs to run after the keys are set because it checks for the existence of the encrypted private key
+    await this.processForceSetPasswordReason(response.forcePasswordReset, userId);
+
     this.messagingService.send("loggedIn");
 
     return result;
diff --git a/libs/auth/src/common/login-strategies/password-login.strategy.spec.ts b/libs/auth/src/common/login-strategies/password-login.strategy.spec.ts
index 3cbe38e0abc..61a06f94b02 100644
--- a/libs/auth/src/common/login-strategies/password-login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/password-login.strategy.spec.ts
@@ -3,6 +3,7 @@ import { BehaviorSubject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
@@ -11,6 +12,7 @@ import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/id
 import { IdentityTwoFactorResponse } from "@bitwarden/common/auth/models/response/identity-two-factor.response";
 import { MasterPasswordPolicyResponse } from "@bitwarden/common/auth/models/response/master-password-policy.response";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { FakeMasterPasswordService } from "@bitwarden/common/key-management/master-password/services/fake-master-password.service";
 import {
@@ -18,6 +20,7 @@ import {
   VaultTimeoutSettingsService,
 } from "@bitwarden/common/key-management/vault-timeout";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -54,7 +57,7 @@ const masterKey = new SymmetricCryptoKey(
 ) as MasterKey;
 const userId = Utils.newGuid() as UserId;
 const deviceId = Utils.newGuid();
-const masterPasswordPolicy = new MasterPasswordPolicyResponse({
+const masterPasswordPolicyResponse = new MasterPasswordPolicyResponse({
   EnforceOnLogin: true,
   MinLength: 8,
 });
@@ -82,6 +85,7 @@ describe("PasswordLoginStrategy", () => {
   let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
   let kdfConfigService: MockProxy<KdfConfigService>;
   let environmentService: MockProxy<EnvironmentService>;
+  let configService: MockProxy<ConfigService>;
 
   let passwordLoginStrategy: PasswordLoginStrategy;
   let credentials: PasswordLoginCredentials;
@@ -109,6 +113,7 @@ describe("PasswordLoginStrategy", () => {
     vaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
     kdfConfigService = mock<KdfConfigService>();
     environmentService = mock<EnvironmentService>();
+    configService = mock<ConfigService>();
 
     appIdService.getAppId.mockResolvedValue(deviceId);
     tokenService.decodeAccessToken.mockResolvedValue({
@@ -148,9 +153,10 @@ describe("PasswordLoginStrategy", () => {
       vaultTimeoutSettingsService,
       kdfConfigService,
       environmentService,
+      configService,
     );
     credentials = new PasswordLoginCredentials(email, masterPassword);
-    tokenResponse = identityTokenResponseFactory(masterPasswordPolicy);
+    tokenResponse = identityTokenResponseFactory(masterPasswordPolicyResponse);
 
     apiService.postIdentityToken.mockResolvedValue(tokenResponse);
 
@@ -202,7 +208,10 @@ describe("PasswordLoginStrategy", () => {
       localHashedPassword,
       userId,
     );
-    expect(keyService.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(tokenResponse.key, userId);
+    expect(masterPasswordService.mock.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
+      tokenResponse.key,
+      userId,
+    );
     expect(keyService.setUserKey).toHaveBeenCalledWith(userKey, userId);
     expect(keyService.setPrivateKey).toHaveBeenCalledWith(tokenResponse.privateKey, userId);
   });
@@ -224,6 +233,67 @@ describe("PasswordLoginStrategy", () => {
     expect(policyService.evaluateMasterPassword).toHaveBeenCalled();
   });
 
+  it("when given master password policies as part of the login credentials from an org invite, it combines them with the token response policies to evaluate the user's password as weak", async () => {
+    const passwordStrengthScore = 0;
+
+    passwordStrengthService.getPasswordStrength.mockReturnValue({
+      score: passwordStrengthScore,
+    } as any);
+    policyService.evaluateMasterPassword.mockReturnValue(false);
+    tokenService.decodeAccessToken.mockResolvedValue({ sub: userId });
+
+    jest
+      .spyOn(configService, "getFeatureFlag")
+      .mockImplementation((flag: FeatureFlag) =>
+        Promise.resolve(flag === FeatureFlag.PM16117_ChangeExistingPasswordRefactor),
+      );
+
+    credentials.masterPasswordPoliciesFromOrgInvite = Object.assign(
+      new MasterPasswordPolicyOptions(),
+      {
+        minLength: 10,
+        minComplexity: 2,
+        requireUpper: true,
+        requireLower: true,
+        requireNumbers: true,
+        requireSpecial: true,
+        enforceOnLogin: true,
+      },
+    );
+
+    const combinedMasterPasswordPolicyOptions = Object.assign(new MasterPasswordPolicyOptions(), {
+      minLength: 10,
+      minComplexity: 2,
+      requireUpper: true,
+      requireLower: true,
+      requireNumbers: true,
+      requireSpecial: true,
+      enforceOnLogin: false,
+    });
+
+    policyService.combineMasterPasswordPolicyOptions.mockReturnValue(
+      combinedMasterPasswordPolicyOptions,
+    );
+
+    await passwordLoginStrategy.logIn(credentials);
+
+    expect(policyService.combineMasterPasswordPolicyOptions).toHaveBeenCalledWith(
+      credentials.masterPasswordPoliciesFromOrgInvite,
+      MasterPasswordPolicyOptions.fromResponse(masterPasswordPolicyResponse),
+    );
+
+    expect(policyService.evaluateMasterPassword).toHaveBeenCalledWith(
+      passwordStrengthScore,
+      credentials.masterPassword,
+      combinedMasterPasswordPolicyOptions,
+    );
+
+    expect(masterPasswordService.mock.setForceSetPasswordReason).toHaveBeenCalledWith(
+      ForceSetPasswordReason.WeakMasterPassword,
+      userId,
+    );
+  });
+
   it("forces the user to update their master password on successful login when it does not meet master password policy requirements", async () => {
     passwordStrengthService.getPasswordStrength.mockReturnValue({ score: 0 } as any);
     policyService.evaluateMasterPassword.mockReturnValue(false);
@@ -248,7 +318,7 @@ describe("PasswordLoginStrategy", () => {
       TwoFactorProviders2: { 0: null },
       error: "invalid_grant",
       error_description: "Two factor required.",
-      MasterPasswordPolicy: masterPasswordPolicy,
+      MasterPasswordPolicy: masterPasswordPolicyResponse,
     });
 
     // First login request fails requiring 2FA
@@ -268,7 +338,7 @@ describe("PasswordLoginStrategy", () => {
       TwoFactorProviders2: { 0: null },
       error: "invalid_grant",
       error_description: "Two factor required.",
-      MasterPasswordPolicy: masterPasswordPolicy,
+      MasterPasswordPolicy: masterPasswordPolicyResponse,
     });
 
     // First login request fails requiring 2FA
@@ -277,7 +347,7 @@ describe("PasswordLoginStrategy", () => {
 
     // Second login request succeeds
     apiService.postIdentityToken.mockResolvedValueOnce(
-      identityTokenResponseFactory(masterPasswordPolicy),
+      identityTokenResponseFactory(masterPasswordPolicyResponse),
     );
     await passwordLoginStrategy.logInTwoFactor({
       provider: TwoFactorProviderType.Authenticator,
diff --git a/libs/auth/src/common/login-strategies/password-login.strategy.ts b/libs/auth/src/common/login-strategies/password-login.strategy.ts
index b314b7fddbb..cd3d5df1d5e 100644
--- a/libs/auth/src/common/login-strategies/password-login.strategy.ts
+++ b/libs/auth/src/common/login-strategies/password-login.strategy.ts
@@ -12,6 +12,7 @@ import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/ide
 import { IdentityDeviceVerificationResponse } from "@bitwarden/common/auth/models/response/identity-device-verification.response";
 import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/identity-token.response";
 import { IdentityTwoFactorResponse } from "@bitwarden/common/auth/models/response/identity-two-factor.response";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { HashPurpose } from "@bitwarden/common/platform/enums";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
@@ -75,7 +76,7 @@ export class PasswordLoginStrategy extends LoginStrategy {
     this.localMasterKeyHash$ = this.cache.pipe(map((state) => state.localMasterKeyHash));
   }
 
-  override async logIn(credentials: PasswordLoginCredentials) {
+  override async logIn(credentials: PasswordLoginCredentials): Promise<AuthResult> {
     const { email, masterPassword, twoFactor } = credentials;
 
     const data = new PasswordLoginStrategyData();
@@ -126,7 +127,10 @@ export class PasswordLoginStrategy extends LoginStrategy {
     if (this.encryptionKeyMigrationRequired(response)) {
       return;
     }
-    await this.keyService.setMasterKeyEncryptedUserKey(response.key, userId);
+
+    if (response.key) {
+      await this.masterPasswordService.setMasterKeyEncryptedUserKey(response.key, userId);
+    }
 
     const masterKey = await firstValueFrom(this.masterPasswordService.masterKey$(userId));
     if (masterKey) {
@@ -160,18 +164,42 @@ export class PasswordLoginStrategy extends LoginStrategy {
     credentials: PasswordLoginCredentials,
     authResult: AuthResult,
   ): Promise<void> {
-    // TODO: PM-21084 - investigate if we should be sending down masterPasswordPolicy on the IdentityDeviceVerificationResponse like we do for the IdentityTwoFactorResponse
+    // TODO: PM-21084 - investigate if we should be sending down masterPasswordPolicy on the
+    // IdentityDeviceVerificationResponse like we do for the IdentityTwoFactorResponse
     // If the response is a device verification response, we don't need to evaluate the password
     if (identityResponse instanceof IdentityDeviceVerificationResponse) {
       return;
     }
 
     // The identity result can contain master password policies for the user's organizations
-    const masterPasswordPolicyOptions =
-      this.getMasterPasswordPolicyOptionsFromResponse(identityResponse);
+    let masterPasswordPolicyOptions: MasterPasswordPolicyOptions | undefined;
 
-    if (!masterPasswordPolicyOptions?.enforceOnLogin) {
-      return;
+    if (
+      await this.configService.getFeatureFlag(FeatureFlag.PM16117_ChangeExistingPasswordRefactor)
+    ) {
+      // Get the master password policy options from both the org invite and the identity response.
+      masterPasswordPolicyOptions = this.policyService.combineMasterPasswordPolicyOptions(
+        credentials.masterPasswordPoliciesFromOrgInvite,
+        this.getMasterPasswordPolicyOptionsFromResponse(identityResponse),
+      );
+
+      // We deliberately do not check enforceOnLogin as existing users who are logging
+      // in after getting an org invite should always be forced to set a password that
+      // meets the org's policy. Org Invite -> Registration also works this way for
+      // new BW users as well.
+      if (
+        !credentials.masterPasswordPoliciesFromOrgInvite &&
+        !masterPasswordPolicyOptions?.enforceOnLogin
+      ) {
+        return;
+      }
+    } else {
+      masterPasswordPolicyOptions =
+        this.getMasterPasswordPolicyOptionsFromResponse(identityResponse);
+
+      if (!masterPasswordPolicyOptions?.enforceOnLogin) {
+        return;
+      }
     }
 
     // If there is a policy active, evaluate the supplied password before its no longer in memory
diff --git a/libs/auth/src/common/login-strategies/sso-login.strategy.spec.ts b/libs/auth/src/common/login-strategies/sso-login.strategy.spec.ts
index d743a71f160..ea041081985 100644
--- a/libs/auth/src/common/login-strategies/sso-login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/sso-login.strategy.spec.ts
@@ -5,10 +5,12 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { AdminAuthRequestStorable } from "@bitwarden/common/auth/models/domain/admin-auth-req-storable";
+import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
 import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
 import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/identity-token.response";
 import { IUserDecryptionOptionsServerResponse } from "@bitwarden/common/auth/models/response/user-decryption-options/user-decryption-options.response";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
@@ -19,6 +21,7 @@ import {
 } from "@bitwarden/common/key-management/vault-timeout";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -26,6 +29,7 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { EncryptedString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
 import { CsprngArray } from "@bitwarden/common/types/csprng";
@@ -66,6 +70,7 @@ describe("SsoLoginStrategy", () => {
   let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
   let kdfConfigService: MockProxy<KdfConfigService>;
   let environmentService: MockProxy<EnvironmentService>;
+  let configService: MockProxy<ConfigService>;
 
   let ssoLoginStrategy: SsoLoginStrategy;
   let credentials: SsoLoginCredentials;
@@ -102,6 +107,7 @@ describe("SsoLoginStrategy", () => {
     vaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
     kdfConfigService = mock<KdfConfigService>();
     environmentService = mock<EnvironmentService>();
+    configService = mock<ConfigService>();
 
     tokenService.getTwoFactorToken.mockResolvedValue(null);
     appIdService.getAppId.mockResolvedValue(deviceId);
@@ -150,6 +156,7 @@ describe("SsoLoginStrategy", () => {
       vaultTimeoutSettingsService,
       kdfConfigService,
       environmentService,
+      configService,
     );
     credentials = new SsoLoginCredentials(ssoCode, ssoCodeVerifier, ssoRedirectUrl, ssoOrgId);
   });
@@ -196,8 +203,50 @@ describe("SsoLoginStrategy", () => {
     await ssoLoginStrategy.logIn(credentials);
 
     // Assert
-    expect(keyService.setMasterKeyEncryptedUserKey).toHaveBeenCalledTimes(1);
-    expect(keyService.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(tokenResponse.key, userId);
+    expect(masterPasswordService.mock.setMasterKeyEncryptedUserKey).toHaveBeenCalledTimes(1);
+    expect(masterPasswordService.mock.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
+      tokenResponse.key,
+      userId,
+    );
+  });
+
+  describe("given the PM16117_SetInitialPasswordRefactor feature flag is ON", () => {
+    beforeEach(() => {
+      configService.getFeatureFlag.mockImplementation(async (flag) => {
+        if (flag === FeatureFlag.PM16117_SetInitialPasswordRefactor) {
+          return true;
+        }
+        return false;
+      });
+    });
+
+    describe("given the user does not have the `trustedDeviceOption`, does not have a master password, is not using key connector, does not have a user key, but they DO have a `userKeyEncryptedPrivateKey`", () => {
+      it("should set the forceSetPasswordReason to TdeOffboardingUntrustedDevice", async () => {
+        // Arrange
+        const mockUserDecryptionOptions: IUserDecryptionOptionsServerResponse = {
+          HasMasterPassword: false,
+          TrustedDeviceOption: null,
+          KeyConnectorOption: null,
+        };
+        const tokenResponse = identityTokenResponseFactory(null, mockUserDecryptionOptions);
+        apiService.postIdentityToken.mockResolvedValue(tokenResponse);
+
+        keyService.userEncryptedPrivateKey$.mockReturnValue(
+          of("userKeyEncryptedPrivateKey" as EncryptedString),
+        );
+        keyService.hasUserKey.mockResolvedValue(false);
+
+        // Act
+        await ssoLoginStrategy.logIn(credentials);
+
+        // Assert
+        expect(masterPasswordService.mock.setForceSetPasswordReason).toHaveBeenCalledTimes(1);
+        expect(masterPasswordService.mock.setForceSetPasswordReason).toHaveBeenCalledWith(
+          ForceSetPasswordReason.TdeOffboardingUntrustedDevice,
+          userId,
+        );
+      });
+    });
   });
 
   describe("Trusted Device Decryption", () => {
diff --git a/libs/auth/src/common/login-strategies/sso-login.strategy.ts b/libs/auth/src/common/login-strategies/sso-login.strategy.ts
index 92add18059c..8ab84f0968a 100644
--- a/libs/auth/src/common/login-strategies/sso-login.strategy.ts
+++ b/libs/auth/src/common/login-strategies/sso-login.strategy.ts
@@ -9,6 +9,7 @@ import { SsoTokenRequest } from "@bitwarden/common/auth/models/request/identity-
 import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
 import { IdentityTokenResponse } from "@bitwarden/common/auth/models/response/identity-token.response";
 import { HttpStatusCode } from "@bitwarden/common/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
 import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
@@ -185,7 +186,10 @@ export class SsoLoginStrategy extends LoginStrategy {
 
     if (masterKeyEncryptedUserKey) {
       // set the master key encrypted user key if it exists
-      await this.keyService.setMasterKeyEncryptedUserKey(masterKeyEncryptedUserKey, userId);
+      await this.masterPasswordService.setMasterKeyEncryptedUserKey(
+        masterKeyEncryptedUserKey,
+        userId,
+      );
     }
 
     const userDecryptionOptions = tokenResponse?.userDecryptionOptions;
@@ -260,7 +264,7 @@ export class SsoLoginStrategy extends LoginStrategy {
         );
       }
 
-      if (await this.keyService.hasUserKey()) {
+      if (await this.keyService.hasUserKey(userId)) {
         // Now that we have a decrypted user key in memory, we can check if we
         // need to establish trust on the current device
         await this.deviceTrustService.trustDeviceIfRequired(userId);
@@ -340,13 +344,38 @@ export class SsoLoginStrategy extends LoginStrategy {
     tokenResponse: IdentityTokenResponse,
     userId: UserId,
   ): Promise<void> {
-    const newSsoUser = tokenResponse.key == null;
+    const isSetInitialPasswordFlagOn = await this.configService.getFeatureFlag(
+      FeatureFlag.PM16117_SetInitialPasswordRefactor,
+    );
 
-    if (!newSsoUser) {
-      await this.keyService.setPrivateKey(
-        tokenResponse.privateKey ?? (await this.createKeyPairForOldAccount(userId)),
-        userId,
-      );
+    if (isSetInitialPasswordFlagOn) {
+      if (tokenResponse.hasMasterKeyEncryptedUserKey()) {
+        // User has masterKeyEncryptedUserKey, so set the userKeyEncryptedPrivateKey
+        // Note: new JIT provisioned SSO users will not yet have a user asymmetric key pair
+        // and so we don't want them falling into the createKeyPairForOldAccount flow
+        await this.keyService.setPrivateKey(
+          tokenResponse.privateKey ?? (await this.createKeyPairForOldAccount(userId)),
+          userId,
+        );
+      } else if (tokenResponse.privateKey) {
+        // User doesn't have masterKeyEncryptedUserKey but they do have a userKeyEncryptedPrivateKey
+        // This is just existing TDE users or a TDE offboarder on an untrusted device
+        await this.keyService.setPrivateKey(tokenResponse.privateKey, userId);
+      }
+      // else {
+      //    User could be new JIT provisioned SSO user in either a MP encryption org OR a TDE org.
+      //    In either case, the user doesn't yet have a user asymmetric key pair, a user key, or a master key + master key encrypted user key.
+      // }
+    } else {
+      // A user that does not yet have a masterKeyEncryptedUserKey set is a new SSO user
+      const newSsoUser = tokenResponse.key == null;
+
+      if (!newSsoUser) {
+        await this.keyService.setPrivateKey(
+          tokenResponse.privateKey ?? (await this.createKeyPairForOldAccount(userId)),
+          userId,
+        );
+      }
     }
   }
 
@@ -386,7 +415,7 @@ export class SsoLoginStrategy extends LoginStrategy {
       return false;
     }
 
-    // Check for TDE offboarding - user is being offboarded from TDE and needs to set a password
+    // Check for TDE offboarding - user is being offboarded from TDE and needs to set a password on a trusted device
     if (userDecryptionOptions.trustedDeviceOption?.isTdeOffboarding) {
       await this.masterPasswordService.setForceSetPasswordReason(
         ForceSetPasswordReason.TdeOffboarding,
@@ -395,6 +424,39 @@ export class SsoLoginStrategy extends LoginStrategy {
       return true;
     }
 
+    // If a TDE org user in an offboarding state logs in on an untrusted device, then they will receive their existing userKeyEncryptedPrivateKey from the server, but
+    // TDE would not have been able to decrypt their user key b/c we don't send down TDE as a valid decryption option, so the user key will be unavilable here for TDE org users on untrusted devices.
+    // - UserDecryptionOptions.trustedDeviceOption is undefined -- device isn't trusted.
+    // - UserDecryptionOptions.hasMasterPassword is false -- user doesn't have a master password.
+    // - UserDecryptionOptions.UsesKeyConnector is undefined. -- they aren't using key connector
+    // - UserKey is not set after successful login -- because automatic decryption is not available
+    // - userKeyEncryptedPrivateKey is set after successful login -- this is the key differentiator between a TDE org user logging into an untrusted device and MP encryption JIT provisioned user logging in for the first time.
+    const isSetInitialPasswordFlagOn = await this.configService.getFeatureFlag(
+      FeatureFlag.PM16117_SetInitialPasswordRefactor,
+    );
+
+    if (isSetInitialPasswordFlagOn) {
+      const hasUserKeyEncryptedPrivateKey = await firstValueFrom(
+        this.keyService.userEncryptedPrivateKey$(userId),
+      );
+      const hasUserKey = await this.keyService.hasUserKey(userId);
+
+      // TODO: PM-23491 we should explore consolidating this logic into a flag on the server. It could be set when an org is switched from TDE to MP encryption for each org user.
+      if (
+        !userDecryptionOptions.trustedDeviceOption &&
+        !userDecryptionOptions.hasMasterPassword &&
+        !userDecryptionOptions.keyConnectorOption?.keyConnectorUrl &&
+        hasUserKeyEncryptedPrivateKey &&
+        !hasUserKey
+      ) {
+        await this.masterPasswordService.setForceSetPasswordReason(
+          ForceSetPasswordReason.TdeOffboardingUntrustedDevice,
+          userId,
+        );
+        return true;
+      }
+    }
+
     // Check if user has permission to set password but hasn't yet
     if (
       !userDecryptionOptions.hasMasterPassword &&
diff --git a/libs/auth/src/common/login-strategies/user-api-login.strategy.spec.ts b/libs/auth/src/common/login-strategies/user-api-login.strategy.spec.ts
index ec017e58c3c..7114afbf94f 100644
--- a/libs/auth/src/common/login-strategies/user-api-login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/user-api-login.strategy.spec.ts
@@ -13,6 +13,7 @@ import {
   VaultTimeoutSettingsService,
 } from "@bitwarden/common/key-management/vault-timeout";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import {
   Environment,
   EnvironmentService,
@@ -56,6 +57,7 @@ describe("UserApiLoginStrategy", () => {
   let billingAccountProfileStateService: MockProxy<BillingAccountProfileStateService>;
   let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
   let kdfConfigService: MockProxy<KdfConfigService>;
+  let configService: MockProxy<ConfigService>;
 
   let apiLogInStrategy: UserApiLoginStrategy;
   let credentials: UserApiLoginCredentials;
@@ -88,6 +90,7 @@ describe("UserApiLoginStrategy", () => {
     billingAccountProfileStateService = mock<BillingAccountProfileStateService>();
     vaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
     kdfConfigService = mock<KdfConfigService>();
+    configService = mock<ConfigService>();
 
     appIdService.getAppId.mockResolvedValue(deviceId);
     tokenService.getTwoFactorToken.mockResolvedValue(null);
@@ -115,6 +118,7 @@ describe("UserApiLoginStrategy", () => {
       vaultTimeoutSettingsService,
       kdfConfigService,
       environmentService,
+      configService,
     );
 
     credentials = new UserApiLoginCredentials(apiClientId, apiClientSecret);
@@ -176,7 +180,10 @@ describe("UserApiLoginStrategy", () => {
 
     await apiLogInStrategy.logIn(credentials);
 
-    expect(keyService.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(tokenResponse.key, userId);
+    expect(masterPasswordService.mock.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
+      tokenResponse.key,
+      userId,
+    );
     expect(keyService.setPrivateKey).toHaveBeenCalledWith(tokenResponse.privateKey, userId);
   });
 
diff --git a/libs/auth/src/common/login-strategies/user-api-login.strategy.ts b/libs/auth/src/common/login-strategies/user-api-login.strategy.ts
index 7e7ecee0385..df532799576 100644
--- a/libs/auth/src/common/login-strategies/user-api-login.strategy.ts
+++ b/libs/auth/src/common/login-strategies/user-api-login.strategy.ts
@@ -63,7 +63,9 @@ export class UserApiLoginStrategy extends LoginStrategy {
     response: IdentityTokenResponse,
     userId: UserId,
   ): Promise<void> {
-    await this.keyService.setMasterKeyEncryptedUserKey(response.key, userId);
+    if (response.key) {
+      await this.masterPasswordService.setMasterKeyEncryptedUserKey(response.key, userId);
+    }
 
     if (response.apiUseKeyConnector) {
       const masterKey = await firstValueFrom(this.masterPasswordService.masterKey$(userId));
diff --git a/libs/auth/src/common/login-strategies/webauthn-login.strategy.spec.ts b/libs/auth/src/common/login-strategies/webauthn-login.strategy.spec.ts
index e3c2d2da27f..f5ba2d0be23 100644
--- a/libs/auth/src/common/login-strategies/webauthn-login.strategy.spec.ts
+++ b/libs/auth/src/common/login-strategies/webauthn-login.strategy.spec.ts
@@ -16,6 +16,7 @@ import {
   VaultTimeoutSettingsService,
 } from "@bitwarden/common/key-management/vault-timeout";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -54,6 +55,7 @@ describe("WebAuthnLoginStrategy", () => {
   let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
   let kdfConfigService: MockProxy<KdfConfigService>;
   let environmentService: MockProxy<EnvironmentService>;
+  let configService: MockProxy<ConfigService>;
 
   let webAuthnLoginStrategy!: WebAuthnLoginStrategy;
 
@@ -98,6 +100,7 @@ describe("WebAuthnLoginStrategy", () => {
     vaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
     kdfConfigService = mock<KdfConfigService>();
     environmentService = mock<EnvironmentService>();
+    configService = mock<ConfigService>();
 
     tokenService.getTwoFactorToken.mockResolvedValue(null);
     appIdService.getAppId.mockResolvedValue(deviceId);
@@ -124,6 +127,7 @@ describe("WebAuthnLoginStrategy", () => {
       vaultTimeoutSettingsService,
       kdfConfigService,
       environmentService,
+      configService,
     );
 
     // Create credentials
@@ -237,8 +241,8 @@ describe("WebAuthnLoginStrategy", () => {
 
     // Assert
     // Master key encrypted user key should be set
-    expect(keyService.setMasterKeyEncryptedUserKey).toHaveBeenCalledTimes(1);
-    expect(keyService.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
+    expect(masterPasswordService.mock.setMasterKeyEncryptedUserKey).toHaveBeenCalledTimes(1);
+    expect(masterPasswordService.mock.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
       idTokenResponse.key,
       userId,
     );
diff --git a/libs/auth/src/common/login-strategies/webauthn-login.strategy.ts b/libs/auth/src/common/login-strategies/webauthn-login.strategy.ts
index 1d817c57009..c5fe6d55779 100644
--- a/libs/auth/src/common/login-strategies/webauthn-login.strategy.ts
+++ b/libs/auth/src/common/login-strategies/webauthn-login.strategy.ts
@@ -66,7 +66,10 @@ export class WebAuthnLoginStrategy extends LoginStrategy {
 
     if (masterKeyEncryptedUserKey) {
       // set the master key encrypted user key if it exists
-      await this.keyService.setMasterKeyEncryptedUserKey(masterKeyEncryptedUserKey, userId);
+      await this.masterPasswordService.setMasterKeyEncryptedUserKey(
+        masterKeyEncryptedUserKey,
+        userId,
+      );
     }
 
     const userDecryptionOptions = idTokenResponse?.userDecryptionOptions;
diff --git a/libs/auth/src/common/models/domain/login-credentials.ts b/libs/auth/src/common/models/domain/login-credentials.ts
index bce8ce54de5..96ee88945eb 100644
--- a/libs/auth/src/common/models/domain/login-credentials.ts
+++ b/libs/auth/src/common/models/domain/login-credentials.ts
@@ -2,6 +2,7 @@
 // @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { AuthenticationType } from "@bitwarden/common/auth/enums/authentication-type";
 import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request";
 import { WebAuthnLoginAssertionResponseRequest } from "@bitwarden/common/auth/services/webauthn-login/request/webauthn-login-assertion-response.request";
@@ -15,6 +16,7 @@ export class PasswordLoginCredentials {
     public email: string,
     public masterPassword: string,
     public twoFactor?: TokenTwoFactorRequest,
+    public masterPasswordPoliciesFromOrgInvite?: MasterPasswordPolicyOptions,
   ) {}
 }
 
diff --git a/libs/auth/src/common/services/auth-request/auth-request-api.service.ts b/libs/auth/src/common/services/auth-request/auth-request-api.service.ts
index c9fec1400c9..15517a9a0e5 100644
--- a/libs/auth/src/common/services/auth-request/auth-request-api.service.ts
+++ b/libs/auth/src/common/services/auth-request/auth-request-api.service.ts
@@ -1,16 +1,23 @@
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuthRequest } from "@bitwarden/common/auth/models/request/auth.request";
 import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 
-import { AuthRequestApiService } from "../../abstractions/auth-request-api.service";
+import { AuthRequestApiServiceAbstraction } from "../../abstractions/auth-request-api.service";
 
-export class DefaultAuthRequestApiService implements AuthRequestApiService {
+export class DefaultAuthRequestApiService implements AuthRequestApiServiceAbstraction {
   constructor(
     private apiService: ApiService,
     private logService: LogService,
   ) {}
 
+  async getPendingAuthRequests(): Promise<ListResponse<AuthRequestResponse>> {
+    const path = `/auth-requests/pending`;
+    const r = await this.apiService.send("GET", path, null, true, true);
+    return new ListResponse(r, AuthRequestResponse);
+  }
+
   async getAuthRequest(requestId: string): Promise<AuthRequestResponse> {
     try {
       const path = `/auth-requests/${requestId}`;
diff --git a/libs/auth/src/common/services/auth-request/auth-request.service.spec.ts b/libs/auth/src/common/services/auth-request/auth-request.service.spec.ts
index 0d2df969f87..6f4e3512a6a 100644
--- a/libs/auth/src/common/services/auth-request/auth-request.service.spec.ts
+++ b/libs/auth/src/common/services/auth-request/auth-request.service.spec.ts
@@ -1,32 +1,34 @@
 import { mock } from "jest-mock-extended";
+import { firstValueFrom } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { FakeMasterPasswordService } from "@bitwarden/common/key-management/master-password/services/fake-master-password.service";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { AuthRequestPushNotification } from "@bitwarden/common/models/response/notification.response";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { StateProvider } from "@bitwarden/common/platform/state";
-import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
 import { UserId } from "@bitwarden/common/types/guid";
 import { MasterKey, UserKey } from "@bitwarden/common/types/key";
 import { KeyService } from "@bitwarden/key-management";
 
+import { DefaultAuthRequestApiService } from "./auth-request-api.service";
 import { AuthRequestService } from "./auth-request.service";
 
 describe("AuthRequestService", () => {
   let sut: AuthRequestService;
 
   const stateProvider = mock<StateProvider>();
-  let accountService: FakeAccountService;
   let masterPasswordService: FakeMasterPasswordService;
   const appIdService = mock<AppIdService>();
   const keyService = mock<KeyService>();
   const encryptService = mock<EncryptService>();
   const apiService = mock<ApiService>();
+  const authRequestApiService = mock<DefaultAuthRequestApiService>();
 
   let mockPrivateKey: Uint8Array;
   let mockPublicKey: Uint8Array;
@@ -34,17 +36,16 @@ describe("AuthRequestService", () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
-    accountService = mockAccountServiceWith(mockUserId);
     masterPasswordService = new FakeMasterPasswordService();
 
     sut = new AuthRequestService(
       appIdService,
-      accountService,
       masterPasswordService,
       keyService,
       encryptService,
       apiService,
       stateProvider,
+      authRequestApiService,
     );
 
     mockPrivateKey = new Uint8Array(64);
@@ -105,23 +106,6 @@ describe("AuthRequestService", () => {
       );
     });
 
-    it("should use the master key and hash if they exist", async () => {
-      masterPasswordService.masterKeySubject.next(
-        new SymmetricCryptoKey(new Uint8Array(32)) as MasterKey,
-      );
-      masterPasswordService.masterKeyHashSubject.next("MASTER_KEY_HASH");
-
-      await sut.approveOrDenyAuthRequest(
-        true,
-        new AuthRequestResponse({ id: "123", publicKey: "KEY" }),
-      );
-
-      expect(encryptService.encapsulateKeyUnsigned).toHaveBeenCalledWith(
-        new SymmetricCryptoKey(new Uint8Array(32)),
-        expect.anything(),
-      );
-    });
-
     it("should use the user key if the master key and hash do not exist", async () => {
       keyService.getUserKey.mockResolvedValueOnce(
         new SymmetricCryptoKey(new Uint8Array(64)) as UserKey,
@@ -138,6 +122,7 @@ describe("AuthRequestService", () => {
       );
     });
   });
+
   describe("setUserKeyAfterDecryptingSharedUserKey", () => {
     it("decrypts and sets user key when given valid auth request response and private key", async () => {
       // Arrange
@@ -246,45 +231,6 @@ describe("AuthRequestService", () => {
     });
   });
 
-  describe("decryptAuthReqPubKeyEncryptedMasterKeyAndHash", () => {
-    it("returns a decrypted master key and hash when given a valid public key encrypted master key, public key encrypted master key hash, and an auth req private key", async () => {
-      // Arrange
-      const mockPubKeyEncryptedMasterKey = "pubKeyEncryptedMasterKey";
-      const mockPubKeyEncryptedMasterKeyHash = "pubKeyEncryptedMasterKeyHash";
-
-      const mockDecryptedMasterKeyBytes = new Uint8Array(64);
-      const mockDecryptedMasterKey = new SymmetricCryptoKey(
-        mockDecryptedMasterKeyBytes,
-      ) as MasterKey;
-      const mockDecryptedMasterKeyHashBytes = new Uint8Array(64);
-      const mockDecryptedMasterKeyHash = Utils.fromBufferToUtf8(mockDecryptedMasterKeyHashBytes);
-
-      encryptService.rsaDecrypt.mockResolvedValueOnce(mockDecryptedMasterKeyHashBytes);
-      encryptService.decapsulateKeyUnsigned.mockResolvedValueOnce(
-        new SymmetricCryptoKey(mockDecryptedMasterKeyBytes),
-      );
-
-      // Act
-      const result = await sut.decryptPubKeyEncryptedMasterKeyAndHash(
-        mockPubKeyEncryptedMasterKey,
-        mockPubKeyEncryptedMasterKeyHash,
-        mockPrivateKey,
-      );
-
-      // Assert
-      expect(encryptService.decapsulateKeyUnsigned).toHaveBeenCalledWith(
-        new EncString(mockPubKeyEncryptedMasterKey),
-        mockPrivateKey,
-      );
-      expect(encryptService.rsaDecrypt).toHaveBeenCalledWith(
-        new EncString(mockPubKeyEncryptedMasterKeyHash),
-        mockPrivateKey,
-      );
-      expect(result.masterKey).toEqual(mockDecryptedMasterKey);
-      expect(result.masterKeyHash).toEqual(mockDecryptedMasterKeyHash);
-    });
-  });
-
   describe("getFingerprintPhrase", () => {
     it("returns the same fingerprint regardless of email casing", () => {
       const email = "test@email.com";
@@ -294,4 +240,99 @@ describe("AuthRequestService", () => {
       expect(phrase).toEqual(phraseUpperCase);
     });
   });
+
+  describe("getLatestAuthRequest", () => {
+    it("returns newest authRequest from list of authRequests", async () => {
+      const now = minutesAgo(0);
+      const fiveMinutesAgo = minutesAgo(5);
+      const tenMinutesAgo = minutesAgo(10);
+
+      const newerAuthRequest = createMockAuthRequest(
+        "now-request",
+        false,
+        false,
+        now.toISOString(), // newer request
+        "1fda13f4-5134-4157-90e3-b4e3fb2d855z",
+      );
+      const olderAuthRequest = createMockAuthRequest(
+        "5-minute-old-request",
+        false,
+        false,
+        fiveMinutesAgo.toISOString(), // older request
+        "1fda13f4-5134-4157-90e3-b4e3fb2d855c",
+      );
+      const oldestAuthRequest = createMockAuthRequest(
+        "10-minute-old-request",
+        false,
+        false,
+        tenMinutesAgo.toISOString(), // oldest request
+        "1fda13f4-5134-4157-90e3-b4e3fb2d855a",
+      );
+
+      const listResponse = new ListResponse(
+        { Data: [oldestAuthRequest, olderAuthRequest, newerAuthRequest] },
+        AuthRequestResponse,
+      );
+
+      // Ensure the mock is properly set up to return the list response
+      authRequestApiService.getPendingAuthRequests.mockResolvedValue(listResponse);
+
+      // Act
+      const sutReturnValue = await firstValueFrom(sut.getLatestPendingAuthRequest$());
+
+      // Assert
+      // Verify the mock was called
+      expect(authRequestApiService.getPendingAuthRequests).toHaveBeenCalledTimes(1);
+      expect(sutReturnValue.creationDate).toEqual(newerAuthRequest.creationDate);
+      expect(sutReturnValue.id).toEqual(newerAuthRequest.id);
+    });
+  });
+
+  it("returns null from empty list of authRequests", async () => {
+    const listResponse = new ListResponse({ Data: [] }, AuthRequestResponse);
+
+    // Ensure the mock is properly set up to return the list response
+    authRequestApiService.getPendingAuthRequests.mockResolvedValue(listResponse);
+
+    // Act
+    const sutReturnValue = await firstValueFrom(sut.getLatestPendingAuthRequest$());
+
+    // Assert
+    // Verify the mock was called
+    expect(authRequestApiService.getPendingAuthRequests).toHaveBeenCalledTimes(1);
+    expect(sutReturnValue).toBeNull();
+  });
 });
+
+function createMockAuthRequest(
+  id: string,
+  isAnswered: boolean,
+  isExpired: boolean,
+  creationDate: string,
+  deviceId?: string,
+): AuthRequestResponse {
+  const authRequestResponse = new AuthRequestResponse({
+    id: id,
+    publicKey:
+      "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+AIKUBDf4exqE9JDzGJegDzIoaZcNkUeewovgwSJuKuya0mP4CPP00ajmi9GEu6z3VWfB+yzx1O4gxHV/T5s620wnMYm6nAv2gDS+kEaXou4MOt7QMidq4kVhM7aixN2klKivH/E8GFPiMUzNQv0lMQthsVLLWFuMRxYfChe9Cxn9EWp7TYy4rAmi+jSTxzIGj+RC7f2qu2qdPSsKHLXtW7NA0SWhIntWbmc9QxD2nQ4qHgk/qUwvHoUhwKGNCcIDkXqMJ7ChN3v5tX1sFpwhQQrmlwiVC4+sBScfAgyYylfTPnuBd6b3UrC3D34GvHMgDvLjz7LwlBrkSXoF7xWZwIDAQAB",
+    requestDeviceIdentifier: "1fda13f4-5134-4157-90e3-b4e3fb2d855c",
+    requestDeviceTypeValue: 10,
+    requestDeviceType: "Firefox",
+    requestIpAddress: "2a04:4e40:9400:0:bb4:3591:d601:f5cc",
+    requestCountryName: "united states",
+    key: null,
+    masterPasswordHash: null,
+    creationDate: creationDate, // ISO 8601 date string : "2025-07-11T19:11:17.9866667Z"
+    responseDate: null,
+    requestApproved: false,
+    isAnswered: isAnswered,
+    isExpired: isExpired,
+    deviceId: deviceId,
+  });
+
+  return authRequestResponse;
+}
+
+function minutesAgo(minutes: number): Date {
+  return new Date(Date.now() - minutes * 60_000);
+}
diff --git a/libs/auth/src/common/services/auth-request/auth-request.service.ts b/libs/auth/src/common/services/auth-request/auth-request.service.ts
index 226403d9c8c..70d505ed6ff 100644
--- a/libs/auth/src/common/services/auth-request/auth-request.service.ts
+++ b/libs/auth/src/common/services/auth-request/auth-request.service.ts
@@ -1,15 +1,15 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { Observable, Subject, firstValueFrom } from "rxjs";
+import { Observable, Subject, defer, firstValueFrom, map } from "rxjs";
 import { Jsonify } from "type-fest";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AdminAuthRequestStorable } from "@bitwarden/common/auth/models/domain/admin-auth-req-storable";
 import { PasswordlessAuthRequest } from "@bitwarden/common/auth/models/request/passwordless-auth.request";
 import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { AuthRequestPushNotification } from "@bitwarden/common/models/response/notification.response";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -24,6 +24,7 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { MasterKey, UserKey } from "@bitwarden/common/types/key";
 import { KeyService } from "@bitwarden/key-management";
 
+import { AuthRequestApiServiceAbstraction } from "../../abstractions/auth-request-api.service";
 import { AuthRequestServiceAbstraction } from "../../abstractions/auth-request.service.abstraction";
 
 /**
@@ -49,12 +50,12 @@ export class AuthRequestService implements AuthRequestServiceAbstraction {
 
   constructor(
     private appIdService: AppIdService,
-    private accountService: AccountService,
     private masterPasswordService: InternalMasterPasswordServiceAbstraction,
     private keyService: KeyService,
     private encryptService: EncryptService,
     private apiService: ApiService,
     private stateProvider: StateProvider,
+    private authRequestApiService: AuthRequestApiServiceAbstraction,
   ) {
     this.authRequestPushNotification$ = this.authRequestPushNotificationSubject.asObservable();
     this.adminLoginApproved$ = this.adminLoginApprovedSubject.asObservable();
@@ -91,6 +92,34 @@ export class AuthRequestService implements AuthRequestServiceAbstraction {
     await this.stateProvider.setUserState(ADMIN_AUTH_REQUEST_KEY, null, userId);
   }
 
+  /**
+   * @description Gets the list of all standard (not admin approval) pending AuthRequests.
+   */
+  getPendingAuthRequests$(): Observable<Array<AuthRequestResponse>> {
+    return defer(() => this.authRequestApiService.getPendingAuthRequests()).pipe(
+      map((authRequestResponses: ListResponse<AuthRequestResponse>) => {
+        return authRequestResponses.data.map((authRequestResponse: AuthRequestResponse) => {
+          return new AuthRequestResponse(authRequestResponse);
+        });
+      }),
+    );
+  }
+
+  getLatestPendingAuthRequest$(): Observable<AuthRequestResponse | null> {
+    return this.getPendingAuthRequests$().pipe(
+      map((authRequests: Array<AuthRequestResponse>) => {
+        if (authRequests.length === 0) {
+          return null;
+        }
+        return authRequests.sort((a, b) => {
+          const dateA = new Date(a.creationDate).getTime();
+          const dateB = new Date(b.creationDate).getTime();
+          return dateB - dateA; // Sort in descending order
+        })[0];
+      }),
+    );
+  }
+
   async approveOrDenyAuthRequest(
     approve: boolean,
     authRequest: AuthRequestResponse,
@@ -103,32 +132,12 @@ export class AuthRequestService implements AuthRequestServiceAbstraction {
     }
     const pubKey = Utils.fromB64ToArray(authRequest.publicKey);
 
-    const userId = (await firstValueFrom(this.accountService.activeAccount$)).id;
-    const masterKey = await firstValueFrom(this.masterPasswordService.masterKey$(userId));
-    const masterKeyHash = await firstValueFrom(this.masterPasswordService.masterKeyHash$(userId));
-    let encryptedMasterKeyHash;
-    let keyToEncrypt;
-
-    if (masterKey && masterKeyHash) {
-      // Only encrypt the master password hash if masterKey exists as
-      // we won't have a masterKeyHash without a masterKey
-      encryptedMasterKeyHash = await this.encryptService.rsaEncrypt(
-        Utils.fromUtf8ToArray(masterKeyHash),
-        pubKey,
-      );
-      keyToEncrypt = masterKey;
-    } else {
-      keyToEncrypt = await this.keyService.getUserKey();
-    }
-
-    const encryptedKey = await this.encryptService.encapsulateKeyUnsigned(
-      keyToEncrypt as SymmetricCryptoKey,
-      pubKey,
-    );
+    const keyToEncrypt = await this.keyService.getUserKey();
+    const encryptedKey = await this.encryptService.encapsulateKeyUnsigned(keyToEncrypt, pubKey);
 
     const response = new PasswordlessAuthRequest(
       encryptedKey.encryptedString,
-      encryptedMasterKeyHash?.encryptedString,
+      undefined,
       await this.appIdService.getAppId(),
       approve,
     );
@@ -173,10 +182,12 @@ export class AuthRequestService implements AuthRequestServiceAbstraction {
     pubKeyEncryptedUserKey: string,
     privateKey: Uint8Array,
   ): Promise<UserKey> {
-    return (await this.encryptService.decapsulateKeyUnsigned(
+    const decryptedUserKey = await this.encryptService.decapsulateKeyUnsigned(
       new EncString(pubKeyEncryptedUserKey),
       privateKey,
-    )) as UserKey;
+    );
+
+    return decryptedUserKey as UserKey;
   }
 
   async decryptPubKeyEncryptedMasterKeyAndHash(
@@ -184,15 +195,17 @@ export class AuthRequestService implements AuthRequestServiceAbstraction {
     pubKeyEncryptedMasterKeyHash: string,
     privateKey: Uint8Array,
   ): Promise<{ masterKey: MasterKey; masterKeyHash: string }> {
-    const masterKey = (await this.encryptService.decapsulateKeyUnsigned(
+    const decryptedMasterKeyArrayBuffer = await this.encryptService.rsaDecrypt(
       new EncString(pubKeyEncryptedMasterKey),
       privateKey,
-    )) as MasterKey;
+    );
 
     const decryptedMasterKeyHashArrayBuffer = await this.encryptService.rsaDecrypt(
       new EncString(pubKeyEncryptedMasterKeyHash),
       privateKey,
     );
+
+    const masterKey = new SymmetricCryptoKey(decryptedMasterKeyArrayBuffer) as MasterKey;
     const masterKeyHash = Utils.fromBufferToUtf8(decryptedMasterKeyHashArrayBuffer);
 
     return {
diff --git a/libs/auth/src/common/services/index.ts b/libs/auth/src/common/services/index.ts
index 73d31799b7e..f66a827a2c2 100644
--- a/libs/auth/src/common/services/index.ts
+++ b/libs/auth/src/common/services/index.ts
@@ -7,3 +7,4 @@ export * from "./auth-request/auth-request-api.service";
 export * from "./accounts/lock.service";
 export * from "./login-success-handler/default-login-success-handler.service";
 export * from "./sso-redirect/sso-url.service";
+export * from "./logout/default-logout.service";
diff --git a/libs/auth/src/common/services/login-strategies/login-strategy.service.spec.ts b/libs/auth/src/common/services/login-strategies/login-strategy.service.spec.ts
index 981f5592621..8ddee96dd57 100644
--- a/libs/auth/src/common/services/login-strategies/login-strategy.service.spec.ts
+++ b/libs/auth/src/common/services/login-strategies/login-strategy.service.spec.ts
@@ -21,6 +21,7 @@ import {
   VaultTimeoutSettingsService,
 } from "@bitwarden/common/key-management/vault-timeout";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -75,6 +76,7 @@ describe("LoginStrategyService", () => {
   let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
   let kdfConfigService: MockProxy<KdfConfigService>;
   let taskSchedulerService: MockProxy<TaskSchedulerService>;
+  let configService: MockProxy<ConfigService>;
 
   let stateProvider: FakeGlobalStateProvider;
   let loginStrategyCacheExpirationState: FakeGlobalState<Date | null>;
@@ -107,6 +109,7 @@ describe("LoginStrategyService", () => {
     vaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
     kdfConfigService = mock<KdfConfigService>();
     taskSchedulerService = mock<TaskSchedulerService>();
+    configService = mock<ConfigService>();
 
     sut = new LoginStrategyService(
       accountService,
@@ -134,6 +137,7 @@ describe("LoginStrategyService", () => {
       vaultTimeoutSettingsService,
       kdfConfigService,
       taskSchedulerService,
+      configService,
     );
 
     loginStrategyCacheExpirationState = stateProvider.getFake(CACHE_EXPIRATION_KEY);
diff --git a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
index a9b7ef250bc..6900e5e5872 100644
--- a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
+++ b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
@@ -26,6 +26,7 @@ import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/va
 import { PreloginRequest } from "@bitwarden/common/models/request/prelogin.request";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -131,6 +132,7 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
     protected vaultTimeoutSettingsService: VaultTimeoutSettingsService,
     protected kdfConfigService: KdfConfigService,
     protected taskSchedulerService: TaskSchedulerService,
+    protected configService: ConfigService,
   ) {
     this.currentAuthnTypeState = this.stateProvider.get(CURRENT_LOGIN_STRATEGY_KEY);
     this.loginStrategyCacheState = this.stateProvider.get(CACHE_KEY);
@@ -400,6 +402,7 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
       this.vaultTimeoutSettingsService,
       this.kdfConfigService,
       this.environmentService,
+      this.configService,
     ];
 
     return source.pipe(
diff --git a/libs/auth/src/common/services/logout/default-logout.service.spec.ts b/libs/auth/src/common/services/logout/default-logout.service.spec.ts
new file mode 100644
index 00000000000..3febd841695
--- /dev/null
+++ b/libs/auth/src/common/services/logout/default-logout.service.spec.ts
@@ -0,0 +1,40 @@
+import { MockProxy, mock } from "jest-mock-extended";
+
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { UserId } from "@bitwarden/common/types/guid";
+
+import { LogoutService } from "../../abstractions";
+import { LogoutReason } from "../../types";
+
+import { DefaultLogoutService } from "./default-logout.service";
+
+describe("DefaultLogoutService", () => {
+  let logoutService: LogoutService;
+  let messagingService: MockProxy<MessagingService>;
+
+  beforeEach(() => {
+    messagingService = mock<MessagingService>();
+    logoutService = new DefaultLogoutService(messagingService);
+  });
+
+  it("instantiates", () => {
+    expect(logoutService).not.toBeFalsy();
+  });
+
+  describe("logout", () => {
+    it("sends logout message without a logout reason when not provided", async () => {
+      const userId = "1" as UserId;
+
+      await logoutService.logout(userId);
+
+      expect(messagingService.send).toHaveBeenCalledWith("logout", { userId });
+    });
+
+    it("sends logout message with a logout reason when provided", async () => {
+      const userId = "1" as UserId;
+      const logoutReason: LogoutReason = "vaultTimeout";
+      await logoutService.logout(userId, logoutReason);
+      expect(messagingService.send).toHaveBeenCalledWith("logout", { userId, logoutReason });
+    });
+  });
+});
diff --git a/libs/auth/src/common/services/logout/default-logout.service.ts b/libs/auth/src/common/services/logout/default-logout.service.ts
new file mode 100644
index 00000000000..4e96c7cfba1
--- /dev/null
+++ b/libs/auth/src/common/services/logout/default-logout.service.ts
@@ -0,0 +1,14 @@
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { UserId } from "@bitwarden/common/types/guid";
+
+import { LogoutService, NewActiveUser } from "../../abstractions/logout.service";
+import { LogoutReason } from "../../types";
+
+export class DefaultLogoutService implements LogoutService {
+  constructor(protected messagingService: MessagingService) {}
+  async logout(userId: UserId, logoutReason?: LogoutReason): Promise<NewActiveUser | undefined> {
+    this.messagingService.send("logout", { userId, logoutReason });
+
+    return undefined;
+  }
+}
diff --git a/libs/auth/tsconfig.json b/libs/auth/tsconfig.json
index 8d08522ffce..9c607a26b09 100644
--- a/libs/auth/tsconfig.json
+++ b/libs/auth/tsconfig.json
@@ -1,23 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "resolveJsonModule": true,
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/angular": ["../auth/src/angular"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/components": ["../components/src"],
-      "@bitwarden/generator-core": ["../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/auth/tsconfig.spec.json b/libs/auth/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/libs/auth/tsconfig.spec.json
+++ b/libs/auth/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/libs/billing/jest.config.js b/libs/billing/jest.config.js
index c43606191b9..0aa13381668 100644
--- a/libs/billing/jest.config.js
+++ b/libs/billing/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
@@ -8,9 +8,8 @@ const sharedConfig = require("../../libs/shared/jest.config.angular");
 module.exports = {
   ...sharedConfig,
   displayName: "libs/billing tests",
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
+    prefix: "<rootDir>/../../",
   }),
 };
diff --git a/libs/billing/tsconfig.json b/libs/billing/tsconfig.json
index bb08eb89d1c..9c607a26b09 100644
--- a/libs/billing/tsconfig.json
+++ b/libs/billing/tsconfig.json
@@ -1,6 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {},
+  "extends": "../../tsconfig.base",
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/billing/tsconfig.spec.json b/libs/billing/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/libs/billing/tsconfig.spec.json
+++ b/libs/billing/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/libs/common/jest.config.js b/libs/common/jest.config.js
index 7e6c0997b9c..a1e14ee62f8 100644
--- a/libs/common/jest.config.js
+++ b/libs/common/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../shared/jest.config.ts");
 
@@ -12,6 +12,6 @@ module.exports = {
   testEnvironment: "jsdom",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
+    prefix: "<rootDir>/../../",
   }),
 };
diff --git a/libs/common/spec/fake-storage.service.ts b/libs/common/spec/fake-storage.service.ts
index c6d989c5abf..1eae3dbfbe3 100644
--- a/libs/common/spec/fake-storage.service.ts
+++ b/libs/common/spec/fake-storage.service.ts
@@ -1,119 +1 @@
-import { MockProxy, mock } from "jest-mock-extended";
-import { Subject } from "rxjs";
-
-import {
-  AbstractStorageService,
-  ObservableStorageService,
-  StorageUpdate,
-} from "../src/platform/abstractions/storage.service";
-import { StorageOptions } from "../src/platform/models/domain/storage-options";
-
-const INTERNAL_KEY = "__internal__";
-
-export class FakeStorageService implements AbstractStorageService, ObservableStorageService {
-  private store: Record<string, unknown>;
-  private updatesSubject = new Subject<StorageUpdate>();
-  private _valuesRequireDeserialization = false;
-
-  /**
-   * Returns a mock of a {@see AbstractStorageService} for asserting the expected
-   * amount of calls. It is not recommended to use this to mock implementations as
-   * they are not respected.
-   */
-  mock: MockProxy<AbstractStorageService>;
-
-  constructor(initial?: Record<string, unknown>) {
-    this.store = initial ?? {};
-    this.mock = mock<AbstractStorageService>();
-  }
-
-  /**
-   * Updates the internal store for this fake implementation, this bypasses any mock calls
-   * or updates to the {@link updates$} observable.
-   * @param store
-   */
-  internalUpdateStore(store: Record<string, unknown>) {
-    this.store = store;
-  }
-
-  get internalStore() {
-    return this.store;
-  }
-
-  internalUpdateValuesRequireDeserialization(value: boolean) {
-    this._valuesRequireDeserialization = value;
-  }
-
-  get valuesRequireDeserialization(): boolean {
-    return this._valuesRequireDeserialization;
-  }
-
-  get updates$() {
-    return this.updatesSubject.asObservable();
-  }
-
-  get<T>(key: string, options?: StorageOptions): Promise<T> {
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.mock.get(key, options);
-    const value = this.store[key] as T;
-    return Promise.resolve(value);
-  }
-  has(key: string, options?: StorageOptions): Promise<boolean> {
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.mock.has(key, options);
-    return Promise.resolve(this.store[key] != null);
-  }
-  async save<T>(key: string, obj: T, options?: StorageOptions): Promise<void> {
-    // These exceptions are copied from https://github.com/sindresorhus/conf/blob/608adb0c46fb1680ddbd9833043478367a64c120/source/index.ts#L193-L203
-    // which is a library that is used by `ElectronStorageService`. We add them here to ensure that the behavior in our testing mirrors the real world.
-    if (typeof key !== "string" && typeof key !== "object") {
-      throw new TypeError(
-        `Expected \`key\` to be of type \`string\` or \`object\`, got ${typeof key}`,
-      );
-    }
-
-    // We don't throw this error because ElectronStorageService automatically detects this case
-    // and calls `delete()` instead of `set()`.
-    // if (typeof key !== "object" && obj === undefined) {
-    //   throw new TypeError("Use `delete()` to clear values");
-    // }
-
-    if (this._containsReservedKey(key)) {
-      throw new TypeError(
-        `Please don't use the ${INTERNAL_KEY} key, as it's used to manage this module internal operations.`,
-      );
-    }
-
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.mock.save(key, obj, options);
-    this.store[key] = obj;
-    this.updatesSubject.next({ key: key, updateType: "save" });
-  }
-  remove(key: string, options?: StorageOptions): Promise<void> {
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.mock.remove(key, options);
-    delete this.store[key];
-    this.updatesSubject.next({ key: key, updateType: "remove" });
-    return Promise.resolve();
-  }
-
-  private _containsReservedKey(key: string | Partial<unknown>): boolean {
-    if (typeof key === "object") {
-      const firsKey = Object.keys(key)[0];
-
-      if (firsKey === INTERNAL_KEY) {
-        return true;
-      }
-    }
-
-    if (typeof key !== "string") {
-      return false;
-    }
-
-    return false;
-  }
-}
+export { FakeStorageService } from "@bitwarden/storage-test-utils";
diff --git a/libs/common/spec/jest-sdk-client-factory.ts b/libs/common/spec/jest-sdk-client-factory.ts
index ff120ccd787..8e5e1c9d3fc 100644
--- a/libs/common/spec/jest-sdk-client-factory.ts
+++ b/libs/common/spec/jest-sdk-client-factory.ts
@@ -1,9 +1,11 @@
-import { ClientSettings, LogLevel, BitwardenClient } from "@bitwarden/sdk-internal";
+import { BitwardenClient } from "@bitwarden/sdk-internal";
 
 import { SdkClientFactory } from "../src/platform/abstractions/sdk/sdk-client-factory";
 
 export class DefaultSdkClientFactory implements SdkClientFactory {
-  createSdkClient(settings?: ClientSettings, log_level?: LogLevel): Promise<BitwardenClient> {
+  createSdkClient(
+    ...args: ConstructorParameters<typeof BitwardenClient>
+  ): Promise<BitwardenClient> {
     throw new Error("Method not implemented.");
   }
 }
diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts
index 49543e2f2ce..4969e87f1c6 100644
--- a/libs/common/src/abstractions/api.service.ts
+++ b/libs/common/src/abstractions/api.service.ts
@@ -21,7 +21,6 @@ import { ProviderUserBulkRequest } from "../admin-console/models/request/provide
 import { ProviderUserConfirmRequest } from "../admin-console/models/request/provider/provider-user-confirm.request";
 import { ProviderUserInviteRequest } from "../admin-console/models/request/provider/provider-user-invite.request";
 import { ProviderUserUpdateRequest } from "../admin-console/models/request/provider/provider-user-update.request";
-import { SelectionReadOnlyRequest } from "../admin-console/models/request/selection-read-only.request";
 import {
   OrganizationConnectionConfigApis,
   OrganizationConnectionResponse,
@@ -208,7 +207,7 @@ export abstract class ApiService {
   deleteManyCiphersAdmin: (request: CipherBulkDeleteRequest) => Promise<any>;
   putMoveCiphers: (request: CipherBulkMoveRequest) => Promise<any>;
   putShareCipher: (id: string, request: CipherShareRequest) => Promise<CipherResponse>;
-  putShareCiphers: (request: CipherBulkShareRequest) => Promise<any>;
+  putShareCiphers: (request: CipherBulkShareRequest) => Promise<ListResponse<CipherResponse>>;
   putCipherCollections: (
     id: string,
     request: CipherCollectionsRequest,
@@ -228,16 +227,6 @@ export abstract class ApiService {
     request: CipherBulkRestoreRequest,
   ) => Promise<ListResponse<CipherResponse>>;
 
-  /**
-   * @deprecated Mar 25 2021: This method has been deprecated in favor of direct uploads.
-   * This method still exists for backward compatibility with old server versions.
-   */
-  postCipherAttachmentLegacy: (id: string, data: FormData) => Promise<CipherResponse>;
-  /**
-   * @deprecated Mar 25 2021: This method has been deprecated in favor of direct uploads.
-   * This method still exists for backward compatibility with old server versions.
-   */
-  postCipherAttachmentAdminLegacy: (id: string, data: FormData) => Promise<CipherResponse>;
   postCipherAttachment: (
     id: string,
     request: AttachmentRequest,
@@ -270,11 +259,6 @@ export abstract class ApiService {
     organizationId: string,
     request: CollectionRequest,
   ) => Promise<CollectionDetailsResponse>;
-  putCollectionUsers: (
-    organizationId: string,
-    id: string,
-    request: SelectionReadOnlyRequest[],
-  ) => Promise<any>;
   putCollection: (
     organizationId: string,
     id: string,
@@ -282,11 +266,6 @@ export abstract class ApiService {
   ) => Promise<CollectionDetailsResponse>;
   deleteCollection: (organizationId: string, id: string) => Promise<any>;
   deleteManyCollections: (organizationId: string, collectionIds: string[]) => Promise<any>;
-  deleteCollectionUser: (
-    organizationId: string,
-    id: string,
-    organizationUserId: string,
-  ) => Promise<any>;
 
   getGroupUsers: (organizationId: string, id: string) => Promise<string[]>;
   deleteGroupUser: (organizationId: string, id: string, organizationUserId: string) => Promise<any>;
diff --git a/libs/common/src/abstractions/audit.service.ts b/libs/common/src/abstractions/audit.service.ts
index a54beb59a78..b019ebe1fe8 100644
--- a/libs/common/src/abstractions/audit.service.ts
+++ b/libs/common/src/abstractions/audit.service.ts
@@ -1,8 +1,17 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { BreachAccountResponse } from "../models/response/breach-account.response";
 
 export abstract class AuditService {
-  passwordLeaked: (password: string) => Promise<number>;
-  breachedAccounts: (username: string) => Promise<BreachAccountResponse[]>;
+  /**
+   * Checks how many times a password has been leaked.
+   * @param password The password to check.
+   * @returns A promise that resolves to the number of times the password has been leaked.
+   */
+  abstract passwordLeaked: (password: string) => Promise<number>;
+
+  /**
+   * Retrieves accounts that have been breached for a given username.
+   * @param username The username to check for breaches.
+   * @returns A promise that resolves to an array of BreachAccountResponse objects.
+   */
+  abstract breachedAccounts: (username: string) => Promise<BreachAccountResponse[]>;
 }
diff --git a/libs/common/src/admin-console/abstractions/policy/policy.service.abstraction.ts b/libs/common/src/admin-console/abstractions/policy/policy.service.abstraction.ts
index bf02872ed7c..8df7e44986b 100644
--- a/libs/common/src/admin-console/abstractions/policy/policy.service.abstraction.ts
+++ b/libs/common/src/admin-console/abstractions/policy/policy.service.abstraction.ts
@@ -50,6 +50,25 @@ export abstract class PolicyService {
     policies?: Policy[],
   ) => Observable<MasterPasswordPolicyOptions | undefined>;
 
+  /**
+   * Combines all Master Password policies that are passed in and returns
+   * back the strongest combination of all the policies in the form of a
+   * MasterPasswordPolicyOptions.
+   * @param policies
+   */
+  abstract combinePoliciesIntoMasterPasswordPolicyOptions(
+    policies: Policy[],
+  ): MasterPasswordPolicyOptions | undefined;
+
+  /**
+   * Takes an arbitrary amount of Master Password Policy options in any form and merges them
+   * together using the strictest combination of all of them.
+   * @param masterPasswordPolicyOptions
+   */
+  abstract combineMasterPasswordPolicyOptions(
+    ...masterPasswordPolicyOptions: MasterPasswordPolicyOptions[]
+  ): MasterPasswordPolicyOptions | undefined;
+
   /**
    * Evaluates whether a proposed Master Password complies with all Master Password policies that apply to the user.
    */
diff --git a/libs/common/src/admin-console/enums/policy-type.enum.ts b/libs/common/src/admin-console/enums/policy-type.enum.ts
index 42ab798eabf..91f3a8229f8 100644
--- a/libs/common/src/admin-console/enums/policy-type.enum.ts
+++ b/libs/common/src/admin-console/enums/policy-type.enum.ts
@@ -6,7 +6,7 @@ export enum PolicyType {
   PasswordGenerator = 2, // Sets minimum requirements/default type for generated passwords/passphrases
   SingleOrg = 3, // Allows users to only be apart of one organization
   RequireSso = 4, // Requires users to authenticate with SSO
-  PersonalOwnership = 5, // Disables personal vault ownership for adding/cloning items
+  OrganizationDataOwnership = 5, // Enforces organization ownership items added/cloned to the default collection
   DisableSend = 6, // Disables the ability to create and edit Bitwarden Sends
   SendOptions = 7, // Sets restrictions or defaults for Bitwarden Sends
   ResetPassword = 8, // Allows orgs to use reset password : also can enable auto-enrollment during invite flow
@@ -16,4 +16,5 @@ export enum PolicyType {
   AutomaticAppLogIn = 12, // Enables automatic log in of apps from configured identity provider
   FreeFamiliesSponsorshipPolicy = 13, // Disables free families plan for organization
   RemoveUnlockWithPin = 14, // Do not allow members to unlock their account with a PIN.
+  RestrictedItemTypes = 15, // Restricts item types that can be created within an organization
 }
diff --git a/libs/common/src/admin-console/services/policy/default-policy.service.spec.ts b/libs/common/src/admin-console/services/policy/default-policy.service.spec.ts
index 7787bdbc943..9db61ec5c95 100644
--- a/libs/common/src/admin-console/services/policy/default-policy.service.spec.ts
+++ b/libs/common/src/admin-console/services/policy/default-policy.service.spec.ts
@@ -536,6 +536,152 @@ describe("PolicyService", () => {
     });
   });
 
+  describe("combinePoliciesIntoMasterPasswordPolicyOptions", () => {
+    let policyService: DefaultPolicyService;
+    let stateProvider: FakeStateProvider;
+    let organizationService: MockProxy<OrganizationService>;
+
+    beforeEach(() => {
+      stateProvider = new FakeStateProvider(mockAccountServiceWith(userId));
+      organizationService = mock<OrganizationService>();
+      policyService = new DefaultPolicyService(stateProvider, organizationService);
+    });
+
+    it("returns undefined when there are no policies", () => {
+      const result = policyService.combinePoliciesIntoMasterPasswordPolicyOptions([]);
+      expect(result).toBeUndefined();
+    });
+
+    it("returns options for a single policy", () => {
+      const masterPasswordPolicyRequirements = {
+        minComplexity: 3,
+        minLength: 10,
+        requireUpper: true,
+      };
+      const policies = [
+        new Policy(
+          policyData(
+            "1",
+            "org1",
+            PolicyType.MasterPassword,
+            true,
+            masterPasswordPolicyRequirements,
+          ),
+        ),
+      ];
+
+      const result = policyService.combinePoliciesIntoMasterPasswordPolicyOptions(policies);
+
+      expect(result).toEqual({
+        minComplexity: 3,
+        minLength: 10,
+        requireUpper: true,
+        requireLower: false,
+        requireNumbers: false,
+        requireSpecial: false,
+        enforceOnLogin: false,
+      });
+    });
+
+    it("merges options from multiple policies", () => {
+      const masterPasswordPolicyRequirements1 = {
+        minComplexity: 3,
+        minLength: 10,
+        requireUpper: true,
+      };
+      const masterPasswordPolicyRequirements2 = { minComplexity: 5, requireNumbers: true };
+      const policies = [
+        new Policy(
+          policyData(
+            "1",
+            "org1",
+            PolicyType.MasterPassword,
+            true,
+            masterPasswordPolicyRequirements1,
+          ),
+        ),
+        new Policy(
+          policyData(
+            "2",
+            "org2",
+            PolicyType.MasterPassword,
+            true,
+            masterPasswordPolicyRequirements2,
+          ),
+        ),
+      ];
+
+      const result = policyService.combinePoliciesIntoMasterPasswordPolicyOptions(policies);
+
+      expect(result).toEqual({
+        minComplexity: 5,
+        minLength: 10,
+        requireUpper: true,
+        requireLower: false,
+        requireNumbers: true,
+        requireSpecial: false,
+        enforceOnLogin: false,
+      });
+    });
+
+    it("ignores disabled policies", () => {
+      const masterPasswordPolicyRequirements = {
+        minComplexity: 3,
+        minLength: 10,
+        requireUpper: true,
+      };
+      const policies = [
+        new Policy(
+          policyData(
+            "1",
+            "org1",
+            PolicyType.MasterPassword,
+            false,
+            masterPasswordPolicyRequirements,
+          ),
+        ),
+      ];
+
+      const result = policyService.combinePoliciesIntoMasterPasswordPolicyOptions(policies);
+
+      expect(result).toBeUndefined();
+    });
+
+    it("ignores policies with no data", () => {
+      const policies = [new Policy(policyData("1", "org1", PolicyType.MasterPassword, true))];
+
+      const result = policyService.combinePoliciesIntoMasterPasswordPolicyOptions(policies);
+
+      expect(result).toBeUndefined();
+    });
+
+    it("returns undefined when policies are not MasterPassword related", () => {
+      const unrelatedPolicyRequirements = {
+        minComplexity: 3,
+        minLength: 10,
+        requireUpper: true,
+      };
+      const policies = [
+        new Policy(
+          policyData(
+            "1",
+            "org1",
+            PolicyType.MaximumVaultTimeout,
+            true,
+            unrelatedPolicyRequirements,
+          ),
+        ),
+        new Policy(
+          policyData("2", "org2", PolicyType.DisableSend, true, unrelatedPolicyRequirements),
+        ),
+      ];
+
+      const result = policyService.combinePoliciesIntoMasterPasswordPolicyOptions(policies);
+
+      expect(result).toBeUndefined();
+    });
+  });
+
   function policyData(
     id: string,
     organizationId: string,
diff --git a/libs/common/src/admin-console/services/policy/default-policy.service.ts b/libs/common/src/admin-console/services/policy/default-policy.service.ts
index 1158d29d737..667dd9082a4 100644
--- a/libs/common/src/admin-console/services/policy/default-policy.service.ts
+++ b/libs/common/src/admin-console/services/policy/default-policy.service.ts
@@ -89,6 +89,8 @@ export class DefaultPolicyService implements PolicyService {
     const policies$ = policies ? of(policies) : this.policies$(userId);
     return policies$.pipe(
       map((obsPolicies) => {
+        // TODO: replace with this.combinePoliciesIntoMasterPasswordPolicyOptions(obsPolicies)) once
+        // FeatureFlag.PM16117_ChangeExistingPasswordRefactor is removed.
         let enforcedOptions: MasterPasswordPolicyOptions | undefined = undefined;
         const filteredPolicies =
           obsPolicies.filter((p) => p.type === PolicyType.MasterPassword) ?? [];
@@ -146,6 +148,47 @@ export class DefaultPolicyService implements PolicyService {
     );
   }
 
+  combinePoliciesIntoMasterPasswordPolicyOptions(
+    policies: Policy[],
+  ): MasterPasswordPolicyOptions | undefined {
+    let enforcedOptions: MasterPasswordPolicyOptions | undefined = undefined;
+    const filteredPolicies = policies.filter((p) => p.type === PolicyType.MasterPassword) ?? [];
+
+    if (filteredPolicies.length === 0) {
+      return;
+    }
+
+    filteredPolicies.forEach((currentPolicy) => {
+      if (!currentPolicy.enabled || !currentPolicy.data) {
+        return undefined;
+      }
+
+      if (!enforcedOptions) {
+        enforcedOptions = new MasterPasswordPolicyOptions();
+      }
+
+      this.mergeMasterPasswordPolicyOptions(enforcedOptions, currentPolicy.data);
+    });
+
+    return enforcedOptions;
+  }
+
+  combineMasterPasswordPolicyOptions(
+    ...policies: MasterPasswordPolicyOptions[]
+  ): MasterPasswordPolicyOptions | undefined {
+    let combinedOptions: MasterPasswordPolicyOptions | undefined = undefined;
+
+    policies.forEach((currentOptions) => {
+      if (!combinedOptions) {
+        combinedOptions = new MasterPasswordPolicyOptions();
+      }
+
+      this.mergeMasterPasswordPolicyOptions(combinedOptions, currentOptions);
+    });
+
+    return combinedOptions;
+  }
+
   evaluateMasterPassword(
     passwordStrength: number,
     newPassword: string,
@@ -228,17 +271,45 @@ export class DefaultPolicyService implements PolicyService {
       case PolicyType.MaximumVaultTimeout:
         // Max Vault Timeout applies to everyone except owners
         return organization.isOwner;
+      // the following policies apply to everyone
       case PolicyType.PasswordGenerator:
-        // password generation policy applies to everyone
+        // password generation policy
         return false;
-      case PolicyType.PersonalOwnership:
-        // individual vault policy applies to everyone except admins and owners
-        return organization.isAdmin;
       case PolicyType.FreeFamiliesSponsorshipPolicy:
-        // free Bitwarden families policy applies to everyone
+        // free Bitwarden families policy
         return false;
+      case PolicyType.RestrictedItemTypes:
+        // restricted item types policy
+        return false;
+      case PolicyType.OrganizationDataOwnership:
+        // organization data ownership policy applies to everyone except admins and owners
+        return organization.isAdmin;
       default:
         return organization.canManagePolicies;
     }
   }
+
+  private mergeMasterPasswordPolicyOptions(
+    target: MasterPasswordPolicyOptions | undefined,
+    source: MasterPasswordPolicyOptions | undefined,
+  ) {
+    if (!target) {
+      target = new MasterPasswordPolicyOptions();
+    }
+
+    // For complexity and minLength, take the highest value.
+    // For boolean settings, enable it if either policy has it enabled (OR).
+    if (source) {
+      target.minComplexity = Math.max(
+        target.minComplexity,
+        source.minComplexity ?? target.minComplexity,
+      );
+      target.minLength = Math.max(target.minLength, source.minLength ?? target.minLength);
+      target.requireUpper = Boolean(target.requireUpper || source.requireUpper);
+      target.requireLower = Boolean(target.requireLower || source.requireLower);
+      target.requireNumbers = Boolean(target.requireNumbers || source.requireNumbers);
+      target.requireSpecial = Boolean(target.requireSpecial || source.requireSpecial);
+      target.enforceOnLogin = Boolean(target.enforceOnLogin || source.enforceOnLogin);
+    }
+  }
 }
diff --git a/libs/common/src/auth/models/domain/force-set-password-reason.ts b/libs/common/src/auth/models/domain/force-set-password-reason.ts
index 68392125281..9e2069b30d6 100644
--- a/libs/common/src/auth/models/domain/force-set-password-reason.ts
+++ b/libs/common/src/auth/models/domain/force-set-password-reason.ts
@@ -1,41 +1,67 @@
-/*
- * This enum is used to determine if a user should be forced to initially set or reset their password
- * on login (server flag) or unlock via MP (client evaluation).
+/**
+ * This enum is used to determine if a user should be forced to set an initial password or
+ * change their existing password upon login (communicated via server flag) or upon unlocking
+ * with their master password (set via client evaluation).
  */
 // FIXME: update to use a const object instead of a typescript enum
 // eslint-disable-next-line @bitwarden/platform/no-enums
 export enum ForceSetPasswordReason {
   /**
-   * A password reset should not be forced.
+   * A password set/change should not be forced.
    */
   None,
 
-  /**
-   * Occurs when an organization admin forces a user to reset their password.
-   * Communicated via server flag.
-   */
-  AdminForcePasswordReset,
+  /*--------------------------
+      Set Initial Password  
+  ---------------------------*/
 
   /**
-   * Occurs when a user logs in / unlocks their vault with a master password that does not meet an organization's
-   * master password policy that is enforced on login/unlock.
-   * Only set client side b/c server can't evaluate MP.
+   * Occurs when a user JIT provisions into a master-password-encryption org via SSO and must set their initial password.
    */
-  WeakMasterPassword,
+  SsoNewJitProvisionedUser,
 
   /**
-   * Occurs when a TDE user without a password obtains the password reset permission.
+   * Occurs when a TDE org user without a password obtains the password reset ("manage account recovery")
+   * permission, which requires the TDE user to have/set a password.
+   *
    * Set post login & decryption client side and by server in sync (to catch logged in users).
    */
   TdeUserWithoutPasswordHasPasswordResetPermission,
 
   /**
-   * Occurs when TDE is disabled and master password has to be set.
+   * Occurs when an org admin switches the org from trusted-device-encryption to master-password-encryption,
+   * which forces the org user to set an initial password. User must not already have a master password,
+   * and they must be on a previously trusted device.
+   *
+   * Communicated via server flag.
    */
   TdeOffboarding,
 
   /**
-   * Occurs when a new SSO user is JIT provisioned and needs to set their master password.
+   * Occurs when an org admin switches the org from trusted-device-encryption to master-password-encryption,
+   * which forces the org user to set an initial password. User must not already have a master password,
+   * and they must be on an untrusted device.
+   *
+   * Calculated on client based on server flags and user state.
    */
-  SsoNewJitProvisionedUser,
+  TdeOffboardingUntrustedDevice,
+
+  /*----------------------------
+      Change Existing Password  
+  -----------------------------*/
+
+  /**
+   * Occurs when an org admin forces a user to change their password via Account Recovery.
+   *
+   * Communicated via server flag.
+   */
+  AdminForcePasswordReset,
+
+  /**
+   * Occurs when a user logs in / unlocks their vault with a master password that does not meet an org's
+   * master password policy that is enforced on login/unlock.
+   *
+   * Only set client side b/c server can't evaluate MP.
+   */
+  WeakMasterPassword,
 }
diff --git a/libs/common/src/auth/models/response/auth-request.response.ts b/libs/common/src/auth/models/response/auth-request.response.ts
index 372ae047f4d..94c65000919 100644
--- a/libs/common/src/auth/models/response/auth-request.response.ts
+++ b/libs/common/src/auth/models/response/auth-request.response.ts
@@ -18,6 +18,7 @@ export class AuthRequestResponse extends BaseResponse {
   responseDate?: string;
   isAnswered: boolean;
   isExpired: boolean;
+  deviceId?: string; // could be null or empty
 
   constructor(response: any) {
     super(response);
@@ -33,6 +34,7 @@ export class AuthRequestResponse extends BaseResponse {
     this.creationDate = this.getResponseProperty("CreationDate");
     this.requestApproved = this.getResponseProperty("RequestApproved");
     this.responseDate = this.getResponseProperty("ResponseDate");
+    this.deviceId = this.getResponseProperty("RequestDeviceId");
 
     const requestDate = new Date(this.creationDate);
     const requestDateUTC = Date.UTC(
diff --git a/libs/common/src/auth/models/response/identity-token.response.ts b/libs/common/src/auth/models/response/identity-token.response.ts
index 3e2896eec64..2d991e9f349 100644
--- a/libs/common/src/auth/models/response/identity-token.response.ts
+++ b/libs/common/src/auth/models/response/identity-token.response.ts
@@ -5,6 +5,7 @@
 import { KdfType } from "@bitwarden/key-management";
 
 import { BaseResponse } from "../../../models/response/base.response";
+import { EncString } from "../../../platform/models/domain/enc-string";
 
 import { MasterPasswordPolicyResponse } from "./master-password-policy.response";
 import { UserDecryptionOptionsResponse } from "./user-decryption-options/user-decryption-options.response";
@@ -16,8 +17,8 @@ export class IdentityTokenResponse extends BaseResponse {
   tokenType: string;
 
   resetMasterPassword: boolean;
-  privateKey: string;
-  key: string;
+  privateKey: string; // userKeyEncryptedPrivateKey
+  key?: EncString; // masterKeyEncryptedUserKey
   twoFactorToken: string;
   kdf: KdfType;
   kdfIterations: number;
@@ -39,7 +40,10 @@ export class IdentityTokenResponse extends BaseResponse {
 
     this.resetMasterPassword = this.getResponseProperty("ResetMasterPassword");
     this.privateKey = this.getResponseProperty("PrivateKey");
-    this.key = this.getResponseProperty("Key");
+    const key = this.getResponseProperty("Key");
+    if (key) {
+      this.key = new EncString(key);
+    }
     this.twoFactorToken = this.getResponseProperty("TwoFactorToken");
     this.kdf = this.getResponseProperty("Kdf");
     this.kdfIterations = this.getResponseProperty("KdfIterations");
@@ -58,4 +62,8 @@ export class IdentityTokenResponse extends BaseResponse {
       );
     }
   }
+
+  hasMasterKeyEncryptedUserKey(): boolean {
+    return Boolean(this.key);
+  }
 }
diff --git a/libs/common/src/auth/services/organization-invite/default-organization-invite.service.ts b/libs/common/src/auth/services/organization-invite/default-organization-invite.service.ts
new file mode 100644
index 00000000000..0ebbbaa8c0c
--- /dev/null
+++ b/libs/common/src/auth/services/organization-invite/default-organization-invite.service.ts
@@ -0,0 +1,26 @@
+import { OrganizationInvite } from "@bitwarden/common/auth/services/organization-invite/organization-invite";
+import { OrganizationInviteService } from "@bitwarden/common/auth/services/organization-invite/organization-invite.service";
+
+export class DefaultOrganizationInviteService implements OrganizationInviteService {
+  /**
+   * No-op implementation.
+   */
+  async getOrganizationInvite(): Promise<OrganizationInvite | null> {
+    return null;
+  }
+
+  /**
+   * No-op implementation.
+   * @param invite an organization invite
+   */
+  async setOrganizationInvitation(invite: OrganizationInvite): Promise<void> {
+    return;
+  }
+
+  /**
+   * No-op implementation.
+   * */
+  async clearOrganizationInvitation(): Promise<void> {
+    return;
+  }
+}
diff --git a/libs/common/src/auth/services/organization-invite/organization-invite-state.ts b/libs/common/src/auth/services/organization-invite/organization-invite-state.ts
new file mode 100644
index 00000000000..c544fa3269f
--- /dev/null
+++ b/libs/common/src/auth/services/organization-invite/organization-invite-state.ts
@@ -0,0 +1,13 @@
+import { OrganizationInvite } from "@bitwarden/common/auth/services/organization-invite/organization-invite";
+import { KeyDefinition, ORGANIZATION_INVITE_DISK } from "@bitwarden/common/platform/state";
+
+// We're storing the organization invite for 2 reasons:
+// 1. If the org requires a MP policy check, we need to keep track that the user has already been redirected when they return.
+// 2. The MP policy check happens on login/register flows, we need to store the token to retrieve the policies then.
+export const ORGANIZATION_INVITE = new KeyDefinition<OrganizationInvite | null>(
+  ORGANIZATION_INVITE_DISK,
+  "organizationInvite",
+  {
+    deserializer: (invite) => (invite ? OrganizationInvite.fromJSON(invite) : null),
+  },
+);
diff --git a/libs/common/src/auth/services/organization-invite/organization-invite.service.ts b/libs/common/src/auth/services/organization-invite/organization-invite.service.ts
new file mode 100644
index 00000000000..15d9b1533f5
--- /dev/null
+++ b/libs/common/src/auth/services/organization-invite/organization-invite.service.ts
@@ -0,0 +1,20 @@
+import { OrganizationInvite } from "@bitwarden/common/auth/services/organization-invite/organization-invite";
+
+export abstract class OrganizationInviteService {
+  /**
+   * Returns the currently stored organization invite
+   */
+  abstract getOrganizationInvite: () => Promise<OrganizationInvite | null>;
+
+  /**
+   * Stores a new organization invite
+   * @param invite an organization invite
+   * @throws if the invite is nullish
+   */
+  abstract setOrganizationInvitation: (invite: OrganizationInvite) => Promise<void>;
+
+  /**
+   * Clears the currently stored organization invite
+   */
+  abstract clearOrganizationInvitation: () => Promise<void>;
+}
diff --git a/libs/common/src/auth/services/organization-invite/organization-invite.ts b/libs/common/src/auth/services/organization-invite/organization-invite.ts
new file mode 100644
index 00000000000..d18fdcedb41
--- /dev/null
+++ b/libs/common/src/auth/services/organization-invite/organization-invite.ts
@@ -0,0 +1,20 @@
+import { Jsonify } from "type-fest";
+
+export class OrganizationInvite {
+  email?: string;
+  initOrganization?: boolean;
+  orgSsoIdentifier?: string;
+  orgUserHasExistingUser?: boolean;
+  organizationId?: string;
+  organizationName?: string;
+  organizationUserId?: string;
+  token?: string;
+
+  static fromJSON(json: Jsonify<OrganizationInvite>): OrganizationInvite | null {
+    if (json == null) {
+      return null;
+    }
+
+    return Object.assign(new OrganizationInvite(), json);
+  }
+}
diff --git a/libs/common/src/auth/utils/assert-non-nullish.util.ts b/libs/common/src/auth/utils/assert-non-nullish.util.ts
new file mode 100644
index 00000000000..91fb8ef44b8
--- /dev/null
+++ b/libs/common/src/auth/utils/assert-non-nullish.util.ts
@@ -0,0 +1,45 @@
+/**
+ * Asserts that a value is non-nullish (not `null` or `undefined`); throws if value is nullish.
+ *
+ * @param val the value to check
+ * @param name the name of the value to include in the error message
+ * @param ctx context to optionally append to the error message
+ * @throws if the value is null or undefined
+ *
+ * @example
+ *
+ * ```
+ *    // `newPasswordHint` can have an empty string as a valid value, so we check non-nullish
+ *    this.assertNonNullish(
+ *      passwordInputResult.newPasswordHint,
+ *      "newPasswordHint",
+ *      "Could not set initial password."
+ *    );
+ *    // Output error message: "newPasswordHint is null or undefined. Could not set initial password."
+ * ```
+ *
+ * @remarks
+ *
+ * If you use this method repeatedly to check several values, it may help to assign any
+ * additional context (`ctx`) to a variable and pass it in to each call. This prevents the
+ * call from reformatting vertically via prettier in your text editor, taking up multiple lines.
+ *
+ * For example:
+ * ```
+ *    const ctx = "Could not set initial password.";
+ *
+ *    this.assertNonNullish(valueOne, "valueOne", ctx);
+ *    this.assertNonNullish(valueTwo, "valueTwo", ctx);
+ *    this.assertNonNullish(valueThree, "valueThree", ctx);
+ * ```
+ */
+export function assertNonNullish<T>(
+  val: T,
+  name: string,
+  ctx?: string,
+): asserts val is NonNullable<T> {
+  if (val == null) {
+    // If context is provided, append it to the error message with a space before it.
+    throw new Error(`${name} is null or undefined.${ctx ? ` ${ctx}` : ""}`);
+  }
+}
diff --git a/libs/common/src/auth/utils/assert-truthy.util.ts b/libs/common/src/auth/utils/assert-truthy.util.ts
new file mode 100644
index 00000000000..8e003186929
--- /dev/null
+++ b/libs/common/src/auth/utils/assert-truthy.util.ts
@@ -0,0 +1,46 @@
+/**
+ * Asserts that a value is truthy; throws if value is falsy.
+ *
+ * @param val the value to check
+ * @param name the name of the value to include in the error message
+ * @param ctx context to optionally append to the error message
+ * @throws if the value is falsy (`false`, `""`, `0`, `null`, `undefined`, `void`, or `NaN`)
+ *
+ * @example
+ *
+ * ```
+ *    this.assertTruthy(
+ *      this.organizationId,
+ *      "organizationId",
+ *      "Could not set initial password."
+ *    );
+ *    // Output error message: "organizationId is falsy. Could not set initial password."
+ * ```
+ *
+ * @remarks
+ *
+ * If you use this method repeatedly to check several values, it may help to assign any
+ * additional context (`ctx`) to a variable and pass it in to each call. This prevents the
+ * call from reformatting vertically via prettier in your text editor, taking up multiple lines.
+ *
+ * For example:
+ * ```
+ *    const ctx = "Could not set initial password.";
+ *
+ *    this.assertTruthy(valueOne, "valueOne", ctx);
+ *    this.assertTruthy(valueTwo, "valueTwo", ctx);
+ *    this.assertTruthy(valueThree, "valueThree", ctx);
+ */
+export function assertTruthy<T>(
+  val: T,
+  name: string,
+  ctx?: string,
+): asserts val is Exclude<T, false | "" | 0 | null | undefined | void | 0n> {
+  // Because `NaN` is a value (not a type) of type 'number', that means we cannot add
+  // it to the list of falsy values in the type assertion. Instead, we check for it
+  // separately at runtime.
+  if (!val || (typeof val === "number" && Number.isNaN(val))) {
+    // If context is provided, append it to the error message with a space before it.
+    throw new Error(`${name} is falsy.${ctx ? ` ${ctx}` : ""}`);
+  }
+}
diff --git a/libs/common/src/auth/utils/index.ts b/libs/common/src/auth/utils/index.ts
new file mode 100644
index 00000000000..96bab53d3f9
--- /dev/null
+++ b/libs/common/src/auth/utils/index.ts
@@ -0,0 +1,2 @@
+export { assertTruthy } from "./assert-truthy.util";
+export { assertNonNullish } from "./assert-non-nullish.util";
diff --git a/libs/common/src/autofill/services/autofill-settings.service.ts b/libs/common/src/autofill/services/autofill-settings.service.ts
index 3346ef99a58..c56f852d3de 100644
--- a/libs/common/src/autofill/services/autofill-settings.service.ts
+++ b/libs/common/src/autofill/services/autofill-settings.service.ts
@@ -1,6 +1,9 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { map, Observable, switchMap } from "rxjs";
+import { combineLatest, map, Observable, startWith, switchMap } from "rxjs";
+
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "../../admin-console/enums";
@@ -155,6 +158,7 @@ export class AutofillSettingsService implements AutofillSettingsServiceAbstracti
     private stateProvider: StateProvider,
     private policyService: PolicyService,
     private accountService: AccountService,
+    private restrictedItemTypesService: RestrictedItemTypesService,
   ) {
     this.autofillOnPageLoadState = this.stateProvider.getActive(AUTOFILL_ON_PAGE_LOAD);
     this.autofillOnPageLoad$ = this.autofillOnPageLoadState.state$.pipe(map((x) => x ?? false));
@@ -199,7 +203,16 @@ export class AutofillSettingsService implements AutofillSettingsServiceAbstracti
     );
 
     this.showInlineMenuCardsState = this.stateProvider.getActive(SHOW_INLINE_MENU_CARDS);
-    this.showInlineMenuCards$ = this.showInlineMenuCardsState.state$.pipe(map((x) => x ?? true));
+    this.showInlineMenuCards$ = combineLatest([
+      this.showInlineMenuCardsState.state$.pipe(map((x) => x ?? true)),
+      this.restrictedItemTypesService.restricted$.pipe(startWith([])),
+    ]).pipe(
+      map(
+        ([enabled, restrictions]) =>
+          // If enabled, show cards inline menu unless card type is restricted
+          enabled && !restrictions.some((r) => r.cipherType === CipherType.Card),
+      ),
+    );
 
     this.enableContextMenuState = this.stateProvider.getGlobal(ENABLE_CONTEXT_MENU);
     this.enableContextMenu$ = this.enableContextMenuState.state$.pipe(map((x) => x ?? true));
diff --git a/libs/common/src/billing/models/response/organization-billing-metadata.response.ts b/libs/common/src/billing/models/response/organization-billing-metadata.response.ts
index d30ad76a147..aa34c37bd1d 100644
--- a/libs/common/src/billing/models/response/organization-billing-metadata.response.ts
+++ b/libs/common/src/billing/models/response/organization-billing-metadata.response.ts
@@ -11,6 +11,7 @@ export class OrganizationBillingMetadataResponse extends BaseResponse {
   invoiceCreatedDate: Date | null;
   subPeriodEndDate: Date | null;
   isSubscriptionCanceled: boolean;
+  organizationOccupiedSeats: number;
 
   constructor(response: any) {
     super(response);
@@ -25,6 +26,7 @@ export class OrganizationBillingMetadataResponse extends BaseResponse {
     this.invoiceCreatedDate = this.parseDate(this.getResponseProperty("InvoiceCreatedDate"));
     this.subPeriodEndDate = this.parseDate(this.getResponseProperty("SubPeriodEndDate"));
     this.isSubscriptionCanceled = this.getResponseProperty("IsSubscriptionCanceled");
+    this.organizationOccupiedSeats = this.getResponseProperty("OrganizationOccupiedSeats");
   }
 
   private parseDate(dateString: any): Date | null {
diff --git a/libs/common/src/enums/device-type.enum.ts b/libs/common/src/enums/device-type.enum.ts
index d5628536ff7..c462081140e 100644
--- a/libs/common/src/enums/device-type.enum.ts
+++ b/libs/common/src/enums/device-type.enum.ts
@@ -27,6 +27,7 @@ export enum DeviceType {
   WindowsCLI = 23,
   MacOsCLI = 24,
   LinuxCLI = 25,
+  DuckDuckGoBrowser = 26,
 }
 
 /**
@@ -55,6 +56,7 @@ export const DeviceTypeMetadata: Record<DeviceType, DeviceTypeMetadata> = {
   [DeviceType.IEBrowser]: { category: "webVault", platform: "IE" },
   [DeviceType.SafariBrowser]: { category: "webVault", platform: "Safari" },
   [DeviceType.VivaldiBrowser]: { category: "webVault", platform: "Vivaldi" },
+  [DeviceType.DuckDuckGoBrowser]: { category: "webVault", platform: "DuckDuckGo" },
   [DeviceType.UnknownBrowser]: { category: "webVault", platform: "Unknown" },
   [DeviceType.WindowsDesktop]: { category: "desktop", platform: "Windows" },
   [DeviceType.MacOsDesktop]: { category: "desktop", platform: "macOS" },
diff --git a/libs/common/src/enums/event-type.enum.ts b/libs/common/src/enums/event-type.enum.ts
index 9efe49b1b0f..914dac00abb 100644
--- a/libs/common/src/enums/event-type.enum.ts
+++ b/libs/common/src/enums/event-type.enum.ts
@@ -90,4 +90,7 @@ export enum EventType {
   OrganizationDomain_NotVerified = 2003,
 
   Secret_Retrieved = 2100,
+  Secret_Created = 2101,
+  Secret_Edited = 2102,
+  Secret_Deleted = 2103,
 }
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 43b36c5692f..fcc81070331 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -11,18 +11,17 @@ import { ServerConfig } from "../platform/abstractions/config/server-config";
 // eslint-disable-next-line @bitwarden/platform/no-enums
 export enum FeatureFlag {
   /* Admin Console Team */
-  LimitItemDeletion = "pm-15493-restrict-item-deletion-to-can-manage-permission",
   SeparateCustomRolePermissions = "pm-19917-separate-custom-role-permissions",
+  CreateDefaultLocation = "pm-19467-create-default-location",
 
   /* Auth */
+  PM16117_SetInitialPasswordRefactor = "pm-16117-set-initial-password-refactor",
   PM16117_ChangeExistingPasswordRefactor = "pm-16117-change-existing-password-refactor",
-  PM9115_TwoFactorExtensionDataPersistence = "pm-9115-two-factor-extension-data-persistence",
+  PM14938_BrowserExtensionLoginApproval = "pm-14938-browser-extension-login-approvals",
 
   /* Autofill */
   BlockBrowserInjectionsByDomain = "block-browser-injections-by-domain",
-  DelayFido2PageScriptInitWithinMv2 = "delay-fido2-page-script-init-within-mv2",
   EnableNewCardCombinedExpiryAutofill = "enable-new-card-combined-expiry-autofill",
-  IdpAutoSubmitLogin = "idp-auto-submit-login",
   NotificationRefresh = "notification-refresh",
   UseTreeWalkerApiForPageDetailsCollection = "use-tree-walker-api-for-page-details-collection",
   MacOsNativeCredentialSync = "macos-native-credential-sync",
@@ -30,36 +29,33 @@ export enum FeatureFlag {
   /* Billing */
   TrialPaymentOptional = "PM-8163-trial-payment",
   PM12276_BreadcrumbEventLogs = "pm-12276-breadcrumbing-for-business-features",
-  PM18794_ProviderPaymentMethod = "pm-18794-provider-payment-method",
   PM17772_AdminInitiatedSponsorships = "pm-17772-admin-initiated-sponsorships",
   PM19956_RequireProviderPaymentMethodDuringSetup = "pm-19956-require-provider-payment-method-during-setup",
   UseOrganizationWarningsService = "use-organization-warnings-service",
+  AllowTrialLengthZero = "pm-20322-allow-trial-length-0",
+  PM21881_ManagePaymentDetailsOutsideCheckout = "pm-21881-manage-payment-details-outside-checkout",
 
   /* Data Insights and Reporting */
-  CriticalApps = "pm-14466-risk-insights-critical-application",
   EnableRiskInsightsNotifications = "enable-risk-insights-notifications",
 
   /* Key Management */
   PrivateKeyRegeneration = "pm-12241-private-key-regeneration",
-  UserKeyRotationV2 = "userkey-rotation-v2",
   PM4154_BulkEncryptionService = "PM-4154-bulk-encryption-service",
   UseSDKForDecryption = "use-sdk-for-decryption",
   PM17987_BlockType0 = "pm-17987-block-type-0",
   EnrollAeadOnKeyRotation = "enroll-aead-on-key-rotation",
 
   /* Tools */
-  ItemShare = "item-share",
   DesktopSendUIRefresh = "desktop-send-ui-refresh",
 
   /* Vault */
   PM8851_BrowserOnboardingNudge = "pm-8851-browser-onboarding-nudge",
   PM9111ExtensionPersistAddEditForm = "pm-9111-extension-persist-add-edit-form",
-  SecurityTasks = "security-tasks",
   PM19941MigrateCipherDomainToSdk = "pm-19941-migrate-cipher-domain-to-sdk",
   CipherKeyEncryption = "cipher-key-encryption",
-  PM18520_UpdateDesktopCipherForm = "pm-18520-desktop-cipher-forms",
   EndUserNotifications = "pm-10609-end-user-notifications",
   RemoveCardItemTypePolicy = "pm-16442-remove-card-item-type-policy",
+  PM19315EndUserActivationMvp = "pm-19315-end-user-activation-mvp",
 
   /* Platform */
   IpcChannelFramework = "ipc-channel-framework",
@@ -80,51 +76,47 @@ const FALSE = false as boolean;
  */
 export const DefaultFeatureFlagValue = {
   /* Admin Console Team */
-  [FeatureFlag.LimitItemDeletion]: FALSE,
   [FeatureFlag.SeparateCustomRolePermissions]: FALSE,
+  [FeatureFlag.CreateDefaultLocation]: FALSE,
 
   /* Autofill */
   [FeatureFlag.BlockBrowserInjectionsByDomain]: FALSE,
-  [FeatureFlag.DelayFido2PageScriptInitWithinMv2]: FALSE,
   [FeatureFlag.EnableNewCardCombinedExpiryAutofill]: FALSE,
-  [FeatureFlag.IdpAutoSubmitLogin]: FALSE,
   [FeatureFlag.NotificationRefresh]: FALSE,
   [FeatureFlag.UseTreeWalkerApiForPageDetailsCollection]: FALSE,
   [FeatureFlag.MacOsNativeCredentialSync]: FALSE,
 
   /* Data Insights and Reporting */
-  [FeatureFlag.CriticalApps]: FALSE,
   [FeatureFlag.EnableRiskInsightsNotifications]: FALSE,
 
   /* Tools */
-  [FeatureFlag.ItemShare]: FALSE,
   [FeatureFlag.DesktopSendUIRefresh]: FALSE,
 
   /* Vault */
   [FeatureFlag.PM8851_BrowserOnboardingNudge]: FALSE,
   [FeatureFlag.PM9111ExtensionPersistAddEditForm]: FALSE,
-  [FeatureFlag.SecurityTasks]: FALSE,
   [FeatureFlag.CipherKeyEncryption]: FALSE,
-  [FeatureFlag.PM18520_UpdateDesktopCipherForm]: FALSE,
   [FeatureFlag.EndUserNotifications]: FALSE,
   [FeatureFlag.PM19941MigrateCipherDomainToSdk]: FALSE,
   [FeatureFlag.RemoveCardItemTypePolicy]: FALSE,
+  [FeatureFlag.PM19315EndUserActivationMvp]: FALSE,
 
   /* Auth */
+  [FeatureFlag.PM16117_SetInitialPasswordRefactor]: FALSE,
   [FeatureFlag.PM16117_ChangeExistingPasswordRefactor]: FALSE,
-  [FeatureFlag.PM9115_TwoFactorExtensionDataPersistence]: FALSE,
+  [FeatureFlag.PM14938_BrowserExtensionLoginApproval]: FALSE,
 
   /* Billing */
   [FeatureFlag.TrialPaymentOptional]: FALSE,
   [FeatureFlag.PM12276_BreadcrumbEventLogs]: FALSE,
-  [FeatureFlag.PM18794_ProviderPaymentMethod]: FALSE,
   [FeatureFlag.PM17772_AdminInitiatedSponsorships]: FALSE,
   [FeatureFlag.PM19956_RequireProviderPaymentMethodDuringSetup]: FALSE,
   [FeatureFlag.UseOrganizationWarningsService]: FALSE,
+  [FeatureFlag.AllowTrialLengthZero]: FALSE,
+  [FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout]: FALSE,
 
   /* Key Management */
   [FeatureFlag.PrivateKeyRegeneration]: FALSE,
-  [FeatureFlag.UserKeyRotationV2]: FALSE,
   [FeatureFlag.PM4154_BulkEncryptionService]: FALSE,
   [FeatureFlag.UseSDKForDecryption]: FALSE,
   [FeatureFlag.PM17987_BlockType0]: FALSE,
diff --git a/libs/common/src/enums/notification-type.enum.ts b/libs/common/src/enums/notification-type.enum.ts
index 6d731253ce3..d362ffc841a 100644
--- a/libs/common/src/enums/notification-type.enum.ts
+++ b/libs/common/src/enums/notification-type.enum.ts
@@ -29,5 +29,5 @@ export enum NotificationType {
   Notification = 20,
   NotificationStatus = 21,
 
-  PendingSecurityTasks = 22,
+  RefreshSecurityTasks = 22,
 }
diff --git a/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts b/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts
index 5bb946b25bf..525e8a6b5f7 100644
--- a/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts
+++ b/libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts
@@ -26,6 +26,7 @@ import {
   getFeatureFlagValue,
 } from "../../../enums/feature-flag.enum";
 import { ServerConfig } from "../../../platform/abstractions/config/server-config";
+import { SdkLoadService } from "../../../platform/abstractions/sdk/sdk-load.service";
 import { EncryptService } from "../abstractions/encrypt.service";
 
 export class EncryptServiceImplementation implements EncryptService {
@@ -242,6 +243,7 @@ export class EncryptServiceImplementation implements EncryptService {
       if (encString == null || encString.encryptedString == null) {
         throw new Error("encString is null or undefined");
       }
+      await SdkLoadService.Ready;
       return PureCrypto.symmetric_decrypt(encString.encryptedString, key.toEncoded());
     }
     this.logService.debug("decrypting with javascript");
@@ -324,6 +326,7 @@ export class EncryptServiceImplementation implements EncryptService {
         encThing.dataBytes,
         encThing.macBytes,
       ).buffer;
+      await SdkLoadService.Ready;
       return PureCrypto.symmetric_decrypt_array_buffer(buffer, key.toEncoded());
     }
     this.logService.debug("[EncryptService] Decrypting bytes with javascript");
diff --git a/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts b/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts
index d19de6c0414..813dd693dd9 100644
--- a/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts
+++ b/libs/common/src/key-management/crypto/services/encrypt.service.spec.ts
@@ -11,10 +11,12 @@ import {
   SymmetricCryptoKey,
 } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { CsprngArray } from "@bitwarden/common/types/csprng";
+import { PureCrypto } from "@bitwarden/sdk-internal";
 
 import { makeStaticByteArray } from "../../../../spec";
 import { DefaultFeatureFlagValue, FeatureFlag } from "../../../enums/feature-flag.enum";
 import { ServerConfig } from "../../../platform/abstractions/config/server-config";
+import { SdkLoadService } from "../../../platform/abstractions/sdk/sdk-load.service";
 
 import { EncryptServiceImplementation } from "./encrypt.service.implementation";
 
@@ -343,6 +345,24 @@ describe("EncryptService", () => {
       );
     });
 
+    it("calls PureCrypto when useSDKForDecryption is true", async () => {
+      (encryptService as any).useSDKForDecryption = true;
+      const decryptedBytes = makeStaticByteArray(10, 200);
+      Object.defineProperty(SdkLoadService, "Ready", {
+        value: Promise.resolve(),
+        configurable: true,
+      });
+      jest.spyOn(PureCrypto, "symmetric_decrypt_array_buffer").mockReturnValue(decryptedBytes);
+
+      const actual = await encryptService.decryptToBytes(encBuffer, key);
+
+      expect(PureCrypto.symmetric_decrypt_array_buffer).toHaveBeenCalledWith(
+        encBuffer.buffer,
+        key.toEncoded(),
+      );
+      expect(actual).toEqualBuffer(decryptedBytes);
+    });
+
     it("decrypts data with provided key for Aes256CbcHmac", async () => {
       const decryptedBytes = makeStaticByteArray(10, 200);
 
@@ -450,6 +470,25 @@ describe("EncryptService", () => {
       );
     });
 
+    it("calls PureCrypto when useSDKForDecryption is true", async () => {
+      (encryptService as any).useSDKForDecryption = true;
+      const key = new SymmetricCryptoKey(makeStaticByteArray(64, 0));
+      const encString = new EncString(EncryptionType.AesCbc256_HmacSha256_B64, "data", "iv", "mac");
+      Object.defineProperty(SdkLoadService, "Ready", {
+        value: Promise.resolve(),
+        configurable: true,
+      });
+      jest.spyOn(PureCrypto, "symmetric_decrypt").mockReturnValue("data");
+
+      const actual = await encryptService.decryptToUtf8(encString, key);
+
+      expect(actual).toEqual("data");
+      expect(PureCrypto.symmetric_decrypt).toHaveBeenCalledWith(
+        encString.encryptedString,
+        key.toEncoded(),
+      );
+    });
+
     it("decrypts data with provided key for AesCbc256_HmacSha256", async () => {
       const key = new SymmetricCryptoKey(makeStaticByteArray(64, 0));
       const encString = new EncString(EncryptionType.AesCbc256_HmacSha256_B64, "data", "iv", "mac");
diff --git a/libs/common/src/key-management/device-trust/abstractions/device-trust.service.abstraction.ts b/libs/common/src/key-management/device-trust/abstractions/device-trust.service.abstraction.ts
index 407ae007622..6498d358c44 100644
--- a/libs/common/src/key-management/device-trust/abstractions/device-trust.service.abstraction.ts
+++ b/libs/common/src/key-management/device-trust/abstractions/device-trust.service.abstraction.ts
@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { Observable } from "rxjs";
 
-import { DeviceKeysUpdateRequest } from "@bitwarden/common/auth/models/request/update-devices-trust.request";
+import { OtherDeviceKeysUpdateRequest } from "@bitwarden/common/auth/models/request/update-devices-trust.request";
 
 import { DeviceResponse } from "../../../auth/abstractions/devices/responses/device.response";
 import { EncString } from "../../../platform/models/domain/enc-string";
@@ -61,5 +61,5 @@ export abstract class DeviceTrustServiceAbstraction {
     oldUserKey: UserKey,
     newUserKey: UserKey,
     userId: UserId,
-  ) => Promise<DeviceKeysUpdateRequest[]>;
+  ) => Promise<OtherDeviceKeysUpdateRequest[]>;
 }
diff --git a/libs/common/src/key-management/device-trust/services/device-trust.service.implementation.ts b/libs/common/src/key-management/device-trust/services/device-trust.service.implementation.ts
index ecfeb10dcda..b02c8922ccb 100644
--- a/libs/common/src/key-management/device-trust/services/device-trust.service.implementation.ts
+++ b/libs/common/src/key-management/device-trust/services/device-trust.service.implementation.ts
@@ -89,9 +89,7 @@ export class DeviceTrustService implements DeviceTrustServiceAbstraction {
   ) {
     this.supportsDeviceTrust$ = this.userDecryptionOptionsService.userDecryptionOptions$.pipe(
       map((options) => {
-        // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
-        // eslint-disable-next-line no-constant-binary-expression
-        return options?.trustedDeviceOption != null ?? false;
+        return options?.trustedDeviceOption != null;
       }),
     );
   }
@@ -99,9 +97,7 @@ export class DeviceTrustService implements DeviceTrustServiceAbstraction {
   supportsDeviceTrustByUserId$(userId: UserId): Observable<boolean> {
     return this.userDecryptionOptionsService.userDecryptionOptionsById$(userId).pipe(
       map((options) => {
-        // TODO: Eslint upgrade. Please resolve this since the ?? does nothing
-        // eslint-disable-next-line no-constant-binary-expression
-        return options?.trustedDeviceOption != null ?? false;
+        return options?.trustedDeviceOption != null;
       }),
     );
   }
@@ -200,7 +196,7 @@ export class DeviceTrustService implements DeviceTrustServiceAbstraction {
     oldUserKey: UserKey,
     newUserKey: UserKey,
     userId: UserId,
-  ): Promise<DeviceKeysUpdateRequest[]> {
+  ): Promise<OtherDeviceKeysUpdateRequest[]> {
     if (!userId) {
       throw new Error("UserId is required. Cannot get rotated data.");
     }
diff --git a/libs/common/src/key-management/key-connector/services/key-connector.service.spec.ts b/libs/common/src/key-management/key-connector/services/key-connector.service.spec.ts
index 6049d4db5a1..2f897a7a28a 100644
--- a/libs/common/src/key-management/key-connector/services/key-connector.service.spec.ts
+++ b/libs/common/src/key-management/key-connector/services/key-connector.service.spec.ts
@@ -5,21 +5,23 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { OrganizationUserType } from "@bitwarden/common/admin-console/enums";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
-import { KeyService } from "@bitwarden/key-management";
+import { KdfType, KeyService } from "@bitwarden/key-management";
 
 import { FakeAccountService, FakeStateProvider, mockAccountServiceWith } from "../../../../spec";
 import { ApiService } from "../../../abstractions/api.service";
 import { OrganizationData } from "../../../admin-console/models/data/organization.data";
 import { Organization } from "../../../admin-console/models/domain/organization";
 import { ProfileOrganizationResponse } from "../../../admin-console/models/response/profile-organization.response";
+import { IdentityTokenResponse } from "../../../auth/models/response/identity-token.response";
 import { KeyConnectorUserKeyResponse } from "../../../auth/models/response/key-connector-user-key.response";
 import { TokenService } from "../../../auth/services/token.service";
 import { LogService } from "../../../platform/abstractions/log.service";
 import { Utils } from "../../../platform/misc/utils";
+import { EncString } from "../../../platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
 import { KeyGenerationService } from "../../../platform/services/key-generation.service";
 import { OrganizationId, UserId } from "../../../types/guid";
-import { MasterKey } from "../../../types/key";
+import { MasterKey, UserKey } from "../../../types/key";
 import { FakeMasterPasswordService } from "../../master-password/services/fake-master-password.service";
 import { KeyConnectorUserKeyRequest } from "../models/key-connector-user-key.request";
 
@@ -50,7 +52,7 @@ describe("KeyConnectorService", () => {
   const keyConnectorUrl = "https://key-connector-url.com";
 
   beforeEach(() => {
-    jest.clearAllMocks();
+    jest.resetAllMocks();
 
     masterPasswordService = new FakeMasterPasswordService();
     accountService = mockAccountServiceWith(mockUserId);
@@ -403,6 +405,106 @@ describe("KeyConnectorService", () => {
     });
   });
 
+  describe("convertNewSsoUserToKeyConnector", () => {
+    const tokenResponse = mock<IdentityTokenResponse>();
+    const passwordKey = new SymmetricCryptoKey(new Uint8Array(64));
+    const mockUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+    const mockEmail = "test@example.com";
+    const mockMasterKey = getMockMasterKey();
+    let mockMakeUserKeyResult: [UserKey, EncString];
+
+    beforeEach(() => {
+      const mockUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      const mockKeyPair = ["mockPubKey", new EncString("mockEncryptedPrivKey")] as [
+        string,
+        EncString,
+      ];
+      const encString = new EncString("mockEncryptedString");
+      mockMakeUserKeyResult = [mockUserKey, encString] as [UserKey, EncString];
+
+      tokenResponse.kdf = KdfType.PBKDF2_SHA256;
+      tokenResponse.kdfIterations = 100000;
+      tokenResponse.kdfMemory = 16;
+      tokenResponse.kdfParallelism = 4;
+      tokenResponse.keyConnectorUrl = keyConnectorUrl;
+
+      keyGenerationService.createKey.mockResolvedValue(passwordKey);
+      keyService.makeMasterKey.mockResolvedValue(mockMasterKey);
+      keyService.makeUserKey.mockResolvedValue(mockMakeUserKeyResult);
+      keyService.makeKeyPair.mockResolvedValue(mockKeyPair);
+      tokenService.getEmail.mockResolvedValue(mockEmail);
+    });
+
+    it("sets up a new SSO user with key connector", async () => {
+      await keyConnectorService.convertNewSsoUserToKeyConnector(
+        tokenResponse,
+        mockOrgId,
+        mockUserId,
+      );
+
+      expect(keyGenerationService.createKey).toHaveBeenCalledWith(512);
+      expect(keyService.makeMasterKey).toHaveBeenCalledWith(
+        passwordKey.keyB64,
+        mockEmail,
+        expect.any(Object),
+      );
+      expect(masterPasswordService.mock.setMasterKey).toHaveBeenCalledWith(
+        mockMasterKey,
+        mockUserId,
+      );
+      expect(keyService.makeUserKey).toHaveBeenCalledWith(mockMasterKey);
+      expect(keyService.setUserKey).toHaveBeenCalledWith(mockUserKey, mockUserId);
+      expect(masterPasswordService.mock.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
+        mockMakeUserKeyResult[1],
+        mockUserId,
+      );
+      expect(keyService.makeKeyPair).toHaveBeenCalledWith(mockMakeUserKeyResult[0]);
+      expect(apiService.postUserKeyToKeyConnector).toHaveBeenCalledWith(
+        tokenResponse.keyConnectorUrl,
+        expect.any(KeyConnectorUserKeyRequest),
+      );
+      expect(apiService.postSetKeyConnectorKey).toHaveBeenCalled();
+    });
+
+    it("handles api error", async () => {
+      apiService.postUserKeyToKeyConnector.mockRejectedValue(new Error("API error"));
+
+      try {
+        await keyConnectorService.convertNewSsoUserToKeyConnector(
+          tokenResponse,
+          mockOrgId,
+          mockUserId,
+        );
+      } catch (error: any) {
+        expect(error).toBeInstanceOf(Error);
+        expect(error?.message).toBe("Key Connector error");
+      }
+
+      expect(keyGenerationService.createKey).toHaveBeenCalledWith(512);
+      expect(keyService.makeMasterKey).toHaveBeenCalledWith(
+        passwordKey.keyB64,
+        mockEmail,
+        expect.any(Object),
+      );
+      expect(masterPasswordService.mock.setMasterKey).toHaveBeenCalledWith(
+        mockMasterKey,
+        mockUserId,
+      );
+      expect(keyService.makeUserKey).toHaveBeenCalledWith(mockMasterKey);
+      expect(keyService.setUserKey).toHaveBeenCalledWith(mockUserKey, mockUserId);
+      expect(masterPasswordService.mock.setMasterKeyEncryptedUserKey).toHaveBeenCalledWith(
+        mockMakeUserKeyResult[1],
+        mockUserId,
+      );
+      expect(keyService.makeKeyPair).toHaveBeenCalledWith(mockMakeUserKeyResult[0]);
+      expect(apiService.postUserKeyToKeyConnector).toHaveBeenCalledWith(
+        tokenResponse.keyConnectorUrl,
+        expect.any(KeyConnectorUserKeyRequest),
+      );
+      expect(apiService.postSetKeyConnectorKey).not.toHaveBeenCalled();
+    });
+  });
+
   function organizationData(
     usesKeyConnector: boolean,
     keyConnectorEnabled: boolean,
diff --git a/libs/common/src/key-management/key-connector/services/key-connector.service.ts b/libs/common/src/key-management/key-connector/services/key-connector.service.ts
index 905bc42defe..0c4f4090e61 100644
--- a/libs/common/src/key-management/key-connector/services/key-connector.service.ts
+++ b/libs/common/src/key-management/key-connector/services/key-connector.service.ts
@@ -160,7 +160,7 @@ export class KeyConnectorService implements KeyConnectorServiceAbstraction {
 
     const userKey = await this.keyService.makeUserKey(masterKey);
     await this.keyService.setUserKey(userKey[0], userId);
-    await this.keyService.setMasterKeyEncryptedUserKey(userKey[1].encryptedString, userId);
+    await this.masterPasswordService.setMasterKeyEncryptedUserKey(userKey[1], userId);
 
     const [pubKey, privKey] = await this.keyService.makeKeyPair(userKey[0]);
 
diff --git a/libs/common/src/key-management/master-password/services/master-password.service.spec.ts b/libs/common/src/key-management/master-password/services/master-password.service.spec.ts
index b55e770f865..4a09a6d66b1 100644
--- a/libs/common/src/key-management/master-password/services/master-password.service.spec.ts
+++ b/libs/common/src/key-management/master-password/services/master-password.service.spec.ts
@@ -153,4 +153,41 @@ describe("MasterPasswordService", () => {
       expect(result).toBeNull();
     });
   });
+
+  describe("setMasterKeyEncryptedUserKey", () => {
+    test.each([null as unknown as EncString, undefined as unknown as EncString])(
+      "throws when the provided encryptedKey is %s",
+      async (encryptedKey) => {
+        await expect(sut.setMasterKeyEncryptedUserKey(encryptedKey, userId)).rejects.toThrow(
+          "Encrypted Key is required.",
+        );
+      },
+    );
+
+    it("throws an error if encryptedKey is malformed null", async () => {
+      await expect(
+        sut.setMasterKeyEncryptedUserKey(new EncString(null as unknown as string), userId),
+      ).rejects.toThrow("Encrypted Key is required.");
+    });
+
+    test.each([null as unknown as UserId, undefined as unknown as UserId])(
+      "throws when the provided userId is %s",
+      async (userId) => {
+        await expect(
+          sut.setMasterKeyEncryptedUserKey(new EncString(testMasterKeyEncryptedKey), userId),
+        ).rejects.toThrow("User ID is required.");
+      },
+    );
+
+    it("calls stateProvider with the provided encryptedKey and user ID", async () => {
+      const encryptedKey = new EncString(testMasterKeyEncryptedKey);
+
+      await sut.setMasterKeyEncryptedUserKey(encryptedKey, userId);
+
+      expect(stateProvider.getUser).toHaveBeenCalled();
+      expect(mockUserState.update).toHaveBeenCalled();
+      const updateFn = mockUserState.update.mock.calls[0][0];
+      expect(updateFn(null)).toEqual(encryptedKey.toJSON());
+    });
+  });
 });
diff --git a/libs/common/src/key-management/master-password/services/master-password.service.ts b/libs/common/src/key-management/master-password/services/master-password.service.ts
index 9e58680d453..95ed346f110 100644
--- a/libs/common/src/key-management/master-password/services/master-password.service.ts
+++ b/libs/common/src/key-management/master-password/services/master-password.service.ts
@@ -130,7 +130,7 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr
   }
 
   async setMasterKeyEncryptedUserKey(encryptedKey: EncString, userId: UserId): Promise<void> {
-    if (encryptedKey == null) {
+    if (encryptedKey == null || encryptedKey.encryptedString == null) {
       throw new Error("Encrypted Key is required.");
     }
     if (userId == null) {
diff --git a/libs/common/src/key-management/sends/abstractions/index.ts b/libs/common/src/key-management/sends/abstractions/index.ts
new file mode 100644
index 00000000000..d8812f06ac9
--- /dev/null
+++ b/libs/common/src/key-management/sends/abstractions/index.ts
@@ -0,0 +1 @@
+export * from "./send-password.service";
diff --git a/libs/common/src/key-management/sends/abstractions/send-password.service.ts b/libs/common/src/key-management/sends/abstractions/send-password.service.ts
new file mode 100644
index 00000000000..7ffa3169e2f
--- /dev/null
+++ b/libs/common/src/key-management/sends/abstractions/send-password.service.ts
@@ -0,0 +1,17 @@
+import { SendHashedPassword, SendPasswordKeyMaterial } from "../types/send-hashed-password.type";
+
+/**
+ * Service for managing passwords for sends.
+ */
+export abstract class SendPasswordService {
+  /**
+   * Hashes a raw send password using the provided key material
+   * @param password - the raw password to hash
+   * @param keyMaterial - the key material
+   * @returns a promise that resolves to the hashed password as a SendHashedPassword
+   */
+  abstract hashPassword(
+    password: string,
+    keyMaterial: SendPasswordKeyMaterial,
+  ): Promise<SendHashedPassword>;
+}
diff --git a/libs/common/src/key-management/sends/index.ts b/libs/common/src/key-management/sends/index.ts
new file mode 100644
index 00000000000..17299c79ea7
--- /dev/null
+++ b/libs/common/src/key-management/sends/index.ts
@@ -0,0 +1,3 @@
+export * from "./abstractions";
+export * from "./services";
+export * from "./types";
diff --git a/libs/common/src/key-management/sends/services/default-send-password.service.spec.ts b/libs/common/src/key-management/sends/services/default-send-password.service.spec.ts
new file mode 100644
index 00000000000..54d57cb1b96
--- /dev/null
+++ b/libs/common/src/key-management/sends/services/default-send-password.service.spec.ts
@@ -0,0 +1,63 @@
+import { mock, MockProxy } from "jest-mock-extended";
+
+import { SEND_KDF_ITERATIONS } from "../../../tools/send/send-kdf";
+import { CryptoFunctionService } from "../../crypto/abstractions/crypto-function.service";
+import { SendPasswordKeyMaterial } from "../types";
+
+import { DefaultSendPasswordService } from "./default-send-password.service";
+
+describe("DefaultSendPasswordService", () => {
+  let sendPasswordService: DefaultSendPasswordService;
+  let mockCryptoFunctionService: MockProxy<CryptoFunctionService>;
+
+  beforeEach(() => {
+    mockCryptoFunctionService = mock<CryptoFunctionService>();
+
+    sendPasswordService = new DefaultSendPasswordService(mockCryptoFunctionService);
+  });
+
+  it("instantiates", () => {
+    expect(sendPasswordService).not.toBeFalsy();
+  });
+
+  it("hashes a password with the provided key material", async () => {
+    // Arrange
+    const password = "testPassword";
+
+    const keyMaterial = new Uint8Array([1, 2, 3, 4, 5]) as SendPasswordKeyMaterial;
+
+    const expectedHash = new Uint8Array([1, 2, 3, 4, 5]); // Mocked hash output
+    mockCryptoFunctionService.pbkdf2.mockResolvedValue(expectedHash);
+
+    // Act
+    const result = await sendPasswordService.hashPassword(password, keyMaterial);
+
+    // Assert
+    expect(mockCryptoFunctionService.pbkdf2).toHaveBeenCalledWith(
+      password,
+      keyMaterial,
+      "sha256",
+      SEND_KDF_ITERATIONS,
+    );
+
+    expect(result).toEqual(expectedHash);
+  });
+
+  it("throws an error if a password isn't provided", async () => {
+    // Arrange
+    const keyMaterial = new Uint8Array([1, 2, 3, 4, 5]) as SendPasswordKeyMaterial;
+    const expectedError = new Error("Password and key material are required.");
+    // Act & Assert
+    await expect(sendPasswordService.hashPassword("", keyMaterial)).rejects.toThrow(expectedError);
+  });
+
+  it("throws an error if key material isn't provided", async () => {
+    // Arrange
+    const password = "testPassword";
+    const expectedError = new Error("Password and key material are required.");
+    // Act & Assert
+    await expect(
+      sendPasswordService.hashPassword(password, undefined as unknown as SendPasswordKeyMaterial),
+    ).rejects.toThrow(expectedError);
+  });
+});
diff --git a/libs/common/src/key-management/sends/services/default-send-password.service.ts b/libs/common/src/key-management/sends/services/default-send-password.service.ts
new file mode 100644
index 00000000000..eba7469dd3a
--- /dev/null
+++ b/libs/common/src/key-management/sends/services/default-send-password.service.ts
@@ -0,0 +1,27 @@
+import { SEND_KDF_ITERATIONS } from "../../../tools/send/send-kdf";
+import { CryptoFunctionService } from "../../crypto/abstractions/crypto-function.service";
+import { SendPasswordService } from "../abstractions/send-password.service";
+import { SendHashedPassword, SendPasswordKeyMaterial } from "../types/send-hashed-password.type";
+
+export class DefaultSendPasswordService implements SendPasswordService {
+  constructor(private cryptoFunctionService: CryptoFunctionService) {}
+
+  async hashPassword(
+    password: string,
+    keyMaterial: SendPasswordKeyMaterial,
+  ): Promise<SendHashedPassword> {
+    if (!password || !keyMaterial) {
+      throw new Error("Password and key material are required.");
+    }
+
+    // Derive a password hash using the key material.
+    const passwordHash = await this.cryptoFunctionService.pbkdf2(
+      password,
+      keyMaterial,
+      "sha256",
+      SEND_KDF_ITERATIONS,
+    );
+
+    return passwordHash as SendHashedPassword;
+  }
+}
diff --git a/libs/common/src/key-management/sends/services/index.ts b/libs/common/src/key-management/sends/services/index.ts
new file mode 100644
index 00000000000..4b42a7b46e0
--- /dev/null
+++ b/libs/common/src/key-management/sends/services/index.ts
@@ -0,0 +1 @@
+export * from "./default-send-password.service";
diff --git a/libs/common/src/key-management/sends/types/index.ts b/libs/common/src/key-management/sends/types/index.ts
new file mode 100644
index 00000000000..c6f6567ae34
--- /dev/null
+++ b/libs/common/src/key-management/sends/types/index.ts
@@ -0,0 +1 @@
+export * from "./send-hashed-password.type";
diff --git a/libs/common/src/key-management/sends/types/send-hashed-password.type.ts b/libs/common/src/key-management/sends/types/send-hashed-password.type.ts
new file mode 100644
index 00000000000..2b6fb34fc8f
--- /dev/null
+++ b/libs/common/src/key-management/sends/types/send-hashed-password.type.ts
@@ -0,0 +1,4 @@
+import { Opaque } from "type-fest";
+
+export type SendHashedPassword = Opaque<Uint8Array, "SendHashedPassword">;
+export type SendPasswordKeyMaterial = Opaque<Uint8Array, "SendPasswordKeyMaterial">;
diff --git a/libs/common/src/key-management/vault-timeout/services/vault-timeout-settings.service.ts b/libs/common/src/key-management/vault-timeout/services/vault-timeout-settings.service.ts
index 16e38ae0b52..b3ed2165ed9 100644
--- a/libs/common/src/key-management/vault-timeout/services/vault-timeout-settings.service.ts
+++ b/libs/common/src/key-management/vault-timeout/services/vault-timeout-settings.service.ts
@@ -92,7 +92,7 @@ export class VaultTimeoutSettingsService implements VaultTimeoutSettingsServiceA
       clientSecret,
     ]);
 
-    await this.keyService.refreshAdditionalKeys();
+    await this.keyService.refreshAdditionalKeys(userId);
   }
 
   availableVaultTimeoutActions$(userId?: string): Observable<VaultTimeoutAction[]> {
diff --git a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts
index b17e85ca9c4..9963e7d24f8 100644
--- a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts
+++ b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts
@@ -14,7 +14,6 @@ import { LogoutReason } from "@bitwarden/auth/common";
 import { BiometricsService } from "@bitwarden/key-management";
 
 import { FakeAccountService, mockAccountServiceWith } from "../../../../spec";
-import { SearchService } from "../../../abstractions/search.service";
 import { AccountInfo } from "../../../auth/abstractions/account.service";
 import { AuthService } from "../../../auth/abstractions/auth.service";
 import { AuthenticationStatus } from "../../../auth/enums/authentication-status";
@@ -28,6 +27,7 @@ import { StateEventRunnerService } from "../../../platform/state";
 import { UserId } from "../../../types/guid";
 import { CipherService } from "../../../vault/abstractions/cipher.service";
 import { FolderService } from "../../../vault/abstractions/folder/folder.service.abstraction";
+import { SearchService } from "../../../vault/abstractions/search.service";
 import { FakeMasterPasswordService } from "../../master-password/services/fake-master-password.service";
 import { VaultTimeoutAction } from "../enums/vault-timeout-action.enum";
 import { VaultTimeout, VaultTimeoutStringType } from "../types/vault-timeout.type";
@@ -417,16 +417,12 @@ describe("VaultTimeoutService", () => {
       expect(stateEventRunnerService.handleEvent).toHaveBeenCalledWith("lock", "user1");
     });
 
-    it("should call locked callback if no user passed into lock", async () => {
+    it("should call locked callback with the locking user if no userID is passed in.", async () => {
       setupLock();
 
       await vaultTimeoutService.lock();
 
-      // Currently these pass `undefined` (or what they were given) as the userId back
-      // but we could change this to give the user that was locked (active) to these methods
-      // so they don't have to get it their own way, but that is a behavioral change that needs
-      // to be tested.
-      expect(lockedCallback).toHaveBeenCalledWith(undefined);
+      expect(lockedCallback).toHaveBeenCalledWith("user1");
     });
 
     it("should call state event runner with user passed into lock", async () => {
diff --git a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts
index 131f826fd33..b5ee6a1fc0f 100644
--- a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts
+++ b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts
@@ -12,7 +12,6 @@ import { LogoutReason } from "@bitwarden/auth/common";
 // eslint-disable-next-line no-restricted-imports
 import { BiometricsService } from "@bitwarden/key-management";
 
-import { SearchService } from "../../../abstractions/search.service";
 import { AccountService } from "../../../auth/abstractions/account.service";
 import { AuthService } from "../../../auth/abstractions/auth.service";
 import { AuthenticationStatus } from "../../../auth/enums/authentication-status";
@@ -25,6 +24,7 @@ import { StateEventRunnerService } from "../../../platform/state";
 import { UserId } from "../../../types/guid";
 import { CipherService } from "../../../vault/abstractions/cipher.service";
 import { FolderService } from "../../../vault/abstractions/folder/folder.service.abstraction";
+import { SearchService } from "../../../vault/abstractions/search.service";
 import { InternalMasterPasswordServiceAbstraction } from "../../master-password/abstractions/master-password.service.abstraction";
 import { VaultTimeoutSettingsService } from "../abstractions/vault-timeout-settings.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "../abstractions/vault-timeout.service";
@@ -49,7 +49,7 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
     private taskSchedulerService: TaskSchedulerService,
     protected logService: LogService,
     private biometricService: BiometricsService,
-    private lockedCallback: (userId?: string) => Promise<void> = null,
+    private lockedCallback: (userId: UserId) => Promise<void> = null,
     private loggedOutCallback: (
       logoutReason: LogoutReason,
       userId?: string,
@@ -166,7 +166,7 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
     this.messagingService.send("locked", { userId: lockingUserId });
 
     if (this.lockedCallback != null) {
-      await this.lockedCallback(userId);
+      await this.lockedCallback(lockingUserId);
     }
   }
 
diff --git a/libs/common/src/models/export/cipher.export.ts b/libs/common/src/models/export/cipher.export.ts
index 7d0ef9e9c34..fa050375391 100644
--- a/libs/common/src/models/export/cipher.export.ts
+++ b/libs/common/src/models/export/cipher.export.ts
@@ -124,9 +124,9 @@ export class CipherExport {
       domain.passwordHistory = req.passwordHistory.map((ph) => PasswordHistoryExport.toDomain(ph));
     }
 
-    domain.creationDate = req.creationDate;
-    domain.revisionDate = req.revisionDate;
-    domain.deletedDate = req.deletedDate;
+    domain.creationDate = req.creationDate ? new Date(req.creationDate) : null;
+    domain.revisionDate = req.revisionDate ? new Date(req.revisionDate) : null;
+    domain.deletedDate = req.deletedDate ? new Date(req.deletedDate) : null;
     return domain;
   }
 
diff --git a/libs/common/src/models/export/password-history.export.ts b/libs/common/src/models/export/password-history.export.ts
index ece7e331009..5382b9cb974 100644
--- a/libs/common/src/models/export/password-history.export.ts
+++ b/libs/common/src/models/export/password-history.export.ts
@@ -22,7 +22,7 @@ export class PasswordHistoryExport {
 
   static toDomain(req: PasswordHistoryExport, domain = new Password()) {
     domain.password = req.password != null ? new EncString(req.password) : null;
-    domain.lastUsedDate = req.lastUsedDate;
+    domain.lastUsedDate = req.lastUsedDate ? new Date(req.lastUsedDate) : null;
     return domain;
   }
 
diff --git a/libs/common/src/models/response/profile.response.ts b/libs/common/src/models/response/profile.response.ts
index 9aee5acbce8..1607d39e25c 100644
--- a/libs/common/src/models/response/profile.response.ts
+++ b/libs/common/src/models/response/profile.response.ts
@@ -1,6 +1,7 @@
 import { ProfileOrganizationResponse } from "../../admin-console/models/response/profile-organization.response";
 import { ProfileProviderOrganizationResponse } from "../../admin-console/models/response/profile-provider-organization.response";
 import { ProfileProviderResponse } from "../../admin-console/models/response/profile-provider.response";
+import { EncString } from "../../platform/models/domain/enc-string";
 import { UserId } from "../../types/guid";
 
 import { BaseResponse } from "./base.response";
@@ -14,7 +15,7 @@ export class ProfileResponse extends BaseResponse {
   premiumFromOrganization: boolean;
   culture: string;
   twoFactorEnabled: boolean;
-  key: string;
+  key?: EncString;
   avatarColor: string;
   creationDate: string;
   privateKey: string;
@@ -36,7 +37,10 @@ export class ProfileResponse extends BaseResponse {
     this.premiumFromOrganization = this.getResponseProperty("PremiumFromOrganization");
     this.culture = this.getResponseProperty("Culture");
     this.twoFactorEnabled = this.getResponseProperty("TwoFactorEnabled");
-    this.key = this.getResponseProperty("Key");
+    const key = this.getResponseProperty("Key");
+    if (key) {
+      this.key = new EncString(key);
+    }
     this.avatarColor = this.getResponseProperty("AvatarColor");
     this.creationDate = this.getResponseProperty("CreationDate");
     this.privateKey = this.getResponseProperty("PrivateKey");
diff --git a/libs/common/src/platform/abstractions/config/config-api.service.abstraction.ts b/libs/common/src/platform/abstractions/config/config-api.service.abstraction.ts
index 3c191f59ccc..0460e8c715f 100644
--- a/libs/common/src/platform/abstractions/config/config-api.service.abstraction.ts
+++ b/libs/common/src/platform/abstractions/config/config-api.service.abstraction.ts
@@ -5,5 +5,5 @@ export abstract class ConfigApiServiceAbstraction {
   /**
    * Fetches the server configuration for the given user. If no user is provided, the configuration will not contain user-specific context.
    */
-  abstract get(userId: UserId | undefined): Promise<ServerConfigResponse>;
+  abstract get(userId: UserId | null): Promise<ServerConfigResponse>;
 }
diff --git a/libs/common/src/platform/abstractions/environment.service.ts b/libs/common/src/platform/abstractions/environment.service.ts
index b8931656848..86a0fbea242 100644
--- a/libs/common/src/platform/abstractions/environment.service.ts
+++ b/libs/common/src/platform/abstractions/environment.service.ts
@@ -95,6 +95,13 @@ export interface Environment {
  */
 export abstract class EnvironmentService {
   abstract environment$: Observable<Environment>;
+
+  /**
+   * The environment stored in global state, when a user signs in the state stored here will become
+   * their user environment.
+   */
+  abstract globalEnvironment$: Observable<Environment>;
+
   abstract cloudWebVaultUrl$: Observable<string>;
 
   /**
@@ -125,12 +132,12 @@ export abstract class EnvironmentService {
    * @param userId - The user id to set the cloud web vault app URL for. If null or undefined the global environment is set.
    * @param region - The region of the cloud web vault app.
    */
-  abstract setCloudRegion(userId: UserId, region: Region): Promise<void>;
+  abstract setCloudRegion(userId: UserId | null, region: Region): Promise<void>;
 
   /**
    * Get the environment from state. Useful if you need to get the environment for another user.
    */
-  abstract getEnvironment$(userId: UserId): Observable<Environment | undefined>;
+  abstract getEnvironment$(userId: UserId): Observable<Environment>;
 
   /**
    * @deprecated Use {@link getEnvironment$} instead.
diff --git a/libs/common/src/platform/abstractions/fido2/fido2-authenticator.service.abstraction.ts b/libs/common/src/platform/abstractions/fido2/fido2-authenticator.service.abstraction.ts
index 15655393362..fd3453198e6 100644
--- a/libs/common/src/platform/abstractions/fido2/fido2-authenticator.service.abstraction.ts
+++ b/libs/common/src/platform/abstractions/fido2/fido2-authenticator.service.abstraction.ts
@@ -70,7 +70,7 @@ export class Fido2AuthenticatorError extends Error {
 }
 
 export interface PublicKeyCredentialDescriptor {
-  id: Uint8Array;
+  id: ArrayBuffer;
   transports?: ("ble" | "hybrid" | "internal" | "nfc" | "usb")[];
   type: "public-key";
 }
@@ -155,9 +155,9 @@ export interface Fido2AuthenticatorGetAssertionParams {
 
 export interface Fido2AuthenticatorGetAssertionResult {
   selectedCredential: {
-    id: Uint8Array;
-    userHandle?: Uint8Array;
+    id: ArrayBuffer;
+    userHandle?: ArrayBuffer;
   };
-  authenticatorData: Uint8Array;
-  signature: Uint8Array;
+  authenticatorData: ArrayBuffer;
+  signature: ArrayBuffer;
 }
diff --git a/libs/common/src/platform/abstractions/log.service.ts b/libs/common/src/platform/abstractions/log.service.ts
index d77a4f69906..c540f1a2b8f 100644
--- a/libs/common/src/platform/abstractions/log.service.ts
+++ b/libs/common/src/platform/abstractions/log.service.ts
@@ -1,9 +1 @@
-import { LogLevelType } from "../enums/log-level-type.enum";
-
-export abstract class LogService {
-  abstract debug(message?: any, ...optionalParams: any[]): void;
-  abstract info(message?: any, ...optionalParams: any[]): void;
-  abstract warning(message?: any, ...optionalParams: any[]): void;
-  abstract error(message?: any, ...optionalParams: any[]): void;
-  abstract write(level: LogLevelType, message?: any, ...optionalParams: any[]): void;
-}
+export { LogService } from "@bitwarden/logging";
diff --git a/libs/common/src/platform/abstractions/platform-utils.service.ts b/libs/common/src/platform/abstractions/platform-utils.service.ts
index fa0fc8f2501..7586da5a564 100644
--- a/libs/common/src/platform/abstractions/platform-utils.service.ts
+++ b/libs/common/src/platform/abstractions/platform-utils.service.ts
@@ -28,6 +28,15 @@ export abstract class PlatformUtilsService {
   abstract getApplicationVersionNumber(): Promise<string>;
   abstract supportsWebAuthn(win: Window): boolean;
   abstract supportsDuo(): boolean;
+  /**
+   * Returns true if the device supports autofill functionality
+   */
+  abstract supportsAutofill(): boolean;
+  /**
+   * Returns true if the device supports native file downloads without
+   * the need for `target="_blank"`
+   */
+  abstract supportsFileDownloads(): boolean;
   /**
    * @deprecated use `@bitwarden/components/ToastService.showToast` instead
    *
diff --git a/libs/common/src/platform/abstractions/storage.service.ts b/libs/common/src/platform/abstractions/storage.service.ts
index 390d71ae2ad..8ff733dd730 100644
--- a/libs/common/src/platform/abstractions/storage.service.ts
+++ b/libs/common/src/platform/abstractions/storage.service.ts
@@ -1,26 +1,6 @@
-import { Observable } from "rxjs";
-
-import { StorageOptions } from "../models/domain/storage-options";
-
-export type StorageUpdateType = "save" | "remove";
-export type StorageUpdate = {
-  key: string;
-  updateType: StorageUpdateType;
-};
-
-export interface ObservableStorageService {
-  /**
-   * Provides an {@link Observable} that represents a stream of updates that
-   * have happened in this storage service or in the storage this service provides
-   * an interface to.
-   */
-  get updates$(): Observable<StorageUpdate>;
-}
-
-export abstract class AbstractStorageService {
-  abstract get valuesRequireDeserialization(): boolean;
-  abstract get<T>(key: string, options?: StorageOptions): Promise<T>;
-  abstract has(key: string, options?: StorageOptions): Promise<boolean>;
-  abstract save<T>(key: string, obj: T, options?: StorageOptions): Promise<void>;
-  abstract remove(key: string, options?: StorageOptions): Promise<void>;
-}
+export {
+  StorageUpdateType,
+  StorageUpdate,
+  ObservableStorageService,
+  AbstractStorageService,
+} from "@bitwarden/storage-core";
diff --git a/libs/common/src/platform/enums/html-storage-location.enum.ts b/libs/common/src/platform/enums/html-storage-location.enum.ts
index 1d018a72869..80dc2d3850b 100644
--- a/libs/common/src/platform/enums/html-storage-location.enum.ts
+++ b/libs/common/src/platform/enums/html-storage-location.enum.ts
@@ -1,7 +1 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum HtmlStorageLocation {
-  Local = "local",
-  Memory = "memory",
-  Session = "session",
-}
+export { HtmlStorageLocation } from "@bitwarden/storage-core";
diff --git a/libs/common/src/platform/enums/log-level-type.enum.ts b/libs/common/src/platform/enums/log-level-type.enum.ts
index b5f84467d6e..024c71c9f97 100644
--- a/libs/common/src/platform/enums/log-level-type.enum.ts
+++ b/libs/common/src/platform/enums/log-level-type.enum.ts
@@ -1,8 +1 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum LogLevelType {
-  Debug,
-  Info,
-  Warning,
-  Error,
-}
+export { LogLevel as LogLevelType } from "@bitwarden/logging";
diff --git a/libs/common/src/platform/enums/storage-location.enum.ts b/libs/common/src/platform/enums/storage-location.enum.ts
index 9f6e22babec..a312ea00af1 100644
--- a/libs/common/src/platform/enums/storage-location.enum.ts
+++ b/libs/common/src/platform/enums/storage-location.enum.ts
@@ -1,7 +1 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum StorageLocation {
-  Both = "both",
-  Disk = "disk",
-  Memory = "memory",
-}
+export { StorageLocationEnum as StorageLocation } from "@bitwarden/storage-core";
diff --git a/libs/common/src/platform/ipc/ipc-message.ts b/libs/common/src/platform/ipc/ipc-message.ts
index c0702f07567..abd352da1c0 100644
--- a/libs/common/src/platform/ipc/ipc-message.ts
+++ b/libs/common/src/platform/ipc/ipc-message.ts
@@ -2,7 +2,11 @@ import type { OutgoingMessage } from "@bitwarden/sdk-internal";
 
 export interface IpcMessage {
   type: "bitwarden-ipc-message";
-  message: Omit<OutgoingMessage, "free">;
+  message: SerializedOutgoingMessage;
+}
+
+export interface SerializedOutgoingMessage extends Omit<OutgoingMessage, "free" | "payload"> {
+  payload: number[];
 }
 
 export function isIpcMessage(message: any): message is IpcMessage {
diff --git a/libs/common/src/platform/ipc/ipc.service.ts b/libs/common/src/platform/ipc/ipc.service.ts
index c3cd77d9850..2fba4380706 100644
--- a/libs/common/src/platform/ipc/ipc.service.ts
+++ b/libs/common/src/platform/ipc/ipc.service.ts
@@ -4,7 +4,7 @@ import { IpcClient, IncomingMessage, OutgoingMessage } from "@bitwarden/sdk-inte
 
 export abstract class IpcService {
   private _client?: IpcClient;
-  protected get client(): IpcClient {
+  get client(): IpcClient {
     if (!this._client) {
       throw new Error("IpcService not initialized");
     }
@@ -23,6 +23,8 @@ export abstract class IpcService {
 
   protected async initWithClient(client: IpcClient): Promise<void> {
     this._client = client;
+    await this._client.start();
+
     this._messages$ = new Observable<IncomingMessage>((subscriber) => {
       let isSubscribed = true;
       const receiveLoop = async () => {
diff --git a/libs/common/src/platform/misc/throttle.spec.ts b/libs/common/src/platform/misc/throttle.spec.ts
deleted file mode 100644
index 1c1ff6324a6..00000000000
--- a/libs/common/src/platform/misc/throttle.spec.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { throttle } from "./throttle";
-
-describe("throttle decorator", () => {
-  it("should call the function once at a time", async () => {
-    const foo = new Foo();
-    const promises = [];
-    for (let i = 0; i < 10; i++) {
-      promises.push(foo.bar(1));
-    }
-    await Promise.all(promises);
-
-    expect(foo.calls).toBe(10);
-  });
-
-  it("should call the function once at a time for each object", async () => {
-    const foo = new Foo();
-    const foo2 = new Foo();
-    const promises = [];
-    for (let i = 0; i < 10; i++) {
-      promises.push(foo.bar(1));
-      promises.push(foo2.bar(1));
-    }
-    await Promise.all(promises);
-
-    expect(foo.calls).toBe(10);
-    expect(foo2.calls).toBe(10);
-  });
-
-  it("should call the function limit at a time", async () => {
-    const foo = new Foo();
-    const promises = [];
-    for (let i = 0; i < 10; i++) {
-      promises.push(foo.baz(1));
-    }
-    await Promise.all(promises);
-
-    expect(foo.calls).toBe(10);
-  });
-
-  it("should call the function limit at a time for each object", async () => {
-    const foo = new Foo();
-    const foo2 = new Foo();
-    const promises = [];
-    for (let i = 0; i < 10; i++) {
-      promises.push(foo.baz(1));
-      promises.push(foo2.baz(1));
-    }
-    await Promise.all(promises);
-
-    expect(foo.calls).toBe(10);
-    expect(foo2.calls).toBe(10);
-  });
-});
-
-class Foo {
-  calls = 0;
-  inflight = 0;
-
-  @throttle(1, () => "bar")
-  bar(a: number) {
-    this.calls++;
-    this.inflight++;
-    return new Promise((res) => {
-      setTimeout(() => {
-        expect(this.inflight).toBe(1);
-        this.inflight--;
-        res(a * 2);
-      }, Math.random() * 10);
-    });
-  }
-
-  @throttle(5, () => "baz")
-  baz(a: number) {
-    this.calls++;
-    this.inflight++;
-    return new Promise((res) => {
-      setTimeout(() => {
-        expect(this.inflight).toBeLessThanOrEqual(5);
-        this.inflight--;
-        res(a * 3);
-      }, Math.random() * 10);
-    });
-  }
-
-  @throttle(1, () => "qux")
-  qux(a: number) {
-    this.calls++;
-    this.inflight++;
-    return new Promise((res) => {
-      setTimeout(() => {
-        expect(this.inflight).toBe(1);
-        this.inflight--;
-        res(a * 3);
-      }, Math.random() * 10);
-    });
-  }
-}
diff --git a/libs/common/src/platform/misc/throttle.ts b/libs/common/src/platform/misc/throttle.ts
deleted file mode 100644
index 643cce8f6ba..00000000000
--- a/libs/common/src/platform/misc/throttle.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-/**
- * Use as a Decorator on async functions, it will limit how many times the function can be
- * in-flight at a time.
- *
- * Calls beyond the limit will be queued, and run when one of the active calls finishes
- */
-export function throttle(limit: number, throttleKey: (args: any[]) => string) {
-  return <T>(
-    target: any,
-    propertyKey: string | symbol,
-    descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<T>>,
-  ) => {
-    const originalMethod: () => Promise<T> = descriptor.value;
-    const allThrottles = new Map<any, Map<string, (() => void)[]>>();
-
-    const getThrottles = (obj: any) => {
-      let throttles = allThrottles.get(obj);
-      if (throttles != null) {
-        return throttles;
-      }
-      throttles = new Map<string, (() => void)[]>();
-      allThrottles.set(obj, throttles);
-      return throttles;
-    };
-
-    return {
-      value: function (...args: any[]) {
-        const throttles = getThrottles(this);
-        const argsThrottleKey = throttleKey(args);
-        let queue = throttles.get(argsThrottleKey);
-        if (queue == null) {
-          queue = [];
-          throttles.set(argsThrottleKey, queue);
-        }
-
-        return new Promise<T>((resolve, reject) => {
-          const exec = () => {
-            const onFinally = () => {
-              queue.splice(queue.indexOf(exec), 1);
-              if (queue.length >= limit) {
-                queue[limit - 1]();
-              } else if (queue.length === 0) {
-                throttles.delete(argsThrottleKey);
-                if (throttles.size === 0) {
-                  allThrottles.delete(this);
-                }
-              }
-            };
-            originalMethod
-              .apply(this, args)
-              .then((val: any) => {
-                onFinally();
-                return val;
-              })
-              .catch((err: any) => {
-                onFinally();
-                throw err;
-              })
-              .then(resolve, reject);
-          };
-          queue.push(exec);
-          if (queue.length <= limit) {
-            exec();
-          }
-        });
-      },
-    };
-  };
-}
diff --git a/libs/common/src/platform/misc/utils.ts b/libs/common/src/platform/misc/utils.ts
index a1e914da531..b3c1db91806 100644
--- a/libs/common/src/platform/misc/utils.ts
+++ b/libs/common/src/platform/misc/utils.ts
@@ -260,7 +260,7 @@ export class Utils {
     });
   }
 
-  static guidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
+  static guidRegex = /^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/;
 
   static isGuid(id: string) {
     return RegExp(Utils.guidRegex, "i").test(id);
diff --git a/libs/common/src/platform/models/domain/storage-options.ts b/libs/common/src/platform/models/domain/storage-options.ts
index e27628b8502..adf498ed2ab 100644
--- a/libs/common/src/platform/models/domain/storage-options.ts
+++ b/libs/common/src/platform/models/domain/storage-options.ts
@@ -1,9 +1 @@
-import { HtmlStorageLocation, StorageLocation } from "../../enums";
-
-export type StorageOptions = {
-  storageLocation?: StorageLocation;
-  useSecureStorage?: boolean;
-  userId?: string;
-  htmlStorageLocation?: HtmlStorageLocation;
-  keySuffix?: string;
-};
+export type { StorageOptions } from "@bitwarden/storage-core";
diff --git a/libs/common/src/platform/notifications/internal/default-notifications.service.ts b/libs/common/src/platform/notifications/internal/default-notifications.service.ts
index 4cbc8227364..ff22173a26e 100644
--- a/libs/common/src/platform/notifications/internal/default-notifications.service.ts
+++ b/libs/common/src/platform/notifications/internal/default-notifications.service.ts
@@ -108,14 +108,19 @@ export class DefaultNotificationsService implements NotificationsServiceAbstract
         return this.webPushConnectionService.supportStatus$(userId);
       }),
       supportSwitch({
-        supported: (service) =>
-          service.notifications$.pipe(
+        supported: (service) => {
+          this.logService.info("Using WebPush for notifications");
+          return service.notifications$.pipe(
             catchError((err: unknown) => {
               this.logService.warning("Issue with web push, falling back to SignalR", err);
               return this.connectSignalR$(userId, notificationsUrl);
             }),
-          ),
-        notSupported: () => this.connectSignalR$(userId, notificationsUrl),
+          );
+        },
+        notSupported: () => {
+          this.logService.info("Using SignalR for notifications");
+          return this.connectSignalR$(userId, notificationsUrl);
+        },
       }),
     );
   }
diff --git a/libs/common/src/platform/notifications/internal/signalr-connection.service.ts b/libs/common/src/platform/notifications/internal/signalr-connection.service.ts
index 8bea98cb506..58d6311c668 100644
--- a/libs/common/src/platform/notifications/internal/signalr-connection.service.ts
+++ b/libs/common/src/platform/notifications/internal/signalr-connection.service.ts
@@ -31,22 +31,35 @@ export type TimeoutManager = {
 class SignalRLogger implements ILogger {
   constructor(private readonly logService: LogService) {}
 
+  redactMessage(message: string): string {
+    const ACCESS_TOKEN_TEXT = "access_token=";
+    // Redact the access token from the logs if it exists.
+    const accessTokenIndex = message.indexOf(ACCESS_TOKEN_TEXT);
+    if (accessTokenIndex !== -1) {
+      return message.substring(0, accessTokenIndex + ACCESS_TOKEN_TEXT.length) + "[REDACTED]";
+    }
+
+    return message;
+  }
+
   log(logLevel: LogLevel, message: string): void {
+    const redactedMessage = `[SignalR] ${this.redactMessage(message)}`;
+
     switch (logLevel) {
       case LogLevel.Critical:
-        this.logService.error(message);
+        this.logService.error(redactedMessage);
         break;
       case LogLevel.Error:
-        this.logService.error(message);
+        this.logService.error(redactedMessage);
         break;
       case LogLevel.Warning:
-        this.logService.warning(message);
+        this.logService.warning(redactedMessage);
         break;
       case LogLevel.Information:
-        this.logService.info(message);
+        this.logService.info(redactedMessage);
         break;
       case LogLevel.Debug:
-        this.logService.debug(message);
+        this.logService.debug(redactedMessage);
         break;
     }
   }
diff --git a/libs/common/src/platform/notifications/internal/worker-webpush-connection.service.spec.ts b/libs/common/src/platform/notifications/internal/worker-webpush-connection.service.spec.ts
new file mode 100644
index 00000000000..6d9457389ca
--- /dev/null
+++ b/libs/common/src/platform/notifications/internal/worker-webpush-connection.service.spec.ts
@@ -0,0 +1,387 @@
+import { mock, MockProxy } from "jest-mock-extended";
+import { firstValueFrom, of } from "rxjs";
+
+import {
+  awaitAsync,
+  FakeGlobalState,
+  FakeStateProvider,
+  mockAccountServiceWith,
+} from "../../../../spec";
+import { PushTechnology } from "../../../enums/push-technology.enum";
+import { UserId } from "../../../types/guid";
+import { ConfigService } from "../../abstractions/config/config.service";
+import { ServerConfig } from "../../abstractions/config/server-config";
+import { Supported } from "../../misc/support-status";
+import { Utils } from "../../misc/utils";
+import { ServerConfigData } from "../../models/data/server-config.data";
+import { PushSettingsConfigResponse } from "../../models/response/server-config.response";
+import { KeyDefinition } from "../../state";
+
+import { WebPushNotificationsApiService } from "./web-push-notifications-api.service";
+import { WebPushConnector } from "./webpush-connection.service";
+import {
+  WEB_PUSH_SUBSCRIPTION_USERS,
+  WorkerWebPushConnectionService,
+} from "./worker-webpush-connection.service";
+
+const mockUser1 = "testUser1" as UserId;
+
+const createSub = (key: string) => {
+  return {
+    options: { applicationServerKey: Utils.fromUrlB64ToArray(key), userVisibleOnly: true },
+    endpoint: `web.push.endpoint/?${Utils.newGuid()}`,
+    expirationTime: 5,
+    getKey: () => null,
+    toJSON: () => ({ endpoint: "something", keys: {}, expirationTime: 5 }),
+    unsubscribe: () => Promise.resolve(true),
+  } satisfies PushSubscription;
+};
+
+describe("WorkerWebpushConnectionService", () => {
+  let configService: MockProxy<ConfigService>;
+  let webPushApiService: MockProxy<WebPushNotificationsApiService>;
+  let stateProvider: FakeStateProvider;
+  let pushManager: MockProxy<PushManager>;
+  const userId = "testUser1" as UserId;
+
+  let sut: WorkerWebPushConnectionService;
+
+  beforeEach(() => {
+    configService = mock();
+    webPushApiService = mock();
+    stateProvider = new FakeStateProvider(mockAccountServiceWith(userId));
+    pushManager = mock();
+
+    sut = new WorkerWebPushConnectionService(
+      configService,
+      webPushApiService,
+      mock<ServiceWorkerRegistration>({ pushManager: pushManager }),
+      stateProvider,
+    );
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+  type ExtractKeyDefinitionType<T> = T extends KeyDefinition<infer U> ? U : never;
+  describe("supportStatus$", () => {
+    let fakeGlobalState: FakeGlobalState<
+      ExtractKeyDefinitionType<typeof WEB_PUSH_SUBSCRIPTION_USERS>
+    >;
+
+    beforeEach(() => {
+      fakeGlobalState = stateProvider.getGlobal(WEB_PUSH_SUBSCRIPTION_USERS) as FakeGlobalState<
+        ExtractKeyDefinitionType<typeof WEB_PUSH_SUBSCRIPTION_USERS>
+      >;
+    });
+
+    test("when web push is supported, have an existing subscription, and we've already registered the user, should not call API", async () => {
+      configService.serverConfig$ = of(
+        new ServerConfig(
+          new ServerConfigData({
+            push: new PushSettingsConfigResponse({
+              pushTechnology: PushTechnology.WebPush,
+              vapidPublicKey: "dGVzdA",
+            }),
+          }),
+        ),
+      );
+      const existingSubscription = createSub("dGVzdA");
+      await fakeGlobalState.nextState({ [existingSubscription.endpoint]: [userId] });
+
+      pushManager.getSubscription.mockResolvedValue(existingSubscription);
+
+      const supportStatus = await firstValueFrom(sut.supportStatus$(mockUser1));
+      expect(supportStatus.type).toBe("supported");
+      const service = (supportStatus as Supported<WebPushConnector>).service;
+      expect(service).not.toBeFalsy();
+
+      const notificationsSub = service.notifications$.subscribe();
+
+      await awaitAsync(2);
+
+      expect(pushManager.getSubscription).toHaveBeenCalledTimes(1);
+      expect(webPushApiService.putSubscription).toHaveBeenCalledTimes(0);
+
+      expect(fakeGlobalState.nextMock).toHaveBeenCalledTimes(0);
+
+      notificationsSub.unsubscribe();
+    });
+
+    test("when web push is supported, have an existing subscription, and we haven't registered the user, should call API", async () => {
+      configService.serverConfig$ = of(
+        new ServerConfig(
+          new ServerConfigData({
+            push: new PushSettingsConfigResponse({
+              pushTechnology: PushTechnology.WebPush,
+              vapidPublicKey: "dGVzdA",
+            }),
+          }),
+        ),
+      );
+      const existingSubscription = createSub("dGVzdA");
+      await fakeGlobalState.nextState({
+        [existingSubscription.endpoint]: ["otherUserId" as UserId],
+      });
+
+      pushManager.getSubscription.mockResolvedValue(existingSubscription);
+
+      const supportStatus = await firstValueFrom(sut.supportStatus$(mockUser1));
+      expect(supportStatus.type).toBe("supported");
+      const service = (supportStatus as Supported<WebPushConnector>).service;
+      expect(service).not.toBeFalsy();
+
+      const notificationsSub = service.notifications$.subscribe();
+
+      await awaitAsync(2);
+
+      expect(pushManager.getSubscription).toHaveBeenCalledTimes(1);
+      expect(webPushApiService.putSubscription).toHaveBeenCalledTimes(1);
+
+      expect(fakeGlobalState.nextMock).toHaveBeenCalledTimes(1);
+      expect(fakeGlobalState.nextMock).toHaveBeenCalledWith({
+        [existingSubscription.endpoint]: ["otherUserId", mockUser1],
+      });
+
+      notificationsSub.unsubscribe();
+    });
+
+    test("when web push is supported, have an existing subscription, but it isn't in state, should call API and add to state", async () => {
+      configService.serverConfig$ = of(
+        new ServerConfig(
+          new ServerConfigData({
+            push: new PushSettingsConfigResponse({
+              pushTechnology: PushTechnology.WebPush,
+              vapidPublicKey: "dGVzdA",
+            }),
+          }),
+        ),
+      );
+      const existingSubscription = createSub("dGVzdA");
+      await fakeGlobalState.nextState({
+        [existingSubscription.endpoint]: null!,
+      });
+
+      pushManager.getSubscription.mockResolvedValue(existingSubscription);
+
+      const supportStatus = await firstValueFrom(sut.supportStatus$(mockUser1));
+      expect(supportStatus.type).toBe("supported");
+      const service = (supportStatus as Supported<WebPushConnector>).service;
+      expect(service).not.toBeFalsy();
+
+      const notificationsSub = service.notifications$.subscribe();
+
+      await awaitAsync(2);
+
+      expect(pushManager.getSubscription).toHaveBeenCalledTimes(1);
+      expect(webPushApiService.putSubscription).toHaveBeenCalledTimes(1);
+
+      expect(fakeGlobalState.nextMock).toHaveBeenCalledTimes(1);
+      expect(fakeGlobalState.nextMock).toHaveBeenCalledWith({
+        [existingSubscription.endpoint]: [mockUser1],
+      });
+
+      notificationsSub.unsubscribe();
+    });
+
+    test("when web push is supported, have an existing subscription, but state array is null, should call API and add to state", async () => {
+      configService.serverConfig$ = of(
+        new ServerConfig(
+          new ServerConfigData({
+            push: new PushSettingsConfigResponse({
+              pushTechnology: PushTechnology.WebPush,
+              vapidPublicKey: "dGVzdA",
+            }),
+          }),
+        ),
+      );
+      const existingSubscription = createSub("dGVzdA");
+      await fakeGlobalState.nextState({});
+
+      pushManager.getSubscription.mockResolvedValue(existingSubscription);
+
+      const supportStatus = await firstValueFrom(sut.supportStatus$(mockUser1));
+      expect(supportStatus.type).toBe("supported");
+      const service = (supportStatus as Supported<WebPushConnector>).service;
+      expect(service).not.toBeFalsy();
+
+      const notificationsSub = service.notifications$.subscribe();
+
+      await awaitAsync(2);
+
+      expect(pushManager.getSubscription).toHaveBeenCalledTimes(1);
+      expect(webPushApiService.putSubscription).toHaveBeenCalledTimes(1);
+
+      expect(fakeGlobalState.nextMock).toHaveBeenCalledTimes(1);
+      expect(fakeGlobalState.nextMock).toHaveBeenCalledWith({
+        [existingSubscription.endpoint]: [mockUser1],
+      });
+
+      notificationsSub.unsubscribe();
+    });
+
+    test("when web push is supported, but we don't have an existing subscription, should call the api and wipe out existing state", async () => {
+      configService.serverConfig$ = of(
+        new ServerConfig(
+          new ServerConfigData({
+            push: new PushSettingsConfigResponse({
+              pushTechnology: PushTechnology.WebPush,
+              vapidPublicKey: "dGVzdA",
+            }),
+          }),
+        ),
+      );
+      const existingState = createSub("dGVzdA");
+      await fakeGlobalState.nextState({ [existingState.endpoint]: [userId] });
+
+      pushManager.getSubscription.mockResolvedValue(null);
+      const newSubscription = createSub("dGVzdA");
+      pushManager.subscribe.mockResolvedValue(newSubscription);
+
+      const supportStatus = await firstValueFrom(sut.supportStatus$(mockUser1));
+      expect(supportStatus.type).toBe("supported");
+      const service = (supportStatus as Supported<WebPushConnector>).service;
+      expect(service).not.toBeFalsy();
+
+      const notificationsSub = service.notifications$.subscribe();
+
+      await awaitAsync(2);
+
+      expect(pushManager.getSubscription).toHaveBeenCalledTimes(1);
+      expect(webPushApiService.putSubscription).toHaveBeenCalledTimes(1);
+
+      expect(fakeGlobalState.nextMock).toHaveBeenCalledTimes(1);
+      expect(fakeGlobalState.nextMock).toHaveBeenCalledWith({
+        [newSubscription.endpoint]: [mockUser1],
+      });
+
+      notificationsSub.unsubscribe();
+    });
+
+    test("when web push is supported and no existing subscription, should call API", async () => {
+      configService.serverConfig$ = of(
+        new ServerConfig(
+          new ServerConfigData({
+            push: new PushSettingsConfigResponse({
+              pushTechnology: PushTechnology.WebPush,
+              vapidPublicKey: "dGVzdA",
+            }),
+          }),
+        ),
+      );
+
+      pushManager.getSubscription.mockResolvedValue(null);
+      pushManager.subscribe.mockResolvedValue(createSub("dGVzdA"));
+
+      const supportStatus = await firstValueFrom(sut.supportStatus$(mockUser1));
+      expect(supportStatus.type).toBe("supported");
+      const service = (supportStatus as Supported<WebPushConnector>).service;
+      expect(service).not.toBeFalsy();
+
+      const notificationsSub = service.notifications$.subscribe();
+
+      await awaitAsync(2);
+
+      expect(pushManager.getSubscription).toHaveBeenCalledTimes(1);
+      expect(pushManager.subscribe).toHaveBeenCalledTimes(1);
+      expect(webPushApiService.putSubscription).toHaveBeenCalledTimes(1);
+
+      notificationsSub.unsubscribe();
+    });
+
+    test("when web push is supported and existing subscription with different key, should call API", async () => {
+      configService.serverConfig$ = of(
+        new ServerConfig(
+          new ServerConfigData({
+            push: new PushSettingsConfigResponse({
+              pushTechnology: PushTechnology.WebPush,
+              vapidPublicKey: "dGVzdA",
+            }),
+          }),
+        ),
+      );
+
+      pushManager.getSubscription.mockResolvedValue(createSub("dGVzdF9hbHQ"));
+
+      pushManager.subscribe.mockResolvedValue(createSub("dGVzdA"));
+
+      const supportStatus = await firstValueFrom(sut.supportStatus$(mockUser1));
+      expect(supportStatus.type).toBe("supported");
+      const service = (supportStatus as Supported<WebPushConnector>).service;
+      expect(service).not.toBeFalsy();
+
+      const notificationsSub = service.notifications$.subscribe();
+
+      await awaitAsync(2);
+
+      expect(pushManager.getSubscription).toHaveBeenCalledTimes(1);
+      expect(pushManager.subscribe).toHaveBeenCalledTimes(1);
+      expect(webPushApiService.putSubscription).toHaveBeenCalledTimes(1);
+
+      notificationsSub.unsubscribe();
+    });
+
+    test("when server config emits multiple times quickly while api call takes a long time will only call API once", async () => {
+      configService.serverConfig$ = of(
+        new ServerConfig(
+          new ServerConfigData({
+            push: new PushSettingsConfigResponse({
+              pushTechnology: PushTechnology.WebPush,
+              vapidPublicKey: "dGVzdA",
+            }),
+          }),
+        ),
+      );
+
+      pushManager.getSubscription.mockResolvedValue(createSub("dGVzdF9hbHQ"));
+
+      pushManager.subscribe.mockResolvedValue(createSub("dGVzdA"));
+
+      const supportStatus = await firstValueFrom(sut.supportStatus$(mockUser1));
+      expect(supportStatus.type).toBe("supported");
+      const service = (supportStatus as Supported<WebPushConnector>).service;
+      expect(service).not.toBeFalsy();
+
+      const notificationsSub = service.notifications$.subscribe();
+
+      await awaitAsync(2);
+
+      expect(pushManager.getSubscription).toHaveBeenCalledTimes(1);
+      expect(pushManager.subscribe).toHaveBeenCalledTimes(1);
+      expect(webPushApiService.putSubscription).toHaveBeenCalledTimes(1);
+
+      notificationsSub.unsubscribe();
+    });
+
+    it("server config shows SignalR support should return not-supported", async () => {
+      configService.serverConfig$ = of(
+        new ServerConfig(
+          new ServerConfigData({
+            push: new PushSettingsConfigResponse({
+              pushTechnology: PushTechnology.SignalR,
+            }),
+          }),
+        ),
+      );
+
+      const supportStatus = await firstValueFrom(sut.supportStatus$(mockUser1));
+      expect(supportStatus.type).toBe("not-supported");
+    });
+
+    it("server config shows web push but no public key support should return not-supported", async () => {
+      configService.serverConfig$ = of(
+        new ServerConfig(
+          new ServerConfigData({
+            push: new PushSettingsConfigResponse({
+              pushTechnology: PushTechnology.WebPush,
+              vapidPublicKey: null,
+            }),
+          }),
+        ),
+      );
+
+      const supportStatus = await firstValueFrom(sut.supportStatus$(mockUser1));
+      expect(supportStatus.type).toBe("not-supported");
+    });
+  });
+});
diff --git a/libs/common/src/platform/notifications/internal/worker-webpush-connection.service.ts b/libs/common/src/platform/notifications/internal/worker-webpush-connection.service.ts
index a1143d14d1d..528ad90ed61 100644
--- a/libs/common/src/platform/notifications/internal/worker-webpush-connection.service.ts
+++ b/libs/common/src/platform/notifications/internal/worker-webpush-connection.service.ts
@@ -9,6 +9,7 @@ import {
   Subject,
   Subscription,
   switchMap,
+  withLatestFrom,
 } from "rxjs";
 
 import { PushTechnology } from "../../../enums/push-technology.enum";
@@ -17,6 +18,7 @@ import { UserId } from "../../../types/guid";
 import { ConfigService } from "../../abstractions/config/config.service";
 import { SupportStatus } from "../../misc/support-status";
 import { Utils } from "../../misc/utils";
+import { KeyDefinition, StateProvider, WEB_PUSH_SUBSCRIPTION } from "../../state";
 
 import { WebPushNotificationsApiService } from "./web-push-notifications-api.service";
 import { WebPushConnectionService, WebPushConnector } from "./webpush-connection.service";
@@ -48,6 +50,7 @@ export class WorkerWebPushConnectionService implements WebPushConnectionService
     private readonly configService: ConfigService,
     private readonly webPushApiService: WebPushNotificationsApiService,
     private readonly serviceWorkerRegistration: ServiceWorkerRegistration,
+    private readonly stateProvider: StateProvider,
   ) {}
 
   start(): Subscription {
@@ -97,6 +100,7 @@ export class WorkerWebPushConnectionService implements WebPushConnectionService
             this.serviceWorkerRegistration,
             this.pushEvent,
             this.pushChangeEvent,
+            this.stateProvider,
           ),
         } satisfies SupportStatus<WebPushConnector>;
       }),
@@ -114,20 +118,36 @@ class MyWebPushConnector implements WebPushConnector {
     private readonly serviceWorkerRegistration: ServiceWorkerRegistration,
     private readonly pushEvent$: Observable<PushEvent>,
     private readonly pushChangeEvent$: Observable<PushSubscriptionChangeEvent>,
+    private readonly stateProvider: StateProvider,
   ) {
+    const subscriptionUsersState = this.stateProvider.getGlobal(WEB_PUSH_SUBSCRIPTION_USERS);
     this.notifications$ = this.getOrCreateSubscription$(this.vapidPublicKey).pipe(
-      concatMap((subscription) => {
-        return defer(() => {
-          if (subscription == null) {
-            throw new Error("Expected a non-null subscription.");
-          }
-          return this.webPushApiService.putSubscription(subscription.toJSON());
-        }).pipe(
-          switchMap(() => this.pushEvent$),
-          map((e) => {
-            return new NotificationResponse(e.data.json().data);
-          }),
-        );
+      withLatestFrom(subscriptionUsersState.state$.pipe(map((x) => x ?? {}))),
+      concatMap(async ([[isExistingSubscription, subscription], subscriptionUsers]) => {
+        if (subscription == null) {
+          throw new Error("Expected a non-null subscription.");
+        }
+
+        // If this is a new subscription, we can clear state and start over
+        if (!isExistingSubscription) {
+          subscriptionUsers = {};
+        }
+
+        // If the user is already subscribed, we don't need to do anything
+        if (subscriptionUsers[subscription.endpoint]?.includes(this.userId)) {
+          return;
+        }
+        subscriptionUsers[subscription.endpoint] ??= [];
+        subscriptionUsers[subscription.endpoint].push(this.userId);
+        // Update the state with the new subscription-user association
+        await subscriptionUsersState.update(() => subscriptionUsers);
+
+        // Inform the server about the new subscription-user association
+        await this.webPushApiService.putSubscription(subscription.toJSON());
+      }),
+      switchMap(() => this.pushEvent$),
+      map((e) => {
+        return new NotificationResponse(e.data.json().data);
       }),
     );
   }
@@ -146,7 +166,7 @@ class MyWebPushConnector implements WebPushConnector {
           await this.serviceWorkerRegistration.pushManager.getSubscription();
 
         if (existingSubscription == null) {
-          return await this.pushManagerSubscribe(key);
+          return [false, await this.pushManagerSubscribe(key)] as const;
         }
 
         const subscriptionKey = Utils.fromBufferToUrlB64(
@@ -159,12 +179,30 @@ class MyWebPushConnector implements WebPushConnector {
         if (subscriptionKey !== key) {
           // There is a subscription, but it's not for the current server, unsubscribe and then make a new one
           await existingSubscription.unsubscribe();
-          return await this.pushManagerSubscribe(key);
+          return [false, await this.pushManagerSubscribe(key)] as const;
         }
 
-        return existingSubscription;
+        return [true, existingSubscription] as const;
       }),
-      this.pushChangeEvent$.pipe(map((event) => event.newSubscription)),
+      this.pushChangeEvent$.pipe(map((event) => [false, event.newSubscription] as const)),
     );
   }
 }
+
+export const WEB_PUSH_SUBSCRIPTION_USERS = new KeyDefinition<Record<string, UserId[]>>(
+  WEB_PUSH_SUBSCRIPTION,
+  "subUsers",
+  {
+    deserializer: (obj) => {
+      if (obj == null) {
+        return {};
+      }
+
+      const result: Record<string, UserId[]> = {};
+      for (const [key, value] of Object.entries(obj)) {
+        result[key] = Array.isArray(value) ? value : [];
+      }
+      return result;
+    },
+  },
+);
diff --git a/libs/common/src/platform/services/config/config-api.service.ts b/libs/common/src/platform/services/config/config-api.service.ts
index f283410acea..b7ecb9c8712 100644
--- a/libs/common/src/platform/services/config/config-api.service.ts
+++ b/libs/common/src/platform/services/config/config-api.service.ts
@@ -10,7 +10,7 @@ export class ConfigApiService implements ConfigApiServiceAbstraction {
     private tokenService: TokenService,
   ) {}
 
-  async get(userId: UserId | undefined): Promise<ServerConfigResponse> {
+  async get(userId: UserId | null): Promise<ServerConfigResponse> {
     // Authentication adds extra context to config responses, if the user has an access token, we want to use it
     // We don't particularly care about ensuring the token is valid and not expired, just that it exists
     const authed: boolean =
diff --git a/libs/common/src/platform/services/config/config.service.spec.ts b/libs/common/src/platform/services/config/config.service.spec.ts
index ea3b56a32f1..e8a1872c4c1 100644
--- a/libs/common/src/platform/services/config/config.service.spec.ts
+++ b/libs/common/src/platform/services/config/config.service.spec.ts
@@ -10,9 +10,9 @@ import {
   FakeGlobalState,
   FakeSingleUserState,
   FakeStateProvider,
-  awaitAsync,
   mockAccountServiceWith,
 } from "../../../../spec";
+import { Matrix } from "../../../../spec/matrix";
 import { subscribeTo } from "../../../../spec/observable-tracker";
 import { AuthService } from "../../../auth/abstractions/auth.service";
 import { AuthenticationStatus } from "../../../auth/enums/authentication-status";
@@ -74,7 +74,8 @@ describe("ConfigService", () => {
     });
 
     beforeEach(() => {
-      environmentService.environment$ = environmentSubject;
+      Matrix.autoMockMethod(environmentService.getEnvironment$, () => environmentSubject);
+      environmentService.globalEnvironment$ = environmentSubject;
       sut = new DefaultConfigService(
         configApiService,
         environmentService,
@@ -98,9 +99,12 @@ describe("ConfigService", () => {
             : serverConfigFactory(activeApiUrl + userId, tooOld);
         const globalStored =
           configStateDescription === "missing"
-            ? {}
+            ? {
+                [activeApiUrl]: null,
+              }
             : {
                 [activeApiUrl]: serverConfigFactory(activeApiUrl, tooOld),
+                [activeApiUrl + "0"]: serverConfigFactory(activeApiUrl + userId, tooOld),
               };
 
         beforeEach(() => {
@@ -108,11 +112,6 @@ describe("ConfigService", () => {
           userState.nextState(userStored);
         });
 
-        // sanity check
-        test("authed and unauthorized state are different", () => {
-          expect(globalStored[activeApiUrl]).not.toEqual(userStored);
-        });
-
         describe("fail to fetch", () => {
           beforeEach(() => {
             configApiService.get.mockRejectedValue(new Error("Unable to fetch"));
@@ -178,6 +177,7 @@ describe("ConfigService", () => {
         beforeEach(() => {
           globalState.stateSubject.next(globalStored);
           userState.nextState(userStored);
+          Matrix.autoMockMethod(environmentService.getEnvironment$, () => environmentSubject);
         });
         it("does not fetch from server", async () => {
           await firstValueFrom(sut.serverConfig$);
@@ -189,21 +189,13 @@ describe("ConfigService", () => {
           const actual = await firstValueFrom(sut.serverConfig$);
           expect(actual).toEqual(activeUserId ? userStored : globalStored[activeApiUrl]);
         });
-
-        it("does not complete after emit", async () => {
-          const emissions = [];
-          const subscription = sut.serverConfig$.subscribe((v) => emissions.push(v));
-          await awaitAsync();
-          expect(emissions.length).toBe(1);
-          expect(subscription.closed).toBe(false);
-        });
       });
     });
   });
 
   it("gets global config when there is an locked active user", async () => {
     await accountService.switchAccount(userId);
-    environmentService.environment$ = of(environmentFactory(activeApiUrl));
+    environmentService.globalEnvironment$ = of(environmentFactory(activeApiUrl));
 
     globalState.stateSubject.next({
       [activeApiUrl]: serverConfigFactory(activeApiUrl + "global"),
@@ -236,7 +228,8 @@ describe("ConfigService", () => {
 
     beforeEach(() => {
       environmentSubject = new Subject<Environment>();
-      environmentService.environment$ = environmentSubject;
+      environmentService.globalEnvironment$ = environmentSubject;
+      Matrix.autoMockMethod(environmentService.getEnvironment$, () => environmentSubject);
       sut = new DefaultConfigService(
         configApiService,
         environmentService,
@@ -327,7 +320,8 @@ describe("ConfigService", () => {
 
     beforeEach(async () => {
       const config = serverConfigFactory("existing-data", tooOld);
-      environmentService.environment$ = environmentSubject;
+      environmentService.globalEnvironment$ = environmentSubject;
+      Matrix.autoMockMethod(environmentService.getEnvironment$, () => environmentSubject);
 
       globalState.stateSubject.next({ [apiUrl(0)]: config });
       userState.stateSubject.next({
diff --git a/libs/common/src/platform/services/config/default-config.service.ts b/libs/common/src/platform/services/config/default-config.service.ts
index 33f86d30885..4297b65cb60 100644
--- a/libs/common/src/platform/services/config/default-config.service.ts
+++ b/libs/common/src/platform/services/config/default-config.service.ts
@@ -1,17 +1,18 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import {
   combineLatest,
+  distinctUntilChanged,
   firstValueFrom,
   map,
   mergeWith,
   NEVER,
   Observable,
   of,
-  shareReplay,
+  ReplaySubject,
+  share,
   Subject,
   switchMap,
   tap,
+  timer,
 } from "rxjs";
 import { SemVer } from "semver";
 
@@ -50,11 +51,15 @@ export const GLOBAL_SERVER_CONFIGURATIONS = KeyDefinition.record<ServerConfig, A
   },
 );
 
+const environmentComparer = (previous: Environment, current: Environment) => {
+  return previous.getApiUrl() === current.getApiUrl();
+};
+
 // FIXME: currently we are limited to api requests for active users. Update to accept a UserId and APIUrl once ApiService supports it.
 export class DefaultConfigService implements ConfigService {
-  private failedFetchFallbackSubject = new Subject<ServerConfig>();
+  private failedFetchFallbackSubject = new Subject<ServerConfig | null>();
 
-  serverConfig$: Observable<ServerConfig>;
+  serverConfig$: Observable<ServerConfig | null>;
 
   serverSettings$: Observable<ServerSettings>;
 
@@ -67,25 +72,51 @@ export class DefaultConfigService implements ConfigService {
     private stateProvider: StateProvider,
     private authService: AuthService,
   ) {
-    const userId$ = this.stateProvider.activeUserId$;
-    const authStatus$ = userId$.pipe(
-      switchMap((userId) => (userId == null ? of(null) : this.authService.authStatusFor$(userId))),
+    const globalConfig$ = this.environmentService.globalEnvironment$.pipe(
+      distinctUntilChanged(environmentComparer),
+      switchMap((environment) =>
+        this.globalConfigFor$(environment.getApiUrl()).pipe(
+          map((config) => {
+            return [config, null as UserId | null, environment] as const;
+          }),
+        ),
+      ),
     );
 
-    this.serverConfig$ = combineLatest([
-      userId$,
-      this.environmentService.environment$,
-      authStatus$,
-    ]).pipe(
-      switchMap(([userId, environment, authStatus]) => {
-        if (userId == null || authStatus !== AuthenticationStatus.Unlocked) {
-          return this.globalConfigFor$(environment.getApiUrl()).pipe(
-            map((config) => [config, null, environment] as const),
-          );
+    this.serverConfig$ = this.stateProvider.activeUserId$.pipe(
+      distinctUntilChanged(),
+      switchMap((userId) => {
+        if (userId == null) {
+          // Global
+          return globalConfig$;
         }
 
-        return this.userConfigFor$(userId).pipe(
-          map((config) => [config, userId, environment] as const),
+        return this.authService.authStatusFor$(userId).pipe(
+          map((authStatus) => authStatus === AuthenticationStatus.Unlocked),
+          distinctUntilChanged(),
+          switchMap((isUnlocked) => {
+            if (!isUnlocked) {
+              return globalConfig$;
+            }
+
+            return combineLatest([
+              this.environmentService
+                .getEnvironment$(userId)
+                .pipe(distinctUntilChanged(environmentComparer)),
+              this.userConfigFor$(userId),
+            ]).pipe(
+              switchMap(([environment, config]) => {
+                if (config == null) {
+                  // If the user doesn't have any config yet, use the global config for that url as the fallback
+                  return this.globalConfigFor$(environment.getApiUrl()).pipe(
+                    map((globalConfig) => [globalConfig, userId, environment] as const),
+                  );
+                }
+
+                return of([config, userId, environment] as const);
+              }),
+            );
+          }),
         );
       }),
       tap(async (rec) => {
@@ -106,7 +137,7 @@ export class DefaultConfigService implements ConfigService {
       }),
       // If fetch fails, we'll emit on this subject to fallback to the existing config
       mergeWith(this.failedFetchFallbackSubject),
-      shareReplay({ refCount: true, bufferSize: 1 }),
+      share({ connector: () => new ReplaySubject(1), resetOnRefCountZero: () => timer(1000) }),
     );
 
     this.cloudRegion$ = this.serverConfig$.pipe(
@@ -155,8 +186,8 @@ export class DefaultConfigService implements ConfigService {
 
   // Updates the on-disk configuration with a newly retrieved configuration
   private async renewConfig(
-    existingConfig: ServerConfig,
-    userId: UserId,
+    existingConfig: ServerConfig | null,
+    userId: UserId | null,
     environment: Environment,
   ): Promise<void> {
     try {
@@ -164,9 +195,7 @@ export class DefaultConfigService implements ConfigService {
       // somewhat quickly even though it may not be accurate, we won't cancel the HTTP request
       // though so that hopefully it can have finished and hydrated a more accurate value.
       const handle = setTimeout(() => {
-        this.logService.info(
-          "Self-host environment did not respond in time, emitting previous config.",
-        );
+        this.logService.info("Environment did not respond in time, emitting previous config.");
         this.failedFetchFallbackSubject.next(existingConfig);
       }, SLOW_EMISSION_GUARD);
       const response = await this.configApiService.get(userId);
@@ -199,13 +228,13 @@ export class DefaultConfigService implements ConfigService {
     }
   }
 
-  private globalConfigFor$(apiUrl: string): Observable<ServerConfig> {
+  private globalConfigFor$(apiUrl: string): Observable<ServerConfig | null> {
     return this.stateProvider
       .getGlobal(GLOBAL_SERVER_CONFIGURATIONS)
-      .state$.pipe(map((configs) => configs?.[apiUrl]));
+      .state$.pipe(map((configs) => configs?.[apiUrl] ?? null));
   }
 
-  private userConfigFor$(userId: UserId): Observable<ServerConfig> {
+  private userConfigFor$(userId: UserId): Observable<ServerConfig | null> {
     return this.stateProvider.getUser(userId, USER_SERVER_CONFIG).state$;
   }
 }
diff --git a/libs/common/src/platform/services/console-log.service.spec.ts b/libs/common/src/platform/services/console-log.service.spec.ts
index 508ca4eb327..e73aed5f3b5 100644
--- a/libs/common/src/platform/services/console-log.service.spec.ts
+++ b/libs/common/src/platform/services/console-log.service.spec.ts
@@ -1,6 +1,6 @@
-import { interceptConsole, restoreConsole } from "../../../spec";
+import { ConsoleLogService } from "@bitwarden/logging";
 
-import { ConsoleLogService } from "./console-log.service";
+import { interceptConsole, restoreConsole } from "../../../spec";
 
 describe("ConsoleLogService", () => {
   const error = new Error("this is an error");
diff --git a/libs/common/src/platform/services/console-log.service.ts b/libs/common/src/platform/services/console-log.service.ts
index cb6554e2aa2..6d55614757b 100644
--- a/libs/common/src/platform/services/console-log.service.ts
+++ b/libs/common/src/platform/services/console-log.service.ts
@@ -1,59 +1 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { LogService as LogServiceAbstraction } from "../abstractions/log.service";
-import { LogLevelType } from "../enums/log-level-type.enum";
-
-export class ConsoleLogService implements LogServiceAbstraction {
-  protected timersMap: Map<string, [number, number]> = new Map();
-
-  constructor(
-    protected isDev: boolean,
-    protected filter: (level: LogLevelType) => boolean = null,
-  ) {}
-
-  debug(message?: any, ...optionalParams: any[]) {
-    if (!this.isDev) {
-      return;
-    }
-    this.write(LogLevelType.Debug, message, ...optionalParams);
-  }
-
-  info(message?: any, ...optionalParams: any[]) {
-    this.write(LogLevelType.Info, message, ...optionalParams);
-  }
-
-  warning(message?: any, ...optionalParams: any[]) {
-    this.write(LogLevelType.Warning, message, ...optionalParams);
-  }
-
-  error(message?: any, ...optionalParams: any[]) {
-    this.write(LogLevelType.Error, message, ...optionalParams);
-  }
-
-  write(level: LogLevelType, message?: any, ...optionalParams: any[]) {
-    if (this.filter != null && this.filter(level)) {
-      return;
-    }
-
-    switch (level) {
-      case LogLevelType.Debug:
-        // eslint-disable-next-line
-        console.log(message, ...optionalParams);
-        break;
-      case LogLevelType.Info:
-        // eslint-disable-next-line
-        console.log(message, ...optionalParams);
-        break;
-      case LogLevelType.Warning:
-        // eslint-disable-next-line
-        console.warn(message, ...optionalParams);
-        break;
-      case LogLevelType.Error:
-        // eslint-disable-next-line
-        console.error(message, ...optionalParams);
-        break;
-      default:
-        break;
-    }
-  }
-}
+export { ConsoleLogService } from "@bitwarden/logging";
diff --git a/libs/common/src/platform/services/default-environment.service.ts b/libs/common/src/platform/services/default-environment.service.ts
index df55693ba0b..4a1af68505a 100644
--- a/libs/common/src/platform/services/default-environment.service.ts
+++ b/libs/common/src/platform/services/default-environment.service.ts
@@ -133,6 +133,7 @@ export class DefaultEnvironmentService implements EnvironmentService {
   );
 
   environment$: Observable<Environment>;
+  globalEnvironment$: Observable<Environment>;
   cloudWebVaultUrl$: Observable<string>;
 
   constructor(
@@ -148,6 +149,10 @@ export class DefaultEnvironmentService implements EnvironmentService {
       distinctUntilChanged((oldUserId: UserId, newUserId: UserId) => oldUserId == newUserId),
     );
 
+    this.globalEnvironment$ = this.stateProvider
+      .getGlobal(GLOBAL_ENVIRONMENT_KEY)
+      .state$.pipe(map((state) => this.buildEnvironment(state?.region, state?.urls)));
+
     this.environment$ = account$.pipe(
       switchMap((userId) => {
         const t = userId
@@ -263,7 +268,7 @@ export class DefaultEnvironmentService implements EnvironmentService {
     return new SelfHostedEnvironment(urls);
   }
 
-  async setCloudRegion(userId: UserId, region: CloudRegion) {
+  async setCloudRegion(userId: UserId | null, region: CloudRegion) {
     if (userId == null) {
       await this.globalCloudRegionState.update(() => region);
     } else {
@@ -271,7 +276,7 @@ export class DefaultEnvironmentService implements EnvironmentService {
     }
   }
 
-  getEnvironment$(userId: UserId): Observable<Environment | undefined> {
+  getEnvironment$(userId: UserId): Observable<Environment> {
     return this.stateProvider.getUser(userId, USER_ENVIRONMENT_KEY).state$.pipe(
       map((state) => {
         return this.buildEnvironment(state?.region, state?.urls);
diff --git a/libs/common/src/platform/services/fido2/credential-id-utils.spec.ts b/libs/common/src/platform/services/fido2/credential-id-utils.spec.ts
index 76e068ac01c..1f2217ccd63 100644
--- a/libs/common/src/platform/services/fido2/credential-id-utils.spec.ts
+++ b/libs/common/src/platform/services/fido2/credential-id-utils.spec.ts
@@ -9,7 +9,7 @@ describe("credential-id-utils", () => {
         new Uint8Array([
           0x08, 0xd7, 0x0b, 0x74, 0xe9, 0xf5, 0x45, 0x22, 0xa4, 0x25, 0xe5, 0xdc, 0xd4, 0x01, 0x07,
           0xe7,
-        ]),
+        ]).buffer,
       );
     });
 
@@ -20,7 +20,7 @@ describe("credential-id-utils", () => {
         new Uint8Array([
           0x08, 0xd7, 0x0b, 0x74, 0xe9, 0xf5, 0x45, 0x22, 0xa4, 0x25, 0xe5, 0xdc, 0xd4, 0x01, 0x07,
           0xe7,
-        ]),
+        ]).buffer,
       );
     });
 
diff --git a/libs/common/src/platform/services/fido2/credential-id-utils.ts b/libs/common/src/platform/services/fido2/credential-id-utils.ts
index 685669f0da3..08ea33114f5 100644
--- a/libs/common/src/platform/services/fido2/credential-id-utils.ts
+++ b/libs/common/src/platform/services/fido2/credential-id-utils.ts
@@ -3,13 +3,13 @@
 import { Fido2Utils } from "./fido2-utils";
 import { guidToRawFormat } from "./guid-utils";
 
-export function parseCredentialId(encodedCredentialId: string): Uint8Array {
+export function parseCredentialId(encodedCredentialId: string): ArrayBuffer {
   try {
     if (encodedCredentialId.startsWith("b64.")) {
       return Fido2Utils.stringToBuffer(encodedCredentialId.slice(4));
     }
 
-    return guidToRawFormat(encodedCredentialId);
+    return guidToRawFormat(encodedCredentialId).buffer;
   } catch {
     return undefined;
   }
@@ -18,13 +18,16 @@ export function parseCredentialId(encodedCredentialId: string): Uint8Array {
 /**
  * Compares two credential IDs for equality.
  */
-export function compareCredentialIds(a: Uint8Array, b: Uint8Array): boolean {
-  if (a.length !== b.length) {
+export function compareCredentialIds(a: ArrayBuffer, b: ArrayBuffer): boolean {
+  if (a.byteLength !== b.byteLength) {
     return false;
   }
 
-  for (let i = 0; i < a.length; i++) {
-    if (a[i] !== b[i]) {
+  const viewA = new Uint8Array(a);
+  const viewB = new Uint8Array(b);
+
+  for (let i = 0; i < viewA.length; i++) {
+    if (viewA[i] !== viewB[i]) {
       return false;
     }
   }
diff --git a/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts b/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts
index 5c377e1a980..fef64399b40 100644
--- a/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts
+++ b/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts
@@ -5,11 +5,12 @@ import { BehaviorSubject, of } from "rxjs";
 
 import { mockAccountServiceWith } from "../../../../spec";
 import { Account } from "../../../auth/abstractions/account.service";
-import { UserId } from "../../../types/guid";
-import { CipherService } from "../../../vault/abstractions/cipher.service";
+import { CipherId, UserId } from "../../../types/guid";
+import { CipherService, EncryptionContext } from "../../../vault/abstractions/cipher.service";
 import { SyncService } from "../../../vault/abstractions/sync/sync.service.abstraction";
 import { CipherRepromptType } from "../../../vault/enums/cipher-reprompt-type";
 import { CipherType } from "../../../vault/enums/cipher-type";
+import { CipherData } from "../../../vault/models/data/cipher.data";
 import { Cipher } from "../../../vault/models/domain/cipher";
 import { CipherView } from "../../../vault/models/view/cipher.view";
 import { Fido2CredentialView } from "../../../vault/models/view/fido2-credential.view";
@@ -36,8 +37,9 @@ type ParentWindowReference = string;
 const RpId = "bitwarden.com";
 
 describe("FidoAuthenticatorService", () => {
+  const userId = "testId" as UserId;
   const activeAccountSubject = new BehaviorSubject<Account | null>({
-    id: "testId" as UserId,
+    id: userId,
     email: "test@example.com",
     emailVerified: true,
     name: "Test User",
@@ -217,9 +219,11 @@ describe("FidoAuthenticatorService", () => {
       beforeEach(async () => {
         existingCipher = createCipherView({ type: CipherType.Login });
         params = await createParams({ requireResidentKey: false });
-        cipherService.get.mockImplementation(async (id) =>
-          id === existingCipher.id ? ({ decrypt: () => existingCipher } as any) : undefined,
+
+        cipherService.ciphers$.mockImplementation((userId: UserId) =>
+          of({ [existingCipher.id as CipherId]: {} as CipherData }),
         );
+
         cipherService.getAllDecrypted.mockResolvedValue([existingCipher]);
         cipherService.decrypt.mockResolvedValue(existingCipher);
       });
@@ -254,7 +258,7 @@ describe("FidoAuthenticatorService", () => {
           cipherId: existingCipher.id,
           userVerified: false,
         });
-        cipherService.encrypt.mockResolvedValue(encryptedCipher as unknown as Cipher);
+        cipherService.encrypt.mockResolvedValue(encryptedCipher as unknown as EncryptionContext);
 
         await authenticator.makeCredential(params, windowReference);
 
@@ -325,7 +329,7 @@ describe("FidoAuthenticatorService", () => {
           cipherId: existingCipher.id,
           userVerified: false,
         });
-        cipherService.encrypt.mockResolvedValue(encryptedCipher as unknown as Cipher);
+        cipherService.encrypt.mockResolvedValue(encryptedCipher as unknown as EncryptionContext);
         cipherService.updateWithServer.mockRejectedValue(new Error("Internal error"));
 
         const result = async () => await authenticator.makeCredential(params, windowReference);
@@ -350,20 +354,21 @@ describe("FidoAuthenticatorService", () => {
           cipherId,
           userVerified: false,
         });
-        cipherService.get.mockImplementation(async (cipherId) =>
-          cipherId === cipher.id ? ({ decrypt: () => cipher } as any) : undefined,
+        cipherService.ciphers$.mockImplementation((userId: UserId) =>
+          of({ [cipher.id as CipherId]: {} as CipherData }),
         );
+
         cipherService.getAllDecrypted.mockResolvedValue([await cipher]);
         cipherService.decrypt.mockResolvedValue(cipher);
         cipherService.encrypt.mockImplementation(async (cipher) => {
           cipher.login.fido2Credentials[0].credentialId = credentialId; // Replace id for testability
-          return {} as any;
+          return { cipher: {} as any as Cipher, encryptedFor: userId };
         });
-        cipherService.createWithServer.mockImplementation(async (cipher) => {
+        cipherService.createWithServer.mockImplementation(async ({ cipher }) => {
           cipher.id = cipherId;
           return cipher;
         });
-        cipherService.updateWithServer.mockImplementation(async (cipher) => {
+        cipherService.updateWithServer.mockImplementation(async ({ cipher }) => {
           cipher.id = cipherId;
           return cipher;
         });
diff --git a/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts b/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts
index a605e466338..e560a77cc2e 100644
--- a/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts
+++ b/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts
@@ -1,13 +1,15 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { firstValueFrom } from "rxjs";
+import { filter, firstValueFrom, map, timeout } from "rxjs";
 
 import { AccountService } from "../../../auth/abstractions/account.service";
 import { getUserId } from "../../../auth/services/account.service";
+import { CipherId } from "../../../types/guid";
 import { CipherService } from "../../../vault/abstractions/cipher.service";
 import { SyncService } from "../../../vault/abstractions/sync/sync.service.abstraction";
 import { CipherRepromptType } from "../../../vault/enums/cipher-reprompt-type";
 import { CipherType } from "../../../vault/enums/cipher-type";
+import { Cipher } from "../../../vault/models/domain/cipher";
 import { CipherView } from "../../../vault/models/view/cipher.view";
 import { Fido2CredentialView } from "../../../vault/models/view/fido2-credential.view";
 import {
@@ -149,7 +151,23 @@ export class Fido2AuthenticatorService<ParentWindowReference>
         const activeUserId = await firstValueFrom(
           this.accountService.activeAccount$.pipe(getUserId),
         );
-        const encrypted = await this.cipherService.get(cipherId, activeUserId);
+
+        const encrypted = await firstValueFrom(
+          this.cipherService.ciphers$(activeUserId).pipe(
+            map((ciphers) => ciphers[cipherId as CipherId]),
+            filter((c) => c !== undefined),
+            timeout({
+              first: 5000,
+              with: () => {
+                this.logService?.error(
+                  `[Fido2Authenticator] Aborting because cipher with ID ${cipherId} could not be found within timeout.`,
+                );
+                throw new Fido2AuthenticatorError(Fido2AuthenticatorErrorCode.Unknown);
+              },
+            }),
+            map((c) => new Cipher(c, null)),
+          ),
+        );
 
         cipher = await this.cipherService.decrypt(encrypted, activeUserId);
 
@@ -496,7 +514,7 @@ async function getPrivateKeyFromFido2Credential(
   const keyBuffer = Fido2Utils.stringToBuffer(fido2Credential.keyValue);
   return await crypto.subtle.importKey(
     "pkcs8",
-    keyBuffer,
+    new Uint8Array(keyBuffer),
     {
       name: fido2Credential.keyAlgorithm,
       namedCurve: fido2Credential.keyCurve,
diff --git a/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts b/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts
index 51c3d8617ab..4fd91fb19e6 100644
--- a/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts
+++ b/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts
@@ -92,6 +92,27 @@ describe("FidoAuthenticatorService", () => {
   });
 
   describe("createCredential", () => {
+    describe("Mapping params should handle variations in input formats", () => {
+      it.each([
+        [true, true],
+        [false, false],
+        ["false", false],
+        ["", false],
+        ["true", true],
+      ])("requireResidentKey should handle %s as boolean %s", async (input, expected) => {
+        const params = createParams({
+          authenticatorSelection: { requireResidentKey: input as any },
+          extensions: { credProps: true },
+        });
+
+        authenticator.makeCredential.mockResolvedValue(createAuthenticatorMakeResult());
+
+        const result = await client.createCredential(params, windowReference);
+
+        expect(result.extensions.credProps?.rk).toBe(expected);
+      });
+    });
+
     describe("input parameters validation", () => {
       // Spec: If sameOriginWithAncestors is false, return a "NotAllowedError" DOMException.
       it("should throw error if sameOriginWithAncestors is false", async () => {
diff --git a/libs/common/src/platform/services/fido2/fido2-client.service.ts b/libs/common/src/platform/services/fido2/fido2-client.service.ts
index 2445cd366de..431585441a7 100644
--- a/libs/common/src/platform/services/fido2/fido2-client.service.ts
+++ b/libs/common/src/platform/services/fido2/fido2-client.service.ts
@@ -127,9 +127,9 @@ export class Fido2ClientService<ParentWindowReference>
     }
 
     const userId = Fido2Utils.stringToBuffer(params.user.id);
-    if (userId.length < 1 || userId.length > 64) {
+    if (userId.byteLength < 1 || userId.byteLength > 64) {
       this.logService?.warning(
-        `[Fido2Client] Invalid 'user.id' length: ${params.user.id} (${userId.length})`,
+        `[Fido2Client] Invalid 'user.id' length: ${params.user.id} (${userId.byteLength})`,
       );
       throw new TypeError("Invalid 'user.id' length");
     }
@@ -483,11 +483,15 @@ function mapToMakeCredentialParams({
       type: credential.type,
     })) ?? [];
 
+  /**
+   * Quirk: Accounts for the fact that some RP's mistakenly submits 'requireResidentKey' as a string
+   */
   const requireResidentKey =
     params.authenticatorSelection?.residentKey === "required" ||
     params.authenticatorSelection?.residentKey === "preferred" ||
     (params.authenticatorSelection?.residentKey === undefined &&
-      params.authenticatorSelection?.requireResidentKey === true);
+      (params.authenticatorSelection?.requireResidentKey === true ||
+        (params.authenticatorSelection?.requireResidentKey as unknown as string) === "true"));
 
   const requireUserVerification =
     params.authenticatorSelection?.userVerification === "required" ||
diff --git a/libs/common/src/platform/services/fido2/fido2-utils.ts b/libs/common/src/platform/services/fido2/fido2-utils.ts
index b9f3c8f8c48..99e260f4a53 100644
--- a/libs/common/src/platform/services/fido2/fido2-utils.ts
+++ b/libs/common/src/platform/services/fido2/fido2-utils.ts
@@ -1,6 +1,45 @@
 // FIXME: Update this file to be type safe and remove this and next line
+import type {
+  AssertCredentialResult,
+  CreateCredentialResult,
+} from "../../abstractions/fido2/fido2-client.service.abstraction";
+
 // @ts-strict-ignore
 export class Fido2Utils {
+  static createResultToJson(result: CreateCredentialResult): any {
+    return {
+      id: result.credentialId,
+      rawId: result.credentialId,
+      response: {
+        clientDataJSON: result.clientDataJSON,
+        authenticatorData: result.authData,
+        transports: result.transports,
+        publicKey: result.publicKey,
+        publicKeyAlgorithm: result.publicKeyAlgorithm,
+        attestationObject: result.attestationObject,
+      },
+      authenticatorAttachment: "platform",
+      clientExtensionResults: result.extensions,
+      type: "public-key",
+    };
+  }
+
+  static getResultToJson(result: AssertCredentialResult): any {
+    return {
+      id: result.credentialId,
+      rawId: result.credentialId,
+      response: {
+        clientDataJSON: result.clientDataJSON,
+        authenticatorData: result.authenticatorData,
+        signature: result.signature,
+        userHandle: result.userHandle,
+      },
+      authenticatorAttachment: "platform",
+      clientExtensionResults: {},
+      type: "public-key",
+    };
+  }
+
   static bufferToString(bufferSource: BufferSource): string {
     return Fido2Utils.fromBufferToB64(Fido2Utils.bufferSourceToUint8Array(bufferSource))
       .replace(/\+/g, "-")
@@ -8,8 +47,8 @@ export class Fido2Utils {
       .replace(/=/g, "");
   }
 
-  static stringToBuffer(str: string): Uint8Array {
-    return Fido2Utils.fromB64ToArray(Fido2Utils.fromUrlB64ToB64(str));
+  static stringToBuffer(str: string): ArrayBuffer {
+    return Fido2Utils.fromB64ToArray(Fido2Utils.fromUrlB64ToB64(str)).buffer;
   }
 
   static bufferSourceToUint8Array(bufferSource: BufferSource): Uint8Array {
diff --git a/libs/common/src/platform/services/fido2/guid-utils.ts b/libs/common/src/platform/services/fido2/guid-utils.ts
index 92c69c29eb0..66e6cbb1d7c 100644
--- a/libs/common/src/platform/services/fido2/guid-utils.ts
+++ b/libs/common/src/platform/services/fido2/guid-utils.ts
@@ -7,12 +7,14 @@
   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
 
+import { Utils } from "../../../platform/misc/utils";
+
 /** Private array used for optimization */
 const byteToHex = Array.from({ length: 256 }, (_, i) => (i + 0x100).toString(16).substring(1));
 
 /** Convert standard format (XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX) UUID to raw 16 byte array. */
 export function guidToRawFormat(guid: string) {
-  if (!isValidGuid(guid)) {
+  if (!Utils.isGuid(guid)) {
     throw TypeError("GUID parameter is invalid");
   }
 
@@ -81,15 +83,13 @@ export function guidToStandardFormat(bufferSource: BufferSource) {
   ).toLowerCase();
 
   // Consistency check for valid UUID.  If this throws, it's likely due to one
-  // or more input array values not mapping to a hex octet (leading to "undefined" in the uuid)
-  if (!isValidGuid(guid)) {
+  // of the following:
+  // - One or more input array values don't map to a hex octet (leading to
+  // "undefined" in the uuid)
+  // - Invalid input values for the RFC `version` or `variant` fields
+  if (!Utils.isGuid(guid)) {
     throw TypeError("Converted GUID is invalid");
   }
 
   return guid;
 }
-
-// Perform format validation, without enforcing any variant restrictions as Utils.isGuid does
-function isValidGuid(guid: string): boolean {
-  return RegExp(/^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/, "i").test(guid);
-}
diff --git a/libs/common/src/platform/services/memory-storage.service.ts b/libs/common/src/platform/services/memory-storage.service.ts
index 52d38dec9bf..9d5bb98e73a 100644
--- a/libs/common/src/platform/services/memory-storage.service.ts
+++ b/libs/common/src/platform/services/memory-storage.service.ts
@@ -1,47 +1 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Subject } from "rxjs";
-
-import { AbstractStorageService, StorageUpdate } from "../abstractions/storage.service";
-
-export class MemoryStorageService extends AbstractStorageService {
-  protected store = new Map<string, unknown>();
-  private updatesSubject = new Subject<StorageUpdate>();
-
-  get valuesRequireDeserialization(): boolean {
-    return false;
-  }
-  get updates$() {
-    return this.updatesSubject.asObservable();
-  }
-
-  get<T>(key: string): Promise<T> {
-    if (this.store.has(key)) {
-      const obj = this.store.get(key);
-      return Promise.resolve(obj as T);
-    }
-    return Promise.resolve(null);
-  }
-
-  async has(key: string): Promise<boolean> {
-    return (await this.get(key)) != null;
-  }
-
-  save<T>(key: string, obj: T): Promise<void> {
-    if (obj == null) {
-      return this.remove(key);
-    }
-    // TODO: Remove once foreground/background contexts are separated in browser
-    // Needed to ensure ownership of all memory by the context running the storage service
-    const toStore = structuredClone(obj);
-    this.store.set(key, toStore);
-    this.updatesSubject.next({ key, updateType: "save" });
-    return Promise.resolve();
-  }
-
-  remove(key: string): Promise<void> {
-    this.store.delete(key);
-    this.updatesSubject.next({ key, updateType: "remove" });
-    return Promise.resolve();
-  }
-}
+export { MemoryStorageService } from "@bitwarden/storage-core";
diff --git a/libs/common/src/platform/services/sdk/default-sdk.service.ts b/libs/common/src/platform/services/sdk/default-sdk.service.ts
index 6be89a4b376..a0d00b5eef6 100644
--- a/libs/common/src/platform/services/sdk/default-sdk.service.ts
+++ b/libs/common/src/platform/services/sdk/default-sdk.service.ts
@@ -21,6 +21,7 @@ import {
   BitwardenClient,
   ClientSettings,
   DeviceType as SdkDeviceType,
+  TokenProvider,
 } from "@bitwarden/sdk-internal";
 
 import { EncryptedOrganizationKeyData } from "../../../admin-console/models/data/encrypted-organization-key.data";
@@ -41,6 +42,17 @@ import { EncryptedString } from "../../models/domain/enc-string";
 // blocking the creation of an internal client for that user.
 const UnsetClient = Symbol("UnsetClient");
 
+/**
+ * A token provider that exposes the access token to the SDK.
+ */
+class JsTokenProvider implements TokenProvider {
+  constructor() {}
+
+  async get_access_token(): Promise<string | undefined> {
+    return undefined;
+  }
+}
+
 export class DefaultSdkService implements SdkService {
   private sdkClientOverrides = new BehaviorSubject<{
     [userId: UserId]: Rc<BitwardenClient> | typeof UnsetClient;
@@ -51,7 +63,7 @@ export class DefaultSdkService implements SdkService {
     concatMap(async (env) => {
       await SdkLoadService.Ready;
       const settings = this.toSettings(env);
-      return await this.sdkClientFactory.createSdkClient(settings);
+      return await this.sdkClientFactory.createSdkClient(new JsTokenProvider(), settings);
     }),
     shareReplay({ refCount: true, bufferSize: 1 }),
   );
@@ -151,7 +163,10 @@ export class DefaultSdkService implements SdkService {
             }
 
             const settings = this.toSettings(env);
-            const client = await this.sdkClientFactory.createSdkClient(settings);
+            const client = await this.sdkClientFactory.createSdkClient(
+              new JsTokenProvider(),
+              settings,
+            );
 
             await this.initializeClient(
               userId,
@@ -180,9 +195,7 @@ export class DefaultSdkService implements SdkService {
           return () => client?.markForDisposal();
         });
       }),
-      tap({
-        finalize: () => this.sdkClientCache.delete(userId),
-      }),
+      tap({ finalize: () => this.sdkClientCache.delete(userId) }),
       shareReplay({ refCount: true, bufferSize: 1 }),
     );
 
@@ -205,9 +218,7 @@ export class DefaultSdkService implements SdkService {
       method: { decryptedKey: { decrypted_user_key: userKey.keyB64 } },
       kdfParams:
         kdfParams.kdfType === KdfType.PBKDF2_SHA256
-          ? {
-              pBKDF2: { iterations: kdfParams.iterations },
-            }
+          ? { pBKDF2: { iterations: kdfParams.iterations } }
           : {
               argon2id: {
                 iterations: kdfParams.iterations,
@@ -216,6 +227,7 @@ export class DefaultSdkService implements SdkService {
               },
             },
       privateKey,
+      signingKey: undefined,
     });
 
     // We initialize the org crypto even if the org_keys are
diff --git a/libs/common/src/platform/services/storage-service.provider.ts b/libs/common/src/platform/services/storage-service.provider.ts
index c34487403ca..32f2a7afc5c 100644
--- a/libs/common/src/platform/services/storage-service.provider.ts
+++ b/libs/common/src/platform/services/storage-service.provider.ts
@@ -1,39 +1,2 @@
-import { AbstractStorageService, ObservableStorageService } from "../abstractions/storage.service";
-// eslint-disable-next-line import/no-restricted-paths
-import { ClientLocations, StorageLocation } from "../state/state-definition";
-
-export type PossibleLocation = StorageLocation | ClientLocations[keyof ClientLocations];
-
-/**
- * A provider for getting client specific computed storage locations and services.
- */
-export class StorageServiceProvider {
-  constructor(
-    protected readonly diskStorageService: AbstractStorageService & ObservableStorageService,
-    protected readonly memoryStorageService: AbstractStorageService & ObservableStorageService,
-  ) {}
-
-  /**
-   * Computes the location and corresponding service for a given client.
-   *
-   * **NOTE** The default implementation does not respect client overrides and if clients
-   * have special overrides they are responsible for implementing this service.
-   * @param defaultLocation The default location to use if no client specific override is preferred.
-   * @param overrides Client specific overrides
-   * @returns The computed storage location and corresponding storage service to use to get/store state.
-   * @throws If there is no configured storage service for the given inputs.
-   */
-  get(
-    defaultLocation: PossibleLocation,
-    overrides: Partial<ClientLocations>,
-  ): [location: PossibleLocation, service: AbstractStorageService & ObservableStorageService] {
-    switch (defaultLocation) {
-      case "disk":
-        return [defaultLocation, this.diskStorageService];
-      case "memory":
-        return [defaultLocation, this.memoryStorageService];
-      default:
-        throw new Error(`Unexpected location: ${defaultLocation}`);
-    }
-  }
-}
+export { StorageServiceProvider } from "@bitwarden/storage-core";
+export type { PossibleLocation } from "@bitwarden/storage-core";
diff --git a/libs/common/src/platform/state/implementations/default-active-user-state.spec.ts b/libs/common/src/platform/state/implementations/default-active-user-state.spec.ts
index b73415d6b79..1cb1453a509 100644
--- a/libs/common/src/platform/state/implementations/default-active-user-state.spec.ts
+++ b/libs/common/src/platform/state/implementations/default-active-user-state.spec.ts
@@ -6,12 +6,13 @@ import { any, mock } from "jest-mock-extended";
 import { BehaviorSubject, firstValueFrom, map, of, timeout } from "rxjs";
 import { Jsonify } from "type-fest";
 
+import { StorageServiceProvider } from "@bitwarden/storage-core";
+
 import { awaitAsync, trackEmissions } from "../../../../spec";
 import { FakeStorageService } from "../../../../spec/fake-storage.service";
 import { Account } from "../../../auth/abstractions/account.service";
 import { UserId } from "../../../types/guid";
 import { LogService } from "../../abstractions/log.service";
-import { StorageServiceProvider } from "../../services/storage-service.provider";
 import { StateDefinition } from "../state-definition";
 import { StateEventRegistrarService } from "../state-event-registrar.service";
 import { UserKeyDefinition } from "../user-key-definition";
diff --git a/libs/common/src/platform/state/implementations/default-global-state.provider.ts b/libs/common/src/platform/state/implementations/default-global-state.provider.ts
index 18e9c21e75e..bd0cfc1dc9a 100644
--- a/libs/common/src/platform/state/implementations/default-global-state.provider.ts
+++ b/libs/common/src/platform/state/implementations/default-global-state.provider.ts
@@ -1,7 +1,8 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { StorageServiceProvider } from "@bitwarden/storage-core";
+
 import { LogService } from "../../abstractions/log.service";
-import { StorageServiceProvider } from "../../services/storage-service.provider";
 import { GlobalState } from "../global-state";
 import { GlobalStateProvider } from "../global-state.provider";
 import { KeyDefinition } from "../key-definition";
diff --git a/libs/common/src/platform/state/implementations/default-global-state.ts b/libs/common/src/platform/state/implementations/default-global-state.ts
index c88e9303c8e..a06eb23e010 100644
--- a/libs/common/src/platform/state/implementations/default-global-state.ts
+++ b/libs/common/src/platform/state/implementations/default-global-state.ts
@@ -1,8 +1,6 @@
+import { AbstractStorageService, ObservableStorageService } from "@bitwarden/storage-core";
+
 import { LogService } from "../../abstractions/log.service";
-import {
-  AbstractStorageService,
-  ObservableStorageService,
-} from "../../abstractions/storage.service";
 import { GlobalState } from "../global-state";
 import { KeyDefinition, globalKeyBuilder } from "../key-definition";
 
diff --git a/libs/common/src/platform/state/implementations/default-single-user-state.provider.ts b/libs/common/src/platform/state/implementations/default-single-user-state.provider.ts
index 54e268e0b69..bef56ad2309 100644
--- a/libs/common/src/platform/state/implementations/default-single-user-state.provider.ts
+++ b/libs/common/src/platform/state/implementations/default-single-user-state.provider.ts
@@ -1,8 +1,9 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { StorageServiceProvider } from "@bitwarden/storage-core";
+
 import { UserId } from "../../../types/guid";
 import { LogService } from "../../abstractions/log.service";
-import { StorageServiceProvider } from "../../services/storage-service.provider";
 import { StateEventRegistrarService } from "../state-event-registrar.service";
 import { UserKeyDefinition } from "../user-key-definition";
 import { SingleUserState } from "../user-state";
diff --git a/libs/common/src/platform/state/implementations/default-single-user-state.ts b/libs/common/src/platform/state/implementations/default-single-user-state.ts
index 1dafd3aecad..db776c3d11d 100644
--- a/libs/common/src/platform/state/implementations/default-single-user-state.ts
+++ b/libs/common/src/platform/state/implementations/default-single-user-state.ts
@@ -1,11 +1,9 @@
 import { Observable, combineLatest, of } from "rxjs";
 
+import { AbstractStorageService, ObservableStorageService } from "@bitwarden/storage-core";
+
 import { UserId } from "../../../types/guid";
 import { LogService } from "../../abstractions/log.service";
-import {
-  AbstractStorageService,
-  ObservableStorageService,
-} from "../../abstractions/storage.service";
 import { StateEventRegistrarService } from "../state-event-registrar.service";
 import { UserKeyDefinition } from "../user-key-definition";
 import { CombinedState, SingleUserState } from "../user-state";
diff --git a/libs/common/src/platform/state/implementations/specific-state.provider.spec.ts b/libs/common/src/platform/state/implementations/specific-state.provider.spec.ts
index 1b5a36445c9..6674c2577d7 100644
--- a/libs/common/src/platform/state/implementations/specific-state.provider.spec.ts
+++ b/libs/common/src/platform/state/implementations/specific-state.provider.spec.ts
@@ -1,10 +1,11 @@
 import { mock } from "jest-mock-extended";
 
+import { StorageServiceProvider } from "@bitwarden/storage-core";
+
 import { mockAccountServiceWith } from "../../../../spec/fake-account-service";
 import { FakeStorageService } from "../../../../spec/fake-storage.service";
 import { UserId } from "../../../types/guid";
 import { LogService } from "../../abstractions/log.service";
-import { StorageServiceProvider } from "../../services/storage-service.provider";
 import { KeyDefinition } from "../key-definition";
 import { StateDefinition } from "../state-definition";
 import { StateEventRegistrarService } from "../state-event-registrar.service";
diff --git a/libs/common/src/platform/state/implementations/state-base.ts b/libs/common/src/platform/state/implementations/state-base.ts
index 578720a2281..03140e1fe1f 100644
--- a/libs/common/src/platform/state/implementations/state-base.ts
+++ b/libs/common/src/platform/state/implementations/state-base.ts
@@ -15,12 +15,10 @@ import {
 } from "rxjs";
 import { Jsonify } from "type-fest";
 
+import { AbstractStorageService, ObservableStorageService } from "@bitwarden/storage-core";
+
 import { StorageKey } from "../../../types/state";
 import { LogService } from "../../abstractions/log.service";
-import {
-  AbstractStorageService,
-  ObservableStorageService,
-} from "../../abstractions/storage.service";
 import { DebugOptions } from "../key-definition";
 import { populateOptionsWithDefault, StateUpdateOptions } from "../state-update-options";
 
diff --git a/libs/common/src/platform/state/implementations/util.ts b/libs/common/src/platform/state/implementations/util.ts
index 0a9d76f6da5..14b11f6b553 100644
--- a/libs/common/src/platform/state/implementations/util.ts
+++ b/libs/common/src/platform/state/implementations/util.ts
@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { AbstractStorageService } from "../../abstractions/storage.service";
+import { AbstractStorageService } from "@bitwarden/storage-core";
 
 export async function getStoredValue<T>(
   key: string,
diff --git a/libs/common/src/platform/state/state-definition.ts b/libs/common/src/platform/state/state-definition.ts
index 3caa03c95a5..5e24146fbdd 100644
--- a/libs/common/src/platform/state/state-definition.ts
+++ b/libs/common/src/platform/state/state-definition.ts
@@ -1,45 +1,7 @@
-/**
- * Default storage location options.
- *
- * `disk` generally means state that is accessible between restarts of the application,
- * with the exception of the web client. In web this means `sessionStorage`. The data
- * persists through refreshes of the page but not available once that tab is closed or
- * from any other tabs.
- *
- * `memory` means that the information stored there goes away during application
- * restarts.
- */
-export type StorageLocation = "disk" | "memory";
+import { StorageLocation, ClientLocations } from "@bitwarden/storage-core";
 
-/**
- * *Note*: The property names of this object should match exactly with the string values of the {@link ClientType} enum
- */
-export type ClientLocations = {
-  /**
-   * Overriding storage location for the web client.
-   *
-   * Includes an extra storage location to store data in `localStorage`
-   * that is available from different tabs and after a tab has closed.
-   */
-  web: StorageLocation | "disk-local";
-  /**
-   * Overriding storage location for browser clients.
-   *
-   * `"memory-large-object"` is used to store non-countable objects in memory. This exists due to limited persistent memory available to browser extensions.
-   *
-   * `"disk-backup-local-storage"` is used to store object in both disk and in `localStorage`. Data is stored in both locations but is only retrieved
-   * from `localStorage` when a null-ish value is retrieved from disk first.
-   */
-  browser: StorageLocation | "memory-large-object" | "disk-backup-local-storage";
-  /**
-   * Overriding storage location for desktop clients.
-   */
-  //desktop: StorageLocation;
-  /**
-   * Overriding storage location for CLI clients.
-   */
-  //cli: StorageLocation;
-};
+// To be removed once references are updated to point to @bitwarden/storage-core
+export { StorageLocation, ClientLocations };
 
 /**
  * Defines the base location and instruction of where this state is expected to be located.
diff --git a/libs/common/src/platform/state/state-definitions.ts b/libs/common/src/platform/state/state-definitions.ts
index 563f8404931..7472520189c 100644
--- a/libs/common/src/platform/state/state-definitions.ts
+++ b/libs/common/src/platform/state/state-definitions.ts
@@ -106,6 +106,9 @@ export const NEW_WEB_LAYOUT_BANNER_DISK = new StateDefinition("newWebLayoutBanne
 export const APPLICATION_ID_DISK = new StateDefinition("applicationId", "disk", {
   web: "disk-local",
 });
+export const BADGE_MEMORY = new StateDefinition("badge", "memory", {
+  browser: "memory-large-object",
+});
 export const BIOMETRIC_SETTINGS_DISK = new StateDefinition("biometricSettings", "disk");
 export const CLEAR_EVENT_DISK = new StateDefinition("clearEvent", "disk");
 export const CONFIG_DISK = new StateDefinition("config", "disk", {
@@ -128,6 +131,9 @@ export const EXTENSION_INITIAL_INSTALL_DISK = new StateDefinition(
   "extensionInitialInstall",
   "disk",
 );
+export const WEB_PUSH_SUBSCRIPTION = new StateDefinition("webPushSubscription", "disk", {
+  web: "disk-local",
+});
 
 // Design System
 
@@ -152,6 +158,7 @@ export const SEND_DISK = new StateDefinition("encryptedSend", "disk", {
 export const SEND_MEMORY = new StateDefinition("decryptedSend", "memory", {
   browser: "memory-large-object",
 });
+export const SEND_ACCESS_AUTH_MEMORY = new StateDefinition("sendAccessAuth", "memory");
 
 // Vault
 
diff --git a/libs/common/src/platform/state/state-event-registrar.service.spec.ts b/libs/common/src/platform/state/state-event-registrar.service.spec.ts
index 2fae985033b..b022e2ce413 100644
--- a/libs/common/src/platform/state/state-event-registrar.service.spec.ts
+++ b/libs/common/src/platform/state/state-event-registrar.service.spec.ts
@@ -1,8 +1,12 @@
 import { mock } from "jest-mock-extended";
 
+import {
+  AbstractStorageService,
+  ObservableStorageService,
+  StorageServiceProvider,
+} from "@bitwarden/storage-core";
+
 import { FakeGlobalStateProvider } from "../../../spec";
-import { AbstractStorageService, ObservableStorageService } from "../abstractions/storage.service";
-import { StorageServiceProvider } from "../services/storage-service.provider";
 
 import { StateDefinition } from "./state-definition";
 import { STATE_LOCK_EVENT, StateEventRegistrarService } from "./state-event-registrar.service";
diff --git a/libs/common/src/platform/state/state-event-runner.service.spec.ts b/libs/common/src/platform/state/state-event-runner.service.spec.ts
index 1c98099a518..4aef3d8516c 100644
--- a/libs/common/src/platform/state/state-event-runner.service.spec.ts
+++ b/libs/common/src/platform/state/state-event-runner.service.spec.ts
@@ -1,9 +1,13 @@
 import { mock } from "jest-mock-extended";
 
+import {
+  AbstractStorageService,
+  ObservableStorageService,
+  StorageServiceProvider,
+} from "@bitwarden/storage-core";
+
 import { FakeGlobalStateProvider } from "../../../spec";
 import { UserId } from "../../types/guid";
-import { AbstractStorageService, ObservableStorageService } from "../abstractions/storage.service";
-import { StorageServiceProvider } from "../services/storage-service.provider";
 
 import { STATE_LOCK_EVENT } from "./state-event-registrar.service";
 import { StateEventRunnerService } from "./state-event-runner.service";
diff --git a/libs/common/src/platform/state/state-event-runner.service.ts b/libs/common/src/platform/state/state-event-runner.service.ts
index f24c50f86d6..9e6f8f214e1 100644
--- a/libs/common/src/platform/state/state-event-runner.service.ts
+++ b/libs/common/src/platform/state/state-event-runner.service.ts
@@ -2,8 +2,9 @@
 // @ts-strict-ignore
 import { firstValueFrom } from "rxjs";
 
+import { StorageServiceProvider } from "@bitwarden/storage-core";
+
 import { UserId } from "../../types/guid";
-import { StorageServiceProvider } from "../services/storage-service.provider";
 
 import { GlobalState } from "./global-state";
 import { GlobalStateProvider } from "./global-state.provider";
diff --git a/libs/common/src/platform/state/storage/memory-storage.service.ts b/libs/common/src/platform/state/storage/memory-storage.service.ts
index df3fe615626..53810f11d22 100644
--- a/libs/common/src/platform/state/storage/memory-storage.service.ts
+++ b/libs/common/src/platform/state/storage/memory-storage.service.ts
@@ -1,54 +1 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Subject } from "rxjs";
-
-import {
-  AbstractStorageService,
-  ObservableStorageService,
-  StorageUpdate,
-} from "../../abstractions/storage.service";
-
-export class MemoryStorageService
-  extends AbstractStorageService
-  implements ObservableStorageService
-{
-  protected store: Record<string, string> = {};
-  private updatesSubject = new Subject<StorageUpdate>();
-
-  get valuesRequireDeserialization(): boolean {
-    return true;
-  }
-  get updates$() {
-    return this.updatesSubject.asObservable();
-  }
-
-  get<T>(key: string): Promise<T> {
-    const json = this.store[key];
-    if (json) {
-      const obj = JSON.parse(json as string);
-      return Promise.resolve(obj as T);
-    }
-    return Promise.resolve(null);
-  }
-
-  async has(key: string): Promise<boolean> {
-    return (await this.get(key)) != null;
-  }
-
-  save<T>(key: string, obj: T): Promise<void> {
-    if (obj == null) {
-      return this.remove(key);
-    }
-    // TODO: Remove once foreground/background contexts are separated in browser
-    // Needed to ensure ownership of all memory by the context running the storage service
-    this.store[key] = JSON.stringify(obj);
-    this.updatesSubject.next({ key, updateType: "save" });
-    return Promise.resolve();
-  }
-
-  remove(key: string): Promise<void> {
-    delete this.store[key];
-    this.updatesSubject.next({ key, updateType: "remove" });
-    return Promise.resolve();
-  }
-}
+export { SerializedMemoryStorageService as MemoryStorageService } from "@bitwarden/storage-core";
diff --git a/libs/common/src/platform/sync/default-sync.service.ts b/libs/common/src/platform/sync/default-sync.service.ts
index 47ac3784c33..99e87383657 100644
--- a/libs/common/src/platform/sync/default-sync.service.ts
+++ b/libs/common/src/platform/sync/default-sync.service.ts
@@ -225,7 +225,10 @@ export class DefaultSyncService extends CoreSyncService {
       throw new Error("Stamp has changed");
     }
 
-    await this.keyService.setMasterKeyEncryptedUserKey(response.key, response.id);
+    // Users with no master password will not have a key.
+    if (response?.key) {
+      await this.masterPasswordService.setMasterKeyEncryptedUserKey(response.key, response.id);
+    }
     await this.keyService.setPrivateKey(response.privateKey, response.id);
     await this.keyService.setProviderKeys(response.providers, response.id);
     await this.keyService.setOrgKeys(
diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts
index 95aea41e68b..62d300fc029 100644
--- a/libs/common/src/services/api.service.ts
+++ b/libs/common/src/services/api.service.ts
@@ -28,7 +28,6 @@ import { ProviderUserBulkRequest } from "../admin-console/models/request/provide
 import { ProviderUserConfirmRequest } from "../admin-console/models/request/provider/provider-user-confirm.request";
 import { ProviderUserInviteRequest } from "../admin-console/models/request/provider/provider-user-invite.request";
 import { ProviderUserUpdateRequest } from "../admin-console/models/request/provider/provider-user-update.request";
-import { SelectionReadOnlyRequest } from "../admin-console/models/request/selection-read-only.request";
 import {
   OrganizationConnectionConfigApis,
   OrganizationConnectionResponse,
@@ -98,7 +97,7 @@ import { PaymentResponse } from "../billing/models/response/payment.response";
 import { PlanResponse } from "../billing/models/response/plan.response";
 import { SubscriptionResponse } from "../billing/models/response/subscription.response";
 import { TaxInfoResponse } from "../billing/models/response/tax-info.response";
-import { DeviceType } from "../enums";
+import { ClientType, DeviceType } from "../enums";
 import { KeyConnectorUserKeyRequest } from "../key-management/key-connector/models/key-connector-user-key.request";
 import { SetKeyConnectorKeyRequest } from "../key-management/key-connector/models/set-key-connector-key.request";
 import { VaultTimeoutSettingsService } from "../key-management/vault-timeout";
@@ -155,8 +154,6 @@ export type HttpOperations = {
 export class ApiService implements ApiServiceAbstraction {
   private device: DeviceType;
   private deviceType: string;
-  private isWebClient = false;
-  private isDesktopClient = false;
   private refreshTokenPromise: Promise<string> | undefined;
 
   /**
@@ -179,22 +176,6 @@ export class ApiService implements ApiServiceAbstraction {
   ) {
     this.device = platformUtilsService.getDevice();
     this.deviceType = this.device.toString();
-    this.isWebClient =
-      this.device === DeviceType.IEBrowser ||
-      this.device === DeviceType.ChromeBrowser ||
-      this.device === DeviceType.EdgeBrowser ||
-      this.device === DeviceType.FirefoxBrowser ||
-      this.device === DeviceType.OperaBrowser ||
-      this.device === DeviceType.SafariBrowser ||
-      this.device === DeviceType.UnknownBrowser ||
-      this.device === DeviceType.VivaldiBrowser;
-    this.isDesktopClient =
-      this.device === DeviceType.WindowsDesktop ||
-      this.device === DeviceType.MacOsDesktop ||
-      this.device === DeviceType.LinuxDesktop ||
-      this.device === DeviceType.WindowsCLI ||
-      this.device === DeviceType.MacOsCLI ||
-      this.device === DeviceType.LinuxCLI;
   }
 
   // Auth APIs
@@ -532,8 +513,9 @@ export class ApiService implements ApiServiceAbstraction {
     return new CipherResponse(r);
   }
 
-  putShareCiphers(request: CipherBulkShareRequest): Promise<any> {
-    return this.send("PUT", "/ciphers/share", request, true, false);
+  async putShareCiphers(request: CipherBulkShareRequest): Promise<ListResponse<CipherResponse>> {
+    const r = await this.send("PUT", "/ciphers/share", request, true, true);
+    return new ListResponse<CipherResponse>(r, CipherResponse);
   }
 
   async putCipherCollections(
@@ -638,24 +620,6 @@ export class ApiService implements ApiServiceAbstraction {
     return new AttachmentUploadDataResponse(r);
   }
 
-  /**
-   * @deprecated Mar 25 2021: This method has been deprecated in favor of direct uploads.
-   * This method still exists for backward compatibility with old server versions.
-   */
-  async postCipherAttachmentLegacy(id: string, data: FormData): Promise<CipherResponse> {
-    const r = await this.send("POST", "/ciphers/" + id + "/attachment", data, true, true);
-    return new CipherResponse(r);
-  }
-
-  /**
-   * @deprecated Mar 25 2021: This method has been deprecated in favor of direct uploads.
-   * This method still exists for backward compatibility with old server versions.
-   */
-  async postCipherAttachmentAdminLegacy(id: string, data: FormData): Promise<CipherResponse> {
-    const r = await this.send("POST", "/ciphers/" + id + "/attachment-admin", data, true, true);
-    return new CipherResponse(r);
-  }
-
   deleteCipherAttachment(id: string, attachmentId: string): Promise<any> {
     return this.send("DELETE", "/ciphers/" + id + "/attachment/" + attachmentId, null, true, true);
   }
@@ -791,20 +755,6 @@ export class ApiService implements ApiServiceAbstraction {
     return new CollectionAccessDetailsResponse(r);
   }
 
-  async putCollectionUsers(
-    organizationId: string,
-    id: string,
-    request: SelectionReadOnlyRequest[],
-  ): Promise<any> {
-    await this.send(
-      "PUT",
-      "/organizations/" + organizationId + "/collections/" + id + "/users",
-      request,
-      true,
-      false,
-    );
-  }
-
   deleteCollection(organizationId: string, id: string): Promise<any> {
     return this.send(
       "DELETE",
@@ -825,20 +775,6 @@ export class ApiService implements ApiServiceAbstraction {
     );
   }
 
-  deleteCollectionUser(
-    organizationId: string,
-    id: string,
-    organizationUserId: string,
-  ): Promise<any> {
-    return this.send(
-      "DELETE",
-      "/organizations/" + organizationId + "/collections/" + id + "/user/" + organizationUserId,
-      null,
-      true,
-      false,
-    );
-  }
-
   // Groups APIs
 
   async getGroupUsers(organizationId: string, id: string): Promise<string[]> {
@@ -884,7 +820,9 @@ export class ApiService implements ApiServiceAbstraction {
   // Sync APIs
 
   async getSync(): Promise<SyncResponse> {
-    const path = this.isDesktopClient || this.isWebClient ? "/sync?excludeDomains=true" : "/sync";
+    const path = !this.platformUtilsService.supportsAutofill()
+      ? "/sync?excludeDomains=true"
+      : "/sync";
     const r = await this.send("GET", path, null, true, true);
     return new SyncResponse(r);
   }
@@ -1859,6 +1797,11 @@ export class ApiService implements ApiServiceAbstraction {
     if (authed) {
       const authHeader = await this.getActiveBearerToken();
       headers.set("Authorization", "Bearer " + authHeader);
+    } else {
+      // For unauthenticated requests, we need to tell the server what the device is for flag targeting,
+      // since it won't be able to get it from the access token.
+      const appId = await this.appIdService.getAppId();
+      headers.set("Device-Identifier", appId);
     }
 
     if (body != null) {
@@ -1916,7 +1859,7 @@ export class ApiService implements ApiServiceAbstraction {
 
   private async getCredentials(): Promise<RequestCredentials> {
     const env = await firstValueFrom(this.environmentService.environment$);
-    if (!this.isWebClient || env.hasBaseUrl()) {
+    if (this.platformUtilsService.getClientType() !== ClientType.Web || env.hasBaseUrl()) {
       return "include";
     }
     return undefined;
diff --git a/libs/common/src/services/audit.service.spec.ts b/libs/common/src/services/audit.service.spec.ts
new file mode 100644
index 00000000000..ce594823a7b
--- /dev/null
+++ b/libs/common/src/services/audit.service.spec.ts
@@ -0,0 +1,81 @@
+import { ApiService } from "../abstractions/api.service";
+import { CryptoFunctionService } from "../key-management/crypto/abstractions/crypto-function.service";
+import { ErrorResponse } from "../models/response/error.response";
+
+import { AuditService } from "./audit.service";
+
+jest.useFakeTimers();
+
+// Polyfill global Request for Jest environment if not present
+if (typeof global.Request === "undefined") {
+  global.Request = jest.fn((input: string | URL, init?: RequestInit) => {
+    return { url: typeof input === "string" ? input : input.toString(), ...init };
+  }) as any;
+}
+
+describe("AuditService", () => {
+  let auditService: AuditService;
+  let mockCrypto: jest.Mocked<CryptoFunctionService>;
+  let mockApi: jest.Mocked<ApiService>;
+
+  beforeEach(() => {
+    mockCrypto = {
+      hash: jest.fn().mockResolvedValue(Buffer.from("AABBCCDDEEFF", "hex")),
+    } as unknown as jest.Mocked<CryptoFunctionService>;
+
+    mockApi = {
+      nativeFetch: jest.fn().mockResolvedValue({
+        text: jest.fn().mockResolvedValue(`CDDEEFF:4\nDDEEFF:2\n123456:1`),
+      }),
+      getHibpBreach: jest.fn(),
+    } as unknown as jest.Mocked<ApiService>;
+
+    auditService = new AuditService(mockCrypto, mockApi, 2);
+  });
+
+  it("should not exceed max concurrent passwordLeaked requests", async () => {
+    const inFlight: string[] = [];
+    const maxInFlight: number[] = [];
+
+    // Patch fetchLeakedPasswordCount to track concurrency
+    const origFetch = (auditService as any).fetchLeakedPasswordCount.bind(auditService);
+    jest
+      .spyOn(auditService as any, "fetchLeakedPasswordCount")
+      .mockImplementation(async (password: string) => {
+        inFlight.push(password);
+        maxInFlight.push(inFlight.length);
+        // Simulate async work to allow concurrency limiter to take effect
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        inFlight.splice(inFlight.indexOf(password), 1);
+        return origFetch(password);
+      });
+
+    const p1 = auditService.passwordLeaked("password1");
+    const p2 = auditService.passwordLeaked("password2");
+    const p3 = auditService.passwordLeaked("password3");
+    const p4 = auditService.passwordLeaked("password4");
+
+    jest.advanceTimersByTime(250);
+
+    // Flush all pending timers and microtasks
+    await jest.runAllTimersAsync();
+    await Promise.all([p1, p2, p3, p4]);
+
+    // The max value in maxInFlight should not exceed 2 (the concurrency limit)
+    expect(Math.max(...maxInFlight)).toBeLessThanOrEqual(2);
+    expect((auditService as any).fetchLeakedPasswordCount).toHaveBeenCalledTimes(4);
+    expect(mockCrypto.hash).toHaveBeenCalledTimes(4);
+    expect(mockApi.nativeFetch).toHaveBeenCalledTimes(4);
+  });
+
+  it("should return empty array for breachedAccounts on 404", async () => {
+    mockApi.getHibpBreach.mockRejectedValueOnce({ statusCode: 404 } as ErrorResponse);
+    const result = await auditService.breachedAccounts("user@example.com");
+    expect(result).toEqual([]);
+  });
+
+  it("should throw error for breachedAccounts on non-404 error", async () => {
+    mockApi.getHibpBreach.mockRejectedValueOnce({ statusCode: 500 } as ErrorResponse);
+    await expect(auditService.breachedAccounts("user@example.com")).rejects.toThrow();
+  });
+});
diff --git a/libs/common/src/services/audit.service.ts b/libs/common/src/services/audit.service.ts
index 10654267687..d1eddbbdf82 100644
--- a/libs/common/src/services/audit.service.ts
+++ b/libs/common/src/services/audit.service.ts
@@ -1,21 +1,58 @@
+import { Subject } from "rxjs";
+import { mergeMap } from "rxjs/operators";
+
 import { ApiService } from "../abstractions/api.service";
 import { AuditService as AuditServiceAbstraction } from "../abstractions/audit.service";
 import { CryptoFunctionService } from "../key-management/crypto/abstractions/crypto-function.service";
 import { BreachAccountResponse } from "../models/response/breach-account.response";
 import { ErrorResponse } from "../models/response/error.response";
-import { throttle } from "../platform/misc/throttle";
 import { Utils } from "../platform/misc/utils";
 
 const PwnedPasswordsApi = "https://api.pwnedpasswords.com/range/";
 
 export class AuditService implements AuditServiceAbstraction {
+  private passwordLeakedSubject = new Subject<{
+    password: string;
+    resolve: (count: number) => void;
+    reject: (err: any) => void;
+  }>();
+
   constructor(
     private cryptoFunctionService: CryptoFunctionService,
     private apiService: ApiService,
-  ) {}
+    private readonly maxConcurrent: number = 100, // default to 100, can be overridden
+  ) {
+    this.maxConcurrent = maxConcurrent;
+    this.passwordLeakedSubject
+      .pipe(
+        mergeMap(
+          // Handle each password leak request, resolving or rejecting the associated promise.
+          async (req) => {
+            try {
+              const count = await this.fetchLeakedPasswordCount(req.password);
+              req.resolve(count);
+            } catch (err) {
+              req.reject(err);
+            }
+          },
+          this.maxConcurrent, // Limit concurrent API calls
+        ),
+      )
+      .subscribe();
+  }
 
-  @throttle(100, () => "passwordLeaked")
   async passwordLeaked(password: string): Promise<number> {
+    return new Promise<number>((resolve, reject) => {
+      this.passwordLeakedSubject.next({ password, resolve, reject });
+    });
+  }
+
+  /**
+   * Fetches the count of leaked passwords from the Pwned Passwords API.
+   * @param password The password to check.
+   * @returns A promise that resolves to the number of times the password has been leaked.
+   */
+  protected async fetchLeakedPasswordCount(password: string): Promise<number> {
     const hashBytes = await this.cryptoFunctionService.hash(password, "sha1");
     const hash = Utils.fromBufferToHex(hashBytes).toUpperCase();
     const hashStart = hash.substr(0, 5);
diff --git a/libs/common/src/tools/send/services/send.service.abstraction.ts b/libs/common/src/tools/send/services/send.service.abstraction.ts
index 0cf951e4197..f586e39a755 100644
--- a/libs/common/src/tools/send/services/send.service.abstraction.ts
+++ b/libs/common/src/tools/send/services/send.service.abstraction.ts
@@ -54,7 +54,7 @@ export abstract class SendService implements UserKeyRotationDataProvider<SendWit
   /**
    * @deprecated Only use in CLI
    */
-  getAllDecryptedFromState: () => Promise<SendView[]>;
+  getAllDecryptedFromState: (userId: UserId) => Promise<SendView[]>;
 }
 
 export abstract class InternalSendService extends SendService {
diff --git a/libs/common/src/tools/send/services/send.service.spec.ts b/libs/common/src/tools/send/services/send.service.spec.ts
index 777bc54f299..d2a2d5dd9b5 100644
--- a/libs/common/src/tools/send/services/send.service.spec.ts
+++ b/libs/common/src/tools/send/services/send.service.spec.ts
@@ -467,10 +467,21 @@ describe("SendService", () => {
     });
   });
 
-  it("getAllDecryptedFromState", async () => {
-    const sends = await sendService.getAllDecryptedFromState();
+  describe("getAllDecryptedFromState", () => {
+    it("returns already decrypted sends in state", async () => {
+      const sends = await sendService.getAllDecryptedFromState(mockUserId);
 
-    expect(sends[0]).toMatchObject(testSendViewData("1", "Test Send"));
+      expect(sends[0]).toMatchObject(testSendViewData("1", "Test Send"));
+    });
+
+    it("throws if no decrypted sends in state and there is no userKey", async () => {
+      decryptedState.nextState(null);
+      keyService.hasUserKey.mockResolvedValue(false);
+
+      await expect(sendService.getAllDecryptedFromState(mockUserId)).rejects.toThrow(
+        "No user key found.",
+      );
+    });
   });
 
   describe("getRotatedData", () => {
diff --git a/libs/common/src/tools/send/services/send.service.ts b/libs/common/src/tools/send/services/send.service.ts
index 2556fa2e908..623ab7c4a7b 100644
--- a/libs/common/src/tools/send/services/send.service.ts
+++ b/libs/common/src/tools/send/services/send.service.ts
@@ -199,14 +199,14 @@ export class SendService implements InternalSendServiceAbstraction {
     return response;
   }
 
-  async getAllDecryptedFromState(): Promise<SendView[]> {
+  async getAllDecryptedFromState(userId: UserId): Promise<SendView[]> {
     let decSends = await this.stateProvider.getDecryptedSends();
     if (decSends != null) {
       return decSends;
     }
 
     decSends = [];
-    const hasKey = await this.keyService.hasUserKey();
+    const hasKey = await this.keyService.hasUserKey(userId);
     if (!hasKey) {
       throw new Error("No user key found.");
     }
diff --git a/libs/common/src/tools/state/user-state-subject.ts b/libs/common/src/tools/state/user-state-subject.ts
index 118b0069c84..2c80c9ad135 100644
--- a/libs/common/src/tools/state/user-state-subject.ts
+++ b/libs/common/src/tools/state/user-state-subject.ts
@@ -161,6 +161,14 @@ export class UserStateSubject<
     this.outputSubscription = userState$
       .pipe(
         switchMap((userState) => userState.state$),
+        map((stored) => {
+          if (stored && typeof stored === "object" && ALWAYS_UPDATE_KLUDGE in stored) {
+            // related: ALWAYS_UPDATE_KLUDGE FIXME
+            delete stored[ALWAYS_UPDATE_KLUDGE];
+          }
+
+          return stored;
+        }),
         this.declassify(encryptor$),
         this.adjust(combineLatestWith(constraints$)),
         takeUntil(anyComplete(account$)),
diff --git a/libs/common/src/types/guid.ts b/libs/common/src/types/guid.ts
index bf891b55691..5edd34e4fc5 100644
--- a/libs/common/src/types/guid.ts
+++ b/libs/common/src/types/guid.ts
@@ -2,7 +2,9 @@ import { Opaque } from "type-fest";
 
 export type Guid = Opaque<string, "Guid">;
 
-export type UserId = Opaque<string, "UserId">;
+// Convenience re-export of UserId from it's original location, any library that
+// wants to be lower level than common should instead import it from user-core.
+export { UserId } from "@bitwarden/user-core";
 export type OrganizationId = Opaque<string, "OrganizationId">;
 export type CollectionId = Opaque<string, "CollectionId">;
 export type ProviderId = Opaque<string, "ProviderId">;
diff --git a/libs/common/src/vault/abstractions/cipher.service.ts b/libs/common/src/vault/abstractions/cipher.service.ts
index fc809058161..9f5c173826e 100644
--- a/libs/common/src/vault/abstractions/cipher.service.ts
+++ b/libs/common/src/vault/abstractions/cipher.service.ts
@@ -21,6 +21,12 @@ import { CipherView } from "../models/view/cipher.view";
 import { FieldView } from "../models/view/field.view";
 import { AddEditCipherInfo } from "../types/add-edit-cipher-info";
 
+export type EncryptionContext = {
+  cipher: Cipher;
+  /** The Id of the user that encrypted the cipher. It should always represent a UserId, even for Organization-owned ciphers */
+  encryptedFor: UserId;
+};
+
 export abstract class CipherService implements UserKeyRotationDataProvider<CipherWithIdRequest> {
   abstract cipherViews$(userId: UserId): Observable<CipherView[]>;
   abstract ciphers$(userId: UserId): Observable<Record<CipherId, CipherData>>;
@@ -42,7 +48,7 @@ export abstract class CipherService implements UserKeyRotationDataProvider<Ciphe
     keyForEncryption?: SymmetricCryptoKey,
     keyForCipherKeyDecryption?: SymmetricCryptoKey,
     originalCipher?: Cipher,
-  ): Promise<Cipher>;
+  ): Promise<EncryptionContext>;
   abstract encryptFields(fieldsModel: FieldView[], key: SymmetricCryptoKey): Promise<Field[]>;
   abstract encryptField(fieldModel: FieldView, key: SymmetricCryptoKey): Promise<Field>;
   abstract get(id: string, userId: UserId): Promise<Cipher>;
@@ -94,7 +100,10 @@ export abstract class CipherService implements UserKeyRotationDataProvider<Ciphe
    *
    * @returns A promise that resolves to the created cipher
    */
-  abstract createWithServer(cipher: Cipher, orgAdmin?: boolean): Promise<Cipher>;
+  abstract createWithServer(
+    { cipher, encryptedFor }: EncryptionContext,
+    orgAdmin?: boolean,
+  ): Promise<Cipher>;
   /**
    * Update a cipher with the server
    * @param cipher The cipher to update
@@ -104,7 +113,7 @@ export abstract class CipherService implements UserKeyRotationDataProvider<Ciphe
    * @returns A promise that resolves to the updated cipher
    */
   abstract updateWithServer(
-    cipher: Cipher,
+    { cipher, encryptedFor }: EncryptionContext,
     orgAdmin?: boolean,
     isNotClone?: boolean,
   ): Promise<Cipher>;
@@ -200,7 +209,7 @@ export abstract class CipherService implements UserKeyRotationDataProvider<Ciphe
     userId: UserId,
   ): Promise<any>;
   abstract restoreWithServer(id: string, userId: UserId, asAdmin?: boolean): Promise<any>;
-  abstract restoreManyWithServer(ids: string[], orgId?: string): Promise<void>;
+  abstract restoreManyWithServer(ids: string[], userId: UserId, orgId?: string): Promise<void>;
   abstract getKeyForCipherKeyDecryption(cipher: Cipher, userId: UserId): Promise<any>;
   abstract setAddEditCipherInfo(value: AddEditCipherInfo, userId: UserId): Promise<void>;
   /**
diff --git a/libs/common/src/abstractions/search.service.ts b/libs/common/src/vault/abstractions/search.service.ts
similarity index 82%
rename from libs/common/src/abstractions/search.service.ts
rename to libs/common/src/vault/abstractions/search.service.ts
index 2bff33bf2db..c981aa748a4 100644
--- a/libs/common/src/abstractions/search.service.ts
+++ b/libs/common/src/vault/abstractions/search.service.ts
@@ -2,9 +2,9 @@
 // @ts-strict-ignore
 import { Observable } from "rxjs";
 
-import { SendView } from "../tools/send/models/view/send.view";
-import { IndexedEntityId, UserId } from "../types/guid";
-import { CipherView } from "../vault/models/view/cipher.view";
+import { SendView } from "../../tools/send/models/view/send.view";
+import { IndexedEntityId, UserId } from "../../types/guid";
+import { CipherView } from "../models/view/cipher.view";
 
 export abstract class SearchService {
   indexedEntityId$: (userId: UserId) => Observable<IndexedEntityId | null>;
diff --git a/libs/common/src/vault/enums/cipher-reprompt-type.ts b/libs/common/src/vault/enums/cipher-reprompt-type.ts
index 190a9bad042..91b05399d32 100644
--- a/libs/common/src/vault/enums/cipher-reprompt-type.ts
+++ b/libs/common/src/vault/enums/cipher-reprompt-type.ts
@@ -1,6 +1,8 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum CipherRepromptType {
-  None = 0,
-  Password = 1,
-}
+import { UnionOfValues } from "../types/union-of-values";
+
+export const CipherRepromptType = {
+  None: 0,
+  Password: 1,
+} as const;
+
+export type CipherRepromptType = UnionOfValues<typeof CipherRepromptType>;
diff --git a/libs/common/src/vault/enums/cipher-type.spec.ts b/libs/common/src/vault/enums/cipher-type.spec.ts
new file mode 100644
index 00000000000..41eee6ea0b5
--- /dev/null
+++ b/libs/common/src/vault/enums/cipher-type.spec.ts
@@ -0,0 +1,66 @@
+import {
+  CipherType,
+  cipherTypeNames,
+  isCipherType,
+  toCipherType,
+  toCipherTypeName,
+} from "./cipher-type";
+
+describe("CipherType", () => {
+  describe("toCipherTypeName", () => {
+    it("should map CipherType correctly", () => {
+      // identity test as the value is calculated
+      expect(cipherTypeNames).toEqual({
+        1: "Login",
+        2: "SecureNote",
+        3: "Card",
+        4: "Identity",
+        5: "SshKey",
+      });
+    });
+  });
+
+  describe("toCipherTypeName", () => {
+    it("returns the associated name for the cipher type", () => {
+      expect(toCipherTypeName(1)).toBe("Login");
+      expect(toCipherTypeName(2)).toBe("SecureNote");
+      expect(toCipherTypeName(3)).toBe("Card");
+      expect(toCipherTypeName(4)).toBe("Identity");
+      expect(toCipherTypeName(5)).toBe("SshKey");
+    });
+
+    it("returns undefined for an invalid cipher type", () => {
+      expect(toCipherTypeName(999 as any)).toBeUndefined();
+      expect(toCipherTypeName("" as any)).toBeUndefined();
+    });
+  });
+
+  describe("isCipherType", () => {
+    it("returns true for valid CipherType values", () => {
+      [1, 2, 3, 4, 5].forEach((value) => {
+        expect(isCipherType(value)).toBe(true);
+      });
+    });
+
+    it("returns false for invalid CipherType values", () => {
+      expect(isCipherType(999 as any)).toBe(false);
+      expect(isCipherType("Login" as any)).toBe(false);
+      expect(isCipherType(null)).toBe(false);
+      expect(isCipherType(undefined)).toBe(false);
+    });
+  });
+
+  describe("toCipherType", () => {
+    it("converts valid values to CipherType", () => {
+      expect(toCipherType("1")).toBe(CipherType.Login);
+      expect(toCipherType("02")).toBe(CipherType.SecureNote);
+    });
+
+    it("returns null for invalid values", () => {
+      expect(toCipherType(999 as any)).toBeUndefined();
+      expect(toCipherType("Login" as any)).toBeUndefined();
+      expect(toCipherType(null)).toBeUndefined();
+      expect(toCipherType(undefined)).toBeUndefined();
+    });
+  });
+});
diff --git a/libs/common/src/vault/enums/cipher-type.ts b/libs/common/src/vault/enums/cipher-type.ts
index 30d80cdef7e..31fb72f4772 100644
--- a/libs/common/src/vault/enums/cipher-type.ts
+++ b/libs/common/src/vault/enums/cipher-type.ts
@@ -1,9 +1,60 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum CipherType {
-  Login = 1,
-  SecureNote = 2,
-  Card = 3,
-  Identity = 4,
-  SshKey = 5,
+const _CipherType = Object.freeze({
+  Login: 1,
+  SecureNote: 2,
+  Card: 3,
+  Identity: 4,
+  SshKey: 5,
+} as const);
+
+type _CipherType = typeof _CipherType;
+
+export type CipherType = _CipherType[keyof _CipherType];
+
+// FIXME: Update typing of `CipherType` to be `Record<keyof _CipherType, CipherType>` which is ADR-0025 compliant when the TypeScript version is at least 5.8.
+export const CipherType: typeof _CipherType = _CipherType;
+
+/**
+ * Reverse mapping of Cipher Types to their associated names.
+ * Prefer using {@link toCipherTypeName} rather than accessing this object directly.
+ *
+ * When represented as an enum in TypeScript, this mapping was provided
+ * by default. Now using a constant object it needs to be defined manually.
+ */
+export const cipherTypeNames = Object.freeze(
+  Object.fromEntries(Object.entries(CipherType).map(([key, value]) => [value, key])),
+) as Readonly<Record<CipherType, keyof typeof CipherType>>;
+
+/**
+ * Returns the associated name for the cipher type, will throw when the name is not found.
+ */
+export function toCipherTypeName(type: CipherType): keyof typeof CipherType | undefined {
+  const name = cipherTypeNames[type];
+
+  return name;
 }
+
+/**
+ * @returns `true` if the value is a valid `CipherType`, `false` otherwise.
+ */
+export const isCipherType = (value: unknown): value is CipherType => {
+  return Object.values(CipherType).includes(value as CipherType);
+};
+
+/**
+ * Converts a value to a `CipherType` if it is valid, otherwise returns `null`.
+ */
+export const toCipherType = (value: unknown): CipherType | undefined => {
+  if (isCipherType(value)) {
+    return value;
+  }
+
+  if (typeof value === "string") {
+    const valueAsInt = parseInt(value, 10);
+
+    if (isCipherType(valueAsInt)) {
+      return valueAsInt;
+    }
+  }
+
+  return undefined;
+};
diff --git a/libs/common/src/vault/enums/extension-page-urls.enum.ts b/libs/common/src/vault/enums/extension-page-urls.enum.ts
new file mode 100644
index 00000000000..95f9e0a21df
--- /dev/null
+++ b/libs/common/src/vault/enums/extension-page-urls.enum.ts
@@ -0,0 +1,12 @@
+import { UnionOfValues } from "../types/union-of-values";
+
+/**
+ * Available pages within the extension by their URL.
+ * Useful when opening a specific page within the popup.
+ */
+export const ExtensionPageUrls: Record<string, `popup/index.html#/${string}`> = {
+  Index: "popup/index.html#/",
+  AtRiskPasswords: "popup/index.html#/at-risk-passwords",
+} as const;
+
+export type ExtensionPageUrls = UnionOfValues<typeof ExtensionPageUrls>;
diff --git a/libs/common/src/vault/enums/field-type.enum.ts b/libs/common/src/vault/enums/field-type.enum.ts
index df5016890b2..0e8e2aaca3d 100644
--- a/libs/common/src/vault/enums/field-type.enum.ts
+++ b/libs/common/src/vault/enums/field-type.enum.ts
@@ -1,8 +1,12 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum FieldType {
-  Text = 0,
-  Hidden = 1,
-  Boolean = 2,
-  Linked = 3,
-}
+const _FieldType = Object.freeze({
+  Text: 0,
+  Hidden: 1,
+  Boolean: 2,
+  Linked: 3,
+} as const);
+
+type _FieldType = typeof _FieldType;
+
+export type FieldType = _FieldType[keyof _FieldType];
+
+export const FieldType: Record<keyof _FieldType, FieldType> = _FieldType;
diff --git a/libs/common/src/vault/enums/index.ts b/libs/common/src/vault/enums/index.ts
index d7d1d06d2b9..c996a14a81a 100644
--- a/libs/common/src/vault/enums/index.ts
+++ b/libs/common/src/vault/enums/index.ts
@@ -3,3 +3,4 @@ export * from "./cipher-type";
 export * from "./field-type.enum";
 export * from "./linked-id-type.enum";
 export * from "./secure-note-type.enum";
+export * from "./extension-page-urls.enum";
diff --git a/libs/common/src/vault/enums/linked-id-type.enum.ts b/libs/common/src/vault/enums/linked-id-type.enum.ts
index b329aecb3f4..20ef15e6207 100644
--- a/libs/common/src/vault/enums/linked-id-type.enum.ts
+++ b/libs/common/src/vault/enums/linked-id-type.enum.ts
@@ -1,46 +1,48 @@
+import { UnionOfValues } from "../types/union-of-values";
+
 export type LinkedIdType = LoginLinkedId | CardLinkedId | IdentityLinkedId;
 
 // LoginView
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum LoginLinkedId {
-  Username = 100,
-  Password = 101,
-}
+export const LoginLinkedId = {
+  Username: 100,
+  Password: 101,
+} as const;
+
+export type LoginLinkedId = UnionOfValues<typeof LoginLinkedId>;
 
 // CardView
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum CardLinkedId {
-  CardholderName = 300,
-  ExpMonth = 301,
-  ExpYear = 302,
-  Code = 303,
-  Brand = 304,
-  Number = 305,
-}
+export const CardLinkedId = {
+  CardholderName: 300,
+  ExpMonth: 301,
+  ExpYear: 302,
+  Code: 303,
+  Brand: 304,
+  Number: 305,
+} as const;
+
+export type CardLinkedId = UnionOfValues<typeof CardLinkedId>;
 
 // IdentityView
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum IdentityLinkedId {
-  Title = 400,
-  MiddleName = 401,
-  Address1 = 402,
-  Address2 = 403,
-  Address3 = 404,
-  City = 405,
-  State = 406,
-  PostalCode = 407,
-  Country = 408,
-  Company = 409,
-  Email = 410,
-  Phone = 411,
-  Ssn = 412,
-  Username = 413,
-  PassportNumber = 414,
-  LicenseNumber = 415,
-  FirstName = 416,
-  LastName = 417,
-  FullName = 418,
-}
+export const IdentityLinkedId = {
+  Title: 400,
+  MiddleName: 401,
+  Address1: 402,
+  Address2: 403,
+  Address3: 404,
+  City: 405,
+  State: 406,
+  PostalCode: 407,
+  Country: 408,
+  Company: 409,
+  Email: 410,
+  Phone: 411,
+  Ssn: 412,
+  Username: 413,
+  PassportNumber: 414,
+  LicenseNumber: 415,
+  FirstName: 416,
+  LastName: 417,
+  FullName: 418,
+} as const;
+
+export type IdentityLinkedId = UnionOfValues<typeof IdentityLinkedId>;
diff --git a/libs/common/src/vault/enums/secure-note-type.enum.ts b/libs/common/src/vault/enums/secure-note-type.enum.ts
index 4fbd05e6bd4..bb5838d028c 100644
--- a/libs/common/src/vault/enums/secure-note-type.enum.ts
+++ b/libs/common/src/vault/enums/secure-note-type.enum.ts
@@ -1,5 +1,7 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum SecureNoteType {
-  Generic = 0,
-}
+import { UnionOfValues } from "../types/union-of-values";
+
+export const SecureNoteType = {
+  Generic: 0,
+} as const;
+
+export type SecureNoteType = UnionOfValues<typeof SecureNoteType>;
diff --git a/libs/common/src/vault/enums/vault-messages.enum.ts b/libs/common/src/vault/enums/vault-messages.enum.ts
index 73272564432..fe76cd72427 100644
--- a/libs/common/src/vault/enums/vault-messages.enum.ts
+++ b/libs/common/src/vault/enums/vault-messages.enum.ts
@@ -1,7 +1,9 @@
 const VaultMessages = {
   HasBwInstalled: "hasBwInstalled",
   checkBwInstalled: "checkIfBWExtensionInstalled",
+  /** @deprecated use {@link OpenBrowserExtensionToUrl} */
   OpenAtRiskPasswords: "openAtRiskPasswords",
+  OpenBrowserExtensionToUrl: "openBrowserExtensionToUrl",
   PopupOpened: "popupOpened",
 } as const;
 
diff --git a/libs/common/src/vault/models/data/cipher.data.ts b/libs/common/src/vault/models/data/cipher.data.ts
index 1be70283fb3..7554f23f6a0 100644
--- a/libs/common/src/vault/models/data/cipher.data.ts
+++ b/libs/common/src/vault/models/data/cipher.data.ts
@@ -57,7 +57,7 @@ export class CipherData {
     this.organizationUseTotp = response.organizationUseTotp;
     this.favorite = response.favorite;
     this.revisionDate = response.revisionDate;
-    this.type = response.type;
+    this.type = response.type as CipherType;
     this.name = response.name;
     this.notes = response.notes;
     this.collectionIds = collectionIds != null ? collectionIds : response.collectionIds;
diff --git a/libs/common/src/vault/models/data/field.data.ts b/libs/common/src/vault/models/data/field.data.ts
index b9daf7fa423..cf9df69a6b0 100644
--- a/libs/common/src/vault/models/data/field.data.ts
+++ b/libs/common/src/vault/models/data/field.data.ts
@@ -7,7 +7,7 @@ export class FieldData {
   type: FieldType;
   name: string;
   value: string;
-  linkedId: LinkedIdType;
+  linkedId: LinkedIdType | null;
 
   constructor(response?: FieldApi) {
     if (response == null) {
diff --git a/libs/common/src/vault/models/domain/cipher.spec.ts b/libs/common/src/vault/models/domain/cipher.spec.ts
index 5c98ceda9f7..ba83cf38ae4 100644
--- a/libs/common/src/vault/models/domain/cipher.spec.ts
+++ b/libs/common/src/vault/models/domain/cipher.spec.ts
@@ -68,6 +68,68 @@ describe("Cipher DTO", () => {
     });
   });
 
+  it("Decrypt should handle cipher key error", async () => {
+    const cipher = new Cipher();
+    cipher.id = "id";
+    cipher.organizationId = "orgId";
+    cipher.folderId = "folderId";
+    cipher.edit = true;
+    cipher.viewPassword = true;
+    cipher.organizationUseTotp = true;
+    cipher.favorite = false;
+    cipher.revisionDate = new Date("2022-01-31T12:00:00.000Z");
+    cipher.type = CipherType.Login;
+    cipher.name = mockEnc("EncryptedString");
+    cipher.notes = mockEnc("EncryptedString");
+    cipher.creationDate = new Date("2022-01-01T12:00:00.000Z");
+    cipher.deletedDate = null;
+    cipher.reprompt = CipherRepromptType.None;
+    cipher.key = mockEnc("EncKey");
+    cipher.permissions = new CipherPermissionsApi();
+
+    const loginView = new LoginView();
+    loginView.username = "username";
+    loginView.password = "password";
+
+    const login = mock<Login>();
+    login.decrypt.mockResolvedValue(loginView);
+    cipher.login = login;
+
+    const keyService = mock<KeyService>();
+    const encryptService = mock<EncryptService>();
+    const cipherService = mock<CipherService>();
+
+    encryptService.unwrapSymmetricKey.mockRejectedValue(new Error("Failed to unwrap key"));
+
+    (window as any).bitwardenContainerService = new ContainerService(keyService, encryptService);
+
+    const cipherView = await cipher.decrypt(
+      await cipherService.getKeyForCipherKeyDecryption(cipher, mockUserId),
+    );
+
+    expect(cipherView).toMatchObject({
+      id: "id",
+      organizationId: "orgId",
+      folderId: "folderId",
+      name: "[error: cannot decrypt]",
+      type: 1,
+      favorite: false,
+      organizationUseTotp: true,
+      edit: true,
+      viewPassword: true,
+      decryptionFailure: true,
+      collectionIds: undefined,
+      revisionDate: new Date("2022-01-31T12:00:00.000Z"),
+      creationDate: new Date("2022-01-01T12:00:00.000Z"),
+      deletedDate: null,
+      reprompt: 0,
+      localData: undefined,
+      permissions: new CipherPermissionsApi(),
+    });
+
+    expect(login.decrypt).not.toHaveBeenCalled();
+  });
+
   describe("LoginCipher", () => {
     let cipherData: CipherData;
 
@@ -887,7 +949,10 @@ describe("Cipher DTO", () => {
         reprompt: SdkCipherRepromptType.None,
         organizationUseTotp: true,
         edit: true,
-        permissions: new CipherPermissionsApi(),
+        permissions: {
+          delete: false,
+          restore: false,
+        },
         viewPassword: true,
         localData: {
           lastUsedDate: "2025-04-15T12:00:00.000Z",
diff --git a/libs/common/src/vault/models/domain/cipher.ts b/libs/common/src/vault/models/domain/cipher.ts
index f647adf198e..9cc9226cd46 100644
--- a/libs/common/src/vault/models/domain/cipher.ts
+++ b/libs/common/src/vault/models/domain/cipher.ts
@@ -145,14 +145,15 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
     if (this.key != null) {
       const encryptService = Utils.getContainerService().getEncryptService();
 
-      const cipherKey = await encryptService.unwrapSymmetricKey(this.key, encKey);
-      if (cipherKey == null) {
+      try {
+        const cipherKey = await encryptService.unwrapSymmetricKey(this.key, encKey);
+        encKey = cipherKey;
+        bypassValidation = false;
+      } catch {
         model.name = "[error: cannot decrypt]";
         model.decryptionFailure = true;
         return model;
       }
-      encKey = cipherKey;
-      bypassValidation = false;
     }
 
     await this.decryptObj<Cipher, CipherView>(
@@ -292,6 +293,7 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
     const domain = new Cipher();
     const name = EncString.fromJSON(obj.name);
     const notes = EncString.fromJSON(obj.notes);
+    const creationDate = obj.creationDate == null ? null : new Date(obj.creationDate);
     const revisionDate = obj.revisionDate == null ? null : new Date(obj.revisionDate);
     const deletedDate = obj.deletedDate == null ? null : new Date(obj.deletedDate);
     const attachments = obj.attachments?.map((a: any) => Attachment.fromJSON(a));
@@ -302,6 +304,7 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
     Object.assign(domain, obj, {
       name,
       notes,
+      creationDate,
       revisionDate,
       deletedDate,
       attachments,
@@ -341,18 +344,23 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
   toSdkCipher(): SdkCipher {
     const sdkCipher: SdkCipher = {
       id: this.id,
-      organizationId: this.organizationId,
-      folderId: this.folderId,
-      collectionIds: this.collectionIds || [],
+      organizationId: this.organizationId ?? undefined,
+      folderId: this.folderId ?? undefined,
+      collectionIds: this.collectionIds ?? [],
       key: this.key?.toJSON(),
       name: this.name.toJSON(),
       notes: this.notes?.toJSON(),
       type: this.type,
-      favorite: this.favorite,
-      organizationUseTotp: this.organizationUseTotp,
-      edit: this.edit,
-      permissions: this.permissions,
-      viewPassword: this.viewPassword,
+      favorite: this.favorite ?? false,
+      organizationUseTotp: this.organizationUseTotp ?? false,
+      edit: this.edit ?? true,
+      permissions: this.permissions
+        ? {
+            delete: this.permissions.delete,
+            restore: this.permissions.restore,
+          }
+        : undefined,
+      viewPassword: this.viewPassword ?? true,
       localData: this.localData
         ? {
             lastUsedDate: this.localData.lastUsedDate
diff --git a/libs/common/src/vault/models/domain/login-uri.ts b/libs/common/src/vault/models/domain/login-uri.ts
index b3e6fad70dd..5874d99c99d 100644
--- a/libs/common/src/vault/models/domain/login-uri.ts
+++ b/libs/common/src/vault/models/domain/login-uri.ts
@@ -97,8 +97,8 @@ export class LoginUri extends Domain {
    */
   toSdkLoginUri(): SdkLoginUri {
     return {
-      uri: this.uri.toJSON(),
-      uriChecksum: this.uriChecksum.toJSON(),
+      uri: this.uri?.toJSON(),
+      uriChecksum: this.uriChecksum?.toJSON(),
       match: this.match,
     };
   }
diff --git a/libs/common/src/vault/models/domain/login.ts b/libs/common/src/vault/models/domain/login.ts
index 1893212bdaa..b54251ca727 100644
--- a/libs/common/src/vault/models/domain/login.ts
+++ b/libs/common/src/vault/models/domain/login.ts
@@ -159,7 +159,7 @@ export class Login extends Domain {
       password: this.password?.toJSON(),
       passwordRevisionDate: this.passwordRevisionDate?.toISOString(),
       totp: this.totp?.toJSON(),
-      autofillOnPageLoad: this.autofillOnPageLoad,
+      autofillOnPageLoad: this.autofillOnPageLoad ?? undefined,
       fido2Credentials: this.fido2Credentials?.map((f) => f.toSdkFido2Credential()),
     };
   }
diff --git a/libs/common/src/vault/models/request/cipher-bulk-share.request.ts b/libs/common/src/vault/models/request/cipher-bulk-share.request.ts
index 4f56297d0a5..d0c394bea00 100644
--- a/libs/common/src/vault/models/request/cipher-bulk-share.request.ts
+++ b/libs/common/src/vault/models/request/cipher-bulk-share.request.ts
@@ -1,5 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { UserId } from "../../../types/guid";
 import { Cipher } from "../domain/cipher";
 
 import { CipherWithIdRequest } from "./cipher-with-id.request";
@@ -8,11 +9,15 @@ export class CipherBulkShareRequest {
   ciphers: CipherWithIdRequest[];
   collectionIds: string[];
 
-  constructor(ciphers: Cipher[], collectionIds: string[]) {
+  constructor(
+    ciphers: Cipher[],
+    collectionIds: string[],
+    readonly encryptedFor: UserId,
+  ) {
     if (ciphers != null) {
       this.ciphers = [];
       ciphers.forEach((c) => {
-        this.ciphers.push(new CipherWithIdRequest(c));
+        this.ciphers.push(new CipherWithIdRequest({ cipher: c, encryptedFor }));
       });
     }
     this.collectionIds = collectionIds;
diff --git a/libs/common/src/vault/models/request/cipher-create.request.ts b/libs/common/src/vault/models/request/cipher-create.request.ts
index 9c3be5544b9..e992ebed9b2 100644
--- a/libs/common/src/vault/models/request/cipher-create.request.ts
+++ b/libs/common/src/vault/models/request/cipher-create.request.ts
@@ -1,4 +1,4 @@
-import { Cipher } from "../domain/cipher";
+import { EncryptionContext } from "../../abstractions/cipher.service";
 
 import { CipherRequest } from "./cipher.request";
 
@@ -6,8 +6,8 @@ export class CipherCreateRequest {
   cipher: CipherRequest;
   collectionIds: string[];
 
-  constructor(cipher: Cipher) {
-    this.cipher = new CipherRequest(cipher);
+  constructor({ cipher, encryptedFor }: EncryptionContext) {
+    this.cipher = new CipherRequest({ cipher, encryptedFor });
     this.collectionIds = cipher.collectionIds;
   }
 }
diff --git a/libs/common/src/vault/models/request/cipher-share.request.ts b/libs/common/src/vault/models/request/cipher-share.request.ts
index 4043599ce05..17c46168efe 100644
--- a/libs/common/src/vault/models/request/cipher-share.request.ts
+++ b/libs/common/src/vault/models/request/cipher-share.request.ts
@@ -1,4 +1,4 @@
-import { Cipher } from "../domain/cipher";
+import { EncryptionContext } from "../../abstractions/cipher.service";
 
 import { CipherRequest } from "./cipher.request";
 
@@ -6,8 +6,8 @@ export class CipherShareRequest {
   cipher: CipherRequest;
   collectionIds: string[];
 
-  constructor(cipher: Cipher) {
-    this.cipher = new CipherRequest(cipher);
+  constructor({ cipher, encryptedFor }: EncryptionContext) {
+    this.cipher = new CipherRequest({ cipher, encryptedFor });
     this.collectionIds = cipher.collectionIds;
   }
 }
diff --git a/libs/common/src/vault/models/request/cipher-with-id.request.ts b/libs/common/src/vault/models/request/cipher-with-id.request.ts
index f291e342640..0b04f50fb1e 100644
--- a/libs/common/src/vault/models/request/cipher-with-id.request.ts
+++ b/libs/common/src/vault/models/request/cipher-with-id.request.ts
@@ -1,12 +1,12 @@
-import { Cipher } from "../domain/cipher";
+import { EncryptionContext } from "../../abstractions/cipher.service";
 
 import { CipherRequest } from "./cipher.request";
 
 export class CipherWithIdRequest extends CipherRequest {
   id: string;
 
-  constructor(cipher: Cipher) {
-    super(cipher);
+  constructor({ cipher, encryptedFor }: EncryptionContext) {
+    super({ cipher, encryptedFor });
     this.id = cipher.id;
   }
 }
diff --git a/libs/common/src/vault/models/request/cipher.request.ts b/libs/common/src/vault/models/request/cipher.request.ts
index 5b77ee7508e..2e3b2efbedc 100644
--- a/libs/common/src/vault/models/request/cipher.request.ts
+++ b/libs/common/src/vault/models/request/cipher.request.ts
@@ -1,5 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { UserId } from "../../../types/guid";
+import { EncryptionContext } from "../../abstractions/cipher.service";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
 import { CipherType } from "../../enums/cipher-type";
 import { CardApi } from "../api/card.api";
@@ -10,12 +12,12 @@ import { LoginUriApi } from "../api/login-uri.api";
 import { LoginApi } from "../api/login.api";
 import { SecureNoteApi } from "../api/secure-note.api";
 import { SshKeyApi } from "../api/ssh-key.api";
-import { Cipher } from "../domain/cipher";
 
 import { AttachmentRequest } from "./attachment.request";
 import { PasswordHistoryRequest } from "./password-history.request";
 
 export class CipherRequest {
+  encryptedFor: UserId;
   type: CipherType;
   folderId: string;
   organizationId: string;
@@ -36,8 +38,9 @@ export class CipherRequest {
   reprompt: CipherRepromptType;
   key: string;
 
-  constructor(cipher: Cipher) {
+  constructor({ cipher, encryptedFor }: EncryptionContext) {
     this.type = cipher.type;
+    this.encryptedFor = encryptedFor;
     this.folderId = cipher.folderId;
     this.organizationId = cipher.organizationId;
     this.name = cipher.name ? cipher.name.encryptedString : null;
diff --git a/libs/common/src/vault/models/response/cipher.response.ts b/libs/common/src/vault/models/response/cipher.response.ts
index 944a19e088b..d4c907ae2b0 100644
--- a/libs/common/src/vault/models/response/cipher.response.ts
+++ b/libs/common/src/vault/models/response/cipher.response.ts
@@ -1,6 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { BaseResponse } from "../../../models/response/base.response";
+import { CipherType } from "../../enums";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
 import { CardApi } from "../api/card.api";
 import { CipherPermissionsApi } from "../api/cipher-permissions.api";
@@ -17,7 +18,7 @@ export class CipherResponse extends BaseResponse {
   id: string;
   organizationId: string;
   folderId: string;
-  type: number;
+  type: CipherType;
   name: string;
   notes: string;
   fields: FieldApi[];
diff --git a/libs/common/src/vault/models/view/attachment.view.spec.ts b/libs/common/src/vault/models/view/attachment.view.spec.ts
index 8ae836e1265..b24d251d246 100644
--- a/libs/common/src/vault/models/view/attachment.view.spec.ts
+++ b/libs/common/src/vault/models/view/attachment.view.spec.ts
@@ -26,6 +26,8 @@ describe("AttachmentView", () => {
     });
 
     it("should return an AttachmentView from an SdkAttachmentView", () => {
+      jest.spyOn(SymmetricCryptoKey, "fromString").mockReturnValue("mockKey" as any);
+
       const sdkAttachmentView = {
         id: "id",
         url: "url",
@@ -33,6 +35,7 @@ describe("AttachmentView", () => {
         sizeName: "sizeName",
         fileName: "fileName",
         key: "encKeyB64_fromString",
+        decryptedKey: "decryptedKey_B64",
       } as SdkAttachmentView;
 
       const result = AttachmentView.fromSdkAttachmentView(sdkAttachmentView);
@@ -43,14 +46,20 @@ describe("AttachmentView", () => {
         size: "size",
         sizeName: "sizeName",
         fileName: "fileName",
-        key: null,
+        key: "mockKey",
         encryptedKey: new EncString(sdkAttachmentView.key as string),
       });
+
+      expect(SymmetricCryptoKey.fromString).toHaveBeenCalledWith("decryptedKey_B64");
     });
   });
 
   describe("toSdkAttachmentView", () => {
     it("should convert AttachmentView to SdkAttachmentView", () => {
+      const mockKey = {
+        toBase64: jest.fn().mockReturnValue("keyB64"),
+      } as any;
+
       const attachmentView = new AttachmentView();
       attachmentView.id = "id";
       attachmentView.url = "url";
@@ -58,8 +67,10 @@ describe("AttachmentView", () => {
       attachmentView.sizeName = "sizeName";
       attachmentView.fileName = "fileName";
       attachmentView.encryptedKey = new EncString("encKeyB64");
+      attachmentView.key = mockKey;
 
       const result = attachmentView.toSdkAttachmentView();
+
       expect(result).toEqual({
         id: "id",
         url: "url",
@@ -67,6 +78,7 @@ describe("AttachmentView", () => {
         sizeName: "sizeName",
         fileName: "fileName",
         key: "encKeyB64",
+        decryptedKey: "keyB64",
       });
     });
   });
diff --git a/libs/common/src/vault/models/view/attachment.view.ts b/libs/common/src/vault/models/view/attachment.view.ts
index 2ef4280d97a..d943d21367d 100644
--- a/libs/common/src/vault/models/view/attachment.view.ts
+++ b/libs/common/src/vault/models/view/attachment.view.ts
@@ -45,7 +45,8 @@ export class AttachmentView implements View {
 
   static fromJSON(obj: Partial<Jsonify<AttachmentView>>): AttachmentView {
     const key = obj.key == null ? null : SymmetricCryptoKey.fromJSON(obj.key);
-    return Object.assign(new AttachmentView(), obj, { key: key });
+    const encryptedKey = obj.encryptedKey == null ? undefined : new EncString(obj.encryptedKey);
+    return Object.assign(new AttachmentView(), obj, { key: key, encryptedKey: encryptedKey });
   }
 
   /**
@@ -59,6 +60,8 @@ export class AttachmentView implements View {
       sizeName: this.sizeName,
       fileName: this.fileName,
       key: this.encryptedKey?.toJSON(),
+      // TODO: PM-23005 - Temporary field, should be removed when encrypted migration is complete
+      decryptedKey: this.key ? this.key.toBase64() : null,
     };
   }
 
@@ -76,6 +79,8 @@ export class AttachmentView implements View {
     view.size = obj.size ?? null;
     view.sizeName = obj.sizeName ?? null;
     view.fileName = obj.fileName ?? null;
+    // TODO: PM-23005 - Temporary field, should be removed when encrypted migration is complete
+    view.key = obj.key ? SymmetricCryptoKey.fromString(obj.decryptedKey) : null;
     view.encryptedKey = new EncString(obj.key);
 
     return view;
diff --git a/libs/common/src/vault/models/view/card.view.ts b/libs/common/src/vault/models/view/card.view.ts
index 2adfbb39e89..dd7f5d6be57 100644
--- a/libs/common/src/vault/models/view/card.view.ts
+++ b/libs/common/src/vault/models/view/card.view.ts
@@ -157,6 +157,15 @@ export class CardView extends ItemView {
       return undefined;
     }
 
-    return Object.assign(new CardView(), obj);
+    const cardView = new CardView();
+
+    cardView.cardholderName = obj.cardholderName ?? null;
+    cardView.brand = obj.brand ?? null;
+    cardView.number = obj.number ?? null;
+    cardView.expMonth = obj.expMonth ?? null;
+    cardView.expYear = obj.expYear ?? null;
+    cardView.code = obj.code ?? null;
+
+    return cardView;
   }
 }
diff --git a/libs/common/src/vault/models/view/cipher.view.ts b/libs/common/src/vault/models/view/cipher.view.ts
index 1f73903a5bc..353fffa8eef 100644
--- a/libs/common/src/vault/models/view/cipher.view.ts
+++ b/libs/common/src/vault/models/view/cipher.view.ts
@@ -25,7 +25,7 @@ export class CipherView implements View, InitializerMetadata {
   readonly initializerKey = InitializerKey.CipherView;
 
   id: string = null;
-  organizationId: string = null;
+  organizationId: string | undefined = null;
   folderId: string = null;
   name: string = null;
   notes: string = null;
@@ -188,6 +188,7 @@ export class CipherView implements View, InitializerMetadata {
     }
 
     const view = new CipherView();
+    const creationDate = obj.creationDate == null ? null : new Date(obj.creationDate);
     const revisionDate = obj.revisionDate == null ? null : new Date(obj.revisionDate);
     const deletedDate = obj.deletedDate == null ? null : new Date(obj.deletedDate);
     const attachments = obj.attachments?.map((a: any) => AttachmentView.fromJSON(a));
@@ -195,6 +196,7 @@ export class CipherView implements View, InitializerMetadata {
     const passwordHistory = obj.passwordHistory?.map((ph: any) => PasswordHistoryView.fromJSON(ph));
 
     Object.assign(view, obj, {
+      creationDate: creationDate,
       revisionDate: revisionDate,
       deletedDate: deletedDate,
       attachments: attachments,
diff --git a/libs/common/src/vault/models/view/identity.view.ts b/libs/common/src/vault/models/view/identity.view.ts
index a75d11efd95..877940e4aea 100644
--- a/libs/common/src/vault/models/view/identity.view.ts
+++ b/libs/common/src/vault/models/view/identity.view.ts
@@ -169,6 +169,27 @@ export class IdentityView extends ItemView {
       return undefined;
     }
 
-    return Object.assign(new IdentityView(), obj);
+    const identityView = new IdentityView();
+
+    identityView.title = obj.title ?? null;
+    identityView.firstName = obj.firstName ?? null;
+    identityView.middleName = obj.middleName ?? null;
+    identityView.lastName = obj.lastName ?? null;
+    identityView.address1 = obj.address1 ?? null;
+    identityView.address2 = obj.address2 ?? null;
+    identityView.address3 = obj.address3 ?? null;
+    identityView.city = obj.city ?? null;
+    identityView.state = obj.state ?? null;
+    identityView.postalCode = obj.postalCode ?? null;
+    identityView.country = obj.country ?? null;
+    identityView.company = obj.company ?? null;
+    identityView.email = obj.email ?? null;
+    identityView.phone = obj.phone ?? null;
+    identityView.ssn = obj.ssn ?? null;
+    identityView.username = obj.username ?? null;
+    identityView.passportNumber = obj.passportNumber ?? null;
+    identityView.licenseNumber = obj.licenseNumber ?? null;
+
+    return identityView;
   }
 }
diff --git a/libs/common/src/vault/models/view/login.view.ts b/libs/common/src/vault/models/view/login.view.ts
index 6bdc23f42b1..c6e6ca001e4 100644
--- a/libs/common/src/vault/models/view/login.view.ts
+++ b/libs/common/src/vault/models/view/login.view.ts
@@ -116,13 +116,18 @@ export class LoginView extends ItemView {
       return undefined;
     }
 
-    const passwordRevisionDate =
-      obj.passwordRevisionDate == null ? null : new Date(obj.passwordRevisionDate);
-    const uris = obj.uris?.map((uri) => LoginUriView.fromSdkLoginUriView(uri)) || [];
+    const loginView = new LoginView();
 
-    return Object.assign(new LoginView(), obj, {
-      passwordRevisionDate,
-      uris,
-    });
+    loginView.username = obj.username ?? null;
+    loginView.password = obj.password ?? null;
+    loginView.passwordRevisionDate =
+      obj.passwordRevisionDate == null ? null : new Date(obj.passwordRevisionDate);
+    loginView.totp = obj.totp ?? null;
+    loginView.autofillOnPageLoad = obj.autofillOnPageLoad ?? null;
+    loginView.uris = obj.uris?.map((uri) => LoginUriView.fromSdkLoginUriView(uri)) || [];
+    // FIDO2 credentials are not decrypted here, they remain encrypted
+    loginView.fido2Credentials = null;
+
+    return loginView;
   }
 }
diff --git a/libs/common/src/vault/models/view/secure-note.view.ts b/libs/common/src/vault/models/view/secure-note.view.ts
index 075e4dfc520..8e7a6b4652d 100644
--- a/libs/common/src/vault/models/view/secure-note.view.ts
+++ b/libs/common/src/vault/models/view/secure-note.view.ts
@@ -37,6 +37,9 @@ export class SecureNoteView extends ItemView {
       return undefined;
     }
 
-    return Object.assign(new SecureNoteView(), obj);
+    const secureNoteView = new SecureNoteView();
+    secureNoteView.type = obj.type ?? null;
+
+    return secureNoteView;
   }
 }
diff --git a/libs/common/src/vault/models/view/ssh-key.view.ts b/libs/common/src/vault/models/view/ssh-key.view.ts
index a3d091e4c07..a83793678dc 100644
--- a/libs/common/src/vault/models/view/ssh-key.view.ts
+++ b/libs/common/src/vault/models/view/ssh-key.view.ts
@@ -55,10 +55,12 @@ export class SshKeyView extends ItemView {
       return undefined;
     }
 
-    const keyFingerprint = obj.fingerprint;
+    const sshKeyView = new SshKeyView();
 
-    return Object.assign(new SshKeyView(), obj, {
-      keyFingerprint,
-    });
+    sshKeyView.privateKey = obj.privateKey ?? null;
+    sshKeyView.publicKey = obj.publicKey ?? null;
+    sshKeyView.keyFingerprint = obj.fingerprint ?? null;
+
+    return sshKeyView;
   }
 }
diff --git a/libs/common/src/vault/service-utils.ts b/libs/common/src/vault/service-utils.ts
index 5fbc550d6af..0d863e6ad0b 100644
--- a/libs/common/src/vault/service-utils.ts
+++ b/libs/common/src/vault/service-utils.ts
@@ -1,5 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+
 import { ITreeNodeObject, TreeNode } from "./models/domain/tree-node";
 
 export class ServiceUtils {
@@ -24,38 +25,24 @@ export class ServiceUtils {
       return;
     }
 
+    // 'end' indicates we've traversed as far as we can based on the object name
     const end: boolean = partIndex === parts.length - 1;
     const partName: string = parts[partIndex];
 
-    for (let i = 0; i < nodeTree.length; i++) {
-      if (nodeTree[i].node.name !== partName) {
-        continue;
-      }
-      if (end && nodeTree[i].node.id !== obj.id) {
-        // Another node exists with the same name as the node being added
-        nodeTree.push(new TreeNode(obj, parent, partName));
-        return;
-      }
-      // Move down the tree to the next level
-      ServiceUtils.nestedTraverse(
-        nodeTree[i].children,
-        partIndex + 1,
-        parts,
-        obj,
-        nodeTree[i],
-        delimiter,
-      );
+    // If we're at the end, just add the node - it doesn't matter what else is here
+    if (end) {
+      nodeTree.push(new TreeNode(obj, parent, partName));
       return;
     }
 
-    // If there's no node here with the same name...
-    if (nodeTree.filter((n) => n.node.name === partName).length === 0) {
-      // And we're at the end of the path given, add the node
-      if (end) {
-        nodeTree.push(new TreeNode(obj, parent, partName));
-        return;
-      }
-      // And we're not at the end of the path, combine the current name with the next name
+    // Get matching nodes at this level by name
+    // NOTE: this is effectively a loop so we only want to do it once
+    const matchingNodes = nodeTree.filter((n) => n.node.name === partName);
+
+    // If there are no matching nodes...
+    if (matchingNodes.length === 0) {
+      // And we're not at the end of the path (because we didn't trigger the early return above),
+      // combine the current name with the next name.
       // 1, *1.2, 1.2.1 becomes
       // 1, *1.2/1.2.1
       const newPartName = partName + delimiter + parts[partIndex + 1];
@@ -67,14 +54,25 @@ export class ServiceUtils {
         parent,
         delimiter,
       );
+    } else {
+      // There is a node here with the same name, descend into it
+      ServiceUtils.nestedTraverse(
+        matchingNodes[0].children,
+        partIndex + 1,
+        parts,
+        obj,
+        matchingNodes[0],
+        delimiter,
+      );
+      return;
     }
   }
 
   /**
    * Searches a tree for a node with a matching `id`
-   * @param {TreeNode<T>} nodeTree - A single TreeNode branch that will be searched
+   * @param {TreeNode<T extends ITreeNodeObject>} nodeTree - A single TreeNode branch that will be searched
    * @param {string} id - The id of the node to be found
-   * @returns {TreeNode<T>} The node with a matching `id`
+   * @returns {TreeNode<T extends ITreeNodeObject>} The node with a matching `id`
    */
   static getTreeNodeObject<T extends ITreeNodeObject>(
     nodeTree: TreeNode<T>,
@@ -96,9 +94,9 @@ export class ServiceUtils {
 
   /**
    * Searches an array of tree nodes for a node with a matching `id`
-   * @param {TreeNode<T>} nodeTree - An array of TreeNode branches that will be searched
+   * @param {TreeNode<T extends ITreeNodeObject>} nodeTree - An array of TreeNode branches that will be searched
    * @param {string} id - The id of the node to be found
-   * @returns {TreeNode<T>} The node with a matching `id`
+   * @returns {TreeNode<T extends ITreeNodeObject>} The node with a matching `id`
    */
   static getTreeNodeObjectFromList<T extends ITreeNodeObject>(
     nodeTree: TreeNode<T>[],
diff --git a/libs/common/src/vault/services/cipher-authorization.service.spec.ts b/libs/common/src/vault/services/cipher-authorization.service.spec.ts
index 01574d04df5..43e68bfc71f 100644
--- a/libs/common/src/vault/services/cipher-authorization.service.spec.ts
+++ b/libs/common/src/vault/services/cipher-authorization.service.spec.ts
@@ -7,10 +7,9 @@ import { CollectionService, CollectionView } from "@bitwarden/admin-console/comm
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { CollectionId, UserId } from "@bitwarden/common/types/guid";
+import { UserId } from "@bitwarden/common/types/guid";
 
 import { FakeAccountService, mockAccountServiceWith } from "../../../spec";
-import { ConfigService } from "../../platform/abstractions/config/config.service";
 import { CipherPermissionsApi } from "../models/api/cipher-permissions.api";
 import { CipherView } from "../models/view/cipher.view";
 
@@ -24,7 +23,6 @@ describe("CipherAuthorizationService", () => {
 
   const mockCollectionService = mock<CollectionService>();
   const mockOrganizationService = mock<OrganizationService>();
-  const mockConfigService = mock<ConfigService>();
   const mockUserId = Utils.newGuid() as UserId;
   let mockAccountService: FakeAccountService;
 
@@ -70,10 +68,7 @@ describe("CipherAuthorizationService", () => {
       mockCollectionService,
       mockOrganizationService,
       mockAccountService,
-      mockConfigService,
     );
-
-    mockConfigService.getFeatureFlag$.mockReturnValue(of(false));
   });
 
   describe("canRestoreCipher$", () => {
@@ -90,7 +85,7 @@ describe("CipherAuthorizationService", () => {
       });
     });
 
-    it("should return true if isAdminConsleAction and user can edit all ciphers in the org", (done) => {
+    it("should return true if isAdminConsoleAction and user can edit all ciphers in the org", (done) => {
       const cipher = createMockCipher("org1", ["col1"]) as CipherView;
       const organization = createMockOrganization({ canEditAllCiphers: true });
       mockOrganizationService.organizations$.mockReturnValue(
@@ -145,15 +140,6 @@ describe("CipherAuthorizationService", () => {
   });
 
   describe("canDeleteCipher$", () => {
-    it("should return true if cipher has no organizationId", (done) => {
-      const cipher = createMockCipher(null, []) as CipherView;
-
-      cipherAuthorizationService.canDeleteCipher$(cipher).subscribe((result) => {
-        expect(result).toBe(true);
-        done();
-      });
-    });
-
     it("should return true if isAdminConsoleAction is true and cipher is unassigned", (done) => {
       const cipher = createMockCipher("org1", []) as CipherView;
       const organization = createMockOrganization({ canEditUnassignedCiphers: true });
@@ -161,7 +147,7 @@ describe("CipherAuthorizationService", () => {
         of([organization]) as Observable<Organization[]>,
       );
 
-      cipherAuthorizationService.canDeleteCipher$(cipher, [], true).subscribe((result) => {
+      cipherAuthorizationService.canDeleteCipher$(cipher, true).subscribe((result) => {
         expect(result).toBe(true);
         done();
       });
@@ -174,7 +160,7 @@ describe("CipherAuthorizationService", () => {
         of([organization]) as Observable<Organization[]>,
       );
 
-      cipherAuthorizationService.canDeleteCipher$(cipher, [], true).subscribe((result) => {
+      cipherAuthorizationService.canDeleteCipher$(cipher, true).subscribe((result) => {
         expect(result).toBe(true);
         expect(mockOrganizationService.organizations$).toHaveBeenCalledWith(mockUserId);
         done();
@@ -186,136 +172,32 @@ describe("CipherAuthorizationService", () => {
       const organization = createMockOrganization({ canEditUnassignedCiphers: false });
       mockOrganizationService.organizations$.mockReturnValue(of([organization] as Organization[]));
 
-      cipherAuthorizationService.canDeleteCipher$(cipher, [], true).subscribe((result) => {
+      cipherAuthorizationService.canDeleteCipher$(cipher, true).subscribe((result) => {
         expect(result).toBe(false);
         done();
       });
     });
 
-    it("should return true if activeCollectionId is provided and has manage permission", (done) => {
-      const cipher = createMockCipher("org1", ["col1", "col2"]) as CipherView;
-      const activeCollectionId = "col1" as CollectionId;
-      const organization = createMockOrganization();
-      mockOrganizationService.organizations$.mockReturnValue(of([organization] as Organization[]));
-
-      const allCollections = [
-        createMockCollection("col1", true),
-        createMockCollection("col2", false),
-      ];
-      mockCollectionService.decryptedCollectionViews$.mockReturnValue(
-        of(allCollections as CollectionView[]),
-      );
-
-      cipherAuthorizationService
-        .canDeleteCipher$(cipher, [activeCollectionId])
-        .subscribe((result) => {
-          expect(result).toBe(true);
-          expect(mockCollectionService.decryptedCollectionViews$).toHaveBeenCalledWith([
-            "col1",
-            "col2",
-          ] as CollectionId[]);
-          done();
-        });
-    });
-
-    it("should return false if activeCollectionId is provided and manage permission is not present", (done) => {
-      const cipher = createMockCipher("org1", ["col1", "col2"]) as CipherView;
-      const activeCollectionId = "col1" as CollectionId;
-      const organization = createMockOrganization();
-      mockOrganizationService.organizations$.mockReturnValue(of([organization] as Organization[]));
-
-      const allCollections = [
-        createMockCollection("col1", false),
-        createMockCollection("col2", true),
-      ];
-      mockCollectionService.decryptedCollectionViews$.mockReturnValue(
-        of(allCollections as CollectionView[]),
-      );
-
-      cipherAuthorizationService
-        .canDeleteCipher$(cipher, [activeCollectionId])
-        .subscribe((result) => {
-          expect(result).toBe(false);
-          expect(mockCollectionService.decryptedCollectionViews$).toHaveBeenCalledWith([
-            "col1",
-            "col2",
-          ] as CollectionId[]);
-          done();
-        });
-    });
-
-    it("should return true if any collection has manage permission", (done) => {
-      const cipher = createMockCipher("org1", ["col1", "col2", "col3"]) as CipherView;
-      const organization = createMockOrganization();
-      mockOrganizationService.organizations$.mockReturnValue(of([organization] as Organization[]));
-
-      const allCollections = [
-        createMockCollection("col1", false),
-        createMockCollection("col2", true),
-        createMockCollection("col3", false),
-      ];
-      mockCollectionService.decryptedCollectionViews$.mockReturnValue(
-        of(allCollections as CollectionView[]),
-      );
-
-      cipherAuthorizationService.canDeleteCipher$(cipher).subscribe((result) => {
-        expect(result).toBe(true);
-        expect(mockCollectionService.decryptedCollectionViews$).toHaveBeenCalledWith([
-          "col1",
-          "col2",
-          "col3",
-        ] as CollectionId[]);
-        done();
-      });
-    });
-
-    it("should return false if no collection has manage permission", (done) => {
-      const cipher = createMockCipher("org1", ["col1", "col2"]) as CipherView;
-      const organization = createMockOrganization();
-      mockOrganizationService.organizations$.mockReturnValue(of([organization] as Organization[]));
-
-      const allCollections = [
-        createMockCollection("col1", false),
-        createMockCollection("col2", false),
-      ];
-      mockCollectionService.decryptedCollectionViews$.mockReturnValue(
-        of(allCollections as CollectionView[]),
-      );
-
-      cipherAuthorizationService.canDeleteCipher$(cipher).subscribe((result) => {
-        expect(result).toBe(false);
-        expect(mockCollectionService.decryptedCollectionViews$).toHaveBeenCalledWith([
-          "col1",
-          "col2",
-        ] as CollectionId[]);
-        done();
-      });
-    });
-
-    it("should return true if feature flag enabled and cipher.permissions.delete is true", (done) => {
+    it("should return true when cipher.permissions.delete is true", (done) => {
       const cipher = createMockCipher("org1", [], true, {
         delete: true,
       } as CipherPermissionsApi) as CipherView;
       const organization = createMockOrganization();
       mockOrganizationService.organizations$.mockReturnValue(of([organization] as Organization[]));
-      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
 
-      cipherAuthorizationService.canDeleteCipher$(cipher, [], false).subscribe((result) => {
+      cipherAuthorizationService.canDeleteCipher$(cipher, false).subscribe((result) => {
         expect(result).toBe(true);
-        expect(mockCollectionService.decryptedCollectionViews$).not.toHaveBeenCalled();
         done();
       });
     });
 
-    it("should return false if feature flag enabled and cipher.permissions.delete is false", (done) => {
+    it("should return false when cipher.permissions.delete is false", (done) => {
       const cipher = createMockCipher("org1", []) as CipherView;
       const organization = createMockOrganization();
       mockOrganizationService.organizations$.mockReturnValue(of([organization] as Organization[]));
-      mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
 
-      cipherAuthorizationService.canDeleteCipher$(cipher, [], false).subscribe((result) => {
+      cipherAuthorizationService.canDeleteCipher$(cipher, false).subscribe((result) => {
         expect(result).toBe(false);
-        expect(mockCollectionService.decryptedCollectionViews$).not.toHaveBeenCalled();
         done();
       });
     });
diff --git a/libs/common/src/vault/services/cipher-authorization.service.ts b/libs/common/src/vault/services/cipher-authorization.service.ts
index f30e80cdfb8..ab3676930b5 100644
--- a/libs/common/src/vault/services/cipher-authorization.service.ts
+++ b/libs/common/src/vault/services/cipher-authorization.service.ts
@@ -1,15 +1,13 @@
-import { combineLatest, map, Observable, of, shareReplay, switchMap } from "rxjs";
+import { map, Observable, of, shareReplay, switchMap } from "rxjs";
 
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import { CollectionService } from "@bitwarden/admin-console/common";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { CollectionId } from "@bitwarden/common/types/guid";
 
 import { getUserId } from "../../auth/services/account.service";
-import { FeatureFlag } from "../../enums/feature-flag.enum";
 import { Cipher } from "../models/domain/cipher";
 import { CipherView } from "../models/view/cipher.view";
 
@@ -26,14 +24,12 @@ export abstract class CipherAuthorizationService {
    * Determines if the user can delete the specified cipher.
    *
    * @param {CipherLike} cipher - The cipher object to evaluate for deletion permissions.
-   * @param {CollectionId[]} [allowedCollections] - Optional. The selected collection id from the vault filter.
    * @param {boolean} isAdminConsoleAction - Optional. A flag indicating if the action is being performed from the admin console.
    *
    * @returns {Observable<boolean>} - An observable that emits a boolean value indicating if the user can delete the cipher.
    */
   abstract canDeleteCipher$: (
     cipher: CipherLike,
-    allowedCollections?: CollectionId[],
     isAdminConsoleAction?: boolean,
   ) => Observable<boolean>;
 
@@ -72,7 +68,6 @@ export class DefaultCipherAuthorizationService implements CipherAuthorizationSer
     private collectionService: CollectionService,
     private organizationService: OrganizationService,
     private accountService: AccountService,
-    private configService: ConfigService,
   ) {}
 
   private organization$ = (cipher: CipherLike) =>
@@ -86,48 +81,21 @@ export class DefaultCipherAuthorizationService implements CipherAuthorizationSer
    *
    * {@link CipherAuthorizationService.canDeleteCipher$}
    */
-  canDeleteCipher$(
-    cipher: CipherLike,
-    allowedCollections?: CollectionId[],
-    isAdminConsoleAction?: boolean,
-  ): Observable<boolean> {
-    return combineLatest([
-      this.organization$(cipher),
-      this.configService.getFeatureFlag$(FeatureFlag.LimitItemDeletion),
-    ]).pipe(
-      switchMap(([organization, featureFlagEnabled]) => {
+  canDeleteCipher$(cipher: CipherLike, isAdminConsoleAction?: boolean): Observable<boolean> {
+    return this.organization$(cipher).pipe(
+      map((organization) => {
         if (isAdminConsoleAction) {
           // If the user is an admin, they can delete an unassigned cipher
           if (!cipher.collectionIds || cipher.collectionIds.length === 0) {
-            return of(organization?.canEditUnassignedCiphers === true);
+            return organization?.canEditUnassignedCiphers === true;
           }
 
           if (organization?.canEditAllCiphers) {
-            return of(true);
+            return true;
           }
         }
 
-        if (featureFlagEnabled) {
-          return of(cipher.permissions.delete);
-        }
-
-        if (cipher.organizationId == null) {
-          return of(true);
-        }
-
-        return this.collectionService
-          .decryptedCollectionViews$(cipher.collectionIds as CollectionId[])
-          .pipe(
-            map((allCollections) => {
-              const shouldFilter = allowedCollections?.some(Boolean);
-
-              const collections = shouldFilter
-                ? allCollections.filter((c) => allowedCollections?.includes(c.id as CollectionId))
-                : allCollections;
-
-              return collections.some((collection) => collection.manage);
-            }),
-          );
+        return cipher.permissions.delete;
       }),
     );
   }
diff --git a/libs/common/src/vault/services/cipher.service.spec.ts b/libs/common/src/vault/services/cipher.service.spec.ts
index 9e56bac2ca0..2fd9b03a37e 100644
--- a/libs/common/src/vault/services/cipher.service.spec.ts
+++ b/libs/common/src/vault/services/cipher.service.spec.ts
@@ -10,7 +10,6 @@ import { FakeAccountService, mockAccountServiceWith } from "../../../spec/fake-a
 import { FakeStateProvider } from "../../../spec/fake-state-provider";
 import { makeStaticByteArray, makeSymmetricCryptoKey } from "../../../spec/utils";
 import { ApiService } from "../../abstractions/api.service";
-import { SearchService } from "../../abstractions/search.service";
 import { AutofillSettingsService } from "../../autofill/services/autofill-settings.service";
 import { DomainSettingsService } from "../../autofill/services/domain-settings.service";
 import { BulkEncryptService } from "../../key-management/crypto/abstractions/bulk-encrypt.service";
@@ -27,7 +26,9 @@ import { ContainerService } from "../../platform/services/container.service";
 import { CipherId, UserId } from "../../types/guid";
 import { CipherKey, OrgKey, UserKey } from "../../types/key";
 import { CipherEncryptionService } from "../abstractions/cipher-encryption.service";
+import { EncryptionContext } from "../abstractions/cipher.service";
 import { CipherFileUploadService } from "../abstractions/file-upload/cipher-file-upload.service";
+import { SearchService } from "../abstractions/search.service";
 import { FieldType } from "../enums";
 import { CipherRepromptType } from "../enums/cipher-reprompt-type";
 import { CipherType } from "../enums/cipher-type";
@@ -78,36 +79,12 @@ const cipherData: CipherData = {
   },
   passwordHistory: [{ password: "EncryptedString", lastUsedDate: "2022-01-31T12:00:00.000Z" }],
   attachments: [
-    {
-      id: "a1",
-      url: "url",
-      size: "1100",
-      sizeName: "1.1 KB",
-      fileName: "file",
-      key: "EncKey",
-    },
-    {
-      id: "a2",
-      url: "url",
-      size: "1100",
-      sizeName: "1.1 KB",
-      fileName: "file",
-      key: "EncKey",
-    },
+    { id: "a1", url: "url", size: "1100", sizeName: "1.1 KB", fileName: "file", key: "EncKey" },
+    { id: "a2", url: "url", size: "1100", sizeName: "1.1 KB", fileName: "file", key: "EncKey" },
   ],
   fields: [
-    {
-      name: "EncryptedString",
-      value: "EncryptedString",
-      type: FieldType.Text,
-      linkedId: null,
-    },
-    {
-      name: "EncryptedString",
-      value: "EncryptedString",
-      type: FieldType.Hidden,
-      linkedId: null,
-    },
+    { name: "EncryptedString", value: "EncryptedString", type: FieldType.Text, linkedId: null },
+    { name: "EncryptedString", value: "EncryptedString", type: FieldType.Hidden, linkedId: null },
   ],
 };
 const mockUserId = Utils.newGuid() as UserId;
@@ -133,7 +110,7 @@ describe("Cipher Service", () => {
   const userId = "TestUserId" as UserId;
 
   let cipherService: CipherService;
-  let cipherObj: Cipher;
+  let encryptionContext: EncryptionContext;
 
   beforeEach(() => {
     encryptService.encryptFileData.mockReturnValue(Promise.resolve(ENCRYPTED_BYTES));
@@ -159,7 +136,7 @@ describe("Cipher Service", () => {
       cipherEncryptionService,
     );
 
-    cipherObj = new Cipher(cipherData);
+    encryptionContext = { cipher: new Cipher(cipherData), encryptedFor: userId };
   });
 
   afterEach(() => {
@@ -192,33 +169,33 @@ describe("Cipher Service", () => {
     it("should call apiService.postCipherAdmin when orgAdmin param is true and the cipher orgId != null", async () => {
       const spy = jest
         .spyOn(apiService, "postCipherAdmin")
-        .mockImplementation(() => Promise.resolve<any>(cipherObj.toCipherData()));
-      await cipherService.createWithServer(cipherObj, true);
-      const expectedObj = new CipherCreateRequest(cipherObj);
+        .mockImplementation(() => Promise.resolve<any>(encryptionContext.cipher.toCipherData()));
+      await cipherService.createWithServer(encryptionContext, true);
+      const expectedObj = new CipherCreateRequest(encryptionContext);
 
       expect(spy).toHaveBeenCalled();
       expect(spy).toHaveBeenCalledWith(expectedObj);
     });
 
     it("should call apiService.postCipher when orgAdmin param is true and the cipher orgId is null", async () => {
-      cipherObj.organizationId = null;
+      encryptionContext.cipher.organizationId = null!;
       const spy = jest
         .spyOn(apiService, "postCipher")
-        .mockImplementation(() => Promise.resolve<any>(cipherObj.toCipherData()));
-      await cipherService.createWithServer(cipherObj, true);
-      const expectedObj = new CipherRequest(cipherObj);
+        .mockImplementation(() => Promise.resolve<any>(encryptionContext.cipher.toCipherData()));
+      await cipherService.createWithServer(encryptionContext, true);
+      const expectedObj = new CipherRequest(encryptionContext);
 
       expect(spy).toHaveBeenCalled();
       expect(spy).toHaveBeenCalledWith(expectedObj);
     });
 
     it("should call apiService.postCipherCreate if collectionsIds != null", async () => {
-      cipherObj.collectionIds = ["123"];
+      encryptionContext.cipher.collectionIds = ["123"];
       const spy = jest
         .spyOn(apiService, "postCipherCreate")
-        .mockImplementation(() => Promise.resolve<any>(cipherObj.toCipherData()));
-      await cipherService.createWithServer(cipherObj);
-      const expectedObj = new CipherCreateRequest(cipherObj);
+        .mockImplementation(() => Promise.resolve<any>(encryptionContext.cipher.toCipherData()));
+      await cipherService.createWithServer(encryptionContext);
+      const expectedObj = new CipherCreateRequest(encryptionContext);
 
       expect(spy).toHaveBeenCalled();
       expect(spy).toHaveBeenCalledWith(expectedObj);
@@ -227,9 +204,9 @@ describe("Cipher Service", () => {
     it("should call apiService.postCipher when orgAdmin and collectionIds logic is false", async () => {
       const spy = jest
         .spyOn(apiService, "postCipher")
-        .mockImplementation(() => Promise.resolve<any>(cipherObj.toCipherData()));
-      await cipherService.createWithServer(cipherObj);
-      const expectedObj = new CipherRequest(cipherObj);
+        .mockImplementation(() => Promise.resolve<any>(encryptionContext.cipher.toCipherData()));
+      await cipherService.createWithServer(encryptionContext);
+      const expectedObj = new CipherRequest(encryptionContext);
 
       expect(spy).toHaveBeenCalled();
       expect(spy).toHaveBeenCalledWith(expectedObj);
@@ -240,36 +217,36 @@ describe("Cipher Service", () => {
     it("should call apiService.putCipherAdmin when orgAdmin param is true", async () => {
       const spy = jest
         .spyOn(apiService, "putCipherAdmin")
-        .mockImplementation(() => Promise.resolve<any>(cipherObj.toCipherData()));
-      await cipherService.updateWithServer(cipherObj, true);
-      const expectedObj = new CipherRequest(cipherObj);
+        .mockImplementation(() => Promise.resolve<any>(encryptionContext.cipher.toCipherData()));
+      await cipherService.updateWithServer(encryptionContext, true);
+      const expectedObj = new CipherRequest(encryptionContext);
 
       expect(spy).toHaveBeenCalled();
-      expect(spy).toHaveBeenCalledWith(cipherObj.id, expectedObj);
+      expect(spy).toHaveBeenCalledWith(encryptionContext.cipher.id, expectedObj);
     });
 
     it("should call apiService.putCipher if cipher.edit is true", async () => {
-      cipherObj.edit = true;
+      encryptionContext.cipher.edit = true;
       const spy = jest
         .spyOn(apiService, "putCipher")
-        .mockImplementation(() => Promise.resolve<any>(cipherObj.toCipherData()));
-      await cipherService.updateWithServer(cipherObj);
-      const expectedObj = new CipherRequest(cipherObj);
+        .mockImplementation(() => Promise.resolve<any>(encryptionContext.cipher.toCipherData()));
+      await cipherService.updateWithServer(encryptionContext);
+      const expectedObj = new CipherRequest(encryptionContext);
 
       expect(spy).toHaveBeenCalled();
-      expect(spy).toHaveBeenCalledWith(cipherObj.id, expectedObj);
+      expect(spy).toHaveBeenCalledWith(encryptionContext.cipher.id, expectedObj);
     });
 
     it("should call apiService.putPartialCipher when orgAdmin, and edit are false", async () => {
-      cipherObj.edit = false;
+      encryptionContext.cipher.edit = false;
       const spy = jest
         .spyOn(apiService, "putPartialCipher")
-        .mockImplementation(() => Promise.resolve<any>(cipherObj.toCipherData()));
-      await cipherService.updateWithServer(cipherObj);
-      const expectedObj = new CipherPartialRequest(cipherObj);
+        .mockImplementation(() => Promise.resolve<any>(encryptionContext.cipher.toCipherData()));
+      await cipherService.updateWithServer(encryptionContext);
+      const expectedObj = new CipherPartialRequest(encryptionContext.cipher);
 
       expect(spy).toHaveBeenCalled();
-      expect(spy).toHaveBeenCalledWith(cipherObj.id, expectedObj);
+      expect(spy).toHaveBeenCalledWith(encryptionContext.cipher.id, expectedObj);
     });
   });
 
@@ -293,6 +270,15 @@ describe("Cipher Service", () => {
       jest.spyOn(cipherService as any, "getAutofillOnPageLoadDefault").mockResolvedValue(true);
     });
 
+    it("should return the encrypting user id", async () => {
+      keyService.getOrgKey.mockReturnValue(
+        Promise.resolve<any>(new SymmetricCryptoKey(new Uint8Array(32)) as OrgKey),
+      );
+
+      const { encryptedFor } = await cipherService.encrypt(cipherView, userId);
+      expect(encryptedFor).toEqual(userId);
+    });
+
     describe("login encryption", () => {
       it("should add a uri hash to login uris", async () => {
         encryptService.hash.mockImplementation((value) => Promise.resolve(`${value} hash`));
@@ -304,9 +290,9 @@ describe("Cipher Service", () => {
           Promise.resolve<any>(new SymmetricCryptoKey(new Uint8Array(32)) as OrgKey),
         );
 
-        const domain = await cipherService.encrypt(cipherView, userId);
+        const { cipher } = await cipherService.encrypt(cipherView, userId);
 
-        expect(domain.login.uris).toEqual([
+        expect(cipher.login.uris).toEqual([
           {
             uri: new EncString("uri has been encrypted"),
             uriChecksum: new EncString("uri hash has been encrypted"),
@@ -325,7 +311,7 @@ describe("Cipher Service", () => {
 
       it("is null when feature flag is false", async () => {
         configService.getFeatureFlag.mockResolvedValue(false);
-        const cipher = await cipherService.encrypt(cipherView, userId);
+        const { cipher } = await cipherService.encrypt(cipherView, userId);
 
         expect(cipher.key).toBeNull();
       });
@@ -338,7 +324,7 @@ describe("Cipher Service", () => {
         it("is null when the cipher is not viewPassword", async () => {
           cipherView.viewPassword = false;
 
-          const cipher = await cipherService.encrypt(cipherView, userId);
+          const { cipher } = await cipherService.encrypt(cipherView, userId);
 
           expect(cipher.key).toBeNull();
         });
@@ -346,7 +332,7 @@ describe("Cipher Service", () => {
         it("is defined when the cipher is viewPassword", async () => {
           cipherView.viewPassword = true;
 
-          const cipher = await cipherService.encrypt(cipherView, userId);
+          const { cipher } = await cipherService.encrypt(cipherView, userId);
 
           expect(cipher.key).toBeDefined();
         });
@@ -393,7 +379,13 @@ describe("Cipher Service", () => {
         it("is called when cipher viewPassword is false and original cipher has a key", async () => {
           cipherView.viewPassword = false;
 
-          await cipherService.encrypt(cipherView, userId, undefined, undefined, cipherObj);
+          await cipherService.encrypt(
+            cipherView,
+            userId,
+            undefined,
+            undefined,
+            encryptionContext.cipher,
+          );
 
           expect(cipherService["encryptCipherWithCipherKey"]).toHaveBeenCalled();
         });
@@ -416,22 +408,17 @@ describe("Cipher Service", () => {
 
       stateService.getUserId.mockResolvedValue(mockUserId);
 
-      const keys = {
-        userKey: originalUserKey,
-      } as CipherDecryptionKeys;
+      const keys = { userKey: originalUserKey } as CipherDecryptionKeys;
       keyService.cipherDecryptionKeys$.mockReturnValue(of(keys));
 
-      const cipher1 = new CipherView(cipherObj);
-      cipher1.id = "Cipher 1";
+      const cipher1 = new CipherView(encryptionContext.cipher);
+      cipher1.id = "Cipher 1" as CipherId;
       cipher1.organizationId = null;
-      const cipher2 = new CipherView(cipherObj);
-      cipher2.id = "Cipher 2";
+      const cipher2 = new CipherView(encryptionContext.cipher);
+      cipher2.id = "Cipher 2" as CipherId;
       cipher2.organizationId = null;
 
-      decryptedCiphers = new BehaviorSubject({
-        Cipher1: cipher1,
-        Cipher2: cipher2,
-      });
+      decryptedCiphers = new BehaviorSubject({ [cipher1.id]: cipher1, [cipher2.id]: cipher2 });
       jest
         .spyOn(cipherService, "cipherViews$")
         .mockImplementation((userId: UserId) =>
@@ -462,19 +449,19 @@ describe("Cipher Service", () => {
     });
 
     it("throws if the original user key is null", async () => {
-      await expect(cipherService.getRotatedData(null, newUserKey, mockUserId)).rejects.toThrow(
+      await expect(cipherService.getRotatedData(null!, newUserKey, mockUserId)).rejects.toThrow(
         "Original user key is required to rotate ciphers",
       );
     });
 
     it("throws if the new user key is null", async () => {
-      await expect(cipherService.getRotatedData(originalUserKey, null, mockUserId)).rejects.toThrow(
-        "New user key is required to rotate ciphers",
-      );
+      await expect(
+        cipherService.getRotatedData(originalUserKey, null!, mockUserId),
+      ).rejects.toThrow("New user key is required to rotate ciphers");
     });
 
     it("throws if the user has any failed to decrypt ciphers", async () => {
-      const badCipher = new CipherView(cipherObj);
+      const badCipher = new CipherView(encryptionContext.cipher);
       badCipher.id = "Cipher 3";
       badCipher.organizationId = null;
       badCipher.decryptionFailure = true;
@@ -488,12 +475,15 @@ describe("Cipher Service", () => {
   describe("decrypt", () => {
     it("should call decrypt method of CipherEncryptionService when feature flag is true", async () => {
       configService.getFeatureFlag.mockResolvedValue(true);
-      cipherEncryptionService.decrypt.mockResolvedValue(new CipherView(cipherObj));
+      cipherEncryptionService.decrypt.mockResolvedValue(new CipherView(encryptionContext.cipher));
 
-      const result = await cipherService.decrypt(cipherObj, userId);
+      const result = await cipherService.decrypt(encryptionContext.cipher, userId);
 
-      expect(result).toEqual(new CipherView(cipherObj));
-      expect(cipherEncryptionService.decrypt).toHaveBeenCalledWith(cipherObj, userId);
+      expect(result).toEqual(new CipherView(encryptionContext.cipher));
+      expect(cipherEncryptionService.decrypt).toHaveBeenCalledWith(
+        encryptionContext.cipher,
+        userId,
+      );
     });
 
     it("should call legacy decrypt when feature flag is false", async () => {
@@ -501,12 +491,14 @@ describe("Cipher Service", () => {
       configService.getFeatureFlag.mockResolvedValue(false);
       cipherService.getKeyForCipherKeyDecryption = jest.fn().mockResolvedValue(mockUserKey);
       encryptService.decryptToBytes.mockResolvedValue(new Uint8Array(32));
-      jest.spyOn(cipherObj, "decrypt").mockResolvedValue(new CipherView(cipherObj));
+      jest
+        .spyOn(encryptionContext.cipher, "decrypt")
+        .mockResolvedValue(new CipherView(encryptionContext.cipher));
 
-      const result = await cipherService.decrypt(cipherObj, userId);
+      const result = await cipherService.decrypt(encryptionContext.cipher, userId);
 
-      expect(result).toEqual(new CipherView(cipherObj));
-      expect(cipherObj.decrypt).toHaveBeenCalledWith(mockUserKey);
+      expect(result).toEqual(new CipherView(encryptionContext.cipher));
+      expect(encryptionContext.cipher.decrypt).toHaveBeenCalledWith(mockUserKey);
     });
   });
 
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index 2693d9d4644..18acc5238f5 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -9,7 +9,6 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { KeyService } from "@bitwarden/key-management";
 
 import { ApiService } from "../../abstractions/api.service";
-import { SearchService } from "../../abstractions/search.service";
 import { AccountService } from "../../auth/abstractions/account.service";
 import { AutofillSettingsServiceAbstraction } from "../../autofill/services/autofill-settings.service";
 import { DomainSettingsService } from "../../autofill/services/domain-settings.service";
@@ -33,8 +32,12 @@ import { CipherId, CollectionId, OrganizationId, UserId } from "../../types/guid
 import { OrgKey, UserKey } from "../../types/key";
 import { filterOutNullish, perUserCache$ } from "../../vault/utils/observable-utilities";
 import { CipherEncryptionService } from "../abstractions/cipher-encryption.service";
-import { CipherService as CipherServiceAbstraction } from "../abstractions/cipher.service";
+import {
+  CipherService as CipherServiceAbstraction,
+  EncryptionContext,
+} from "../abstractions/cipher.service";
 import { CipherFileUploadService } from "../abstractions/file-upload/cipher-file-upload.service";
+import { SearchService } from "../abstractions/search.service";
 import { FieldType } from "../enums";
 import { CipherType } from "../enums/cipher-type";
 import { CipherData } from "../models/data/cipher.data";
@@ -196,7 +199,7 @@ export class CipherService implements CipherServiceAbstraction {
     keyForCipherEncryption?: SymmetricCryptoKey,
     keyForCipherKeyDecryption?: SymmetricCryptoKey,
     originalCipher: Cipher = null,
-  ): Promise<Cipher> {
+  ): Promise<EncryptionContext> {
     if (model.id != null) {
       if (originalCipher == null) {
         originalCipher = await this.get(model.id, userId);
@@ -214,6 +217,7 @@ export class CipherService implements CipherServiceAbstraction {
     cipher.organizationId = model.organizationId;
     cipher.type = model.type;
     cipher.collectionIds = model.collectionIds;
+    cipher.creationDate = model.creationDate;
     cipher.revisionDate = model.revisionDate;
     cipher.reprompt = model.reprompt;
     cipher.edit = model.edit;
@@ -230,18 +234,24 @@ export class CipherService implements CipherServiceAbstraction {
       keyForCipherEncryption ||= userOrOrgKey;
       // If the caller has provided a key for cipher key decryption, use it. Otherwise, use the user or org key.
       keyForCipherKeyDecryption ||= userOrOrgKey;
-      return this.encryptCipherWithCipherKey(
-        model,
-        cipher,
-        keyForCipherEncryption,
-        keyForCipherKeyDecryption,
-      );
+      return {
+        cipher: await this.encryptCipherWithCipherKey(
+          model,
+          cipher,
+          keyForCipherEncryption,
+          keyForCipherKeyDecryption,
+        ),
+        encryptedFor: userId,
+      };
     } else {
       keyForCipherEncryption ||= await this.getKeyForCipherKeyDecryption(cipher, userId);
       // We want to ensure that the cipher key is null if cipher key encryption is disabled
       // so that decryption uses the proper key.
       cipher.key = null;
-      return this.encryptCipher(model, cipher, keyForCipherEncryption);
+      return {
+        cipher: await this.encryptCipher(model, cipher, keyForCipherEncryption),
+        encryptedFor: userId,
+      };
     }
   }
 
@@ -261,19 +271,14 @@ export class CipherService implements CipherServiceAbstraction {
       attachment.size = model.size;
       attachment.sizeName = model.sizeName;
       attachment.url = model.url;
-      const promise = this.encryptObjProperty(
-        model,
-        attachment,
-        {
-          fileName: null,
+      const promise = this.encryptObjProperty(model, attachment, { fileName: null }, key).then(
+        async () => {
+          if (model.key != null) {
+            attachment.key = await this.encryptService.wrapSymmetricKey(model.key, key);
+          }
+          encAttachments.push(attachment);
         },
-        key,
-      ).then(async () => {
-        if (model.key != null) {
-          attachment.key = await this.encryptService.wrapSymmetricKey(model.key, key);
-        }
-        encAttachments.push(attachment);
-      });
+      );
       promises.push(promise);
     });
 
@@ -306,15 +311,7 @@ export class CipherService implements CipherServiceAbstraction {
       fieldModel.value = "false";
     }
 
-    await this.encryptObjProperty(
-      fieldModel,
-      field,
-      {
-        name: null,
-        value: null,
-      },
-      key,
-    );
+    await this.encryptObjProperty(fieldModel, field, { name: null, value: null }, key);
 
     return field;
   }
@@ -345,14 +342,7 @@ export class CipherService implements CipherServiceAbstraction {
     const ph = new Password();
     ph.lastUsedDate = phModel.lastUsedDate;
 
-    await this.encryptObjProperty(
-      phModel,
-      ph,
-      {
-        password: null,
-      },
-      key,
-    );
+    await this.encryptObjProperty(phModel, ph, { password: null }, key);
 
     return ph;
   }
@@ -393,7 +383,7 @@ export class CipherService implements CipherServiceAbstraction {
     const decCiphers = await this.getDecryptedCiphers(userId);
     if (decCiphers != null && decCiphers.length !== 0) {
       await this.reindexCiphers(userId);
-      return await this.getDecryptedCiphers(userId);
+      return decCiphers;
     }
 
     const decrypted = await this.decryptCiphers(await this.getAll(userId), userId);
@@ -459,12 +449,12 @@ export class CipherService implements CipherServiceAbstraction {
           if (await this.configService.getFeatureFlag(FeatureFlag.PM4154_BulkEncryptionService)) {
             return await this.bulkEncryptService.decryptItems(
               groupedCiphers,
-              keys.orgKeys[orgId as OrganizationId] ?? keys.userKey,
+              keys.orgKeys?.[orgId as OrganizationId] ?? keys.userKey,
             );
           } else {
             return await this.encryptService.decryptItems(
               groupedCiphers,
-              keys.orgKeys[orgId as OrganizationId] ?? keys.userKey,
+              keys.orgKeys?.[orgId as OrganizationId] ?? keys.userKey,
             );
           }
         }),
@@ -705,9 +695,7 @@ export class CipherService implements CipherServiceAbstraction {
     if (ciphersLocalData[cipherId]) {
       ciphersLocalData[cipherId].lastUsedDate = new Date().getTime();
     } else {
-      ciphersLocalData[cipherId] = {
-        lastUsedDate: new Date().getTime(),
-      };
+      ciphersLocalData[cipherId] = { lastUsedDate: new Date().getTime() };
     }
 
     await this.localDataState(userId).update(() => ciphersLocalData);
@@ -735,10 +723,7 @@ export class CipherService implements CipherServiceAbstraction {
     }
 
     const currentTime = new Date().getTime();
-    ciphersLocalData[id as CipherId] = {
-      lastLaunched: currentTime,
-      lastUsedDate: currentTime,
-    };
+    ciphersLocalData[id as CipherId] = { lastLaunched: currentTime, lastUsedDate: currentTime };
 
     await this.localDataState(userId).update(() => ciphersLocalData);
 
@@ -770,18 +755,21 @@ export class CipherService implements CipherServiceAbstraction {
     await this.domainSettingsService.setNeverDomains(domains);
   }
 
-  async createWithServer(cipher: Cipher, orgAdmin?: boolean): Promise<Cipher> {
+  async createWithServer(
+    { cipher, encryptedFor }: EncryptionContext,
+    orgAdmin?: boolean,
+  ): Promise<Cipher> {
     let response: CipherResponse;
     if (orgAdmin && cipher.organizationId != null) {
-      const request = new CipherCreateRequest(cipher);
+      const request = new CipherCreateRequest({ cipher, encryptedFor });
       response = await this.apiService.postCipherAdmin(request);
       const data = new CipherData(response, cipher.collectionIds);
       return new Cipher(data);
     } else if (cipher.collectionIds != null) {
-      const request = new CipherCreateRequest(cipher);
+      const request = new CipherCreateRequest({ cipher, encryptedFor });
       response = await this.apiService.postCipherCreate(request);
     } else {
-      const request = new CipherRequest(cipher);
+      const request = new CipherRequest({ cipher, encryptedFor });
       response = await this.apiService.postCipher(request);
     }
     cipher.id = response.id;
@@ -792,15 +780,18 @@ export class CipherService implements CipherServiceAbstraction {
     return new Cipher(updated[cipher.id as CipherId]);
   }
 
-  async updateWithServer(cipher: Cipher, orgAdmin?: boolean): Promise<Cipher> {
+  async updateWithServer(
+    { cipher, encryptedFor }: EncryptionContext,
+    orgAdmin?: boolean,
+  ): Promise<Cipher> {
     let response: CipherResponse;
     if (orgAdmin) {
-      const request = new CipherRequest(cipher);
+      const request = new CipherRequest({ cipher, encryptedFor });
       response = await this.apiService.putCipherAdmin(cipher.id, request);
       const data = new CipherData(response, cipher.collectionIds);
       return new Cipher(data, cipher.localData);
     } else if (cipher.edit) {
-      const request = new CipherRequest(cipher);
+      const request = new CipherRequest({ cipher, encryptedFor });
       response = await this.apiService.putCipher(cipher.id, request);
     } else {
       const request = new CipherPartialRequest(cipher);
@@ -846,7 +837,7 @@ export class CipherService implements CipherServiceAbstraction {
     organizationId: string,
     collectionIds: string[],
     userId: UserId,
-  ): Promise<any> {
+  ) {
     const promises: Promise<any>[] = [];
     const encCiphers: Cipher[] = [];
     for (const cipher of ciphers) {
@@ -854,14 +845,23 @@ export class CipherService implements CipherServiceAbstraction {
       cipher.collectionIds = collectionIds;
       promises.push(
         this.encryptSharedCipher(cipher, userId).then((c) => {
-          encCiphers.push(c);
+          encCiphers.push(c.cipher);
         }),
       );
     }
     await Promise.all(promises);
-    const request = new CipherBulkShareRequest(encCiphers, collectionIds);
+    const request = new CipherBulkShareRequest(encCiphers, collectionIds, userId);
     try {
-      await this.apiService.putShareCiphers(request);
+      const response = await this.apiService.putShareCiphers(request);
+      const responseMap = new Map(response.data.map((r) => [r.id, r]));
+
+      encCiphers.forEach((cipher) => {
+        const matchingCipher = responseMap.get(cipher.id);
+        if (matchingCipher) {
+          cipher.revisionDate = new Date(matchingCipher.revisionDate);
+        }
+      });
+      await this.upsert(encCiphers.map((c) => c.toCipherData()));
     } catch (e) {
       for (const cipher of ciphers) {
         cipher.organizationId = null;
@@ -869,7 +869,6 @@ export class CipherService implements CipherServiceAbstraction {
       }
       throw e;
     }
-    await this.upsert(encCiphers.map((c) => c.toCipherData()));
   }
 
   saveAttachmentWithServer(
@@ -921,8 +920,8 @@ export class CipherService implements CipherServiceAbstraction {
     //in order to keep item and it's attachments with the same encryption level
     if (cipher.key != null && !cipherKeyEncryptionEnabled) {
       const model = await this.decrypt(cipher, userId);
-      cipher = await this.encrypt(model, userId);
-      await this.updateWithServer(cipher);
+      const reEncrypted = await this.encrypt(model, userId);
+      await this.updateWithServer(reEncrypted);
     }
 
     const encFileName = await this.encryptService.encryptString(filename, cipherEncKey);
@@ -1337,7 +1336,7 @@ export class CipherService implements CipherServiceAbstraction {
    * No longer using an asAdmin Param. Org Vault bulkRestore will assess if an item is unassigned or editable
    * The Org Vault will pass those ids an array as well as the orgId when calling bulkRestore
    */
-  async restoreManyWithServer(ids: string[], userId: UserId, orgId: string = null): Promise<void> {
+  async restoreManyWithServer(ids: string[], userId: UserId, orgId?: string): Promise<void> {
     let response;
 
     if (orgId) {
@@ -1482,7 +1481,7 @@ export class CipherService implements CipherServiceAbstraction {
 
   // In the case of a cipher that is being shared with an organization, we want to decrypt the
   // cipher key with the user's key and then re-encrypt it with the organization's key.
-  private async encryptSharedCipher(model: CipherView, userId: UserId): Promise<Cipher> {
+  private async encryptSharedCipher(model: CipherView, userId: UserId): Promise<EncryptionContext> {
     const keyForCipherKeyDecryption = await this.keyService.getUserKeyWithLegacySupport(userId);
     return await this.encrypt(model, userId, null, keyForCipherKeyDecryption);
   }
@@ -1584,10 +1583,7 @@ export class CipherService implements CipherServiceAbstraction {
         fd.append(
           "data",
           Buffer.from(encData.buffer) as any,
-          {
-            filepath: encFileName.encryptedString,
-            contentType: "application/octet-stream",
-          } as any,
+          { filepath: encFileName.encryptedString, contentType: "application/octet-stream" } as any,
         );
       } else {
         throw e;
@@ -1649,11 +1645,7 @@ export class CipherService implements CipherServiceAbstraction {
         await this.encryptObjProperty(
           model.login,
           cipher.login,
-          {
-            username: null,
-            password: null,
-            totp: null,
-          },
+          { username: null, password: null, totp: null },
           key,
         );
 
@@ -1663,14 +1655,7 @@ export class CipherService implements CipherServiceAbstraction {
           for (let i = 0; i < model.login.uris.length; i++) {
             const loginUri = new LoginUri();
             loginUri.match = model.login.uris[i].match;
-            await this.encryptObjProperty(
-              model.login.uris[i],
-              loginUri,
-              {
-                uri: null,
-              },
-              key,
-            );
+            await this.encryptObjProperty(model.login.uris[i], loginUri, { uri: null }, key);
             const uriHash = await this.encryptService.hash(model.login.uris[i].uri, "sha256");
             loginUri.uriChecksum = await this.encryptService.encryptString(uriHash, key);
             cipher.login.uris.push(loginUri);
@@ -1766,11 +1751,7 @@ export class CipherService implements CipherServiceAbstraction {
         await this.encryptObjProperty(
           model.sshKey,
           cipher.sshKey,
-          {
-            privateKey: null,
-            publicKey: null,
-            keyFingerprint: null,
-          },
+          { privateKey: null, publicKey: null, keyFingerprint: null },
           key,
         );
         return;
@@ -1855,15 +1836,7 @@ export class CipherService implements CipherServiceAbstraction {
     }
 
     await Promise.all([
-      this.encryptObjProperty(
-        model,
-        cipher,
-        {
-          name: null,
-          notes: null,
-        },
-        key,
-      ),
+      this.encryptObjProperty(model, cipher, { name: null, notes: null }, key),
       this.encryptCipherData(cipher, model, key),
       this.encryptFields(model.fields, key).then((fields) => {
         cipher.fields = fields;
diff --git a/libs/common/src/vault/services/default-cipher-encryption.service.spec.ts b/libs/common/src/vault/services/default-cipher-encryption.service.spec.ts
index c0b3d3be85f..4d05a5197fb 100644
--- a/libs/common/src/vault/services/default-cipher-encryption.service.spec.ts
+++ b/libs/common/src/vault/services/default-cipher-encryption.service.spec.ts
@@ -7,7 +7,7 @@ import {
   CipherType as SdkCipherType,
   CipherView as SdkCipherView,
   CipherListView,
-  Attachment as SdkAttachment,
+  AttachmentView as SdkAttachmentView,
 } from "@bitwarden/sdk-internal";
 
 import { mockEnc } from "../../../spec";
@@ -311,7 +311,9 @@ describe("DefaultCipherEncryptionService", () => {
       const expectedDecryptedContent = new Uint8Array([5, 6, 7, 8]);
 
       jest.spyOn(cipher, "toSdkCipher").mockReturnValue({ id: "id" } as SdkCipher);
-      jest.spyOn(attachment, "toSdkAttachmentView").mockReturnValue({ id: "a1" } as SdkAttachment);
+      jest
+        .spyOn(attachment, "toSdkAttachmentView")
+        .mockReturnValue({ id: "a1" } as SdkAttachmentView);
       mockSdkClient.vault().attachments().decrypt_buffer.mockReturnValue(expectedDecryptedContent);
 
       const result = await cipherEncryptionService.decryptAttachmentContent(
diff --git a/libs/common/src/vault/services/file-upload/cipher-file-upload.service.ts b/libs/common/src/vault/services/file-upload/cipher-file-upload.service.ts
index 4dd2f7f7338..10fa1d9580c 100644
--- a/libs/common/src/vault/services/file-upload/cipher-file-upload.service.ts
+++ b/libs/common/src/vault/services/file-upload/cipher-file-upload.service.ts
@@ -6,7 +6,6 @@ import {
   FileUploadApiMethods,
   FileUploadService,
 } from "../../../platform/abstractions/file-upload/file-upload.service";
-import { Utils } from "../../../platform/misc/utils";
 import { EncArrayBuffer } from "../../../platform/models/domain/enc-array-buffer";
 import { EncString } from "../../../platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
@@ -47,18 +46,7 @@ export class CipherFileUploadService implements CipherFileUploadServiceAbstracti
         this.generateMethods(uploadDataResponse, response, request.adminRequest),
       );
     } catch (e) {
-      if (
-        (e instanceof ErrorResponse && (e as ErrorResponse).statusCode === 404) ||
-        (e as ErrorResponse).statusCode === 405
-      ) {
-        response = await this.legacyServerAttachmentFileUpload(
-          request.adminRequest,
-          cipher.id,
-          encFileName,
-          encData,
-          dataEncKey[1],
-        );
-      } else if (e instanceof ErrorResponse) {
+      if (e instanceof ErrorResponse) {
         throw new Error((e as ErrorResponse).getSingleMessage());
       } else {
         throw e;
@@ -113,50 +101,4 @@ export class CipherFileUploadService implements CipherFileUploadServiceAbstracti
       }
     };
   }
-
-  /**
-   * @deprecated Mar 25 2021: This method has been deprecated in favor of direct uploads.
-   * This method still exists for backward compatibility with old server versions.
-   */
-  async legacyServerAttachmentFileUpload(
-    admin: boolean,
-    cipherId: string,
-    encFileName: EncString,
-    encData: EncArrayBuffer,
-    key: EncString,
-  ) {
-    const fd = new FormData();
-    try {
-      const blob = new Blob([encData.buffer], { type: "application/octet-stream" });
-      fd.append("key", key.encryptedString);
-      fd.append("data", blob, encFileName.encryptedString);
-    } catch (e) {
-      if (Utils.isNode && !Utils.isBrowser) {
-        fd.append("key", key.encryptedString);
-        fd.append(
-          "data",
-          Buffer.from(encData.buffer) as any,
-          {
-            filepath: encFileName.encryptedString,
-            contentType: "application/octet-stream",
-          } as any,
-        );
-      } else {
-        throw e;
-      }
-    }
-
-    let response: CipherResponse;
-    try {
-      if (admin) {
-        response = await this.apiService.postCipherAttachmentAdminLegacy(cipherId, fd);
-      } else {
-        response = await this.apiService.postCipherAttachmentLegacy(cipherId, fd);
-      }
-    } catch (e) {
-      throw new Error((e as ErrorResponse).getSingleMessage());
-    }
-
-    return response;
-  }
 }
diff --git a/libs/common/src/vault/services/restricted-item-types.service.spec.ts b/libs/common/src/vault/services/restricted-item-types.service.spec.ts
new file mode 100644
index 00000000000..9b549665184
--- /dev/null
+++ b/libs/common/src/vault/services/restricted-item-types.service.spec.ts
@@ -0,0 +1,131 @@
+import { mock, MockProxy } from "jest-mock-extended";
+import { firstValueFrom, of } from "rxjs";
+
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { UserId } from "@bitwarden/common/types/guid";
+import { CipherType } from "@bitwarden/common/vault/enums";
+
+import { RestrictedItemTypesService, RestrictedCipherType } from "./restricted-item-types.service";
+
+describe("RestrictedItemTypesService", () => {
+  let service: RestrictedItemTypesService;
+  let policyService: MockProxy<PolicyService>;
+  let organizationService: MockProxy<OrganizationService>;
+  let accountService: MockProxy<AccountService>;
+  let configService: MockProxy<ConfigService>;
+  let fakeAccount: Account | null;
+
+  const org1: Organization = { id: "org1" } as any;
+  const org2: Organization = { id: "org2" } as any;
+
+  const policyOrg1 = {
+    organizationId: "org1",
+    type: PolicyType.RestrictedItemTypes,
+    enabled: true,
+    data: [CipherType.Card],
+  } as Policy;
+
+  const policyOrg2 = {
+    organizationId: "org2",
+    type: PolicyType.RestrictedItemTypes,
+    enabled: true,
+    data: [CipherType.Card],
+  } as Policy;
+
+  beforeEach(() => {
+    policyService = mock<PolicyService>();
+    organizationService = mock<OrganizationService>();
+    accountService = mock<AccountService>();
+    configService = mock<ConfigService>();
+
+    fakeAccount = { id: Utils.newGuid() as UserId } as Account;
+    accountService.activeAccount$ = of(fakeAccount);
+
+    configService.getFeatureFlag$.mockReturnValue(of(true));
+    organizationService.organizations$.mockReturnValue(of([org1, org2]));
+    policyService.policiesByType$.mockReturnValue(of([]));
+
+    service = new RestrictedItemTypesService(
+      configService,
+      accountService,
+      organizationService,
+      policyService,
+    );
+  });
+
+  it("emits empty array when feature flag is disabled", async () => {
+    configService.getFeatureFlag$.mockReturnValue(of(false));
+
+    const result = await firstValueFrom(service.restricted$);
+    expect(result).toEqual([]);
+  });
+
+  it("emits empty array if no organizations exist", async () => {
+    organizationService.organizations$.mockReturnValue(of([]));
+    policyService.policiesByType$.mockReturnValue(of([]));
+
+    const result = await firstValueFrom(service.restricted$);
+    expect(result).toEqual([]);
+  });
+
+  it("defaults undefined data to [Card] and returns empty allowViewOrgIds", async () => {
+    organizationService.organizations$.mockReturnValue(of([org1]));
+
+    const policyForOrg1 = {
+      organizationId: "org1",
+      type: PolicyType.RestrictedItemTypes,
+      enabled: true,
+      data: undefined,
+    } as Policy;
+    policyService.policiesByType$.mockReturnValue(of([policyForOrg1]));
+
+    const result = await firstValueFrom(service.restricted$);
+    expect(result).toEqual<RestrictedCipherType[]>([
+      { cipherType: CipherType.Card, allowViewOrgIds: [] },
+    ]);
+  });
+
+  it("if one org restricts Card and another has no policy, allowViewOrgIds contains the unrestricted org", async () => {
+    policyService.policiesByType$.mockReturnValue(of([policyOrg1]));
+
+    const result = await firstValueFrom(service.restricted$);
+    expect(result).toEqual<RestrictedCipherType[]>([
+      { cipherType: CipherType.Card, allowViewOrgIds: ["org2"] },
+    ]);
+  });
+
+  it("returns empty allowViewOrgIds when all orgs restrict the same type", async () => {
+    organizationService.organizations$.mockReturnValue(of([org1, org2]));
+    policyService.policiesByType$.mockReturnValue(of([policyOrg1, policyOrg2]));
+
+    const result = await firstValueFrom(service.restricted$);
+    expect(result).toEqual<RestrictedCipherType[]>([
+      { cipherType: CipherType.Card, allowViewOrgIds: [] },
+    ]);
+  });
+
+  it("aggregates multiple types and computes allowViewOrgIds correctly", async () => {
+    organizationService.organizations$.mockReturnValue(of([org1, org2]));
+    policyService.policiesByType$.mockReturnValue(
+      of([
+        { ...policyOrg1, data: [CipherType.Card, CipherType.Login] } as Policy,
+        { ...policyOrg2, data: [CipherType.Card, CipherType.Identity] } as Policy,
+      ]),
+    );
+
+    const result = await firstValueFrom(service.restricted$);
+
+    expect(result).toEqual<RestrictedCipherType[]>([
+      { cipherType: CipherType.Card, allowViewOrgIds: [] },
+      { cipherType: CipherType.Login, allowViewOrgIds: ["org2"] },
+      { cipherType: CipherType.Identity, allowViewOrgIds: ["org1"] },
+    ]);
+  });
+});
diff --git a/libs/common/src/vault/services/restricted-item-types.service.ts b/libs/common/src/vault/services/restricted-item-types.service.ts
new file mode 100644
index 00000000000..6b848e6626b
--- /dev/null
+++ b/libs/common/src/vault/services/restricted-item-types.service.ts
@@ -0,0 +1,125 @@
+import { combineLatest, map, of, Observable } from "rxjs";
+import { switchMap, distinctUntilChanged, shareReplay } from "rxjs/operators";
+
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+
+import { Cipher } from "../models/domain/cipher";
+
+export type RestrictedCipherType = {
+  cipherType: CipherType;
+  allowViewOrgIds: string[];
+};
+
+type CipherLike = Cipher | CipherView;
+
+export class RestrictedItemTypesService {
+  /**
+   * Emits an array of RestrictedCipherType objects:
+   * - cipherType: each type restricted by at least one org-level policy
+   * - allowViewOrgIds: org IDs that allow viewing that type
+   */
+  readonly restricted$: Observable<RestrictedCipherType[]> = this.configService
+    .getFeatureFlag$(FeatureFlag.RemoveCardItemTypePolicy)
+    .pipe(
+      switchMap((flagOn) => {
+        if (!flagOn) {
+          return of([]);
+        }
+        return this.accountService.activeAccount$.pipe(
+          getUserId,
+          switchMap((userId) =>
+            combineLatest([
+              this.organizationService.organizations$(userId),
+              this.policyService.policiesByType$(PolicyType.RestrictedItemTypes, userId),
+            ]),
+          ),
+          map(([orgs, enabledPolicies]) => {
+            // Helper to extract restricted types, defaulting to [Card]
+            const restrictedTypes = (p: (typeof enabledPolicies)[number]) =>
+              (p.data as CipherType[]) ?? [CipherType.Card];
+
+            // Union across all enabled policies
+            const allRestrictedTypes = Array.from(
+              new Set(enabledPolicies.flatMap(restrictedTypes)),
+            );
+
+            return allRestrictedTypes.map((cipherType) => {
+              // Determine which orgs allow viewing this type
+              const allowViewOrgIds = orgs
+                .filter((org) => {
+                  const orgPolicy = enabledPolicies.find((p) => p.organizationId === org.id);
+                  // no policy for this org => allows everything
+                  if (!orgPolicy) {
+                    return true;
+                  }
+                  // if this type not in their restricted list => they allow it
+                  return !restrictedTypes(orgPolicy).includes(cipherType);
+                })
+                .map((org) => org.id);
+
+              return { cipherType, allowViewOrgIds };
+            });
+          }),
+        );
+      }),
+      distinctUntilChanged(),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
+
+  constructor(
+    private configService: ConfigService,
+    private accountService: AccountService,
+    private organizationService: OrganizationService,
+    private policyService: PolicyService,
+  ) {}
+
+  /**
+   * Determines if a cipher is restricted from being viewed by the user.
+   *
+   * @param cipher - The cipher to check
+   * @param restrictedTypes - Array of restricted cipher types (from restricted$ observable)
+   * @returns true if the cipher is restricted, false otherwise
+   *
+   * Restriction logic:
+   * - If cipher type is not restricted by any org → allowed
+   * - If cipher belongs to an org that allows this type → allowed
+   * - Otherwise → restricted
+   */
+  isCipherRestricted(cipher: CipherLike, restrictedTypes: RestrictedCipherType[]): boolean {
+    const restriction = restrictedTypes.find((r) => r.cipherType === cipher.type);
+
+    // If cipher type is not restricted by any organization, allow it
+    if (!restriction) {
+      return false;
+    }
+
+    // If cipher belongs to an organization
+    if (cipher.organizationId) {
+      // Check if this organization allows viewing this cipher type
+      return !restriction.allowViewOrgIds.includes(cipher.organizationId);
+    }
+
+    // Cipher is restricted by at least one organization, restrict it
+    return true;
+  }
+
+  /**
+   * Convenience method that combines getting restrictions and checking a cipher.
+   *
+   * @param cipher - The cipher to check
+   * @returns Observable<boolean> indicating if the cipher is restricted
+   */
+  isCipherRestricted$(cipher: CipherLike): Observable<boolean> {
+    return this.restricted$.pipe(
+      map((restrictedTypes) => this.isCipherRestricted(cipher, restrictedTypes)),
+    );
+  }
+}
diff --git a/libs/common/src/services/search.service.ts b/libs/common/src/vault/services/search.service.ts
similarity index 96%
rename from libs/common/src/services/search.service.ts
rename to libs/common/src/vault/services/search.service.ts
index 3e6a070195a..4b7a26b6a31 100644
--- a/libs/common/src/services/search.service.ts
+++ b/libs/common/src/vault/services/search.service.ts
@@ -4,21 +4,21 @@ import * as lunr from "lunr";
 import { Observable, firstValueFrom, map } from "rxjs";
 import { Jsonify } from "type-fest";
 
-import { SearchService as SearchServiceAbstraction } from "../abstractions/search.service";
-import { UriMatchStrategy } from "../models/domain/domain-service";
-import { I18nService } from "../platform/abstractions/i18n.service";
-import { LogService } from "../platform/abstractions/log.service";
+import { UriMatchStrategy } from "../../models/domain/domain-service";
+import { I18nService } from "../../platform/abstractions/i18n.service";
+import { LogService } from "../../platform/abstractions/log.service";
 import {
   SingleUserState,
   StateProvider,
   UserKeyDefinition,
   VAULT_SEARCH_MEMORY,
-} from "../platform/state";
-import { SendView } from "../tools/send/models/view/send.view";
-import { IndexedEntityId, UserId } from "../types/guid";
-import { FieldType } from "../vault/enums";
-import { CipherType } from "../vault/enums/cipher-type";
-import { CipherView } from "../vault/models/view/cipher.view";
+} from "../../platform/state";
+import { SendView } from "../../tools/send/models/view/send.view";
+import { IndexedEntityId, UserId } from "../../types/guid";
+import { SearchService as SearchServiceAbstraction } from "../abstractions/search.service";
+import { FieldType } from "../enums";
+import { CipherType } from "../enums/cipher-type";
+import { CipherView } from "../models/view/cipher.view";
 
 export type SerializedLunrIndex = {
   version: string;
diff --git a/libs/common/src/vault/services/vault-settings/vault-settings.service.ts b/libs/common/src/vault/services/vault-settings/vault-settings.service.ts
index 423acba8fff..28671a94cc9 100644
--- a/libs/common/src/vault/services/vault-settings/vault-settings.service.ts
+++ b/libs/common/src/vault/services/vault-settings/vault-settings.service.ts
@@ -1,13 +1,15 @@
-import { Observable, map, shareReplay } from "rxjs";
+import { Observable, combineLatest, map, shareReplay, startWith } from "rxjs";
 
 import { ActiveUserState, GlobalState, StateProvider } from "../../../platform/state";
 import { VaultSettingsService as VaultSettingsServiceAbstraction } from "../../abstractions/vault-settings/vault-settings.service";
+import { CipherType } from "../../enums";
 import {
   SHOW_CARDS_CURRENT_TAB,
   SHOW_IDENTITIES_CURRENT_TAB,
   USER_ENABLE_PASSKEYS,
   CLICK_ITEMS_AUTOFILL_VAULT_VIEW,
 } from "../key-state/vault-settings.state";
+import { RestrictedItemTypesService } from "../restricted-item-types.service";
 
 /**
  * {@link VaultSettingsServiceAbstraction}
@@ -27,8 +29,15 @@ export class VaultSettingsService implements VaultSettingsServiceAbstraction {
   /**
    * {@link VaultSettingsServiceAbstraction.showCardsCurrentTab$}
    */
-  readonly showCardsCurrentTab$: Observable<boolean> = this.showCardsCurrentTabState.state$.pipe(
-    map((x) => x ?? true),
+  readonly showCardsCurrentTab$: Observable<boolean> = combineLatest([
+    this.showCardsCurrentTabState.state$.pipe(map((x) => x ?? true)),
+    this.restrictedItemTypesService.restricted$.pipe(startWith([])),
+  ]).pipe(
+    map(
+      ([enabled, restrictions]) =>
+        // If enabled, show cards tab unless card type is restricted
+        enabled && !restrictions.some((r) => r.cipherType === CipherType.Card),
+    ),
   );
 
   private showIdentitiesCurrentTabState: ActiveUserState<boolean> = this.stateProvider.getActive(
@@ -51,7 +60,10 @@ export class VaultSettingsService implements VaultSettingsServiceAbstraction {
       shareReplay({ bufferSize: 1, refCount: false }),
     );
 
-  constructor(private stateProvider: StateProvider) {}
+  constructor(
+    private stateProvider: StateProvider,
+    private restrictedItemTypesService: RestrictedItemTypesService,
+  ) {}
 
   /**
    * {@link VaultSettingsServiceAbstraction.setShowCardsCurrentTab}
diff --git a/libs/common/src/vault/tasks/enums/security-task-status.enum.ts b/libs/common/src/vault/tasks/enums/security-task-status.enum.ts
index c8c26266e66..44cb33bf65d 100644
--- a/libs/common/src/vault/tasks/enums/security-task-status.enum.ts
+++ b/libs/common/src/vault/tasks/enums/security-task-status.enum.ts
@@ -1,13 +1,15 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum SecurityTaskStatus {
+import { UnionOfValues } from "../../types/union-of-values";
+
+export const SecurityTaskStatus = {
   /**
    * Default status for newly created tasks that have not been completed.
    */
-  Pending = 0,
+  Pending: 0,
 
   /**
    * Status when a task is considered complete and has no remaining actions
    */
-  Completed = 1,
-}
+  Completed: 1,
+} as const;
+
+export type SecurityTaskStatus = UnionOfValues<typeof SecurityTaskStatus>;
diff --git a/libs/common/src/vault/tasks/enums/security-task-type.enum.ts b/libs/common/src/vault/tasks/enums/security-task-type.enum.ts
index 79a2d23c8b3..36a3982c431 100644
--- a/libs/common/src/vault/tasks/enums/security-task-type.enum.ts
+++ b/libs/common/src/vault/tasks/enums/security-task-type.enum.ts
@@ -1,8 +1,10 @@
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum SecurityTaskType {
+import { UnionOfValues } from "../../types/union-of-values";
+
+export const SecurityTaskType = {
   /**
    * Task to update a cipher's password that was found to be at-risk by an administrator
    */
-  UpdateAtRiskCredential = 0,
-}
+  UpdateAtRiskCredential: 0,
+} as const;
+
+export type SecurityTaskType = UnionOfValues<typeof SecurityTaskType>;
diff --git a/libs/common/src/vault/tasks/services/default-task.service.spec.ts b/libs/common/src/vault/tasks/services/default-task.service.spec.ts
index cb22d1296ba..a1f9872266e 100644
--- a/libs/common/src/vault/tasks/services/default-task.service.spec.ts
+++ b/libs/common/src/vault/tasks/services/default-task.service.spec.ts
@@ -7,7 +7,6 @@ import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { NotificationType } from "@bitwarden/common/enums";
 import { NotificationResponse } from "@bitwarden/common/models/response/notification.response";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { Message, MessageListener } from "@bitwarden/common/platform/messaging";
 import { NotificationsService } from "@bitwarden/common/platform/notifications";
 import { SecurityTaskId, UserId } from "@bitwarden/common/types/guid";
@@ -25,7 +24,6 @@ describe("Default task service", () => {
   const userId = "user-id" as UserId;
   const mockApiSend = jest.fn();
   const mockGetAllOrgs$ = jest.fn();
-  const mockGetFeatureFlag$ = jest.fn();
   const mockAuthStatuses$ = new BehaviorSubject<Record<UserId, AuthenticationStatus>>({});
   const mockNotifications$ = new Subject<readonly [NotificationResponse, UserId]>();
   const mockMessages$ = new Subject<Message<Record<string, unknown>>>();
@@ -34,14 +32,12 @@ describe("Default task service", () => {
   beforeEach(async () => {
     mockApiSend.mockClear();
     mockGetAllOrgs$.mockClear();
-    mockGetFeatureFlag$.mockClear();
 
     fakeStateProvider = new FakeStateProvider(mockAccountServiceWith(userId));
     service = new DefaultTaskService(
       fakeStateProvider,
       { send: mockApiSend } as unknown as ApiService,
       { organizations$: mockGetAllOrgs$ } as unknown as OrganizationService,
-      { getFeatureFlag$: mockGetFeatureFlag$ } as unknown as ConfigService,
       { authStatuses$: mockAuthStatuses$.asObservable() } as unknown as AuthService,
       { notifications$: mockNotifications$.asObservable() } as unknown as NotificationsService,
       { allMessages$: mockMessages$.asObservable() } as unknown as MessageListener,
@@ -50,7 +46,6 @@ describe("Default task service", () => {
 
   describe("tasksEnabled$", () => {
     it("should emit true if any organization uses risk insights", async () => {
-      mockGetFeatureFlag$.mockReturnValue(new BehaviorSubject(true));
       mockGetAllOrgs$.mockReturnValue(
         new BehaviorSubject([
           {
@@ -70,7 +65,6 @@ describe("Default task service", () => {
     });
 
     it("should emit false if no organization uses risk insights", async () => {
-      mockGetFeatureFlag$.mockReturnValue(new BehaviorSubject(true));
       mockGetAllOrgs$.mockReturnValue(
         new BehaviorSubject([
           {
@@ -88,28 +82,10 @@ describe("Default task service", () => {
 
       expect(result).toBe(false);
     });
-
-    it("should emit false if the feature flag is off", async () => {
-      mockGetFeatureFlag$.mockReturnValue(new BehaviorSubject(false));
-      mockGetAllOrgs$.mockReturnValue(
-        new BehaviorSubject([
-          {
-            useRiskInsights: true,
-          },
-        ] as Organization[]),
-      );
-
-      const { tasksEnabled$ } = service;
-
-      const result = await firstValueFrom(tasksEnabled$("user-id" as UserId));
-
-      expect(result).toBe(false);
-    });
   });
 
   describe("tasks$", () => {
     beforeEach(() => {
-      mockGetFeatureFlag$.mockReturnValue(new BehaviorSubject(true));
       mockGetAllOrgs$.mockReturnValue(
         new BehaviorSubject([
           {
@@ -182,7 +158,6 @@ describe("Default task service", () => {
 
   describe("pendingTasks$", () => {
     beforeEach(() => {
-      mockGetFeatureFlag$.mockReturnValue(new BehaviorSubject(true));
       mockGetAllOrgs$.mockReturnValue(
         new BehaviorSubject([
           {
@@ -390,7 +365,7 @@ describe("Default task service", () => {
         const subscription = service.listenForTaskNotifications();
 
         const notification = {
-          type: NotificationType.PendingSecurityTasks,
+          type: NotificationType.RefreshSecurityTasks,
         } as NotificationResponse;
         mockNotifications$.next([notification, userId]);
 
@@ -415,7 +390,7 @@ describe("Default task service", () => {
         const subscription = service.listenForTaskNotifications();
 
         const notification = {
-          type: NotificationType.PendingSecurityTasks,
+          type: NotificationType.RefreshSecurityTasks,
         } as NotificationResponse;
         mockNotifications$.next([notification, "other-user-id" as UserId]);
 
diff --git a/libs/common/src/vault/tasks/services/default-task.service.ts b/libs/common/src/vault/tasks/services/default-task.service.ts
index a50f736f7fd..35a7561d63d 100644
--- a/libs/common/src/vault/tasks/services/default-task.service.ts
+++ b/libs/common/src/vault/tasks/services/default-task.service.ts
@@ -15,9 +15,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { NotificationType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { MessageListener } from "@bitwarden/common/platform/messaging";
 import { NotificationsService } from "@bitwarden/common/platform/notifications";
 import { StateProvider } from "@bitwarden/common/platform/state";
@@ -43,20 +41,14 @@ export class DefaultTaskService implements TaskService {
     private stateProvider: StateProvider,
     private apiService: ApiService,
     private organizationService: OrganizationService,
-    private configService: ConfigService,
     private authService: AuthService,
     private notificationService: NotificationsService,
     private messageListener: MessageListener,
   ) {}
 
   tasksEnabled$ = perUserCache$((userId) => {
-    return combineLatest([
-      this.organizationService
-        .organizations$(userId)
-        .pipe(map((orgs) => orgs.some((o) => o.useRiskInsights))),
-      this.configService.getFeatureFlag$(FeatureFlag.SecurityTasks),
-    ]).pipe(
-      map(([atLeastOneOrgEnabled, flagEnabled]) => atLeastOneOrgEnabled && flagEnabled),
+    return this.organizationService.organizations$(userId).pipe(
+      map((orgs) => orgs.some((o) => o.useRiskInsights)),
       distinctUntilChanged(),
     );
   });
@@ -160,7 +152,7 @@ export class DefaultTaskService implements TaskService {
     return this.notificationService.notifications$.pipe(
       filter(
         ([notification, userId]) =>
-          notification.type === NotificationType.PendingSecurityTasks &&
+          notification.type === NotificationType.RefreshSecurityTasks &&
           filterByUserIds.includes(userId),
       ),
       map(([, userId]) => userId),
diff --git a/libs/common/src/vault/types/cipher-menu-items.ts b/libs/common/src/vault/types/cipher-menu-items.ts
new file mode 100644
index 00000000000..7108d0d0bd6
--- /dev/null
+++ b/libs/common/src/vault/types/cipher-menu-items.ts
@@ -0,0 +1,24 @@
+import { CipherType } from "../enums";
+
+/**
+ * Represents a menu item for creating a new cipher of a specific type
+ */
+export type CipherMenuItem = {
+  /** The cipher type this menu item represents */
+  type: CipherType;
+  /** The icon class name (e.g., "bwi-globe") */
+  icon: string;
+  /** The i18n key for the label text */
+  labelKey: string;
+};
+
+/**
+ * All available cipher menu items with their associated icons and labels
+ */
+export const CIPHER_MENU_ITEMS = Object.freeze([
+  { type: CipherType.Login, icon: "bwi-globe", labelKey: "typeLogin" },
+  { type: CipherType.Card, icon: "bwi-credit-card", labelKey: "typeCard" },
+  { type: CipherType.Identity, icon: "bwi-id-card", labelKey: "typeIdentity" },
+  { type: CipherType.SecureNote, icon: "bwi-sticky-note", labelKey: "typeNote" },
+  { type: CipherType.SshKey, icon: "bwi-key", labelKey: "typeSshKey" },
+] as const) satisfies readonly CipherMenuItem[];
diff --git a/libs/common/src/vault/types/union-of-values.ts b/libs/common/src/vault/types/union-of-values.ts
new file mode 100644
index 00000000000..e7c721652e8
--- /dev/null
+++ b/libs/common/src/vault/types/union-of-values.ts
@@ -0,0 +1,2 @@
+/** Creates a union type consisting of all values within the record. */
+export type UnionOfValues<T extends Record<string, unknown>> = T[keyof T];
diff --git a/libs/common/src/vault/utils/get-web-store-url.ts b/libs/common/src/vault/utils/get-web-store-url.ts
new file mode 100644
index 00000000000..87698d65de2
--- /dev/null
+++ b/libs/common/src/vault/utils/get-web-store-url.ts
@@ -0,0 +1,22 @@
+import { DeviceType } from "@bitwarden/common/enums";
+
+/**
+ *  Returns the web store URL for the Bitwarden browser extension based on the device type.
+ *  @defaults Bitwarden download page
+ */
+export const getWebStoreUrl = (deviceType: DeviceType): string => {
+  switch (deviceType) {
+    case DeviceType.ChromeBrowser:
+      return "https://chromewebstore.google.com/detail/bitwarden-password-manage/nngceckbapebfimnlniiiahkandclblb";
+    case DeviceType.FirefoxBrowser:
+      return "https://addons.mozilla.org/en-US/firefox/addon/bitwarden-password-manager/";
+    case DeviceType.SafariBrowser:
+      return "https://apps.apple.com/us/app/bitwarden/id1352778147?mt=12";
+    case DeviceType.OperaBrowser:
+      return "https://addons.opera.com/extensions/details/bitwarden-free-password-manager/";
+    case DeviceType.EdgeBrowser:
+      return "https://microsoftedge.microsoft.com/addons/detail/jbkfoedolllekgbhcbcoahefnbanhhlh";
+    default:
+      return "https://bitwarden.com/download/#downloads-web-browser";
+  }
+};
diff --git a/libs/common/tsconfig.json b/libs/common/tsconfig.json
index 03f66196a30..1d81cc8c221 100644
--- a/libs/common/tsconfig.json
+++ b/libs/common/tsconfig.json
@@ -1,15 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      // TODO: Remove once circular dependencies in admin-console, auth and key-management are resolved
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
   "include": ["src", "spec", "./custom-matchers.d.ts", "../key-management/src/index.ts"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/common/tsconfig.spec.json b/libs/common/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/libs/common/tsconfig.spec.json
+++ b/libs/common/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/libs/components/jest.config.js b/libs/components/jest.config.js
index 2f4b1ed15d4..4310480dd29 100644
--- a/libs/components/jest.config.js
+++ b/libs/components/jest.config.js
@@ -1,16 +1,15 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../../tsconfig.base");
 
-const sharedConfig = require("../../libs/shared/jest.config.angular");
+const sharedConfig = require("../shared/jest.config.angular");
 
 /** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
   displayName: "libs/components tests",
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
+    prefix: "<rootDir>/../../",
   }),
 };
diff --git a/libs/components/src/a11y/a11y-cell.directive.ts b/libs/components/src/a11y/a11y-cell.directive.ts
index c9a8fdda255..3a2d5c4f6b2 100644
--- a/libs/components/src/a11y/a11y-cell.directive.ts
+++ b/libs/components/src/a11y/a11y-cell.directive.ts
@@ -6,7 +6,6 @@ import { FocusableElement } from "../shared/focusable-element";
 
 @Directive({
   selector: "bitA11yCell",
-  standalone: true,
   providers: [{ provide: FocusableElement, useExisting: A11yCellDirective }],
 })
 export class A11yCellDirective implements FocusableElement {
diff --git a/libs/components/src/a11y/a11y-grid.directive.ts b/libs/components/src/a11y/a11y-grid.directive.ts
index ef7ba68b65c..c061464239e 100644
--- a/libs/components/src/a11y/a11y-grid.directive.ts
+++ b/libs/components/src/a11y/a11y-grid.directive.ts
@@ -15,7 +15,6 @@ import { A11yRowDirective } from "./a11y-row.directive";
 
 @Directive({
   selector: "bitA11yGrid",
-  standalone: true,
 })
 export class A11yGridDirective implements AfterViewInit {
   @HostBinding("attr.role")
diff --git a/libs/components/src/a11y/a11y-row.directive.ts b/libs/components/src/a11y/a11y-row.directive.ts
index 7e0431d17e2..f7588dc0053 100644
--- a/libs/components/src/a11y/a11y-row.directive.ts
+++ b/libs/components/src/a11y/a11y-row.directive.ts
@@ -13,7 +13,6 @@ import { A11yCellDirective } from "./a11y-cell.directive";
 
 @Directive({
   selector: "bitA11yRow",
-  standalone: true,
 })
 export class A11yRowDirective implements AfterViewInit {
   @HostBinding("attr.role")
diff --git a/libs/components/src/a11y/a11y-title.directive.ts b/libs/components/src/a11y/a11y-title.directive.ts
index c3833f42ed2..f5f016b93c0 100644
--- a/libs/components/src/a11y/a11y-title.directive.ts
+++ b/libs/components/src/a11y/a11y-title.directive.ts
@@ -4,7 +4,6 @@ import { Directive, ElementRef, Input, OnInit, Renderer2 } from "@angular/core";
 
 @Directive({
   selector: "[appA11yTitle]",
-  standalone: true,
 })
 export class A11yTitleDirective implements OnInit {
   @Input() set appA11yTitle(title: string) {
diff --git a/libs/auth/src/angular/anon-layout/anon-layout-wrapper-data.service.ts b/libs/components/src/anon-layout/anon-layout-wrapper-data.service.ts
similarity index 100%
rename from libs/auth/src/angular/anon-layout/anon-layout-wrapper-data.service.ts
rename to libs/components/src/anon-layout/anon-layout-wrapper-data.service.ts
diff --git a/libs/auth/src/angular/anon-layout/anon-layout-wrapper.component.html b/libs/components/src/anon-layout/anon-layout-wrapper.component.html
similarity index 85%
rename from libs/auth/src/angular/anon-layout/anon-layout-wrapper.component.html
rename to libs/components/src/anon-layout/anon-layout-wrapper.component.html
index 95b1e6cadfe..3509e4dcdb0 100644
--- a/libs/auth/src/angular/anon-layout/anon-layout-wrapper.component.html
+++ b/libs/components/src/anon-layout/anon-layout-wrapper.component.html
@@ -4,7 +4,8 @@
   [icon]="pageIcon"
   [showReadonlyHostname]="showReadonlyHostname"
   [maxWidth]="maxWidth"
-  [titleAreaMaxWidth]="titleAreaMaxWidth"
+  [hideCardWrapper]="hideCardWrapper"
+  [hideIcon]="hideIcon"
 >
   <router-outlet></router-outlet>
   <router-outlet slot="secondary" name="secondary"></router-outlet>
diff --git a/libs/auth/src/angular/anon-layout/anon-layout-wrapper.component.ts b/libs/components/src/anon-layout/anon-layout-wrapper.component.ts
similarity index 86%
rename from libs/auth/src/angular/anon-layout/anon-layout-wrapper.component.ts
rename to libs/components/src/anon-layout/anon-layout-wrapper.component.ts
index 17f5ec8e3c6..a55e66845f6 100644
--- a/libs/auth/src/angular/anon-layout/anon-layout-wrapper.component.ts
+++ b/libs/components/src/anon-layout/anon-layout-wrapper.component.ts
@@ -4,13 +4,13 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute, Data, NavigationEnd, Router, RouterModule } from "@angular/router";
 import { Subject, filter, switchMap, takeUntil, tap } from "rxjs";
 
-import { AnonLayoutComponent } from "@bitwarden/auth/angular";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { Icon, Translation } from "@bitwarden/components";
+
+import { Translation } from "../dialog";
+import { Icon } from "../icon";
 
 import { AnonLayoutWrapperDataService } from "./anon-layout-wrapper-data.service";
+import { AnonLayoutComponent, AnonLayoutMaxWidth } from "./anon-layout.component";
 
 export interface AnonLayoutWrapperData {
   /**
@@ -29,6 +29,10 @@ export interface AnonLayoutWrapperData {
    * The optional icon to display on the page.
    */
   pageIcon?: Icon | null;
+  /**
+   * Hides the default Bitwarden shield icon.
+   */
+  hideIcon?: boolean;
   /**
    * Optional flag to either show the optional environment selector (false) or just a readonly hostname (true).
    */
@@ -36,15 +40,14 @@ export interface AnonLayoutWrapperData {
   /**
    * Optional flag to set the max-width of the page. Defaults to 'md' if not provided.
    */
-  maxWidth?: "md" | "3xl";
+  maxWidth?: AnonLayoutMaxWidth;
   /**
-   * Optional flag to set the max-width of the title area. Defaults to null if not provided.
+   * Hide the card that wraps the default content. Defaults to false.
    */
-  titleAreaMaxWidth?: "md";
+  hideCardWrapper?: boolean;
 }
 
 @Component({
-  standalone: true,
   templateUrl: "anon-layout-wrapper.component.html",
   imports: [AnonLayoutComponent, RouterModule],
 })
@@ -55,8 +58,9 @@ export class AnonLayoutWrapperComponent implements OnInit, OnDestroy {
   protected pageSubtitle: string;
   protected pageIcon: Icon;
   protected showReadonlyHostname: boolean;
-  protected maxWidth: "md" | "3xl";
-  protected titleAreaMaxWidth: "md";
+  protected maxWidth: AnonLayoutMaxWidth;
+  protected hideCardWrapper: boolean;
+  protected hideIcon: boolean = false;
 
   constructor(
     private router: Router,
@@ -105,9 +109,13 @@ export class AnonLayoutWrapperComponent implements OnInit, OnDestroy {
       this.pageIcon = firstChildRouteData["pageIcon"];
     }
 
+    if (firstChildRouteData["hideIcon"] !== undefined) {
+      this.hideIcon = firstChildRouteData["hideIcon"];
+    }
+
     this.showReadonlyHostname = Boolean(firstChildRouteData["showReadonlyHostname"]);
     this.maxWidth = firstChildRouteData["maxWidth"];
-    this.titleAreaMaxWidth = firstChildRouteData["titleAreaMaxWidth"];
+    this.hideCardWrapper = Boolean(firstChildRouteData["hideCardWrapper"]);
   }
 
   private listenForServiceDataChanges() {
@@ -144,6 +152,10 @@ export class AnonLayoutWrapperComponent implements OnInit, OnDestroy {
       this.showReadonlyHostname = data.showReadonlyHostname;
     }
 
+    if (data.hideCardWrapper !== undefined) {
+      this.hideCardWrapper = data.hideCardWrapper;
+    }
+
     // Manually fire change detection to avoid ExpressionChangedAfterItHasBeenCheckedError
     // when setting the page data from a service
     this.changeDetectorRef.detectChanges();
@@ -165,7 +177,8 @@ export class AnonLayoutWrapperComponent implements OnInit, OnDestroy {
     this.pageIcon = null;
     this.showReadonlyHostname = null;
     this.maxWidth = null;
-    this.titleAreaMaxWidth = null;
+    this.hideCardWrapper = null;
+    this.hideIcon = null;
   }
 
   ngOnDestroy() {
diff --git a/libs/auth/src/angular/anon-layout/anon-layout-wrapper.mdx b/libs/components/src/anon-layout/anon-layout-wrapper.mdx
similarity index 100%
rename from libs/auth/src/angular/anon-layout/anon-layout-wrapper.mdx
rename to libs/components/src/anon-layout/anon-layout-wrapper.mdx
diff --git a/libs/auth/src/angular/anon-layout/anon-layout-wrapper.stories.ts b/libs/components/src/anon-layout/anon-layout-wrapper.stories.ts
similarity index 87%
rename from libs/auth/src/angular/anon-layout/anon-layout-wrapper.stories.ts
rename to libs/components/src/anon-layout/anon-layout-wrapper.stories.ts
index f106f9ee0dc..4de7952344b 100644
--- a/libs/auth/src/angular/anon-layout/anon-layout-wrapper.stories.ts
+++ b/libs/components/src/anon-layout/anon-layout-wrapper.stories.ts
@@ -14,24 +14,19 @@ import {
   EnvironmentService,
   Environment,
 } from "@bitwarden/common/platform/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { ButtonModule } from "@bitwarden/components";
 
-// FIXME: remove `/apps` import from `/libs`
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line import/no-restricted-paths, no-restricted-imports
-import { PreloadedEnglishI18nModule } from "../../../../../apps/web/src/app/core/tests";
-import { LockIcon } from "../icons";
-import { RegistrationCheckEmailIcon } from "../icons/registration-check-email.icon";
+import { ButtonModule } from "../button";
+import { LockIcon, RegistrationCheckEmailIcon } from "../icon/icons";
+import { I18nMockService } from "../utils";
 
 import { AnonLayoutWrapperDataService } from "./anon-layout-wrapper-data.service";
 import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "./anon-layout-wrapper.component";
 import { DefaultAnonLayoutWrapperDataService } from "./default-anon-layout-wrapper-data.service";
 
 export default {
-  title: "Auth/Anon Layout Wrapper",
+  title: "Component Library/Anon Layout Wrapper",
   component: AnonLayoutWrapperComponent,
 } as Meta;
 
@@ -84,13 +79,22 @@ const decorators = (options: {
             getClientType: () => options.clientType || ClientType.Web,
           } as Partial<PlatformUtilsService>,
         },
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              setAStrongPassword: "Set a strong password",
+              appLogoLabel: "app logo label",
+              finishCreatingYourAccountBySettingAPassword:
+                "Finish creating your account by setting a password",
+              enterpriseSingleSignOn: "Enterprise Single Sign-On",
+            });
+          },
+        },
       ],
     }),
     applicationConfig({
-      providers: [
-        importProvidersFrom(RouterModule.forRoot(options.routes)),
-        importProvidersFrom(PreloadedEnglishI18nModule),
-      ],
+      providers: [importProvidersFrom(RouterModule.forRoot(options.routes))],
     }),
   ];
 };
@@ -102,18 +106,21 @@ type Story = StoryObj<AnonLayoutWrapperComponent>;
 @Component({
   selector: "bit-default-primary-outlet-example-component",
   template: "<p>Primary Outlet Example: <br> your primary component goes here</p>",
+  standalone: false,
 })
 export class DefaultPrimaryOutletExampleComponent {}
 
 @Component({
   selector: "bit-default-secondary-outlet-example-component",
   template: "<p>Secondary Outlet Example: <br> your secondary component goes here</p>",
+  standalone: false,
 })
 export class DefaultSecondaryOutletExampleComponent {}
 
 @Component({
   selector: "bit-default-env-selector-outlet-example-component",
   template: "<p>Env Selector Outlet Example: <br> your env selector component goes here</p>",
+  standalone: false,
 })
 export class DefaultEnvSelectorOutletExampleComponent {}
 
@@ -188,6 +195,7 @@ const changedData: AnonLayoutWrapperData = {
   template: `
     <button type="button" bitButton buttonType="primary" (click)="toggleData()">Toggle Data</button>
   `,
+  standalone: false,
 })
 export class DynamicContentExampleComponent {
   initialData = true;
diff --git a/libs/auth/src/angular/anon-layout/anon-layout.component.html b/libs/components/src/anon-layout/anon-layout.component.html
similarity index 65%
rename from libs/auth/src/angular/anon-layout/anon-layout.component.html
rename to libs/components/src/anon-layout/anon-layout.component.html
index 1e16dba82cc..4dfde5e7ef3 100644
--- a/libs/auth/src/angular/anon-layout/anon-layout.component.html
+++ b/libs/components/src/anon-layout/anon-layout.component.html
@@ -13,11 +13,8 @@
     <bit-icon [icon]="logo" [ariaLabel]="'appLogoLabel' | i18n"></bit-icon>
   </a>
 
-  <div
-    class="tw-text-center tw-mb-4 sm:tw-mb-6"
-    [ngClass]="{ 'tw-max-w-md tw-mx-auto': titleAreaMaxWidth === 'md' }"
-  >
-    <div *ngIf="!hideIcon" class="tw-mx-auto tw-max-w-24 sm:tw-max-w-28 md:tw-max-w-32">
+  <div class="tw-text-center tw-mb-4 sm:tw-mb-6 tw-mx-auto" [ngClass]="maxWidthClass">
+    <div *ngIf="!hideIcon" class="tw-w-24 sm:tw-w-28 md:tw-w-32 tw-mx-auto">
       <bit-icon [icon]="icon"></bit-icon>
     </div>
 
@@ -36,14 +33,20 @@
   </div>
 
   <div
-    class="tw-grow tw-w-full tw-max-w-md tw-mx-auto tw-flex tw-flex-col tw-items-center sm:tw-min-w-[28rem]"
-    [ngClass]="{ 'tw-max-w-md': maxWidth === 'md', 'tw-max-w-3xl': maxWidth === '3xl' }"
+    class="tw-grow tw-w-full tw-mx-auto tw-flex tw-flex-col tw-items-center sm:tw-min-w-[28rem]"
+    [ngClass]="maxWidthClass"
   >
-    <div
-      class="tw-rounded-2xl tw-mb-6 sm:tw-mb-10 tw-mx-auto tw-w-full sm:tw-bg-background sm:tw-border sm:tw-border-solid sm:tw-border-secondary-300 sm:tw-p-8"
-    >
-      <ng-content></ng-content>
-    </div>
+    @if (hideCardWrapper) {
+      <div class="tw-mb-6 sm:tw-mb-10">
+        <ng-container *ngTemplateOutlet="defaultContent"></ng-container>
+      </div>
+    } @else {
+      <div
+        class="tw-rounded-2xl tw-mb-6 sm:tw-mb-10 tw-mx-auto tw-w-full sm:tw-bg-background sm:tw-border sm:tw-border-solid sm:tw-border-secondary-300 sm:tw-p-8"
+      >
+        <ng-container *ngTemplateOutlet="defaultContent"></ng-container>
+      </div>
+    }
     <ng-content select="[slot=secondary]"></ng-content>
   </div>
 
@@ -60,3 +63,7 @@
     </ng-container>
   </footer>
 </main>
+
+<ng-template #defaultContent>
+  <ng-content></ng-content>
+</ng-template>
diff --git a/libs/auth/src/angular/anon-layout/anon-layout.component.ts b/libs/components/src/anon-layout/anon-layout.component.ts
similarity index 72%
rename from libs/auth/src/angular/anon-layout/anon-layout.component.ts
rename to libs/components/src/anon-layout/anon-layout.component.ts
index 1ca4ccd2432..1324e37a418 100644
--- a/libs/auth/src/angular/anon-layout/anon-layout.component.ts
+++ b/libs/components/src/anon-layout/anon-layout.component.ts
@@ -9,19 +9,15 @@ import { ClientType } from "@bitwarden/common/enums";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { IconModule, Icon } from "../../../../components/src/icon";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { SharedModule } from "../../../../components/src/shared";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { TypographyModule } from "../../../../components/src/typography";
-import { BitwardenLogo, BitwardenShield } from "../icons";
+import { IconModule, Icon } from "../icon";
+import { BitwardenLogo } from "../icon/icons";
+import { AnonLayoutBitwardenShield } from "../icon/logos";
+import { SharedModule } from "../shared";
+import { TypographyModule } from "../typography";
+
+export type AnonLayoutMaxWidth = "md" | "lg" | "xl" | "2xl" | "3xl";
 
 @Component({
-  standalone: true,
   selector: "auth-anon-layout",
   templateUrl: "./anon-layout.component.html",
   imports: [IconModule, CommonModule, TypographyModule, SharedModule, RouterModule],
@@ -40,29 +36,38 @@ export class AnonLayoutComponent implements OnInit, OnChanges {
   @Input() hideLogo: boolean = false;
   @Input() hideFooter: boolean = false;
   @Input() hideIcon: boolean = false;
+  @Input() hideCardWrapper: boolean = false;
 
   /**
-   * Max width of the title area content
-   *
-   * @default null
-   */
-  @Input() titleAreaMaxWidth?: "md";
-
-  /**
-   * Max width of the layout content
+   * Max width of the anon layout title, subtitle, and content areas.
    *
    * @default 'md'
    */
-  @Input() maxWidth: "md" | "3xl" = "md";
+  @Input() maxWidth: AnonLayoutMaxWidth = "md";
 
   protected logo = BitwardenLogo;
-  protected year = "2024";
+  protected year: string;
   protected clientType: ClientType;
   protected hostname: string;
   protected version: string;
 
   protected hideYearAndVersion = false;
 
+  get maxWidthClass(): string {
+    switch (this.maxWidth) {
+      case "md":
+        return "tw-max-w-md";
+      case "lg":
+        return "tw-max-w-lg";
+      case "xl":
+        return "tw-max-w-xl";
+      case "2xl":
+        return "tw-max-w-2xl";
+      case "3xl":
+        return "tw-max-w-3xl";
+    }
+  }
+
   constructor(
     private environmentService: EnvironmentService,
     private platformUtilsService: PlatformUtilsService,
@@ -74,13 +79,12 @@ export class AnonLayoutComponent implements OnInit, OnChanges {
 
   async ngOnInit() {
     this.maxWidth = this.maxWidth ?? "md";
-    this.titleAreaMaxWidth = this.titleAreaMaxWidth ?? null;
     this.hostname = (await firstValueFrom(this.environmentService.environment$)).getHostname();
     this.version = await this.platformUtilsService.getApplicationVersion();
 
     // If there is no icon input, then use the default icon
     if (this.icon == null) {
-      this.icon = BitwardenShield;
+      this.icon = AnonLayoutBitwardenShield;
     }
   }
 
diff --git a/libs/auth/src/angular/anon-layout/anon-layout.mdx b/libs/components/src/anon-layout/anon-layout.mdx
similarity index 96%
rename from libs/auth/src/angular/anon-layout/anon-layout.mdx
rename to libs/components/src/anon-layout/anon-layout.mdx
index 8aec3a06767..9d40d617b0d 100644
--- a/libs/auth/src/angular/anon-layout/anon-layout.mdx
+++ b/libs/components/src/anon-layout/anon-layout.mdx
@@ -6,8 +6,8 @@ import * as stories from "./anon-layout.stories";
 
 # AnonLayout Component
 
-The Auth-owned AnonLayoutComponent is to be used primarily for unauthenticated pages\*, where we
-don't know who the user is.
+The AnonLayoutComponent is to be used primarily for unauthenticated pages\*, where we don't know who
+the user is.
 
 \*There will be a few exceptions to this&mdash;that is, AnonLayout will also be used for the Unlock
 and View Send pages.
@@ -165,4 +165,4 @@ import { EnvironmentSelectorComponent } from "./components/environment-selector/
 
 ---
 
-<Story of={stories.WithSecondaryContent} />
+<Story of={stories.SecondaryContent} />
diff --git a/libs/components/src/anon-layout/anon-layout.stories.ts b/libs/components/src/anon-layout/anon-layout.stories.ts
new file mode 100644
index 00000000000..24aaf10f7ba
--- /dev/null
+++ b/libs/components/src/anon-layout/anon-layout.stories.ts
@@ -0,0 +1,250 @@
+import { ActivatedRoute, RouterModule } from "@angular/router";
+import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
+import { BehaviorSubject, of } from "rxjs";
+
+import { ClientType } from "@bitwarden/common/enums";
+import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+
+import { ButtonModule } from "../button";
+import { Icon } from "../icon";
+import { LockIcon } from "../icon/icons";
+import { I18nMockService } from "../utils/i18n-mock.service";
+
+import { AnonLayoutComponent } from "./anon-layout.component";
+
+class MockPlatformUtilsService implements Partial<PlatformUtilsService> {
+  getApplicationVersion = () => Promise.resolve("Version 2024.1.1");
+  getClientType = () => ClientType.Web;
+}
+
+type StoryArgs = Pick<
+  AnonLayoutComponent,
+  | "title"
+  | "subtitle"
+  | "showReadonlyHostname"
+  | "hideCardWrapper"
+  | "hideIcon"
+  | "hideLogo"
+  | "hideFooter"
+  | "maxWidth"
+> & {
+  contentLength: "normal" | "long" | "thin";
+  showSecondary: boolean;
+  useDefaultIcon: boolean;
+  icon: Icon;
+};
+
+export default {
+  title: "Component Library/Anon Layout",
+  component: AnonLayoutComponent,
+  decorators: [
+    moduleMetadata({
+      imports: [ButtonModule, RouterModule],
+      providers: [
+        {
+          provide: PlatformUtilsService,
+          useClass: MockPlatformUtilsService,
+        },
+        {
+          provide: I18nService,
+          useFactory: () =>
+            new I18nMockService({
+              accessing: "Accessing",
+              appLogoLabel: "app logo label",
+            }),
+        },
+        {
+          provide: EnvironmentService,
+          useValue: {
+            environment$: new BehaviorSubject({
+              getHostname() {
+                return "bitwarden.com";
+              },
+            }).asObservable(),
+          },
+        },
+        {
+          provide: ActivatedRoute,
+          useValue: { queryParams: of({}) },
+        },
+      ],
+    }),
+  ],
+
+  render: (args: StoryArgs) => {
+    const { useDefaultIcon, icon, ...rest } = args;
+    return {
+      props: {
+        ...rest,
+        icon: useDefaultIcon ? null : icon,
+      },
+      template: `
+        <auth-anon-layout
+          [title]="title"
+          [subtitle]="subtitle"
+          [icon]="icon"
+          [showReadonlyHostname]="showReadonlyHostname"
+          [maxWidth]="maxWidth"
+          [hideCardWrapper]="hideCardWrapper"
+          [hideIcon]="hideIcon"
+          [hideLogo]="hideLogo"
+          [hideFooter]="hideFooter"
+        >
+          <ng-container [ngSwitch]="contentLength">
+            <div *ngSwitchCase="'thin'" class="tw-text-center">  <div class="tw-font-bold">Thin Content</div></div>
+            <div *ngSwitchCase="'long'">
+              <div class="tw-font-bold">Long Content</div>
+              <div>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</div>
+              <div>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</div>
+            </div>
+            <div *ngSwitchDefault>
+              <div class="tw-font-bold">Normal Content</div>
+              <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. </div>
+            </div>
+          </ng-container>
+
+          <div *ngIf="showSecondary" slot="secondary" class="tw-text-center">
+            <div class="tw-font-bold tw-mb-2">
+              Secondary Projected Content (optional)
+            </div>
+            <button bitButton>Perform Action</button>
+          </div>
+        </auth-anon-layout>
+      `,
+    };
+  },
+
+  argTypes: {
+    title: { control: "text" },
+    subtitle: { control: "text" },
+
+    icon: { control: false, table: { disable: true } },
+    useDefaultIcon: {
+      control: false,
+      table: { disable: true },
+      description: "If true, passes null so component falls back to its built-in icon",
+    },
+
+    showReadonlyHostname: { control: "boolean" },
+    maxWidth: {
+      control: "select",
+      options: ["md", "lg", "xl", "2xl", "3xl"],
+    },
+
+    hideCardWrapper: { control: "boolean" },
+    hideIcon: { control: "boolean" },
+    hideLogo: { control: "boolean" },
+    hideFooter: { control: "boolean" },
+
+    contentLength: {
+      control: "radio",
+      options: ["normal", "long", "thin"],
+    },
+
+    showSecondary: { control: "boolean" },
+  },
+
+  args: {
+    title: "The Page Title",
+    subtitle: "The subtitle (optional)",
+    icon: LockIcon,
+    useDefaultIcon: false,
+    showReadonlyHostname: false,
+    maxWidth: "md",
+    hideCardWrapper: false,
+    hideIcon: false,
+    hideLogo: false,
+    hideFooter: false,
+    contentLength: "normal",
+    showSecondary: false,
+  },
+} as Meta<StoryArgs>;
+
+type Story = StoryObj<StoryArgs>;
+
+export const NormalPrimaryContent: Story = {
+  args: {
+    contentLength: "normal",
+  },
+};
+
+export const LongPrimaryContent: Story = {
+  args: {
+    contentLength: "long",
+  },
+};
+
+export const ThinPrimaryContent: Story = {
+  args: {
+    contentLength: "thin",
+  },
+};
+
+export const LongContentAndTitlesAndDefaultWidth: Story = {
+  args: {
+    title:
+      "This is a very long title that might not fit in the default width. It's really long and descriptive, so it might take up more space than usual.",
+    subtitle:
+      "This is a very long subtitle that might not fit in the default width. It's really long and descriptive, so it might take up more space than usual.",
+    contentLength: "long",
+  },
+};
+
+export const LongContentAndTitlesAndLargestWidth: Story = {
+  args: {
+    title:
+      "This is a very long title that might not fit in the default width. It's really long and descriptive, so it might take up more space than usual.",
+    subtitle:
+      "This is a very long subtitle that might not fit in the default width. It's really long and descriptive, so it might take up more space than usual.",
+    contentLength: "long",
+    maxWidth: "3xl",
+  },
+};
+
+export const SecondaryContent: Story = {
+  args: {
+    showSecondary: true,
+  },
+};
+
+export const NoTitle: Story = { args: { title: undefined } };
+
+export const NoSubtitle: Story = { args: { subtitle: undefined } };
+
+export const NoWrapper: Story = {
+  args: { hideCardWrapper: true },
+};
+
+export const DefaultIcon: Story = {
+  args: { useDefaultIcon: true },
+};
+
+export const NoIcon: Story = {
+  args: { hideIcon: true },
+};
+
+export const NoLogo: Story = {
+  args: { hideLogo: true },
+};
+
+export const NoFooter: Story = {
+  args: { hideFooter: true },
+};
+
+export const ReadonlyHostname: Story = {
+  args: { showReadonlyHostname: true },
+};
+
+export const MinimalState: Story = {
+  args: {
+    title: undefined,
+    subtitle: undefined,
+    contentLength: "normal",
+    hideCardWrapper: true,
+    hideIcon: true,
+    hideLogo: true,
+    hideFooter: true,
+  },
+};
diff --git a/libs/auth/src/angular/anon-layout/default-anon-layout-wrapper-data.service.ts b/libs/components/src/anon-layout/default-anon-layout-wrapper-data.service.ts
similarity index 100%
rename from libs/auth/src/angular/anon-layout/default-anon-layout-wrapper-data.service.ts
rename to libs/components/src/anon-layout/default-anon-layout-wrapper-data.service.ts
diff --git a/libs/components/src/anon-layout/index.ts b/libs/components/src/anon-layout/index.ts
new file mode 100644
index 00000000000..764360e85dd
--- /dev/null
+++ b/libs/components/src/anon-layout/index.ts
@@ -0,0 +1,4 @@
+export * from "./anon-layout-wrapper-data.service";
+export * from "./anon-layout-wrapper.component";
+export * from "./anon-layout.component";
+export * from "./default-anon-layout-wrapper-data.service";
diff --git a/libs/components/src/async-actions/bit-action.directive.ts b/libs/components/src/async-actions/bit-action.directive.ts
index ac50082852a..46132803475 100644
--- a/libs/components/src/async-actions/bit-action.directive.ts
+++ b/libs/components/src/async-actions/bit-action.directive.ts
@@ -15,7 +15,6 @@ import { FunctionReturningAwaitable, functionToObservable } from "../utils/funct
  */
 @Directive({
   selector: "[bitAction]",
-  standalone: true,
 })
 export class BitActionDirective implements OnDestroy {
   private destroy$ = new Subject<void>();
diff --git a/libs/components/src/async-actions/bit-submit.directive.ts b/libs/components/src/async-actions/bit-submit.directive.ts
index a38e76aaca6..838d78af8b2 100644
--- a/libs/components/src/async-actions/bit-submit.directive.ts
+++ b/libs/components/src/async-actions/bit-submit.directive.ts
@@ -14,7 +14,6 @@ import { FunctionReturningAwaitable, functionToObservable } from "../utils/funct
  */
 @Directive({
   selector: "[formGroup][bitSubmit]",
-  standalone: true,
 })
 export class BitSubmitDirective implements OnInit, OnDestroy {
   private destroy$ = new Subject<void>();
diff --git a/libs/components/src/async-actions/form-button.directive.ts b/libs/components/src/async-actions/form-button.directive.ts
index 1c2855f32e7..95a133403bf 100644
--- a/libs/components/src/async-actions/form-button.directive.ts
+++ b/libs/components/src/async-actions/form-button.directive.ts
@@ -25,7 +25,6 @@ import { BitSubmitDirective } from "./bit-submit.directive";
  */
 @Directive({
   selector: "button[bitFormButton]",
-  standalone: true,
 })
 export class BitFormButtonDirective implements OnDestroy {
   private destroy$ = new Subject<void>();
diff --git a/libs/components/src/async-actions/in-forms.stories.ts b/libs/components/src/async-actions/in-forms.stories.ts
index b45f750084c..7f51a8bdad2 100644
--- a/libs/components/src/async-actions/in-forms.stories.ts
+++ b/libs/components/src/async-actions/in-forms.stories.ts
@@ -13,6 +13,7 @@ import { IconButtonModule } from "../icon-button";
 import { InputModule } from "../input/input.module";
 import { I18nMockService } from "../utils/i18n-mock.service";
 
+import { AsyncActionsModule } from "./async-actions.module";
 import { BitActionDirective } from "./bit-action.directive";
 import { BitSubmitDirective } from "./bit-submit.directive";
 import { BitFormButtonDirective } from "./form-button.directive";
@@ -30,16 +31,23 @@ const template = `
       <button type="button" bitSuffix bitIconButton="bwi-refresh" bitFormButton [bitAction]="refresh"></button>
     </bit-form-field>
 
-    <button class="tw-mr-2" type="submit" buttonType="primary" bitButton bitFormButton>Submit</button>
-    <button class="tw-mr-2" type="button" buttonType="secondary" bitButton bitFormButton>Cancel</button>
-    <button class="tw-mr-2" type="button" buttonType="danger" bitButton bitFormButton [bitAction]="delete">Delete</button>
-    <button class="tw-mr-2" type="button" buttonType="secondary" bitButton bitFormButton [disabled]="true">Disabled</button>
-    <button class="tw-mr-2" type="button" buttonType="secondary" bitIconButton="bwi-star" bitFormButton [bitAction]="delete">Delete</button>
+    <button class="tw-me-2" type="submit" buttonType="primary" bitButton bitFormButton>Submit</button>
+    <button class="tw-me-2" type="button" buttonType="secondary" bitButton bitFormButton>Cancel</button>
+    <button class="tw-me-2" type="button" buttonType="danger" bitButton bitFormButton [bitAction]="delete">Delete</button>
+    <button class="tw-me-2" type="button" buttonType="secondary" bitButton bitFormButton [disabled]="true">Disabled</button>
+    <button class="tw-me-2" type="button" buttonType="secondary" bitIconButton="bwi-star" bitFormButton [bitAction]="delete">Delete</button>
   </form>`;
 
 @Component({
   selector: "app-promise-example",
   template,
+  imports: [
+    AsyncActionsModule,
+    ButtonModule,
+    FormFieldModule,
+    IconButtonModule,
+    ReactiveFormsModule,
+  ],
 })
 class PromiseExampleComponent {
   formObj = this.formBuilder.group({
@@ -77,6 +85,13 @@ class PromiseExampleComponent {
 @Component({
   selector: "app-observable-example",
   template,
+  imports: [
+    AsyncActionsModule,
+    ButtonModule,
+    FormFieldModule,
+    IconButtonModule,
+    ReactiveFormsModule,
+  ],
 })
 class ObservableExampleComponent {
   formObj = this.formBuilder.group({
@@ -109,7 +124,6 @@ export default {
   title: "Component Library/Async Actions/In Forms",
   decorators: [
     moduleMetadata({
-      declarations: [PromiseExampleComponent, ObservableExampleComponent],
       imports: [
         BitSubmitDirective,
         BitFormButtonDirective,
@@ -120,6 +134,8 @@ export default {
         ButtonModule,
         IconButtonModule,
         BitActionDirective,
+        PromiseExampleComponent,
+        ObservableExampleComponent,
       ],
       providers: [
         {
diff --git a/libs/components/src/async-actions/standalone.stories.ts b/libs/components/src/async-actions/standalone.stories.ts
index 52b85b88561..542825eb17a 100644
--- a/libs/components/src/async-actions/standalone.stories.ts
+++ b/libs/components/src/async-actions/standalone.stories.ts
@@ -9,10 +9,11 @@ import { ValidationService } from "@bitwarden/common/platform/abstractions/valid
 import { ButtonModule } from "../button";
 import { IconButtonModule } from "../icon-button";
 
+import { AsyncActionsModule } from "./async-actions.module";
 import { BitActionDirective } from "./bit-action.directive";
 
 const template = /*html*/ `
-  <button bitButton buttonType="primary" [bitAction]="action" class="tw-mr-2">
+  <button bitButton buttonType="primary" [bitAction]="action" class="tw-me-2">
     Perform action {{ statusEmoji }}
   </button>
   <button bitIconButton="bwi-trash" buttonType="danger" [bitAction]="action"></button>`;
@@ -20,6 +21,8 @@ const template = /*html*/ `
 @Component({
   template,
   selector: "app-promise-example",
+  imports: [AsyncActionsModule, ButtonModule, IconButtonModule],
+  standalone: true,
 })
 class PromiseExampleComponent {
   statusEmoji = "🟡";
@@ -36,6 +39,7 @@ class PromiseExampleComponent {
 @Component({
   template,
   selector: "app-action-resolves-quickly",
+  imports: [AsyncActionsModule, ButtonModule, IconButtonModule],
 })
 class ActionResolvesQuicklyComponent {
   statusEmoji = "🟡";
@@ -53,6 +57,7 @@ class ActionResolvesQuicklyComponent {
 @Component({
   template,
   selector: "app-observable-example",
+  imports: [AsyncActionsModule, ButtonModule, IconButtonModule],
 })
 class ObservableExampleComponent {
   action = () => {
@@ -63,6 +68,7 @@ class ObservableExampleComponent {
 @Component({
   template,
   selector: "app-rejected-promise-example",
+  imports: [AsyncActionsModule, ButtonModule, IconButtonModule],
 })
 class RejectedPromiseExampleComponent {
   action = async () => {
@@ -76,13 +82,15 @@ export default {
   title: "Component Library/Async Actions/Standalone",
   decorators: [
     moduleMetadata({
-      declarations: [
+      imports: [
+        ButtonModule,
+        IconButtonModule,
+        BitActionDirective,
         PromiseExampleComponent,
         ObservableExampleComponent,
         RejectedPromiseExampleComponent,
         ActionResolvesQuicklyComponent,
       ],
-      imports: [ButtonModule, IconButtonModule, BitActionDirective],
       providers: [
         {
           provide: ValidationService,
diff --git a/libs/components/src/avatar/avatar.component.ts b/libs/components/src/avatar/avatar.component.ts
index 554f55636fc..8ccd639a41d 100644
--- a/libs/components/src/avatar/avatar.component.ts
+++ b/libs/components/src/avatar/avatar.component.ts
@@ -16,12 +16,17 @@ const SizeClasses: Record<SizeTypes, string[]> = {
   xsmall: ["tw-h-6", "tw-w-6"],
 };
 
+/**
+  * Avatars display a unique color that helps a user visually recognize their logged in account.
+
+  * A variance in color across the avatar component is important as it is used in Account Switching as a
+  * visual indicator to recognize which of a personal or work account a user is logged into.
+*/
 @Component({
   selector: "bit-avatar",
   template: `@if (src) {
     <img [src]="src" title="{{ title || text }}" [ngClass]="classList" />
   }`,
-  standalone: true,
   imports: [NgClass],
 })
 export class AvatarComponent implements OnChanges {
diff --git a/libs/components/src/avatar/avatar.mdx b/libs/components/src/avatar/avatar.mdx
index 627ba526ed9..bbf356f96fa 100644
--- a/libs/components/src/avatar/avatar.mdx
+++ b/libs/components/src/avatar/avatar.mdx
@@ -1,15 +1,15 @@
-import { Meta, Canvas, Primary, Controls } from "@storybook/addon-docs";
+import { Description, Meta, Canvas, Primary, Controls, Title } from "@storybook/addon-docs";
 
 import * as stories from "./avatar.stories";
 
 <Meta of={stories} />
 
-# Avatar
+```ts
+import { AvatarModule } from "@bitwarden/components";
+```
 
-Avatars display a unique color that helps a user visually recognize their logged in account.
-
-A variance in color across the avatar component is important as it is used in Account Switching as a
-visual indicator to recognize which of a personal or work account a user is logged into.
+<Title />
+<Description />
 
 <Primary />
 <Controls />
diff --git a/libs/components/src/avatar/avatar.stories.ts b/libs/components/src/avatar/avatar.stories.ts
index 19a6f86d89c..9b0d4e4aa8c 100644
--- a/libs/components/src/avatar/avatar.stories.ts
+++ b/libs/components/src/avatar/avatar.stories.ts
@@ -1,5 +1,7 @@
 import { Meta, StoryObj } from "@storybook/angular";
 
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
+
 import { AvatarComponent } from "./avatar.component";
 
 export default {
@@ -21,42 +23,56 @@ export default {
 type Story = StoryObj<AvatarComponent>;
 
 export const Default: Story = {
+  render: (args) => {
+    return {
+      props: args,
+      template: `
+        <bit-avatar ${formatArgsForCodeSnippet<AvatarComponent>(args)}></bit-avatar>
+      `,
+    };
+  },
   args: {
     color: "#175ddc",
   },
 };
 
 export const Large: Story = {
+  ...Default,
   args: {
     size: "large",
   },
 };
 
 export const Small: Story = {
+  ...Default,
   args: {
     size: "small",
   },
 };
 
 export const LightBackground: Story = {
+  ...Default,
   args: {
     color: "#d2ffcf",
   },
 };
 
 export const Border: Story = {
+  ...Default,
   args: {
     border: true,
   },
 };
 
 export const ColorByID: Story = {
+  ...Default,
   args: {
     id: "236478",
   },
 };
 
 export const ColorByText: Story = {
+  ...Default,
   args: {
     text: "Jason Doe",
   },
diff --git a/libs/components/src/badge-list/badge-list.component.ts b/libs/components/src/badge-list/badge-list.component.ts
index 86e9a84cb77..7b719a4ec86 100644
--- a/libs/components/src/badge-list/badge-list.component.ts
+++ b/libs/components/src/badge-list/badge-list.component.ts
@@ -10,7 +10,6 @@ import { BadgeModule, BadgeVariant } from "../badge";
 @Component({
   selector: "bit-badge-list",
   templateUrl: "badge-list.component.html",
-  standalone: true,
   imports: [BadgeModule, I18nPipe],
 })
 export class BadgeListComponent implements OnChanges {
diff --git a/libs/components/src/badge-list/badge-list.stories.ts b/libs/components/src/badge-list/badge-list.stories.ts
index f69ecde8377..504871f9509 100644
--- a/libs/components/src/badge-list/badge-list.stories.ts
+++ b/libs/components/src/badge-list/badge-list.stories.ts
@@ -2,6 +2,7 @@ import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
 import { BadgeModule } from "../badge";
 import { SharedModule } from "../shared";
 import { I18nMockService } from "../utils/i18n-mock.service";
@@ -44,7 +45,7 @@ export const Default: Story = {
   render: (args) => ({
     props: args,
     template: `
-      <bit-badge-list [variant]="variant" [maxItems]="maxItems" [items]="items" [truncate]="truncate"></bit-badge-list>
+      <bit-badge-list ${formatArgsForCodeSnippet<BadgeListComponent>(args)}></bit-badge-list>
     `,
   }),
 
diff --git a/libs/components/src/badge/badge.component.ts b/libs/components/src/badge/badge.component.ts
index 893257ff225..e2cbb4f1ceb 100644
--- a/libs/components/src/badge/badge.component.ts
+++ b/libs/components/src/badge/badge.component.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CommonModule } from "@angular/common";
 import { Component, ElementRef, HostBinding, Input } from "@angular/core";
 
@@ -45,13 +43,23 @@ const hoverStyles: Record<BadgeVariant, string[]> = {
     "hover:!tw-text-contrast",
   ],
 };
+/**
+  * Badges are primarily used as labels, counters, and small buttons.
 
+  * Typically Badges are only used with text set to `text-xs`. If additional sizes are needed, the component configurations may be reviewed and adjusted.
+
+  * The Badge directive can be used on a `<span>` (non clickable events), or an `<a>` or `<button>` tag
+
+  * > `NOTE:` The Focus and Hover states only apply to badges used for interactive events.
+  *
+  * > `NOTE:` The `disabled` state only applies to buttons.
+  *
+*/
 @Component({
   selector: "span[bitBadge], a[bitBadge], button[bitBadge]",
   providers: [{ provide: FocusableElement, useExisting: BadgeComponent }],
   imports: [CommonModule],
   templateUrl: "badge.component.html",
-  standalone: true,
 })
 export class BadgeComponent implements FocusableElement {
   @HostBinding("class") get classList() {
@@ -89,7 +97,7 @@ export class BadgeComponent implements FocusableElement {
     if (this.title !== undefined) {
       return this.title;
     }
-    return this.truncate ? this.el.nativeElement.textContent.trim() : null;
+    return this.truncate ? this?.el?.nativeElement?.textContent?.trim() : null;
   }
 
   /**
diff --git a/libs/components/src/badge/badge.mdx b/libs/components/src/badge/badge.mdx
index 55f32183899..957a3256cbb 100644
--- a/libs/components/src/badge/badge.mdx
+++ b/libs/components/src/badge/badge.mdx
@@ -1,4 +1,4 @@
-import { Meta, Canvas, Primary, Controls } from "@storybook/addon-docs";
+import { Meta, Canvas, Primary, Controls, Title, Description } from "@storybook/addon-docs";
 
 import * as stories from "./badge.stories";
 
@@ -8,25 +8,15 @@ import * as stories from "./badge.stories";
 import { BadgeModule } from "@bitwarden/components";
 ```
 
-# Badge
-
-Badges are primarily used as labels, counters, and small buttons.
-
-Typically Badges are only used with text set to `text-xs`. If additional sizes are needed, the
-component configurations may be reviewed and adjusted.
-
-The Badge directive can be used on a `<span>` (non clickable events), or an `<a>` or `<button>` tag
-for interactive events. The Focus and Hover states only apply to badges used for interactive events.
-The `disabled` state only applies to buttons.
-
-The story below uses the `<button>` element to demonstrate all the possible states.
+<Title />
+<Description />
 
 <Primary />
 <Controls />
 
 ## Styles
 
-### Primary
+### Default / Primary
 
 The primary badge is used to indicate an active status (example: device management page) or provide
 additional information (example: type of emergency access granted).
diff --git a/libs/components/src/badge/badge.stories.ts b/libs/components/src/badge/badge.stories.ts
index 6473ba8c867..a151547ef6a 100644
--- a/libs/components/src/badge/badge.stories.ts
+++ b/libs/components/src/badge/badge.stories.ts
@@ -1,6 +1,8 @@
 import { CommonModule } from "@angular/common";
 import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
 
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
+
 import { BadgeComponent } from "./badge.component";
 
 export default {
@@ -12,7 +14,6 @@ export default {
     }),
   ],
   args: {
-    variant: "primary",
     truncate: false,
   },
   parameters: {
@@ -25,45 +26,11 @@ export default {
 
 type Story = StoryObj<BadgeComponent>;
 
-export const Variants: Story = {
+export const Default: Story = {
   render: (args) => ({
     props: args,
     template: /*html*/ `
-      <span class="tw-text-main tw-mx-1">Default</span>
-      <button class="tw-mx-1" bitBadge variant="primary" [truncate]="truncate">Primary</button>
-      <button class="tw-mx-1" bitBadge variant="secondary" [truncate]="truncate">Secondary</button>
-      <button class="tw-mx-1" bitBadge variant="success" [truncate]="truncate">Success</button>
-      <button class="tw-mx-1" bitBadge variant="danger" [truncate]="truncate">Danger</button>
-      <button class="tw-mx-1" bitBadge variant="warning" [truncate]="truncate">Warning</button>
-      <button class="tw-mx-1" bitBadge variant="info" [truncate]="truncate">Info</button>
-      <button class="tw-mx-1" bitBadge variant="notification" [truncate]="truncate">Notification</button>
-      <br/><br/>
-      <span class="tw-text-main tw-mx-1">Hover</span>
-      <button class="tw-mx-1 tw-test-hover" bitBadge variant="primary" [truncate]="truncate">Primary</button>
-      <button class="tw-mx-1 tw-test-hover" bitBadge variant="secondary" [truncate]="truncate">Secondary</button>
-      <button class="tw-mx-1 tw-test-hover" bitBadge variant="success" [truncate]="truncate">Success</button>
-      <button class="tw-mx-1 tw-test-hover" bitBadge variant="danger" [truncate]="truncate">Danger</button>
-      <button class="tw-mx-1 tw-test-hover" bitBadge variant="warning" [truncate]="truncate">Warning</button>
-      <button class="tw-mx-1 tw-test-hover" bitBadge variant="info" [truncate]="truncate">Info</button>
-      <button class="tw-mx-1 tw-test-hover" bitBadge variant="notification" [truncate]="truncate">Notification</button>
-      <br/><br/>
-      <span class="tw-text-main tw-mx-1">Focus Visible</span>
-      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="primary" [truncate]="truncate">Primary</button>
-      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="secondary" [truncate]="truncate">Secondary</button>
-      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="success" [truncate]="truncate">Success</button>
-      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="danger" [truncate]="truncate">Danger</button>
-      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="warning" [truncate]="truncate">Warning</button>
-      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="info" [truncate]="truncate">Info</button>
-      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="notification" [truncate]="truncate">Notification</button>
-      <br/><br/>
-      <span class="tw-text-main tw-mx-1">Disabled</span>
-      <button disabled class="tw-mx-1" bitBadge variant="primary" [truncate]="truncate">Primary</button>
-      <button disabled class="tw-mx-1" bitBadge variant="secondary" [truncate]="truncate">Secondary</button>
-      <button disabled class="tw-mx-1" bitBadge variant="success" [truncate]="truncate">Success</button>
-      <button disabled class="tw-mx-1" bitBadge variant="danger" [truncate]="truncate">Danger</button>
-      <button disabled class="tw-mx-1" bitBadge variant="warning" [truncate]="truncate">Warning</button>
-      <button disabled class="tw-mx-1" bitBadge variant="info" [truncate]="truncate">Info</button>
-      <button disabled class="tw-mx-1" bitBadge variant="notification" [truncate]="truncate">Notification</button>
+      <span bitBadge ${formatArgsForCodeSnippet<BadgeComponent>(args)}>Badge containing lengthy text</span>
     `,
   }),
 };
@@ -72,11 +39,17 @@ export const Primary: Story = {
   render: (args) => ({
     props: args,
     template: /*html*/ `
-      <span class="tw-text-main">Span </span><span bitBadge [variant]="variant" [truncate]="truncate">Badge containing lengthy text</span>
-      <br /><br />
-      <span class="tw-text-main">Link </span><a href="#" bitBadge [variant]="variant" [truncate]="truncate">Badge</a>
-      <br /><br />
-      <span class="tw-text-main">Button </span><button bitBadge [variant]="variant" [truncate]="truncate">Badge</button>
+      <div class="tw-flex tw-flex-col tw-gap-4">
+        <div class="tw-flex tw-items-center tw-gap-2">
+          <span class="tw-text-main">span</span><span bitBadge ${formatArgsForCodeSnippet<BadgeComponent>(args)}>Badge containing lengthy text</span>
+        </div>
+        <div class="tw-flex tw-items-center tw-gap-2">
+          <span class="tw-text-main">link </span><a href="#" bitBadge ${formatArgsForCodeSnippet<BadgeComponent>(args)}>Badge</a>
+        </div>
+        <div class="tw-flex tw-items-center tw-gap-2">
+          <span class="tw-text-main">button </span><button bitBadge ${formatArgsForCodeSnippet<BadgeComponent>(args)}>Badge</button>
+        </div>
+      </div>
     `,
   }),
 };
@@ -129,3 +102,46 @@ export const Truncated: Story = {
     truncate: true,
   },
 };
+
+export const VariantsAndInteractionStates: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <span class="tw-text-main tw-mx-1">Default</span>
+      <button class="tw-mx-1" bitBadge variant="primary" [truncate]="truncate">Primary</button>
+      <button class="tw-mx-1" bitBadge variant="secondary" [truncate]="truncate">Secondary</button>
+      <button class="tw-mx-1" bitBadge variant="success" [truncate]="truncate">Success</button>
+      <button class="tw-mx-1" bitBadge variant="danger" [truncate]="truncate">Danger</button>
+      <button class="tw-mx-1" bitBadge variant="warning" [truncate]="truncate">Warning</button>
+      <button class="tw-mx-1" bitBadge variant="info" [truncate]="truncate">Info</button>
+      <button class="tw-mx-1" bitBadge variant="notification" [truncate]="truncate">Notification</button>
+      <br/><br/>
+      <span class="tw-text-main tw-mx-1">Hover</span>
+      <button class="tw-mx-1 tw-test-hover" bitBadge variant="primary" [truncate]="truncate">Primary</button>
+      <button class="tw-mx-1 tw-test-hover" bitBadge variant="secondary" [truncate]="truncate">Secondary</button>
+      <button class="tw-mx-1 tw-test-hover" bitBadge variant="success" [truncate]="truncate">Success</button>
+      <button class="tw-mx-1 tw-test-hover" bitBadge variant="danger" [truncate]="truncate">Danger</button>
+      <button class="tw-mx-1 tw-test-hover" bitBadge variant="warning" [truncate]="truncate">Warning</button>
+      <button class="tw-mx-1 tw-test-hover" bitBadge variant="info" [truncate]="truncate">Info</button>
+      <button class="tw-mx-1 tw-test-hover" bitBadge variant="notification" [truncate]="truncate">Notification</button>
+      <br/><br/>
+      <span class="tw-text-main tw-mx-1">Focus Visible</span>
+      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="primary" [truncate]="truncate">Primary</button>
+      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="secondary" [truncate]="truncate">Secondary</button>
+      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="success" [truncate]="truncate">Success</button>
+      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="danger" [truncate]="truncate">Danger</button>
+      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="warning" [truncate]="truncate">Warning</button>
+      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="info" [truncate]="truncate">Info</button>
+      <button class="tw-mx-1 tw-test-focus-visible" bitBadge variant="notification" [truncate]="truncate">Notification</button>
+      <br/><br/>
+      <span class="tw-text-main tw-mx-1">Disabled</span>
+      <button disabled class="tw-mx-1" bitBadge variant="primary" [truncate]="truncate">Primary</button>
+      <button disabled class="tw-mx-1" bitBadge variant="secondary" [truncate]="truncate">Secondary</button>
+      <button disabled class="tw-mx-1" bitBadge variant="success" [truncate]="truncate">Success</button>
+      <button disabled class="tw-mx-1" bitBadge variant="danger" [truncate]="truncate">Danger</button>
+      <button disabled class="tw-mx-1" bitBadge variant="warning" [truncate]="truncate">Warning</button>
+      <button disabled class="tw-mx-1" bitBadge variant="info" [truncate]="truncate">Info</button>
+      <button disabled class="tw-mx-1" bitBadge variant="notification" [truncate]="truncate">Notification</button>
+    `,
+  }),
+};
diff --git a/libs/components/src/banner/banner.component.html b/libs/components/src/banner/banner.component.html
index 1a9d58d342a..6f271d587b5 100644
--- a/libs/components/src/banner/banner.component.html
+++ b/libs/components/src/banner/banner.component.html
@@ -1,5 +1,5 @@
 <div
-  class="tw-flex tw-items-center tw-gap-2 tw-p-2 tw-pl-4 tw-text-main tw-border-transparent tw-bg-clip-padding tw-border-solid tw-border-b tw-border-0"
+  class="tw-flex tw-items-center tw-gap-2 tw-p-2 tw-ps-4 tw-text-main tw-border-transparent tw-bg-clip-padding tw-border-solid tw-border-b tw-border-0"
   [ngClass]="bannerClass"
   [attr.role]="useAlertRole ? 'status' : null"
   [attr.aria-live]="useAlertRole ? 'polite' : null"
diff --git a/libs/components/src/banner/banner.component.ts b/libs/components/src/banner/banner.component.ts
index a7b710d6a74..02d55230ce2 100644
--- a/libs/components/src/banner/banner.component.ts
+++ b/libs/components/src/banner/banner.component.ts
@@ -7,23 +7,31 @@ import { I18nPipe } from "@bitwarden/ui-common";
 
 import { IconButtonModule } from "../icon-button";
 
-type BannerTypes = "premium" | "info" | "warning" | "danger";
+type BannerType = "premium" | "info" | "warning" | "danger";
 
-const defaultIcon: Record<BannerTypes, string> = {
+const defaultIcon: Record<BannerType, string> = {
   premium: "bwi-star",
   info: "bwi-info-circle",
   warning: "bwi-exclamation-triangle",
   danger: "bwi-error",
 };
+/**
+  * Banners are used for important communication with the user that needs to be seen right away, but has
+  * little effect on the experience. Banners appear at the top of the user's screen on page load and
+  * persist across all pages a user navigates to.
 
+  * - They should always be dismissible and never use a timeout. If a user dismisses a banner, it should not reappear during that same active session.
+  * - Use banners sparingly, as they can feel intrusive to the user if they appear unexpectedly. Their effectiveness may decrease if too many are used.
+  * - Avoid stacking multiple banners.
+  * - Banners can contain a button or anchor that uses the `bitLink` directive with `linkType="secondary"`.
+ */
 @Component({
   selector: "bit-banner",
   templateUrl: "./banner.component.html",
-  standalone: true,
   imports: [CommonModule, IconButtonModule, I18nPipe],
 })
 export class BannerComponent implements OnInit {
-  @Input("bannerType") bannerType: BannerTypes = "info";
+  @Input("bannerType") bannerType: BannerType = "info";
   @Input() icon: string;
   @Input() useAlertRole = true;
   @Input() showClose = true;
diff --git a/libs/components/src/banner/banner.mdx b/libs/components/src/banner/banner.mdx
index 67fb796a548..f37fe90e117 100644
--- a/libs/components/src/banner/banner.mdx
+++ b/libs/components/src/banner/banner.mdx
@@ -1,25 +1,16 @@
-import { Meta, Controls, Canvas, Primary } from "@storybook/addon-docs";
+import { Canvas, Controls, Description, Meta, Primary, Title } from "@storybook/addon-docs";
 
 import * as stories from "./banner.stories";
 
 <Meta of={stories} />
 
-# Banner
-
-Banners are used for important communication with the user that needs to be seen right away, but has
-little effect on the experience. Banners appear at the top of the user's screen on page load and
-persist across all pages a user navigates to.
-
-- They should always be dismissible and never use a timeout. If a user dismisses a banner, it should
-  not reappear during that same active session.
-- Use banners sparingly, as they can feel intrusive to the user if they appear unexpectedly. Their
-  effectiveness may decrease if too many are used.
-- Avoid stacking multiple banners.
-- Banners can contain a button or anchor that uses the `bitLink` directive with
-  `linkType="secondary"`.
+```ts
+import { BannerModule } from "@bitwarden/components";
+```
 
+<Title />
+<Description />
 <Primary />
-
 <Controls />
 
 ## Types
@@ -56,5 +47,5 @@ Rarely used, but may be used to alert users over critical messages or very outda
 ## Accessibility
 
 Banners sets the `role="status"` and `aria-live="polite"` attributes to ensure screen readers
-announce the content prior to the test of the page. This behaviour can be disabled by setting
+announce the content prior to the test of the page. This behavior can be disabled by setting
 `[useAlertRole]="false"`.
diff --git a/libs/components/src/banner/banner.stories.ts b/libs/components/src/banner/banner.stories.ts
index 105d30bc04a..8338c9240b9 100644
--- a/libs/components/src/banner/banner.stories.ts
+++ b/libs/components/src/banner/banner.stories.ts
@@ -2,6 +2,7 @@ import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
 import { IconButtonModule } from "../icon-button";
 import { LinkModule } from "../link";
 import { SharedModule } from "../shared/shared.module";
@@ -44,48 +45,50 @@ export default {
 
 type Story = StoryObj<BannerComponent>;
 
+export const Base: Story = {
+  render: (args) => {
+    return {
+      props: args,
+      template: `
+        <bit-banner ${formatArgsForCodeSnippet<BannerComponent>(args)}>
+          Content Really Long Text Lorem Ipsum Ipsum Ipsum
+          <button bitLink linkType="secondary">Button</button>
+        </bit-banner>
+      `,
+    };
+  },
+};
+
 export const Premium: Story = {
+  ...Base,
   args: {
     bannerType: "premium",
   },
-  render: (args) => ({
-    props: args,
-    template: `
-      <bit-banner [bannerType]="bannerType" (onClose)="onClose($event)" [showClose]=showClose>
-        Content Really Long Text Lorem Ipsum Ipsum Ipsum
-        <button bitLink linkType="secondary">Button</button>
-      </bit-banner>
-      `,
-  }),
-};
-
-Premium.args = {
-  bannerType: "premium",
 };
 
 export const Info: Story = {
-  ...Premium,
+  ...Base,
   args: {
     bannerType: "info",
   },
 };
 
 export const Warning: Story = {
-  ...Premium,
+  ...Base,
   args: {
     bannerType: "warning",
   },
 };
 
 export const Danger: Story = {
-  ...Premium,
+  ...Base,
   args: {
     bannerType: "danger",
   },
 };
 
 export const HideClose: Story = {
-  ...Premium,
+  ...Base,
   args: {
     showClose: false,
   },
diff --git a/libs/components/src/breadcrumbs/breadcrumb.component.html b/libs/components/src/breadcrumbs/breadcrumb.component.html
index bb4dc7cdffe..28a93134496 100644
--- a/libs/components/src/breadcrumbs/breadcrumb.component.html
+++ b/libs/components/src/breadcrumbs/breadcrumb.component.html
@@ -1,6 +1,6 @@
 <ng-template>
   @if (icon) {
-    <i class="bwi {{ icon }} !tw-mr-2" aria-hidden="true"></i>
+    <i class="bwi {{ icon }} !tw-me-2" aria-hidden="true"></i>
   }
   <ng-content></ng-content>
 </ng-template>
diff --git a/libs/components/src/breadcrumbs/breadcrumb.component.ts b/libs/components/src/breadcrumbs/breadcrumb.component.ts
index 53c46a9b24a..d466ef61c1a 100644
--- a/libs/components/src/breadcrumbs/breadcrumb.component.ts
+++ b/libs/components/src/breadcrumbs/breadcrumb.component.ts
@@ -7,7 +7,6 @@ import { QueryParamsHandling } from "@angular/router";
 @Component({
   selector: "bit-breadcrumb",
   templateUrl: "./breadcrumb.component.html",
-  standalone: true,
 })
 export class BreadcrumbComponent {
   @Input()
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.component.ts b/libs/components/src/breadcrumbs/breadcrumbs.component.ts
index 6e8fbf5c25a..1ff575d5070 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.component.ts
+++ b/libs/components/src/breadcrumbs/breadcrumbs.component.ts
@@ -8,10 +8,14 @@ import { MenuModule } from "../menu";
 
 import { BreadcrumbComponent } from "./breadcrumb.component";
 
+/**
+ * Breadcrumbs are used to help users understand where they are in a products navigation. Typically
+ * Bitwarden uses this component to indicate the user's current location in a set of data organized in
+ * containers (Collections, Folders, or Projects).
+ */
 @Component({
   selector: "bit-breadcrumbs",
   templateUrl: "./breadcrumbs.component.html",
-  standalone: true,
   imports: [CommonModule, LinkModule, RouterModule, IconButtonModule, MenuModule],
 })
 export class BreadcrumbsComponent {
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.mdx b/libs/components/src/breadcrumbs/breadcrumbs.mdx
index 1ea0aff8c36..cd1d0226387 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.mdx
+++ b/libs/components/src/breadcrumbs/breadcrumbs.mdx
@@ -1,14 +1,15 @@
-import { Meta, Canvas, Primary, Controls } from "@storybook/addon-docs";
+import { Meta, Canvas, Primary, Controls, Title, Description } from "@storybook/addon-docs";
 
 import * as stories from "./breadcrumbs.stories";
 
 <Meta of={stories} />
 
-# Breadcrumbs
+```ts
+import { BreadcrumbsModule } from "@bitwarden/components";
+```
 
-Breadcrumbs are used to help users understand where they are in a products navigation. Typically
-Bitwarden uses this component to indicate the user's current location in a set of data organized in
-containers (Collections, Folders, or Projects).
+<Title />
+<Description />
 
 <Primary />
 <Controls />
diff --git a/libs/components/src/button/button.component.spec.ts b/libs/components/src/button/button.component.spec.ts
index d63f611a5f8..1651b6cf12a 100644
--- a/libs/components/src/button/button.component.spec.ts
+++ b/libs/components/src/button/button.component.spec.ts
@@ -1,7 +1,5 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component, DebugElement } from "@angular/core";
-import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 
 import { ButtonModule } from "./index";
@@ -13,21 +11,18 @@ describe("Button", () => {
   let disabledButtonDebugElement: DebugElement;
   let linkDebugElement: DebugElement;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async () => {
     TestBed.configureTestingModule({
-      imports: [ButtonModule],
-      declarations: [TestApp],
+      imports: [TestApp],
     });
 
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    TestBed.compileComponents();
+    await TestBed.compileComponents();
     fixture = TestBed.createComponent(TestApp);
     testAppComponent = fixture.debugElement.componentInstance;
     buttonDebugElement = fixture.debugElement.query(By.css("button"));
     disabledButtonDebugElement = fixture.debugElement.query(By.css("button#disabled"));
     linkDebugElement = fixture.debugElement.query(By.css("a"));
-  }));
+  });
 
   it("should not be disabled when loading and disabled are false", () => {
     testAppComponent.loading = false;
@@ -39,23 +34,25 @@ describe("Button", () => {
     expect(buttonDebugElement.nativeElement.disabled).toBeFalsy();
   });
 
-  it("should be disabled when disabled is true", () => {
+  it("should be aria-disabled and not html attribute disabled when disabled is true", () => {
     testAppComponent.disabled = true;
     fixture.detectChanges();
-
-    expect(buttonDebugElement.nativeElement.disabled).toBeTruthy();
+    expect(buttonDebugElement.attributes["aria-disabled"]).toBe("true");
+    expect(buttonDebugElement.nativeElement.disabled).toBeFalsy();
     // Anchor tags cannot be disabled.
   });
 
-  it("should be disabled when attribute disabled is true", () => {
-    expect(disabledButtonDebugElement.nativeElement.disabled).toBeTruthy();
+  it("should be aria-disabled not html attribute disabled when attribute disabled is true", () => {
+    fixture.detectChanges();
+    expect(disabledButtonDebugElement.attributes["aria-disabled"]).toBe("true");
+    expect(disabledButtonDebugElement.nativeElement.disabled).toBeFalsy();
   });
 
   it("should be disabled when loading is true", () => {
     testAppComponent.loading = true;
     fixture.detectChanges();
 
-    expect(buttonDebugElement.nativeElement.disabled).toBeTruthy();
+    expect(buttonDebugElement.attributes["aria-disabled"]).toBe("true");
   });
 });
 
@@ -85,10 +82,11 @@ describe("Button", () => {
 
     <button id="disabled" type="button" bitButton disabled>Button</button>
   `,
+  imports: [ButtonModule],
 })
 class TestApp {
-  buttonType: string;
-  block: boolean;
-  disabled: boolean;
-  loading: boolean;
+  buttonType?: string;
+  block?: boolean;
+  disabled?: boolean;
+  loading?: boolean;
 }
diff --git a/libs/components/src/button/button.component.ts b/libs/components/src/button/button.component.ts
index 19618938c42..671b1dfb96d 100644
--- a/libs/components/src/button/button.component.ts
+++ b/libs/components/src/button/button.component.ts
@@ -1,10 +1,21 @@
 import { coerceBooleanProperty } from "@angular/cdk/coercion";
 import { NgClass } from "@angular/common";
-import { Input, HostBinding, Component, model, computed, input } from "@angular/core";
+import {
+  Input,
+  HostBinding,
+  Component,
+  model,
+  computed,
+  input,
+  ElementRef,
+  inject,
+  Signal,
+} from "@angular/core";
 import { toObservable, toSignal } from "@angular/core/rxjs-interop";
 import { debounce, interval } from "rxjs";
 
 import { ButtonLikeAbstraction, ButtonType, ButtonSize } from "../shared/button-like.abstraction";
+import { ariaDisableElement } from "../utils";
 
 const focusRing = [
   "focus-visible:tw-ring-2",
@@ -31,9 +42,7 @@ const buttonStyles: Record<ButtonType, string[]> = {
     "tw-bg-transparent",
     "tw-border-primary-600",
     "!tw-text-primary-600",
-    "hover:tw-bg-primary-600",
-    "hover:tw-border-primary-600",
-    "hover:!tw-text-contrast",
+    "hover:tw-bg-hover-default",
     ...focusRing,
   ],
   danger: [
@@ -52,10 +61,9 @@ const buttonStyles: Record<ButtonType, string[]> = {
   selector: "button[bitButton], a[bitButton]",
   templateUrl: "button.component.html",
   providers: [{ provide: ButtonLikeAbstraction, useExisting: ButtonComponent }],
-  standalone: true,
   imports: [NgClass],
   host: {
-    "[attr.disabled]": "disabledAttr()",
+    "[attr.aria-disabled]": "disabledAttr()",
   },
 })
 export class ButtonComponent implements ButtonLikeAbstraction {
@@ -72,27 +80,28 @@ export class ButtonComponent implements ButtonLikeAbstraction {
       "focus:tw-outline-none",
     ]
       .concat(this.block ? ["tw-w-full", "tw-block"] : ["tw-inline-block"])
-      .concat(buttonStyles[this.buttonType ?? "secondary"])
       .concat(
         this.showDisabledStyles() || this.disabled()
           ? [
-              "disabled:tw-bg-secondary-300",
-              "disabled:hover:tw-bg-secondary-300",
-              "disabled:tw-border-secondary-300",
-              "disabled:hover:tw-border-secondary-300",
-              "disabled:!tw-text-muted",
-              "disabled:hover:!tw-text-muted",
-              "disabled:tw-cursor-not-allowed",
-              "disabled:hover:tw-no-underline",
+              "aria-disabled:!tw-bg-secondary-300",
+              "hover:tw-bg-secondary-300",
+              "aria-disabled:tw-border-secondary-300",
+              "hover:tw-border-secondary-300",
+              "aria-disabled:!tw-text-muted",
+              "hover:!tw-text-muted",
+              "aria-disabled:tw-cursor-not-allowed",
+              "hover:tw-no-underline",
+              "aria-disabled:tw-pointer-events-none",
             ]
           : [],
       )
+      .concat(buttonStyles[this.buttonType ?? "secondary"])
       .concat(buttonSizeStyles[this.size() || "default"]);
   }
 
   protected disabledAttr = computed(() => {
     const disabled = this.disabled() != null && this.disabled() !== false;
-    return disabled || this.loading() ? true : null;
+    return disabled || this.loading() ? true : undefined;
   });
 
   /**
@@ -141,4 +150,9 @@ export class ButtonComponent implements ButtonLikeAbstraction {
   );
 
   disabled = model<boolean>(false);
+  private el = inject(ElementRef<HTMLButtonElement>);
+
+  constructor() {
+    ariaDisableElement(this.el.nativeElement, this.disabledAttr as Signal<boolean | undefined>);
+  }
 }
diff --git a/libs/components/src/button/button.mdx b/libs/components/src/button/button.mdx
index 61874922fc7..b0f347ba337 100644
--- a/libs/components/src/button/button.mdx
+++ b/libs/components/src/button/button.mdx
@@ -1,4 +1,12 @@
-import { Meta, Canvas, Primary, Controls } from "@storybook/addon-docs";
+import {
+  Markdown,
+  Meta,
+  Canvas,
+  Primary,
+  Controls,
+  Title,
+  Description,
+} from "@storybook/addon-docs";
 
 import * as stories from "./button.stories";
 
@@ -8,10 +16,9 @@ import * as stories from "./button.stories";
 import { ButtonModule } from "@bitwarden/components";
 ```
 
-# Button
+<Title />
 
-Buttons are interactive elements that can be triggered using a mouse, keyboard, or touch. They are
-used to indicate actions that can be performed by a user such as submitting a form.
+### Default / Secondary
 
 <Primary />
 
@@ -30,7 +37,7 @@ takes:
 
 ### Groups
 
-Groups of buttons should be seperated by a `0.5` rem gap. Usually acomplished by using the
+Groups of buttons should be separated by a `0.5` rem gap. Usually accomplished by using the
 `tw-gap-2` class in the button group container.
 
 Groups within page content, dialog footers or forms should have the `primary` call to action placed
@@ -41,26 +48,24 @@ right.
 
 There are 3 main styles for the button: Primary, Secondary, and Danger.
 
-### Primary
+### Default / Secondary
 
-<Canvas of={stories.Primary} />
+The secondary styling(shown above) should be used for secondary calls to action. An action is
+"secondary" if it relates indirectly to the purpose of a page. There may be multiple secondary
+buttons next to each other; however, generally there should only be 1 or 2 calls to action per page.
+
+### Primary
 
 Use the primary button styling for all Primary call to actions. An action is "primary" if it relates
 to the main purpose of a page. There should never be 2 primary styled buttons next to each other.
 
-### Secondary
-
-<Canvas of={stories.Secondary} />
-
-The secondary styling should be used for secondary calls to action. An action is "secondary" if it
-relates indirectly to the purpose of a page. There may be multiple secondary buttons next to each
-other; however, generally there should only be 1 or 2 calls to action per page.
+<Canvas of={stories.Primary} />
 
 ### Danger
 
-<Canvas of={stories.Danger} />
+Use the danger styling only in settings when the user may perform a permanent destructive action.
 
-Use the danger styling only in settings when the user may preform a permanent action.
+<Canvas of={stories.Danger} />
 
 ## Disabled UI
 
@@ -114,7 +119,7 @@ success toast).
 ### Submit and async actions
 
 Both submit and async action buttons use a loading button state while an action is taken. If your
-button is preforming a long running task in the background like a server API call, be sure to review
+button is performing a long running task in the background like a server API call, be sure to review
 the [Async Actions Directive](?path=/story/component-library-async-actions-overview--page).
 
 <Canvas of={stories.Loading} />
diff --git a/libs/components/src/button/button.stories.ts b/libs/components/src/button/button.stories.ts
index 759bd1a352c..29a9e367fcc 100644
--- a/libs/components/src/button/button.stories.ts
+++ b/libs/components/src/button/button.stories.ts
@@ -1,15 +1,15 @@
 import { Meta, StoryObj } from "@storybook/angular";
 
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
+
 import { ButtonComponent } from "./button.component";
 
 export default {
   title: "Component Library/Button",
   component: ButtonComponent,
   args: {
-    buttonType: "primary",
     disabled: false,
     loading: false,
-    size: "default",
   },
   argTypes: {
     size: {
@@ -27,40 +27,27 @@ export default {
 
 type Story = StoryObj<ButtonComponent>;
 
-export const Primary: Story = {
+export const Default: Story = {
   render: (args) => ({
     props: args,
     template: /*html*/ `
-    <div class="tw-flex tw-gap-4 tw-mb-6 tw-items-center">
-      <button bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block">Button</button>
-      <button bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-hover">Button:hover</button>
-      <button bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-focus-visible">Button:focus-visible</button>
-      <button bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-hover tw-test-focus-visible">Button:hover:focus-visible</button>
-      <button bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-active">Button:active</button>
-    </div>
-    <div class="tw-flex tw-gap-4 tw-items-center">
-      <a href="#" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block">Anchor</a>
-      <a href="#" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-hover">Anchor:hover</a>
-      <a href="#" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-focus-visible">Anchor:focus-visible</a>
-      <a href="#" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-hover tw-test-focus-visible">Anchor:hover:focus-visible</a>
-      <a href="#" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-active">Anchor:active</a>
-    </div>
+      <button bitButton ${formatArgsForCodeSnippet<ButtonComponent>(args)}>Button</button>
     `,
   }),
-  args: {
-    buttonType: "primary",
-  },
-};
-
-export const Secondary: Story = {
-  ...Primary,
   args: {
     buttonType: "secondary",
   },
 };
 
+export const Primary: Story = {
+  ...Default,
+  args: {
+    buttonType: "primary",
+  },
+};
+
 export const Danger: Story = {
-  ...Primary,
+  ...Default,
   args: {
     buttonType: "danger",
   },
@@ -83,16 +70,8 @@ export const Small: Story = {
 };
 
 export const Loading: Story = {
-  render: (args) => ({
-    props: args,
-    template: `
-      <button bitButton [disabled]="disabled" [loading]="loading" [block]="block" buttonType="primary" class="tw-mr-2">Primary</button>
-      <button bitButton [disabled]="disabled" [loading]="loading" [block]="block" buttonType="secondary" class="tw-mr-2">Secondary</button>
-      <button bitButton [disabled]="disabled" [loading]="loading" [block]="block" buttonType="danger" class="tw-mr-2">Danger</button>
-    `,
-  }),
+  ...Default,
   args: {
-    disabled: false,
     loading: true,
   },
 };
@@ -101,7 +80,6 @@ export const Disabled: Story = {
   ...Loading,
   args: {
     disabled: true,
-    loading: false,
   },
 };
 
@@ -110,13 +88,13 @@ export const DisabledWithAttribute: Story = {
     props: args,
     template: `
       @if (disabled) {
-        <button bitButton disabled [loading]="loading" [block]="block" buttonType="primary" class="tw-mr-2">Primary</button>
-        <button bitButton disabled [loading]="loading" [block]="block" buttonType="secondary" class="tw-mr-2">Secondary</button>
-        <button bitButton disabled [loading]="loading" [block]="block" buttonType="danger" class="tw-mr-2">Danger</button>
+        <button bitButton disabled [loading]="loading" [block]="block" buttonType="primary" class="tw-me-2">Primary</button>
+        <button bitButton disabled [loading]="loading" [block]="block" buttonType="secondary" class="tw-me-2">Secondary</button>
+        <button bitButton disabled [loading]="loading" [block]="block" buttonType="danger" class="tw-me-2">Danger</button>
       } @else {
-        <button bitButton [loading]="loading" [block]="block" buttonType="primary" class="tw-mr-2">Primary</button>
-        <button bitButton [loading]="loading" [block]="block" buttonType="secondary" class="tw-mr-2">Secondary</button>
-        <button bitButton [loading]="loading" [block]="block" buttonType="danger" class="tw-mr-2">Danger</button>
+        <button bitButton [loading]="loading" [block]="block" buttonType="primary" class="tw-me-2">Primary</button>
+        <button bitButton [loading]="loading" [block]="block" buttonType="secondary" class="tw-me-2">Secondary</button>
+        <button bitButton [loading]="loading" [block]="block" buttonType="danger" class="tw-me-2">Danger</button>
       }
     `,
   }),
@@ -132,10 +110,10 @@ export const Block: Story = {
     template: `
       <span class="tw-flex">
         <button bitButton [buttonType]="buttonType" [block]="block">[block]="true" Button</button>
-        <a bitButton [buttonType]="buttonType" [block]="block" href="#" class="tw-ml-2">[block]="true" Link</a>
+        <a bitButton [buttonType]="buttonType" [block]="block" href="#" class="tw-ms-2">[block]="true" Link</a>
 
-        <button bitButton [buttonType]="buttonType" block class="tw-ml-2">block Button</button>
-        <a bitButton [buttonType]="buttonType" block href="#" class="tw-ml-2">block Link</a>
+        <button bitButton [buttonType]="buttonType" block class="tw-ms-2">block Button</button>
+        <a bitButton [buttonType]="buttonType" block href="#" class="tw-ms-2">block Link</a>
       </span>
     `,
   }),
@@ -165,3 +143,28 @@ export const WithIcon: Story = {
     `,
   }),
 };
+
+export const InteractionStates: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+    <div class="tw-flex tw-gap-4 tw-mb-6 tw-items-center">
+      <button bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block">Button</button>
+      <button bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-hover">Button:hover</button>
+      <button bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-focus-visible">Button:focus-visible</button>
+      <button bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-hover tw-test-focus-visible">Button:hover:focus-visible</button>
+      <button bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-active">Button:active</button>
+    </div>
+    <div class="tw-flex tw-gap-4 tw-items-center">
+      <a href="#" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block">Anchor</a>
+      <a href="#" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-hover">Anchor:hover</a>
+      <a href="#" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-focus-visible">Anchor:focus-visible</a>
+      <a href="#" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-hover tw-test-focus-visible">Anchor:hover:focus-visible</a>
+      <a href="#" bitButton [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size" [block]="block" class="tw-test-active">Anchor:active</a>
+    </div>
+    `,
+  }),
+  args: {
+    buttonType: "primary",
+  },
+};
diff --git a/libs/components/src/callout/callout.component.html b/libs/components/src/callout/callout.component.html
index bb7f918df32..99f1ed43996 100644
--- a/libs/components/src/callout/callout.component.html
+++ b/libs/components/src/callout/callout.component.html
@@ -1,17 +1,24 @@
 <aside
-  class="tw-mb-4 tw-box-border tw-rounded-lg tw-border tw-border-l-4 tw-border-solid tw-bg-background tw-pl-3 tw-pr-2 tw-py-2 tw-leading-5 tw-text-main"
+  class="tw-mb-4 tw-box-border tw-rounded-lg tw-bg-background tw-ps-3 tw-pe-3 tw-py-2 tw-leading-5 tw-text-main"
   [ngClass]="calloutClass"
   [attr.aria-labelledby]="titleId"
 >
   @if (title) {
-    <header id="{{ titleId }}" class="tw-mb-1 tw-mt-0 tw-text-base tw-font-semibold">
+    <header
+      id="{{ titleId }}"
+      class="tw-mb-1 tw-mt-0 tw-text-base tw-font-semibold tw-flex tw-gap-2 tw-items-start"
+    >
       @if (icon) {
-        <i class="bwi" [ngClass]="[icon, headerClass]" aria-hidden="true"></i>
+        <i
+          class="bwi !tw-text-main tw-relative tw-top-[3px]"
+          [ngClass]="[icon]"
+          aria-hidden="true"
+        ></i>
       }
       {{ title }}
     </header>
   }
-  <div bitTypography="body2">
+  <div class="tw-ps-6" bitTypography="body2">
     <ng-content></ng-content>
   </div>
 </aside>
diff --git a/libs/components/src/callout/callout.component.spec.ts b/libs/components/src/callout/callout.component.spec.ts
index b7388da3492..fb241961962 100644
--- a/libs/components/src/callout/callout.component.spec.ts
+++ b/libs/components/src/callout/callout.component.spec.ts
@@ -33,8 +33,7 @@ describe("Callout", () => {
       component.type = "success";
       fixture.detectChanges();
       expect(component.title).toBeUndefined();
-      expect(component.icon).toBe("bwi-check");
-      expect(component.headerClass).toBe("!tw-text-success");
+      expect(component.icon).toBe("bwi-check-circle");
     });
 
     it("info", () => {
@@ -42,7 +41,6 @@ describe("Callout", () => {
       fixture.detectChanges();
       expect(component.title).toBeUndefined();
       expect(component.icon).toBe("bwi-info-circle");
-      expect(component.headerClass).toBe("!tw-text-info");
     });
 
     it("warning", () => {
@@ -50,7 +48,6 @@ describe("Callout", () => {
       fixture.detectChanges();
       expect(component.title).toBe("Warning");
       expect(component.icon).toBe("bwi-exclamation-triangle");
-      expect(component.headerClass).toBe("!tw-text-warning");
     });
 
     it("danger", () => {
@@ -58,7 +55,6 @@ describe("Callout", () => {
       fixture.detectChanges();
       expect(component.title).toBe("Error");
       expect(component.icon).toBe("bwi-error");
-      expect(component.headerClass).toBe("!tw-text-danger");
     });
   });
 });
diff --git a/libs/components/src/callout/callout.component.ts b/libs/components/src/callout/callout.component.ts
index 6ffd8d2d0ec..a289496e71b 100644
--- a/libs/components/src/callout/callout.component.ts
+++ b/libs/components/src/callout/callout.component.ts
@@ -10,7 +10,7 @@ import { TypographyModule } from "../typography";
 export type CalloutTypes = "success" | "info" | "warning" | "danger";
 
 const defaultIcon: Record<CalloutTypes, string> = {
-  success: "bwi-check",
+  success: "bwi-check-circle",
   info: "bwi-info-circle",
   warning: "bwi-exclamation-triangle",
   danger: "bwi-error",
@@ -24,10 +24,14 @@ const defaultI18n: Partial<Record<CalloutTypes, string>> = {
 // Increments for each instance of this component
 let nextId = 0;
 
+/**
+ * Callouts are used to communicate important information to the user. Callouts should be used
+ * sparingly, as they command a large amount of visual attention. Avoid using more than 1 callout in
+ * the same location.
+ */
 @Component({
   selector: "bit-callout",
   templateUrl: "callout.component.html",
-  standalone: true,
   imports: [SharedModule, TypographyModule],
 })
 export class CalloutComponent implements OnInit {
@@ -49,26 +53,13 @@ export class CalloutComponent implements OnInit {
   get calloutClass() {
     switch (this.type) {
       case "danger":
-        return "tw-border-danger-600";
+        return "tw-bg-danger-100";
       case "info":
-        return "tw-border-info-600";
+        return "tw-bg-info-100";
       case "success":
-        return "tw-border-success-600";
+        return "tw-bg-success-100";
       case "warning":
-        return "tw-border-warning-600";
-    }
-  }
-
-  get headerClass() {
-    switch (this.type) {
-      case "danger":
-        return "!tw-text-danger";
-      case "info":
-        return "!tw-text-info";
-      case "success":
-        return "!tw-text-success";
-      case "warning":
-        return "!tw-text-warning";
+        return "tw-bg-warning-100";
     }
   }
 }
diff --git a/libs/components/src/callout/callout.mdx b/libs/components/src/callout/callout.mdx
index 160b1e1cc33..a1254b3f691 100644
--- a/libs/components/src/callout/callout.mdx
+++ b/libs/components/src/callout/callout.mdx
@@ -1,4 +1,4 @@
-import { Meta, Canvas, Primary, Controls } from "@storybook/addon-docs";
+import { Meta, Canvas, Primary, Controls, Title, Description } from "@storybook/addon-docs";
 
 import * as stories from "./callout.stories";
 
@@ -8,11 +8,11 @@ import { CalloutModule } from "@bitwarden/components";
 
 <Meta of={stories} />
 
-# Callouts
+<Title />
+<Description />
 
-Callouts are used to communicate important information to the user. Callouts should be used
-sparingly, as they command a large amount of visual attention. Avoid using more than 1 callout in
-the same location.
+<Primary />
+<Controls />
 
 ## Styles
 
diff --git a/libs/components/src/callout/callout.stories.ts b/libs/components/src/callout/callout.stories.ts
index 3101d4316f1..5f66cf8453d 100644
--- a/libs/components/src/callout/callout.stories.ts
+++ b/libs/components/src/callout/callout.stories.ts
@@ -2,6 +2,7 @@ import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
 import { I18nMockService } from "../utils/i18n-mock.service";
 
 import { CalloutComponent } from "./callout.component";
@@ -24,9 +25,6 @@ export default {
       ],
     }),
   ],
-  args: {
-    type: "warning",
-  },
   parameters: {
     design: {
       type: "figma",
@@ -37,36 +35,35 @@ export default {
 
 type Story = StoryObj<CalloutComponent>;
 
-export const Success: Story = {
+export const Info: Story = {
   render: (args) => ({
     props: args,
     template: `
-      <bit-callout [type]="type" [title]="title">Content</bit-callout>
+      <bit-callout ${formatArgsForCodeSnippet<CalloutComponent>(args)}>The content of the callout</bit-callout>
     `,
   }),
   args: {
-    type: "success",
-    title: "Success",
+    title: "Callout title",
   },
 };
 
-export const Info: Story = {
-  ...Success,
+export const Success: Story = {
+  ...Info,
   args: {
-    type: "info",
-    title: "Info",
+    ...Info.args,
+    type: "success",
   },
 };
 
 export const Warning: Story = {
-  ...Success,
+  ...Info,
   args: {
     type: "warning",
   },
 };
 
 export const Danger: Story = {
-  ...Success,
+  ...Info,
   args: {
     type: "danger",
   },
diff --git a/libs/components/src/card/card.component.ts b/libs/components/src/card/card.component.ts
index fdb02f280da..d7e36d1ea9e 100644
--- a/libs/components/src/card/card.component.ts
+++ b/libs/components/src/card/card.component.ts
@@ -2,7 +2,6 @@ import { ChangeDetectionStrategy, Component } from "@angular/core";
 
 @Component({
   selector: "bit-card",
-  standalone: true,
   template: `<ng-content></ng-content>`,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
diff --git a/libs/components/src/checkbox/checkbox.component.ts b/libs/components/src/checkbox/checkbox.component.ts
index 0ce6f1889b5..6159b01d2b5 100644
--- a/libs/components/src/checkbox/checkbox.component.ts
+++ b/libs/components/src/checkbox/checkbox.component.ts
@@ -9,76 +9,89 @@ import { BitFormControlAbstraction } from "../form-control";
   selector: "input[type=checkbox][bitCheckbox]",
   template: "",
   providers: [{ provide: BitFormControlAbstraction, useExisting: CheckboxComponent }],
-  standalone: true,
 })
 export class CheckboxComponent implements BitFormControlAbstraction {
   @HostBinding("class")
   protected inputClasses = [
     "tw-appearance-none",
     "tw-outline-none",
+    "tw-box-border",
     "tw-relative",
     "tw-transition",
     "tw-cursor-pointer",
     "tw-inline-block",
     "tw-align-sub",
-    "tw-rounded",
-    "tw-border",
-    "tw-border-solid",
-    "tw-border-secondary-500",
-    "tw-h-[1.12rem]",
-    "tw-w-[1.12rem]",
-    "tw-mr-1.5",
     "tw-flex-none", // Flexbox fix for bit-form-control
+    "!tw-p-1",
+    "after:tw-inset-1",
+    // negative margin to negate the positioning added by the padding
+    "!-tw-mt-1",
+    "!-tw-mb-1",
+    "!-tw-ms-1",
 
     "before:tw-content-['']",
     "before:tw-block",
-    "before:tw-absolute",
     "before:tw-inset-0",
+    "before:tw-h-[1.12rem]",
+    "before:tw-w-[1.12rem]",
+    "before:tw-rounded",
+    "before:tw-border",
+    "before:tw-border-solid",
+    "before:tw-border-secondary-500",
+    "before:tw-box-border",
 
-    "hover:tw-border-2",
-    "[&>label]:tw-border-2",
+    "after:tw-content-['']",
+    "after:tw-block",
+    "after:tw-absolute",
+    "after:tw-inset-0",
+    "after:tw-h-[1.12rem]",
+    "after:tw-w-[1.12rem]",
+    "after:tw-box-border",
+
+    "hover:before:tw-border-2",
+    "[&>label]:before:tw-border-2",
 
     // if it exists, the parent form control handles focus
-    "[&:not(bit-form-control_*)]:focus-visible:tw-ring-2",
-    "[&:not(bit-form-control_*)]:focus-visible:tw-ring-offset-2",
-    "[&:not(bit-form-control_*)]:focus-visible:tw-ring-primary-600",
+    "[&:not(bit-form-control_*)]:focus-visible:before:tw-ring-2",
+    "[&:not(bit-form-control_*)]:focus-visible:before:tw-ring-offset-2",
+    "[&:not(bit-form-control_*)]:focus-visible:before:tw-ring-primary-600",
 
-    "disabled:tw-cursor-auto",
-    "disabled:tw-border",
-    "disabled:hover:tw-border",
-    "disabled:tw-bg-secondary-100",
-    "disabled:hover:tw-bg-secondary-100",
+    "disabled:before:tw-cursor-auto",
+    "disabled:before:tw-border",
+    "disabled:before:hover:tw-border",
+    "disabled:before:tw-bg-secondary-100",
+    "disabled:hover:before:tw-bg-secondary-100",
 
-    "checked:tw-bg-primary-600",
-    "checked:tw-border-primary-600",
-    "checked:hover:tw-bg-primary-700",
-    "checked:hover:tw-border-primary-700",
-    "[&>label:hover]:checked:tw-bg-primary-700",
-    "[&>label:hover]:checked:tw-border-primary-700",
-    "checked:before:tw-bg-text-contrast",
-    "checked:before:tw-mask-position-[center]",
-    "checked:before:tw-mask-repeat-[no-repeat]",
-    "checked:disabled:tw-border-secondary-100",
-    "checked:disabled:hover:tw-border-secondary-100",
-    "checked:disabled:tw-bg-secondary-100",
-    "checked:disabled:before:tw-bg-text-muted",
+    "checked:before:tw-bg-primary-600",
+    "checked:before:tw-border-primary-600",
+    "checked:before:hover:tw-bg-primary-700",
+    "checked:before:hover:tw-border-primary-700",
+    "[&>label:hover]:checked:before:tw-bg-primary-700",
+    "[&>label:hover]:checked:before:tw-border-primary-700",
+    "checked:after:tw-bg-text-contrast",
+    "checked:after:tw-mask-position-[center]",
+    "checked:after:tw-mask-repeat-[no-repeat]",
+    "checked:disabled:before:tw-border-secondary-100",
+    "checked:disabled:hover:before:tw-border-secondary-100",
+    "checked:disabled:before:tw-bg-secondary-100",
+    "checked:disabled:after:tw-bg-text-muted",
 
-    "[&:not(:indeterminate)]:checked:before:tw-mask-image-[var(--mask-image)]",
-    "indeterminate:before:tw-mask-image-[var(--indeterminate-mask-image)]",
+    "[&:not(:indeterminate)]:checked:after:tw-mask-image-[var(--mask-image)]",
+    "indeterminate:after:tw-mask-image-[var(--indeterminate-mask-image)]",
 
-    "indeterminate:tw-bg-primary-600",
-    "indeterminate:tw-border-primary-600",
-    "indeterminate:hover:tw-bg-primary-700",
-    "indeterminate:hover:tw-border-primary-700",
-    "[&>label:hover]:indeterminate:tw-bg-primary-700",
-    "[&>label:hover]:indeterminate:tw-border-primary-700",
-    "indeterminate:before:tw-bg-text-contrast",
-    "indeterminate:before:tw-mask-position-[center]",
-    "indeterminate:before:tw-mask-repeat-[no-repeat]",
-    "indeterminate:before:tw-mask-image-[var(--indeterminate-mask-image)]",
+    "indeterminate:before:tw-bg-primary-600",
+    "indeterminate:before:tw-border-primary-600",
+    "indeterminate:hover:before:tw-bg-primary-700",
+    "indeterminate:hover:before:tw-border-primary-700",
+    "[&>label:hover]:indeterminate:before:tw-bg-primary-700",
+    "[&>label:hover]:indeterminate:before:tw-border-primary-700",
+    "indeterminate:after:tw-bg-text-contrast",
+    "indeterminate:after:tw-mask-position-[center]",
+    "indeterminate:after:tw-mask-repeat-[no-repeat]",
+    "indeterminate:after:tw-mask-image-[var(--indeterminate-mask-image)]",
     "indeterminate:disabled:tw-border-secondary-100",
     "indeterminate:disabled:tw-bg-secondary-100",
-    "indeterminate:disabled:before:tw-bg-text-muted",
+    "indeterminate:disabled:after:tw-bg-text-muted",
   ];
 
   constructor(@Optional() @Self() private ngControl?: NgControl) {}
diff --git a/libs/components/src/checkbox/checkbox.mdx b/libs/components/src/checkbox/checkbox.mdx
index f3ce0d8fd07..ba5de4d234a 100644
--- a/libs/components/src/checkbox/checkbox.mdx
+++ b/libs/components/src/checkbox/checkbox.mdx
@@ -1,4 +1,4 @@
-import { Meta, Canvas, Source, Primary, Controls } from "@storybook/addon-docs";
+import { Meta, Canvas, Source, Primary, Controls, Title, Description } from "@storybook/addon-docs";
 
 import * as stories from "./checkbox.stories";
 
@@ -8,7 +8,8 @@ import * as stories from "./checkbox.stories";
 import { CheckboxModule } from "@bitwarden/components";
 ```
 
-# Checkbox
+<Title />
+<Description />
 
 <Primary />
 <Controls />
diff --git a/libs/components/src/checkbox/checkbox.stories.ts b/libs/components/src/checkbox/checkbox.stories.ts
index 9a59897e009..9050d97cafc 100644
--- a/libs/components/src/checkbox/checkbox.stories.ts
+++ b/libs/components/src/checkbox/checkbox.stories.ts
@@ -13,6 +13,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 
 import { BadgeModule } from "../badge";
 import { FormControlModule } from "../form-control";
+import { FormFieldModule } from "../form-field";
 import { TableModule } from "../table";
 import { I18nMockService } from "../utils/i18n-mock.service";
 
@@ -30,6 +31,7 @@ const template = /*html*/ `
 @Component({
   selector: "app-example",
   template,
+  imports: [CheckboxModule, FormFieldModule, ReactiveFormsModule],
 })
 class ExampleComponent {
   protected formObj = this.formBuilder.group({
@@ -55,8 +57,8 @@ export default {
   title: "Component Library/Form/Checkbox",
   decorators: [
     moduleMetadata({
-      declarations: [ExampleComponent],
       imports: [
+        ExampleComponent,
         FormsModule,
         ReactiveFormsModule,
         FormControlModule,
@@ -195,17 +197,17 @@ export const Custom: Story = {
     props: args,
     template: /*html*/ `
       <div class="tw-flex tw-flex-col tw-w-32">
-        <label class="tw-text-main tw-flex tw-bg-secondary-300 tw-p-2">
+        <label class="tw-text-main tw-gap-2 tw-flex tw-items-center tw-justify-between tw-bg-secondary-300 tw-p-2">
           A-Z
-          <input class="tw-ml-auto focus-visible:tw-ring-offset-secondary-300" type="checkbox" bitCheckbox />
+          <input class="tw-me-0 focus-visible:tw-ring-offset-secondary-300" type="checkbox" bitCheckbox />
         </label>
-        <label class="tw-text-main tw-flex tw-bg-secondary-300 tw-p-2">
+        <label class="tw-text-main tw-flex tw-items-center tw-justify-between tw-bg-secondary-300 tw-p-2">
           a-z
-          <input class="tw-ml-auto focus-visible:tw-ring-offset-secondary-300" type="checkbox" bitCheckbox />
+          <input class="tw-me-0 focus-visible:tw-ring-offset-secondary-300" type="checkbox" bitCheckbox />
         </label>
-        <label class="tw-text-main tw-flex tw-bg-secondary-300 tw-p-2">
+       <label class="tw-text-main tw-flex tw-items-center tw-justify-between tw-bg-secondary-300 tw-p-2">
           0-9
-          <input class="tw-ml-auto focus-visible:tw-ring-offset-secondary-300" type="checkbox" bitCheckbox />
+          <input class="tw-me-0 focus-visible:tw-ring-offset-secondary-300" type="checkbox" bitCheckbox />
         </label>
       </div>
     `,
@@ -232,7 +234,7 @@ export const InTableRow: Story = {
                 type="checkbox"
                 bitCheckbox
                 id="checkAll"
-                class="tw-mr-2"
+                class="tw-me-2"
               />
               <label for="checkAll" class="tw-mb-0">
                 All
diff --git a/libs/components/src/chip-select/chip-select.component.html b/libs/components/src/chip-select/chip-select.component.html
index ff561ef8403..9591194e6a6 100644
--- a/libs/components/src/chip-select/chip-select.component.html
+++ b/libs/components/src/chip-select/chip-select.component.html
@@ -14,7 +14,7 @@
   <!-- Primary button -->
   <button
     type="button"
-    class="tw-inline-flex tw-gap-1.5 tw-items-center tw-justify-between tw-bg-transparent hover:tw-bg-transparent tw-border-none tw-outline-none tw-w-full tw-py-1 tw-pl-3 last:tw-pr-3 [&:not(:last-child)]:tw-pr-0 tw-truncate tw-text-[color:inherit] tw-text-[length:inherit]"
+    class="tw-inline-flex tw-gap-1.5 tw-items-center tw-justify-between tw-bg-transparent hover:tw-bg-transparent tw-border-none tw-outline-none tw-w-full tw-py-1 tw-ps-3 last:tw-pe-3 [&:not(:last-child)]:tw-pe-0 tw-truncate tw-text-[color:inherit] tw-text-[length:inherit]"
     data-fvw-target
     [ngClass]="{
       'tw-cursor-not-allowed': disabled,
@@ -28,13 +28,14 @@
     #chipSelectButton
   >
     <span class="tw-inline-flex tw-items-center tw-gap-1.5 tw-truncate">
-      <i class="bwi !tw-text-[inherit]" [ngClass]="icon"></i>
+      <i class="bwi !tw-text-[inherit]" [ngClass]="icon" aria-hidden="true"></i>
       <span class="tw-truncate">{{ label }}</span>
     </span>
     @if (!selectedOption) {
       <i
         class="bwi tw-mt-0.5"
         [ngClass]="menuTrigger.isOpen ? 'bwi-angle-up' : 'bwi-angle-down'"
+        aria-hidden="true"
       ></i>
     }
   </button>
@@ -45,13 +46,13 @@
       type="button"
       [attr.aria-label]="'removeItem' | i18n: label"
       [disabled]="disabled"
-      class="tw-bg-transparent hover:tw-bg-transparent tw-outline-none tw-rounded-full tw-py-0.5 tw-px-1 tw-mr-1 tw-text-[color:inherit] tw-text-[length:inherit] tw-border-solid tw-border tw-border-transparent hover:tw-border-text-contrast hover:disabled:tw-border-transparent tw-flex tw-items-center tw-justify-center focus-visible:tw-ring-2 tw-ring-text-contrast focus-visible:hover:tw-border-transparent"
+      class="tw-bg-transparent hover:tw-bg-transparent tw-outline-none tw-rounded-full tw-py-0.5 tw-px-1 tw-me-1 tw-text-[color:inherit] tw-text-[length:inherit] tw-border-solid tw-border tw-border-transparent hover:tw-border-text-contrast hover:disabled:tw-border-transparent tw-flex tw-items-center tw-justify-center focus-visible:tw-ring-2 tw-ring-text-contrast focus-visible:hover:tw-border-transparent"
       [ngClass]="{
         'tw-cursor-not-allowed': disabled,
       }"
       (click)="clear()"
     >
-      <i class="bwi bwi-close tw-text-xs"></i>
+      <i class="bwi bwi-close tw-text-xs" aria-hidden="true"></i>
     </button>
   }
 </div>
@@ -101,7 +102,7 @@
           }
           {{ option.label }}
           @if (option.children?.length) {
-            <i slot="end" class="bwi bwi-angle-right"></i>
+            <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
           }
         </button>
       }
diff --git a/libs/components/src/chip-select/chip-select.component.ts b/libs/components/src/chip-select/chip-select.component.ts
index d1f3bba2624..2eede684688 100644
--- a/libs/components/src/chip-select/chip-select.component.ts
+++ b/libs/components/src/chip-select/chip-select.component.ts
@@ -33,10 +33,12 @@ export type ChipSelectOption<T> = Option<T> & {
   children?: ChipSelectOption<T>[];
 };
 
+/**
+ * `<bit-chip-select>` is a select element that is commonly used to filter items in lists or tables.
+ */
 @Component({
   selector: "bit-chip-select",
   templateUrl: "chip-select.component.html",
-  standalone: true,
   imports: [SharedModule, ButtonModule, IconButtonModule, MenuModule, TypographyModule],
   providers: [
     {
diff --git a/libs/components/src/chip-select/chip-select.mdx b/libs/components/src/chip-select/chip-select.mdx
index d569158b75a..b09b9664f8e 100644
--- a/libs/components/src/chip-select/chip-select.mdx
+++ b/libs/components/src/chip-select/chip-select.mdx
@@ -1,4 +1,4 @@
-import { Meta, Primary, Controls, Canvas } from "@storybook/addon-docs";
+import { Meta, Primary, Controls, Canvas, Title, Description } from "@storybook/addon-docs";
 
 import * as stories from "./chip-select.stories";
 
@@ -8,9 +8,8 @@ import * as stories from "./chip-select.stories";
 import { ChipSelectComponent } from "@bitwarden/components";
 ```
 
-# Chip Select
-
-`<bit-chip-select>` is a select element that is commonly used to filter items in lists or tables.
+<Title />
+<Description />
 
 <Canvas of={stories.Default} />
 
diff --git a/libs/components/src/color-password/color-password.component.ts b/libs/components/src/color-password/color-password.component.ts
index 2dd78e8525d..fb6f6568101 100644
--- a/libs/components/src/color-password/color-password.component.ts
+++ b/libs/components/src/color-password/color-password.component.ts
@@ -10,7 +10,11 @@ enum CharacterType {
   Special,
   Number,
 }
-
+/**
+ * The color password is used primarily in the Generator pages and in the Login type form. It includes
+ * the logic for displaying letters as `text-main`, numbers as `primary`, and special symbols as
+ * `danger`.
+ */
 @Component({
   selector: "bit-color-password",
   template: `@for (character of passwordCharArray(); track $index; let i = $index) {
@@ -21,7 +25,6 @@ enum CharacterType {
       }
     </span>
   }`,
-  standalone: true,
 })
 export class ColorPasswordComponent {
   password = input<string>("");
diff --git a/libs/components/src/color-password/color-password.mdx b/libs/components/src/color-password/color-password.mdx
index 8f3746715e1..4deeace9b9e 100644
--- a/libs/components/src/color-password/color-password.mdx
+++ b/libs/components/src/color-password/color-password.mdx
@@ -1,14 +1,15 @@
-import { Meta, Canvas, Primary, Controls } from "@storybook/addon-docs";
+import { Meta, Canvas, Primary, Controls, Title, Description } from "@storybook/addon-docs";
 
 import * as stories from "./color-password.stories";
 
 <Meta of={stories} />
 
-# Color password
+```ts
+import { ColorPasswordModule } from "@bitwarden/components";
+```
 
-The color password is used primarily in the Generator pages and in the Login type form. It includes
-the logic for displaying letters as `text-main`, numbers as `primary`, and special symbols as
-`danger`.
+<Title />
+<Description />
 
 <Primary />
 <Controls />
diff --git a/libs/components/src/color-password/color-password.stories.ts b/libs/components/src/color-password/color-password.stories.ts
index bb835d97d4a..5a544dcb22e 100644
--- a/libs/components/src/color-password/color-password.stories.ts
+++ b/libs/components/src/color-password/color-password.stories.ts
@@ -1,5 +1,7 @@
 import { Meta, StoryObj } from "@storybook/angular";
 
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
+
 import { ColorPasswordComponent } from "./color-password.component";
 
 const examplePassword = "Wq$Jk😀7j  DX#rS5Sdi!z ";
@@ -25,7 +27,7 @@ export const ColorPassword: Story = {
   render: (args) => ({
     props: args,
     template: `
-      <bit-color-password class="tw-text-base" [password]="password" [showCount]="showCount"></bit-color-password>
+      <bit-color-password ${formatArgsForCodeSnippet<ColorPasswordComponent>(args)}></bit-color-password>
     `,
   }),
 };
@@ -35,7 +37,7 @@ export const WrappedColorPassword: Story = {
     props: args,
     template: `
       <div class="tw-max-w-32">
-        <bit-color-password class="tw-text-base" [password]="password" [showCount]="showCount"></bit-color-password>
+        <bit-color-password ${formatArgsForCodeSnippet<ColorPasswordComponent>(args)}></bit-color-password>
       </div>
     `,
   }),
diff --git a/libs/components/src/container/container.component.ts b/libs/components/src/container/container.component.ts
index 1bcdb8f459b..2f9e15c06b8 100644
--- a/libs/components/src/container/container.component.ts
+++ b/libs/components/src/container/container.component.ts
@@ -6,6 +6,5 @@ import { Component } from "@angular/core";
 @Component({
   selector: "bit-container",
   templateUrl: "container.component.html",
-  standalone: true,
 })
 export class ContainerComponent {}
diff --git a/libs/components/src/copy-click/copy-click.directive.spec.ts b/libs/components/src/copy-click/copy-click.directive.spec.ts
index eab616b141e..321a18596e4 100644
--- a/libs/components/src/copy-click/copy-click.directive.spec.ts
+++ b/libs/components/src/copy-click/copy-click.directive.spec.ts
@@ -1,10 +1,11 @@
 import { Component, ElementRef, ViewChild } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { mock } from "jest-mock-extended";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
-import { ToastService } from "../";
+import { ToastService, CopyClickListener, COPY_CLICK_LISTENER } from "../";
 
 import { CopyClickDirective } from "./copy-click.directive";
 
@@ -21,7 +22,6 @@ import { CopyClickDirective } from "./copy-click.directive";
       #toastWithLabel
     ></button>
   `,
-  standalone: true,
   imports: [CopyClickDirective],
 })
 class TestCopyClickComponent {
@@ -35,10 +35,12 @@ describe("CopyClickDirective", () => {
   let fixture: ComponentFixture<TestCopyClickComponent>;
   const copyToClipboard = jest.fn();
   const showToast = jest.fn();
+  const copyClickListener = mock<CopyClickListener>();
 
   beforeEach(async () => {
     copyToClipboard.mockClear();
     showToast.mockClear();
+    copyClickListener.onCopy.mockClear();
 
     await TestBed.configureTestingModule({
       imports: [TestCopyClickComponent],
@@ -56,6 +58,7 @@ describe("CopyClickDirective", () => {
         },
         { provide: PlatformUtilsService, useValue: { copyToClipboard } },
         { provide: ToastService, useValue: { showToast } },
+        { provide: COPY_CLICK_LISTENER, useValue: copyClickListener },
       ],
     }).compileComponents();
 
@@ -93,7 +96,6 @@ describe("CopyClickDirective", () => {
     successToastButton.click();
     expect(showToast).toHaveBeenCalledWith({
       message: "copySuccessful",
-      title: null,
       variant: "success",
     });
   });
@@ -104,7 +106,6 @@ describe("CopyClickDirective", () => {
     infoToastButton.click();
     expect(showToast).toHaveBeenCalledWith({
       message: "copySuccessful",
-      title: null,
       variant: "info",
     });
   });
@@ -116,8 +117,15 @@ describe("CopyClickDirective", () => {
 
     expect(showToast).toHaveBeenCalledWith({
       message: "valueCopied Content",
-      title: null,
       variant: "success",
     });
   });
+
+  it("should call copyClickListener.onCopy when value is copied", () => {
+    const successToastButton = fixture.componentInstance.successToastButton.nativeElement;
+
+    successToastButton.click();
+
+    expect(copyClickListener.onCopy).toHaveBeenCalledWith("success toast shown");
+  });
 });
diff --git a/libs/components/src/copy-click/copy-click.directive.ts b/libs/components/src/copy-click/copy-click.directive.ts
index f91366360c5..514a55a0242 100644
--- a/libs/components/src/copy-click/copy-click.directive.ts
+++ b/libs/components/src/copy-click/copy-click.directive.ts
@@ -1,15 +1,21 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Directive, HostListener, Input } from "@angular/core";
+import { Directive, HostListener, Input, InjectionToken, Inject, Optional } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
 import { ToastService, ToastVariant } from "../";
 
+/**
+ * Listener that can be provided to receive copy events to allow for customized behavior.
+ */
+export interface CopyClickListener {
+  onCopy(value: string): void;
+}
+
+export const COPY_CLICK_LISTENER = new InjectionToken<CopyClickListener>("CopyClickListener");
+
 @Directive({
   selector: "[appCopyClick]",
-  standalone: true,
 })
 export class CopyClickDirective {
   private _showToast = false;
@@ -19,6 +25,7 @@ export class CopyClickDirective {
     private platformUtilsService: PlatformUtilsService,
     private toastService: ToastService,
     private i18nService: I18nService,
+    @Optional() @Inject(COPY_CLICK_LISTENER) private copyListener?: CopyClickListener,
   ) {}
 
   @Input("appCopyClick") valueToCopy = "";
@@ -27,7 +34,7 @@ export class CopyClickDirective {
    * When set, the toast displayed will show `<valueLabel> copied`
    * instead of the default messaging.
    */
-  @Input() valueLabel: string;
+  @Input() valueLabel?: string;
 
   /**
    * When set without a value, a success toast will be shown when the value is copied
@@ -55,6 +62,10 @@ export class CopyClickDirective {
   @HostListener("click") onClick() {
     this.platformUtilsService.copyToClipboard(this.valueToCopy);
 
+    if (this.copyListener) {
+      this.copyListener.onCopy(this.valueToCopy);
+    }
+
     if (this._showToast) {
       const message = this.valueLabel
         ? this.i18nService.t("valueCopied", this.valueLabel)
@@ -62,7 +73,6 @@ export class CopyClickDirective {
 
       this.toastService.showToast({
         variant: this.toastVariant,
-        title: null,
         message,
       });
     }
diff --git a/libs/components/src/dialog/dialog.service.stories.ts b/libs/components/src/dialog/dialog.service.stories.ts
index e7c5a17c308..c7b8f0ae916 100644
--- a/libs/components/src/dialog/dialog.service.stories.ts
+++ b/libs/components/src/dialog/dialog.service.stories.ts
@@ -1,25 +1,37 @@
-import { DIALOG_DATA, DialogModule, DialogRef } from "@angular/cdk/dialog";
+import { DIALOG_DATA, DialogRef } from "@angular/cdk/dialog";
 import { Component, Inject } from "@angular/core";
-import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
+import { NoopAnimationsModule, provideAnimations } from "@angular/platform-browser/animations";
+import { RouterTestingModule } from "@angular/router/testing";
+import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular";
+import { getAllByRole, userEvent } from "@storybook/test";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { ButtonModule } from "../button";
 import { IconButtonModule } from "../icon-button";
+import { LayoutComponent } from "../layout";
 import { SharedModule } from "../shared";
+import { positionFixedWrapperDecorator } from "../stories/storybook-decorators";
 import { I18nMockService } from "../utils/i18n-mock.service";
 
-import { DialogComponent } from "./dialog/dialog.component";
+import { DialogModule } from "./dialog.module";
 import { DialogService } from "./dialog.service";
-import { DialogCloseDirective } from "./directives/dialog-close.directive";
-import { DialogTitleContainerDirective } from "./directives/dialog-title-container.directive";
 
 interface Animal {
   animal: string;
 }
 
 @Component({
-  template: `<button bitButton type="button" (click)="openDialog()">Open Dialog</button>`,
+  template: `
+    <bit-layout>
+      <button class="tw-mr-2" bitButton type="button" (click)="openDialog()">Open Dialog</button>
+      <button class="tw-mr-2" bitButton type="button" (click)="openDialogNonDismissable()">
+        Open Non-Dismissable Dialog
+      </button>
+      <button bitButton type="button" (click)="openDrawer()">Open Drawer</button>
+    </bit-layout>
+  `,
+  imports: [ButtonModule, LayoutComponent],
 })
 class StoryDialogComponent {
   constructor(public dialogService: DialogService) {}
@@ -31,6 +43,23 @@ class StoryDialogComponent {
       },
     });
   }
+
+  openDialogNonDismissable() {
+    this.dialogService.open(NonDismissableContent, {
+      data: {
+        animal: "panda",
+      },
+      disableClose: true,
+    });
+  }
+
+  openDrawer() {
+    this.dialogService.openDrawer(StoryDialogContentComponent, {
+      data: {
+        animal: "panda",
+      },
+    });
+  }
 }
 
 @Component({
@@ -49,6 +78,7 @@ class StoryDialogComponent {
       </ng-container>
     </bit-dialog>
   `,
+  imports: [DialogModule, ButtonModule],
 })
 class StoryDialogContentComponent {
   constructor(
@@ -61,29 +91,67 @@ class StoryDialogContentComponent {
   }
 }
 
+@Component({
+  template: `
+    <bit-dialog title="Dialog Title" dialogSize="large">
+      <span bitDialogContent>
+        Dialog body text goes here.
+        <br />
+        Animal: {{ animal }}
+      </span>
+      <ng-container bitDialogFooter>
+        <button type="button" bitButton buttonType="primary" (click)="dialogRef.close()">
+          Save
+        </button>
+      </ng-container>
+    </bit-dialog>
+  `,
+  imports: [DialogModule, ButtonModule],
+})
+class NonDismissableContent {
+  constructor(
+    public dialogRef: DialogRef,
+    @Inject(DIALOG_DATA) private data: Animal,
+  ) {}
+
+  get animal() {
+    return this.data?.animal;
+  }
+}
+
 export default {
   title: "Component Library/Dialogs/Service",
   component: StoryDialogComponent,
   decorators: [
+    positionFixedWrapperDecorator(),
     moduleMetadata({
-      declarations: [StoryDialogContentComponent],
       imports: [
         SharedModule,
         ButtonModule,
+        NoopAnimationsModule,
         DialogModule,
         IconButtonModule,
-        DialogCloseDirective,
-        DialogComponent,
-        DialogTitleContainerDirective,
+        RouterTestingModule,
+        LayoutComponent,
       ],
+      providers: [DialogService],
+    }),
+    applicationConfig({
       providers: [
+        provideAnimations(),
         DialogService,
         {
           provide: I18nService,
           useFactory: () => {
             return new I18nMockService({
               close: "Close",
-              loading: "Loading",
+              search: "Search",
+              skipToContent: "Skip to content",
+              submenu: "submenu",
+              toggleCollapse: "toggle collapse",
+              toggleSideNavigation: "Toggle side navigation",
+              yes: "Yes",
+              no: "No",
             });
           },
         },
@@ -100,4 +168,30 @@ export default {
 
 type Story = StoryObj<StoryDialogComponent>;
 
-export const Default: Story = {};
+export const Default: Story = {
+  play: async (context) => {
+    const canvas = context.canvasElement;
+
+    const button = getAllByRole(canvas, "button")[0];
+    await userEvent.click(button);
+  },
+};
+
+export const NonDismissable: Story = {
+  play: async (context) => {
+    const canvas = context.canvasElement;
+
+    const button = getAllByRole(canvas, "button")[1];
+    await userEvent.click(button);
+  },
+};
+
+/** Drawers must be a descendant of `bit-layout`. */
+export const Drawer: Story = {
+  play: async (context) => {
+    const canvas = context.canvasElement;
+
+    const button = getAllByRole(canvas, "button")[2];
+    await userEvent.click(button);
+  },
+};
diff --git a/libs/components/src/dialog/dialog.service.ts b/libs/components/src/dialog/dialog.service.ts
index 83aaaff470e..409bf0a5b55 100644
--- a/libs/components/src/dialog/dialog.service.ts
+++ b/libs/components/src/dialog/dialog.service.ts
@@ -1,31 +1,25 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import {
-  DEFAULT_DIALOG_CONFIG,
-  Dialog,
-  DialogConfig,
-  DialogRef,
-  DIALOG_SCROLL_STRATEGY,
+  Dialog as CdkDialog,
+  DialogConfig as CdkDialogConfig,
+  DialogRef as CdkDialogRefBase,
+  DIALOG_DATA,
+  DialogCloseOptions,
 } from "@angular/cdk/dialog";
-import { ComponentType, Overlay, OverlayContainer, ScrollStrategy } from "@angular/cdk/overlay";
-import {
-  Inject,
-  Injectable,
-  Injector,
-  OnDestroy,
-  Optional,
-  SkipSelf,
-  TemplateRef,
-} from "@angular/core";
+import { ComponentType, ScrollStrategy } from "@angular/cdk/overlay";
+import { ComponentPortal, Portal } from "@angular/cdk/portal";
+import { Injectable, Injector, TemplateRef, inject } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { NavigationEnd, Router } from "@angular/router";
-import { filter, firstValueFrom, Subject, switchMap, takeUntil } from "rxjs";
+import { filter, firstValueFrom, map, Observable, Subject, switchMap } from "rxjs";
 
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
+import { DrawerService } from "../drawer/drawer.service";
+
 import { SimpleConfigurableDialogComponent } from "./simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component";
-import { SimpleDialogOptions, Translation } from "./simple-dialog/types";
+import { SimpleDialogOptions } from "./simple-dialog/types";
 
 /**
  * The default `BlockScrollStrategy` does not work well with virtual scrolling.
@@ -48,61 +42,163 @@ class CustomBlockScrollStrategy implements ScrollStrategy {
   detach() {}
 }
 
+export abstract class DialogRef<R = unknown, C = unknown>
+  implements Pick<CdkDialogRef<R, C>, "close" | "closed" | "disableClose" | "componentInstance">
+{
+  abstract readonly isDrawer?: boolean;
+
+  // --- From CdkDialogRef ---
+  abstract close(result?: R, options?: DialogCloseOptions): void;
+  abstract readonly closed: Observable<R | undefined>;
+  abstract disableClose: boolean | undefined;
+  /**
+   * @deprecated
+   * Does not work with drawer dialogs.
+   **/
+  abstract componentInstance: C | null;
+}
+
+export type DialogConfig<D = unknown, R = unknown> = Pick<
+  CdkDialogConfig<D, R>,
+  "data" | "disableClose" | "ariaModal" | "positionStrategy" | "height" | "width"
+>;
+
+class DrawerDialogRef<R = unknown, C = unknown> implements DialogRef<R, C> {
+  readonly isDrawer = true;
+
+  private _closed = new Subject<R | undefined>();
+  closed = this._closed.asObservable();
+  disableClose = false;
+
+  /** The portal containing the drawer */
+  portal?: Portal<unknown>;
+
+  constructor(private drawerService: DrawerService) {}
+
+  close(result?: R, _options?: DialogCloseOptions): void {
+    if (this.disableClose) {
+      return;
+    }
+    this.drawerService.close(this.portal!);
+    this._closed.next(result);
+    this._closed.complete();
+  }
+
+  componentInstance: C | null = null;
+}
+
+/**
+ * DialogRef that delegates functionality to the CDK implementation
+ **/
+export class CdkDialogRef<R = unknown, C = unknown> implements DialogRef<R, C> {
+  readonly isDrawer = false;
+
+  /** This is not available until after construction, @see DialogService.open. */
+  cdkDialogRefBase!: CdkDialogRefBase<R, C>;
+
+  // --- Delegated to CdkDialogRefBase ---
+
+  close(result?: R, options?: DialogCloseOptions): void {
+    this.cdkDialogRefBase.close(result, options);
+  }
+
+  get closed(): Observable<R | undefined> {
+    return this.cdkDialogRefBase.closed;
+  }
+
+  get disableClose(): boolean | undefined {
+    return this.cdkDialogRefBase.disableClose;
+  }
+  set disableClose(value: boolean | undefined) {
+    this.cdkDialogRefBase.disableClose = value;
+  }
+
+  // Delegate the `componentInstance` property to the CDK DialogRef
+  get componentInstance(): C | null {
+    return this.cdkDialogRefBase.componentInstance;
+  }
+}
+
 @Injectable()
-export class DialogService extends Dialog implements OnDestroy {
-  private _destroy$ = new Subject<void>();
+export class DialogService {
+  private dialog = inject(CdkDialog);
+  private drawerService = inject(DrawerService);
+  private injector = inject(Injector);
+  private router = inject(Router, { optional: true });
+  private authService = inject(AuthService, { optional: true });
+  private i18nService = inject(I18nService);
 
   private backDropClasses = ["tw-fixed", "tw-bg-black", "tw-bg-opacity-30", "tw-inset-0"];
-
   private defaultScrollStrategy = new CustomBlockScrollStrategy();
+  private activeDrawer: DrawerDialogRef<any, any> | null = null;
 
-  constructor(
-    /** Parent class constructor */
-    _overlay: Overlay,
-    _injector: Injector,
-    @Optional() @Inject(DEFAULT_DIALOG_CONFIG) _defaultOptions: DialogConfig,
-    @Optional() @SkipSelf() _parentDialog: Dialog,
-    _overlayContainer: OverlayContainer,
-    @Inject(DIALOG_SCROLL_STRATEGY) scrollStrategy: any,
-
-    /** Not in parent class */
-    @Optional() router: Router,
-    @Optional() authService: AuthService,
-
-    protected i18nService: I18nService,
-  ) {
-    super(_overlay, _injector, _defaultOptions, _parentDialog, _overlayContainer, scrollStrategy);
-
+  constructor() {
+    /**
+     * TODO: This logic should exist outside of `libs/components`.
+     * @see https://bitwarden.atlassian.net/browse/CL-657
+     **/
     /** Close all open dialogs if the vault locks */
-    if (router && authService) {
-      router.events
+    if (this.router && this.authService) {
+      this.router.events
         .pipe(
           filter((event) => event instanceof NavigationEnd),
-          switchMap(() => authService.getAuthStatus()),
+          switchMap(() => this.authService!.getAuthStatus()),
           filter((v) => v !== AuthenticationStatus.Unlocked),
-          takeUntil(this._destroy$),
+          takeUntilDestroyed(),
         )
         .subscribe(() => this.closeAll());
     }
   }
 
-  override ngOnDestroy(): void {
-    this._destroy$.next();
-    this._destroy$.complete();
-    super.ngOnDestroy();
-  }
-
-  override open<R = unknown, D = unknown, C = unknown>(
+  open<R = unknown, D = unknown, C = unknown>(
     componentOrTemplateRef: ComponentType<C> | TemplateRef<C>,
     config?: DialogConfig<D, DialogRef<R, C>>,
   ): DialogRef<R, C> {
-    config = {
+    /**
+     * This is a bit circular in nature:
+     * We need the DialogRef instance for the DI injector that is passed *to* `Dialog.open`,
+     * but we get the base CDK DialogRef instance *from* `Dialog.open`.
+     *
+     * To break the circle, we define CDKDialogRef as a wrapper for the CDKDialogRefBase.
+     * This allows us to create the class instance and provide the base instance later, almost like "deferred inheritance".
+     **/
+    const ref = new CdkDialogRef<R, C>();
+    const injector = this.createInjector({
+      data: config?.data,
+      dialogRef: ref,
+    });
+
+    // Merge the custom config with the default config
+    const _config = {
       backdropClass: this.backDropClasses,
       scrollStrategy: this.defaultScrollStrategy,
+      injector,
       ...config,
     };
 
-    return super.open(componentOrTemplateRef, config);
+    ref.cdkDialogRefBase = this.dialog.open<R, D, C>(componentOrTemplateRef, _config);
+    return ref;
+  }
+
+  /** Opens a dialog in the side drawer */
+  openDrawer<R = unknown, D = unknown, C = unknown>(
+    component: ComponentType<C>,
+    config?: DialogConfig<D, DialogRef<R, C>>,
+  ): DialogRef<R, C> {
+    this.activeDrawer?.close();
+    /**
+     * This is also circular. When creating the DrawerDialogRef, we do not yet have a portal instance to provide to the injector.
+     * Similar to `this.open`, we get around this with mutability.
+     */
+    this.activeDrawer = new DrawerDialogRef(this.drawerService);
+    const portal = new ComponentPortal(
+      component,
+      null,
+      this.createInjector({ data: config?.data, dialogRef: this.activeDrawer }),
+    );
+    this.activeDrawer.portal = portal;
+    this.drawerService.open(portal);
+    return this.activeDrawer;
   }
 
   /**
@@ -113,8 +209,7 @@ export class DialogService extends Dialog implements OnDestroy {
    */
   async openSimpleDialog(simpleDialogOptions: SimpleDialogOptions): Promise<boolean> {
     const dialogRef = this.openSimpleDialogRef(simpleDialogOptions);
-
-    return firstValueFrom(dialogRef.closed);
+    return firstValueFrom(dialogRef.closed.pipe(map((v: boolean | undefined) => !!v)));
   }
 
   /**
@@ -134,20 +229,29 @@ export class DialogService extends Dialog implements OnDestroy {
     });
   }
 
-  protected translate(translation: string | Translation, defaultKey?: string): string {
-    if (translation == null && defaultKey == null) {
-      return null;
-    }
+  /** Close all open dialogs */
+  closeAll(): void {
+    return this.dialog.closeAll();
+  }
 
-    if (translation == null) {
-      return this.i18nService.t(defaultKey);
-    }
-
-    // Translation interface use implies we must localize.
-    if (typeof translation === "object") {
-      return this.i18nService.t(translation.key, ...(translation.placeholders ?? []));
-    }
-
-    return translation;
+  /** The injector that is passed to the opened dialog */
+  private createInjector(opts: { data: unknown; dialogRef: DialogRef }): Injector {
+    return Injector.create({
+      providers: [
+        {
+          provide: DIALOG_DATA,
+          useValue: opts.data,
+        },
+        {
+          provide: DialogRef,
+          useValue: opts.dialogRef,
+        },
+        {
+          provide: CdkDialogRefBase,
+          useValue: opts.dialogRef,
+        },
+      ],
+      parent: this.injector,
+    });
   }
 }
diff --git a/libs/components/src/dialog/dialog/dialog.component.html b/libs/components/src/dialog/dialog/dialog.component.html
index 01f05985127..db08f88799b 100644
--- a/libs/components/src/dialog/dialog/dialog.component.html
+++ b/libs/components/src/dialog/dialog/dialog.component.html
@@ -1,12 +1,22 @@
+@let isDrawer = dialogRef?.isDrawer;
 <section
-  class="tw-flex tw-w-full tw-flex-col tw-self-center tw-overflow-hidden tw-rounded-xl tw-border tw-border-solid tw-border-secondary-300 tw-bg-background tw-text-main"
-  [ngClass]="width"
+  class="tw-flex tw-w-full tw-flex-col tw-self-center tw-overflow-hidden tw-border tw-border-solid tw-border-secondary-300 tw-bg-background tw-text-main"
+  [ngClass]="[width, isDrawer ? 'tw-h-screen tw-border-t-0' : 'tw-rounded-xl']"
   @fadeIn
+  cdkTrapFocus
+  cdkTrapFocusAutoCapture
 >
+  @let showHeaderBorder = !isDrawer || background === "alt" || bodyHasScrolledFrom().top;
   <header
-    class="tw-flex tw-justify-between tw-items-center tw-gap-4 tw-border-0 tw-border-b tw-border-solid tw-border-secondary-300 tw-p-4"
+    class="tw-flex tw-justify-between tw-items-center tw-gap-4 tw-border-0 tw-border-b tw-border-solid"
+    [ngClass]="{
+      'tw-p-4': !isDrawer,
+      'tw-p-6 tw-pb-4': isDrawer,
+      'tw-border-secondary-300': showHeaderBorder,
+      'tw-border-transparent': !showHeaderBorder,
+    }"
   >
-    <h1
+    <h2
       bitDialogTitleContainer
       bitTypography="h3"
       noMargin
@@ -19,22 +29,26 @@
         </span>
       }
       <ng-content select="[bitDialogTitle]"></ng-content>
-    </h1>
-    <button
-      type="button"
-      bitIconButton="bwi-close"
-      buttonType="main"
-      size="default"
-      bitDialogClose
-      [attr.title]="'close' | i18n"
-      [attr.aria-label]="'close' | i18n"
-    ></button>
+    </h2>
+    @if (!this.dialogRef?.disableClose) {
+      <button
+        type="button"
+        bitIconButton="bwi-close"
+        buttonType="main"
+        size="default"
+        bitDialogClose
+        [attr.title]="'close' | i18n"
+        [attr.aria-label]="'close' | i18n"
+      ></button>
+    }
   </header>
 
   <div
-    class="tw-relative tw-flex tw-flex-col tw-overflow-hidden"
+    class="tw-relative tw-flex-1 tw-flex tw-flex-col tw-overflow-hidden"
     [ngClass]="{
       'tw-min-h-60': loading,
+      'tw-bg-background': background === 'default',
+      'tw-bg-background-alt': background === 'alt',
     }"
   >
     @if (loading) {
@@ -43,20 +57,28 @@
       </div>
     }
     <div
+      cdkScrollable
       [ngClass]="{
-        'tw-p-4': !disablePadding,
+        'tw-p-4': !disablePadding && !isDrawer,
+        'tw-px-6 tw-py-4': !disablePadding && isDrawer,
         'tw-overflow-y-auto': !loading,
         'tw-invisible tw-overflow-y-hidden': loading,
-        'tw-bg-background': background === 'default',
-        'tw-bg-background-alt': background === 'alt',
       }"
     >
       <ng-content select="[bitDialogContent]"></ng-content>
     </div>
   </div>
 
+  @let showFooterBorder = !isDrawer || background === "alt" || bodyHasScrolledFrom().bottom;
   <footer
-    class="tw-flex tw-flex-row tw-items-center tw-gap-2 tw-border-0 tw-border-t tw-border-solid tw-border-secondary-300 tw-bg-background tw-p-4"
+    class="tw-flex tw-flex-row tw-items-center tw-gap-2 tw-border-0 tw-border-t tw-border-solid tw-border-secondary-300 tw-bg-background"
+    [ngClass]="[isDrawer ? 'tw-px-6 tw-py-4' : 'tw-p-4']"
+    [ngClass]="{
+      'tw-px-6 tw-py-4': isDrawer,
+      'tw-p-4': !isDrawer,
+      'tw-border-secondary-300': showFooterBorder,
+      'tw-border-transparent': !showFooterBorder,
+    }"
   >
     <ng-content select="[bitDialogFooter]"></ng-content>
   </footer>
diff --git a/libs/components/src/dialog/dialog/dialog.component.ts b/libs/components/src/dialog/dialog/dialog.component.ts
index 504dbd3a1ea..c0ddab27dd5 100644
--- a/libs/components/src/dialog/dialog/dialog.component.ts
+++ b/libs/components/src/dialog/dialog/dialog.component.ts
@@ -1,14 +1,18 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { CdkTrapFocus } from "@angular/cdk/a11y";
 import { coerceBooleanProperty } from "@angular/cdk/coercion";
+import { CdkScrollable } from "@angular/cdk/scrolling";
 import { CommonModule } from "@angular/common";
-import { Component, HostBinding, Input } from "@angular/core";
+import { Component, HostBinding, Input, inject, viewChild } from "@angular/core";
 
 import { I18nPipe } from "@bitwarden/ui-common";
 
 import { BitIconButtonComponent } from "../../icon-button/icon-button.component";
 import { TypographyDirective } from "../../typography/typography.directive";
+import { hasScrolledFrom } from "../../utils/has-scrolled-from";
 import { fadeIn } from "../animations";
+import { DialogRef } from "../dialog.service";
 import { DialogCloseDirective } from "../directives/dialog-close.directive";
 import { DialogTitleContainerDirective } from "../directives/dialog-title-container.directive";
 
@@ -16,7 +20,9 @@ import { DialogTitleContainerDirective } from "../directives/dialog-title-contai
   selector: "bit-dialog",
   templateUrl: "./dialog.component.html",
   animations: [fadeIn],
-  standalone: true,
+  host: {
+    "(keydown.esc)": "handleEsc($event)",
+  },
   imports: [
     CommonModule,
     DialogTitleContainerDirective,
@@ -24,9 +30,15 @@ import { DialogTitleContainerDirective } from "../directives/dialog-title-contai
     BitIconButtonComponent,
     DialogCloseDirective,
     I18nPipe,
+    CdkTrapFocus,
+    CdkScrollable,
   ],
 })
 export class DialogComponent {
+  protected dialogRef = inject(DialogRef, { optional: true });
+  private scrollableBody = viewChild.required(CdkScrollable);
+  protected bodyHasScrolledFrom = hasScrolledFrom(this.scrollableBody);
+
   /** Background color */
   @Input()
   background: "default" | "alt" = "default";
@@ -64,21 +76,33 @@ export class DialogComponent {
 
   @HostBinding("class") get classes() {
     // `tw-max-h-[90vh]` is needed to prevent dialogs from overlapping the desktop header
-    return ["tw-flex", "tw-flex-col", "tw-w-screen", "tw-p-4", "tw-max-h-[90vh]"].concat(
-      this.width,
-    );
+    return ["tw-flex", "tw-flex-col", "tw-w-screen"]
+      .concat(
+        this.width,
+        this.dialogRef?.isDrawer
+          ? ["tw-min-h-screen", "md:tw-w-[23rem]"]
+          : ["tw-p-4", "tw-w-screen", "tw-max-h-[90vh]"],
+      )
+      .flat();
+  }
+
+  handleEsc(event: Event) {
+    if (!this.dialogRef?.disableClose) {
+      this.dialogRef?.close();
+      event.stopPropagation();
+    }
   }
 
   get width() {
     switch (this.dialogSize) {
       case "small": {
-        return "tw-max-w-sm";
+        return "md:tw-max-w-sm";
       }
       case "large": {
-        return "tw-max-w-3xl";
+        return "md:tw-max-w-3xl";
       }
       default: {
-        return "tw-max-w-xl";
+        return "md:tw-max-w-xl";
       }
     }
   }
diff --git a/libs/components/src/dialog/dialog/dialog.stories.ts b/libs/components/src/dialog/dialog/dialog.stories.ts
index 03a88458f5a..bb8b2450de2 100644
--- a/libs/components/src/dialog/dialog/dialog.stories.ts
+++ b/libs/components/src/dialog/dialog/dialog.stories.ts
@@ -89,7 +89,7 @@ export const Default: Story = {
           <button bitButton buttonType="secondary" [disabled]="loading">Cancel</button>
           <button
             [disabled]="loading"
-            class="tw-ml-auto"
+            class="tw-ms-auto"
             bitIconButton="bwi-trash"
             buttonType="danger"
             size="default"
@@ -252,7 +252,7 @@ export const WithCards: Story = {
           <button bitButton buttonType="secondary" [disabled]="loading">Cancel</button>
           <button
             [disabled]="loading"
-            class="tw-ml-auto"
+            class="tw-ms-auto"
             bitIconButton="bwi-trash"
             buttonType="danger"
             size="default"
diff --git a/libs/components/src/dialog/dialogs.mdx b/libs/components/src/dialog/dialogs.mdx
index 63df0bfc131..3f44f31a5eb 100644
--- a/libs/components/src/dialog/dialogs.mdx
+++ b/libs/components/src/dialog/dialogs.mdx
@@ -22,6 +22,9 @@ For alerts or simple confirmation actions, like speedbumps, use the
 Dialogs's should be used sparingly as they do call extra attention to themselves and can be
 interruptive if overused.
 
+For non-blocking, supplementary content, open dialogs as a
+[Drawer](?path=/story/component-library-dialogs-service--drawer) (requires `bit-layout`).
+
 ## Placement
 
 Dialogs should be centered vertically and horizontally on screen. Dialogs height should expand to
diff --git a/libs/components/src/dialog/directives/dialog-close.directive.ts b/libs/components/src/dialog/directives/dialog-close.directive.ts
index 5e5fda3e014..5e44ced7c21 100644
--- a/libs/components/src/dialog/directives/dialog-close.directive.ts
+++ b/libs/components/src/dialog/directives/dialog-close.directive.ts
@@ -3,7 +3,6 @@ import { Directive, HostBinding, HostListener, Input, Optional } from "@angular/
 
 @Directive({
   selector: "[bitDialogClose]",
-  standalone: true,
 })
 export class DialogCloseDirective {
   @Input("bitDialogClose") dialogResult: any;
diff --git a/libs/components/src/dialog/directives/dialog-title-container.directive.ts b/libs/components/src/dialog/directives/dialog-title-container.directive.ts
index cf46396967b..e17487f2780 100644
--- a/libs/components/src/dialog/directives/dialog-title-container.directive.ts
+++ b/libs/components/src/dialog/directives/dialog-title-container.directive.ts
@@ -6,7 +6,6 @@ let nextId = 0;
 
 @Directive({
   selector: "[bitDialogTitleContainer]",
-  standalone: true,
 })
 export class DialogTitleContainerDirective implements OnInit {
   @HostBinding("id") id = `bit-dialog-title-${nextId++}`;
diff --git a/libs/components/src/dialog/index.ts b/libs/components/src/dialog/index.ts
index 0ab9a5d9e67..fb4c2721b81 100644
--- a/libs/components/src/dialog/index.ts
+++ b/libs/components/src/dialog/index.ts
@@ -1,4 +1,4 @@
 export * from "./dialog.module";
 export * from "./simple-dialog/types";
 export * from "./dialog.service";
-export { DialogConfig, DIALOG_DATA, DialogRef } from "@angular/cdk/dialog";
+export { DIALOG_DATA } from "@angular/cdk/dialog";
diff --git a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts
index 00026209183..f849fe81df6 100644
--- a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts
@@ -30,7 +30,6 @@ const DEFAULT_COLOR: Record<SimpleDialogType, string> = {
 
 @Component({
   templateUrl: "./simple-configurable-dialog.component.html",
-  standalone: true,
   imports: [
     ReactiveFormsModule,
     BitSubmitDirective,
diff --git a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts
index 87d6eb9fbfc..036ef1177e6 100644
--- a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts
@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
-import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
-import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular";
+import { provideAnimations } from "@angular/platform-browser/animations";
+import { Meta, StoryObj, applicationConfig } from "@storybook/angular";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
@@ -31,6 +31,7 @@ import { DialogModule } from "../../dialog.module";
       </bit-callout>
     }
   `,
+  imports: [ButtonModule, CalloutModule, DialogModule],
 })
 class StoryDialogComponent {
   protected dialogs: { title: string; dialogs: SimpleDialogOptions[] }[] = [
@@ -146,11 +147,9 @@ export default {
   title: "Component Library/Dialogs/Service/SimpleConfigurable",
   component: StoryDialogComponent,
   decorators: [
-    moduleMetadata({
-      imports: [ButtonModule, BrowserAnimationsModule, DialogModule, CalloutModule],
-    }),
     applicationConfig({
       providers: [
+        provideAnimations(),
         {
           provide: I18nService,
           useFactory: () => {
diff --git a/libs/components/src/dialog/simple-dialog/simple-dialog.component.html b/libs/components/src/dialog/simple-dialog/simple-dialog.component.html
index d810838cabb..47cd396a239 100644
--- a/libs/components/src/dialog/simple-dialog/simple-dialog.component.html
+++ b/libs/components/src/dialog/simple-dialog/simple-dialog.component.html
@@ -1,8 +1,8 @@
 <div
-  class="tw-my-4 tw-flex tw-max-h-screen tw-w-96 tw-max-w-90vw tw-flex-col tw-overflow-hidden tw-rounded-3xl tw-border tw-border-solid tw-border-secondary-300 tw-bg-text-contrast tw-text-main"
+  class="tw-my-4 tw-pb-6 tw-pt-8 tw-flex tw-max-h-screen tw-w-96 tw-max-w-90vw tw-flex-col tw-overflow-hidden tw-rounded-3xl tw-border tw-border-solid tw-border-secondary-100 tw-shadow-xl tw-bg-text-contrast tw-text-main"
   @fadeIn
 >
-  <div class="tw-flex tw-flex-col tw-items-center tw-gap-2 tw-px-4 tw-pt-4 tw-text-center">
+  <div class="tw-flex tw-px-6 tw-flex-col tw-items-center tw-gap-2 tw-text-center">
     @if (!hideIcon()) {
       @if (hasIcon) {
         <ng-content select="[bitDialogIcon]"></ng-content>
@@ -20,13 +20,11 @@
     </h1>
   </div>
   <div
-    class="tw-overflow-y-auto tw-px-4 tw-pb-4 tw-text-center tw-text-base tw-break-words tw-hyphens-auto"
+    class="tw-overflow-y-auto tw-px-6 tw-mb-6 tw-text-center tw-text-base tw-break-words tw-hyphens-auto"
   >
     <ng-content select="[bitDialogContent]"></ng-content>
   </div>
-  <div
-    class="tw-flex tw-flex-row tw-gap-2 tw-border-0 tw-border-t tw-border-solid tw-border-secondary-300 tw-p-4"
-  >
+  <div class="tw-flex tw-flex-col tw-gap-2 tw-px-6">
     <ng-content select="[bitDialogFooter]"></ng-content>
   </div>
 </div>
diff --git a/libs/components/src/dialog/simple-dialog/simple-dialog.component.ts b/libs/components/src/dialog/simple-dialog/simple-dialog.component.ts
index db7023b5b86..85f1bed8cf5 100644
--- a/libs/components/src/dialog/simple-dialog/simple-dialog.component.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-dialog.component.ts
@@ -6,7 +6,6 @@ import { DialogTitleContainerDirective } from "../directives/dialog-title-contai
 
 @Directive({
   selector: "[bitDialogIcon]",
-  standalone: true,
 })
 export class IconDirective {}
 
@@ -14,7 +13,6 @@ export class IconDirective {}
   selector: "bit-simple-dialog",
   templateUrl: "./simple-dialog.component.html",
   animations: [fadeIn],
-  standalone: true,
   imports: [DialogTitleContainerDirective, TypographyDirective],
 })
 export class SimpleDialogComponent {
diff --git a/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts b/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts
index 680ebe9ed3b..ce9f7b46fef 100644
--- a/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts
@@ -1,13 +1,12 @@
 import { DialogRef, DIALOG_DATA } from "@angular/cdk/dialog";
 import { Component, Inject } from "@angular/core";
-import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { provideAnimations } from "@angular/platform-browser/animations";
 import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
+import { getAllByRole, userEvent } from "@storybook/test";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { ButtonModule } from "../../button";
-import { IconButtonModule } from "../../icon-button";
-import { SharedModule } from "../../shared/shared.module";
 import { I18nMockService } from "../../utils/i18n-mock.service";
 import { DialogModule } from "../dialog.module";
 import { DialogService } from "../dialog.service";
@@ -17,18 +16,45 @@ interface Animal {
 }
 
 @Component({
-  template: `<button type="button" bitButton (click)="openDialog()">Open Simple Dialog</button>`,
+  template: `
+    <button type="button" bitButton (click)="openSimpleDialog()">Open Simple Dialog</button>
+    <button type="button" bitButton (click)="openNonDismissableWithPrimaryButtonDialog()">
+      Open Non-Dismissable Simple Dialog with Primary Button
+    </button>
+    <button type="button" bitButton (click)="openNonDismissableWithNoButtonsDialog()">
+      Open Non-Dismissable Simple Dialog with No Buttons
+    </button>
+  `,
+  imports: [ButtonModule],
 })
 class StoryDialogComponent {
   constructor(public dialogService: DialogService) {}
 
-  openDialog() {
-    this.dialogService.open(StoryDialogContentComponent, {
+  openSimpleDialog() {
+    this.dialogService.open(SimpleDialogContent, {
       data: {
         animal: "panda",
       },
     });
   }
+
+  openNonDismissableWithPrimaryButtonDialog() {
+    this.dialogService.open(NonDismissableWithPrimaryButtonContent, {
+      data: {
+        animal: "panda",
+      },
+      disableClose: true,
+    });
+  }
+
+  openNonDismissableWithNoButtonsDialog() {
+    this.dialogService.open(NonDismissableWithNoButtonsContent, {
+      data: {
+        animal: "panda",
+      },
+      disableClose: true,
+    });
+  }
 }
 
 @Component({
@@ -48,8 +74,62 @@ class StoryDialogComponent {
       </ng-container>
     </bit-simple-dialog>
   `,
+  imports: [ButtonModule, DialogModule],
 })
-class StoryDialogContentComponent {
+class SimpleDialogContent {
+  constructor(
+    public dialogRef: DialogRef,
+    @Inject(DIALOG_DATA) private data: Animal,
+  ) {}
+
+  get animal() {
+    return this.data?.animal;
+  }
+}
+
+@Component({
+  template: `
+    <bit-simple-dialog>
+      <span bitDialogTitle>Dialog Title</span>
+      <span bitDialogContent>
+        Dialog body text goes here.
+        <br />
+        Animal: {{ animal }}
+      </span>
+      <ng-container bitDialogFooter>
+        <button type="button" bitButton buttonType="primary" (click)="dialogRef.close()">
+          Save
+        </button>
+      </ng-container>
+    </bit-simple-dialog>
+  `,
+  imports: [ButtonModule, DialogModule],
+})
+class NonDismissableWithPrimaryButtonContent {
+  constructor(
+    public dialogRef: DialogRef,
+    @Inject(DIALOG_DATA) private data: Animal,
+  ) {}
+
+  get animal() {
+    return this.data?.animal;
+  }
+}
+
+@Component({
+  template: `
+    <bit-simple-dialog>
+      <span bitDialogTitle>Dialog Title</span>
+      <span bitDialogContent>
+        Dialog body text goes here.
+        <br />
+        Animal: {{ animal }}
+      </span>
+    </bit-simple-dialog>
+  `,
+  imports: [ButtonModule, DialogModule],
+})
+class NonDismissableWithNoButtonsContent {
   constructor(
     public dialogRef: DialogRef,
     @Inject(DIALOG_DATA) private data: Animal,
@@ -65,15 +145,8 @@ export default {
   component: StoryDialogComponent,
   decorators: [
     moduleMetadata({
-      declarations: [StoryDialogContentComponent],
-      imports: [
-        SharedModule,
-        IconButtonModule,
-        ButtonModule,
-        BrowserAnimationsModule,
-        DialogModule,
-      ],
       providers: [
+        provideAnimations(),
         DialogService,
         {
           provide: I18nService,
@@ -96,4 +169,29 @@ export default {
 
 type Story = StoryObj<StoryDialogComponent>;
 
-export const Default: Story = {};
+export const Default: Story = {
+  play: async (context) => {
+    const canvas = context.canvasElement;
+
+    const button = getAllByRole(canvas, "button")[0];
+    await userEvent.click(button);
+  },
+};
+
+export const NonDismissableWithPrimaryButton: Story = {
+  play: async (context) => {
+    const canvas = context.canvasElement;
+
+    const button = getAllByRole(canvas, "button")[1];
+    await userEvent.click(button);
+  },
+};
+
+export const NonDismissableWithNoButtons: Story = {
+  play: async (context) => {
+    const canvas = context.canvasElement;
+
+    const button = getAllByRole(canvas, "button")[2];
+    await userEvent.click(button);
+  },
+};
diff --git a/libs/components/src/disclosure/disclosure-trigger-for.directive.ts b/libs/components/src/disclosure/disclosure-trigger-for.directive.ts
index 6db26410bea..bf7bdb409ec 100644
--- a/libs/components/src/disclosure/disclosure-trigger-for.directive.ts
+++ b/libs/components/src/disclosure/disclosure-trigger-for.directive.ts
@@ -7,7 +7,6 @@ import { DisclosureComponent } from "./disclosure.component";
 @Directive({
   selector: "[bitDisclosureTriggerFor]",
   exportAs: "disclosureTriggerFor",
-  standalone: true,
 })
 export class DisclosureTriggerForDirective {
   /**
diff --git a/libs/components/src/disclosure/disclosure.component.ts b/libs/components/src/disclosure/disclosure.component.ts
index 6de06b48b3f..58e425e9206 100644
--- a/libs/components/src/disclosure/disclosure.component.ts
+++ b/libs/components/src/disclosure/disclosure.component.ts
@@ -11,9 +11,32 @@ import {
 
 let nextId = 0;
 
+/**
+  * The `bit-disclosure` component is used in tandem with the `bitDisclosureTriggerFor` directive to create an accessible content area whose visibility is controlled by a trigger button.
+
+  * To compose a disclosure and trigger:
+
+  * 1. Create a trigger component (see "Supported Trigger Components" section below)
+  * 2. Create a `bit-disclosure`
+  * 3. Set a template reference on the `bit-disclosure`
+  * 4. Use the `bitDisclosureTriggerFor` directive on the trigger component, and pass it the `bit-disclosure` template reference
+  * 5. Set the `open` property on the `bit-disclosure` to init the disclosure as either currently expanded or currently collapsed. The disclosure will default to `false`, meaning it defaults to being hidden.
+  *
+  * @example
+  *
+  * ```html
+  * <button
+  *   type="button"
+  *   bitIconButton="bwi-sliders"
+  *   [buttonType]="'muted'"
+  *   [bitDisclosureTriggerFor]="disclosureRef"
+  * ></button>
+  * <bit-disclosure #disclosureRef open>click button to hide this content</bit-disclosure>
+  * ```
+  *
+ */
 @Component({
   selector: "bit-disclosure",
-  standalone: true,
   template: `<ng-content></ng-content>`,
 })
 export class DisclosureComponent {
diff --git a/libs/components/src/disclosure/disclosure.mdx b/libs/components/src/disclosure/disclosure.mdx
index 2fcff6f5982..50ccf936acc 100644
--- a/libs/components/src/disclosure/disclosure.mdx
+++ b/libs/components/src/disclosure/disclosure.mdx
@@ -1,4 +1,4 @@
-import { Meta, Canvas, Primary, Controls } from "@storybook/addon-docs";
+import { Meta, Canvas, Primary, Controls, Title, Description } from "@storybook/addon-docs";
 
 import * as stories from "./disclosure.stories";
 
@@ -8,37 +8,11 @@ import * as stories from "./disclosure.stories";
 import { DisclosureComponent, DisclosureTriggerForDirective } from "@bitwarden/components";
 ```
 
-# Disclosure
-
-The `bit-disclosure` component is used in tandem with the `bitDisclosureTriggerFor` directive to
-create an accessible content area whose visibility is controlled by a trigger button.
-
-To compose a disclosure and trigger:
-
-1. Create a trigger component (see "Supported Trigger Components" section below)
-2. Create a `bit-disclosure`
-3. Set a template reference on the `bit-disclosure`
-4. Use the `bitDisclosureTriggerFor` directive on the trigger component, and pass it the
-   `bit-disclosure` template reference
-5. Set the `open` property on the `bit-disclosure` to init the disclosure as either currently
-   expanded or currently collapsed. The disclosure will default to `false`, meaning it defaults to
-   being hidden.
-
-```
-<button
-   type="button"
-   bitIconButton="bwi-sliders"
-   [buttonType]="'muted'"
-   [bitDisclosureTriggerFor]="disclosureRef"
-></button>
-<bit-disclosure #disclosureRef open>click button to hide this content</bit-disclosure>
-```
+<Title />
+<Description />
 
 <Canvas of={stories.DisclosureWithIconButton} />
 
-<br />
-<br />
-
 ## Supported Trigger Components
 
 This is the list of currently supported trigger components:
diff --git a/libs/components/src/drawer/drawer-body.component.ts b/libs/components/src/drawer/drawer-body.component.ts
index 9bd2adcffbc..9b5d3148d9b 100644
--- a/libs/components/src/drawer/drawer-body.component.ts
+++ b/libs/components/src/drawer/drawer-body.component.ts
@@ -1,20 +1,19 @@
 import { CdkScrollable } from "@angular/cdk/scrolling";
-import { ChangeDetectionStrategy, Component, Signal, inject } from "@angular/core";
-import { toSignal } from "@angular/core/rxjs-interop";
-import { map } from "rxjs";
+import { ChangeDetectionStrategy, Component } from "@angular/core";
+
+import { hasScrolledFrom } from "../utils/has-scrolled-from";
 
 /**
  * Body container for `bit-drawer`
  */
 @Component({
   selector: "bit-drawer-body",
-  standalone: true,
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [],
   host: {
     class:
       "tw-p-4 tw-pt-0 tw-block tw-overflow-auto tw-border-solid tw-border tw-border-transparent tw-transition-colors tw-duration-200",
-    "[class.tw-border-t-secondary-300]": "isScrolled()",
+    "[class.tw-border-t-secondary-300]": "this.hasScrolledFrom().top",
   },
   hostDirectives: [
     {
@@ -24,13 +23,5 @@ import { map } from "rxjs";
   template: ` <ng-content></ng-content> `,
 })
 export class DrawerBodyComponent {
-  private scrollable = inject(CdkScrollable);
-
-  /** TODO: share this utility with browser popup header? */
-  protected isScrolled: Signal<boolean> = toSignal(
-    this.scrollable
-      .elementScrolled()
-      .pipe(map(() => this.scrollable.measureScrollOffset("top") > 0)),
-    { initialValue: false },
-  );
+  protected hasScrolledFrom = hasScrolledFrom();
 }
diff --git a/libs/components/src/drawer/drawer-close.directive.ts b/libs/components/src/drawer/drawer-close.directive.ts
index bf56dd8b71f..f105e21ea62 100644
--- a/libs/components/src/drawer/drawer-close.directive.ts
+++ b/libs/components/src/drawer/drawer-close.directive.ts
@@ -15,7 +15,6 @@ import { DrawerComponent } from "./drawer.component";
  **/
 @Directive({
   selector: "button[bitDrawerClose]",
-  standalone: true,
   host: {
     "(click)": "onClick()",
   },
diff --git a/libs/components/src/drawer/drawer-header.component.ts b/libs/components/src/drawer/drawer-header.component.ts
index de112a448cf..36addcd2bea 100644
--- a/libs/components/src/drawer/drawer-header.component.ts
+++ b/libs/components/src/drawer/drawer-header.component.ts
@@ -13,12 +13,11 @@ import { DrawerCloseDirective } from "./drawer-close.directive";
  **/
 @Component({
   selector: "bit-drawer-header",
-  standalone: true,
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [CommonModule, DrawerCloseDirective, TypographyModule, IconButtonModule, I18nPipe],
   templateUrl: "drawer-header.component.html",
   host: {
-    class: "tw-block tw-pl-4 tw-pr-2 tw-py-2",
+    class: "tw-block tw-ps-4 tw-pe-2 tw-py-2",
   },
 })
 export class DrawerHeaderComponent {
diff --git a/libs/components/src/drawer/drawer-host.directive.ts b/libs/components/src/drawer/drawer-host.directive.ts
index f5e3e56b099..64eea6a9c06 100644
--- a/libs/components/src/drawer/drawer-host.directive.ts
+++ b/libs/components/src/drawer/drawer-host.directive.ts
@@ -8,7 +8,6 @@ import { Directive, signal } from "@angular/core";
  */
 @Directive({
   selector: "[bitDrawerHost]",
-  standalone: true,
 })
 export class DrawerHostDirective {
   private _portal = signal<Portal<unknown> | undefined>(undefined);
diff --git a/libs/components/src/drawer/drawer.component.ts b/libs/components/src/drawer/drawer.component.ts
index ccabb6f0b6e..7a3c764b16f 100644
--- a/libs/components/src/drawer/drawer.component.ts
+++ b/libs/components/src/drawer/drawer.component.ts
@@ -10,7 +10,7 @@ import {
   viewChild,
 } from "@angular/core";
 
-import { DrawerHostDirective } from "./drawer-host.directive";
+import { DrawerService } from "./drawer.service";
 
 /**
  * A drawer is a panel of supplementary content that is adjacent to the page's main content.
@@ -19,13 +19,12 @@ import { DrawerHostDirective } from "./drawer-host.directive";
  */
 @Component({
   selector: "bit-drawer",
-  standalone: true,
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [CommonModule, PortalModule],
   templateUrl: "drawer.component.html",
 })
 export class DrawerComponent {
-  private drawerHost = inject(DrawerHostDirective);
+  private drawerHost = inject(DrawerService);
   private portal = viewChild.required(CdkPortal);
 
   /**
diff --git a/libs/components/src/drawer/drawer.mdx b/libs/components/src/drawer/drawer.mdx
index 57d618cfe95..bc99fa290d6 100644
--- a/libs/components/src/drawer/drawer.mdx
+++ b/libs/components/src/drawer/drawer.mdx
@@ -12,6 +12,8 @@ import { DrawerComponent } from "@bitwarden/components";
 
 # Drawer
 
+**Note: `bit-drawer` is deprecated. Use `bit-dialog` and `DialogService.openDrawer(...)` instead.**
+
 A drawer is a panel of supplementary content that is adjacent to the page's main content.
 
 <Primary />
diff --git a/libs/components/src/drawer/drawer.service.ts b/libs/components/src/drawer/drawer.service.ts
new file mode 100644
index 00000000000..dd8575efee8
--- /dev/null
+++ b/libs/components/src/drawer/drawer.service.ts
@@ -0,0 +1,20 @@
+import { Portal } from "@angular/cdk/portal";
+import { Injectable, signal } from "@angular/core";
+
+@Injectable({ providedIn: "root" })
+export class DrawerService {
+  private _portal = signal<Portal<unknown> | undefined>(undefined);
+
+  /** The portal to display */
+  portal = this._portal.asReadonly();
+
+  open(portal: Portal<unknown>) {
+    this._portal.set(portal);
+  }
+
+  close(portal: Portal<unknown>) {
+    if (portal === this.portal()) {
+      this._portal.set(undefined);
+    }
+  }
+}
diff --git a/libs/components/src/form-control/form-control.component.html b/libs/components/src/form-control/form-control.component.html
index cc9c3dabbb6..15d422b01a1 100644
--- a/libs/components/src/form-control/form-control.component.html
+++ b/libs/components/src/form-control/form-control.component.html
@@ -1,5 +1,5 @@
 <label
-  class="tw-transition tw-select-none tw-mb-0 tw-inline-flex tw-rounded tw-p-0.5 has-[:focus-visible]:tw-ring has-[:focus-visible]:tw-ring-primary-600"
+  class="tw-transition tw-items-start [&:has(input[type='checkbox'])]:tw-gap-[.25rem] [&:has(input[type='radio'])]:tw-gap-1.5 tw-select-none tw-mb-0 tw-inline-flex tw-rounded has-[:focus-visible]:tw-ring has-[:focus-visible]:tw-ring-primary-600"
   [ngClass]="[formControl.disabled ? 'tw-cursor-auto' : 'tw-cursor-pointer']"
 >
   <ng-content></ng-content>
@@ -21,7 +21,7 @@
   </span>
 </label>
 @if (hasError) {
-  <div class="tw-mt-1 tw-text-danger tw-text-xs tw-ml-0.5">
+  <div class="tw-mt-1 tw-text-danger tw-text-xs tw-ms-0.5">
     <i class="bwi bwi-error"></i> {{ displayError }}
   </div>
 }
diff --git a/libs/components/src/form-control/form-control.component.ts b/libs/components/src/form-control/form-control.component.ts
index 690c00a9dc0..0e2fa393f80 100644
--- a/libs/components/src/form-control/form-control.component.ts
+++ b/libs/components/src/form-control/form-control.component.ts
@@ -14,7 +14,6 @@ import { BitFormControlAbstraction } from "./form-control.abstraction";
 @Component({
   selector: "bit-form-control",
   templateUrl: "form-control.component.html",
-  standalone: true,
   imports: [NgClass, TypographyDirective, I18nPipe],
 })
 export class FormControlComponent {
@@ -40,7 +39,7 @@ export class FormControlComponent {
 
   @HostBinding("class") get classes() {
     return []
-      .concat(this.inline ? ["tw-inline-block", "tw-mr-4"] : ["tw-block"])
+      .concat(this.inline ? ["tw-inline-block", "tw-me-4"] : ["tw-block"])
       .concat(this.disableMargin ? [] : ["tw-mb-4"]);
   }
 
diff --git a/libs/components/src/form-control/hint.component.ts b/libs/components/src/form-control/hint.component.ts
index 4fee0d4560f..c1f21bf2545 100644
--- a/libs/components/src/form-control/hint.component.ts
+++ b/libs/components/src/form-control/hint.component.ts
@@ -8,7 +8,6 @@ let nextId = 0;
   host: {
     class: "tw-text-muted tw-font-normal tw-inline-block tw-mt-1 tw-text-xs",
   },
-  standalone: true,
 })
 export class BitHintComponent {
   @HostBinding() id = `bit-hint-${nextId++}`;
diff --git a/libs/components/src/form-control/label.component.ts b/libs/components/src/form-control/label.component.ts
index e0c4ebf466b..d5028715bd5 100644
--- a/libs/components/src/form-control/label.component.ts
+++ b/libs/components/src/form-control/label.component.ts
@@ -10,7 +10,6 @@ let nextId = 0;
 
 @Component({
   selector: "bit-label",
-  standalone: true,
   templateUrl: "label.component.html",
   imports: [CommonModule],
 })
diff --git a/libs/components/src/form-field/error-summary.component.ts b/libs/components/src/form-field/error-summary.component.ts
index 1709c3078fa..c57819a1fca 100644
--- a/libs/components/src/form-field/error-summary.component.ts
+++ b/libs/components/src/form-field/error-summary.component.ts
@@ -15,7 +15,6 @@ import { I18nPipe } from "@bitwarden/ui-common";
     class: "tw-block tw-text-danger tw-mt-2",
     "aria-live": "assertive",
   },
-  standalone: true,
   imports: [I18nPipe],
 })
 export class BitErrorSummary {
diff --git a/libs/components/src/form-field/error.component.ts b/libs/components/src/form-field/error.component.ts
index 27adbf7d313..a0f7906b366 100644
--- a/libs/components/src/form-field/error.component.ts
+++ b/libs/components/src/form-field/error.component.ts
@@ -14,7 +14,6 @@ let nextId = 0;
     class: "tw-block tw-mt-1 tw-text-danger tw-text-xs",
     "aria-live": "assertive",
   },
-  standalone: true,
 })
 export class BitErrorComponent {
   @HostBinding() id = `bit-error-${nextId++}`;
diff --git a/libs/components/src/form-field/form-field.component.html b/libs/components/src/form-field/form-field.component.html
index 02d7c37cadf..ccea0546f3a 100644
--- a/libs/components/src/form-field/form-field.component.html
+++ b/libs/components/src/form-field/form-field.component.html
@@ -20,7 +20,7 @@
     <div class="tw-absolute tw-size-full tw-top-0 tw-pointer-events-none tw-z-20">
       <div class="tw-size-full tw-flex">
         <div
-          class="tw-min-w-3 tw-border-r-0 group-focus-within/bit-form-field:tw-border-r-0 !tw-rounded-l-lg"
+          class="tw-min-w-3 tw-border-r-0 group-focus-within/bit-form-field:tw-border-r-0 !tw-rounded-s-lg"
           [ngClass]="inputBorderClasses"
         ></div>
         <div
@@ -40,17 +40,17 @@
           </label>
         </div>
         <div
-          class="tw-min-w-3 tw-grow tw-border-l-0 group-focus-within/bit-form-field:tw-border-l-0 !tw-rounded-r-lg"
+          class="tw-min-w-3 tw-grow tw-border-l-0 group-focus-within/bit-form-field:tw-border-l-0 !tw-rounded-e-lg"
           [ngClass]="inputBorderClasses"
         ></div>
       </div>
     </div>
     <div
-      class="tw-gap-1 tw-bg-background tw-rounded-lg tw-flex tw-min-h-11 [&:not(:has(button:enabled)):has(input:read-only)]:tw-bg-secondary-100 [&:not(:has(button:enabled)):has(textarea:read-only)]:tw-bg-secondary-100"
+      class="tw-gap-1 tw-bg-background tw-rounded-lg tw-flex tw-min-h-11 [&:has(input:disabled,input:read-only,textarea:read-only):not(:has(button:not([aria-disabled='true'])))]:tw-bg-secondary-100"
     >
       <div
         #prefixContainer
-        class="tw-flex tw-items-center tw-gap-1 tw-pl-3 tw-py-2"
+        class="tw-flex tw-items-center tw-gap-1 tw-ps-3 tw-py-2"
         [hidden]="!prefixHasChildren()"
       >
         <ng-container *ngTemplateOutlet="prefixContent"></ng-container>
@@ -59,15 +59,15 @@
         class="tw-w-full tw-relative tw-py-2 has-[bit-select]:tw-p-0 has-[bit-multi-select]:tw-p-0 has-[input:read-only:not([hidden])]:tw-bg-secondary-100 has-[textarea:read-only:not([hidden])]:tw-bg-secondary-100"
         data-default-content
         [ngClass]="[
-          prefixHasChildren() ? '' : 'tw-rounded-l-lg tw-pl-3',
-          suffixHasChildren() ? '' : 'tw-rounded-r-lg tw-pr-3',
+          prefixHasChildren() ? '' : 'tw-rounded-s-lg tw-ps-3',
+          suffixHasChildren() ? '' : 'tw-rounded-e-lg tw-pe-3',
         ]"
       >
         <ng-container *ngTemplateOutlet="defaultContent"></ng-container>
       </div>
       <div
         #suffixContainer
-        class="tw-flex tw-items-center tw-gap-1 tw-pr-3 tw-py-2"
+        class="tw-flex tw-items-center tw-gap-1 tw-pe-3 tw-py-2"
         [hidden]="!suffixHasChildren()"
       >
         <ng-container *ngTemplateOutlet="suffixContent"></ng-container>
@@ -92,7 +92,7 @@
       <div
         #prefixContainer
         [hidden]="!prefixHasChildren()"
-        class="tw-flex tw-items-center tw-gap-1 tw-pl-1"
+        class="tw-flex tw-items-center tw-gap-1 tw-ps-1"
       >
         <ng-container *ngTemplateOutlet="prefixContent"></ng-container>
       </div>
@@ -105,7 +105,7 @@
       <div
         #suffixContainer
         [hidden]="!suffixHasChildren()"
-        class="tw-flex tw-items-center tw-gap-1 tw-pr-1"
+        class="tw-flex tw-items-center tw-gap-1 tw-pe-1"
       >
         <ng-container *ngTemplateOutlet="suffixContent"></ng-container>
       </div>
diff --git a/libs/components/src/form-field/form-field.component.ts b/libs/components/src/form-field/form-field.component.ts
index e810aaec8cb..954297a8aa4 100644
--- a/libs/components/src/form-field/form-field.component.ts
+++ b/libs/components/src/form-field/form-field.component.ts
@@ -26,7 +26,6 @@ import { BitFormFieldControl } from "./form-field-control";
 @Component({
   selector: "bit-form-field",
   templateUrl: "./form-field.component.html",
-  standalone: true,
   imports: [CommonModule, BitErrorComponent, I18nPipe],
 })
 export class BitFormFieldComponent implements AfterContentChecked {
diff --git a/libs/components/src/form-field/form-field.stories.ts b/libs/components/src/form-field/form-field.stories.ts
index 738ac96bf76..06a6d9547a3 100644
--- a/libs/components/src/form-field/form-field.stories.ts
+++ b/libs/components/src/form-field/form-field.stories.ts
@@ -72,6 +72,7 @@ export default {
   decorators: [
     moduleMetadata({
       imports: [
+        A11yTitleDirective,
         FormsModule,
         ReactiveFormsModule,
         FormFieldModule,
@@ -87,8 +88,8 @@ export default {
         SectionComponent,
         TextFieldModule,
         BadgeModule,
+        A11yTitleDirective,
       ],
-      declarations: [A11yTitleDirective],
       providers: [
         {
           provide: I18nService,
diff --git a/libs/components/src/form-field/password-input-toggle.directive.ts b/libs/components/src/form-field/password-input-toggle.directive.ts
index 933722db5b4..a696a88c468 100644
--- a/libs/components/src/form-field/password-input-toggle.directive.ts
+++ b/libs/components/src/form-field/password-input-toggle.directive.ts
@@ -18,7 +18,6 @@ import { BitFormFieldComponent } from "./form-field.component";
 
 @Directive({
   selector: "[bitPasswordInputToggle]",
-  standalone: true,
 })
 export class BitPasswordInputToggleDirective implements AfterContentInit, OnChanges {
   /**
diff --git a/libs/components/src/form-field/password-input-toggle.spec.ts b/libs/components/src/form-field/password-input-toggle.spec.ts
index a3956e930ad..114010c37bc 100644
--- a/libs/components/src/form-field/password-input-toggle.spec.ts
+++ b/libs/components/src/form-field/password-input-toggle.spec.ts
@@ -6,7 +6,6 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 
 import { IconButtonModule } from "../icon-button";
 import { BitIconButtonComponent } from "../icon-button/icon-button.component";
-import { InputModule } from "../input/input.module";
 import { I18nMockService } from "../utils/i18n-mock.service";
 
 import { BitFormFieldControl } from "./form-field-control";
@@ -25,6 +24,7 @@ import { BitPasswordInputToggleDirective } from "./password-input-toggle.directi
       </bit-form-field>
     </form>
   `,
+  imports: [FormFieldModule, IconButtonModule],
 })
 class TestFormFieldComponent {}
 
@@ -36,8 +36,7 @@ describe("PasswordInputToggle", () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [FormFieldModule, IconButtonModule, InputModule],
-      declarations: [TestFormFieldComponent],
+      imports: [TestFormFieldComponent],
       providers: [
         {
           provide: I18nService,
diff --git a/libs/components/src/form-field/prefix.directive.ts b/libs/components/src/form-field/prefix.directive.ts
index b44e90cbaad..34fcbf85233 100644
--- a/libs/components/src/form-field/prefix.directive.ts
+++ b/libs/components/src/form-field/prefix.directive.ts
@@ -4,7 +4,6 @@ import { BitIconButtonComponent } from "../icon-button/icon-button.component";
 
 @Directive({
   selector: "[bitPrefix]",
-  standalone: true,
 })
 export class BitPrefixDirective implements OnInit {
   @HostBinding("class") @Input() get classList() {
diff --git a/libs/components/src/form-field/suffix.directive.ts b/libs/components/src/form-field/suffix.directive.ts
index baf1afce763..28736ce78a9 100644
--- a/libs/components/src/form-field/suffix.directive.ts
+++ b/libs/components/src/form-field/suffix.directive.ts
@@ -4,7 +4,6 @@ import { BitIconButtonComponent } from "../icon-button/icon-button.component";
 
 @Directive({
   selector: "[bitSuffix]",
-  standalone: true,
 })
 export class BitSuffixDirective implements OnInit {
   @HostBinding("class") @Input() get classList() {
diff --git a/libs/components/src/form/form.stories.ts b/libs/components/src/form/form.stories.ts
index 6aef140fe5f..1fc9bbef751 100644
--- a/libs/components/src/form/form.stories.ts
+++ b/libs/components/src/form/form.stories.ts
@@ -1,13 +1,6 @@
-import {
-  AbstractControl,
-  FormBuilder,
-  FormsModule,
-  ReactiveFormsModule,
-  ValidationErrors,
-  ValidatorFn,
-  Validators,
-} from "@angular/forms";
+import { FormBuilder, FormsModule, ReactiveFormsModule, Validators } from "@angular/forms";
 import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
+import { userEvent, getByText } from "@storybook/test";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
@@ -15,6 +8,7 @@ import { ButtonModule } from "../button";
 import { CheckboxModule } from "../checkbox";
 import { FormControlModule } from "../form-control";
 import { FormFieldModule } from "../form-field";
+import { trimValidator, forbiddenCharacters } from "../form-field/bit-validators";
 import { InputModule } from "../input/input.module";
 import { MultiSelectModule } from "../multi-select";
 import { RadioButtonModule } from "../radio-button";
@@ -48,13 +42,19 @@ export default {
               required: "required",
               checkboxRequired: "Option is required",
               inputRequired: "Input is required.",
-              inputEmail: "Input is not an email-address.",
+              inputEmail: "Input is not an email address.",
+              inputForbiddenCharacters: (char) =>
+                `The following characters are not allowed: "${char}"`,
               inputMinValue: (min) => `Input value must be at least ${min}.`,
               inputMaxValue: (max) => `Input value must not exceed ${max}.`,
+              inputMinLength: (min) => `Input value must be at least ${min} characters long.`,
+              inputMaxLength: (max) => `Input value must not exceed ${max} characters in length.`,
+              inputTrimValidator: `Input must not contain only whitespace.`,
               multiSelectPlaceholder: "-- Type to Filter --",
               multiSelectLoading: "Retrieving options...",
               multiSelectNotFound: "No items found",
               multiSelectClearAll: "Clear all",
+              fieldsNeedAttention: "__$1__ field(s) above need your attention.",
             });
           },
         },
@@ -72,7 +72,7 @@ export default {
 const fb = new FormBuilder();
 const exampleFormObj = fb.group({
   name: ["", [Validators.required]],
-  email: ["", [Validators.required, Validators.email, forbiddenNameValidator(/bit/i)]],
+  email: ["", [Validators.required, Validators.email, forbiddenCharacters(["#"])]],
   country: [undefined as string | undefined, [Validators.required]],
   groups: [],
   terms: [false, [Validators.requiredTrue]],
@@ -80,14 +80,6 @@ const exampleFormObj = fb.group({
   age: [null, [Validators.min(0), Validators.max(150)]],
 });
 
-// Custom error message, `message` is shown as the error message
-function forbiddenNameValidator(nameRe: RegExp): ValidatorFn {
-  return (control: AbstractControl): ValidationErrors | null => {
-    const forbidden = nameRe.test(control.value);
-    return forbidden ? { forbiddenName: { message: "forbiddenName" } } : null;
-  };
-}
-
 type Story = StoryObj;
 
 export const FullExample: Story = {
@@ -177,3 +169,95 @@ export const FullExample: Story = {
     ],
   },
 };
+
+const showValidationsFormObj = fb.group({
+  required: ["", [Validators.required]],
+  whitespace: ["    ", trimValidator],
+  email: ["example?bad-email", [Validators.email]],
+  minLength: ["Hello", [Validators.minLength(8)]],
+  maxLength: ["Hello there", [Validators.maxLength(8)]],
+  minValue: [9, [Validators.min(10)]],
+  maxValue: [15, [Validators.max(10)]],
+  forbiddenChars: ["Th!$ value cont#in$ forbidden char$", forbiddenCharacters(["#", "!", "$"])],
+});
+
+export const Validations: Story = {
+  render: (args) => ({
+    props: {
+      formObj: showValidationsFormObj,
+      submit: () => showValidationsFormObj.markAllAsTouched(),
+      ...args,
+    },
+    template: /*html*/ `
+      <form [formGroup]="formObj" (ngSubmit)="submit()">
+        <bit-form-field>
+          <bit-label>Required validation</bit-label>
+          <input bitInput formControlName="required" />
+          <bit-hint>This field is required. Submit form or blur input to see error</bit-hint>
+        </bit-form-field>
+
+        <bit-form-field>
+          <bit-label>Email validation</bit-label>
+          <input bitInput type="email" formControlName="email" />
+          <bit-hint>This field contains a malformed email address. Submit form or blur input to see error</bit-hint>
+        </bit-form-field>
+
+        <bit-form-field>
+          <bit-label>Min length validation</bit-label>
+          <input bitInput formControlName="minLength" />
+          <bit-hint>Value must be at least 8 characters. Submit form or blur input to see error</bit-hint>
+        </bit-form-field>
+
+        <bit-form-field>
+          <bit-label>Max length validation</bit-label>
+          <input bitInput formControlName="maxLength" />
+          <bit-hint>Value must be less then 8 characters. Submit form or blur input to see error</bit-hint>
+        </bit-form-field>
+
+        <bit-form-field>
+          <bit-label>Min number value validation</bit-label>
+          <input
+            bitInput
+            type="number"
+            formControlName="minValue"
+          />
+          <bit-hint>Value must be greater than 10. Submit form or blur input to see error</bit-hint>
+        </bit-form-field>
+
+        <bit-form-field>
+          <bit-label>Max number value validation</bit-label>
+          <input
+            bitInput
+            type="number"
+            formControlName="maxValue"
+          />
+          <bit-hint>Value must be less than than 10. Submit form or blur input to see error</bit-hint>
+        </bit-form-field>
+
+        <bit-form-field>
+          <bit-label>Forbidden characters validation</bit-label>
+          <input
+            bitInput
+            formControlName="forbiddenChars"
+          />
+          <bit-hint>Value must not contain '#', '!' or '$'. Submit form or blur input to see error</bit-hint>
+        </bit-form-field>
+
+        <bit-form-field>
+          <bit-label>White space validation</bit-label>
+          <input bitInput formControlName="whitespace" />
+          <bit-hint>This input contains only white space. Submit form or blur input to see error</bit-hint>
+        </bit-form-field>
+
+        <button type="submit" bitButton buttonType="primary">Submit</button>
+        <bit-error-summary [formGroup]="formObj"></bit-error-summary>
+      </form>
+    `,
+  }),
+  play: async (context) => {
+    const canvas = context.canvasElement;
+    const submitButton = getByText(canvas, "Submit");
+
+    await userEvent.click(submitButton);
+  },
+};
diff --git a/libs/components/src/form/forms.mdx b/libs/components/src/form/forms.mdx
index e3baf200f96..498eb8a3ed2 100644
--- a/libs/components/src/form/forms.mdx
+++ b/libs/components/src/form/forms.mdx
@@ -142,8 +142,20 @@ If a checkbox group has more than 4 options a
 
 <Canvas of={checkboxStories.Default} />
 
+## Validation messages
+
+These are examples of our default validation error messages:
+
+<Canvas of={formStories.Validations} />
+
 ## Accessibility
 
+### Icon Buttons in Form Fields
+
+When adding prefix or suffix icon buttons to a form field, be sure to use the `appA11yTitle`
+directive to provide a label for screenreaders. Typically, the label should follow this pattern:
+`{Action} {field label}`, i.e. "Copy username".
+
 ### Required Fields
 
 - Use "(required)" in the label of each required form field styled the same as the field's helper
@@ -152,12 +164,6 @@ If a checkbox group has more than 4 options a
   helper text.
   - **Example:** "Billing Email is required if owned by a business".
 
-### Icon Buttons in Form Fields
-
-When adding prefix or suffix icon buttons to a form field, be sure to use the `appA11yTitle`
-directive to provide a label for screenreaders. Typically, the label should follow this pattern:
-`{Action} {field label}`, i.e. "Copy username".
-
 ### Form Field Errors
 
 - When a resting field is filled out, validation is triggered when the user de-focuses the field
diff --git a/libs/components/src/icon-button/icon-button.component.ts b/libs/components/src/icon-button/icon-button.component.ts
index 60877070e2b..6c1426adbe8 100644
--- a/libs/components/src/icon-button/icon-button.component.ts
+++ b/libs/components/src/icon-button/icon-button.component.ts
@@ -1,12 +1,22 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { NgClass } from "@angular/common";
-import { Component, computed, ElementRef, HostBinding, Input, model } from "@angular/core";
+import {
+  Component,
+  computed,
+  ElementRef,
+  HostBinding,
+  inject,
+  Input,
+  model,
+  Signal,
+} from "@angular/core";
 import { toObservable, toSignal } from "@angular/core/rxjs-interop";
 import { debounce, interval } from "rxjs";
 
 import { ButtonLikeAbstraction, ButtonType } from "../shared/button-like.abstraction";
 import { FocusableElement } from "../shared/focusable-element";
+import { ariaDisableElement } from "../utils";
 
 export type IconButtonType = ButtonType | "contrast" | "main" | "muted" | "light";
 
@@ -102,41 +112,41 @@ const styles: Record<IconButtonType, string[]> = {
 
 const disabledStyles: Record<IconButtonType, string[]> = {
   contrast: [
-    "disabled:tw-opacity-60",
-    "disabled:hover:tw-border-transparent",
-    "disabled:hover:tw-bg-transparent",
+    "aria-disabled:tw-opacity-60",
+    "aria-disabled:hover:tw-border-transparent",
+    "aria-disabled:hover:tw-bg-transparent",
   ],
   main: [
-    "disabled:!tw-text-secondary-300",
-    "disabled:hover:tw-border-transparent",
-    "disabled:hover:tw-bg-transparent",
+    "aria-disabled:!tw-text-secondary-300",
+    "aria-disabled:hover:tw-border-transparent",
+    "aria-disabled:hover:tw-bg-transparent",
   ],
   muted: [
-    "disabled:!tw-text-secondary-300",
-    "disabled:hover:tw-border-transparent",
-    "disabled:hover:tw-bg-transparent",
+    "aria-disabled:!tw-text-secondary-300",
+    "aria-disabled:hover:tw-border-transparent",
+    "aria-disabled:hover:tw-bg-transparent",
   ],
   primary: [
-    "disabled:tw-opacity-60",
-    "disabled:hover:tw-border-primary-600",
-    "disabled:hover:tw-bg-primary-600",
+    "aria-disabled:tw-opacity-60",
+    "aria-disabled:hover:tw-border-primary-600",
+    "aria-disabled:hover:tw-bg-primary-600",
   ],
   secondary: [
-    "disabled:tw-opacity-60",
-    "disabled:hover:tw-border-text-muted",
-    "disabled:hover:tw-bg-transparent",
-    "disabled:hover:!tw-text-muted",
+    "aria-disabled:tw-opacity-60",
+    "aria-disabled:hover:tw-border-text-muted",
+    "aria-disabled:hover:tw-bg-transparent",
+    "aria-disabled:hover:!tw-text-muted",
   ],
   danger: [
-    "disabled:!tw-text-secondary-300",
-    "disabled:hover:tw-border-transparent",
-    "disabled:hover:tw-bg-transparent",
-    "disabled:hover:!tw-text-secondary-300",
+    "aria-disabled:!tw-text-secondary-300",
+    "aria-disabled:hover:tw-border-transparent",
+    "aria-disabled:hover:tw-bg-transparent",
+    "aria-disabled:hover:!tw-text-secondary-300",
   ],
   light: [
-    "disabled:tw-opacity-60",
-    "disabled:hover:tw-border-transparent",
-    "disabled:hover:tw-bg-transparent",
+    "aria-disabled:tw-opacity-60",
+    "aria-disabled:hover:tw-border-transparent",
+    "aria-disabled:hover:tw-bg-transparent",
   ],
   unstyled: [],
 };
@@ -147,7 +157,13 @@ const sizes: Record<IconButtonSize, string[]> = {
   default: ["tw-px-2.5", "tw-py-1.5"],
   small: ["tw-leading-none", "tw-text-base", "tw-p-1"],
 };
+/**
+  * Icon buttons are used when no text accompanies the button. It consists of an icon that may be updated to any icon in the `bwi-font`, a `title` attribute, and an `aria-label`.
 
+  * The most common use of the icon button is in the banner, toast, and modal components as a close button. It can also be found in tables as the 3 dot option menu, or on navigation list items when there are options that need to be collapsed into a menu.
+
+  * Similar to the main button components, spacing between multiple icon buttons should be .5rem.
+ */
 @Component({
   selector: "button[bitIconButton]:not(button[bitButton])",
   templateUrl: "icon-button.component.html",
@@ -155,10 +171,9 @@ const sizes: Record<IconButtonSize, string[]> = {
     { provide: ButtonLikeAbstraction, useExisting: BitIconButtonComponent },
     { provide: FocusableElement, useExisting: BitIconButtonComponent },
   ],
-  standalone: true,
   imports: [NgClass],
   host: {
-    "[attr.disabled]": "disabledAttr()",
+    "[attr.aria-disabled]": "disabledAttr()",
   },
 })
 export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableElement {
@@ -228,5 +243,10 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
     return this.elementRef.nativeElement;
   }
 
-  constructor(private elementRef: ElementRef) {}
+  private elementRef = inject(ElementRef);
+
+  constructor() {
+    const element = this.elementRef.nativeElement;
+    ariaDisableElement(element, this.disabledAttr as Signal<boolean | undefined>);
+  }
 }
diff --git a/libs/components/src/icon-button/icon-button.mdx b/libs/components/src/icon-button/icon-button.mdx
index 85164717de7..637a9d7daa0 100644
--- a/libs/components/src/icon-button/icon-button.mdx
+++ b/libs/components/src/icon-button/icon-button.mdx
@@ -1,4 +1,4 @@
-import { Meta, Canvas, Primary, Controls } from "@storybook/addon-docs";
+import { Meta, Canvas, Primary, Controls, Title, Description } from "@storybook/addon-docs";
 
 import * as stories from "./icon-button.stories";
 
@@ -8,16 +8,8 @@ import * as stories from "./icon-button.stories";
 import { IconButtonModule } from "@bitwarden/components";
 ```
 
-# Icon Button
-
-Icon buttons are used when no text accompanies the button. It consists of an icon that may be
-updated to any icon in the `bwi-font`, a `title` attribute, and an `aria-label`.
-
-The most common use of the icon button is in the banner, toast, and modal components as a close
-button. It can also be found in tables as the 3 dot option menu, or on navigation list items when
-there are options that need to be collapsed into a menu.
-
-Similar to the main button components, spacing between multiple icon buttons should be .5rem.
+<Title />
+<Description />
 
 <Primary />
 <Controls />
diff --git a/libs/components/src/icon-button/icon-button.stories.ts b/libs/components/src/icon-button/icon-button.stories.ts
index 08c95c5d641..f63c494f7db 100644
--- a/libs/components/src/icon-button/icon-button.stories.ts
+++ b/libs/components/src/icon-button/icon-button.stories.ts
@@ -1,5 +1,7 @@
 import { Meta, StoryObj } from "@storybook/angular";
 
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
+
 import { BitIconButtonComponent } from "./icon-button.component";
 
 export default {
@@ -7,8 +9,11 @@ export default {
   component: BitIconButtonComponent,
   args: {
     bitIconButton: "bwi-plus",
-    size: "default",
-    disabled: false,
+  },
+  argTypes: {
+    buttonType: {
+      options: ["primary", "secondary", "danger", "unstyled", "contrast", "main", "muted", "light"],
+    },
   },
   parameters: {
     design: {
@@ -24,25 +29,9 @@ export const Default: Story = {
   render: (args) => ({
     props: args,
     template: /*html*/ `
-    <div class="tw-space-x-4">
-      <button bitIconButton="bwi-plus" [disabled]="disabled" [loading]="loading" buttonType="main" [size]="size">Button</button>
-      <button bitIconButton="bwi-plus" [disabled]="disabled" [loading]="loading" buttonType="muted" [size]="size">Button</button>
-      <button bitIconButton="bwi-plus" [disabled]="disabled" [loading]="loading" buttonType="primary" [size]="size">Button</button>
-      <button bitIconButton="bwi-plus" [disabled]="disabled" [loading]="loading" buttonType="secondary"[size]="size">Button</button>
-      <button bitIconButton="bwi-plus" [disabled]="disabled" [loading]="loading" buttonType="danger" [size]="size">Button</button>
-      <div class="tw-bg-primary-600 tw-p-2 tw-inline-block">
-        <button bitIconButton="bwi-plus" [disabled]="disabled" [loading]="loading" buttonType="contrast" [size]="size">Button</button>
-      </div>
-      <div class="tw-bg-background-alt2 tw-p-2 tw-inline-block">
-        <button bitIconButton="bwi-plus" [disabled]="disabled" [loading]="loading" buttonType="light" [size]="size">Button</button>
-      </div>
-    </div>
+      <button ${formatArgsForCodeSnippet<BitIconButtonComponent>(args)}>Button</button>
     `,
   }),
-  args: {
-    size: "default",
-    buttonType: "primary",
-  },
 };
 
 export const Small: Story = {
@@ -54,40 +43,35 @@ export const Small: Story = {
 };
 
 export const Primary: Story = {
-  render: (args) => ({
-    props: args,
-    template: /*html*/ `
-    <button bitIconButton="bwi-plus" [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size">Button</button>
-    `,
-  }),
+  ...Default,
   args: {
     buttonType: "primary",
   },
 };
 
 export const Secondary: Story = {
-  ...Primary,
+  ...Default,
   args: {
     buttonType: "secondary",
   },
 };
 
 export const Danger: Story = {
-  ...Primary,
+  ...Default,
   args: {
     buttonType: "danger",
   },
 };
 
 export const Main: Story = {
-  ...Primary,
+  ...Default,
   args: {
     buttonType: "main",
   },
 };
 
 export const Muted: Story = {
-  ...Primary,
+  ...Default,
   args: {
     buttonType: "muted",
   },
@@ -98,7 +82,8 @@ export const Light: Story = {
     props: args,
     template: /*html*/ `
     <div class="tw-bg-background-alt2 tw-p-6 tw-w-full tw-inline-block">
-      <button bitIconButton="bwi-plus" [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size">Button</button>
+      <!-- <div> used only to provide dark background color -->
+      <button ${formatArgsForCodeSnippet<BitIconButtonComponent>(args)}>Button</button>
     </div>
       `,
   }),
@@ -112,7 +97,8 @@ export const Contrast: Story = {
     props: args,
     template: /*html*/ `
     <div class="tw-bg-primary-600 tw-p-6 tw-w-full tw-inline-block">
-      <button bitIconButton="bwi-plus" [disabled]="disabled" [loading]="loading" [buttonType]="buttonType" [size]="size">Button</button>
+      <!-- <div> used only to provide dark background color -->
+      <button ${formatArgsForCodeSnippet<BitIconButtonComponent>(args)}>Button</button>
     </div>
       `,
   }),
diff --git a/libs/components/src/icon/icon.component.ts b/libs/components/src/icon/icon.component.ts
index 08fa25956d0..5eae2c1d501 100644
--- a/libs/components/src/icon/icon.component.ts
+++ b/libs/components/src/icon/icon.component.ts
@@ -11,7 +11,6 @@ import { Icon, isIcon } from "./icon";
     "[innerHtml]": "innerHtml",
   },
   template: ``,
-  standalone: true,
 })
 export class BitIconComponent {
   innerHtml: SafeHtml | null = null;
diff --git a/libs/components/src/icon/icon.mdx b/libs/components/src/icon/icon.mdx
index 6435fc24948..01f03d1861b 100644
--- a/libs/components/src/icon/icon.mdx
+++ b/libs/components/src/icon/icon.mdx
@@ -4,6 +4,10 @@ import * as stories from "./icon.stories";
 
 <Meta of={stories} />
 
+```ts
+import { IconModule } from "@bitwarden/components";
+```
+
 # Icon Use Instructions
 
 - Icons will generally be attached to the associated Jira task.
@@ -37,12 +41,14 @@ import * as stories from "./icon.stories";
 
    - A non-comprehensive list of common colors and their associated classes is below:
 
-     | Hardcoded Value                                                                                                                          | Tailwind Stroke Class     | Tailwind Fill Class     | Tailwind Variable       |
-     | ---------------------------------------------------------------------------------------------------------------------------------------- | ------------------------- | ----------------------- | ----------------------- |
-     | `#020F66` <span style={{ display: "inline-block", width: "8px", height: "8px", borderRadius: "50%", backgroundColor: "#020F66"}}></span> | `tw-stroke-art-primary`   | `tw-fill-art-primary`   | `--color-art-primary`   |
-     | `#10949D` <span style={{ display: "inline-block", width: "8px", height: "8px", borderRadius: "50%", backgroundColor: "#10949D"}}></span> | `tw-stroke-art-accent`    | `tw-fill-art-accent`    | `--color-art-accent`    |
-     | `#2CDDE9` <span style={{ display: "inline-block", width: "8px", height: "8px", borderRadius: "50%", backgroundColor: "#2CDDE9"}}></span> | `tw-stroke-art-accent`    | `tw-fill-art-accent`    | `--color-art-accent`    |
-     | `#89929F` <span style={{ display: "inline-block", width: "8px", height: "8px", borderRadius: "50%", backgroundColor: "#89929F"}}></span> | `tw-stroke-secondary-600` | `tw-fill-secondary-600` | `--color-secondary-600` |
+     | Hardcoded Value                                                                                                                          | Tailwind Stroke Class                 | Tailwind Fill Class                 | Tailwind Variable                   |
+     | ---------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | ----------------------------------- | ----------------------------------- |
+     | `#020F66` <span style={{ display: "inline-block", width: "8px", height: "8px", borderRadius: "50%", backgroundColor: "#020F66"}}></span> | `tw-stroke-illustration-outline`      | `tw-fill-illustration-outline`      | `--color-illustration-outline`      |
+     | `#DBE5F6` <span style={{ display: "inline-block", width: "8px", height: "8px", borderRadius: "50%", backgroundColor: "#DBE5F6"}}></span> | `tw-stroke-illustration-bg-primary`   | `tw-fill-illustration-bg-primary`   | `--color-illustration-bg-primary`   |
+     | `#AAC3EF` <span style={{ display: "inline-block", width: "8px", height: "8px", borderRadius: "50%", backgroundColor: "#AAC3EF"}}></span> | `tw-stroke-illustration-bg-secondary` | `tw-fill-illustration-bg-secondary` | `--color-illustration-bg-secondary` |
+     | `#FFFFFF` <span style={{ display: "inline-block", width: "8px", height: "8px", borderRadius: "50%", backgroundColor: "#FFFFFF"}}></span> | `tw-stroke-illustration-bg-tertiary`  | `tw-fill-illustration-bg-tertiary`  | `--color-illustration-bg-tertiary`  |
+     | `#FFBF00` <span style={{ display: "inline-block", width: "8px", height: "8px", borderRadius: "50%", backgroundColor: "#FFBF00"}}></span> | `tw-stroke-illustration-tertiary`     | `tw-fill-illustration-tertiary`     | `--color-illustration-tertiary`     |
+     | `#175DDC` <span style={{ display: "inline-block", width: "8px", height: "8px", borderRadius: "50%", backgroundColor: "#175DDC"}}></span> | `tw-stroke-illustration-logo`         | `tw-fill-illustration-logo`         | `--color-illustration-logo`         |
 
    - If the hex that you have on an SVG path is not listed above, there are a few ways to figure out
      the appropriate Tailwind class:
@@ -52,20 +58,20 @@ import * as stories from "./icon.stories";
        - Click on an individual path on the SVG until you see the path's properties in the
          right-hand panel.
        - Scroll down to the Colors section.
-         - Example: `Color/Art/Primary`
+         - Example: `Color/Illustration/Outline`
          - This also includes Hex or RGB values that can be used to find the appropriate Tailwind
            variable as well if you follow the manual search option below.
        - Create the appropriate stroke or fill class from the color used.
-         - Example: `Color/Art/Primary` corresponds to `--color-art-primary` which corresponds to
-           `tw-stroke-art-primary` or `tw-fill-art-primary`.
+         - Example: `Color/Illustration/Outline` corresponds to `--color-illustration-outline` which
+           corresponds to `tw-stroke-illustration-outline` or `tw-fill-illustration-outline`.
      - **Option 2: Manual Search**
        - Take the path's stroke or fill hex value and convert it to RGB using a tool like
          [Hex to RGB](https://www.rgbtohex.net/hex-to-rgb/).
        - Search for the RGB value without commas in our `tw-theme.css` to find the Tailwind variable
          that corresponds to the color.
        - Create the appropriate stroke or fill class using the Tailwind variable.
-         - Example: `--color-art-primary` corresponds to `tw-stroke-art-primary` or
-           `tw-fill-art-primary`.
+         - Example: `--color-illustration-outline` corresponds to `tw-stroke-illustration-outline`
+           or `tw-fill-illustration-outline`.
 
 6. **Remove any hardcoded width or height attributes** if your SVG has a configured
    [viewBox](https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/viewBox) attribute in order
diff --git a/libs/auth/src/angular/icons/bitwarden-logo.icon.ts b/libs/components/src/icon/icons/bitwarden-logo.icon.ts
similarity index 96%
rename from libs/auth/src/angular/icons/bitwarden-logo.icon.ts
rename to libs/components/src/icon/icons/bitwarden-logo.icon.ts
index 2df07c45ff9..27b8ece164d 100644
--- a/libs/auth/src/angular/icons/bitwarden-logo.icon.ts
+++ b/libs/components/src/icon/icons/bitwarden-logo.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon";
 
 export const BitwardenLogo = svgIcon`
   <svg viewBox="0 0 290 45" xmlns="http://www.w3.org/2000/svg">
diff --git a/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-bitwarden-logo.icon.ts b/libs/components/src/icon/icons/extension-bitwarden-logo.icon.ts
similarity index 99%
rename from apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-bitwarden-logo.icon.ts
rename to libs/components/src/icon/icons/extension-bitwarden-logo.icon.ts
index 1de4bd37239..a8a07d5d1ef 100644
--- a/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-bitwarden-logo.icon.ts
+++ b/libs/components/src/icon/icons/extension-bitwarden-logo.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon";
 
 export const ExtensionBitwardenLogo = svgIcon`
   <svg
diff --git a/libs/components/src/icon/icons/index.ts b/libs/components/src/icon/icons/index.ts
index eff3ec8c609..69fac7d644e 100644
--- a/libs/components/src/icon/icons/index.ts
+++ b/libs/components/src/icon/icons/index.ts
@@ -1,8 +1,12 @@
-export * from "./search";
-export * from "./security";
+export * from "./bitwarden-logo.icon";
+export * from "./extension-bitwarden-logo.icon";
+export * from "./lock.icon";
+export * from "./generator";
 export * from "./no-access";
 export * from "./no-results";
-export * from "./generator";
+export * from "./registration-check-email.icon";
+export * from "./search";
+export * from "./security";
 export * from "./send";
 export * from "./settings";
 export * from "./vault";
diff --git a/libs/auth/src/angular/icons/lock.icon.ts b/libs/components/src/icon/icons/lock.icon.ts
similarity index 92%
rename from libs/auth/src/angular/icons/lock.icon.ts
rename to libs/components/src/icon/icons/lock.icon.ts
index 43ea2509e19..d7a7e4abb1b 100644
--- a/libs/auth/src/angular/icons/lock.icon.ts
+++ b/libs/components/src/icon/icons/lock.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon";
 
 export const LockIcon = svgIcon`
   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 100" fill="none">
diff --git a/libs/auth/src/angular/icons/registration-check-email.icon.ts b/libs/components/src/icon/icons/registration-check-email.icon.ts
similarity index 90%
rename from libs/auth/src/angular/icons/registration-check-email.icon.ts
rename to libs/components/src/icon/icons/registration-check-email.icon.ts
index d32964d8cb1..f0e881e5b2d 100644
--- a/libs/auth/src/angular/icons/registration-check-email.icon.ts
+++ b/libs/components/src/icon/icons/registration-check-email.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon";
 
 export const RegistrationCheckEmailIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 100" fill="none">
diff --git a/libs/components/src/icon/index.ts b/libs/components/src/icon/index.ts
index 8f29234dbc5..4f797326be3 100644
--- a/libs/components/src/icon/index.ts
+++ b/libs/components/src/icon/index.ts
@@ -1,3 +1,4 @@
 export * from "./icon.module";
 export * from "./icon";
 export * as Icons from "./icons";
+export { AdminConsoleLogo, PasswordManagerLogo, SecretsManagerLogo } from "./logos";
diff --git a/libs/components/src/icon/logos/bitwarden/admin-console.ts b/libs/components/src/icon/logos/bitwarden/admin-console.ts
new file mode 100644
index 00000000000..673cf9642c8
--- /dev/null
+++ b/libs/components/src/icon/logos/bitwarden/admin-console.ts
@@ -0,0 +1,7 @@
+import { svgIcon } from "../../icon";
+
+const AdminConsoleLogo = svgIcon`
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 46" fill="none"><path class="tw-fill-text-alt2" fill-rule="evenodd" d="M48.137 7.639c2.293 0 4.077.869 5.387 2.68 1.31 1.773 1.966 4.2 1.966 7.277 0 3.186-.655 5.648-2.002 7.386-1.347 1.774-3.167 2.607-5.46 2.607s-4.04-.797-5.351-2.462h-.364l-.692 1.701a.673.673 0 0 1-.618.399H38.09a.65.65 0 0 1-.655-.652V1.122A.65.65 0 0 1 38.09.47h3.932a.65.65 0 0 1 .655.652v5.575c0 .797-.073 2.064-.218 3.802h.218c1.201-1.883 3.058-2.86 5.46-2.86Zm-1.674 4.236c-1.274 0-2.257.398-2.876 1.195-.582.796-.91 2.136-.91 3.946v.58c0 2.064.291 3.548.91 4.417.619.869 1.602 1.34 2.948 1.34 1.056 0 1.966-.507 2.585-1.521.619-.978.946-2.462.946-4.309 0-1.883-.327-3.294-.946-4.236-.655-.941-1.565-1.412-2.657-1.412Zm17.69 15.388h-3.931a.65.65 0 0 1-.655-.652V8.69a.65.65 0 0 1 .655-.652h3.931a.65.65 0 0 1 .655.652v17.886c.037.326-.29.688-.655.688Zm14.378-3.874c.765 0 1.675-.145 2.767-.435a.436.436 0 0 1 .546.435v3.005c0 .181-.11.326-.255.398-1.237.507-2.803.76-4.55.76-2.111 0-3.64-.506-4.586-1.593-.947-1.05-1.456-2.643-1.456-4.743v-9.232h-2.075a.42.42 0 0 1-.437-.435V9.847c0-.036.036-.072.036-.108l2.876-1.702 1.42-3.765c.072-.181.218-.29.4-.29h2.62a.42.42 0 0 1 .438.434v3.657h5.205c.11 0 .218.109.218.218v3.258a.42.42 0 0 1-.436.435h-4.95v9.196c0 .724.218 1.304.618 1.63.364.398.946.579 1.601.579Zm24.498 3.874c-.51 0-.91-.326-1.128-.797l-3.859-11.694c-.255-.833-.582-2.1-1.019-3.73h-.11l-.363 1.304-.765 2.462-3.967 11.695c-.146.47-.583.76-1.092.76-.51 0-.947-.326-1.092-.833L84.792 9.594c-.145-.507.255-1.05.838-1.05h.109c.364 0 .691.253.8.616l2.84 10.246c.691 2.68 1.165 4.635 1.383 5.938h.11c.654-2.68 1.164-4.454 1.492-5.359L96.04 9.268c.146-.434.546-.724 1.056-.724.473 0 .873.29 1.019.724l3.422 10.645c.837 2.715 1.346 4.453 1.528 5.358h.11c.109-.724.546-2.751 1.383-6.01l2.73-10.101a.852.852 0 0 1 .801-.616c.546 0 .946.507.801 1.05l-4.587 16.836c-.146.507-.582.833-1.128.833h-.146Zm21.622 0a.665.665 0 0 1-.655-.58l-.328-2.39h-.182c-.946 1.196-1.893 2.065-2.912 2.572-.983.507-2.184.724-3.531.724-1.856 0-3.276-.47-4.295-1.412-.91-.833-1.42-1.956-1.492-3.367-.146-1.883.655-3.694 2.184-4.744 1.565-1.013 3.749-1.629 6.697-1.629l3.568-.109v-1.23c0-1.81-.364-3.114-1.129-4.02-.764-.905-1.893-1.34-3.494-1.34-1.529 0-3.058.363-4.66 1.123a.8.8 0 0 1-1.055-.398c-.182-.398 0-.869.4-1.014 1.82-.724 3.604-1.122 5.424-1.122 2.075 0 3.604.543 4.659 1.63 1.019 1.05 1.529 2.75 1.529 4.96v11.767c-.036.217-.364.579-.728.579Zm-7.535-1.231c2.038 0 3.604-.58 4.732-1.702 1.165-1.122 1.747-2.752 1.747-4.743v-1.81l-3.276.145c-2.657.108-4.513.543-5.678 1.23-1.129.688-1.711 1.81-1.711 3.26 0 1.158.364 2.1 1.056 2.75.8.544 1.82.87 3.13.87Zm21.549-17.85c.546 0 1.092.036 1.711.109a.819.819 0 0 1 .692.941c-.073.434-.51.688-.947.615-.546-.072-1.092-.144-1.638-.144-1.601 0-2.912.688-3.931 2.027-1.019 1.34-1.529 3.078-1.529 5.105v9.486c0 .471-.364.833-.837.833a.822.822 0 0 1-.837-.832V9.303c0-.398.327-.724.728-.724.4 0 .728.29.728.688l.145 2.68h.109c.765-1.376 1.602-2.354 2.476-2.897.837-.58 1.893-.869 3.13-.869Zm12.813 0c1.347 0 2.548.253 3.531.724 1.019.47 1.893 1.34 2.657 2.535h.109a86.503 86.503 0 0 1-.109-4.237V1.303c0-.471.364-.833.837-.833.474 0 .838.362.838.833V26.61c0 .326-.255.58-.583.58a.59.59 0 0 1-.582-.544l-.364-2.353h-.146c-1.419 2.136-3.494 3.186-6.151 3.186-2.621 0-4.551-.796-5.97-2.426-1.347-1.629-2.075-3.946-2.075-7.024 0-3.222.655-5.684 2.038-7.422 1.384-1.557 3.349-2.426 5.97-2.426Zm0 1.557c-2.075 0-3.604.724-4.659 2.172-1.019 1.412-1.529 3.476-1.529 6.228 0 5.286 2.075 7.93 6.225 7.93 2.147 0 3.676-.616 4.659-1.848 1.019-1.23 1.492-3.258 1.492-6.082v-.29c0-2.896-.473-4.96-1.492-6.191-.947-1.304-2.512-1.92-4.696-1.92Zm21.804 17.85c-2.73 0-4.841-.833-6.406-2.535-1.529-1.665-2.294-4.019-2.294-7.024s.728-5.395 2.221-7.169c1.492-1.81 3.458-2.715 5.969-2.715 2.184 0 3.968.76 5.206 2.28 1.31 1.521 1.929 3.621 1.929 6.264v1.376h-13.541c.036 2.571.619 4.526 1.82 5.902 1.201 1.376 2.876 1.991 5.096 1.991 1.056 0 2.038-.072 2.839-.217a14.74 14.74 0 0 0 2.111-.58.731.731 0 0 1 .983.689c0 .29-.182.58-.473.688-.874.362-1.711.58-2.475.724-.91.253-1.893.326-2.985.326Zm-.51-17.886c-1.82 0-3.276.579-4.368 1.774-1.092 1.158-1.71 2.896-1.929 5.105h11.648c0-2.136-.473-3.874-1.419-5.069-.947-1.195-2.257-1.81-3.932-1.81Zm26.354 17.56a.822.822 0 0 1-.837-.833V15.097c0-1.882-.4-3.258-1.165-4.09-.837-.834-2.038-1.304-3.713-1.304-2.256 0-3.894.543-4.914 1.701-1.019 1.123-1.601 2.97-1.601 5.468v9.486c0 .47-.364.832-.837.832a.822.822 0 0 1-.838-.832V9.304c0-.434.328-.76.765-.76.4 0 .691.29.764.652l.219 1.883h.109c1.237-1.956 3.385-2.933 6.516-2.933 4.258 0 6.406 2.28 6.406 6.843v11.369c-.036.507-.437.905-.874.905ZM62.224.18c-1.71 0-3.094 1.304-3.094 2.933v.29c0 1.593 1.42 2.932 3.094 2.932 1.675 0 3.094-1.34 3.094-2.932v-.254c0-1.665-1.42-2.969-3.094-2.969Z" clip-rule="evenodd"/><path class="tw-fill-text-alt2" d="M22.097 17.27V4.322h-9.099v23c1.612-.85 3.054-1.773 4.326-2.771 3.182-2.482 4.773-4.91 4.773-7.283Zm3.9-15.536v15.535a9.26 9.26 0 0 1-.68 3.45 12.85 12.85 0 0 1-1.686 3.034c-.67.883-1.47 1.743-2.397 2.579a27.862 27.862 0 0 1-2.57 2.083 32.334 32.334 0 0 1-2.457 1.568c-.853.492-1.459.826-1.817 1.001-.36.176-.647.31-.864.405-.162.08-.338.121-.528.121s-.365-.04-.528-.121c-.216-.095-.504-.23-.863-.405-.359-.175-.965-.509-1.818-1.001a32.354 32.354 0 0 1-2.457-1.568 27.873 27.873 0 0 1-2.57-2.083 18.756 18.756 0 0 1-2.396-2.58A12.851 12.851 0 0 1 .68 20.719 9.259 9.259 0 0 1 0 17.27V1.734c0-.35.129-.654.386-.91C.643.567.948.439 1.3.439h23.397c.352 0 .657.128.914.385.257.256.386.56.386.91ZM92.527 45.635l3.977-10.79h1.372l3.962 10.79h-1.372l-.987-2.775h-4.593l-1.002 2.775h-1.357Zm2.744-3.823h3.823l-1.911-5.334-1.912 5.334ZM106.412 45.82c-.761 0-1.429-.175-2.004-.524a3.647 3.647 0 0 1-1.326-1.434c-.308-.606-.462-1.295-.462-2.066 0-.77.159-1.454.478-2.05.318-.606.76-1.079 1.325-1.418.565-.35 1.233-.524 2.004-.524.627 0 1.182.128 1.665.385.483.257.858.617 1.125 1.08v-4.733h1.295v11.099h-1.171l-.124-1.264c-.246.37-.601.704-1.063 1.002-.463.298-1.043.447-1.742.447Zm.139-1.126c.513 0 .966-.118 1.356-.354.401-.247.709-.586.925-1.017.226-.432.339-.936.339-1.511 0-.576-.113-1.08-.339-1.51a2.36 2.36 0 0 0-.925-1.003c-.39-.246-.843-.37-1.356-.37-.504 0-.956.124-1.357.37-.39.237-.699.57-.925 1.002-.216.432-.324.935-.324 1.51 0 .576.108 1.08.324 1.512.226.431.535.77.925 1.017.401.236.853.354 1.357.354ZM112.623 45.635v-7.646h1.172l.092 1.11c.247-.411.576-.73.987-.956.411-.226.873-.339 1.387-.339.606 0 1.125.123 1.557.37.442.247.781.622 1.017 1.125a2.94 2.94 0 0 1 1.095-1.094c.472-.267.981-.401 1.526-.401.914 0 1.644.277 2.189.832.544.545.817 1.388.817 2.528v4.47h-1.28v-4.33c0-.792-.159-1.388-.478-1.789-.318-.4-.775-.601-1.372-.601-.616 0-1.13.241-1.541.724-.401.473-.601 1.151-.601 2.035v3.962h-1.295v-4.332c0-.791-.159-1.387-.478-1.788-.319-.4-.776-.601-1.372-.601-.606 0-1.115.241-1.526.724-.401.473-.601 1.151-.601 2.035v3.962h-1.295ZM127.198 36.293a.908.908 0 0 1-.647-.246.91.91 0 0 1-.247-.648c0-.246.083-.452.247-.616a.908.908 0 0 1 .647-.247c.247 0 .458.082.632.247a.81.81 0 0 1 .262.616.878.878 0 0 1-.262.648.887.887 0 0 1-.632.246Zm-.647 9.342v-7.646h1.295v7.646h-1.295ZM130.1 45.635v-7.646h1.172l.077 1.372a2.777 2.777 0 0 1 1.064-1.14 2.993 2.993 0 0 1 1.572-.417c.904 0 1.624.277 2.158.832.545.545.817 1.388.817 2.528v4.47h-1.295v-4.33c0-1.594-.658-2.39-1.973-2.39-.658 0-1.207.241-1.649.724-.432.473-.648 1.151-.648 2.035v3.962H130.1ZM147.811 45.82c-1.059 0-1.973-.231-2.744-.694a4.818 4.818 0 0 1-1.773-1.958c-.421-.842-.632-1.819-.632-2.928 0-1.1.211-2.066.632-2.898.422-.843 1.013-1.5 1.773-1.974.771-.472 1.685-.709 2.744-.709 1.233 0 2.235.298 3.006.894.781.586 1.279 1.408 1.495 2.467h-1.434c-.164-.668-.503-1.203-1.017-1.603-.503-.411-1.187-.617-2.05-.617-.771 0-1.444.18-2.019.54-.576.349-1.023.858-1.342 1.526-.308.657-.462 1.449-.462 2.374 0 .924.154 1.72.462 2.389.319.658.766 1.166 1.342 1.526.575.35 1.248.524 2.019.524.863 0 1.547-.195 2.05-.586.514-.4.853-.93 1.017-1.587h1.434c-.216 1.038-.714 1.85-1.495 2.435-.771.586-1.773.879-3.006.879ZM157.58 45.82c-.72 0-1.367-.165-1.942-.493a3.627 3.627 0 0 1-1.372-1.388c-.329-.606-.494-1.315-.494-2.127 0-.812.17-1.516.509-2.112a3.598 3.598 0 0 1 1.372-1.403 3.93 3.93 0 0 1 1.958-.493c.719 0 1.366.164 1.942.493a3.494 3.494 0 0 1 1.356 1.403c.34.596.509 1.3.509 2.112s-.169 1.52-.509 2.127a3.596 3.596 0 0 1-1.387 1.388c-.575.328-1.223.493-1.942.493Zm0-1.11c.442 0 .853-.108 1.233-.324.38-.216.689-.54.925-.97.236-.433.354-.967.354-1.604 0-.637-.118-1.172-.354-1.603-.226-.432-.529-.756-.91-.971a2.426 2.426 0 0 0-1.217-.324c-.442 0-.853.108-1.234.324-.38.215-.688.54-.924.97-.237.432-.355.967-.355 1.604 0 .637.118 1.171.355 1.603.236.432.539.755.909.971.38.216.786.324 1.218.324ZM163.219 45.635v-7.646h1.171l.077 1.372a2.777 2.777 0 0 1 1.064-1.14 2.993 2.993 0 0 1 1.572-.417c.905 0 1.624.277 2.158.832.545.545.817 1.388.817 2.528v4.47h-1.295v-4.33c0-1.594-.657-2.39-1.973-2.39-.657 0-1.207.241-1.649.724-.432.473-.648 1.151-.648 2.035v3.962h-1.294ZM174.969 45.82c-.915 0-1.675-.231-2.282-.694-.606-.462-.96-1.09-1.063-1.88h1.326c.082.4.292.75.632 1.048.349.288.817.431 1.402.431.545 0 .946-.113 1.203-.339.257-.236.385-.514.385-.832 0-.463-.169-.771-.509-.925-.328-.154-.796-.293-1.402-.416a7.953 7.953 0 0 1-1.234-.355 2.846 2.846 0 0 1-1.032-.647c-.278-.288-.417-.663-.417-1.126 0-.668.247-1.212.74-1.634.504-.431 1.182-.647 2.035-.647.812 0 1.475.206 1.989.617.524.4.827.976.909 1.726h-1.279c-.052-.39-.221-.694-.509-.91-.277-.226-.653-.339-1.125-.339-.463 0-.822.098-1.079.293a.935.935 0 0 0-.37.771c0 .308.159.55.478.725.328.174.77.323 1.325.447.473.102.92.23 1.341.385.432.144.781.365 1.049.663.277.288.416.709.416 1.264.01.688-.252 1.259-.786 1.711-.525.442-1.239.663-2.143.663ZM183.231 45.82c-.719 0-1.366-.165-1.942-.493a3.634 3.634 0 0 1-1.372-1.388c-.329-.606-.493-1.315-.493-2.127 0-.812.169-1.516.509-2.112a3.603 3.603 0 0 1 1.371-1.403 3.932 3.932 0 0 1 1.958-.493c.72 0 1.367.164 1.942.493a3.496 3.496 0 0 1 1.357 1.403c.339.596.509 1.3.509 2.112s-.17 1.52-.509 2.127a3.603 3.603 0 0 1-1.387 1.388c-.576.328-1.223.493-1.943.493Zm0-1.11c.442 0 .853-.108 1.234-.324.38-.216.688-.54.924-.97.237-.433.355-.967.355-1.604 0-.637-.118-1.172-.355-1.603-.226-.432-.529-.756-.909-.971a2.427 2.427 0 0 0-1.218-.324c-.442 0-.853.108-1.233.324-.38.215-.689.54-.925.97-.236.432-.354.967-.354 1.604 0 .637.118 1.171.354 1.603.236.432.54.755.91.971.38.216.786.324 1.217.324ZM188.87 45.635V34.536h1.295v11.099h-1.295ZM195.725 45.82c-.73 0-1.377-.165-1.942-.493a3.666 3.666 0 0 1-1.342-1.403c-.318-.596-.477-1.3-.477-2.112 0-.802.159-1.5.477-2.096a3.43 3.43 0 0 1 1.326-1.403c.576-.34 1.239-.509 1.989-.509.74 0 1.377.17 1.911.509.545.328.961.765 1.249 1.31.288.545.431 1.13.431 1.757 0 .113-.005.226-.015.34v.385h-6.089c.031.586.164 1.074.401 1.464.246.38.55.668.909.863.37.196.761.293 1.172.293.534 0 .981-.123 1.341-.37.36-.246.622-.58.786-1.002h1.28c-.206.71-.602 1.3-1.187 1.773-.576.463-1.316.694-2.22.694Zm0-6.922c-.617 0-1.167.19-1.65.57-.472.37-.745.915-.817 1.635h4.81c-.031-.689-.267-1.228-.709-1.619-.442-.39-.987-.586-1.634-.586Z"/></svg>
+`;
+
+export default AdminConsoleLogo;
diff --git a/libs/components/src/icon/logos/bitwarden/index.ts b/libs/components/src/icon/logos/bitwarden/index.ts
new file mode 100644
index 00000000000..ba78bdb4fe5
--- /dev/null
+++ b/libs/components/src/icon/logos/bitwarden/index.ts
@@ -0,0 +1,4 @@
+export { default as AdminConsoleLogo } from "./admin-console";
+export * from "./shield";
+export { default as PasswordManagerLogo } from "./password-manager";
+export { default as SecretsManagerLogo } from "./secrets-manager";
diff --git a/libs/components/src/icon/logos/bitwarden/password-manager.ts b/libs/components/src/icon/logos/bitwarden/password-manager.ts
new file mode 100644
index 00000000000..37b62c5dbc2
--- /dev/null
+++ b/libs/components/src/icon/logos/bitwarden/password-manager.ts
@@ -0,0 +1,7 @@
+import { svgIcon } from "../../icon";
+
+const PasswordManagerLogo = svgIcon`
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 200 49"><path class="tw-fill-text-alt2" fill-rule="evenodd" d="M48.038 7.458c2.289 0 4.069.869 5.376 2.679 1.308 1.774 1.962 4.2 1.962 7.277 0 3.186-.654 5.647-1.998 7.385-1.344 1.774-3.16 2.607-5.449 2.607-2.288 0-4.032-.797-5.34-2.462h-.363l-.69 1.701a.672.672 0 0 1-.618.399h-2.906a.65.65 0 0 1-.654-.652V.942a.65.65 0 0 1 .654-.652h3.923a.65.65 0 0 1 .654.651v5.576c0 .796-.072 2.063-.218 3.8h.218c1.2-1.882 3.052-2.86 5.45-2.86Zm-1.67 4.236c-1.272 0-2.253.398-2.87 1.194-.582.797-.909 2.136-.909 3.946v.58c0 2.063.29 3.548.909 4.416.617.87 1.598 1.34 2.942 1.34 1.053 0 1.962-.507 2.579-1.52.617-.978.945-2.462.945-4.309 0-1.882-.328-3.294-.945-4.236-.654-.94-1.562-1.411-2.652-1.411ZM64.021 27.08h-3.924a.65.65 0 0 1-.654-.652V8.508a.65.65 0 0 1 .654-.652h3.924a.65.65 0 0 1 .653.652v17.884c.037.326-.29.688-.653.688Zm14.348-3.874c.763 0 1.671-.145 2.761-.434a.436.436 0 0 1 .545.434v3.005a.445.445 0 0 1-.254.398c-1.236.507-2.797.76-4.541.76-2.107 0-3.633-.506-4.577-1.592-.945-1.05-1.453-2.643-1.453-4.743v-9.232h-2.07a.419.419 0 0 1-.437-.434V9.666c0-.036.037-.072.037-.108l2.87-1.702 1.416-3.765c.073-.181.218-.29.4-.29h2.615c.254 0 .436.181.436.435v3.656h5.195c.109 0 .218.109.218.218v3.258a.419.419 0 0 1-.436.434h-4.94v9.196c0 .724.217 1.303.617 1.629.363.398.944.58 1.598.58Zm24.447 3.874c-.508 0-.908-.326-1.126-.796l-3.85-11.694c-.254-.833-.581-2.1-1.017-3.73h-.11l-.363 1.304-.762 2.462-3.96 11.694c-.145.47-.581.76-1.09.76-.508 0-.944-.326-1.09-.833L84.62 9.413c-.146-.507.254-1.05.835-1.05h.109a.85.85 0 0 1 .799.615l2.833 10.246c.69 2.679 1.163 4.634 1.38 5.937h.11c.653-2.679 1.162-4.453 1.489-5.358l3.669-10.716c.145-.434.545-.724 1.053-.724.473 0 .872.29 1.017.724l3.415 10.644c.836 2.715 1.344 4.453 1.526 5.358h.109c.109-.724.545-2.752 1.38-6.01l2.725-10.1a.85.85 0 0 1 .799-.616c.545 0 .944.507.799 1.05l-4.577 16.834c-.145.507-.581.833-1.126.833h-.146Zm21.578 0a.664.664 0 0 1-.654-.58l-.327-2.389h-.182c-.944 1.195-1.888 2.064-2.906 2.57-.98.508-2.179.725-3.523.725-1.853 0-3.269-.47-4.287-1.412-.908-.833-1.416-1.955-1.489-3.367-.145-1.883.654-3.693 2.18-4.743 1.562-1.013 3.741-1.629 6.684-1.629l3.559-.108v-1.231c0-1.81-.363-3.114-1.126-4.019-.762-.905-1.889-1.34-3.487-1.34-1.526 0-3.051.363-4.65 1.123a.799.799 0 0 1-1.053-.398c-.182-.399 0-.87.4-1.014 1.816-.724 3.596-1.122 5.412-1.122 2.071 0 3.596.543 4.65 1.629 1.017 1.05 1.525 2.751 1.525 4.96V26.5c-.036.217-.363.579-.726.579Zm-7.52-1.231c2.035 0 3.597-.58 4.723-1.701 1.162-1.123 1.743-2.752 1.743-4.743v-1.81l-3.269.145c-2.652.108-4.504.543-5.667 1.23-1.126.688-1.707 1.81-1.707 3.259 0 1.158.363 2.1 1.053 2.751.8.543 1.817.869 3.124.869ZM138.38 8.001c.545 0 1.09.036 1.708.109a.818.818 0 0 1 .69.94c-.073.435-.509.689-.945.616-.545-.072-1.089-.145-1.634-.145-1.599 0-2.906.688-3.923 2.028-1.018 1.34-1.526 3.077-1.526 5.104v9.486a.82.82 0 0 1-.836.832.82.82 0 0 1-.835-.832V9.123c0-.398.327-.724.726-.724.4 0 .727.29.727.688l.145 2.679h.109c.763-1.376 1.598-2.353 2.47-2.896.836-.58 1.889-.87 3.124-.87Zm12.787 0c1.344 0 2.543.253 3.524.724 1.017.47 1.889 1.34 2.651 2.534h.109a86.486 86.486 0 0 1-.109-4.236v-5.9c0-.471.364-.833.836-.833a.82.82 0 0 1 .835.832v25.306c0 .326-.254.58-.581.58a.589.589 0 0 1-.581-.543l-.363-2.354h-.146c-1.416 2.136-3.487 3.186-6.139 3.186-2.615 0-4.54-.796-5.957-2.425-1.344-1.63-2.071-3.947-2.071-7.024 0-3.222.654-5.684 2.035-7.421C146.59 8.87 148.552 8 151.167 8Zm0 1.557c-2.071 0-3.596.724-4.65 2.172-1.017 1.412-1.525 3.475-1.525 6.227 0 5.285 2.07 7.928 6.211 7.928 2.144 0 3.669-.615 4.65-1.846 1.017-1.231 1.489-3.258 1.489-6.082v-.29c0-2.896-.472-4.96-1.489-6.19-.944-1.304-2.506-1.92-4.686-1.92Zm21.759 17.848c-2.724 0-4.831-.833-6.393-2.534-1.526-1.666-2.289-4.019-2.289-7.024s.727-5.394 2.216-7.168c1.489-1.81 3.451-2.715 5.958-2.715 2.179 0 3.959.76 5.194 2.28 1.308 1.521 1.925 3.62 1.925 6.264v1.375h-13.513c.037 2.57.618 4.526 1.816 5.901 1.199 1.376 2.87 1.992 5.086 1.992 1.054 0 2.034-.073 2.834-.218a14.71 14.71 0 0 0 2.106-.579c.473-.18.981.181.981.688 0 .29-.181.58-.472.688-.872.362-1.707.58-2.47.724-.908.253-1.889.326-2.979.326Zm-.508-17.885c-1.817 0-3.27.58-4.36 1.774-1.089 1.159-1.707 2.897-1.925 5.105h11.624c0-2.136-.472-3.874-1.416-5.068-.945-1.195-2.252-1.81-3.923-1.81Zm26.299 17.559a.82.82 0 0 1-.835-.833V14.916c0-1.883-.4-3.259-1.163-4.091-.835-.833-2.034-1.304-3.705-1.304-2.252 0-3.887.543-4.904 1.702-1.017 1.122-1.598 2.969-1.598 5.467v9.485a.82.82 0 0 1-.836.832.82.82 0 0 1-.835-.832V9.123c0-.434.327-.76.763-.76.399 0 .69.29.763.652l.218 1.882h.109c1.235-1.955 3.378-2.932 6.502-2.932 4.25 0 6.393 2.28 6.393 6.842v11.368c-.036.507-.436.905-.872.905ZM62.097 0c-1.708 0-3.088 1.303-3.088 2.932v.29c0 1.593 1.416 2.933 3.087 2.933 1.671 0 3.088-1.34 3.088-2.933V2.97C65.184 1.303 63.767 0 62.096 0Z" clip-rule="evenodd"/><path class="tw-fill-text-alt2" d="M22.052 17.087V4.142h-9.08V27.14c1.608-.85 3.047-1.773 4.317-2.771 3.175-2.481 4.763-4.908 4.763-7.282Zm3.891-15.534v15.534c0 1.16-.226 2.31-.679 3.45a12.86 12.86 0 0 1-1.682 3.033 18.741 18.741 0 0 1-2.392 2.579c-.925.836-1.78 1.53-2.564 2.083a32.288 32.288 0 0 1-2.452 1.568c-.851.492-1.456.826-1.814 1.001-.358.175-.645.31-.861.405-.163.08-.338.12-.527.12-.19 0-.365-.04-.527-.12-.216-.095-.504-.23-.862-.405-.358-.175-.962-.509-1.814-1.001a32.279 32.279 0 0 1-2.452-1.568 27.823 27.823 0 0 1-2.564-2.083A18.74 18.74 0 0 1 2.36 23.57 12.857 12.857 0 0 1 .68 20.536 9.273 9.273 0 0 1 0 17.087V1.553C0 1.203.128.9.385.643S.945.26 1.297.26h23.35c.35 0 .655.128.911.384.257.256.385.56.385.91ZM195.682 44.967v-7.753h1.12l.088 1.415c.177-.354.408-.649.693-.884a2.853 2.853 0 0 1 1.032-.531 5.033 5.033 0 0 1 1.385-.177v1.297h-.766c-.295 0-.58.04-.855.118a2.183 2.183 0 0 0-.752.383 1.825 1.825 0 0 0-.516.722c-.128.305-.191.688-.191 1.15v4.26h-1.238ZM190.546 45.144c-.688 0-1.297-.167-1.827-.502-.531-.334-.949-.805-1.253-1.415-.295-.609-.442-1.321-.442-2.137 0-.815.147-1.528.442-2.137.304-.609.722-1.08 1.253-1.415.54-.334 1.159-.5 1.857-.5.747 0 1.371.166 1.872.5.501.334.879.781 1.135 1.342.255.56.383 1.174.383 1.842v.295c0 .098-.005.216-.015.353h-5.999v-.958h4.805c-.019-.756-.241-1.331-.663-1.724-.413-.403-.929-.604-1.548-.604a2.24 2.24 0 0 0-1.149.31 2.214 2.214 0 0 0-.84.884c-.217.392-.325.884-.325 1.473v.413c0 .649.108 1.194.325 1.636.216.433.496.757.84.973.353.216.737.324 1.149.324.551 0 .983-.103 1.297-.31.315-.215.546-.52.693-.913h1.223c-.117.432-.324.82-.619 1.164a2.941 2.941 0 0 1-1.09.81c-.433.197-.934.296-1.504.296ZM182.179 48.386c-.697 0-1.311-.088-1.842-.265-.521-.167-.929-.428-1.223-.781-.285-.354-.428-.791-.428-1.312 0-.246.044-.501.133-.767.098-.265.26-.52.486-.766.236-.245.565-.467.988-.663l.943.501c-.56.216-.924.467-1.091.752-.167.285-.25.56-.25.825 0 .324.093.595.28.81.196.217.467.379.81.487.344.108.742.162 1.194.162.443 0 .821-.059 1.135-.177.325-.108.57-.27.737-.486.177-.206.266-.452.266-.737 0-.413-.133-.737-.398-.973-.266-.226-.782-.358-1.548-.398a15 15 0 0 1-1.503-.162 6.95 6.95 0 0 1-1.003-.236 3.329 3.329 0 0 1-.648-.324 4.345 4.345 0 0 1-.457-.368v-.34l1.459-1.4 1.164.384-1.591 1.311.191-.56c.108.079.211.153.31.221.098.07.231.133.398.192.177.05.417.098.722.147.314.05.727.094 1.238.133.707.05 1.272.167 1.695.354.423.186.727.447.914.78.187.325.28.723.28 1.195 0 .413-.118.806-.354 1.179-.226.373-.589.678-1.091.914-.491.245-1.13.368-1.916.368Zm-.014-5.837c-.629 0-1.165-.117-1.607-.353a2.512 2.512 0 0 1-.987-.988 2.952 2.952 0 0 1-.339-1.415c0-.52.113-.987.339-1.4a2.605 2.605 0 0 1 1.002-.987c.442-.246.973-.369 1.592-.369.638 0 1.174.123 1.606.369.433.245.762.574.988.987.226.413.339.88.339 1.4 0 .521-.113.993-.339 1.415a2.508 2.508 0 0 1-.988.988c-.432.236-.968.354-1.606.354Zm0-1.017c.55 0 .977-.142 1.282-.427.305-.295.457-.732.457-1.312 0-.58-.152-1.012-.457-1.297-.305-.285-.732-.427-1.282-.427-.521 0-.949.142-1.283.427-.324.285-.486.718-.486 1.297 0 .58.157 1.017.472 1.312.324.285.756.428 1.297.428Zm1.297-3.271-.369-1.047h3.036v.928l-2.667.118ZM173.442 45.144c-.589 0-1.081-.108-1.474-.325a2.252 2.252 0 0 1-.884-.884 2.533 2.533 0 0 1-.295-1.194c0-.51.128-.943.384-1.297.265-.364.633-.639 1.105-.825.472-.187 1.022-.28 1.651-.28h1.931c0-.502-.059-.92-.177-1.253a1.407 1.407 0 0 0-.575-.752c-.265-.167-.619-.25-1.061-.25-.443 0-.821.113-1.135.339-.315.216-.511.54-.59.972h-1.267c.059-.51.231-.938.515-1.282.285-.354.644-.619 1.076-.796.443-.187.909-.28 1.401-.28.697 0 1.272.128 1.724.383.452.246.786.595 1.002 1.047.217.442.325.968.325 1.577v4.923h-1.106l-.073-1.327a2.752 2.752 0 0 1-.384.59 2.459 2.459 0 0 1-.53.472 2.6 2.6 0 0 1-.708.324c-.255.078-.54.118-.855.118Zm.177-1.047c.324 0 .624-.074.899-.22a2.28 2.28 0 0 0 .708-.59 2.8 2.8 0 0 0 .471-.855c.109-.315.163-.644.163-.988v-.147h-1.828c-.462 0-.84.059-1.135.177-.285.118-.491.285-.619.5a1.315 1.315 0 0 0-.192.708c0 .285.059.536.177.752.118.206.29.368.516.486.236.118.516.177.84.177ZM162.504 44.967v-7.753h1.12l.059 1.223c.226-.442.55-.786.973-1.031.432-.246.929-.369 1.489-.369.57 0 1.066.108 1.488.324.423.217.752.546.988.988.236.442.354 1.002.354 1.68v4.938h-1.239v-4.805c0-.688-.172-1.204-.515-1.548-.335-.344-.787-.516-1.356-.516-.384 0-.737.094-1.062.28a1.97 1.97 0 0 0-.781.796c-.187.354-.28.786-.28 1.297v4.496h-1.238ZM156.803 45.144c-.589 0-1.081-.108-1.474-.325a2.246 2.246 0 0 1-.884-.884 2.52 2.52 0 0 1-.295-1.194c0-.51.128-.943.383-1.297.266-.364.634-.639 1.106-.825.471-.187 1.022-.28 1.651-.28h1.93c0-.502-.059-.92-.176-1.253a1.407 1.407 0 0 0-.575-.752c-.266-.167-.619-.25-1.062-.25-.442 0-.82.113-1.134.339-.315.216-.511.54-.59.972h-1.268c.059-.51.231-.938.516-1.282.285-.354.644-.619 1.076-.796.442-.187.909-.28 1.4-.28.698 0 1.273.128 1.725.383.452.246.786.595 1.002 1.047.216.442.324.968.324 1.577v4.923h-1.105l-.074-1.327a2.747 2.747 0 0 1-.383.59 2.459 2.459 0 0 1-.53.472 2.614 2.614 0 0 1-.708.324c-.255.078-.54.118-.855.118Zm.177-1.047c.324 0 .624-.074.899-.22a2.28 2.28 0 0 0 .708-.59 2.8 2.8 0 0 0 .471-.855c.108-.315.162-.644.162-.988v-.147h-1.827c-.462 0-.84.059-1.135.177-.285.118-.491.285-.619.5a1.315 1.315 0 0 0-.192.708c0 .285.059.536.177.752.118.206.29.368.516.486.236.118.516.177.84.177ZM142.312 44.967V34.649h1.444l3.508 7.267 3.479-7.267h1.459v10.318h-1.238v-8.092l-3.243 6.736h-.929l-3.242-6.677v8.033h-1.238ZM132.309 45.144c-.688 0-1.297-.177-1.828-.53a3.564 3.564 0 0 1-1.238-1.445c-.294-.62-.442-1.317-.442-2.093 0-.786.148-1.48.442-2.079a3.459 3.459 0 0 1 1.238-1.43c.531-.353 1.145-.53 1.843-.53.609 0 1.13.123 1.562.369.442.245.791.59 1.047 1.031v-4.082h1.238v10.612h-1.12l-.104-1.238a2.951 2.951 0 0 1-.589.692 2.826 2.826 0 0 1-.87.531c-.334.128-.727.192-1.179.192Zm.162-1.076c.492 0 .919-.118 1.282-.354.364-.246.644-.59.841-1.032.196-.452.294-.982.294-1.592 0-.609-.098-1.135-.294-1.577-.197-.452-.477-.796-.841-1.031-.363-.246-.79-.369-1.282-.369a2.16 2.16 0 0 0-1.238.369c-.363.235-.648.58-.855 1.031-.206.443-.309.968-.309 1.577 0 .61.103 1.14.309 1.592.207.442.492.786.855 1.032.364.236.776.354 1.238.354ZM123.641 44.967v-7.753h1.12l.089 1.415c.177-.354.408-.649.692-.884a2.853 2.853 0 0 1 1.032-.531 5.045 5.045 0 0 1 1.386-.177v1.297h-.767c-.295 0-.579.04-.855.118a2.178 2.178 0 0 0-.751.383 1.825 1.825 0 0 0-.516.722c-.128.305-.192.688-.192 1.15v4.26h-1.238ZM118.178 45.144c-.718 0-1.352-.167-1.902-.502a3.385 3.385 0 0 1-1.282-1.415c-.305-.609-.457-1.321-.457-2.137 0-.825.152-1.537.457-2.137a3.48 3.48 0 0 1 1.297-1.415c.56-.334 1.199-.5 1.916-.5.727 0 1.361.166 1.901.5.551.334.978.806 1.283 1.415.304.6.457 1.312.457 2.137 0 .816-.158 1.528-.472 2.137a3.385 3.385 0 0 1-1.282 1.416c-.551.334-1.189.5-1.916.5Zm0-1.062c.452 0 .859-.108 1.223-.324.363-.226.648-.56.855-1.002.216-.452.324-1.007.324-1.666 0-.668-.103-1.223-.309-1.665-.207-.442-.492-.771-.855-.988a2.198 2.198 0 0 0-1.209-.339c-.442 0-.845.113-1.209.34-.363.215-.653.545-.869.987-.216.442-.324.997-.324 1.665 0 .659.103 1.214.309 1.666.216.442.501.776.855 1.002.364.216.766.324 1.209.324ZM105.111 44.967l-2.285-7.753h1.238l1.695 6.176 1.799-6.176h1.4l1.813 6.16 1.68-6.16h1.253l-2.285 7.753h-1.267l-1.887-6.456-1.887 6.456h-1.267ZM99.08 45.144c-.698 0-1.278-.103-1.74-.31-.452-.216-.796-.51-1.032-.884a3.065 3.065 0 0 1-.427-1.327h1.267c.04.266.128.511.266.737.147.216.358.393.633.53.276.138.624.207 1.047.207.334 0 .619-.049.855-.147a1.19 1.19 0 0 0 .53-.442c.128-.187.192-.403.192-.649 0-.324-.074-.575-.221-.752-.138-.186-.344-.324-.62-.412a4.498 4.498 0 0 0-1.001-.221 6.69 6.69 0 0 1-1.15-.251 2.902 2.902 0 0 1-.855-.427 1.712 1.712 0 0 1-.516-.664 2.309 2.309 0 0 1-.177-.943c0-.422.113-.796.34-1.12.225-.324.545-.575.957-.752.423-.187.92-.28 1.489-.28.835 0 1.494.192 1.975.575.491.383.781.928.87 1.636h-1.224a1.209 1.209 0 0 0-.501-.855c-.285-.206-.663-.31-1.135-.31-.5 0-.88.094-1.135.28a.871.871 0 0 0-.383.738c0 .226.054.432.162.619.118.177.315.329.59.456.275.118.643.207 1.105.266.58.069 1.071.182 1.474.339.403.147.708.378.914.693.216.314.319.742.31 1.282 0 .51-.123.943-.369 1.297-.236.354-.57.624-1.002.81-.423.187-.919.28-1.489.28ZM91.58 45.144c-.698 0-1.277-.103-1.74-.31-.451-.216-.795-.51-1.031-.884a3.065 3.065 0 0 1-.427-1.327h1.267c.04.266.128.511.266.737.147.216.358.393.633.53.275.138.624.207 1.047.207.334 0 .619-.049.855-.147.235-.108.412-.256.53-.442a1.12 1.12 0 0 0 .192-.649c0-.324-.074-.575-.221-.752-.138-.186-.344-.324-.62-.412a4.498 4.498 0 0 0-1.002-.221 6.692 6.692 0 0 1-1.15-.251 2.9 2.9 0 0 1-.854-.427 1.712 1.712 0 0 1-.516-.664 2.309 2.309 0 0 1-.177-.943c0-.422.113-.796.34-1.12.225-.324.544-.575.957-.752.423-.187.919-.28 1.489-.28.835 0 1.493.192 1.975.575.491.383.781.928.87 1.636h-1.224a1.21 1.21 0 0 0-.501-.855c-.285-.206-.663-.31-1.135-.31-.501 0-.88.094-1.135.28a.87.87 0 0 0-.383.738c0 .226.054.432.162.619.118.177.315.329.59.456.275.118.643.207 1.105.266.58.069 1.071.182 1.474.339.403.147.708.378.914.693.216.314.32.742.31 1.282 0 .51-.123.943-.37 1.297a2.23 2.23 0 0 1-1.001.81c-.423.187-.92.28-1.489.28ZM83.079 45.144c-.59 0-1.081-.108-1.474-.325a2.25 2.25 0 0 1-.885-.884 2.526 2.526 0 0 1-.294-1.194c0-.51.127-.943.383-1.297.265-.364.634-.639 1.105-.825.472-.187 1.022-.28 1.651-.28h1.93c0-.502-.058-.92-.176-1.253-.118-.334-.31-.585-.575-.752-.265-.167-.619-.25-1.061-.25-.442 0-.82.113-1.135.339-.314.216-.51.54-.59.972h-1.267c.059-.51.23-.938.516-1.282a2.64 2.64 0 0 1 1.076-.796c.442-.187.909-.28 1.4-.28.698 0 1.272.128 1.724.383.453.246.787.595 1.003 1.047.216.442.324.968.324 1.577v4.923h-1.105l-.074-1.327a2.752 2.752 0 0 1-.383.59 2.465 2.465 0 0 1-.53.472 2.598 2.598 0 0 1-.708.324 2.9 2.9 0 0 1-.855.118Zm.177-1.047c.324 0 .623-.074.899-.22a2.27 2.27 0 0 0 .707-.59c.207-.256.364-.54.472-.855.108-.315.162-.644.162-.988v-.147h-1.828c-.462 0-.84.059-1.135.177-.285.118-.49.285-.619.5a1.317 1.317 0 0 0-.191.708c0 .285.059.536.177.752.117.206.29.368.515.486.236.118.516.177.84.177ZM72.488 44.967V34.649h3.316c.826 0 1.504.138 2.034.413.531.275.924.649 1.18 1.12.255.462.383.988.383 1.577 0 .58-.128 1.106-.383 1.577-.256.472-.649.845-1.18 1.12-.52.276-1.198.413-2.034.413h-2.078v4.098h-1.238Zm1.238-5.144h2.064c.864 0 1.469-.187 1.813-.56.353-.384.53-.885.53-1.504 0-.648-.177-1.154-.53-1.518-.344-.373-.949-.56-1.813-.56h-2.064v4.142Z"/></svg>
+`;
+
+export default PasswordManagerLogo;
diff --git a/libs/components/src/icon/logos/bitwarden/secrets-manager.ts b/libs/components/src/icon/logos/bitwarden/secrets-manager.ts
new file mode 100644
index 00000000000..bcba5f71d1a
--- /dev/null
+++ b/libs/components/src/icon/logos/bitwarden/secrets-manager.ts
@@ -0,0 +1,7 @@
+import { svgIcon } from "../../icon";
+
+const SecretsManagerLogo = svgIcon`
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 200 49"><path class="tw-fill-text-alt2" fill-rule="evenodd" d="M48.038 7.458c2.289 0 4.069.869 5.376 2.679 1.308 1.774 1.962 4.2 1.962 7.277 0 3.186-.654 5.647-1.998 7.385-1.344 1.774-3.16 2.607-5.449 2.607-2.288 0-4.032-.797-5.34-2.462h-.363l-.69 1.701a.672.672 0 0 1-.618.399h-2.906a.65.65 0 0 1-.654-.652V.942a.65.65 0 0 1 .654-.652h3.923a.65.65 0 0 1 .654.651v5.576c0 .796-.072 2.063-.218 3.8h.218c1.2-1.882 3.052-2.86 5.45-2.86Zm-1.67 4.236c-1.272 0-2.253.398-2.87 1.194-.582.797-.909 2.136-.909 3.946v.58c0 2.063.29 3.548.909 4.416.617.87 1.598 1.34 2.942 1.34 1.053 0 1.962-.507 2.579-1.52.617-.978.945-2.462.945-4.309 0-1.882-.328-3.294-.945-4.236-.654-.94-1.562-1.411-2.652-1.411ZM64.021 27.08h-3.924a.65.65 0 0 1-.654-.652V8.508a.65.65 0 0 1 .654-.652h3.924a.65.65 0 0 1 .653.652v17.884c.037.326-.29.688-.653.688Zm14.348-3.874c.763 0 1.671-.145 2.761-.434a.436.436 0 0 1 .545.434v3.005a.445.445 0 0 1-.254.398c-1.236.507-2.797.76-4.541.76-2.107 0-3.633-.506-4.577-1.592-.945-1.05-1.453-2.643-1.453-4.743v-9.232h-2.07a.419.419 0 0 1-.437-.434V9.666c0-.036.037-.072.037-.108l2.87-1.702 1.416-3.765c.073-.181.218-.29.4-.29h2.615c.254 0 .436.181.436.435v3.656h5.195c.109 0 .218.109.218.218v3.258a.419.419 0 0 1-.436.434h-4.94v9.196c0 .724.217 1.303.617 1.629.363.398.944.58 1.598.58Zm24.447 3.874c-.508 0-.908-.326-1.126-.796l-3.85-11.694c-.254-.833-.581-2.1-1.017-3.73h-.11l-.363 1.304-.762 2.462-3.96 11.694c-.145.47-.581.76-1.09.76-.508 0-.944-.326-1.09-.833L84.62 9.413c-.146-.507.254-1.05.835-1.05h.109a.85.85 0 0 1 .799.615l2.833 10.246c.69 2.679 1.163 4.634 1.38 5.937h.11c.653-2.679 1.162-4.453 1.489-5.358l3.669-10.716c.145-.434.545-.724 1.053-.724.473 0 .872.29 1.017.724l3.415 10.644c.836 2.715 1.344 4.453 1.526 5.358h.109c.109-.724.545-2.752 1.38-6.01l2.725-10.1a.85.85 0 0 1 .799-.616c.545 0 .944.507.799 1.05l-4.577 16.834c-.145.507-.581.833-1.126.833h-.146Zm21.578 0a.664.664 0 0 1-.654-.58l-.327-2.389h-.182c-.944 1.195-1.888 2.064-2.906 2.57-.98.508-2.179.725-3.523.725-1.853 0-3.269-.47-4.287-1.412-.908-.833-1.416-1.955-1.489-3.367-.145-1.883.654-3.693 2.18-4.743 1.562-1.013 3.741-1.629 6.684-1.629l3.559-.108v-1.231c0-1.81-.363-3.114-1.126-4.019-.762-.905-1.889-1.34-3.487-1.34-1.526 0-3.051.363-4.65 1.123a.799.799 0 0 1-1.053-.398c-.182-.399 0-.87.4-1.014 1.816-.724 3.596-1.122 5.412-1.122 2.071 0 3.596.543 4.65 1.629 1.017 1.05 1.525 2.751 1.525 4.96V26.5c-.036.217-.363.579-.726.579Zm-7.52-1.231c2.035 0 3.597-.58 4.723-1.701 1.162-1.123 1.743-2.752 1.743-4.743v-1.81l-3.269.145c-2.652.108-4.504.543-5.667 1.23-1.126.688-1.707 1.81-1.707 3.259 0 1.158.363 2.1 1.053 2.751.8.543 1.817.869 3.124.869ZM138.38 8.001c.545 0 1.09.036 1.708.109a.818.818 0 0 1 .69.94c-.073.435-.509.689-.945.616-.545-.072-1.089-.145-1.634-.145-1.599 0-2.906.688-3.923 2.028-1.018 1.34-1.526 3.077-1.526 5.104v9.486a.82.82 0 0 1-.836.832.82.82 0 0 1-.835-.832V9.123c0-.398.327-.724.726-.724.4 0 .727.29.727.688l.145 2.679h.109c.763-1.376 1.598-2.353 2.47-2.896.836-.58 1.889-.87 3.124-.87Zm12.787 0c1.344 0 2.543.253 3.524.724 1.017.47 1.889 1.34 2.651 2.534h.109a86.486 86.486 0 0 1-.109-4.236v-5.9c0-.471.364-.833.836-.833a.82.82 0 0 1 .835.832v25.306c0 .326-.254.58-.581.58a.589.589 0 0 1-.581-.543l-.363-2.354h-.146c-1.416 2.136-3.487 3.186-6.139 3.186-2.615 0-4.54-.796-5.957-2.425-1.344-1.63-2.071-3.947-2.071-7.024 0-3.222.654-5.684 2.035-7.421C146.59 8.87 148.552 8 151.167 8Zm0 1.557c-2.071 0-3.596.724-4.65 2.172-1.017 1.412-1.525 3.475-1.525 6.227 0 5.285 2.07 7.928 6.211 7.928 2.144 0 3.669-.615 4.65-1.846 1.017-1.231 1.489-3.258 1.489-6.082v-.29c0-2.896-.472-4.96-1.489-6.19-.944-1.304-2.506-1.92-4.686-1.92Zm21.759 17.848c-2.724 0-4.831-.833-6.393-2.534-1.526-1.666-2.289-4.019-2.289-7.024s.727-5.394 2.216-7.168c1.489-1.81 3.451-2.715 5.958-2.715 2.179 0 3.959.76 5.194 2.28 1.308 1.521 1.925 3.62 1.925 6.264v1.375h-13.513c.037 2.57.618 4.526 1.816 5.901 1.199 1.376 2.87 1.992 5.086 1.992 1.054 0 2.034-.073 2.834-.218a14.71 14.71 0 0 0 2.106-.579c.473-.18.981.181.981.688 0 .29-.181.58-.472.688-.872.362-1.707.58-2.47.724-.908.253-1.889.326-2.979.326Zm-.508-17.885c-1.817 0-3.27.58-4.36 1.774-1.089 1.159-1.707 2.897-1.925 5.105h11.624c0-2.136-.472-3.874-1.416-5.068-.945-1.195-2.252-1.81-3.923-1.81Zm26.299 17.559a.82.82 0 0 1-.835-.833V14.916c0-1.883-.4-3.259-1.163-4.091-.835-.833-2.034-1.304-3.705-1.304-2.252 0-3.887.543-4.904 1.702-1.017 1.122-1.598 2.969-1.598 5.467v9.485a.82.82 0 0 1-.836.832.82.82 0 0 1-.835-.832V9.123c0-.434.327-.76.763-.76.399 0 .69.29.763.652l.218 1.882h.109c1.235-1.955 3.378-2.932 6.502-2.932 4.25 0 6.393 2.28 6.393 6.842v11.368c-.036.507-.436.905-.872.905ZM62.097 0c-1.708 0-3.088 1.303-3.088 2.932v.29c0 1.593 1.416 2.933 3.087 2.933 1.671 0 3.088-1.34 3.088-2.933V2.97C65.184 1.303 63.767 0 62.096 0Z" clip-rule="evenodd"/><path class="tw-fill-text-alt2" d="M22.052 17.087V4.142h-9.08V27.14c1.608-.85 3.047-1.773 4.317-2.771 3.175-2.481 4.763-4.908 4.763-7.282Zm3.891-15.534v15.534c0 1.16-.226 2.31-.679 3.45a12.86 12.86 0 0 1-1.682 3.033 18.741 18.741 0 0 1-2.392 2.579c-.925.836-1.78 1.53-2.564 2.083a32.288 32.288 0 0 1-2.452 1.568c-.851.492-1.456.826-1.814 1.001-.358.175-.645.31-.861.405-.163.08-.338.12-.527.12-.19 0-.365-.04-.527-.12-.216-.095-.504-.23-.862-.405-.358-.175-.962-.509-1.814-1.001a32.279 32.279 0 0 1-2.452-1.568 27.823 27.823 0 0 1-2.564-2.083A18.74 18.74 0 0 1 2.36 23.57 12.857 12.857 0 0 1 .68 20.536 9.273 9.273 0 0 1 0 17.087V1.553C0 1.203.128.9.385.643S.945.26 1.297.26h23.35c.35 0 .655.128.911.384.257.256.385.56.385.91ZM195.682 44.967v-7.753h1.12l.088 1.415c.177-.354.408-.649.693-.884a2.853 2.853 0 0 1 1.032-.531 5.033 5.033 0 0 1 1.385-.177v1.297h-.766c-.295 0-.58.04-.855.118a2.183 2.183 0 0 0-.752.383 1.825 1.825 0 0 0-.516.722c-.128.305-.191.688-.191 1.15v4.26h-1.238ZM190.546 45.144c-.688 0-1.297-.167-1.827-.502-.531-.334-.949-.805-1.253-1.415-.295-.609-.442-1.321-.442-2.137 0-.815.147-1.528.442-2.137.304-.609.722-1.08 1.253-1.415.54-.334 1.159-.5 1.857-.5.747 0 1.371.166 1.872.5.501.334.879.781 1.135 1.342.255.56.383 1.174.383 1.842v.295c0 .098-.005.216-.015.353h-5.999v-.958h4.805c-.019-.756-.241-1.331-.663-1.724-.413-.403-.929-.604-1.548-.604a2.24 2.24 0 0 0-1.149.31 2.214 2.214 0 0 0-.84.884c-.217.392-.325.884-.325 1.473v.413c0 .649.108 1.194.325 1.636.216.433.496.757.84.973.353.216.737.324 1.149.324.551 0 .983-.103 1.297-.31.315-.215.546-.52.693-.913h1.223c-.117.432-.324.82-.619 1.164a2.941 2.941 0 0 1-1.09.81c-.433.197-.934.296-1.504.296ZM182.179 48.386c-.697 0-1.311-.088-1.842-.265-.521-.167-.929-.428-1.223-.781-.285-.354-.428-.791-.428-1.312 0-.246.044-.501.133-.767.098-.265.26-.52.486-.766.236-.245.565-.467.988-.663l.943.501c-.56.216-.924.467-1.091.752-.167.285-.25.56-.25.825 0 .324.093.595.28.81.196.217.467.379.81.487.344.108.742.162 1.194.162.443 0 .821-.059 1.135-.177.325-.108.57-.27.737-.486.177-.206.266-.452.266-.737 0-.413-.133-.737-.398-.973-.266-.226-.782-.358-1.548-.398a15 15 0 0 1-1.503-.162 6.95 6.95 0 0 1-1.003-.236 3.329 3.329 0 0 1-.648-.324 4.345 4.345 0 0 1-.457-.368v-.34l1.459-1.4 1.164.384-1.591 1.311.191-.56c.108.079.211.153.31.221.098.07.231.133.398.192.177.05.417.098.722.147.314.05.727.094 1.238.133.707.05 1.272.167 1.695.354.423.186.727.447.914.78.187.325.28.723.28 1.195 0 .413-.118.806-.354 1.179-.226.373-.589.678-1.091.914-.491.245-1.13.368-1.916.368Zm-.014-5.837c-.629 0-1.165-.117-1.607-.353a2.512 2.512 0 0 1-.987-.988 2.952 2.952 0 0 1-.339-1.415c0-.52.113-.987.339-1.4a2.605 2.605 0 0 1 1.002-.987c.442-.246.973-.369 1.592-.369.638 0 1.174.123 1.606.369.433.245.762.574.988.987.226.413.339.88.339 1.4 0 .521-.113.993-.339 1.415a2.508 2.508 0 0 1-.988.988c-.432.236-.968.354-1.606.354Zm0-1.017c.55 0 .977-.142 1.282-.427.305-.295.457-.732.457-1.312 0-.58-.152-1.012-.457-1.297-.305-.285-.732-.427-1.282-.427-.521 0-.949.142-1.283.427-.324.285-.486.718-.486 1.297 0 .58.157 1.017.472 1.312.324.285.756.428 1.297.428Zm1.297-3.271-.369-1.047h3.036v.928l-2.667.118ZM173.442 45.144c-.589 0-1.081-.108-1.474-.325a2.252 2.252 0 0 1-.884-.884 2.533 2.533 0 0 1-.295-1.194c0-.51.128-.943.384-1.297.265-.364.633-.639 1.105-.825.472-.187 1.022-.28 1.651-.28h1.931c0-.502-.059-.92-.177-1.253a1.407 1.407 0 0 0-.575-.752c-.265-.167-.619-.25-1.061-.25-.443 0-.821.113-1.135.339-.315.216-.511.54-.59.972h-1.267c.059-.51.231-.938.515-1.282.285-.354.644-.619 1.076-.796.443-.187.909-.28 1.401-.28.697 0 1.272.128 1.724.383.452.246.786.595 1.002 1.047.217.442.325.968.325 1.577v4.923h-1.106l-.073-1.327a2.752 2.752 0 0 1-.384.59 2.459 2.459 0 0 1-.53.472 2.6 2.6 0 0 1-.708.324c-.255.078-.54.118-.855.118Zm.177-1.047c.324 0 .624-.074.899-.22a2.28 2.28 0 0 0 .708-.59 2.8 2.8 0 0 0 .471-.855c.109-.315.163-.644.163-.988v-.147h-1.828c-.462 0-.84.059-1.135.177-.285.118-.491.285-.619.5a1.315 1.315 0 0 0-.192.708c0 .285.059.536.177.752.118.206.29.368.516.486.236.118.516.177.84.177ZM162.504 44.967v-7.753h1.12l.059 1.223c.226-.442.55-.786.973-1.031.432-.246.929-.369 1.489-.369.57 0 1.066.108 1.488.324.423.217.752.546.988.988.236.442.354 1.002.354 1.68v4.938h-1.239v-4.805c0-.688-.172-1.204-.515-1.548-.335-.344-.787-.516-1.356-.516-.384 0-.737.094-1.062.28a1.97 1.97 0 0 0-.781.796c-.187.354-.28.786-.28 1.297v4.496h-1.238ZM156.803 45.144c-.589 0-1.081-.108-1.474-.325a2.246 2.246 0 0 1-.884-.884 2.52 2.52 0 0 1-.295-1.194c0-.51.128-.943.383-1.297.266-.364.634-.639 1.106-.825.471-.187 1.022-.28 1.651-.28h1.93c0-.502-.059-.92-.176-1.253a1.407 1.407 0 0 0-.575-.752c-.266-.167-.619-.25-1.062-.25-.442 0-.82.113-1.134.339-.315.216-.511.54-.59.972h-1.268c.059-.51.231-.938.516-1.282.285-.354.644-.619 1.076-.796.442-.187.909-.28 1.4-.28.698 0 1.273.128 1.725.383.452.246.786.595 1.002 1.047.216.442.324.968.324 1.577v4.923h-1.105l-.074-1.327a2.747 2.747 0 0 1-.383.59 2.459 2.459 0 0 1-.53.472 2.614 2.614 0 0 1-.708.324c-.255.078-.54.118-.855.118Zm.177-1.047c.324 0 .624-.074.899-.22a2.28 2.28 0 0 0 .708-.59 2.8 2.8 0 0 0 .471-.855c.108-.315.162-.644.162-.988v-.147h-1.827c-.462 0-.84.059-1.135.177-.285.118-.491.285-.619.5a1.315 1.315 0 0 0-.192.708c0 .285.059.536.177.752.118.206.29.368.516.486.236.118.516.177.84.177ZM142.312 44.967V34.649h1.444l3.508 7.267 3.479-7.267h1.459v10.318h-1.238v-8.092l-3.243 6.736h-.929l-3.242-6.677v8.033h-1.238ZM133.566 45.144c-.697 0-1.277-.103-1.739-.31-.452-.216-.796-.51-1.032-.884a3.074 3.074 0 0 1-.427-1.327h1.268c.039.266.127.511.265.737.147.216.359.393.634.53.275.138.624.207 1.046.207.334 0 .619-.049.855-.147.236-.108.413-.256.531-.442.127-.187.191-.403.191-.649 0-.324-.073-.575-.221-.752-.137-.186-.344-.324-.619-.412a4.49 4.49 0 0 0-1.002-.221 6.701 6.701 0 0 1-1.15-.251 2.905 2.905 0 0 1-.855-.427 1.713 1.713 0 0 1-.516-.664 2.324 2.324 0 0 1-.176-.943c0-.422.113-.796.339-1.12.226-.324.545-.575.958-.752.422-.187.918-.28 1.488-.28.836 0 1.494.192 1.975.575.492.383.782.928.87 1.636h-1.223a1.214 1.214 0 0 0-.502-.855c-.284-.206-.663-.31-1.134-.31-.502 0-.88.094-1.135.28a.87.87 0 0 0-.384.738c0 .226.054.432.163.619.117.177.314.329.589.456.275.118.644.207 1.106.266.579.069 1.071.182 1.473.339.403.147.708.378.914.693.216.314.32.742.31 1.282 0 .51-.123.943-.369 1.297-.235.354-.57.624-1.002.81-.422.187-.919.28-1.489.28ZM127.785 44.967c-.442 0-.825-.07-1.15-.207a1.512 1.512 0 0 1-.751-.692c-.167-.334-.251-.782-.251-1.342V38.26h-1.356v-1.046h1.356l.162-1.93h1.076v1.93h2.196v1.046h-2.196v4.466c0 .462.094.777.28.944.187.157.516.236.988.236h.899v1.06h-1.253ZM119.888 45.144c-.688 0-1.297-.167-1.828-.502-.531-.334-.948-.805-1.253-1.415-.295-.609-.442-1.321-.442-2.137 0-.815.147-1.528.442-2.137.305-.609.722-1.08 1.253-1.415.54-.334 1.159-.5 1.857-.5.747 0 1.371.166 1.872.5.501.334.879.781 1.135 1.342.255.56.383 1.174.383 1.842v.295c0 .098-.005.216-.015.353h-5.998v-.958h4.805c-.02-.756-.241-1.331-.664-1.724-.412-.403-.928-.604-1.547-.604-.413 0-.796.103-1.15.31a2.214 2.214 0 0 0-.84.884c-.216.392-.324.884-.324 1.473v.413c0 .649.108 1.194.324 1.636.216.433.496.757.84.973.354.216.737.324 1.15.324.55 0 .982-.103 1.297-.31.314-.215.545-.52.692-.913h1.224c-.118.432-.324.82-.619 1.164a2.945 2.945 0 0 1-1.091.81c-.432.197-.933.296-1.503.296ZM111.205 44.967v-7.753h1.12l.089 1.415a2.68 2.68 0 0 1 .692-.884 2.853 2.853 0 0 1 1.032-.531 5.045 5.045 0 0 1 1.386-.177v1.297h-.767c-.295 0-.58.04-.855.118a2.178 2.178 0 0 0-.751.383 1.805 1.805 0 0 0-.516.722c-.128.305-.192.688-.192 1.15v4.26h-1.238ZM106.044 45.144c-.707 0-1.336-.167-1.887-.502a3.59 3.59 0 0 1-1.297-1.43c-.314-.608-.471-1.316-.471-2.122 0-.815.157-1.523.471-2.122.315-.61.747-1.08 1.297-1.415.551-.344 1.18-.516 1.887-.516.884 0 1.621.236 2.211.708.599.471.983 1.105 1.15 1.9h-1.268c-.108-.49-.359-.869-.752-1.134-.383-.275-.835-.413-1.356-.413a2.27 2.27 0 0 0-1.223.34c-.354.225-.634.56-.84 1.002-.206.442-.31.992-.31 1.65 0 .492.059.929.177 1.312.118.373.28.688.487.944.216.245.466.432.751.56.295.127.614.191.958.191.354 0 .673-.059.958-.177a1.95 1.95 0 0 0 .737-.545c.207-.236.344-.516.413-.84h1.268a3.123 3.123 0 0 1-1.15 1.886c-.599.482-1.336.723-2.211.723ZM97.563 45.144c-.688 0-1.297-.167-1.828-.502-.53-.334-.948-.805-1.252-1.415-.295-.609-.443-1.321-.443-2.137 0-.815.148-1.528.443-2.137.304-.609.722-1.08 1.252-1.415.54-.334 1.16-.5 1.858-.5.746 0 1.37.166 1.871.5.502.334.88.781 1.135 1.342a4.38 4.38 0 0 1 .384 1.842v.295c0 .098-.005.216-.015.353h-5.999v-.958h4.805c-.02-.756-.24-1.331-.663-1.724-.413-.403-.929-.604-1.548-.604-.413 0-.796.103-1.15.31a2.215 2.215 0 0 0-.84.884c-.216.392-.324.884-.324 1.473v.413c0 .649.108 1.194.324 1.636.216.433.497.757.84.973.354.216.737.324 1.15.324.55 0 .983-.103 1.297-.31a1.87 1.87 0 0 0 .693-.913h1.223c-.118.432-.324.82-.619 1.164a2.94 2.94 0 0 1-1.09.81c-.433.197-.934.296-1.504.296ZM89.104 45.144c-.757 0-1.415-.138-1.975-.413a3.084 3.084 0 0 1-1.297-1.15c-.305-.491-.457-1.06-.457-1.71h1.297c0 .403.093.777.28 1.12.186.335.457.605.81.811.364.197.811.295 1.342.295.462 0 .855-.074 1.179-.22.334-.158.585-.37.752-.635.177-.265.265-.565.265-.899 0-.373-.084-.683-.25-.928a1.755 1.755 0 0 0-.664-.62 5.43 5.43 0 0 0-.987-.442c-.374-.127-.777-.26-1.21-.398-.864-.275-1.493-.619-1.886-1.031-.383-.423-.575-.963-.575-1.622 0-.56.128-1.05.384-1.474a2.679 2.679 0 0 1 1.12-.987c.491-.246 1.07-.369 1.74-.369.657 0 1.227.123 1.709.369.491.246.874.585 1.15 1.017.275.423.412.914.412 1.474h-1.297a1.76 1.76 0 0 0-.22-.84 1.729 1.729 0 0 0-.679-.678c-.295-.187-.668-.28-1.12-.28a2.202 2.202 0 0 0-1.002.191c-.285.128-.511.315-.678.56-.158.246-.236.546-.236.9 0 .334.069.604.206.81.148.207.354.383.62.53.274.138.594.266.957.384.364.118.767.25 1.209.398.501.167.943.373 1.326.619.393.236.698.54.914.914.226.373.34.85.34 1.43 0 .49-.133.958-.399 1.4-.255.432-.638.786-1.15 1.061-.51.275-1.154.413-1.93.413Z"/></svg>
+`;
+
+export default SecretsManagerLogo;
diff --git a/libs/auth/src/angular/icons/bitwarden-shield.icon.ts b/libs/components/src/icon/logos/bitwarden/shield.ts
similarity index 52%
rename from libs/auth/src/angular/icons/bitwarden-shield.icon.ts
rename to libs/components/src/icon/logos/bitwarden/shield.ts
index f40dc97e5ee..b942715bb6d 100644
--- a/libs/auth/src/angular/icons/bitwarden-shield.icon.ts
+++ b/libs/components/src/icon/logos/bitwarden/shield.ts
@@ -1,9 +1,16 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../../icon";
 
-export const BitwardenShield = svgIcon`
-  <svg viewBox="0 0 120 132" xmlns="http://www.w3.org/2000/svg">
+/**
+ * Shield logo with extra space in the viewbox.
+ */
+const AnonLayoutBitwardenShield = svgIcon`
+ <svg viewBox="0 0 120 132" xmlns="http://www.w3.org/2000/svg">
     <path class="tw-fill-marketing-logo" d="M82.2944 69.1899V37.2898H60V93.9624C63.948 91.869 67.4812 89.5927 70.5998 87.1338C78.3962 81.0196 82.2944 75.0383 82.2944 69.1899ZM91.8491 30.9097V69.1899C91.8491 72.0477 91.2934 74.8805 90.182 77.6883C89.0706 80.4962 87.6938 82.9884 86.0516 85.1649C84.4094 87.3415 82.452 89.4598 80.1794 91.5201C77.9068 93.5803 75.8084 95.2916 73.8842 96.654C71.96 98.0164 69.9528 99.304 67.8627 100.517C65.7726 101.73 64.288 102.552 63.4088 102.984C62.5297 103.416 61.8247 103.748 61.2939 103.981C60.8958 104.18 60.4645 104.28 60 104.28C59.5355 104.28 59.1042 104.18 58.7061 103.981C58.1753 103.748 57.4703 103.416 56.5911 102.984C55.712 102.552 54.2273 101.73 52.1372 100.517C50.0471 99.304 48.04 98.0164 46.1158 96.654C44.1916 95.2916 42.0932 93.5803 39.8206 91.5201C37.548 89.4598 35.5906 87.3415 33.9484 85.1649C32.3062 82.9884 30.9294 80.4962 29.818 77.6883C28.7066 74.8805 28.1509 72.0477 28.1509 69.1899V30.9097C28.1509 30.0458 28.4661 29.2981 29.0964 28.6668C29.7267 28.0354 30.4732 27.7197 31.3358 27.7197H88.6642C89.5268 27.7197 90.2732 28.0354 90.9036 28.6668C91.5339 29.2981 91.8491 30.0458 91.8491 30.9097Z" />
   </svg>
 `;
+
+const BitwardenShield = svgIcon`
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 28 33"><path d="M26.696.403A1.274 1.274 0 0 0 25.764 0H1.83C1.467 0 1.16.137.898.403a1.294 1.294 0 0 0-.398.944v16.164c0 1.203.235 2.405.697 3.587.462 1.188 1.038 2.24 1.728 3.155.682.922 1.5 1.815 2.453 2.68a28.077 28.077 0 0 0 2.63 2.167 32.181 32.181 0 0 0 2.518 1.628c.875.511 1.493.857 1.863 1.045.37.18.661.324.882.417.163.087.348.13.54.13.192 0 .377-.043.54-.13.221-.1.52-.237.882-.417.37-.18.989-.534 1.863-1.045a34.4 34.4 0 0 0 2.517-1.628c.804-.576 1.679-1.296 2.631-2.168a20.206 20.206 0 0 0 2.454-2.68 13.599 13.599 0 0 0 1.72-3.154c.463-1.189.697-2.384.697-3.587V1.347a1.406 1.406 0 0 0-.42-.944ZM23.61 17.662c0 5.849-9.813 10.89-9.813 10.89V3.458h9.813v14.205Z" class="tw-fill-marketing-logo"/></svg>
+`;
+
+export { AnonLayoutBitwardenShield, BitwardenShield };
diff --git a/libs/components/src/icon/logos/index.ts b/libs/components/src/icon/logos/index.ts
new file mode 100644
index 00000000000..07a8a739289
--- /dev/null
+++ b/libs/components/src/icon/logos/index.ts
@@ -0,0 +1 @@
+export * from "./bitwarden";
diff --git a/libs/components/src/index.ts b/libs/components/src/index.ts
index 319b60e6435..d231048563c 100644
--- a/libs/components/src/index.ts
+++ b/libs/components/src/index.ts
@@ -1,5 +1,6 @@
 export { ButtonType, ButtonLikeAbstraction } from "./shared/button-like.abstraction";
 export * from "./a11y";
+export * from "./anon-layout";
 export * from "./async-actions";
 export * from "./avatar";
 export * from "./badge-list";
@@ -41,3 +42,4 @@ export * from "./toast";
 export * from "./toggle-group";
 export * from "./typography";
 export * from "./utils";
+export * from "./stepper";
diff --git a/libs/components/src/input/autofocus.directive.ts b/libs/components/src/input/autofocus.directive.ts
index 3fd06156f39..46eb1b15b16 100644
--- a/libs/components/src/input/autofocus.directive.ts
+++ b/libs/components/src/input/autofocus.directive.ts
@@ -19,7 +19,6 @@ import { FocusableElement } from "../shared/focusable-element";
  */
 @Directive({
   selector: "[appAutofocus], [bitAutofocus]",
-  standalone: false,
 })
 export class AutofocusDirective implements AfterContentChecked {
   @Input() set appAutofocus(condition: boolean | string) {
diff --git a/libs/components/src/input/input.directive.ts b/libs/components/src/input/input.directive.ts
index f6c6c3d542e..4a6a03295d4 100644
--- a/libs/components/src/input/input.directive.ts
+++ b/libs/components/src/input/input.directive.ts
@@ -30,7 +30,6 @@ export function inputBorderClasses(error: boolean) {
 @Directive({
   selector: "input[bitInput], select[bitInput], textarea[bitInput]",
   providers: [{ provide: BitFormFieldControl, useExisting: BitInputDirective }],
-  standalone: true,
 })
 export class BitInputDirective implements BitFormFieldControl {
   @HostBinding("class") @Input() get classList() {
diff --git a/libs/components/src/item/item-action.component.ts b/libs/components/src/item/item-action.component.ts
index a6ee3a34e6d..d169ee7c00b 100644
--- a/libs/components/src/item/item-action.component.ts
+++ b/libs/components/src/item/item-action.component.ts
@@ -4,7 +4,6 @@ import { A11yCellDirective } from "../a11y/a11y-cell.directive";
 
 @Component({
   selector: "bit-item-action",
-  standalone: true,
   imports: [],
   template: `<ng-content></ng-content>`,
   providers: [{ provide: A11yCellDirective, useExisting: ItemActionComponent }],
diff --git a/libs/components/src/item/item-content.component.ts b/libs/components/src/item/item-content.component.ts
index 76fa3996210..0f828de33b4 100644
--- a/libs/components/src/item/item-content.component.ts
+++ b/libs/components/src/item/item-content.component.ts
@@ -16,7 +16,6 @@ import { TypographyModule } from "../typography";
 
 @Component({
   selector: "bit-item-content, [bit-item-content]",
-  standalone: true,
   imports: [TypographyModule, NgClass],
   templateUrl: `item-content.component.html`,
   host: {
diff --git a/libs/components/src/item/item-group.component.ts b/libs/components/src/item/item-group.component.ts
index 2a9a8275cc6..6e53d2636be 100644
--- a/libs/components/src/item/item-group.component.ts
+++ b/libs/components/src/item/item-group.component.ts
@@ -2,7 +2,6 @@ import { ChangeDetectionStrategy, Component } from "@angular/core";
 
 @Component({
   selector: "bit-item-group",
-  standalone: true,
   imports: [],
   template: `<ng-content></ng-content>`,
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/libs/components/src/item/item.component.ts b/libs/components/src/item/item.component.ts
index 0c45f98139e..e1dfd599aac 100644
--- a/libs/components/src/item/item.component.ts
+++ b/libs/components/src/item/item.component.ts
@@ -12,14 +12,13 @@ import { ItemActionComponent } from "./item-action.component";
 
 @Component({
   selector: "bit-item",
-  standalone: true,
   imports: [ItemActionComponent],
   changeDetection: ChangeDetectionStrategy.OnPush,
   templateUrl: "item.component.html",
   providers: [{ provide: A11yRowDirective, useExisting: ItemComponent }],
   host: {
     class:
-      "tw-block tw-box-border tw-overflow-hidden tw-flex tw-bg-background [&:has([data-item-main-content]_button:hover,[data-item-main-content]_a:hover)]:tw-cursor-pointer [&:has([data-item-main-content]_button:hover,[data-item-main-content]_a:hover)]:tw-bg-primary-100 tw-text-main tw-border-solid tw-border-b tw-border-0 [&:not(bit-layout_*)]:tw-rounded-lg bit-compact:[&:not(bit-layout_*)]:tw-rounded-none bit-compact:[&:not(bit-layout_*)]:last-of-type:tw-rounded-b-lg bit-compact:[&:not(bit-layout_*)]:first-of-type:tw-rounded-t-lg tw-min-h-9 tw-mb-1.5 bit-compact:tw-mb-0",
+      "tw-block tw-box-border tw-overflow-hidden tw-flex tw-bg-background [&:has([data-item-main-content]_button:hover,[data-item-main-content]_a:hover)]:tw-cursor-pointer [&:has([data-item-main-content]_button:hover,[data-item-main-content]_a:hover)]:tw-bg-hover-default tw-text-main tw-border-solid tw-border-b tw-border-0 [&:not(bit-layout_*)]:tw-rounded-lg bit-compact:[&:not(bit-layout_*)]:tw-rounded-none bit-compact:[&:not(bit-layout_*)]:last-of-type:tw-rounded-b-lg bit-compact:[&:not(bit-layout_*)]:first-of-type:tw-rounded-t-lg tw-min-h-9 tw-mb-1.5 bit-compact:tw-mb-0",
   },
 })
 export class ItemComponent extends A11yRowDirective {
diff --git a/libs/components/src/layout/index.ts b/libs/components/src/layout/index.ts
index 6994a4f639f..a257a4dde85 100644
--- a/libs/components/src/layout/index.ts
+++ b/libs/components/src/layout/index.ts
@@ -1 +1,2 @@
 export * from "./layout.component";
+export * from "./scroll-layout.directive";
diff --git a/libs/components/src/layout/layout.component.html b/libs/components/src/layout/layout.component.html
index 33b8de81572..f31d2901b00 100644
--- a/libs/components/src/layout/layout.component.html
+++ b/libs/components/src/layout/layout.component.html
@@ -1,43 +1,54 @@
-<div
-  class="tw-fixed tw-z-50 tw-w-full tw-flex tw-justify-center tw-opacity-0 focus-within:tw-opacity-100 tw-pointer-events-none focus-within:tw-pointer-events-auto"
->
-  <nav class="tw-bg-background-alt3 tw-rounded-md tw-rounded-t-none tw-py-2 tw-text-alt2">
-    <a
-      bitLink
-      class="tw-mx-6 focus-visible:before:!tw-ring-0"
-      [fragment]="mainContentId"
-      [routerLink]="[]"
-      (click)="focusMainContent()"
-      linkType="light"
-      >{{ "skipToContent" | i18n }}</a
-    >
-  </nav>
-</div>
+@let mainContentId = "main-content";
 <div class="tw-flex tw-w-full">
-  <ng-content select="bit-side-nav, [slot=side-nav]"></ng-content>
-  <main
-    [id]="mainContentId"
-    tabindex="-1"
-    class="tw-overflow-auto tw-min-w-0 tw-flex-1 tw-bg-background tw-p-6 md:tw-ml-0 tw-ml-16"
-  >
-    <ng-content></ng-content>
+  <div class="tw-flex tw-w-full" cdkTrapFocus>
+    <div
+      class="tw-fixed tw-z-50 tw-w-full tw-flex tw-justify-center tw-opacity-0 focus-within:tw-opacity-100 tw-pointer-events-none focus-within:tw-pointer-events-auto"
+    >
+      <nav class="tw-bg-background-alt3 tw-rounded-md tw-rounded-t-none tw-py-2 tw-text-alt2">
+        <a
+          #skipLink
+          bitLink
+          class="tw-mx-6 focus-visible:before:!tw-ring-0"
+          [fragment]="mainContentId"
+          [routerLink]="[]"
+          (click)="focusMainContent()"
+          linkType="light"
+          >{{ "skipToContent" | i18n }}</a
+        >
+      </nav>
+    </div>
+    <ng-content select="bit-side-nav, [slot=side-nav]"></ng-content>
+    <main
+      #main
+      [id]="mainContentId"
+      tabindex="-1"
+      bitScrollLayoutHost
+      class="tw-overflow-auto tw-max-h-screen tw-min-w-0 tw-flex-1 tw-bg-background tw-p-6 md:tw-ms-0 tw-ms-16"
+    >
+      <ng-content></ng-content>
 
-    <!-- overlay backdrop for side-nav -->
-    @if (
-      {
-        open: sideNavService.open$ | async,
-      };
-      as data
-    ) {
-      <div
-        class="tw-pointer-events-none tw-fixed tw-inset-0 tw-z-10 tw-bg-black tw-bg-opacity-0 motion-safe:tw-transition-colors md:tw-hidden"
-        [ngClass]="[data.open ? 'tw-bg-opacity-30 md:tw-bg-opacity-0' : 'tw-bg-opacity-0']"
-      >
-        @if (data.open) {
-          <div (click)="sideNavService.toggle()" class="tw-pointer-events-auto tw-size-full"></div>
-        }
-      </div>
-    }
-  </main>
-  <ng-template [cdkPortalOutlet]="drawerPortal()"></ng-template>
+      <!-- overlay backdrop for side-nav -->
+      @if (
+        {
+          open: sideNavService.open$ | async,
+        };
+        as data
+      ) {
+        <div
+          class="tw-pointer-events-none tw-fixed tw-inset-0 tw-z-10 tw-bg-black tw-bg-opacity-0 motion-safe:tw-transition-colors md:tw-hidden"
+          [ngClass]="[data.open ? 'tw-bg-opacity-30 md:tw-bg-opacity-0' : 'tw-bg-opacity-0']"
+        >
+          @if (data.open) {
+            <div
+              (click)="sideNavService.toggle()"
+              class="tw-pointer-events-auto tw-size-full"
+            ></div>
+          }
+        </div>
+      }
+    </main>
+  </div>
+  <div class="tw-absolute tw-z-50 tw-left-0 md:tw-sticky tw-top-0 tw-h-screen md:tw-w-auto">
+    <ng-template [cdkPortalOutlet]="drawerPortal()"></ng-template>
+  </div>
 </div>
diff --git a/libs/components/src/layout/layout.component.ts b/libs/components/src/layout/layout.component.ts
index 7bf8a6ad173..54b0341603c 100644
--- a/libs/components/src/layout/layout.component.ts
+++ b/libs/components/src/layout/layout.component.ts
@@ -1,27 +1,61 @@
+import { A11yModule, CdkTrapFocus } from "@angular/cdk/a11y";
 import { PortalModule } from "@angular/cdk/portal";
 import { CommonModule } from "@angular/common";
-import { Component, inject } from "@angular/core";
+import { Component, ElementRef, inject, viewChild } from "@angular/core";
 import { RouterModule } from "@angular/router";
 
 import { DrawerHostDirective } from "../drawer/drawer-host.directive";
+import { DrawerService } from "../drawer/drawer.service";
 import { LinkModule } from "../link";
 import { SideNavService } from "../navigation/side-nav.service";
 import { SharedModule } from "../shared";
 
+import { ScrollLayoutHostDirective } from "./scroll-layout.directive";
+
 @Component({
   selector: "bit-layout",
   templateUrl: "layout.component.html",
-  standalone: true,
-  imports: [CommonModule, SharedModule, LinkModule, RouterModule, PortalModule],
+  imports: [
+    CommonModule,
+    SharedModule,
+    LinkModule,
+    RouterModule,
+    PortalModule,
+    A11yModule,
+    CdkTrapFocus,
+    ScrollLayoutHostDirective,
+  ],
+  host: {
+    "(document:keydown.tab)": "handleKeydown($event)",
+  },
   hostDirectives: [DrawerHostDirective],
 })
 export class LayoutComponent {
-  protected mainContentId = "main-content";
-
   protected sideNavService = inject(SideNavService);
-  protected drawerPortal = inject(DrawerHostDirective).portal;
+  protected drawerPortal = inject(DrawerService).portal;
 
-  focusMainContent() {
-    document.getElementById(this.mainContentId)?.focus();
+  private mainContent = viewChild.required<ElementRef<HTMLElement>>("main");
+  protected focusMainContent() {
+    this.mainContent().nativeElement.focus();
+  }
+
+  /**
+   * Angular CDK's focus trap utility is silly and will not respect focus order.
+   * This is a workaround to explicitly focus the skip link when tab is first pressed, if no other item already has focus.
+   *
+   * @see https://github.com/angular/components/issues/10247#issuecomment-384060265
+   **/
+  private skipLink = viewChild.required<ElementRef<HTMLElement>>("skipLink");
+  handleKeydown(ev: KeyboardEvent) {
+    if (isNothingFocused()) {
+      ev.preventDefault();
+      this.skipLink().nativeElement.focus();
+    }
   }
 }
+
+const isNothingFocused = (): boolean => {
+  return [document.documentElement, document.body, null].includes(
+    document.activeElement as HTMLElement,
+  );
+};
diff --git a/libs/components/src/layout/layout.stories.ts b/libs/components/src/layout/layout.stories.ts
index e495367f78d..7ab0ffc7ce9 100644
--- a/libs/components/src/layout/layout.stories.ts
+++ b/libs/components/src/layout/layout.stories.ts
@@ -55,207 +55,15 @@ export const WithContent: Story = {
     template: /* HTML */ `
       <bit-layout>
         <bit-side-nav>
-          <bit-nav-item text="Item A" route="#" icon="bwi-lock"></bit-nav-item>
-          <bit-nav-group text="Tree A" icon="bwi-family" [open]="true">
-            <bit-nav-group
-              text="Level 1 - with children (empty)"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-            ></bit-nav-group>
-            <bit-nav-item
-              text="Level 1 - no children"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-            ></bit-nav-item>
-            <bit-nav-group
-              text="Level 1 - with children"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-              [open]="true"
-            >
-              <bit-nav-group
-                text="Level 2 - with children"
-                route="#"
-                icon="bwi-collection-shared"
-                variant="tree"
-                [open]="true"
-              >
-                <bit-nav-item
-                  text="Level 3 - no children, no icon"
-                  route="#"
-                  variant="tree"
-                ></bit-nav-item>
-                <bit-nav-group
-                  text="Level 3 - with children"
-                  route="#"
-                  icon="bwi-collection-shared"
-                  variant="tree"
-                  [open]="true"
-                >
-                  <bit-nav-item
-                    text="Level 4 - no children, no icon"
-                    route="#"
-                    variant="tree"
-                  ></bit-nav-item>
-                </bit-nav-group>
-              </bit-nav-group>
-              <bit-nav-group
-                text="Level 2 - with children (empty)"
-                route="#"
-                icon="bwi-collection-shared"
-                variant="tree"
-                [open]="true"
-              ></bit-nav-group>
-              <bit-nav-item
-                text="Level 2 - no children"
-                route="#"
-                icon="bwi-collection-shared"
-                variant="tree"
-              ></bit-nav-item>
-            </bit-nav-group>
-            <bit-nav-item
-              text="Level 1 - no children"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-            ></bit-nav-item>
+          <bit-nav-group text="Hello World (Anchor)" [route]="['a']" icon="bwi-filter">
+            <bit-nav-item text="Child A" route="a" icon="bwi-filter"></bit-nav-item>
+            <bit-nav-item text="Child B" route="b"></bit-nav-item>
+            <bit-nav-item text="Child C" route="c" icon="bwi-filter"></bit-nav-item>
           </bit-nav-group>
-          <bit-nav-group text="Tree B" icon="bwi-collection-shared" [open]="true">
-            <bit-nav-group
-              text="Level 1 - with children (empty)"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-            ></bit-nav-group>
-            <bit-nav-item
-              text="Level 1 - no children"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-            ></bit-nav-item>
-            <bit-nav-group
-              text="Level 1 - with children"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-              [open]="true"
-            >
-              <bit-nav-group
-                text="Level 2 - with children"
-                route="#"
-                icon="bwi-collection-shared"
-                variant="tree"
-                [open]="true"
-              >
-                <bit-nav-item
-                  text="Level 3 - no children, no icon"
-                  route="#"
-                  variant="tree"
-                ></bit-nav-item>
-                <bit-nav-group
-                  text="Level 3 - with children"
-                  route="#"
-                  icon="bwi-collection-shared"
-                  variant="tree"
-                  [open]="true"
-                >
-                  <bit-nav-item
-                    text="Level 4 - no children, no icon"
-                    route="#"
-                    variant="tree"
-                  ></bit-nav-item>
-                </bit-nav-group>
-              </bit-nav-group>
-              <bit-nav-group
-                text="Level 2 - with children (empty)"
-                route="#"
-                icon="bwi-collection-shared"
-                variant="tree"
-                [open]="true"
-              ></bit-nav-group>
-              <bit-nav-item
-                text="Level 2 - no children"
-                route="#"
-                icon="bwi-collection-shared"
-                variant="tree"
-              ></bit-nav-item>
-            </bit-nav-group>
-            <bit-nav-item
-              text="Level 1 - no children"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-            ></bit-nav-item>
-          </bit-nav-group>
-          <bit-nav-group text="Tree C" icon="bwi-key" [open]="true">
-            <bit-nav-group
-              text="Level 1 - with children (empty)"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-            ></bit-nav-group>
-            <bit-nav-item
-              text="Level 1 - no children"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-            ></bit-nav-item>
-            <bit-nav-group
-              text="Level 1 - with children"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-              [open]="true"
-            >
-              <bit-nav-group
-                text="Level 2 - with children"
-                route="#"
-                icon="bwi-collection-shared"
-                variant="tree"
-                [open]="true"
-              >
-                <bit-nav-item
-                  text="Level 3 - no children, no icon"
-                  route="#"
-                  variant="tree"
-                ></bit-nav-item>
-                <bit-nav-group
-                  text="Level 3 - with children"
-                  route="#"
-                  icon="bwi-collection-shared"
-                  variant="tree"
-                  [open]="true"
-                >
-                  <bit-nav-item
-                    text="Level 4 - no children, no icon"
-                    route="#"
-                    variant="tree"
-                  ></bit-nav-item>
-                </bit-nav-group>
-              </bit-nav-group>
-              <bit-nav-group
-                text="Level 2 - with children (empty)"
-                route="#"
-                icon="bwi-collection-shared"
-                variant="tree"
-                [open]="true"
-              ></bit-nav-group>
-              <bit-nav-item
-                text="Level 2 - no children"
-                route="#"
-                icon="bwi-collection-shared"
-                variant="tree"
-              ></bit-nav-item>
-            </bit-nav-group>
-            <bit-nav-item
-              text="Level 1 - no children"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-            ></bit-nav-item>
+          <bit-nav-group text="Lorem Ipsum (Button)" icon="bwi-filter">
+            <bit-nav-item text="Child A" icon="bwi-filter"></bit-nav-item>
+            <bit-nav-item text="Child B"></bit-nav-item>
+            <bit-nav-item text="Child C" icon="bwi-filter"></bit-nav-item>
           </bit-nav-group>
         </bit-side-nav>
         <bit-callout title="Foobar"> Hello world! </bit-callout>
@@ -277,77 +85,15 @@ export const Secondary: Story = {
     template: /* HTML */ `
       <bit-layout>
         <bit-side-nav variant="secondary">
-          <bit-nav-item text="Item A" icon="bwi-collection-shared"></bit-nav-item>
-          <bit-nav-item text="Item B" icon="bwi-collection-shared"></bit-nav-item>
-          <bit-nav-divider></bit-nav-divider>
-          <bit-nav-item text="Item C" icon="bwi-collection-shared"></bit-nav-item>
-          <bit-nav-item text="Item D" icon="bwi-collection-shared"></bit-nav-item>
-          <bit-nav-group text="Tree example" icon="bwi-collection-shared" [open]="true">
-            <bit-nav-group
-              text="Level 1 - with children (empty)"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-            ></bit-nav-group>
-            <bit-nav-item
-              text="Level 1 - no children"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-            ></bit-nav-item>
-            <bit-nav-group
-              text="Level 1 - with children"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-              [open]="true"
-            >
-              <bit-nav-group
-                text="Level 2 - with children"
-                route="#"
-                icon="bwi-collection-shared"
-                variant="tree"
-                [open]="true"
-              >
-                <bit-nav-item
-                  text="Level 3 - no children, no icon"
-                  route="#"
-                  variant="tree"
-                ></bit-nav-item>
-                <bit-nav-group
-                  text="Level 3 - with children"
-                  route="#"
-                  icon="bwi-collection-shared"
-                  variant="tree"
-                  [open]="true"
-                >
-                  <bit-nav-item
-                    text="Level 4 - no children, no icon"
-                    route="#"
-                    variant="tree"
-                  ></bit-nav-item>
-                </bit-nav-group>
-              </bit-nav-group>
-              <bit-nav-group
-                text="Level 2 - with children (empty)"
-                route="#"
-                icon="bwi-collection-shared"
-                variant="tree"
-                [open]="true"
-              ></bit-nav-group>
-              <bit-nav-item
-                text="Level 2 - no children"
-                route="#"
-                icon="bwi-collection-shared"
-                variant="tree"
-              ></bit-nav-item>
-            </bit-nav-group>
-            <bit-nav-item
-              text="Level 1 - no children"
-              route="#"
-              icon="bwi-collection-shared"
-              variant="tree"
-            ></bit-nav-item>
+          <bit-nav-group text="Hello World (Anchor)" [route]="['a']" icon="bwi-filter">
+            <bit-nav-item text="Child A" route="a" icon="bwi-filter"></bit-nav-item>
+            <bit-nav-item text="Child B" route="b"></bit-nav-item>
+            <bit-nav-item text="Child C" route="c" icon="bwi-filter"></bit-nav-item>
+          </bit-nav-group>
+          <bit-nav-group text="Lorem Ipsum (Button)" icon="bwi-filter">
+            <bit-nav-item text="Child A" icon="bwi-filter"></bit-nav-item>
+            <bit-nav-item text="Child B"></bit-nav-item>
+            <bit-nav-item text="Child C" icon="bwi-filter"></bit-nav-item>
           </bit-nav-group>
         </bit-side-nav>
         <bit-callout title="Foobar"> Hello world! </bit-callout>
diff --git a/libs/components/src/layout/scroll-layout.directive.ts b/libs/components/src/layout/scroll-layout.directive.ts
new file mode 100644
index 00000000000..cb2c2a4e431
--- /dev/null
+++ b/libs/components/src/layout/scroll-layout.directive.ts
@@ -0,0 +1,98 @@
+import { CdkVirtualScrollable, VIRTUAL_SCROLLABLE } from "@angular/cdk/scrolling";
+import {
+  Directive,
+  ElementRef,
+  Injectable,
+  OnDestroy,
+  OnInit,
+  effect,
+  inject,
+  signal,
+} from "@angular/core";
+import { toObservable } from "@angular/core/rxjs-interop";
+import { filter, fromEvent, Observable, switchMap } from "rxjs";
+
+/**
+ * A service is needed because we can't inject a directive defined in the template of a parent component. The parent's template is initialized after projected content.
+ **/
+@Injectable({ providedIn: "root" })
+export class ScrollLayoutService {
+  scrollableRef = signal<ElementRef<HTMLElement> | null>(null);
+  scrollableRef$ = toObservable(this.scrollableRef);
+}
+
+/**
+ * Marks the primary scrollable area of a layout component.
+ *
+ * Stores the element reference in a global service so it can be referenced by `ScrollLayoutDirective` even when it isn't a direct child of this directive.
+ **/
+@Directive({
+  selector: "[bitScrollLayoutHost]",
+  standalone: true,
+  host: {
+    class: "cdk-virtual-scrollable",
+  },
+})
+export class ScrollLayoutHostDirective implements OnDestroy {
+  private ref = inject(ElementRef);
+  private service = inject(ScrollLayoutService);
+
+  constructor() {
+    this.service.scrollableRef.set(this.ref as ElementRef<HTMLElement>);
+  }
+
+  ngOnDestroy(): void {
+    this.service.scrollableRef.set(null);
+  }
+}
+
+/**
+ * Sets the scroll viewport to the element marked with `ScrollLayoutHostDirective`.
+ *
+ * `ScrollLayoutHostDirective` is set on the primary scrollable area of a layout component (`bit-layout`, `popup-page`, etc).
+ *
+ * @see "Virtual Scrolling" in Storybook.
+ */
+@Directive({
+  selector: "[bitScrollLayout]",
+  standalone: true,
+  providers: [{ provide: VIRTUAL_SCROLLABLE, useExisting: ScrollLayoutDirective }],
+})
+export class ScrollLayoutDirective extends CdkVirtualScrollable implements OnInit {
+  private service = inject(ScrollLayoutService);
+
+  constructor() {
+    super();
+
+    effect(() => {
+      const scrollableRef = this.service.scrollableRef();
+      if (!scrollableRef) {
+        // eslint-disable-next-line no-console
+        console.error("ScrollLayoutDirective can't find scroll host");
+        return;
+      }
+
+      this.elementRef = scrollableRef;
+    });
+  }
+
+  override elementScrolled(): Observable<Event> {
+    return this.service.scrollableRef$.pipe(
+      filter((ref) => ref !== null),
+      switchMap((ref) => fromEvent(ref.nativeElement, "scroll")),
+    );
+  }
+
+  override getElementRef(): ElementRef<HTMLElement> {
+    return this.service.scrollableRef()!;
+  }
+
+  override measureBoundingClientRectWithScrollOffset(
+    from: "left" | "top" | "right" | "bottom",
+  ): number {
+    return (
+      this.service.scrollableRef()!.nativeElement.getBoundingClientRect()[from] -
+      this.measureScrollOffset(from)
+    );
+  }
+}
diff --git a/libs/components/src/link/link.directive.ts b/libs/components/src/link/link.directive.ts
index 52aba557661..1a653fd1c83 100644
--- a/libs/components/src/link/link.directive.ts
+++ b/libs/components/src/link/link.directive.ts
@@ -1,4 +1,14 @@
-import { Input, HostBinding, Directive } from "@angular/core";
+import {
+  Input,
+  HostBinding,
+  Directive,
+  inject,
+  ElementRef,
+  input,
+  booleanAttribute,
+} from "@angular/core";
+
+import { ariaDisableElement } from "../utils";
 
 export type LinkType = "primary" | "secondary" | "contrast" | "light";
 
@@ -58,6 +68,11 @@ const commonStyles = [
   "before:tw-transition",
   "focus-visible:before:tw-ring-2",
   "focus-visible:tw-z-10",
+  "aria-disabled:tw-no-underline",
+  "aria-disabled:tw-pointer-events-none",
+  "aria-disabled:!tw-text-secondary-300",
+  "aria-disabled:hover:!tw-text-secondary-300",
+  "aria-disabled:hover:tw-no-underline",
 ];
 
 @Directive()
@@ -66,9 +81,16 @@ abstract class LinkDirective {
   linkType: LinkType = "primary";
 }
 
+/**
+  * Text Links and Buttons can use either the `<a>` or `<button>` tags. Choose which based on the action the button takes:
+
+  * - if navigating to a new page, use a `<a>`
+  * - if taking an action on the current page, use a `<button>`
+
+  * Text buttons or links are most commonly used in paragraphs of text or in forms to customize actions or show/hide additional form options.
+ */
 @Directive({
   selector: "a[bitLink]",
-  standalone: true,
 })
 export class AnchorLinkDirective extends LinkDirective {
   @HostBinding("class") get classList() {
@@ -80,12 +102,21 @@ export class AnchorLinkDirective extends LinkDirective {
 
 @Directive({
   selector: "button[bitLink]",
-  standalone: true,
 })
 export class ButtonLinkDirective extends LinkDirective {
+  private el = inject(ElementRef<HTMLButtonElement>);
+
+  disabled = input(false, { transform: booleanAttribute });
+
   @HostBinding("class") get classList() {
     return ["before:-tw-inset-y-[0.25rem]"]
       .concat(commonStyles)
       .concat(linkStyles[this.linkType] ?? []);
   }
+
+  constructor() {
+    super();
+
+    ariaDisableElement(this.el.nativeElement, this.disabled);
+  }
 }
diff --git a/libs/components/src/link/link.mdx b/libs/components/src/link/link.mdx
index e509ddb9911..8fb5f693f10 100644
--- a/libs/components/src/link/link.mdx
+++ b/libs/components/src/link/link.mdx
@@ -1,4 +1,4 @@
-import { Meta, Story, Primary, Controls } from "@storybook/addon-docs";
+import { Meta, Story, Primary, Controls, Title, Description } from "@storybook/addon-docs";
 
 import * as stories from "./link.stories";
 
@@ -8,18 +8,11 @@ import * as stories from "./link.stories";
 import { LinkModule } from "@bitwarden/components";
 ```
 
-# Link / Text button
-
-Text Links and Buttons can use either the `<a>` or `<button>` tags. Choose which based on the action
-the button takes:
-
-- if navigating to a new page, use a `<a>`
-- if taking an action on the current page, use a `<button>`
-
-Text buttons or links are most commonly used in paragraphs of text or in forms to customize actions
-or show/hide additional form options.
+<Title>Link / Text button</Title>
+<Description />
 
 <Primary />
+<Controls />
 
 ## Variants
 
diff --git a/libs/components/src/link/link.stories.ts b/libs/components/src/link/link.stories.ts
index d07d33ae589..6a0be5499dd 100644
--- a/libs/components/src/link/link.stories.ts
+++ b/libs/components/src/link/link.stories.ts
@@ -1,5 +1,7 @@
 import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
 
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
+
 import { AnchorLinkDirective, ButtonLinkDirective } from "./link.directive";
 import { LinkModule } from "./link.module";
 
@@ -27,6 +29,14 @@ export default {
 type Story = StoryObj<ButtonLinkDirective>;
 
 export const Default: Story = {
+  render: (args) => ({
+    template: /*html*/ `
+      <a bitLink ${formatArgsForCodeSnippet<ButtonLinkDirective>(args)}>Your text here</a>
+    `,
+  }),
+};
+
+export const InteractionStates: Story = {
   render: () => ({
     template: /*html*/ `
       <div class="tw-flex tw-gap-4 tw-p-2 tw-mb-6">
@@ -137,10 +147,10 @@ export const Disabled: Story = {
   render: (args) => ({
     props: args,
     template: /*html*/ `
-      <button bitLink disabled linkType="primary" class="tw-mr-2">Primary</button>
-      <button bitLink disabled linkType="secondary" class="tw-mr-2">Secondary</button>
+      <button bitLink disabled linkType="primary" class="tw-me-2">Primary</button>
+      <button bitLink disabled linkType="secondary" class="tw-me-2">Secondary</button>
       <div class="tw-bg-primary-600 tw-p-2 tw-inline-block">
-        <button bitLink disabled linkType="contrast" class="tw-mr-2">Contrast</button>
+        <button bitLink disabled linkType="contrast">Contrast</button>
       </div>
     `,
   }),
diff --git a/libs/components/src/menu/menu-divider.component.ts b/libs/components/src/menu/menu-divider.component.ts
index 55b5c013c93..194506ee50f 100644
--- a/libs/components/src/menu/menu-divider.component.ts
+++ b/libs/components/src/menu/menu-divider.component.ts
@@ -3,6 +3,5 @@ import { Component } from "@angular/core";
 @Component({
   selector: "bit-menu-divider",
   templateUrl: "./menu-divider.component.html",
-  standalone: true,
 })
 export class MenuDividerComponent {}
diff --git a/libs/components/src/menu/menu-item.directive.ts b/libs/components/src/menu/menu-item.directive.ts
index d0975e8e391..37b68eecd74 100644
--- a/libs/components/src/menu/menu-item.directive.ts
+++ b/libs/components/src/menu/menu-item.directive.ts
@@ -6,7 +6,6 @@ import { Component, ElementRef, HostBinding, Input } from "@angular/core";
 @Component({
   selector: "[bitMenuItem]",
   templateUrl: "menu-item.component.html",
-  standalone: true,
   imports: [NgClass],
 })
 export class MenuItemDirective implements FocusableOption {
@@ -21,7 +20,7 @@ export class MenuItemDirective implements FocusableOption {
     "tw-border-none",
     "tw-bg-background",
     "tw-text-left",
-    "hover:tw-bg-primary-100",
+    "hover:tw-bg-hover-default",
     "focus-visible:tw-z-50",
     "focus-visible:tw-outline-none",
     "focus-visible:tw-ring-2",
diff --git a/libs/components/src/menu/menu-trigger-for.directive.ts b/libs/components/src/menu/menu-trigger-for.directive.ts
index bc174d14d23..528697600c4 100644
--- a/libs/components/src/menu/menu-trigger-for.directive.ts
+++ b/libs/components/src/menu/menu-trigger-for.directive.ts
@@ -1,5 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { hasModifierKey } from "@angular/cdk/keycodes";
 import { Overlay, OverlayConfig, OverlayRef } from "@angular/cdk/overlay";
 import { TemplatePortal } from "@angular/cdk/portal";
 import {
@@ -76,6 +77,13 @@ export class MenuTriggerForDirective implements OnDestroy {
     this.overlayRef.attach(templatePortal);
 
     this.closedEventsSub = this.getClosedEvents().subscribe((event: KeyboardEvent | undefined) => {
+      // Closing the menu is handled in this.destroyMenu, so we want to prevent the escape key
+      // from doing its normal default action, which would otherwise cause a parent component
+      // (like a dialog) or extension window to close
+      if (event?.key === "Escape" && !hasModifierKey(event)) {
+        event.preventDefault();
+      }
+
       if (["Tab", "Escape"].includes(event?.key)) {
         // Required to ensure tab order resumes correctly
         this.elementRef.nativeElement.focus();
diff --git a/libs/components/src/menu/menu.component.spec.ts b/libs/components/src/menu/menu.component.spec.ts
index 81d2ea64079..c6a54f1afae 100644
--- a/libs/components/src/menu/menu.component.spec.ts
+++ b/libs/components/src/menu/menu.component.spec.ts
@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 
 import { MenuTriggerForDirective } from "./menu-trigger-for.directive";
@@ -16,19 +16,16 @@ describe("Menu", () => {
   // The overlay is created outside the root debugElement, so we need to query its parent
   const getBitMenuPanel = () => document.querySelector(".bit-menu-panel");
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async () => {
     TestBed.configureTestingModule({
-      imports: [MenuModule],
-      declarations: [TestApp],
+      imports: [TestApp],
     });
 
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    TestBed.compileComponents();
+    await TestBed.compileComponents();
 
     fixture = TestBed.createComponent(TestApp);
     fixture.detectChanges();
-  }));
+  });
 
   it("should open when the trigger is clicked", async () => {
     const buttonDebugElement = fixture.debugElement.query(By.directive(MenuTriggerForDirective));
@@ -73,5 +70,6 @@ describe("Menu", () => {
       <a id="item2" bitMenuItem>Item 2</a>
     </bit-menu>
   `,
+  imports: [MenuModule],
 })
 class TestApp {}
diff --git a/libs/components/src/menu/menu.component.ts b/libs/components/src/menu/menu.component.ts
index a39dceb4454..8636f158729 100644
--- a/libs/components/src/menu/menu.component.ts
+++ b/libs/components/src/menu/menu.component.ts
@@ -19,7 +19,6 @@ import { MenuItemDirective } from "./menu-item.directive";
   selector: "bit-menu",
   templateUrl: "./menu.component.html",
   exportAs: "menuComponent",
-  standalone: true,
   imports: [CdkTrapFocus],
 })
 export class MenuComponent implements AfterContentInit {
diff --git a/libs/components/src/multi-select/multi-select.component.html b/libs/components/src/multi-select/multi-select.component.html
index e157871e17a..0b46ef2662d 100644
--- a/libs/components/src/multi-select/multi-select.component.html
+++ b/libs/components/src/multi-select/multi-select.component.html
@@ -20,14 +20,14 @@
   appendTo="body"
 >
   <ng-template ng-loadingspinner-tmp>
-    <i class="bwi bwi-spinner bwi-spin tw-mr-1" [title]="loadingText" aria-hidden="true"></i>
+    <i class="bwi bwi-spinner bwi-spin tw-me-1" [title]="loadingText" aria-hidden="true"></i>
   </ng-template>
   <ng-template ng-label-tmp let-item="item" let-clear="clear">
     <button
       type="button"
       bitBadge
       variant="primary"
-      class="tw-mr-1 disabled:tw-border-0 tw-flex tw-gap-1.5 tw-items-center"
+      class="tw-me-1 disabled:tw-border-0 tw-flex tw-gap-1.5 tw-items-center"
       [disabled]="disabled"
       (click)="clear(item)"
     >
@@ -47,7 +47,7 @@
           <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
         }
       </div>
-      <div class="tw-mr-2 tw-flex-initial">
+      <div class="tw-me-2 tw-flex-initial">
         @if (item.icon != null) {
           <i class="bwi bwi-fw {{ item.icon }}" aria-hidden="true"></i>
         }
diff --git a/libs/components/src/multi-select/multi-select.component.ts b/libs/components/src/multi-select/multi-select.component.ts
index cd92eb1d7ae..6fd87483780 100644
--- a/libs/components/src/multi-select/multi-select.component.ts
+++ b/libs/components/src/multi-select/multi-select.component.ts
@@ -37,7 +37,6 @@ let nextId = 0;
   selector: "bit-multi-select",
   templateUrl: "./multi-select.component.html",
   providers: [{ provide: BitFormFieldControl, useExisting: MultiSelectComponent }],
-  standalone: true,
   imports: [NgSelectModule, ReactiveFormsModule, FormsModule, BadgeModule, I18nPipe],
 })
 /**
diff --git a/libs/components/src/navigation/nav-base.component.ts b/libs/components/src/navigation/nav-base.component.ts
index 9b222c9434f..dc3084509a5 100644
--- a/libs/components/src/navigation/nav-base.component.ts
+++ b/libs/components/src/navigation/nav-base.component.ts
@@ -55,16 +55,6 @@ export abstract class NavBaseComponent {
     matrixParams: "ignored",
   };
 
-  /**
-   * If this item is used within a tree, set `variant` to `"tree"`
-   */
-  @Input() variant: "default" | "tree" = "default";
-
-  /**
-   * Depth level when nested inside of a `'tree'` variant
-   */
-  @Input() treeDepth = 0;
-
   /**
    * If `true`, do not change styles when nav item is active.
    */
diff --git a/libs/components/src/navigation/nav-divider.component.html b/libs/components/src/navigation/nav-divider.component.html
index 64e43aeab4e..2d8e1dfa24b 100644
--- a/libs/components/src/navigation/nav-divider.component.html
+++ b/libs/components/src/navigation/nav-divider.component.html
@@ -1,3 +1,3 @@
 @if (sideNavService.open$ | async) {
-  <div class="tw-h-px tw-w-full tw-bg-secondary-300"></div>
+  <div class="tw-h-px tw-w-full tw-my-2 tw-bg-secondary-300"></div>
 }
diff --git a/libs/components/src/navigation/nav-divider.component.ts b/libs/components/src/navigation/nav-divider.component.ts
index eff381e1c94..52fb433c54d 100644
--- a/libs/components/src/navigation/nav-divider.component.ts
+++ b/libs/components/src/navigation/nav-divider.component.ts
@@ -6,7 +6,6 @@ import { SideNavService } from "./side-nav.service";
 @Component({
   selector: "bit-nav-divider",
   templateUrl: "./nav-divider.component.html",
-  standalone: true,
   imports: [CommonModule],
 })
 export class NavDividerComponent {
diff --git a/libs/components/src/navigation/nav-group.component.html b/libs/components/src/navigation/nav-group.component.html
index 9752fe56eb1..6a9ee4c0ab9 100644
--- a/libs/components/src/navigation/nav-group.component.html
+++ b/libs/components/src/navigation/nav-group.component.html
@@ -6,8 +6,6 @@
     [route]="route"
     [relativeTo]="relativeTo"
     [routerLinkActiveOptions]="routerLinkActiveOptions"
-    [variant]="variant"
-    [treeDepth]="treeDepth"
     (mainContentClicked)="handleMainContentClicked()"
     [ariaLabel]="ariaLabel"
     [hideActiveStyles]="parentHideActiveStyles"
@@ -15,10 +13,8 @@
     <ng-template #button>
       <button
         type="button"
-        class="tw-ml-auto"
-        [bitIconButton]="
-          open ? 'bwi-angle-up' : variant === 'tree' ? 'bwi-angle-right' : 'bwi-angle-down'
-        "
+        class="tw-ms-auto"
+        [bitIconButton]="open ? 'bwi-angle-up' : 'bwi-angle-down'"
         [buttonType]="'light'"
         (click)="toggle($event)"
         size="small"
@@ -29,17 +25,9 @@
         [attr.aria-label]="['toggleCollapse' | i18n, text].join(' ')"
       ></button>
     </ng-template>
-    <!-- Show toggle to the left for trees otherwise to the right -->
-    @if (variant === "tree") {
-      <ng-container slot="start">
-        <ng-container *ngTemplateOutlet="button"></ng-container>
-      </ng-container>
-    }
     <ng-container slot="end">
       <ng-content select="[slot=end]"></ng-content>
-      @if (variant !== "tree") {
-        <ng-container *ngTemplateOutlet="button"></ng-container>
-      }
+      <ng-container *ngTemplateOutlet="button"></ng-container>
     </ng-container>
   </bit-nav-item>
   <!-- [attr.aria-controls] of the above button expects a unique ID on the controlled element -->
diff --git a/libs/components/src/navigation/nav-group.component.ts b/libs/components/src/navigation/nav-group.component.ts
index 37244f37c8d..b52f9fcd202 100644
--- a/libs/components/src/navigation/nav-group.component.ts
+++ b/libs/components/src/navigation/nav-group.component.ts
@@ -1,6 +1,5 @@
 import { CommonModule } from "@angular/common";
 import {
-  AfterContentInit,
   booleanAttribute,
   Component,
   ContentChildren,
@@ -27,10 +26,9 @@ import { SideNavService } from "./side-nav.service";
     { provide: NavBaseComponent, useExisting: NavGroupComponent },
     { provide: NavGroupAbstraction, useExisting: NavGroupComponent },
   ],
-  standalone: true,
   imports: [CommonModule, NavItemComponent, IconButtonModule, I18nPipe],
 })
-export class NavGroupComponent extends NavBaseComponent implements AfterContentInit {
+export class NavGroupComponent extends NavBaseComponent {
   @ContentChildren(NavBaseComponent, {
     descendants: true,
   })
@@ -81,18 +79,6 @@ export class NavGroupComponent extends NavBaseComponent implements AfterContentI
     this.setOpen(!this.open);
   }
 
-  /**
-   * - For any nested NavGroupComponents or NavItemComponents, increment the `treeDepth` by 1.
-   */
-  private initNestedStyles() {
-    if (this.variant !== "tree") {
-      return;
-    }
-    [...this.nestedNavComponents].forEach((navGroupOrItem) => {
-      navGroupOrItem.treeDepth += 1;
-    });
-  }
-
   protected handleMainContentClicked() {
     if (!this.sideNavService.open) {
       if (!this.route) {
@@ -104,8 +90,4 @@ export class NavGroupComponent extends NavBaseComponent implements AfterContentI
     }
     this.mainContentClicked.emit();
   }
-
-  ngAfterContentInit(): void {
-    this.initNestedStyles();
-  }
 }
diff --git a/libs/components/src/navigation/nav-group.stories.ts b/libs/components/src/navigation/nav-group.stories.ts
index b2f6b0b6b99..b30acc63c72 100644
--- a/libs/components/src/navigation/nav-group.stories.ts
+++ b/libs/components/src/navigation/nav-group.stories.ts
@@ -13,7 +13,6 @@ import { NavGroupComponent } from "./nav-group.component";
 import { NavigationModule } from "./navigation.module";
 
 @Component({
-  standalone: true,
   template: "",
 })
 class DummyContentComponent {}
@@ -112,31 +111,6 @@ export const HideEmptyGroups: StoryObj<NavGroupComponent & { renderChildren: boo
   }),
 };
 
-export const Tree: StoryObj<NavGroupComponent> = {
-  render: (args) => ({
-    props: args,
-    template: /*html*/ `
-      <bit-side-nav>
-        <bit-nav-group text="Tree example" icon="bwi-collection-shared" [open]="true">
-          <bit-nav-group text="Level 1 - with children (empty)" route="t1" icon="bwi-collection-shared" variant="tree"></bit-nav-group>
-          <bit-nav-item text="Level 1 - no children" route="t2" icon="bwi-collection-shared" variant="tree"></bit-nav-item>
-          <bit-nav-group text="Level 1 - with children" route="t3" icon="bwi-collection-shared" variant="tree" [open]="true">
-            <bit-nav-group text="Level 2 - with children" route="t4" icon="bwi-collection-shared" variant="tree" [open]="true">
-              <bit-nav-item text="Level 3 - no children, no icon" route="t5" variant="tree"></bit-nav-item>
-              <bit-nav-group text="Level 3 - with children" route="t6" icon="bwi-collection-shared" variant="tree" [open]="true">
-                <bit-nav-item text="Level 4 - no children, no icon" route="t7" variant="tree"></bit-nav-item>
-              </bit-nav-group>
-            </bit-nav-group>
-            <bit-nav-group text="Level 2 - with children (empty)" route="t8" icon="bwi-collection-shared" variant="tree" [open]="true"></bit-nav-group>
-            <bit-nav-item text="Level 2 - no children" route="t9" icon="bwi-collection-shared" variant="tree"></bit-nav-item>
-          </bit-nav-group>
-          <bit-nav-item text="Level 1 - no children" route="t10" icon="bwi-collection-shared" variant="tree"></bit-nav-item>
-        </bit-nav-group>
-      </bit-side-nav>
-    `,
-  }),
-};
-
 export const Secondary: StoryObj<NavGroupComponent> = {
   render: (args) => ({
     props: args,
diff --git a/libs/components/src/navigation/nav-item.component.html b/libs/components/src/navigation/nav-item.component.html
index 595ddf5a99f..3d4dadacffa 100644
--- a/libs/components/src/navigation/nav-item.component.html
+++ b/libs/components/src/navigation/nav-item.component.html
@@ -1,113 +1,77 @@
-<ng-container
-  *ngIf="{
-    open: sideNavService.open$ | async,
-  } as data"
->
-  <div
-    *ngIf="data.open || icon"
-    class="tw-relative"
-    [ngClass]="[
-      showActiveStyles
-        ? 'tw-bg-background-alt4'
-        : 'tw-bg-background-alt3 hover:tw-bg-primary-300/60',
-      fvwStyles$ | async,
-    ]"
-  >
+<div class="tw-ps-2 tw-pe-2">
+  @let open = sideNavService.open$ | async;
+  @if (open || icon) {
     <div
-      [ngStyle]="{
-        'padding-left': data.open ? (variant === 'tree' ? 2.5 : 1) + treeDepth * 1.5 + 'rem' : '0',
-      }"
-      class="tw-relative tw-flex"
+      class="tw-relative tw-rounded-md tw-h-10"
+      [ngClass]="[
+        showActiveStyles
+          ? 'tw-bg-background-alt4'
+          : 'tw-bg-background-alt3 hover:tw-bg-hover-contrast',
+        fvwStyles$ | async,
+      ]"
     >
-      <div [ngClass]="[variant === 'tree' ? 'tw-py-1' : 'tw-py-2']">
-        <div
-          #slotStart
-          class="[&>*:focus-visible::before]:!tw-ring-text-alt2 [&>*:hover]:!tw-border-text-alt2 [&>*]:!tw-text-alt2"
-        >
-          <ng-content select="[slot=start]"></ng-content>
-        </div>
-        <!-- Default content for #slotStart (for consistent sizing) -->
-        <div
-          *ngIf="slotStart.childElementCount === 0"
-          [ngClass]="{
-            'tw-w-0': variant !== 'tree',
-          }"
-        >
+      <div class="tw-relative tw-flex tw-items-center tw-h-full">
+        <ng-container *ngIf="route; then isAnchor; else isButton"></ng-container>
+
+        <!-- Main content of `NavItem` -->
+        <ng-template #anchorAndButtonContent>
+          <div
+            [title]="text"
+            class="tw-gap-2 tw-items-center tw-font-bold tw-h-full tw-content-center"
+            [ngClass]="{ 'tw-text-center': !open, 'tw-flex': open }"
+          >
+            <i
+              class="!tw-m-0 tw-w-4 tw-shrink-0 bwi bwi-fw tw-text-alt2 {{ icon }}"
+              [attr.aria-hidden]="open"
+              [attr.aria-label]="text"
+            ></i>
+            @if (open) {
+              <span class="tw-truncate">{{ text }}</span>
+            }
+          </div>
+        </ng-template>
+
+        <!-- Show if a value was passed to `this.to` -->
+        <ng-template #isAnchor>
+          <!-- The `data-fvw` attribute passes focus to `this.focusVisibleWithin$` -->
+          <!-- The following `class` field should match the `#isButton` class field below -->
+          <a
+            class="tw-size-full tw-px-3 tw-block tw-truncate tw-border-none tw-bg-transparent tw-text-start !tw-text-alt2 hover:tw-text-alt2 hover:tw-no-underline focus:tw-outline-none"
+            data-fvw
+            [routerLink]="route"
+            [relativeTo]="relativeTo"
+            [attr.aria-label]="ariaLabel || text"
+            routerLinkActive
+            [routerLinkActiveOptions]="routerLinkActiveOptions"
+            [ariaCurrentWhenActive]="'page'"
+            (isActiveChange)="setIsActive($event)"
+            (click)="mainContentClicked.emit()"
+          >
+            <ng-container *ngTemplateOutlet="anchorAndButtonContent"></ng-container>
+          </a>
+        </ng-template>
+
+        <!-- Show if `this.to` is falsy -->
+        <ng-template #isButton>
+          <!-- Class field should match `#isAnchor` class field above -->
           <button
             type="button"
-            class="tw-invisible"
-            [bitIconButton]="'bwi-angle-down'"
-            size="small"
-            aria-hidden="true"
-          ></button>
-        </div>
-      </div>
-
-      <ng-container *ngIf="route; then isAnchor; else isButton"></ng-container>
-
-      <!-- Main content of `NavItem` -->
-      <ng-template #anchorAndButtonContent>
-        <div
-          [title]="text"
-          class="tw-truncate"
-          [ngClass]="[
-            variant === 'tree' ? 'tw-py-1' : 'tw-py-2',
-            data.open ? 'tw-pr-4' : 'tw-text-center',
-          ]"
-        >
-          <i
-            class="bwi bwi-fw tw-text-alt2 tw-mx-1 {{ icon }}"
-            [attr.aria-hidden]="data.open"
-            [attr.aria-label]="text"
-          ></i
-          ><span
-            *ngIf="data.open"
-            [ngClass]="showActiveStyles ? 'tw-font-bold' : 'tw-font-semibold'"
-            >{{ text }}</span
+            class="tw-size-full tw-px-3 tw-truncate tw-border-none tw-bg-transparent tw-text-start !tw-text-alt2 hover:tw-text-alt2 hover:tw-no-underline focus:tw-outline-none"
+            data-fvw
+            (click)="mainContentClicked.emit()"
           >
-        </div>
-      </ng-template>
+            <ng-container *ngTemplateOutlet="anchorAndButtonContent"></ng-container>
+          </button>
+        </ng-template>
 
-      <!-- Show if a value was passed to `this.to` -->
-      <ng-template #isAnchor>
-        <!-- The `data-fvw` attribute passes focus to `this.focusVisibleWithin$` -->
-        <!-- The following `class` field should match the `#isButton` class field below -->
-        <a
-          class="tw-w-full tw-truncate tw-border-none tw-bg-transparent tw-p-0 tw-text-start !tw-text-alt2 hover:tw-text-alt2 hover:tw-no-underline focus:tw-outline-none"
-          data-fvw
-          [routerLink]="route"
-          [relativeTo]="relativeTo"
-          [attr.aria-label]="ariaLabel || text"
-          routerLinkActive
-          [routerLinkActiveOptions]="routerLinkActiveOptions"
-          [ariaCurrentWhenActive]="'page'"
-          (isActiveChange)="setIsActive($event)"
-          (click)="mainContentClicked.emit()"
-        >
-          <ng-container *ngTemplateOutlet="anchorAndButtonContent"></ng-container>
-        </a>
-      </ng-template>
-
-      <!-- Show if `this.to` is falsy -->
-      <ng-template #isButton>
-        <!-- Class field should match `#isAnchor` class field above -->
-        <button
-          type="button"
-          class="tw-w-full tw-truncate tw-border-none tw-bg-transparent tw-p-0 tw-text-start !tw-text-alt2 hover:tw-text-alt2 hover:tw-no-underline focus:tw-outline-none"
-          data-fvw
-          (click)="mainContentClicked.emit()"
-        >
-          <ng-container *ngTemplateOutlet="anchorAndButtonContent"></ng-container>
-        </button>
-      </ng-template>
-
-      <div
-        *ngIf="data.open"
-        class="tw-flex -tw-ml-3 tw-pr-4 tw-gap-1 [&>*:focus-visible::before]:!tw-ring-text-alt2 [&>*:hover]:!tw-border-text-alt2 [&>*]:tw-text-alt2 empty:tw-hidden"
-        [ngClass]="[variant === 'tree' ? 'tw-py-1' : 'tw-py-2']"
-      >
-        <ng-content select="[slot=end]"></ng-content>
+        @if (open) {
+          <div
+            class="tw-flex tw-items-center tw-pe-1.5 tw-gap-1 [&>*:focus-visible::before]:!tw-ring-text-alt2 [&>*:hover]:!tw-border-text-alt2 [&>*]:tw-text-alt2 empty:tw-hidden"
+          >
+            <ng-content select="[slot=end]"></ng-content>
+          </div>
+        }
       </div>
     </div>
-  </div>
-</ng-container>
+  }
+</div>
diff --git a/libs/components/src/navigation/nav-item.component.ts b/libs/components/src/navigation/nav-item.component.ts
index c84aacf615e..23791c5b979 100644
--- a/libs/components/src/navigation/nav-item.component.ts
+++ b/libs/components/src/navigation/nav-item.component.ts
@@ -17,7 +17,6 @@ export abstract class NavGroupAbstraction {
   selector: "bit-nav-item",
   templateUrl: "./nav-item.component.html",
   providers: [{ provide: NavBaseComponent, useExisting: NavItemComponent }],
-  standalone: true,
   imports: [CommonModule, IconButtonModule, RouterModule],
 })
 export class NavItemComponent extends NavBaseComponent {
diff --git a/libs/components/src/navigation/nav-item.stories.ts b/libs/components/src/navigation/nav-item.stories.ts
index 7d24090f06d..c51cffabb1d 100644
--- a/libs/components/src/navigation/nav-item.stories.ts
+++ b/libs/components/src/navigation/nav-item.stories.ts
@@ -68,6 +68,13 @@ export const WithoutIcon: Story = {
   },
 };
 
+export const WithLongText: Story = {
+  ...Default,
+  args: {
+    text: "Hello World This Is a Cool Item",
+  },
+};
+
 export const WithoutRoute: Story = {
   render: () => ({
     template: `
@@ -80,10 +87,10 @@ export const WithChildButtons: Story = {
   render: (args) => ({
     props: args,
     template: `
-      <bit-nav-item text="Hello World" [route]="['']" icon="bwi-collection-shared">
+      <bit-nav-item text="Hello World Very Cool World" [route]="['']" icon="bwi-collection-shared">
         <button
           slot="end"
-          class="tw-ml-auto"
+          class="tw-ms-auto"
           [bitIconButton]="'bwi-pencil-square'"
           [buttonType]="'light'"
           size="small"
@@ -91,7 +98,7 @@ export const WithChildButtons: Story = {
         ></button>
         <button
           slot="end"
-          class="tw-ml-auto"
+          class="tw-ms-auto"
           [bitIconButton]="'bwi-check'"
           [buttonType]="'light'"
           size="small"
@@ -106,8 +113,8 @@ export const MultipleItemsWithDivider: Story = {
   render: (args) => ({
     props: args,
     template: `
-      <bit-nav-item text="Hello World" icon="bwi-collection-shared"></bit-nav-item>
-      <bit-nav-item text="Hello World" icon="bwi-collection-shared"></bit-nav-item>
+      <bit-nav-item text="Hello World"></bit-nav-item>
+      <bit-nav-item text="Hello World Long Text Long"></bit-nav-item>
       <bit-nav-divider></bit-nav-divider>
       <bit-nav-item text="Hello World" icon="bwi-collection-shared"></bit-nav-item>
       <bit-nav-item text="Hello World" icon="bwi-collection-shared"></bit-nav-item>
diff --git a/libs/components/src/navigation/nav-logo.component.html b/libs/components/src/navigation/nav-logo.component.html
index a6169315333..40dbe8189d6 100644
--- a/libs/components/src/navigation/nav-logo.component.html
+++ b/libs/components/src/navigation/nav-logo.component.html
@@ -1,23 +1,19 @@
-@if (sideNavService.open) {
-  <div class="tw-sticky tw-top-0 tw-z-50">
-    <a
-      [routerLink]="route"
-      class="tw-px-5 tw-pb-5 tw-pt-7 tw-block tw-bg-background-alt3 tw-outline-none focus-visible:tw-ring focus-visible:tw-ring-inset focus-visible:tw-ring-text-alt2"
-      [attr.aria-label]="label"
-      [title]="label"
-      routerLinkActive
-      [ariaCurrentWhenActive]="'page'"
-    >
-      <bit-icon [icon]="openIcon"></bit-icon>
-    </a>
-  </div>
-}
-@if (!sideNavService.open) {
-  <bit-nav-item
-    class="tw-block tw-pt-7"
-    [hideActiveStyles]="true"
-    [route]="route"
-    [icon]="closedIcon"
-    [text]="label"
-  ></bit-nav-item>
-}
+<div
+  [ngClass]="{
+    'tw-sticky tw-top-0 tw-z-50 tw-pb-2': sideNavService.open,
+    'tw-pb-5': !sideNavService.open,
+  }"
+  class="tw-px-2 tw-pt-5"
+>
+  <a
+    [routerLink]="route"
+    class="tw-p-3 tw-block tw-rounded-md tw-bg-background-alt3 tw-outline-none focus-visible:tw-ring focus-visible:tw-ring-inset focus-visible:tw-ring-text-alt2 hover:tw-bg-hover-contrast [&_path]:tw-fill-text-alt2"
+    [ngClass]="{ '[&_svg]:tw-w-[1.687rem]': !sideNavService.open }"
+    [attr.aria-label]="label"
+    [title]="label"
+    routerLinkActive
+    [ariaCurrentWhenActive]="'page'"
+  >
+    <bit-icon [icon]="sideNavService.open ? openIcon : closedIcon"></bit-icon>
+  </a>
+</div>
diff --git a/libs/components/src/navigation/nav-logo.component.ts b/libs/components/src/navigation/nav-logo.component.ts
index de9d801e553..8c40ea0dc79 100644
--- a/libs/components/src/navigation/nav-logo.component.ts
+++ b/libs/components/src/navigation/nav-logo.component.ts
@@ -1,24 +1,23 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-
+import { CommonModule } from "@angular/common";
 import { Component, Input } from "@angular/core";
 import { RouterLinkActive, RouterLink } from "@angular/router";
 
 import { Icon } from "../icon";
 import { BitIconComponent } from "../icon/icon.component";
+import { BitwardenShield } from "../icon/logos";
 
-import { NavItemComponent } from "./nav-item.component";
 import { SideNavService } from "./side-nav.service";
 
 @Component({
   selector: "bit-nav-logo",
   templateUrl: "./nav-logo.component.html",
-  standalone: true,
-  imports: [RouterLinkActive, RouterLink, BitIconComponent, NavItemComponent],
+  imports: [CommonModule, RouterLinkActive, RouterLink, BitIconComponent],
 })
 export class NavLogoComponent {
   /** Icon that is displayed when the side nav is closed */
-  @Input() closedIcon = "bwi-shield";
+  @Input() closedIcon = BitwardenShield;
 
   /** Icon that is displayed when the side nav is open */
   @Input({ required: true }) openIcon: Icon;
diff --git a/libs/components/src/navigation/side-nav.component.html b/libs/components/src/navigation/side-nav.component.html
index 3b77c981be4..124daa776d0 100644
--- a/libs/components/src/navigation/side-nav.component.html
+++ b/libs/components/src/navigation/side-nav.component.html
@@ -14,6 +14,7 @@
         '--color-text-alt2': 'var(--color-text-main)',
         '--color-background-alt3': 'var(--color-secondary-100)',
         '--color-background-alt4': 'var(--color-secondary-300)',
+        '--color-hover-contrast': 'var(--color-hover-default)',
       }
     "
     [cdkTrapFocus]="data.isOverlay"
diff --git a/libs/components/src/navigation/side-nav.component.ts b/libs/components/src/navigation/side-nav.component.ts
index e8e4f131d6d..49b08c63f7c 100644
--- a/libs/components/src/navigation/side-nav.component.ts
+++ b/libs/components/src/navigation/side-nav.component.ts
@@ -16,7 +16,6 @@ export type SideNavVariant = "primary" | "secondary";
 @Component({
   selector: "bit-side-nav",
   templateUrl: "side-nav.component.html",
-  standalone: true,
   imports: [CommonModule, CdkTrapFocus, NavDividerComponent, BitIconButtonComponent, I18nPipe],
 })
 export class SideNavComponent {
diff --git a/libs/components/src/no-items/no-items.component.html b/libs/components/src/no-items/no-items.component.html
index bbc78cec3cb..ae2416d7a7b 100644
--- a/libs/components/src/no-items/no-items.component.html
+++ b/libs/components/src/no-items/no-items.component.html
@@ -1,7 +1,7 @@
 <div class="tw-mx-auto tw-flex tw-flex-col tw-items-center tw-justify-center tw-pt-6">
   <div class="tw-max-w-sm tw-flex tw-flex-col tw-items-center">
     <bit-icon [icon]="icon" aria-hidden="true"></bit-icon>
-    <h3 class="tw-font-semibold tw-text-center">
+    <h3 class="tw-font-semibold tw-text-center tw-mt-4">
       <ng-content select="[slot=title]"></ng-content>
     </h3>
     <p class="tw-text-center">
diff --git a/libs/components/src/no-items/no-items.component.ts b/libs/components/src/no-items/no-items.component.ts
index ee9e0ee0581..20ce95a53ba 100644
--- a/libs/components/src/no-items/no-items.component.ts
+++ b/libs/components/src/no-items/no-items.component.ts
@@ -9,7 +9,6 @@ import { BitIconComponent } from "../icon/icon.component";
 @Component({
   selector: "bit-no-items",
   templateUrl: "./no-items.component.html",
-  standalone: true,
   imports: [BitIconComponent],
 })
 export class NoItemsComponent {
diff --git a/libs/components/src/popover/popover-trigger-for.directive.ts b/libs/components/src/popover/popover-trigger-for.directive.ts
index 482308c94d8..47fda1ca267 100644
--- a/libs/components/src/popover/popover-trigger-for.directive.ts
+++ b/libs/components/src/popover/popover-trigger-for.directive.ts
@@ -19,7 +19,6 @@ import { PopoverComponent } from "./popover.component";
 
 @Directive({
   selector: "[bitPopoverTriggerFor]",
-  standalone: true,
   exportAs: "popoverTrigger",
 })
 export class PopoverTriggerForDirective implements OnDestroy, AfterViewInit {
diff --git a/libs/components/src/popover/popover.component.html b/libs/components/src/popover/popover.component.html
index cb0681822d0..05db9112b8a 100644
--- a/libs/components/src/popover/popover.component.html
+++ b/libs/components/src/popover/popover.component.html
@@ -4,7 +4,7 @@
       <div
         class="tw-relative tw-z-20 tw-w-72 tw-break-words tw-bg-background tw-pb-4 tw-pt-2 tw-text-main"
       >
-        <div class="tw-mb-1 tw-mr-2 tw-flex tw-items-start tw-justify-between tw-gap-4 tw-pl-4">
+        <div class="tw-mb-1 tw-me-2 tw-flex tw-items-start tw-justify-between tw-gap-4 tw-ps-4">
           <h2 bitTypography="h5" class="tw-mt-1 tw-font-semibold">
             {{ title }}
           </h2>
diff --git a/libs/components/src/popover/popover.component.ts b/libs/components/src/popover/popover.component.ts
index e0ff4cf33d4..2c8f6fc3714 100644
--- a/libs/components/src/popover/popover.component.ts
+++ b/libs/components/src/popover/popover.component.ts
@@ -8,7 +8,6 @@ import { SharedModule } from "../shared/shared.module";
 import { TypographyModule } from "../typography";
 
 @Component({
-  standalone: true,
   selector: "bit-popover",
   imports: [A11yModule, IconButtonModule, SharedModule, TypographyModule],
   templateUrl: "./popover.component.html",
diff --git a/libs/components/src/popover/popover.stories.ts b/libs/components/src/popover/popover.stories.ts
index 8e276afa0c4..ee387d69e56 100644
--- a/libs/components/src/popover/popover.stories.ts
+++ b/libs/components/src/popover/popover.stories.ts
@@ -62,7 +62,7 @@ type Story = StoryObj<PopoverTriggerForDirective>;
 const popoverContent = `
   <bit-popover [title]="'Example Title'" #myPopover>
     <div>Lorem ipsum dolor <a href="#">adipisicing elit</a>.</div>
-    <ul class="tw-mt-2 tw-mb-0 tw-pl-4">
+    <ul class="tw-mt-2 tw-mb-0 tw-ps-4">
       <li>Dolor sit amet consectetur</li>
       <li>Esse labore veniam tempora</li>
       <li>Adipisicing elit ipsum <a href="#">iustolaborum</a></li>
@@ -96,7 +96,7 @@ export const Open: Story = {
     template: `
       <bit-popover [title]="'Example Title'" #myPopover="popoverComponent">
         <div>Lorem ipsum dolor <a href="#">adipisicing elit</a>.</div>
-        <ul class="tw-mt-2 tw-mb-0 tw-pl-4">
+        <ul class="tw-mt-2 tw-mb-0 tw-ps-4">
           <li>Dolor sit amet consectetur</li>
           <li>Esse labore veniam tempora</li>
           <li>Adipisicing elit ipsum <a href="#">iustolaborum</a></li>
@@ -118,7 +118,7 @@ export const OpenLongTitle: Story = {
     template: `
       <bit-popover [title]="'Example Title that is really long it wraps 2 lines'" #myPopover="popoverComponent">
         <div>Lorem ipsum dolor <a href="#">adipisicing elit</a>.</div>
-        <ul class="tw-mt-2 tw-mb-0 tw-pl-4">
+        <ul class="tw-mt-2 tw-mb-0 tw-ps-4">
           <li>Dolor sit amet consectetur</li>
           <li>Esse labore veniam tempora</li>
           <li>Adipisicing elit ipsum <a href="#">iustolaborum</a></li>
diff --git a/libs/components/src/progress/progress.component.html b/libs/components/src/progress/progress.component.html
index 30b68d9d645..21b047f732a 100644
--- a/libs/components/src/progress/progress.component.html
+++ b/libs/components/src/progress/progress.component.html
@@ -11,7 +11,7 @@
       <div class="tw-flex tw-h-full tw-flex-wrap tw-items-center tw-overflow-hidden">
         <!-- If text is too long to fit, wrap it below to hide -->
         <div class="tw-h-full">&nbsp;</div>
-        <div class="tw-pr-1">{{ textContent }}</div>
+        <div class="tw-pe-1">{{ textContent }}</div>
       </div>
     }
   </div>
diff --git a/libs/components/src/progress/progress.component.ts b/libs/components/src/progress/progress.component.ts
index 04e535158b1..125d05025a2 100644
--- a/libs/components/src/progress/progress.component.ts
+++ b/libs/components/src/progress/progress.component.ts
@@ -1,33 +1,35 @@
 import { CommonModule } from "@angular/common";
 import { Component, Input } from "@angular/core";
 
-type SizeTypes = "small" | "default" | "large";
-type BackgroundTypes = "danger" | "primary" | "success" | "warning";
+type ProgressSizeType = "small" | "default" | "large";
+type BackgroundType = "danger" | "primary" | "success" | "warning";
 
-const SizeClasses: Record<SizeTypes, string[]> = {
+const SizeClasses: Record<ProgressSizeType, string[]> = {
   small: ["tw-h-1"],
   default: ["tw-h-4"],
   large: ["tw-h-6"],
 };
 
-const BackgroundClasses: Record<BackgroundTypes, string[]> = {
+const BackgroundClasses: Record<BackgroundType, string[]> = {
   danger: ["tw-bg-danger-600"],
   primary: ["tw-bg-primary-600"],
   success: ["tw-bg-success-600"],
   warning: ["tw-bg-warning-600"],
 };
 
+/**
+ * Progress indicators may be used to visually indicate progress or to visually measure some other value, such as a password strength indicator.
+ */
 @Component({
   selector: "bit-progress",
   templateUrl: "./progress.component.html",
-  standalone: true,
   imports: [CommonModule],
 })
 export class ProgressComponent {
   @Input() barWidth = 0;
-  @Input() bgColor: BackgroundTypes = "primary";
+  @Input() bgColor: BackgroundType = "primary";
   @Input() showText = true;
-  @Input() size: SizeTypes = "default";
+  @Input() size: ProgressSizeType = "default";
   @Input() text?: string;
 
   get displayText() {
diff --git a/libs/components/src/progress/progress.mdx b/libs/components/src/progress/progress.mdx
index 9a75f8ae1fa..def2f239129 100644
--- a/libs/components/src/progress/progress.mdx
+++ b/libs/components/src/progress/progress.mdx
@@ -1,13 +1,15 @@
-import { Meta, Canvas, Primary, Controls } from "@storybook/addon-docs";
+import { Meta, Canvas, Primary, Controls, Title, Description } from "@storybook/addon-docs";
 
 import * as stories from "./progress.stories";
 
 <Meta of={stories} />
 
-# Progress
+```ts
+import { ProgressModule } from "@bitwarden/components";
+```
 
-Progress indicators may be used to visually indicate progress or to visually measure some other
-value, such as a password strength indicator.
+<Title />
+<Description />
 
 <Primary />
 <Controls />
diff --git a/libs/components/src/progress/progress.stories.ts b/libs/components/src/progress/progress.stories.ts
index 1484dab0a21..5c7eb066cd3 100644
--- a/libs/components/src/progress/progress.stories.ts
+++ b/libs/components/src/progress/progress.stories.ts
@@ -1,5 +1,7 @@
 import { Meta, StoryObj } from "@storybook/angular";
 
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
+
 import { ProgressComponent } from "./progress.component";
 
 export default {
@@ -20,19 +22,34 @@ export default {
 
 type Story = StoryObj<ProgressComponent>;
 
+export const Base: Story = {
+  render: (args) => ({
+    props: args,
+    template: `
+      <bit-progress ${formatArgsForCodeSnippet<ProgressComponent>(args)}></bit-progress>
+    `,
+  }),
+  args: {
+    barWidth: 50,
+  },
+};
+
 export const Empty: Story = {
+  ...Base,
   args: {
     barWidth: 0,
   },
 };
 
 export const Full: Story = {
+  ...Base,
   args: {
     barWidth: 100,
   },
 };
 
 export const CustomText: Story = {
+  ...Base,
   args: {
     barWidth: 25,
     text: "Loading...",
diff --git a/libs/components/src/radio-button/radio-button.component.spec.ts b/libs/components/src/radio-button/radio-button.component.spec.ts
index f8cdae00664..265b8e23129 100644
--- a/libs/components/src/radio-button/radio-button.component.spec.ts
+++ b/libs/components/src/radio-button/radio-button.component.spec.ts
@@ -1,7 +1,5 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component } from "@angular/core";
-import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -17,26 +15,23 @@ describe("RadioButton", () => {
   let testAppComponent: TestApp;
   let radioButton: HTMLInputElement;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async () => {
     mockGroupComponent = new MockedButtonGroupComponent();
 
     TestBed.configureTestingModule({
-      imports: [RadioButtonModule],
-      declarations: [TestApp],
+      imports: [TestApp],
       providers: [
         { provide: RadioGroupComponent, useValue: mockGroupComponent },
         { provide: I18nService, useValue: new I18nMockService({}) },
       ],
     });
 
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    TestBed.compileComponents();
+    await TestBed.compileComponents();
     fixture = TestBed.createComponent(TestApp);
     fixture.detectChanges();
     testAppComponent = fixture.debugElement.componentInstance;
     radioButton = fixture.debugElement.query(By.css("input[type=radio]")).nativeElement;
-  }));
+  });
 
   it("should emit value when clicking on radio button", () => {
     testAppComponent.value = "value";
@@ -71,12 +66,13 @@ describe("RadioButton", () => {
 
 class MockedButtonGroupComponent implements Partial<RadioGroupComponent> {
   onInputChange = jest.fn();
-  selected = null;
+  selected: unknown = null;
 }
 
 @Component({
   selector: "test-app",
-  template: ` <bit-radio-button [value]="value"><bit-label>Element</bit-label></bit-radio-button>`,
+  template: `<bit-radio-button [value]="value"><bit-label>Element</bit-label></bit-radio-button>`,
+  imports: [RadioButtonModule],
 })
 class TestApp {
   value?: string;
diff --git a/libs/components/src/radio-button/radio-button.component.ts b/libs/components/src/radio-button/radio-button.component.ts
index 2db206bbaf9..a319f86840b 100644
--- a/libs/components/src/radio-button/radio-button.component.ts
+++ b/libs/components/src/radio-button/radio-button.component.ts
@@ -10,7 +10,6 @@ let nextId = 0;
 @Component({
   selector: "bit-radio-button",
   templateUrl: "radio-button.component.html",
-  standalone: true,
   imports: [FormControlModule, RadioInputComponent],
 })
 export class RadioButtonComponent {
diff --git a/libs/components/src/radio-button/radio-group.component.spec.ts b/libs/components/src/radio-button/radio-group.component.spec.ts
index d2b9e6cbf2e..ff01b9323f7 100644
--- a/libs/components/src/radio-button/radio-group.component.spec.ts
+++ b/libs/components/src/radio-button/radio-group.component.spec.ts
@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { FormsModule } from "@angular/forms";
 import { By } from "@angular/platform-browser";
 
@@ -16,16 +16,13 @@ describe("RadioGroupComponent", () => {
   let buttonElements: RadioButtonComponent[];
   let radioButtons: HTMLInputElement[];
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async () => {
     TestBed.configureTestingModule({
-      imports: [FormsModule, RadioButtonModule],
-      declarations: [TestApp],
+      imports: [TestApp],
       providers: [{ provide: I18nService, useValue: new I18nMockService({}) }],
     });
 
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    TestBed.compileComponents();
+    await TestBed.compileComponents();
     fixture = TestBed.createComponent(TestApp);
     fixture.detectChanges();
     testAppComponent = fixture.debugElement.componentInstance;
@@ -37,7 +34,7 @@ describe("RadioGroupComponent", () => {
       .map((e) => e.nativeElement);
 
     fixture.detectChanges();
-  }));
+  });
 
   it("should select second element when setting selected to second", async () => {
     testAppComponent.selected = "second";
@@ -75,6 +72,7 @@ describe("RadioGroupComponent", () => {
       <bit-radio-button value="third">Third</bit-radio-button>
     </bit-radio-group>
   `,
+  imports: [FormsModule, RadioButtonModule],
 })
 class TestApp {
   selected?: string;
diff --git a/libs/components/src/radio-button/radio-group.component.ts b/libs/components/src/radio-button/radio-group.component.ts
index 895f769af50..51c7c5e9c92 100644
--- a/libs/components/src/radio-button/radio-group.component.ts
+++ b/libs/components/src/radio-button/radio-group.component.ts
@@ -13,7 +13,6 @@ let nextId = 0;
 @Component({
   selector: "bit-radio-group",
   templateUrl: "radio-group.component.html",
-  standalone: true,
   imports: [NgTemplateOutlet, I18nPipe],
 })
 export class RadioGroupComponent implements ControlValueAccessor {
diff --git a/libs/components/src/radio-button/radio-input.component.ts b/libs/components/src/radio-button/radio-input.component.ts
index 4a9f5dede60..1598def5c65 100644
--- a/libs/components/src/radio-button/radio-input.component.ts
+++ b/libs/components/src/radio-button/radio-input.component.ts
@@ -11,7 +11,6 @@ let nextId = 0;
   selector: "input[type=radio][bitRadio]",
   template: "",
   providers: [{ provide: BitFormControlAbstraction, useExisting: RadioInputComponent }],
-  standalone: true,
 })
 export class RadioInputComponent implements BitFormControlAbstraction {
   @HostBinding("attr.id") @Input() id = `bit-radio-input-${nextId++}`;
@@ -30,7 +29,6 @@ export class RadioInputComponent implements BitFormControlAbstraction {
     "tw-border-secondary-600",
     "tw-w-[1.12rem]",
     "tw-h-[1.12rem]",
-    "tw-mr-1.5",
     "tw-flex-none", // Flexbox fix for bit-form-control
 
     "hover:tw-border-2",
diff --git a/libs/components/src/resize-observer/index.ts b/libs/components/src/resize-observer/index.ts
new file mode 100644
index 00000000000..c0c0912562f
--- /dev/null
+++ b/libs/components/src/resize-observer/index.ts
@@ -0,0 +1 @@
+export * from "./resize-observer.directive";
diff --git a/libs/components/src/resize-observer/resize-observer.directive.ts b/libs/components/src/resize-observer/resize-observer.directive.ts
new file mode 100644
index 00000000000..5943636f450
--- /dev/null
+++ b/libs/components/src/resize-observer/resize-observer.directive.ts
@@ -0,0 +1,30 @@
+import { Directive, ElementRef, EventEmitter, Output, OnDestroy } from "@angular/core";
+
+@Directive({
+  selector: "[resizeObserver]",
+  standalone: true,
+})
+export class ResizeObserverDirective implements OnDestroy {
+  private observer = new ResizeObserver((entries) => {
+    for (const entry of entries) {
+      if (entry.target === this.el.nativeElement) {
+        this._resizeCallback(entry);
+      }
+    }
+  });
+
+  @Output()
+  resize = new EventEmitter();
+
+  constructor(private el: ElementRef) {
+    this.observer.observe(this.el.nativeElement);
+  }
+
+  _resizeCallback(entry: ResizeObserverEntry) {
+    this.resize.emit(entry);
+  }
+
+  ngOnDestroy() {
+    this.observer.unobserve(this.el.nativeElement);
+  }
+}
diff --git a/libs/components/src/search/search.component.html b/libs/components/src/search/search.component.html
index 5bb25425e57..759e25c07dd 100644
--- a/libs/components/src/search/search.component.html
+++ b/libs/components/src/search/search.component.html
@@ -13,7 +13,7 @@
     [type]="inputType"
     [id]="id"
     [placeholder]="placeholder ?? ('search' | i18n)"
-    class="tw-pl-9"
+    class="tw-ps-9"
     [ngModel]="searchText"
     (ngModelChange)="onChange($event)"
     (blur)="onTouch()"
diff --git a/libs/components/src/search/search.component.ts b/libs/components/src/search/search.component.ts
index 7edf3b1d60a..0cdd9c611fa 100644
--- a/libs/components/src/search/search.component.ts
+++ b/libs/components/src/search/search.component.ts
@@ -30,7 +30,6 @@ let nextId = 0;
       useExisting: SearchComponent,
     },
   ],
-  standalone: true,
   imports: [InputModule, ReactiveFormsModule, FormsModule, I18nPipe],
 })
 export class SearchComponent implements ControlValueAccessor, FocusableElement {
diff --git a/libs/components/src/search/search.mdx b/libs/components/src/search/search.mdx
index 492fd0dda2d..7775225b8c2 100644
--- a/libs/components/src/search/search.mdx
+++ b/libs/components/src/search/search.mdx
@@ -1,4 +1,4 @@
-import { Meta, Canvas, Source, Primary, Controls } from "@storybook/addon-docs";
+import { Meta, Canvas, Source, Primary, Controls, Title } from "@storybook/addon-docs";
 
 import * as stories from "./search.stories";
 
@@ -8,7 +8,7 @@ import * as stories from "./search.stories";
 import { SearchModule } from "@bitwarden/components";
 ```
 
-# Search
+<Title>Search field</Title>
 
 <Primary />
 <Controls />
diff --git a/libs/components/src/search/search.stories.ts b/libs/components/src/search/search.stories.ts
index a6cd714d43a..526e1381d70 100644
--- a/libs/components/src/search/search.stories.ts
+++ b/libs/components/src/search/search.stories.ts
@@ -3,6 +3,7 @@ import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
 import { InputModule } from "../input/input.module";
 import { SharedModule } from "../shared";
 import { I18nMockService } from "../utils/i18n-mock.service";
@@ -27,6 +28,10 @@ export default {
       ],
     }),
   ],
+  args: {
+    placeholder: "search",
+    disabled: false,
+  },
 } as Meta;
 
 type Story = StoryObj<SearchComponent>;
@@ -35,7 +40,7 @@ export const Default: Story = {
   render: (args) => ({
     props: args,
     template: `
-      <bit-search [(ngModel)]="searchText" [placeholder]="placeholder" [disabled]="disabled"></bit-search>
+      <bit-search [(ngModel)]="searchText"${formatArgsForCodeSnippet<SearchComponent>(args)}></bit-search>
     `,
   }),
   args: {},
diff --git a/libs/components/src/section/section-header.component.ts b/libs/components/src/section/section-header.component.ts
index 9f7b1a21f16..c96f9486b52 100644
--- a/libs/components/src/section/section-header.component.ts
+++ b/libs/components/src/section/section-header.component.ts
@@ -3,7 +3,6 @@ import { Component } from "@angular/core";
 import { TypographyModule } from "../typography";
 
 @Component({
-  standalone: true,
   selector: "bit-section-header",
   templateUrl: "./section-header.component.html",
   imports: [TypographyModule],
diff --git a/libs/components/src/section/section.component.ts b/libs/components/src/section/section.component.ts
index ec34c804119..c6a5c1d7cb5 100644
--- a/libs/components/src/section/section.component.ts
+++ b/libs/components/src/section/section.component.ts
@@ -4,7 +4,6 @@ import { Component, Input } from "@angular/core";
 
 @Component({
   selector: "bit-section",
-  standalone: true,
   imports: [CommonModule],
   template: `
     <section
diff --git a/libs/components/src/select/option.component.ts b/libs/components/src/select/option.component.ts
index 841ceda3648..b32b124be25 100644
--- a/libs/components/src/select/option.component.ts
+++ b/libs/components/src/select/option.component.ts
@@ -7,7 +7,6 @@ import { Option } from "./option";
 @Component({
   selector: "bit-option",
   template: `<ng-template><ng-content></ng-content></ng-template>`,
-  standalone: true,
 })
 export class OptionComponent<T = unknown> implements Option<T> {
   @Input()
diff --git a/libs/components/src/select/select.component.html b/libs/components/src/select/select.component.html
index dcca7ae195e..6d4c431f234 100644
--- a/libs/components/src/select/select.component.html
+++ b/libs/components/src/select/select.component.html
@@ -9,10 +9,11 @@
   [clearable]="false"
   (close)="onClose()"
   appendTo="body"
+  [keyDownFn]="onKeyDown"
 >
   <ng-template ng-option-tmp let-item="item">
     <div class="tw-flex" [title]="item.label">
-      <div class="tw-mr-2 tw-flex-initial">
+      <div class="tw-me-2 tw-flex-initial">
         @if (item.icon != null) {
           <i class="bwi bwi-fw {{ item.icon }}" aria-hidden="true"></i>
         }
diff --git a/libs/components/src/select/select.component.spec.ts b/libs/components/src/select/select.component.spec.ts
index 47f0a8c7b13..236a788549a 100644
--- a/libs/components/src/select/select.component.spec.ts
+++ b/libs/components/src/select/select.component.spec.ts
@@ -10,7 +10,6 @@ import { SelectComponent } from "./select.component";
 import { SelectModule } from "./select.module";
 
 @Component({
-  standalone: true,
   imports: [SelectModule, ReactiveFormsModule],
   template: `
     <form [formGroup]="form">
diff --git a/libs/components/src/select/select.component.ts b/libs/components/src/select/select.component.ts
index 8b656af3465..909566bf1f8 100644
--- a/libs/components/src/select/select.component.ts
+++ b/libs/components/src/select/select.component.ts
@@ -1,6 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 
+import { hasModifierKey } from "@angular/cdk/keycodes";
 import {
   Component,
   ContentChildren,
@@ -35,7 +36,6 @@ let nextId = 0;
   selector: "bit-select",
   templateUrl: "select.component.html",
   providers: [{ provide: BitFormFieldControl, useExisting: SelectComponent }],
-  standalone: true,
   imports: [NgSelectModule, ReactiveFormsModule, FormsModule],
 })
 export class SelectComponent<T> implements BitFormFieldControl, ControlValueAccessor {
@@ -186,4 +186,20 @@ export class SelectComponent<T> implements BitFormFieldControl, ControlValueAcce
   protected onClose() {
     this.closed.emit();
   }
+
+  /**
+   * Prevent Escape key press from propagating to parent components
+   * (for example, parent dialog should not close when Escape is pressed in the select)
+   *
+   * @returns true to keep default key behavior; false to prevent default key behavior
+   *
+   * Needs to be arrow function to retain `this` scope.
+   */
+  protected onKeyDown = (event: KeyboardEvent) => {
+    if (this.select.isOpen && event.key === "Escape" && !hasModifierKey(event)) {
+      event.stopPropagation();
+    }
+
+    return true;
+  };
 }
diff --git a/libs/components/src/stepper/index.ts b/libs/components/src/stepper/index.ts
new file mode 100644
index 00000000000..0408a424672
--- /dev/null
+++ b/libs/components/src/stepper/index.ts
@@ -0,0 +1 @@
+export * from "./stepper.module";
diff --git a/libs/components/src/stepper/step.component.html b/libs/components/src/stepper/step.component.html
new file mode 100644
index 00000000000..a4bd3d8f63e
--- /dev/null
+++ b/libs/components/src/stepper/step.component.html
@@ -0,0 +1,3 @@
+<ng-template>
+  <ng-content></ng-content>
+</ng-template>
diff --git a/libs/components/src/stepper/step.component.ts b/libs/components/src/stepper/step.component.ts
new file mode 100644
index 00000000000..6d558964d89
--- /dev/null
+++ b/libs/components/src/stepper/step.component.ts
@@ -0,0 +1,16 @@
+import { CdkStep, CdkStepper } from "@angular/cdk/stepper";
+import { Component, input } from "@angular/core";
+
+@Component({
+  selector: "bit-step",
+  templateUrl: "step.component.html",
+  providers: [{ provide: CdkStep, useExisting: StepComponent }],
+  standalone: true,
+})
+export class StepComponent extends CdkStep {
+  subLabel = input();
+
+  constructor(stepper: CdkStepper) {
+    super(stepper);
+  }
+}
diff --git a/libs/components/src/stepper/step.stories.ts b/libs/components/src/stepper/step.stories.ts
new file mode 100644
index 00000000000..c8005e26de3
--- /dev/null
+++ b/libs/components/src/stepper/step.stories.ts
@@ -0,0 +1,30 @@
+import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+
+import { StepComponent } from "./step.component";
+import { StepperComponent } from "./stepper.component";
+
+export default {
+  title: "Component Library/Stepper/Step",
+  component: StepComponent,
+  decorators: [
+    moduleMetadata({
+      imports: [StepperComponent],
+    }),
+  ],
+} as Meta;
+
+export const Default: StoryObj<StepComponent> = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <bit-stepper>
+        <bit-step
+          label="This is the label"
+          subLabel="This is the sub label"
+        >
+          <p>Your custom step content appears in here. You can add whatever content you'd like</p>
+        </bit-step>
+    </bit-stepper>
+    `,
+  }),
+};
diff --git a/libs/components/src/stepper/stepper.component.html b/libs/components/src/stepper/stepper.component.html
new file mode 100644
index 00000000000..cc4753b8d72
--- /dev/null
+++ b/libs/components/src/stepper/stepper.component.html
@@ -0,0 +1,126 @@
+<div resizeObserver (resize)="handleResize($event)">
+  @if (orientation === "horizontal") {
+    <div role="tablist">
+      <div class="tw-flex tw-gap-8 tw-justify-between">
+        @for (step of steps; track $index; let isLast = $last) {
+          @let isCurrentStepDisabled = isStepDisabled($index);
+          <button
+            type="button"
+            [disabled]="isCurrentStepDisabled"
+            (click)="selectStepByIndex($index)"
+            class="tw-flex tw-p-3 tw-items-center tw-border-none tw-bg-transparent tw-shrink-0"
+            [ngClass]="{
+              'hover:tw-bg-secondary-100': !isCurrentStepDisabled && step.editable,
+            }"
+            [attr.aria-selected]="selectedIndex === $index"
+            [attr.aria-controls]="contentId + $index"
+            role="tab"
+          >
+            @if (step.completed) {
+              <span
+                class="tw-me-3.5 tw-size-9 tw-rounded-full tw-bg-primary-600 tw-font-bold tw-leading-9 tw-text-contrast"
+              >
+                <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
+              </span>
+            } @else {
+              <span
+                class="tw-me-3.5 tw-size-9 tw-rounded-full tw-font-bold tw-leading-9"
+                [ngClass]="{
+                  'tw-bg-primary-600 tw-text-contrast': selectedIndex === $index,
+                  'tw-bg-secondary-300 tw-text-main':
+                    selectedIndex !== $index && !isCurrentStepDisabled && step.editable,
+                  'tw-bg-transparent tw-text-muted': isCurrentStepDisabled,
+                }"
+              >
+                {{ $index + 1 }}
+              </span>
+            }
+            <div class="tw-leading-snug tw-text-left">
+              <p bitTypography="body1" class="tw-m-0">{{ step.label }}</p>
+
+              @if (step.subLabel()) {
+                <p bitTypography="body2" class="tw-m-0 tw-mt-1 tw-text-muted">
+                  {{ step.subLabel() }}
+                </p>
+              }
+            </div>
+          </button>
+          @if (!isLast) {
+            <div
+              class="after:tw-left-0 after:tw-top-[50%] after:-tw-translate-y-[50%] after:tw-h-[2px] after:tw-w-full after:tw-absolute after:tw-bg-secondary-300 after:tw-content-[''] tw-relative tw-w-full"
+            ></div>
+          }
+        }
+      </div>
+    </div>
+    @for (step of steps; track $index; let isLast = $last) {
+      <div role="tabpanel" [attr.id]="contentId + $index" [hidden]="!selected">
+        @if (selectedIndex === $index) {
+          <div [ngTemplateOutlet]="selected.content"></div>
+        }
+      </div>
+    }
+  } @else {
+    @for (step of steps; track $index; let isLast = $last) {
+      @let isCurrentStepDisabled = isStepDisabled($index);
+      <button
+        type="button"
+        [disabled]="isCurrentStepDisabled"
+        (click)="selectStepByIndex($index)"
+        class="tw-flex tw-p-3 tw-w-full tw-items-center tw-border-none tw-bg-transparent"
+        [ngClass]="{
+          'hover:tw-bg-secondary-100': !isCurrentStepDisabled && step.editable,
+        }"
+        [attr.id]="contentId + 'accordion' + $index"
+        [attr.aria-expanded]="selectedIndex === $index"
+        [attr.aria-controls]="contentId + $index"
+      >
+        @if (step.completed) {
+          <span
+            class="tw-me-3.5 tw-size-9 tw-rounded-full tw-bg-primary-600 tw-font-bold tw-leading-9 tw-text-contrast"
+          >
+            <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
+          </span>
+        } @else {
+          <span
+            class="tw-me-3.5 tw-size-9 tw-rounded-full tw-font-bold tw-leading-9"
+            [ngClass]="{
+              'tw-bg-primary-600 tw-text-contrast': selectedIndex === $index,
+              'tw-bg-secondary-300 tw-text-main':
+                selectedIndex !== $index && !isCurrentStepDisabled && step.editable,
+              'tw-bg-transparent tw-text-muted': isCurrentStepDisabled,
+            }"
+          >
+            {{ $index + 1 }}
+          </span>
+        }
+        <div class="tw-leading-snug tw-text-left">
+          <p bitTypography="body1" class="tw-m-0">{{ step.label }}</p>
+
+          @if (step.subLabel()) {
+            <div bitTypography="body2" class="tw-m-0 tw-mt-1 tw-text-muted">
+              {{ step.subLabel() }}
+            </div>
+          }
+        </div>
+      </button>
+      <div
+        [attr.id]="contentId + $index"
+        [hidden]="!selected"
+        [attr.aria-labelledby]="contentId + 'accordion' + $index"
+        role="region"
+      >
+        <div
+          class="tw-ms-7 tw-border-solid tw-border-0 tw-border-s tw-border-secondary-300"
+          [ngClass]="{ 'tw-min-h-6': !isLast }"
+        >
+          @if (selectedIndex === $index) {
+            <div class="tw-ps-8 tw-py-2">
+              <div [ngTemplateOutlet]="selected.content"></div>
+            </div>
+          }
+        </div>
+      </div>
+    }
+  }
+</div>
diff --git a/libs/components/src/stepper/stepper.component.ts b/libs/components/src/stepper/stepper.component.ts
new file mode 100644
index 00000000000..59c12b4371e
--- /dev/null
+++ b/libs/components/src/stepper/stepper.component.ts
@@ -0,0 +1,88 @@
+import { Directionality } from "@angular/cdk/bidi";
+import { CdkStepper, StepperOrientation } from "@angular/cdk/stepper";
+import { CommonModule } from "@angular/common";
+import { ChangeDetectorRef, Component, ElementRef, Input, QueryList } from "@angular/core";
+
+import { ResizeObserverDirective } from "../resize-observer";
+import { TypographyModule } from "../typography";
+
+import { StepComponent } from "./step.component";
+
+/**
+ * The `<bit-stepper>` component extends the
+ * [Angular CdkStepper](https://material.angular.io/cdk/stepper/api#CdkStepper) component
+ */
+@Component({
+  selector: "bit-stepper",
+  templateUrl: "stepper.component.html",
+  providers: [{ provide: CdkStepper, useExisting: StepperComponent }],
+  imports: [CommonModule, ResizeObserverDirective, TypographyModule],
+  standalone: true,
+})
+export class StepperComponent extends CdkStepper {
+  // Need to reimplement the constructor to fix an invalidFactoryDep error in Storybook
+  // @see https://github.com/storybookjs/storybook/issues/23534#issuecomment-2042888436
+  constructor(
+    _dir: Directionality,
+    _changeDetectorRef: ChangeDetectorRef,
+    _elementRef: ElementRef<HTMLElement>,
+  ) {
+    super(_dir, _changeDetectorRef, _elementRef);
+  }
+
+  private resizeWidthsMap = new Map([
+    [2, 600],
+    [3, 768],
+    [4, 900],
+  ]);
+
+  override readonly steps!: QueryList<StepComponent>;
+
+  private internalOrientation: StepperOrientation | undefined = undefined;
+  private initialOrientation: StepperOrientation | undefined = undefined;
+
+  // overriding CdkStepper orientation input so we can default to vertical
+  @Input()
+  override get orientation() {
+    return this.internalOrientation || "vertical";
+  }
+  override set orientation(value: StepperOrientation) {
+    if (!this.internalOrientation) {
+      // tracking the first value of orientation. We want to handle resize events if it's 'horizontal'.
+      // If it's 'vertical' don't change the orientation to 'horizontal' when resizing
+      this.initialOrientation = value;
+    }
+
+    this.internalOrientation = value;
+  }
+
+  handleResize(entry: ResizeObserverEntry) {
+    if (this.initialOrientation === "horizontal") {
+      const stepperContainerWidth = entry.contentRect.width;
+      const numberOfSteps = this.steps.length;
+      const breakpoint = this.resizeWidthsMap.get(numberOfSteps) || 450;
+
+      this.orientation = stepperContainerWidth < breakpoint ? "vertical" : "horizontal";
+      // This is a method of CdkStepper. Their docs define it as: 'Marks the component to be change detected'
+      this._stateChanged();
+    }
+  }
+
+  isStepDisabled(index: number) {
+    if (this.selectedIndex !== index) {
+      return this.selectedIndex === index - 1
+        ? !this.steps.find((_, i) => i == index - 1)?.completed
+        : true;
+    }
+    return false;
+  }
+
+  selectStepByIndex(index: number): void {
+    this.selectedIndex = index;
+  }
+
+  /**
+   * UID for `[attr.aria-controls]`
+   */
+  protected contentId = Math.random().toString(36).substring(2);
+}
diff --git a/libs/components/src/stepper/stepper.mdx b/libs/components/src/stepper/stepper.mdx
new file mode 100644
index 00000000000..ca4efd97aef
--- /dev/null
+++ b/libs/components/src/stepper/stepper.mdx
@@ -0,0 +1,35 @@
+import { Meta, Story, Source, Primary, Controls, Title, Description } from "@storybook/addon-docs";
+
+import * as stories from "./stepper.stories";
+
+<Meta of={stories} />
+
+<Title />
+<Description />
+
+<Primary />
+<Controls />
+
+## Step Component
+
+The `<bit-step>` component extends the
+[Angular CdkStep](https://material.angular.io/cdk/stepper/api#CdkStep) component
+
+The following additional Inputs are accepted:
+
+| Input      | Type   | Description                                                    |
+| ---------- | ------ | -------------------------------------------------------------- |
+| `subLabel` | string | An optional supplemental label to display below the main label |
+
+In order for the stepper component to work as intended, its children must be instances of
+`<bit-step>`.
+
+```html
+<bit-stepper>
+  <bit-step label="This is the label" subLabel="This is the sub label">
+    Your content here
+  </bit-step>
+  <bit-step label="Another label"> Your content here </bit-step>
+  <bit-step label="The last label"> Your content here </bit-step>
+</bit-stepper>
+```
diff --git a/libs/components/src/stepper/stepper.module.ts b/libs/components/src/stepper/stepper.module.ts
new file mode 100644
index 00000000000..da66f2c6a9c
--- /dev/null
+++ b/libs/components/src/stepper/stepper.module.ts
@@ -0,0 +1,10 @@
+import { NgModule } from "@angular/core";
+
+import { StepComponent } from "./step.component";
+import { StepperComponent } from "./stepper.component";
+
+@NgModule({
+  imports: [StepperComponent, StepComponent],
+  exports: [StepperComponent, StepComponent],
+})
+export class StepperModule {}
diff --git a/libs/components/src/stepper/stepper.stories.ts b/libs/components/src/stepper/stepper.stories.ts
new file mode 100644
index 00000000000..a2593588599
--- /dev/null
+++ b/libs/components/src/stepper/stepper.stories.ts
@@ -0,0 +1,70 @@
+import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+
+import { ButtonComponent } from "../button";
+
+import { StepComponent } from "./step.component";
+import { StepperComponent } from "./stepper.component";
+
+export default {
+  title: "Component Library/Stepper",
+  component: StepperComponent,
+  decorators: [
+    moduleMetadata({
+      imports: [ButtonComponent, StepComponent],
+    }),
+  ],
+} as Meta;
+
+export const Default: StoryObj<StepperComponent> = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <bit-stepper [orientation]="orientation">
+        <bit-step
+          label="This is the label"
+          subLabel="This is the sub label"
+        >
+          <p>Your custom step content appears in here. You can add whatever content you'd like</p>
+          <button
+              type="button"
+              bitButton
+              buttonType="primary"
+            >
+              Some button label
+            </button>
+        </bit-step>
+        <bit-step
+            label="Another label"
+        >
+            <p>Another step</p>
+            <button
+              type="button"
+              bitButton
+              buttonType="primary"
+            >
+              Some button label
+            </button>
+        </bit-step>
+        <bit-step
+            label="The last label"
+        >
+            <p>The last step</p>
+            <button
+                type="button"
+                bitButton
+                buttonType="primary"
+            >
+            Some button label
+            </button>
+        </bit-step>
+    </bit-stepper>
+    `,
+  }),
+};
+
+export const Horizontal: StoryObj<StepperComponent> = {
+  ...Default,
+  args: {
+    orientation: "horizontal",
+  },
+};
diff --git a/libs/components/src/stories/colors.mdx b/libs/components/src/stories/colors.mdx
index 3a4a4f0fe3a..87ca673797b 100644
--- a/libs/components/src/stories/colors.mdx
+++ b/libs/components/src/stories/colors.mdx
@@ -62,9 +62,14 @@ export const Table = (args) => (
       {Row("notification-600")}
     </tbody>
     <tbody>
-      {Row("art-primary")}
-      {Row("art-accent")}
+      {Row("illustration-outline")}
+      {Row("illustration-bg-primary")}
+      {Row("illustration-bg-secondary")}
+      {Row("illustration-bg-tertiary")}
+      {Row("illustration-tertiary")}
+      {Row("illustration-logo")}
     </tbody>
+
     <thead>
       <tr>
         <th>Text</th>
@@ -78,6 +83,7 @@ export const Table = (args) => (
       {Row("text-alt2")}
       {Row("text-code")}
     </tbody>
+
   </table>
 );
 
diff --git a/libs/components/src/stories/kitchen-sink/components/dialog-virtual-scroll-block.component.ts b/libs/components/src/stories/kitchen-sink/components/dialog-virtual-scroll-block.component.ts
index 7709506f050..904b9e11c3a 100644
--- a/libs/components/src/stories/kitchen-sink/components/dialog-virtual-scroll-block.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/dialog-virtual-scroll-block.component.ts
@@ -3,15 +3,23 @@ import { Component, OnInit } from "@angular/core";
 
 import { DialogModule, DialogService } from "../../../dialog";
 import { IconButtonModule } from "../../../icon-button";
+import { ScrollLayoutDirective } from "../../../layout";
 import { SectionComponent } from "../../../section";
 import { TableDataSource, TableModule } from "../../../table";
 
 @Component({
   selector: "dialog-virtual-scroll-block",
   standalone: true,
-  imports: [DialogModule, IconButtonModule, SectionComponent, TableModule, ScrollingModule],
+  imports: [
+    DialogModule,
+    IconButtonModule,
+    SectionComponent,
+    TableModule,
+    ScrollingModule,
+    ScrollLayoutDirective,
+  ],
   template: /*html*/ `<bit-section>
-    <cdk-virtual-scroll-viewport scrollWindow itemSize="47">
+    <cdk-virtual-scroll-viewport bitScrollLayout itemSize="63.5">
       <bit-table [dataSource]="dataSource">
         <ng-container header>
           <tr>
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
index 5fc01d37d53..316dbf22d66 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
@@ -8,7 +8,6 @@ import { I18nMockService } from "../../../utils/i18n-mock.service";
 import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
 
 @Component({
-  standalone: true,
   selector: "bit-kitchen-sink-form",
   imports: [KitchenSinkSharedModule],
   providers: [
@@ -117,7 +116,7 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
 
       <bit-popover [title]="'Password help'" #myPopover>
         <div>A strong password has the following:</div>
-        <ul class="tw-mt-2 tw-mb-0 tw-pl-4">
+        <ul class="tw-mt-2 tw-mb-0 tw-ps-4">
           <li>Letters</li>
           <li>Numbers</li>
           <li>Special characters</li>
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts
index 70f56d2e28d..767659de3cb 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts
@@ -9,11 +9,71 @@ import { KitchenSinkTable } from "./kitchen-sink-table.component";
 import { KitchenSinkToggleList } from "./kitchen-sink-toggle-list.component";
 
 @Component({
-  standalone: true,
   imports: [KitchenSinkSharedModule],
   template: `
-    <bit-dialog title="Dialog Title" dialogSize="large">
-      <span bitDialogContent> Dialog body text goes here. </span>
+    <bit-dialog title="Dialog Title" dialogSize="small">
+      <ng-container bitDialogContent>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+        <bit-form-field>
+          <bit-label>What did foo say to bar?</bit-label>
+          <input bitInput value="Baz" />
+        </bit-form-field>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+      </ng-container>
       <ng-container bitDialogFooter>
         <button type="button" bitButton buttonType="primary" (click)="dialogRef.close()">OK</button>
         <button type="button" bitButton buttonType="secondary" bitDialogClose>Cancel</button>
@@ -26,7 +86,6 @@ class KitchenSinkDialog {
 }
 
 @Component({
-  standalone: true,
   selector: "bit-tab-main",
   imports: [KitchenSinkSharedModule, KitchenSinkTable, KitchenSinkToggleList, KitchenSinkForm],
   template: `
@@ -90,72 +149,6 @@ class KitchenSinkDialog {
         </bit-section>
       </bit-tab>
     </bit-tab-group>
-
-    <bit-drawer [(open)]="drawerOpen">
-      <bit-drawer-header title="Foo ipsum"></bit-drawer-header>
-      <bit-drawer-body>
-        <p bitTypography="body1">
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
-          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
-          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
-          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
-          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </p>
-        <bit-form-field>
-          <bit-label>What did foo say to bar?</bit-label>
-          <input bitInput value="Baz" />
-        </bit-form-field>
-        <p bitTypography="body1">
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
-          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
-          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
-          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
-          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </p>
-        <p bitTypography="body1">
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
-          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
-          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
-          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
-          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </p>
-        <p bitTypography="body1">
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
-          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
-          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
-          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
-          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </p>
-        <p bitTypography="body1">
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
-          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
-          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
-          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
-          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </p>
-        <p bitTypography="body1">
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
-          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
-          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
-          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
-          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </p>
-        <p bitTypography="body1">
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
-          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
-          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
-          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
-          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
-          est laborum.
-        </p>
-      </bit-drawer-body>
-    </bit-drawer>
   `,
 })
 export class KitchenSinkMainComponent {
@@ -168,7 +161,7 @@ export class KitchenSinkMainComponent {
   }
 
   openDrawer() {
-    this.drawerOpen.set(true);
+    this.dialogService.openDrawer(KitchenSinkDialog);
   }
 
   navItems = [
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts
index ba71483d7de..8765eae9960 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts
@@ -3,7 +3,6 @@ import { Component } from "@angular/core";
 import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
 
 @Component({
-  standalone: true,
   selector: "bit-kitchen-sink-table",
   imports: [KitchenSinkSharedModule],
   template: `
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-toggle-list.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-toggle-list.component.ts
index c71140d8166..ec8787af1bd 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-toggle-list.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-toggle-list.component.ts
@@ -3,7 +3,6 @@ import { Component } from "@angular/core";
 import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
 
 @Component({
-  standalone: true,
   selector: "bit-kitchen-sink-toggle-list",
   imports: [KitchenSinkSharedModule],
   template: `
diff --git a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
index f57a9de4e68..9e7e6f5d3ba 100644
--- a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
+++ b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
@@ -14,7 +14,7 @@ import {
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
-import { DialogService } from "../../dialog";
+import { PasswordManagerLogo } from "../../icon";
 import { LayoutComponent } from "../../layout";
 import { I18nMockService } from "../../utils/i18n-mock.service";
 import { positionFixedWrapperDecorator } from "../storybook-decorators";
@@ -39,8 +39,20 @@ export default {
         KitchenSinkTable,
         KitchenSinkToggleList,
       ],
+    }),
+    applicationConfig({
       providers: [
-        DialogService,
+        provideNoopAnimations(),
+        importProvidersFrom(
+          RouterModule.forRoot(
+            [
+              { path: "", redirectTo: "bitwarden", pathMatch: "full" },
+              { path: "bitwarden", component: KitchenSinkMainComponent },
+              { path: "virtual-scroll", component: DialogVirtualScrollBlockComponent },
+            ],
+            { useHash: true },
+          ),
+        ),
         {
           provide: I18nService,
           useFactory: () => {
@@ -58,21 +70,6 @@ export default {
         },
       ],
     }),
-    applicationConfig({
-      providers: [
-        provideNoopAnimations(),
-        importProvidersFrom(
-          RouterModule.forRoot(
-            [
-              { path: "", redirectTo: "bitwarden", pathMatch: "full" },
-              { path: "bitwarden", component: KitchenSinkMainComponent },
-              { path: "virtual-scroll", component: DialogVirtualScrollBlockComponent },
-            ],
-            { useHash: true },
-          ),
-        ),
-      ],
-    }),
   ],
 } as Meta;
 
@@ -81,30 +78,41 @@ type Story = StoryObj<LayoutComponent>;
 export const Default: Story = {
   render: (args) => {
     return {
-      props: args,
+      props: {
+        ...args,
+        logo: PasswordManagerLogo,
+      },
       template: /* HTML */ `<bit-layout>
         <bit-side-nav>
+          <bit-nav-logo [openIcon]="logo" route="." [label]="Logo"></bit-nav-logo>
           <bit-nav-group text="Password Managers" icon="bwi-collection-shared" [open]="true">
-            <bit-nav-group
-              text="Favorites"
-              icon="bwi-collection-shared"
-              variant="tree"
-              [open]="true"
-            >
-              <bit-nav-item text="Bitwarden" route="bitwarden"></bit-nav-item>
-              <bit-nav-divider></bit-nav-divider>
-            </bit-nav-group>
-            <bit-nav-item text="Virtual Scroll" route="virtual-scroll"></bit-nav-item>
+            <bit-nav-item text="Child A" route="a" icon="bwi-filter"></bit-nav-item>
+            <bit-nav-item text="Child B" route="b"></bit-nav-item>
+            <bit-nav-item
+              text="Virtual Scroll"
+              route="virtual-scroll"
+              icon="bwi-filter"
+            ></bit-nav-item>
+          </bit-nav-group>
+          <bit-nav-group text="Favorites" icon="bwi-filter">
+            <bit-nav-item text="Favorites Child A" icon="bwi-filter"></bit-nav-item>
+            <bit-nav-item text="Favorites Child B"></bit-nav-item>
+            <bit-nav-item text="Favorites Child C" icon="bwi-filter"></bit-nav-item>
           </bit-nav-group>
         </bit-side-nav>
         <router-outlet></router-outlet>
       </bit-layout>`,
     };
   },
+  parameters: {
+    chromatic: {
+      viewports: [640, 1280],
+    },
+  },
 };
 
 export const MenuOpen: Story = {
-  ...Default,
+  render: Default.render,
   play: async (context) => {
     const canvas = context.canvasElement;
     const table = getByRole(canvas, "table");
@@ -118,7 +126,7 @@ export const MenuOpen: Story = {
 };
 
 export const DialogOpen: Story = {
-  ...Default,
+  render: Default.render,
   play: async (context) => {
     const canvas = context.canvasElement;
     const dialogButton = getByRole(canvas, "button", {
@@ -131,7 +139,7 @@ export const DialogOpen: Story = {
 };
 
 export const DrawerOpen: Story = {
-  ...Default,
+  render: Default.render,
   play: async (context) => {
     const canvas = context.canvasElement;
     const drawerButton = getByRole(canvas, "button", {
@@ -144,7 +152,7 @@ export const DrawerOpen: Story = {
 };
 
 export const PopoverOpen: Story = {
-  ...Default,
+  render: Default.render,
   play: async (context) => {
     const canvas = context.canvasElement;
     const passwordLabelIcon = getByLabelText(canvas, "A random password (required)", {
@@ -156,7 +164,7 @@ export const PopoverOpen: Story = {
 };
 
 export const SimpleDialogOpen: Story = {
-  ...Default,
+  render: Default.render,
   play: async (context) => {
     const canvas = context.canvasElement;
     const submitButton = getByRole(canvas, "button", {
@@ -169,7 +177,7 @@ export const SimpleDialogOpen: Story = {
 };
 
 export const EmptyTab: Story = {
-  ...Default,
+  render: Default.render,
   play: async (context) => {
     const canvas = context.canvasElement;
     const emptyTab = getByRole(canvas, "tab", { name: "Empty tab" });
@@ -178,7 +186,7 @@ export const EmptyTab: Story = {
 };
 
 export const VirtualScrollBlockingDialog: Story = {
-  ...Default,
+  render: Default.render,
   play: async (context) => {
     const canvas = context.canvasElement;
     const navItem = getByText(canvas, "Virtual Scroll");
diff --git a/libs/components/src/stories/virtual-scrolling.mdx b/libs/components/src/stories/virtual-scrolling.mdx
new file mode 100644
index 00000000000..ab51d9865db
--- /dev/null
+++ b/libs/components/src/stories/virtual-scrolling.mdx
@@ -0,0 +1,98 @@
+import { Meta } from "@storybook/addon-docs";
+
+<Meta title="Documentation/Virtual Scrolling" />
+
+# Virtual Scrolling
+
+Virtual scrolling is a technique that improves the rendering performance of very large lists by only
+rendering whatever is currently visible within the viewport. We build on top of
+[Angular CDK's `ScrollingModule`](https://material.angular.dev/cdk/scrolling/overview).
+
+## Scrolling the entire layout
+
+Often, a design calls for the scroll container to envelop the entire page. To support this,
+AngularCDK provides a `scrollWindow` directive that sets the window to be virtual scroll viewport.
+We export a similar directive, `bitScrollLayout`, that integrates with `bit-layout` and `popup-page`
+and should be used instead of `scrollWindow`.
+
+```html
+<!-- Descendant of bit-layout or popup-page -->
+<cdk-virtual-scroll-viewport bitScrollLayout>
+  <!-- virtual scroll implementation here -->
+</cdk-virtual-scroll-viewport>
+```
+
+### Known footgun
+
+Due to the initialization order of Angular components and their templates, `bitScrollLayout` will
+error if it is used _in the same template_ as the layout component:
+
+With `bit-layout`:
+
+```html
+<!-- Will cause `bitScrollLayout` to error -->
+<bit-layout>
+  <cdk-virtual-scroll-viewport bitScrollLayout>
+    <!-- virtual scroll implementation here -->
+  </cdk-virtual-scroll-viewport>
+</bit-layout>
+```
+
+With `popup-page`:
+
+```html
+<!-- Will cause `bitScrollLayout` to error -->
+<popup-page>
+  <cdk-virtual-scroll-viewport bitScrollLayout>
+    <!-- virtual scroll implementation here -->
+  </cdk-virtual-scroll-viewport>
+</popup-page>
+```
+
+In this particular composition, the child content gets constructed before the template of
+`bit-layout` (or `popup-page`) and thus has no scroll container to reference. Workarounds include:
+
+1. Wrap the child in another component. (This tends to happen by default when the layout is
+   integrated with a `router-outlet`.)
+
+With `bit-layout`:
+
+```html
+<bit-layout>
+  <component-that-contains-bitScrollLayout></component-that-contains-bitScrollLayout>
+</bit-layout>
+```
+
+With `popup-page`:
+
+```html
+<popup-page>
+  <component-that-contains-bitScrollLayout></component-that-contains-bitScrollLayout>
+</popup-page>
+```
+
+2. Use a `defer` block.
+
+With `bit-layout`:
+
+```html
+<bit-layout>
+  @defer (on immediate) {
+    <cdk-virtual-scroll-viewport bitScrollLayout>
+      <!-- virtual scroll implementation here -->
+    </div>
+  }
+</bit-layout>
+```
+
+With `popup-page`:
+
+```html
+<popup-page>
+  @defer (on immediate) {
+    <cdk-virtual-scroll-viewport bitScrollLayout>
+      <!-- virtual scroll implementation here -->
+    </div>
+  }
+</popup-page>
+```
diff --git a/libs/components/src/table/cell.directive.ts b/libs/components/src/table/cell.directive.ts
index 8928fe7c095..61c75571063 100644
--- a/libs/components/src/table/cell.directive.ts
+++ b/libs/components/src/table/cell.directive.ts
@@ -2,7 +2,6 @@ import { Directive, HostBinding } from "@angular/core";
 
 @Directive({
   selector: "th[bitCell], td[bitCell]",
-  standalone: true,
 })
 export class CellDirective {
   @HostBinding("class") get classList() {
diff --git a/libs/components/src/table/row.directive.ts b/libs/components/src/table/row.directive.ts
index 23347224af9..2f76ded65aa 100644
--- a/libs/components/src/table/row.directive.ts
+++ b/libs/components/src/table/row.directive.ts
@@ -2,7 +2,6 @@ import { Directive, HostBinding, Input } from "@angular/core";
 
 @Directive({
   selector: "tr[bitRow]",
-  standalone: true,
 })
 export class RowDirective {
   @Input() alignContent: "top" | "middle" | "bottom" | "baseline" = "middle";
@@ -26,7 +25,7 @@ export class RowDirective {
       "tw-border-b",
       "tw-border-secondary-300",
       "tw-border-solid",
-      "hover:tw-bg-background-alt",
+      "hover:tw-bg-hover-default",
       "last:tw-border-0",
       this.alignmentClass,
     ];
diff --git a/libs/components/src/table/sortable.component.ts b/libs/components/src/table/sortable.component.ts
index bdfb87ac52f..d36b60dc014 100644
--- a/libs/components/src/table/sortable.component.ts
+++ b/libs/components/src/table/sortable.component.ts
@@ -17,10 +17,9 @@ import { TableComponent } from "./table.component";
       (click)="setActive()"
     >
       <ng-content></ng-content>
-      <i class="bwi tw-ml-2" [ngClass]="icon"></i>
+      <i class="bwi tw-ms-2" [ngClass]="icon"></i>
     </button>
   `,
-  standalone: true,
   imports: [NgClass],
 })
 export class SortableComponent implements OnInit {
diff --git a/libs/components/src/table/table-scroll.component.html b/libs/components/src/table/table-scroll.component.html
index 8f2c88ba3ad..523912cd7ac 100644
--- a/libs/components/src/table/table-scroll.component.html
+++ b/libs/components/src/table/table-scroll.component.html
@@ -1,5 +1,5 @@
 <cdk-virtual-scroll-viewport
-  scrollWindow
+  bitScrollLayout
   [itemSize]="rowSize"
   [ngStyle]="{ paddingBottom: headerHeight + 'px' }"
 >
diff --git a/libs/components/src/table/table-scroll.component.ts b/libs/components/src/table/table-scroll.component.ts
index e01bf168cb1..193d790e416 100644
--- a/libs/components/src/table/table-scroll.component.ts
+++ b/libs/components/src/table/table-scroll.component.ts
@@ -4,7 +4,6 @@ import {
   CdkVirtualScrollViewport,
   CdkFixedSizeVirtualScroll,
   CdkVirtualForOf,
-  CdkVirtualScrollableWindow,
 } from "@angular/cdk/scrolling";
 import { CommonModule } from "@angular/common";
 import {
@@ -21,6 +20,8 @@ import {
   TrackByFunction,
 } from "@angular/core";
 
+import { ScrollLayoutDirective } from "../layout";
+
 import { RowDirective } from "./row.directive";
 import { TableComponent } from "./table.component";
 
@@ -35,7 +36,6 @@ import { TableComponent } from "./table.component";
  */
 @Directive({
   selector: "[bitRowDef]",
-  standalone: true,
 })
 export class BitRowDef {
   constructor(public template: TemplateRef<any>) {}
@@ -50,14 +50,13 @@ export class BitRowDef {
   selector: "bit-table-scroll",
   templateUrl: "./table-scroll.component.html",
   providers: [{ provide: TableComponent, useExisting: TableScrollComponent }],
-  standalone: true,
   imports: [
     CommonModule,
     CdkVirtualScrollViewport,
-    CdkVirtualScrollableWindow,
     CdkFixedSizeVirtualScroll,
     CdkVirtualForOf,
     RowDirective,
+    ScrollLayoutDirective,
   ],
 })
 export class TableScrollComponent
diff --git a/libs/components/src/table/table.component.ts b/libs/components/src/table/table.component.ts
index cd0a2a6c65e..8029e8461f9 100644
--- a/libs/components/src/table/table.component.ts
+++ b/libs/components/src/table/table.component.ts
@@ -17,7 +17,6 @@ import { TableDataSource } from "./table-data-source";
 
 @Directive({
   selector: "ng-template[body]",
-  standalone: true,
 })
 export class TableBodyDirective {
   // eslint-disable-next-line @typescript-eslint/explicit-member-accessibility
@@ -27,7 +26,6 @@ export class TableBodyDirective {
 @Component({
   selector: "bit-table",
   templateUrl: "./table.component.html",
-  standalone: true,
   imports: [CommonModule],
 })
 export class TableComponent implements OnDestroy, AfterContentChecked {
diff --git a/libs/components/src/table/table.mdx b/libs/components/src/table/table.mdx
index 8d784190ed9..59bf5b773a3 100644
--- a/libs/components/src/table/table.mdx
+++ b/libs/components/src/table/table.mdx
@@ -142,7 +142,7 @@ dataSource.filter = (data) => data.orgType === "family";
 
 Rudimentary string filtering is supported out of the box with `TableDataSource.simpleStringFilter`.
 It works by converting each entry into a string of it's properties. The provided string is then
-compared against the filter value using a simple `indexOf` check. For convienence, you can also just
+compared against the filter value using a simple `indexOf` check. For convenience, you can also just
 pass a string directly.
 
 ```ts
@@ -153,7 +153,7 @@ dataSource.filter = "search value";
 
 ### Virtual Scrolling
 
-It's heavily adviced to use virtual scrolling if you expect the table to have any significant amount
+It's heavily advised to use virtual scrolling if you expect the table to have any significant amount
 of data. This is done by using the `bit-table-scroll` component instead of the `bit-table`
 component. This component behaves slightly different from the `bit-table` component. Instead of
 using the `*ngFor` directive to render the rows, you provide a `bitRowDef` template that will be
@@ -178,6 +178,14 @@ height and align vertically.
 </bit-table-scroll>
 ```
 
+#### Deprecated approach
+
+Before `bit-table-scroll` was introduced, virtual scroll in tables was implemented manually via
+constructs from Angular CDK. This included wrapping the table with a `cdk-virtual-scroll-viewport`
+and targeting with `bit-layout`'s scroll container with the `bitScrollLayout` directive.
+
+This pattern is deprecated in favor of `bit-table-scroll`.
+
 ## Accessibility
 
 - Always include a row or column header with your table; this allows assistive technology to better
diff --git a/libs/components/src/table/table.stories.ts b/libs/components/src/table/table.stories.ts
index e8ab24ee8b7..d696e6077dd 100644
--- a/libs/components/src/table/table.stories.ts
+++ b/libs/components/src/table/table.stories.ts
@@ -1,6 +1,13 @@
+import { RouterTestingModule } from "@angular/router/testing";
 import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
 
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
 import { countries } from "../form/countries";
+import { LayoutComponent } from "../layout";
+import { mockLayoutI18n } from "../layout/mocks";
+import { positionFixedWrapperDecorator } from "../stories/storybook-decorators";
+import { I18nMockService } from "../utils";
 
 import { TableDataSource } from "./table-data-source";
 import { TableModule } from "./table.module";
@@ -8,8 +15,17 @@ import { TableModule } from "./table.module";
 export default {
   title: "Component Library/Table",
   decorators: [
+    positionFixedWrapperDecorator(),
     moduleMetadata({
-      imports: [TableModule],
+      imports: [TableModule, LayoutComponent, RouterTestingModule],
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService(mockLayoutI18n);
+          },
+        },
+      ],
     }),
   ],
   argTypes: {
@@ -116,18 +132,20 @@ export const Scrollable: Story = {
       trackBy: (index: number, item: any) => item.id,
     },
     template: `
-      <bit-table-scroll [dataSource]="dataSource" [rowSize]="43">
-        <ng-container header>
-          <th bitCell bitSortable="id" default>Id</th>
-          <th bitCell bitSortable="name">Name</th>
-          <th bitCell bitSortable="other" [fn]="sortFn">Other</th>
-        </ng-container>
-        <ng-template bitRowDef let-row>
-          <td bitCell>{{ row.id }}</td>
-          <td bitCell>{{ row.name }}</td>
-          <td bitCell>{{ row.other }}</td>
-        </ng-template>
-      </bit-table-scroll>
+      <bit-layout>
+        <bit-table-scroll [dataSource]="dataSource" [rowSize]="43">
+          <ng-container header>
+            <th bitCell bitSortable="id" default>Id</th>
+            <th bitCell bitSortable="name">Name</th>
+            <th bitCell bitSortable="other" [fn]="sortFn">Other</th>
+          </ng-container>
+          <ng-template bitRowDef let-row>
+            <td bitCell>{{ row.id }}</td>
+            <td bitCell>{{ row.name }}</td>
+            <td bitCell>{{ row.other }}</td>
+          </ng-template>
+        </bit-table-scroll>
+      </bit-layout>
     `,
   }),
 };
@@ -144,17 +162,19 @@ export const Filterable: Story = {
       sortFn: (a: any, b: any) => a.id - b.id,
     },
     template: `
-      <input type="search" placeholder="Search" (input)="dataSource.filter = $event.target.value" />
-      <bit-table-scroll [dataSource]="dataSource" [rowSize]="43">
-        <ng-container header>
-          <th bitCell bitSortable="name" default>Name</th>
-          <th bitCell bitSortable="value" width="120px">Value</th>
-        </ng-container>
-        <ng-template bitRowDef let-row>
-          <td bitCell>{{ row.name }}</td>
-          <td bitCell>{{ row.value }}</td>
-        </ng-template>
-      </bit-table-scroll>
+      <bit-layout>
+        <input type="search" placeholder="Search" (input)="dataSource.filter = $event.target.value" />
+        <bit-table-scroll [dataSource]="dataSource" [rowSize]="43">
+          <ng-container header>
+            <th bitCell bitSortable="name" default>Name</th>
+            <th bitCell bitSortable="value" width="120px">Value</th>
+          </ng-container>
+          <ng-template bitRowDef let-row>
+            <td bitCell>{{ row.name }}</td>
+            <td bitCell>{{ row.value }}</td>
+          </ng-template>
+        </bit-table-scroll>
+      </bit-layout>
     `,
   }),
 };
diff --git a/libs/components/src/tabs/shared/tab-header.component.ts b/libs/components/src/tabs/shared/tab-header.component.ts
index c45bafb3d52..24dcd203c6b 100644
--- a/libs/components/src/tabs/shared/tab-header.component.ts
+++ b/libs/components/src/tabs/shared/tab-header.component.ts
@@ -7,9 +7,8 @@ import { Component } from "@angular/core";
   selector: "bit-tab-header",
   host: {
     class:
-      "tw-h-16 tw-pl-4 tw-bg-background-alt tw-flex tw-items-end tw-border-0 tw-border-b tw-border-solid tw-border-secondary-300",
+      "tw-h-16 tw-ps-4 tw-bg-background-alt tw-flex tw-items-end tw-border-0 tw-border-b tw-border-solid tw-border-secondary-300",
   },
   template: `<ng-content></ng-content>`,
-  standalone: true,
 })
 export class TabHeaderComponent {}
diff --git a/libs/components/src/tabs/shared/tab-list-container.directive.ts b/libs/components/src/tabs/shared/tab-list-container.directive.ts
index cedae44e582..1cf8a762d58 100644
--- a/libs/components/src/tabs/shared/tab-list-container.directive.ts
+++ b/libs/components/src/tabs/shared/tab-list-container.directive.ts
@@ -8,6 +8,5 @@ import { Directive } from "@angular/core";
   host: {
     class: "tw-inline-flex tw-flex-wrap tw-leading-5",
   },
-  standalone: true,
 })
 export class TabListContainerDirective {}
diff --git a/libs/components/src/tabs/shared/tab-list-item.directive.ts b/libs/components/src/tabs/shared/tab-list-item.directive.ts
index 2a71a385a83..931ad51c1c8 100644
--- a/libs/components/src/tabs/shared/tab-list-item.directive.ts
+++ b/libs/components/src/tabs/shared/tab-list-item.directive.ts
@@ -9,7 +9,6 @@ import { Directive, ElementRef, HostBinding, Input } from "@angular/core";
  */
 @Directive({
   selector: "[bitTabListItem]",
-  standalone: true,
 })
 export class TabListItemDirective implements FocusableOption {
   @Input() active: boolean;
diff --git a/libs/components/src/tabs/tab-group/tab-body.component.ts b/libs/components/src/tabs/tab-group/tab-body.component.ts
index 45a6a05e7c2..3c14d333258 100644
--- a/libs/components/src/tabs/tab-group/tab-body.component.ts
+++ b/libs/components/src/tabs/tab-group/tab-body.component.ts
@@ -6,7 +6,6 @@ import { Component, HostBinding, Input } from "@angular/core";
 @Component({
   selector: "bit-tab-body",
   templateUrl: "tab-body.component.html",
-  standalone: true,
   imports: [CdkPortalOutlet],
 })
 export class TabBodyComponent {
diff --git a/libs/components/src/tabs/tab-group/tab-group.component.ts b/libs/components/src/tabs/tab-group/tab-group.component.ts
index b525b9b6723..ae7fa12143e 100644
--- a/libs/components/src/tabs/tab-group/tab-group.component.ts
+++ b/libs/components/src/tabs/tab-group/tab-group.component.ts
@@ -31,7 +31,6 @@ let nextId = 0;
 @Component({
   selector: "bit-tab-group",
   templateUrl: "./tab-group.component.html",
-  standalone: true,
   imports: [
     NgTemplateOutlet,
     TabHeaderComponent,
diff --git a/libs/components/src/tabs/tab-group/tab-label.directive.ts b/libs/components/src/tabs/tab-group/tab-label.directive.ts
index 9a0e59845a1..45da163631b 100644
--- a/libs/components/src/tabs/tab-group/tab-label.directive.ts
+++ b/libs/components/src/tabs/tab-group/tab-label.directive.ts
@@ -16,7 +16,6 @@ import { Directive, TemplateRef } from "@angular/core";
  */
 @Directive({
   selector: "[bitTabLabel]",
-  standalone: true,
 })
 export class TabLabelDirective {
   constructor(public templateRef: TemplateRef<unknown>) {}
diff --git a/libs/components/src/tabs/tab-group/tab.component.ts b/libs/components/src/tabs/tab-group/tab.component.ts
index b2c9b1999bc..260cb0c8193 100644
--- a/libs/components/src/tabs/tab-group/tab.component.ts
+++ b/libs/components/src/tabs/tab-group/tab.component.ts
@@ -19,7 +19,6 @@ import { TabLabelDirective } from "./tab-label.directive";
   host: {
     role: "tabpanel",
   },
-  standalone: true,
 })
 export class TabComponent implements OnInit {
   @Input() disabled = false;
diff --git a/libs/components/src/tabs/tab-nav-bar/tab-link.component.html b/libs/components/src/tabs/tab-nav-bar/tab-link.component.html
index 0b5a653d966..f1265c3de5d 100644
--- a/libs/components/src/tabs/tab-nav-bar/tab-link.component.html
+++ b/libs/components/src/tabs/tab-nav-bar/tab-link.component.html
@@ -14,7 +14,7 @@
   <div class="group-hover/tab:tw-underline">
     <ng-content></ng-content>
   </div>
-  <div class="tw-font-normal tw-ml-2 empty:tw-ml-0">
+  <div class="tw-font-normal tw-ms-2 empty:tw-ms-0">
     <ng-content select="[slot=end]"></ng-content>
   </div>
 </a>
diff --git a/libs/components/src/tabs/tab-nav-bar/tab-link.component.ts b/libs/components/src/tabs/tab-nav-bar/tab-link.component.ts
index 0dac6681475..3ba0d651f76 100644
--- a/libs/components/src/tabs/tab-nav-bar/tab-link.component.ts
+++ b/libs/components/src/tabs/tab-nav-bar/tab-link.component.ts
@@ -12,7 +12,6 @@ import { TabNavBarComponent } from "./tab-nav-bar.component";
 @Component({
   selector: "bit-tab-link",
   templateUrl: "tab-link.component.html",
-  standalone: true,
   imports: [TabListItemDirective, RouterModule],
 })
 export class TabLinkComponent implements FocusableOption, AfterViewInit, OnDestroy {
diff --git a/libs/components/src/tabs/tab-nav-bar/tab-nav-bar.component.ts b/libs/components/src/tabs/tab-nav-bar/tab-nav-bar.component.ts
index 305196a0c69..1f3292054e7 100644
--- a/libs/components/src/tabs/tab-nav-bar/tab-nav-bar.component.ts
+++ b/libs/components/src/tabs/tab-nav-bar/tab-nav-bar.component.ts
@@ -21,7 +21,6 @@ import { TabLinkComponent } from "./tab-link.component";
   host: {
     class: "tw-block",
   },
-  standalone: true,
   imports: [TabHeaderComponent, TabListContainerDirective],
 })
 export class TabNavBarComponent implements AfterContentInit {
diff --git a/libs/components/src/tabs/tabs.stories.ts b/libs/components/src/tabs/tabs.stories.ts
index 250a7443065..5879dd2a14e 100644
--- a/libs/components/src/tabs/tabs.stories.ts
+++ b/libs/components/src/tabs/tabs.stories.ts
@@ -90,7 +90,7 @@ export const ContentTabs: Story = {
         <bit-tab label="Second Tab">Second Tab Content</bit-tab>
         <bit-tab>
           <ng-template bitTabLabel>
-            <i class="bwi bwi-search tw-pr-1"></i> Template Label
+            <i class="bwi bwi-search tw-pe-1"></i> Template Label
           </ng-template>
           Template Label Content
         </bit-tab>
@@ -112,7 +112,7 @@ export const NavigationTabs: Story = {
         <bit-tab-link [route]="['item-3']">Item 3</bit-tab-link>
         <bit-tab-link [route]="['item-with-child-counter']">
           Item With Counter
-          <div slot="end" class="tw-pl-2 tw-text-muted">
+          <div slot="end" class="tw-ps-2 tw-text-muted">
             42
           </div>
         </bit-tab-link>
diff --git a/libs/components/src/toast/toast-container.component.ts b/libs/components/src/toast/toast-container.component.ts
index 1cd33f67ac7..d2995e25626 100644
--- a/libs/components/src/toast/toast-container.component.ts
+++ b/libs/components/src/toast/toast-container.component.ts
@@ -4,7 +4,6 @@ import { ToastContainerDirective, ToastrService } from "ngx-toastr";
 @Component({
   selector: "bit-toast-container",
   templateUrl: "toast-container.component.html",
-  standalone: true,
   imports: [ToastContainerDirective],
 })
 export class ToastContainerComponent implements OnInit {
diff --git a/libs/components/src/toast/toast.component.html b/libs/components/src/toast/toast.component.html
index bdbc9674184..8ebf6778286 100644
--- a/libs/components/src/toast/toast.component.html
+++ b/libs/components/src/toast/toast.component.html
@@ -19,7 +19,7 @@
     </div>
     <!-- Overriding hover and focus-visible colors for a11y against colored background -->
     <button
-      class="tw-ml-auto hover:tw-border-text-main focus-visible:before:tw-ring-text-main"
+      class="tw-ms-auto hover:tw-border-text-main focus-visible:before:tw-ring-text-main"
       bitIconButton="bwi-close"
       buttonType="main"
       type="button"
diff --git a/libs/components/src/toast/toast.component.ts b/libs/components/src/toast/toast.component.ts
index bbf0291f180..954f09eb0fb 100644
--- a/libs/components/src/toast/toast.component.ts
+++ b/libs/components/src/toast/toast.component.ts
@@ -28,7 +28,6 @@ const variants: Record<ToastVariant, { icon: string; bgColor: string }> = {
 @Component({
   selector: "bit-toast",
   templateUrl: "toast.component.html",
-  standalone: true,
   imports: [SharedModule, IconButtonModule, TypographyModule],
 })
 export class ToastComponent {
diff --git a/libs/components/src/toast/toast.mdx b/libs/components/src/toast/toast.mdx
index d27109b4772..6d9d80c6ae5 100644
--- a/libs/components/src/toast/toast.mdx
+++ b/libs/components/src/toast/toast.mdx
@@ -1,4 +1,4 @@
-import { Meta, Canvas, Source, Primary, Controls } from "@storybook/addon-docs";
+import { Meta, Canvas, Source, Primary, Controls, Title, Description } from "@storybook/addon-docs";
 
 import * as stories from "./toast.stories";
 
@@ -8,12 +8,16 @@ import * as stories from "./toast.stories";
 import { ToastService } from "@bitwarden/components";
 ```
 
-# Toast
+<Title />
 
-Toasts are ephemeral notifications. They most often communicate the result of a user action. Due to
-their ephemeral nature, long messages and critical alerts should not utilize toasts.
+<Primary />
+<Controls />
 
-<Canvas of={stories.Default} />
+### Variants
+
+<Canvas of={stories.Variants} />
+
+### Long content
 
 <Canvas of={stories.LongContent} />
 
@@ -38,7 +42,7 @@ The following options are accepted:
 
 <Canvas of={stories.Service} />
 
-## Toast container
+### Toast container
 
 `bit-toast-container` should be added to the app root of consuming clients to ensure toasts are
 properly announced to screenreaders.
@@ -48,7 +52,7 @@ properly announced to screenreaders.
 <bit-toast-container></bit-toast-container>
 ```
 
-## Accessibility
+### Accessibility
 
 In addition to the accessibility provided by the `bit-toast-container` component, the toast itself
 will apply `aria-alert="true"` if the toast is of type `error`.
diff --git a/libs/components/src/toast/toast.stories.ts b/libs/components/src/toast/toast.stories.ts
index 0af4974eead..b4a80cd3276 100644
--- a/libs/components/src/toast/toast.stories.ts
+++ b/libs/components/src/toast/toast.stories.ts
@@ -6,6 +6,7 @@ import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/an
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
+import { formatArgsForCodeSnippet } from "../../../../.storybook/format-args-for-code-snippet";
 import { ButtonModule } from "../button";
 import { I18nMockService } from "../utils/i18n-mock.service";
 
@@ -75,11 +76,22 @@ export const Default: Story = {
   render: (args) => ({
     props: args,
     template: `
-      <div class="tw-flex tw-flex-col tw-min-w tw-max-w-[--bit-toast-width]">
-        <bit-toast [title]="title" [message]="message" [progressWidth]="progressWidth" (onClose)="onClose()" variant="success"></bit-toast>
-        <bit-toast [title]="title" [message]="message" [progressWidth]="progressWidth" (onClose)="onClose()" variant="info"></bit-toast>
-        <bit-toast [title]="title" [message]="message" [progressWidth]="progressWidth" (onClose)="onClose()" variant="warning"></bit-toast>
-        <bit-toast [title]="title" [message]="message" [progressWidth]="progressWidth" (onClose)="onClose()" variant="error"></bit-toast>
+      <div class="tw-min-w tw-max-w-[--bit-toast-width]">
+        <bit-toast ${formatArgsForCodeSnippet<ToastComponent>(args)}></bit-toast>
+      </div>
+    `,
+  }),
+};
+
+export const Variants: Story = {
+  render: (args) => ({
+    props: args,
+    template: `
+      <div class="tw-flex tw-flex-col tw-min-w tw-max-w-[--bit-toast-width] tw-gap-2">
+        <bit-toast ${formatArgsForCodeSnippet<ToastComponent>(args)} variant="success"></bit-toast>
+        <bit-toast ${formatArgsForCodeSnippet<ToastComponent>(args)} variant="info"></bit-toast>
+        <bit-toast ${formatArgsForCodeSnippet<ToastComponent>(args)} variant="warning"></bit-toast>
+        <bit-toast ${formatArgsForCodeSnippet<ToastComponent>(args)} variant="error"></bit-toast>
       </div>
     `,
   }),
@@ -93,8 +105,8 @@ export const LongContent: Story = {
   args: {
     title: "Foo",
     message: [
-      "Lorem ipsum dolor sit amet, consectetur adipisci",
-      "Lorem ipsum dolor sit amet, consectetur adipisci",
+      "Maecenas commodo posuere quam, vel malesuada nulla accumsan ac.",
+      "Pellentesque interdum ligula ante, eget bibendum ante lacinia congue.",
     ],
   },
 };
diff --git a/libs/components/src/toast/toastr.component.ts b/libs/components/src/toast/toastr.component.ts
index 75124ceb4b3..3b7665f1d64 100644
--- a/libs/components/src/toast/toastr.component.ts
+++ b/libs/components/src/toast/toastr.component.ts
@@ -4,6 +4,9 @@ import { Toast as BaseToastrComponent, ToastPackage, ToastrService } from "ngx-t
 
 import { ToastComponent } from "./toast.component";
 
+/**
+ * Toasts are ephemeral notifications. They most often communicate the result of a user action. Due to their ephemeral nature, long messages and critical alerts should not utilize toasts.
+ */
 @Component({
   template: `
     <bit-toast
@@ -23,7 +26,6 @@ import { ToastComponent } from "./toast.component";
       transition("active => removed", animate("{{ easeTime }}ms {{ easing }}")),
     ]),
   ],
-  standalone: true,
   imports: [ToastComponent],
 })
 export class BitwardenToastrComponent extends BaseToastrComponent {
diff --git a/libs/components/src/toggle-group/toggle-group.component.spec.ts b/libs/components/src/toggle-group/toggle-group.component.spec.ts
index e418a7b410c..b00161d9064 100644
--- a/libs/components/src/toggle-group/toggle-group.component.spec.ts
+++ b/libs/components/src/toggle-group/toggle-group.component.spec.ts
@@ -1,7 +1,5 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component } from "@angular/core";
-import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 
 import { ToggleGroupModule } from "./toggle-group.module";
@@ -10,18 +8,15 @@ import { ToggleComponent } from "./toggle.component";
 describe("Button", () => {
   let fixture: ComponentFixture<TestApp>;
   let testAppComponent: TestApp;
-  let buttonElements: ToggleComponent[];
+  let buttonElements: ToggleComponent<unknown>[];
   let radioButtons: HTMLInputElement[];
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async () => {
     TestBed.configureTestingModule({
-      imports: [ToggleGroupModule],
-      declarations: [TestApp],
+      imports: [TestApp],
     });
 
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    TestBed.compileComponents();
+    await TestBed.compileComponents();
     fixture = TestBed.createComponent(TestApp);
     testAppComponent = fixture.debugElement.componentInstance;
     buttonElements = fixture.debugElement
@@ -32,7 +27,7 @@ describe("Button", () => {
       .map((e) => e.nativeElement);
 
     fixture.detectChanges();
-  }));
+  });
 
   it("should select second element when setting selected to second", () => {
     testAppComponent.selected = "second";
@@ -67,6 +62,7 @@ describe("Button", () => {
       <bit-toggle value="third">Third</bit-toggle>
     </bit-toggle-group>
   `,
+  imports: [ToggleGroupModule],
 })
 class TestApp {
   selected?: string;
diff --git a/libs/components/src/toggle-group/toggle-group.component.ts b/libs/components/src/toggle-group/toggle-group.component.ts
index 057a594654a..0b4cb059216 100644
--- a/libs/components/src/toggle-group/toggle-group.component.ts
+++ b/libs/components/src/toggle-group/toggle-group.component.ts
@@ -12,7 +12,6 @@ let nextId = 0;
 @Component({
   selector: "bit-toggle-group",
   templateUrl: "./toggle-group.component.html",
-  standalone: true,
 })
 export class ToggleGroupComponent<TValue = unknown> {
   private id = nextId++;
diff --git a/libs/components/src/toggle-group/toggle.component.spec.ts b/libs/components/src/toggle-group/toggle.component.spec.ts
index fe91f94071d..c26ea3ed6a4 100644
--- a/libs/components/src/toggle-group/toggle.component.spec.ts
+++ b/libs/components/src/toggle-group/toggle.component.spec.ts
@@ -1,7 +1,5 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Component } from "@angular/core";
-import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 
 import { ToggleGroupComponent } from "./toggle-group.component";
@@ -13,22 +11,19 @@ describe("Button", () => {
   let testAppComponent: TestApp;
   let radioButton: HTMLInputElement;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(async () => {
     mockGroupComponent = new MockedButtonGroupComponent();
 
     TestBed.configureTestingModule({
-      imports: [ToggleGroupModule],
-      declarations: [TestApp],
+      imports: [TestApp],
       providers: [{ provide: ToggleGroupComponent, useValue: mockGroupComponent }],
     });
 
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    TestBed.compileComponents();
+    await TestBed.compileComponents();
     fixture = TestBed.createComponent(TestApp);
     testAppComponent = fixture.debugElement.componentInstance;
     radioButton = fixture.debugElement.query(By.css("input[type=radio]")).nativeElement;
-  }));
+  });
 
   it("should emit value when clicking on radio button", () => {
     testAppComponent.value = "value";
@@ -63,12 +58,13 @@ describe("Button", () => {
 
 class MockedButtonGroupComponent implements Partial<ToggleGroupComponent> {
   onInputInteraction = jest.fn();
-  selected = null;
+  selected: unknown = null;
 }
 
 @Component({
   selector: "test-app",
   template: ` <bit-toggle [value]="value">Element</bit-toggle>`,
+  imports: [ToggleGroupModule],
 })
 class TestApp {
   value?: string;
diff --git a/libs/components/src/toggle-group/toggle.component.ts b/libs/components/src/toggle-group/toggle.component.ts
index bb48b7e103e..ec0d060f7fa 100644
--- a/libs/components/src/toggle-group/toggle.component.ts
+++ b/libs/components/src/toggle-group/toggle.component.ts
@@ -19,7 +19,6 @@ let nextId = 0;
 @Component({
   selector: "bit-toggle",
   templateUrl: "./toggle.component.html",
-  standalone: true,
   imports: [NgClass],
 })
 export class ToggleComponent<TValue> implements AfterContentChecked, AfterViewInit {
@@ -69,11 +68,11 @@ export class ToggleComponent<TValue> implements AfterContentChecked, AfterViewIn
       "tw-border-r",
       "tw-border-l-0",
       "tw-cursor-pointer",
-      "hover:tw-bg-primary-100",
+      "hover:tw-bg-hover-default",
 
       "group-first-of-type/toggle:tw-border-l",
-      "group-first-of-type/toggle:tw-rounded-l-full",
-      "group-last-of-type/toggle:tw-rounded-r-full",
+      "group-first-of-type/toggle:tw-rounded-s-full",
+      "group-last-of-type/toggle:tw-rounded-e-full",
 
       "peer-focus-visible/toggle-input:tw-outline-none",
       "peer-focus-visible/toggle-input:tw-ring",
diff --git a/libs/components/src/tw-theme.css b/libs/components/src/tw-theme.css
index 24f0b7adaad..eb5bb469202 100644
--- a/libs/components/src/tw-theme.css
+++ b/libs/components/src/tw-theme.css
@@ -13,7 +13,7 @@
   --color-background: 255 255 255;
   --color-background-alt: 243 246 249;
   --color-background-alt2: 23 92 219;
-  --color-background-alt3: 26 65 172;
+  --color-background-alt3: 22 55 146;
   --color-background-alt4: 2 15 102;
 
   --color-primary-100: 219 229 246;
@@ -29,23 +29,24 @@
 
   --color-info-100: 219 229 246;
   --color-info-600: 121 161 233;
-  --color-info-700: 26 65 172;
+  --color-info-700: 13 36 123;
 
-  --color-warning-100: 255 248 228;
+  --color-warning-100: 255 244 212;
   --color-warning-600: 255 191 0;
-  --color-warning-700: 172 88 0;
+  --color-warning-700: 142 64 0;
 
   --color-danger-100: 255 236 239;
   --color-danger-600: 203 38 58;
   --color-danger-700: 149 27 42;
 
-  --color-success-100: 191 236 195;
+  --color-success-100: 213 243 216;
   --color-success-600: 12 128 24;
-  --color-success-700: 11 111 21;
+  --color-success-700: 8 81 15;
 
   --color-notification-100: 255 225 247;
   --color-notification-600: 192 17 118;
 
+  /*art styles deprecated, use 'illustration' instead*/
   --color-art-primary: 2 15 102;
   --color-art-accent: 44 221 223;
 
@@ -55,9 +56,21 @@
   --color-text-alt2: 255 255 255;
   --color-text-code: 192 17 118;
 
+  --color-hover-default: rgb(26 65 172 / 0.1);
+  --color-hover-contrast: rgb(219 229 246 / 0.15);
+
   --color-marketing-logo: 23 93 220;
 
   --tw-ring-offset-color: #ffffff;
+
+  --tw-sm-breakpoint: 640px;
+
+  --color-illustration-outline: 2 15 102;
+  --color-illustration-bg-primary: 219 229 246;
+  --color-illustration-bg-secondary: 170 195 239;
+  --color-illustration-bg-tertiary: 255 255 255;
+  --color-illustration-tertiary: 255 191 0;
+  --color-illustration-logo: 23 93 220;
 }
 
 .theme_light {
@@ -85,25 +98,26 @@
   --color-secondary-600: 143 152 166;
   --color-secondary-700: 158 167 181;
 
-  --color-success-100: 11 111 21;
+  --color-success-100: 8 81 15;
   --color-success-600: 107 241 120;
-  --color-success-700: 191 236 195;
+  --color-success-700: 213 243 216;
 
   --color-danger-100: 149 27 42;
   --color-danger-600: 255 78 99;
   --color-danger-700: 255 236 239;
 
-  --color-warning-100: 172 88 0;
+  --color-warning-100: 142 64 0;
   --color-warning-600: 255 191 0;
-  --color-warning-700: 255 248 228;
+  --color-warning-700: 255 244 212;
 
-  --color-info-100: 26 65 172;
+  --color-info-100: 13 36 123;
   --color-info-600: 121 161 233;
   --color-info-700: 219 229 246;
 
   --color-notification-100: 117 37 83;
   --color-notification-600: 255 143 208;
 
+  /*art styles deprecated, use 'illustration' instead*/
   --color-art-primary: 243 246 249;
   --color-art-accent: 44 221 233;
 
@@ -113,9 +127,19 @@
   --color-text-alt2: 255 255 255;
   --color-text-code: 255 143 208;
 
+  --color-hover-default: rgb(170 195 239 / 0.1);
+  --color-hover-contrast: rgb(26 39 78 / 0.15);
+
   --color-marketing-logo: 255 255 255;
 
   --tw-ring-offset-color: #1f242e;
+
+  --color-illustration-outline: 23 93 220;
+  --color-illustration-bg-primary: 170 195 239;
+  --color-illustration-bg-secondary: 121 161 233;
+  --color-illustration-bg-tertiary: 243 246 249;
+  --color-illustration-tertiary: 255 191 0;
+  --color-illustration-logo: 255 255 255;
 }
 
 /**
diff --git a/libs/components/src/typography/typography.directive.ts b/libs/components/src/typography/typography.directive.ts
index 36d6b996dbe..e48ef67001f 100644
--- a/libs/components/src/typography/typography.directive.ts
+++ b/libs/components/src/typography/typography.directive.ts
@@ -31,7 +31,6 @@ const margins: Record<TypographyType, string[]> = {
 
 @Directive({
   selector: "[bitTypography]",
-  standalone: true,
 })
 export class TypographyDirective {
   @Input("bitTypography") bitTypography: TypographyType;
diff --git a/libs/components/src/utils/aria-disable-element.ts b/libs/components/src/utils/aria-disable-element.ts
new file mode 100644
index 00000000000..f7e02f2cdd1
--- /dev/null
+++ b/libs/components/src/utils/aria-disable-element.ts
@@ -0,0 +1,29 @@
+import { Signal, effect } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { fromEvent } from "rxjs";
+
+/**
+ * a11y helper util used to `aria-disable` elements as opposed to using the HTML `disabled` attr.
+ * - Removes HTML `disabled` attr and replaces it with `aria-disabled="true"`
+ * - Captures click events and prevents them from propagating
+ */
+export function ariaDisableElement(element: HTMLElement, isDisabled: Signal<boolean | undefined>) {
+  effect(() => {
+    if (element.hasAttribute("disabled") || isDisabled()) {
+      // Remove native disabled and set aria-disabled. Capture click event
+      element.removeAttribute("disabled");
+
+      element.setAttribute("aria-disabled", "true");
+    }
+  });
+
+  fromEvent(element, "click")
+    .pipe(takeUntilDestroyed())
+    .subscribe((event: Event) => {
+      if (isDisabled()) {
+        event.stopPropagation();
+        event.preventDefault();
+        return false;
+      }
+    });
+}
diff --git a/libs/components/src/utils/has-scrolled-from.ts b/libs/components/src/utils/has-scrolled-from.ts
new file mode 100644
index 00000000000..44c73465bdd
--- /dev/null
+++ b/libs/components/src/utils/has-scrolled-from.ts
@@ -0,0 +1,41 @@
+import { CdkScrollable } from "@angular/cdk/scrolling";
+import { Signal, inject, signal } from "@angular/core";
+import { toObservable, toSignal } from "@angular/core/rxjs-interop";
+import { map, startWith, switchMap } from "rxjs";
+
+export type ScrollState = {
+  /** `true` when the scrollbar is not at the top-most position */
+  top: boolean;
+
+  /** `true` when the scrollbar is not at the bottom-most position */
+  bottom: boolean;
+};
+
+/**
+ * Check if a `CdkScrollable` instance has been scrolled
+ * @param scrollable The instance to check, defaults to the one provided by the current injector
+ * @returns {Signal<ScrollState>}
+ */
+export const hasScrolledFrom = (scrollable?: Signal<CdkScrollable>): Signal<ScrollState> => {
+  const _scrollable = scrollable ?? signal(inject(CdkScrollable));
+  const scrollable$ = toObservable(_scrollable);
+
+  const scrollState$ = scrollable$.pipe(
+    switchMap((_scrollable) =>
+      _scrollable.elementScrolled().pipe(
+        startWith(null),
+        map(() => ({
+          top: _scrollable.measureScrollOffset("top") > 0,
+          bottom: _scrollable.measureScrollOffset("bottom") > 0,
+        })),
+      ),
+    ),
+  );
+
+  return toSignal(scrollState$, {
+    initialValue: {
+      top: false,
+      bottom: false,
+    },
+  });
+};
diff --git a/libs/components/src/utils/index.ts b/libs/components/src/utils/index.ts
index afadd6b3b41..91fa71cf0e0 100644
--- a/libs/components/src/utils/index.ts
+++ b/libs/components/src/utils/index.ts
@@ -1,2 +1,3 @@
+export * from "./aria-disable-element";
 export * from "./function-to-observable";
 export * from "./i18n-mock.service";
diff --git a/libs/components/tailwind.config.base.js b/libs/components/tailwind.config.base.js
index fde59f4a089..829c812a954 100644
--- a/libs/components/tailwind.config.base.js
+++ b/libs/components/tailwind.config.base.js
@@ -63,6 +63,7 @@ module.exports = {
         100: rgba("--color-notification-100"),
         600: rgba("--color-notification-600"),
       },
+      // art styles deprecated, use 'illustration' instead
       art: {
         primary: rgba("--color-art-primary"),
         accent: rgba("--color-art-accent"),
@@ -82,7 +83,19 @@ module.exports = {
         alt3: rgba("--color-background-alt3"),
         alt4: rgba("--color-background-alt4"),
       },
+      hover: {
+        default: "var(--color-hover-default)",
+        contrast: "var(--color-hover-contrast)",
+      },
       "marketing-logo": rgba("--color-marketing-logo"),
+      illustration: {
+        outline: rgba("--color-illustration-outline"),
+        "bg-primary": rgba("--color-illustration-bg-primary"),
+        "bg-secondary": rgba("--color-illustration-bg-secondary"),
+        "bg-tertiary": rgba("--color-illustration-bg-tertiary"),
+        tertiary: rgba("--color-illustration-tertiary"),
+        logo: rgba("--color-illustration-logo"),
+      },
     },
     textColor: {
       main: rgba("--color-text-main"),
diff --git a/libs/components/tsconfig.json b/libs/components/tsconfig.json
index eceaf0f3816..3706663ecf1 100644
--- a/libs/components/tsconfig.json
+++ b/libs/components/tsconfig.json
@@ -1,39 +1,3 @@
 {
-  "compileOnSave": false,
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "./dist/out-tsc",
-    "forceConsistentCasingInFileNames": true,
-    "strict": false,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "sourceMap": true,
-    "declaration": false,
-    "downlevelIteration": true,
-    "experimentalDecorators": true,
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "target": "es2017",
-    "module": "es2020",
-    "lib": ["es2020", "dom"],
-    "paths": {
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../ui/common/src/setup-jest"]
-    },
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ]
-  },
-  "angularCompilerOptions": {
-    "enableI18nLegacyMessageIdFormat": false,
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true,
-    "strictTemplates": true
-  }
+  "extends": "../../tsconfig.base"
 }
diff --git a/libs/components/tsconfig.spec.json b/libs/components/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/libs/components/tsconfig.spec.json
+++ b/libs/components/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/libs/dirt/card/README.md b/libs/dirt/card/README.md
new file mode 100644
index 00000000000..b97bfd56590
--- /dev/null
+++ b/libs/dirt/card/README.md
@@ -0,0 +1,5 @@
+## DIRT Card
+
+Package name: `@bitwarden/dirt-card`
+
+Generic Tools Card Component
diff --git a/libs/tools/card/jest.config.js b/libs/dirt/card/jest.config.js
similarity index 53%
rename from libs/tools/card/jest.config.js
rename to libs/dirt/card/jest.config.js
index 952e9ce0e2e..2a3582a69d2 100644
--- a/libs/tools/card/jest.config.js
+++ b/libs/dirt/card/jest.config.js
@@ -1,13 +1,15 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../tsconfig.base");
+
+const sharedConfig = require("../../shared/jest.config.angular");
 
 /** @type {import('jest').Config} */
 module.exports = {
-  testMatch: ["**/+(*.)+(spec).+(ts)"],
-  preset: "jest-preset-angular",
+  ...sharedConfig,
+  displayName: "tools/card tests",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../",
+    prefix: "<rootDir>/../../../",
   }),
 };
diff --git a/libs/tools/card/package.json b/libs/dirt/card/package.json
similarity index 92%
rename from libs/tools/card/package.json
rename to libs/dirt/card/package.json
index 06351f1b46a..cf613ead7af 100644
--- a/libs/tools/card/package.json
+++ b/libs/dirt/card/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@bitwarden/tools-card",
+  "name": "@bitwarden/dirt-card",
   "version": "0.0.0",
   "description": "Angular card component",
   "keywords": [
diff --git a/libs/tools/card/src/card.component.html b/libs/dirt/card/src/card.component.html
similarity index 100%
rename from libs/tools/card/src/card.component.html
rename to libs/dirt/card/src/card.component.html
diff --git a/libs/tools/card/src/card.component.ts b/libs/dirt/card/src/card.component.ts
similarity index 95%
rename from libs/tools/card/src/card.component.ts
rename to libs/dirt/card/src/card.component.ts
index 0a7c6e1a295..f9899125dbd 100644
--- a/libs/tools/card/src/card.component.ts
+++ b/libs/dirt/card/src/card.component.ts
@@ -7,9 +7,8 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { TypographyModule } from "@bitwarden/components";
 
 @Component({
-  selector: "tools-card",
+  selector: "dirt-card",
   templateUrl: "./card.component.html",
-  standalone: true,
   imports: [CommonModule, TypographyModule, JslibModule],
   host: {
     class:
diff --git a/libs/tools/card/src/card.stories.ts b/libs/dirt/card/src/card.stories.ts
similarity index 87%
rename from libs/tools/card/src/card.stories.ts
rename to libs/dirt/card/src/card.stories.ts
index 0187783a773..e48e5798a1f 100644
--- a/libs/tools/card/src/card.stories.ts
+++ b/libs/dirt/card/src/card.stories.ts
@@ -7,7 +7,7 @@ import { I18nMockService, TypographyModule } from "@bitwarden/components";
 import { CardComponent } from "./card.component";
 
 export default {
-  title: "Tools/Card",
+  title: "DIRT/Card",
   component: CardComponent,
   decorators: [
     moduleMetadata({
@@ -31,6 +31,6 @@ export const Default: Story = {
   render: (args) => ({
     props: args,
     template: /*html*/ `
-      <tools-card [title]="'Unsecured Members'" [value]="'38'" [maxValue]="'157'"></tools-card>`,
+      <dirt-card [title]="'Unsecured Members'" [value]="'38'" [maxValue]="'157'"></dirt-card>`,
   }),
 };
diff --git a/libs/tools/card/src/index.ts b/libs/dirt/card/src/index.ts
similarity index 100%
rename from libs/tools/card/src/index.ts
rename to libs/dirt/card/src/index.ts
diff --git a/libs/tools/card/test.setup.ts b/libs/dirt/card/test.setup.ts
similarity index 100%
rename from libs/tools/card/test.setup.ts
rename to libs/dirt/card/test.setup.ts
diff --git a/libs/dirt/card/tsconfig.json b/libs/dirt/card/tsconfig.json
new file mode 100644
index 00000000000..941c32b5b2a
--- /dev/null
+++ b/libs/dirt/card/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "extends": "../../../tsconfig.base",
+  "include": ["src"],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/libs/tools/card/tsconfig.spec.json b/libs/dirt/card/tsconfig.spec.json
similarity index 58%
rename from libs/tools/card/tsconfig.spec.json
rename to libs/dirt/card/tsconfig.spec.json
index 919530506de..238f1a9dca0 100644
--- a/libs/tools/card/tsconfig.spec.json
+++ b/libs/dirt/card/tsconfig.spec.json
@@ -1,5 +1,9 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "include": ["src"],
   "files": ["./test.setup.ts"],
   "exclude": ["node_modules", "dist"]
diff --git a/libs/eslint/jest.config.js b/libs/eslint/jest.config.js
index 5acadb023e4..118e698bae5 100644
--- a/libs/eslint/jest.config.js
+++ b/libs/eslint/jest.config.js
@@ -6,6 +6,5 @@ module.exports = {
   testEnvironment: "./fix-jsdom.ts",
   testMatch: ["**/+(*.)+(spec).+(mjs)"],
   displayName: "libs/eslint tests",
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.mjs"],
 };
diff --git a/libs/eslint/tsconfig.json b/libs/eslint/tsconfig.json
index bbf065886c4..69be0fa9cac 100644
--- a/libs/eslint/tsconfig.json
+++ b/libs/eslint/tsconfig.json
@@ -1,6 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {},
+  "extends": "../../tsconfig.base",
   "exclude": ["node_modules", "dist"],
   "files": ["empty.ts"]
 }
diff --git a/libs/importer/jest.config.js b/libs/importer/jest.config.js
index ee5ae302b99..0d7db28409f 100644
--- a/libs/importer/jest.config.js
+++ b/libs/importer/jest.config.js
@@ -1,15 +1,14 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../shared/jest.config.ts");
 
 /** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
-  preset: "jest-preset-angular",
   testEnvironment: "jsdom",
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
+    prefix: "<rootDir>/../../",
   }),
 };
diff --git a/libs/importer/src/components/dialog/file-password-prompt.component.ts b/libs/importer/src/components/dialog/file-password-prompt.component.ts
index d67c60d6b6b..9ad62b7e8f5 100644
--- a/libs/importer/src/components/dialog/file-password-prompt.component.ts
+++ b/libs/importer/src/components/dialog/file-password-prompt.component.ts
@@ -14,7 +14,6 @@ import {
 
 @Component({
   templateUrl: "file-password-prompt.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/importer/src/components/dialog/import-error-dialog.component.ts b/libs/importer/src/components/dialog/import-error-dialog.component.ts
index 9e09afa7cf1..cb998c2dfe9 100644
--- a/libs/importer/src/components/dialog/import-error-dialog.component.ts
+++ b/libs/importer/src/components/dialog/import-error-dialog.component.ts
@@ -18,7 +18,6 @@ export interface ErrorListItem {
 
 @Component({
   templateUrl: "./import-error-dialog.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, DialogModule, TableModule, ButtonModule],
 })
 export class ImportErrorDialogComponent implements OnInit {
diff --git a/libs/importer/src/components/dialog/import-success-dialog.component.ts b/libs/importer/src/components/dialog/import-success-dialog.component.ts
index bafd3c26412..ff9a5d7b014 100644
--- a/libs/importer/src/components/dialog/import-success-dialog.component.ts
+++ b/libs/importer/src/components/dialog/import-success-dialog.component.ts
@@ -22,7 +22,6 @@ export interface ResultList {
 
 @Component({
   templateUrl: "./import-success-dialog.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, DialogModule, TableModule, ButtonModule],
 })
 export class ImportSuccessDialogComponent implements OnInit {
diff --git a/libs/importer/src/components/dialog/sshkey-password-prompt.component.ts b/libs/importer/src/components/dialog/sshkey-password-prompt.component.ts
index 540d576d156..8c199ee5577 100644
--- a/libs/importer/src/components/dialog/sshkey-password-prompt.component.ts
+++ b/libs/importer/src/components/dialog/sshkey-password-prompt.component.ts
@@ -14,7 +14,6 @@ import {
 
 @Component({
   templateUrl: "sshkey-password-prompt.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/importer/src/components/import.component.html b/libs/importer/src/components/import.component.html
index 2182e8532ac..f6d6603dca9 100644
--- a/libs/importer/src/components/import.component.html
+++ b/libs/importer/src/components/import.component.html
@@ -1,6 +1,13 @@
 <bit-callout type="info" *ngIf="importBlockedByPolicy">
   {{ "personalOwnershipPolicyInEffectImports" | i18n }}
 </bit-callout>
+<bit-callout
+  [title]="'restrictCardTypeImport' | i18n"
+  type="info"
+  *ngIf="isCardTypeRestricted$ | async"
+>
+  {{ "restrictCardTypeImportDesc" | i18n }}
+</bit-callout>
 <form [formGroup]="formGroup" [bitSubmit]="submit" id="import_form_importForm">
   <bit-section>
     <bit-section-header>
@@ -428,6 +435,12 @@
           and select Export items &rarr; Enter your Master Password and select Continue. &rarr; Save
           the CSV file on your device.
         </ng-container>
+        <ng-container *ngIf="format === 'passworddepot17xml'">
+          On the desktop application, go to Tools &rarr; Export &rarr; Enter your master password
+          &rarr; Select XML Format (*.xml) as Export format &rarr; Click on next &rarr; Choose which
+          entries should be included in the export &rarr; Click on next to export into the location
+          previously chosen.
+        </ng-container>
       </bit-callout>
       <import-lastpass
         *ngIf="showLastPassOptions"
diff --git a/libs/importer/src/components/import.component.ts b/libs/importer/src/components/import.component.ts
index 7b8f49b796b..4f2715fe9cf 100644
--- a/libs/importer/src/components/import.component.ts
+++ b/libs/importer/src/components/import.component.ts
@@ -45,6 +45,7 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import {
   AsyncActionsModule,
   BitSubmitDirective,
@@ -106,7 +107,6 @@ const safeProviders: SafeProvider[] = [
 @Component({
   selector: "tools-import",
   templateUrl: "import.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
@@ -162,6 +162,9 @@ export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
   protected organization: Organization;
   protected destroy$ = new Subject<void>();
 
+  protected readonly isCardTypeRestricted$: Observable<boolean> =
+    this.restrictedItemTypesService.restricted$.pipe(map((items) => items.length > 0));
+
   private _importBlockedByPolicy = false;
   protected isFromAC = false;
 
@@ -221,6 +224,7 @@ export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
     protected importCollectionService: ImportCollectionServiceAbstraction,
     protected toastService: ToastService,
     protected accountService: AccountService,
+    private restrictedItemTypesService: RestrictedItemTypesService,
   ) {}
 
   protected get importBlockedByPolicy(): boolean {
@@ -332,7 +336,7 @@ export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
       this.accountService.activeAccount$.pipe(
         getUserId,
         switchMap((userId) =>
-          this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
+          this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
         ),
       ),
       this.organizations$,
diff --git a/libs/importer/src/components/lastpass/dialog/lastpass-multifactor-prompt.component.ts b/libs/importer/src/components/lastpass/dialog/lastpass-multifactor-prompt.component.ts
index 662a1291547..f497a3bf32c 100644
--- a/libs/importer/src/components/lastpass/dialog/lastpass-multifactor-prompt.component.ts
+++ b/libs/importer/src/components/lastpass/dialog/lastpass-multifactor-prompt.component.ts
@@ -23,7 +23,6 @@ type LastPassMultifactorPromptData = {
 
 @Component({
   templateUrl: "lastpass-multifactor-prompt.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/importer/src/components/lastpass/dialog/lastpass-password-prompt.component.ts b/libs/importer/src/components/lastpass/dialog/lastpass-password-prompt.component.ts
index e0f0d5b4cfa..861f184f94d 100644
--- a/libs/importer/src/components/lastpass/dialog/lastpass-password-prompt.component.ts
+++ b/libs/importer/src/components/lastpass/dialog/lastpass-password-prompt.component.ts
@@ -17,7 +17,6 @@ import {
 
 @Component({
   templateUrl: "lastpass-password-prompt.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/importer/src/components/lastpass/import-lastpass.component.ts b/libs/importer/src/components/lastpass/import-lastpass.component.ts
index a08349609d9..7fbf7dd8a7a 100644
--- a/libs/importer/src/components/lastpass/import-lastpass.component.ts
+++ b/libs/importer/src/components/lastpass/import-lastpass.component.ts
@@ -28,7 +28,6 @@ import { LastPassDirectImportService } from "./lastpass-direct-import.service";
 @Component({
   selector: "import-lastpass",
   templateUrl: "import-lastpass.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts
index abda9a04a8a..b900e9e8d7a 100644
--- a/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts
+++ b/libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts
@@ -44,7 +44,7 @@ export class BitwardenCsvImporter extends BaseImporter implements Importer {
         cipher.reprompt = parseInt(
           this.getValueOrDefault(value.reprompt, CipherRepromptType.None.toString()),
           10,
-        );
+        ) as CipherRepromptType;
       } catch (e) {
         // eslint-disable-next-line
         console.error("Unable to parse reprompt value", e);
diff --git a/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts
index 4291f7b1ab2..dfc1c9f58e9 100644
--- a/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts
+++ b/libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts
@@ -71,7 +71,7 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
         this.organizationId,
       );
       if (keyForDecryption == null) {
-        keyForDecryption = await this.keyService.getUserKeyWithLegacySupport();
+        keyForDecryption = await this.keyService.getUserKey();
       }
       const encKeyValidation = new EncString(results.encKeyValidation_DO_NOT_EDIT);
       const encKeyValidationDecrypt = await this.encryptService.decryptString(
diff --git a/libs/importer/src/importers/index.ts b/libs/importer/src/importers/index.ts
index c9b4c4c9c19..a1e2c46868f 100644
--- a/libs/importer/src/importers/index.ts
+++ b/libs/importer/src/importers/index.ts
@@ -42,6 +42,7 @@ export { PassmanJsonImporter } from "./passman-json-importer";
 export { PasspackCsvImporter } from "./passpack-csv-importer";
 export { PasswordAgentCsvImporter } from "./passwordagent-csv-importer";
 export { PasswordBossJsonImporter } from "./passwordboss-json-importer";
+export { PasswordDepot17XmlImporter } from "./password-depot";
 export { PasswordDragonXmlImporter } from "./passworddragon-xml-importer";
 export { PasswordSafeXmlImporter } from "./passwordsafe-xml-importer";
 export { PasswordWalletTxtImporter } from "./passwordwallet-txt-importer";
diff --git a/libs/importer/src/importers/password-depot/index.ts b/libs/importer/src/importers/password-depot/index.ts
new file mode 100644
index 00000000000..ef43ad11d96
--- /dev/null
+++ b/libs/importer/src/importers/password-depot/index.ts
@@ -0,0 +1 @@
+export { PasswordDepot17XmlImporter } from "./password-depot-17-xml-importer";
diff --git a/libs/importer/src/importers/password-depot/password-depot-17-macos-xml-importer.spec.ts b/libs/importer/src/importers/password-depot/password-depot-17-macos-xml-importer.spec.ts
new file mode 100644
index 00000000000..6740e040996
--- /dev/null
+++ b/libs/importer/src/importers/password-depot/password-depot-17-macos-xml-importer.spec.ts
@@ -0,0 +1,62 @@
+import {
+  MacOS_MultipleFolders,
+  MacOS_PasswordDepotXmlFile,
+  MacOS_WrongVersion,
+} from "../spec-data/password-depot-xml";
+
+import { PasswordDepot17XmlImporter } from "./password-depot-17-xml-importer";
+
+describe("Password Depot 17 MacOS Xml Importer", () => {
+  it("should return error with invalid export version", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(MacOS_WrongVersion);
+    expect(result.errorMessage).toBe(
+      "Unsupported export version detected - (only 17.0 is supported)",
+    );
+  });
+
+  it("should not create a folder/collection if the group fingerprint is null", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(MacOS_PasswordDepotXmlFile);
+    expect(result.folders.length).toBe(0);
+  });
+
+  it("should create folders and with correct assignments", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(MacOS_MultipleFolders);
+
+    // Expect 10 ciphers, 5 without a folder and 3 within 'folder macos' and 2 with 'folder 2'
+    expect(result.ciphers.length).toBe(10);
+
+    expect(result.folders.length).toBe(2);
+    expect(result.folders[0].name).toBe("folder macos");
+    expect(result.folders[1].name).toBe("folder 2");
+
+    // 3 items within 'folder macos'
+    expect(result.folderRelationships[0]).toEqual([5, 0]);
+    expect(result.folderRelationships[1]).toEqual([6, 0]);
+    expect(result.folderRelationships[2]).toEqual([7, 0]);
+
+    //2 items with 'folder 2'
+    expect(result.folderRelationships[3]).toEqual([8, 1]);
+    expect(result.folderRelationships[4]).toEqual([9, 1]);
+  });
+
+  it("should parse custom fields from a MacOS exported file", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(MacOS_PasswordDepotXmlFile);
+
+    const cipher = result.ciphers.shift();
+    expect(cipher.name).toBe("card 1");
+    expect(cipher.notes).toBe("comment");
+
+    expect(cipher.card).not.toBeNull();
+
+    expect(cipher.card.cardholderName).toBe("some CC holder");
+    expect(cipher.card.number).toBe("4242424242424242");
+    expect(cipher.card.brand).toBe("Visa");
+    expect(cipher.card.expMonth).toBe("8");
+    expect(cipher.card.expYear).toBe("2028");
+    expect(cipher.card.code).toBe("125");
+  });
+});
diff --git a/libs/importer/src/importers/password-depot/password-depot-17-xml-importer.spec.ts b/libs/importer/src/importers/password-depot/password-depot-17-xml-importer.spec.ts
new file mode 100644
index 00000000000..ea84603aef4
--- /dev/null
+++ b/libs/importer/src/importers/password-depot/password-depot-17-xml-importer.spec.ts
@@ -0,0 +1,496 @@
+// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
+// eslint-disable-next-line no-restricted-imports
+import { CollectionView } from "@bitwarden/admin-console/common";
+import { FieldType, SecureNoteType } from "@bitwarden/common/vault/enums";
+import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import { CipherType } from "@bitwarden/sdk-internal";
+
+import {
+  EncryptedFileData,
+  InvalidRootNodeData,
+  InvalidVersionData,
+  CreditCardTestData,
+  MissingPasswordsNodeData,
+  PasswordTestData,
+  IdentityTestData,
+  RDPTestData,
+  SoftwareLicenseTestData,
+  TeamViewerTestData,
+  PuttyTestData,
+  BankingTestData,
+  InformationTestData,
+  CertificateTestData,
+  EncryptedFileTestData,
+  DocumentTestData,
+} from "../spec-data/password-depot-xml";
+
+import { PasswordDepot17XmlImporter } from "./password-depot-17-xml-importer";
+
+describe("Password Depot 17 Xml Importer", () => {
+  it("should return error with missing root tag", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(InvalidRootNodeData);
+    expect(result.errorMessage).toBe("Missing `passwordfile` node.");
+  });
+
+  it("should return error with invalid export version", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(InvalidVersionData);
+    expect(result.errorMessage).toBe(
+      "Unsupported export version detected - (only 17.0 is supported)",
+    );
+  });
+
+  it("should return error if file is marked as encrypted", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(EncryptedFileData);
+    expect(result.errorMessage).toBe("Encrypted Password Depot files are not supported.");
+  });
+
+  it("should return error with missing passwords node tag", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(MissingPasswordsNodeData);
+    expect(result.success).toBe(false);
+    expect(result.errorMessage).toBe("Missing `passwordfile > passwords` node.");
+  });
+
+  it("should parse groups nodes into folders", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const folder = new FolderView();
+    folder.name = "tempDB";
+    const actual = [folder];
+
+    const result = await importer.parse(PasswordTestData);
+    expect(result.folders).toEqual(actual);
+  });
+
+  it("should parse password type into logins", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(PasswordTestData);
+
+    const cipher = result.ciphers.shift();
+
+    expect(cipher.type).toEqual(CipherType.Login);
+    expect(cipher.name).toBe("password type");
+    expect(cipher.notes).toBe("someComment");
+
+    expect(cipher.login).not.toBeNull();
+    expect(cipher.login.username).toBe("someUser");
+    expect(cipher.login.password).toBe("p6J<]fmjv!:H&iJ7/Mwt@3i8");
+    expect(cipher.login.uri).toBe("http://example.com");
+  });
+
+  it("should parse any unmapped fields as custom fields", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(PasswordTestData);
+
+    const cipher = result.ciphers.shift();
+
+    expect(cipher.type).toBe(CipherType.Login);
+    expect(cipher.name).toBe("password type");
+
+    expect(cipher.fields).not.toBeNull();
+
+    expect(cipher.fields[0].name).toBe("lastmodified");
+    expect(cipher.fields[0].value).toBe("07.05.2025 13:37:56");
+    expect(cipher.fields[0].type).toBe(FieldType.Text);
+
+    expect(cipher.fields[1].name).toBe("expirydate");
+    expect(cipher.fields[1].value).toBe("07.05.2025");
+    expect(cipher.fields[0].type).toBe(FieldType.Text);
+
+    expect(cipher.fields[2].name).toBe("importance");
+    expect(cipher.fields[2].value).toBe("0");
+
+    let customField = cipher.fields.find((f) => f.name === "passwort");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("password");
+    expect(customField.type).toEqual(FieldType.Hidden);
+
+    customField = cipher.fields.find((f) => f.name === "memo");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("memo");
+    expect(customField.type).toEqual(FieldType.Text);
+
+    customField = cipher.fields.find((f) => f.name === "datum");
+    expect(customField).toBeDefined();
+    const expectedDate = new Date("2025-05-13T00:00:00Z");
+    expect(customField.value).toEqual(expectedDate.toLocaleDateString());
+    expect(customField.type).toEqual(FieldType.Text);
+
+    customField = cipher.fields.find((f) => f.name === "nummer");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("1");
+    expect(customField.type).toEqual(FieldType.Text);
+
+    customField = cipher.fields.find((f) => f.name === "boolean");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("1");
+    expect(customField.type).toEqual(FieldType.Boolean);
+
+    customField = cipher.fields.find((f) => f.name === "decimal");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("1,01");
+    expect(customField.type).toEqual(FieldType.Text);
+
+    customField = cipher.fields.find((f) => f.name === "email");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("who@cares.com");
+    expect(customField.type).toEqual(FieldType.Text);
+
+    customField = cipher.fields.find((f) => f.name === "url");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("example.com");
+    expect(customField.type).toEqual(FieldType.Text);
+  });
+
+  it("should parse credit cards", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(CreditCardTestData);
+
+    const cipher = result.ciphers.shift();
+    expect(cipher.name).toBe("some CreditCard");
+    expect(cipher.notes).toBe("someComment");
+
+    expect(cipher.card).not.toBeNull();
+
+    expect(cipher.card.cardholderName).toBe("some CC holder");
+    expect(cipher.card.number).toBe("4222422242224222");
+    expect(cipher.card.brand).toBe("Visa");
+    expect(cipher.card.expMonth).toBe("5");
+    expect(cipher.card.expYear).toBe("2026");
+    expect(cipher.card.code).toBe("123");
+  });
+
+  it("should parse identity type", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(IdentityTestData);
+
+    const cipher = result.ciphers.shift();
+    expect(cipher.name).toBe("identity type");
+    expect(cipher.notes).toBe("someNote");
+
+    expect(cipher.identity).not.toBeNull();
+
+    expect(cipher.identity.firstName).toBe("firstName");
+    expect(cipher.identity.lastName).toBe("surName");
+    expect(cipher.identity.email).toBe("email");
+    expect(cipher.identity.company).toBe("someCompany");
+    expect(cipher.identity.address1).toBe("someStreet");
+    expect(cipher.identity.address2).toBe("address 2");
+    expect(cipher.identity.city).toBe("town");
+    expect(cipher.identity.state).toBe("state");
+    expect(cipher.identity.postalCode).toBe("zipCode");
+    expect(cipher.identity.country).toBe("country");
+    expect(cipher.identity.phone).toBe("phoneNumber");
+  });
+
+  it("should parse RDP type", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(RDPTestData);
+
+    const cipher = result.ciphers.shift();
+    expect(cipher.type).toEqual(CipherType.Login);
+    expect(cipher.name).toBe("rdp type");
+    expect(cipher.notes).toBe("someNote");
+
+    expect(cipher.login).not.toBeNull();
+    expect(cipher.login.username).toBe("someUser");
+    expect(cipher.login.password).toBe("somePassword");
+    expect(cipher.login.uri).toBe("ms-rd:subscribe?url=https://contoso.com");
+  });
+
+  it("should parse software license into secure notes", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(SoftwareLicenseTestData);
+
+    const cipher = result.ciphers.shift();
+
+    expect(cipher.type).toEqual(CipherType.SecureNote);
+    expect(cipher.name).toBe("software-license type");
+    expect(cipher.notes).toBe("someComment");
+
+    expect(cipher.secureNote).not.toBeNull();
+    expect(cipher.secureNote.type).toBe(SecureNoteType.Generic);
+
+    let customField = cipher.fields.find((f) => f.name === "IDS_LicenseProduct");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("someProduct");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_LicenseVersion");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("someVersion");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_LicenseName");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("some User");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_LicenseKey");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("license-key");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_LicenseAdditionalKey");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("additional-license-key");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_LicenseURL");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("example.com");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_LicenseProtected");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("1");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_LicenseUserName");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("someUserName");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_LicensePassword");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("somePassword");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_LicensePurchaseDate");
+    expect(customField).toBeDefined();
+    const expectedDate = new Date("2025-05-12T00:00:00Z");
+    expect(customField.value).toEqual(expectedDate.toLocaleDateString());
+
+    customField = cipher.fields.find((f) => f.name === "IDS_LicenseOrderNumber");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("order number");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_LicenseEmail");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("someEmail");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_LicenseExpires");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("Nie");
+  });
+
+  it("should parse team viewer into login type", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(TeamViewerTestData);
+
+    const cipher = result.ciphers.shift();
+
+    expect(cipher.type).toEqual(CipherType.Login);
+    expect(cipher.name).toBe("TeamViewer type");
+    expect(cipher.notes).toBe("someNote");
+
+    expect(cipher.login).not.toBeNull();
+    expect(cipher.login.password).toBe("somePassword");
+    expect(cipher.login.username).toBe("");
+    expect(cipher.login.uri).toBe("partnerId");
+
+    const customField = cipher.fields.find((f) => f.name === "IDS_TeamViewerMode");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("0");
+  });
+
+  it("should parse putty into login type", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(PuttyTestData);
+
+    const cipher = result.ciphers.shift();
+
+    expect(cipher.type).toEqual(CipherType.Login);
+    expect(cipher.name).toBe("Putty type");
+    expect(cipher.notes).toBe("someNote");
+
+    expect(cipher.login).not.toBeNull();
+    expect(cipher.login.password).toBe("somePassword");
+    expect(cipher.login.username).toBe("someUser");
+    expect(cipher.login.uri).toBe("localhost");
+
+    let customField = cipher.fields.find((f) => f.name === "IDS_PuTTyProtocol");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("0");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_PuTTyKeyFile");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("pathToKeyFile");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_PuTTyKeyPassword");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("passwordForKeyFile");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_PuTTyPort");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("8080");
+  });
+
+  it("should parse banking item type into login type", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(BankingTestData);
+
+    const cipher = result.ciphers.shift();
+
+    expect(cipher.type).toEqual(CipherType.Login);
+    expect(cipher.name).toBe("banking type");
+    expect(cipher.notes).toBe("someNote");
+
+    expect(cipher.login).not.toBeNull();
+    expect(cipher.login.password).toBe("somePassword");
+    expect(cipher.login.username).toBe("someUser");
+    expect(cipher.login.uri).toBe("http://some-bank.com");
+
+    let customField = cipher.fields.find((f) => f.name === "IDS_ECHolder");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("account holder");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_ECAccountNumber");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("1234567890");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_ECBLZ");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("12345678");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_ECBankName");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("someBank");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_ECBIC");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("bic");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_ECIBAN");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("iban");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_ECCardNumber");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("12345678");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_ECPhone");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("0049");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_ECLegitimacyID");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("1234");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_ECPIN");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("123");
+
+    customField = cipher.fields.find((f) => f.name === "tan_1_value");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("1234");
+
+    customField = cipher.fields.find((f) => f.name === "tan_1_used");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("12.05.2025 15:10:54");
+
+    // TAN entries
+    customField = cipher.fields.find((f) => f.name === "tan_1_amount");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual(" 100,00");
+
+    customField = cipher.fields.find((f) => f.name === "tan_1_comment");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("some TAN note");
+
+    customField = cipher.fields.find((f) => f.name === "tan_1_ccode");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("123");
+
+    customField = cipher.fields.find((f) => f.name === "tan_2_value");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("4321");
+
+    customField = cipher.fields.find((f) => f.name === "tan_2_amount");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual(" 0,00");
+  });
+
+  it("should parse information into secure note type", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(InformationTestData);
+
+    const cipher = result.ciphers.shift();
+
+    expect(cipher.type).toEqual(CipherType.SecureNote);
+    expect(cipher.name).toBe("information type");
+    expect(cipher.notes).toBe("some note content");
+  });
+
+  it("should parse certificate into login type", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(CertificateTestData);
+
+    const cipher = result.ciphers.shift();
+
+    expect(cipher.type).toEqual(CipherType.Login);
+    expect(cipher.name).toBe("certificate type");
+    expect(cipher.notes).toBe("someNote");
+
+    expect(cipher.login).not.toBeNull();
+    expect(cipher.login.password).toBe("somePassword");
+  });
+
+  it("should parse encrypted file into login type", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(EncryptedFileTestData);
+
+    const cipher = result.ciphers.shift();
+
+    expect(cipher.type).toEqual(CipherType.Login);
+    expect(cipher.name).toBe("encrypted file type");
+    expect(cipher.notes).toBe("some comment");
+
+    expect(cipher.login).not.toBeNull();
+    expect(cipher.login.password).toBe("somePassword");
+  });
+
+  it("should parse document type into secure note", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(DocumentTestData);
+
+    const cipher = result.ciphers.shift();
+
+    expect(cipher.type).toEqual(CipherType.SecureNote);
+    expect(cipher.name).toBe("document type");
+    expect(cipher.notes).toBe("document comment");
+
+    let customField = cipher.fields.find((f) => f.name === "IDS_DocumentSize");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("27071");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_DocumentFolder");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("C:\\Users\\DJSMI\\Downloads\\");
+
+    customField = cipher.fields.find((f) => f.name === "IDS_DocumentFile");
+    expect(customField).toBeDefined();
+    expect(customField.value).toEqual("C:\\Users\\DJSMI\\Downloads\\some.pdf");
+  });
+
+  it("should parse favourites and set them on the target item", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    const result = await importer.parse(PasswordTestData);
+
+    let cipher = result.ciphers.shift();
+    expect(cipher.name).toBe("password type");
+    expect(cipher.favorite).toBe(false);
+
+    cipher = result.ciphers.shift();
+    expect(cipher.name).toBe("password type (2)");
+    expect(cipher.favorite).toBe(true);
+
+    cipher = result.ciphers.shift();
+    expect(cipher.name).toBe("password type (3)");
+    expect(cipher.favorite).toBe(true);
+  });
+
+  it("should parse groups nodes into collections when importing into an organization", async () => {
+    const importer = new PasswordDepot17XmlImporter();
+    importer.organizationId = "someOrgId";
+    const collection = new CollectionView();
+    collection.name = "tempDB";
+    const actual = [collection];
+
+    const result = await importer.parse(PasswordTestData);
+    expect(result.collections).toEqual(actual);
+  });
+});
diff --git a/libs/importer/src/importers/password-depot/password-depot-17-xml-importer.ts b/libs/importer/src/importers/password-depot/password-depot-17-xml-importer.ts
new file mode 100644
index 00000000000..ab1f6b4689f
--- /dev/null
+++ b/libs/importer/src/importers/password-depot/password-depot-17-xml-importer.ts
@@ -0,0 +1,500 @@
+// FIXME: Update this file to be type safe and remove this and next line
+// @ts-strict-ignore
+import { CipherType, FieldType, SecureNoteType } from "@bitwarden/common/vault/enums";
+import { CardView } from "@bitwarden/common/vault/models/view/card.view";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
+import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
+import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
+import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view";
+
+import { ImportResult } from "../../models/import-result";
+import { BaseImporter } from "../base-importer";
+import { Importer } from "../importer";
+
+import { PasswordDepotItemType, PasswordDepotCustomFieldType } from "./types";
+
+/**
+ * Importer for Password Depot 17 xml files.
+ * @see https://www.password-depot.de/
+ * It provides methods to parse the XML data, extract relevant information, and create cipher objects
+ */
+export class PasswordDepot17XmlImporter extends BaseImporter implements Importer {
+  result = new ImportResult();
+
+  _favouritesLookupTable = new Set<string>();
+
+  // Parse the XML data from the Password Depot export file and extracts the relevant information
+  parse(data: string): Promise<ImportResult> {
+    const doc: XMLDocument = this.parseXml(data);
+    if (doc == null) {
+      this.result.success = false;
+      return Promise.resolve(this.result);
+    }
+
+    // Check if the root node is present
+    const rootNode = doc.querySelector("passwordfile");
+    if (rootNode == null) {
+      this.result.errorMessage = "Missing `passwordfile` node.";
+      this.result.success = false;
+      return Promise.resolve(this.result);
+    }
+
+    // Check if the version is supported
+    const headerNode = this.querySelectorDirectChild(rootNode, "header");
+    if (headerNode == null) {
+      this.result.success = false;
+      return Promise.resolve(this.result);
+    }
+
+    let versionNode = this.querySelectorDirectChild(headerNode, "version");
+    if (versionNode == null) {
+      // Adding a fallback for MacOS Password Depot 17.0 export files
+      // These files do not have a version node, but a dataformat node instead
+      versionNode = this.querySelectorDirectChild(headerNode, "dataformat");
+      if (versionNode == null) {
+        this.result.success = false;
+        return Promise.resolve(this.result);
+      }
+    }
+
+    const version = versionNode.textContent;
+    if (!version.startsWith("17")) {
+      this.result.errorMessage = "Unsupported export version detected - (only 17.0 is supported)";
+      this.result.success = false;
+      return Promise.resolve(this.result);
+    }
+
+    // Abort import if the file is encrypted
+    const encryptedNode = this.querySelectorDirectChild(headerNode, "encrypted");
+    if (encryptedNode != null && encryptedNode.textContent == "True") {
+      this.result.errorMessage = "Encrypted Password Depot files are not supported.";
+      this.result.success = false;
+      return Promise.resolve(this.result);
+    }
+
+    // Check if the passwords node is present
+    // This node contains all the password entries
+    const passwordsNode = rootNode.querySelector("passwords");
+    if (passwordsNode == null) {
+      this.result.errorMessage = "Missing `passwordfile > passwords` node.";
+      this.result.success = false;
+      return Promise.resolve(this.result);
+    }
+
+    this.buildFavouritesLookupTable(rootNode);
+
+    this.querySelectorAllDirectChild(passwordsNode, "group").forEach((group) => {
+      this.traverse(group, "");
+    });
+
+    if (this.organization) {
+      this.moveFoldersToCollections(this.result);
+    }
+
+    this.result.success = true;
+    return Promise.resolve(this.result);
+  }
+
+  // Traverses the XML tree and processes each node
+  // It starts from the root node and goes through each group and item
+  // This method is recursive and handles nested groups
+  private traverse(node: Element, groupPrefixName: string) {
+    const folderIndex = this.result.folders.length;
+    let groupName = groupPrefixName;
+
+    if (groupName !== "") {
+      groupName += "/";
+    }
+
+    // Check if the group has a fingerprint attribute (GUID of a folder)
+    const groupFingerprint = node.attributes.getNamedItem("fingerprint");
+    if (groupFingerprint?.textContent != "" && groupFingerprint.textContent != "null") {
+      const nameEl = node.attributes.getNamedItem("name");
+      groupName += nameEl == null ? "-" : nameEl.textContent;
+      const folder = new FolderView();
+      folder.name = groupName;
+      this.result.folders.push(folder);
+    }
+
+    this.querySelectorAllDirectChild(node, "item").forEach((entry) => {
+      const cipherIndex = this.result.ciphers.length;
+
+      const cipher = this.initLoginCipher();
+      //Set default item type similar how we default to Login in other importers
+      let sourceType: PasswordDepotItemType = PasswordDepotItemType.Password;
+
+      const entryFields = entry.children;
+      for (let i = 0; i < entryFields.length; i++) {
+        const entryField = entryFields[i];
+
+        // Skip processing historical entries
+        if (entryField.tagName === "hitems") {
+          continue;
+        }
+
+        if (entryField.tagName === "description") {
+          cipher.name = entryField.textContent;
+          continue;
+        }
+
+        if (entryField.tagName === "comment") {
+          cipher.notes = entryField.textContent;
+          continue;
+        }
+
+        if (entryField.tagName === "type") {
+          sourceType = entryField.textContent as PasswordDepotItemType;
+          switch (sourceType) {
+            case PasswordDepotItemType.Password:
+            case PasswordDepotItemType.RDP:
+            case PasswordDepotItemType.Putty:
+            case PasswordDepotItemType.TeamViewer:
+            case PasswordDepotItemType.Banking:
+            case PasswordDepotItemType.Certificate:
+            case PasswordDepotItemType.EncryptedFile:
+              cipher.type = CipherType.Login;
+              cipher.login = new LoginView();
+              break;
+            case PasswordDepotItemType.CreditCard:
+              cipher.type = CipherType.Card;
+              cipher.card = new CardView();
+              break;
+            case PasswordDepotItemType.SoftwareLicense:
+            case PasswordDepotItemType.Information:
+            case PasswordDepotItemType.Document:
+              cipher.type = CipherType.SecureNote;
+              cipher.secureNote = new SecureNoteView();
+              cipher.secureNote.type = SecureNoteType.Generic;
+              break;
+            case PasswordDepotItemType.Identity:
+              cipher.type = CipherType.Identity;
+              cipher.identity = new IdentityView();
+              break;
+          }
+          continue;
+        }
+
+        if (
+          sourceType === PasswordDepotItemType.Password ||
+          sourceType === PasswordDepotItemType.RDP ||
+          sourceType === PasswordDepotItemType.Putty ||
+          sourceType === PasswordDepotItemType.TeamViewer ||
+          sourceType === PasswordDepotItemType.Banking ||
+          sourceType === PasswordDepotItemType.Certificate ||
+          sourceType === PasswordDepotItemType.EncryptedFile
+        ) {
+          if (this.parseLoginFields(entryField, cipher)) {
+            continue;
+          }
+        }
+
+        // fingerprint is the GUID of the entry
+        // Base on the previously parsed favourites, we can identify an entry and set the favorite flag accordingly
+        if (entryField.tagName === "fingerprint") {
+          if (this._favouritesLookupTable.has(entryField.textContent)) {
+            cipher.favorite = true;
+          }
+        }
+
+        if (entryField.tagName === "customfields") {
+          this.parseCustomFields(entryField, sourceType, cipher);
+          continue;
+        }
+
+        if (sourceType === PasswordDepotItemType.Banking && entryField.tagName === "tans") {
+          this.querySelectorAllDirectChild(entryField, "tan").forEach((tanEntry) => {
+            this.parseBankingTANs(tanEntry, cipher);
+          });
+          continue;
+        }
+
+        this.processKvp(cipher, entryField.tagName, entryField.textContent, FieldType.Text);
+      }
+
+      this.cleanupCipher(cipher);
+      this.result.ciphers.push(cipher);
+
+      if (groupName !== "") {
+        this.result.folderRelationships.push([cipherIndex, folderIndex]);
+      }
+    });
+
+    this.querySelectorAllDirectChild(node, "group").forEach((group) => {
+      this.traverse(group, groupName);
+    });
+  }
+
+  // Parses custom fields and adds them to the cipher
+  // It iterates through all the custom fields and adds them to the cipher
+  private parseCustomFields(
+    entryField: Element,
+    sourceType: PasswordDepotItemType,
+    cipher: CipherView,
+  ) {
+    this.querySelectorAllDirectChild(entryField, "field").forEach((customField) => {
+      const customFieldObject = this.parseCustomField(customField);
+      if (customFieldObject == null) {
+        return;
+      }
+
+      switch (sourceType) {
+        case PasswordDepotItemType.CreditCard:
+          if (this.parseCreditCardCustomFields(customFieldObject, cipher)) {
+            return;
+          }
+          break;
+        case PasswordDepotItemType.Identity:
+          if (this.parseIdentityCustomFields(customFieldObject, cipher)) {
+            return;
+          }
+          break;
+        case PasswordDepotItemType.Information:
+          if (this.parseInformationCustomFields(customFieldObject, cipher)) {
+            return;
+          }
+          break;
+        default:
+          // For other types, we will process the custom field as a regular key-value pair
+          break;
+      }
+
+      this.processKvp(
+        cipher,
+        customFieldObject.name,
+        customFieldObject.value,
+        customFieldObject.type,
+      );
+    });
+  }
+
+  // Parses login fields and adds them to the cipher
+  private parseLoginFields(entryField: Element, cipher: CipherView): boolean {
+    if (entryField.tagName === "username") {
+      cipher.login.username = entryField.textContent;
+      return true;
+    }
+
+    if (entryField.tagName === "password") {
+      cipher.login.password = entryField.textContent;
+      return true;
+    }
+
+    if (entryField.tagName === "url") {
+      cipher.login.uris = this.makeUriArray(entryField.textContent);
+      return true;
+    }
+
+    return false;
+  }
+
+  // Parses a custom field and adds it to the cipher
+  private parseCustomField(customField: Element): FieldView | null {
+    let key: string = undefined;
+    let value: string = undefined;
+    let sourceFieldType: PasswordDepotCustomFieldType = PasswordDepotCustomFieldType.Memo;
+    let visible: string = undefined;
+    // A custom field is represented by a <field> element
+    // On exports from the Windows clients: It contains a <name>, <value>, and optionally a <type> and <visible> element
+    // On exports from the MacOs clients the key-values are defined as xml attributes instead of child nodes
+    if (customField.hasAttributes()) {
+      key = customField.getAttribute("name");
+      if (key == null) {
+        return null;
+      }
+
+      value = customField.getAttribute("value");
+
+      const typeAttr = customField.getAttribute("type");
+      sourceFieldType =
+        typeAttr != null
+          ? (typeAttr as PasswordDepotCustomFieldType)
+          : PasswordDepotCustomFieldType.Memo;
+
+      visible = customField.getAttribute("visible");
+    } else {
+      const keyEl = this.querySelectorDirectChild(customField, "name");
+      key = keyEl != null ? keyEl.textContent : null;
+
+      if (key == null) {
+        return null;
+      }
+
+      const valueEl = this.querySelectorDirectChild(customField, "value");
+      value = valueEl != null ? valueEl.textContent : null;
+
+      const typeEl = this.querySelectorDirectChild(customField, "type");
+      sourceFieldType =
+        typeEl != null
+          ? (typeEl.textContent as PasswordDepotCustomFieldType)
+          : PasswordDepotCustomFieldType.Memo;
+
+      const visibleEl = this.querySelectorDirectChild(customField, "visible");
+      visible = visibleEl != null ? visibleEl.textContent : null;
+    }
+
+    if (sourceFieldType === PasswordDepotCustomFieldType.Date) {
+      if (!isNaN(value as unknown as number)) {
+        // Convert excel date format to JavaScript date
+        const numericValue = parseInt(value);
+        const secondsInDay = 86400;
+        const missingLeapYearDays = secondsInDay * 1000;
+        value = new Date((numericValue - (25567 + 2)) * missingLeapYearDays).toLocaleDateString();
+      }
+    }
+
+    if (sourceFieldType === PasswordDepotCustomFieldType.Password) {
+      return { name: key, value: value, type: FieldType.Hidden, linkedId: null } as FieldView;
+    }
+
+    if (sourceFieldType === PasswordDepotCustomFieldType.Boolean) {
+      return { name: key, value: value, type: FieldType.Boolean, linkedId: null } as FieldView;
+    }
+
+    if (visible == "0") {
+      return { name: key, value: value, type: FieldType.Hidden, linkedId: null } as FieldView;
+    }
+
+    return { name: key, value: value, type: FieldType.Text, linkedId: null } as FieldView;
+  }
+
+  // Parses credit card fields and adds them to the cipher
+  private parseCreditCardCustomFields(customField: FieldView, cipher: CipherView): boolean {
+    if (customField.name === "IDS_CardHolder") {
+      cipher.card.cardholderName = customField.value;
+      return true;
+    }
+
+    if (customField.name === "IDS_CardNumber") {
+      cipher.card.number = customField.value;
+      cipher.card.brand = CardView.getCardBrandByPatterns(cipher.card.number);
+      return true;
+    }
+
+    if (customField.name === "IDS_CardExpires") {
+      this.setCardExpiration(cipher, customField.value);
+      return true;
+    }
+
+    if (customField.name === "IDS_CardCode") {
+      cipher.card.code = customField.value;
+      return true;
+    }
+
+    return false;
+  }
+
+  // Parses identity fields and adds them to the cipher
+  private parseIdentityCustomFields(customField: FieldView, cipher: CipherView): boolean {
+    if (customField.name === "IDS_IdentityName") {
+      this.processFullName(cipher, customField.value);
+      return true;
+    }
+
+    if (customField.name === "IDS_IdentityEmail") {
+      cipher.identity.email = customField.value;
+      return true;
+    }
+
+    if (customField.name === "IDS_IdentityFirstName") {
+      cipher.identity.firstName = customField.value;
+      return true;
+    }
+
+    if (customField.name === "IDS_IdentityLastName") {
+      cipher.identity.lastName = customField.value;
+      return true;
+    }
+
+    if (customField.name === "IDS_IdentityCompany") {
+      cipher.identity.company = customField.value;
+      return true;
+    }
+
+    if (customField.name === "IDS_IdentityAddress1") {
+      cipher.identity.address1 = customField.value;
+      return true;
+    }
+
+    if (customField.name === "IDS_IdentityAddress2") {
+      cipher.identity.address2 = customField.value;
+      return true;
+    }
+
+    if (customField.name === "IDS_IdentityCity") {
+      cipher.identity.city = customField.value;
+      return true;
+    }
+
+    if (customField.name === "IDS_IdentityState") {
+      cipher.identity.state = customField.value;
+      return true;
+    }
+
+    if (customField.name === "IDS_IdentityZIP") {
+      cipher.identity.postalCode = customField.value;
+      return true;
+    }
+
+    if (customField.name === "IDS_IdentityCountry") {
+      cipher.identity.country = customField.value;
+      return true;
+    }
+
+    if (customField.name === "IDS_IdentityPhone") {
+      cipher.identity.phone = customField.value;
+      return true;
+    }
+
+    return false;
+  }
+
+  // Parses information custom fields and adds them to the cipher
+  private parseInformationCustomFields(customField: FieldView, cipher: CipherView): boolean {
+    if (customField.name === "IDS_InformationText") {
+      cipher.notes = customField.value;
+      return true;
+    }
+
+    return false;
+  }
+
+  // Parses TAN objects and adds them to the cipher
+  // It iterates through all the TAN fields and adds them to the cipher
+  private parseBankingTANs(TANsField: Element, cipher: CipherView) {
+    let tanNumber = "0";
+    const entryFields = TANsField.children;
+    for (let i = 0; i < entryFields.length; i++) {
+      const entryField = entryFields[i];
+
+      if (entryField.tagName === "number") {
+        tanNumber = entryField.textContent;
+        continue;
+      }
+
+      this.processKvp(cipher, `tan_${tanNumber}_${entryField.tagName}`, entryField.textContent);
+    }
+  }
+
+  // Parses the favourites-node from the XML file, which contains a base64 encoded string
+  // The string contains the fingerprints/GUIDs of the favourited entries, separated by new lines
+  private buildFavouritesLookupTable(rootNode: Element): void {
+    const favouritesNode = this.querySelectorDirectChild(rootNode, "favorites");
+    if (favouritesNode == null) {
+      return;
+    }
+
+    const decodedBase64String = atob(favouritesNode.textContent);
+    if (decodedBase64String.indexOf("\r\n") > 0) {
+      decodedBase64String.split("\r\n").forEach((line) => {
+        this._favouritesLookupTable.add(line);
+      });
+      return;
+    }
+
+    decodedBase64String.split("\n").forEach((line) => {
+      this._favouritesLookupTable.add(line);
+    });
+  }
+}
diff --git a/libs/importer/src/importers/password-depot/types/index.ts b/libs/importer/src/importers/password-depot/types/index.ts
new file mode 100644
index 00000000000..709e5992ae8
--- /dev/null
+++ b/libs/importer/src/importers/password-depot/types/index.ts
@@ -0,0 +1,2 @@
+export * from "./password-depot-item-type";
+export * from "./password-depot-custom-field-type";
diff --git a/libs/importer/src/importers/password-depot/types/password-depot-custom-field-type.ts b/libs/importer/src/importers/password-depot/types/password-depot-custom-field-type.ts
new file mode 100644
index 00000000000..166378b38b4
--- /dev/null
+++ b/libs/importer/src/importers/password-depot/types/password-depot-custom-field-type.ts
@@ -0,0 +1,15 @@
+/** This object represents the different custom field types in Password Depot */
+export const PasswordDepotCustomFieldType = Object.freeze({
+  Password: "1",
+  Memo: "2",
+  Date: "3",
+  Number: "4",
+  Boolean: "5",
+  Decimal: "6",
+  Email: "7",
+  URL: "8",
+} as const);
+
+/** This type represents the different custom field types in Password Depot */
+export type PasswordDepotCustomFieldType =
+  (typeof PasswordDepotCustomFieldType)[keyof typeof PasswordDepotCustomFieldType];
diff --git a/libs/importer/src/importers/password-depot/types/password-depot-item-type.ts b/libs/importer/src/importers/password-depot/types/password-depot-item-type.ts
new file mode 100644
index 00000000000..04ec3a48c85
--- /dev/null
+++ b/libs/importer/src/importers/password-depot/types/password-depot-item-type.ts
@@ -0,0 +1,19 @@
+/** This object represents the different item types in Password Depot */
+export const PasswordDepotItemType = Object.freeze({
+  Password: "0",
+  CreditCard: "1",
+  SoftwareLicense: "2",
+  Identity: "3",
+  Information: "4",
+  Banking: "5",
+  EncryptedFile: "6",
+  Document: "7",
+  RDP: "8",
+  Putty: "9",
+  TeamViewer: "10",
+  Certificate: "11",
+} as const);
+
+/** This type represents the different item types in Password Depot */
+export type PasswordDepotItemType =
+  (typeof PasswordDepotItemType)[keyof typeof PasswordDepotItemType];
diff --git a/libs/importer/src/importers/roboform-csv-importer.spec.ts b/libs/importer/src/importers/roboform-csv-importer.spec.ts
index 23604042a02..65221669154 100644
--- a/libs/importer/src/importers/roboform-csv-importer.spec.ts
+++ b/libs/importer/src/importers/roboform-csv-importer.spec.ts
@@ -16,7 +16,7 @@ describe("Roboform CSV Importer", () => {
     expect(result != null).toBe(true);
 
     expect(result.folders.length).toBe(0);
-    expect(result.ciphers.length).toBe(5);
+    expect(result.ciphers.length).toBe(4);
     expect(result.ciphers[0].name).toBe("Bitwarden");
     expect(result.ciphers[0].login.username).toBe("user@bitwarden.com");
     expect(result.ciphers[0].login.password).toBe("password");
@@ -31,13 +31,32 @@ describe("Roboform CSV Importer", () => {
     expect(result.ciphers.length).toBe(5);
   });
 
+  it("should parse CSV data totp", async () => {
+    const importer = new RoboFormCsvImporter();
+    const result = await importer.parse(dataNoFolder);
+    expect(result != null).toBe(true);
+
+    expect(result.ciphers[2].login.totp).toBe("totpKeyValue");
+  });
+
+  it("should parse CSV data custom fields", async () => {
+    const importer = new RoboFormCsvImporter();
+    const result = await importer.parse(dataNoFolder);
+    expect(result != null).toBe(true);
+
+    expect(result.ciphers[1].fields[0].name).toBe("Custom Field 1");
+    expect(result.ciphers[1].fields[0].value).toBe("Custom Field 1 Value");
+    expect(result.ciphers[1].fields[1].name).toBe("Custom Field 2");
+    expect(result.ciphers[1].fields[1].value).toBe("Custom Field 2 Value");
+  });
+
   it("should parse CSV data secure note", async () => {
     const importer = new RoboFormCsvImporter();
     const result = await importer.parse(dataNoFolder);
     expect(result != null).toBe(true);
-    expect(result.ciphers[4].type).toBe(CipherType.SecureNote);
-    expect(result.ciphers[4].notes).toBe("This is a safe note");
-    expect(result.ciphers[4].name).toBe("note - 2023-03-31");
+    expect(result.ciphers[3].type).toBe(CipherType.SecureNote);
+    expect(result.ciphers[3].notes).toBe("This is a safe note");
+    expect(result.ciphers[3].name).toBe("note - 2023-03-31");
   });
 
   it("should parse CSV data with folder hierarchy", async () => {
diff --git a/libs/importer/src/importers/roboform-csv-importer.ts b/libs/importer/src/importers/roboform-csv-importer.ts
index 50e899bebfd..eb8a1ceac6a 100644
--- a/libs/importer/src/importers/roboform-csv-importer.ts
+++ b/libs/importer/src/importers/roboform-csv-importer.ts
@@ -1,5 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { FieldType } from "@bitwarden/common/vault/enums";
+
 import { ImportResult } from "../models/import-result";
 
 import { BaseImporter } from "./base-importer";
@@ -31,19 +33,9 @@ export class RoboFormCsvImporter extends BaseImporter implements Importer {
       cipher.login.uris = this.makeUriArray(value.Url);
 
       if (!this.isNullOrWhitespace(value.Rf_fields)) {
-        let fields: string[] = [value.Rf_fields];
-        if (value.__parsed_extra != null && value.__parsed_extra.length > 0) {
-          fields = fields.concat(value.__parsed_extra);
-        }
-        fields.forEach((field: string) => {
-          const parts = field.split(":");
-          if (parts.length < 3) {
-            return;
-          }
-          const key = parts[0] === "-no-name-" ? null : parts[0];
-          const val = parts.length === 4 && parts[2] === "rck" ? parts[1] : parts[2];
-          this.processKvp(cipher, key, val);
-        });
+        this.parseRfFields(cipher, value);
+      } else if (!this.isNullOrWhitespace(value.RfFieldsV2)) {
+        this.parseRfFieldsV2(cipher, value);
       }
 
       this.convertToNoteIfNeeded(cipher);
@@ -68,4 +60,66 @@ export class RoboFormCsvImporter extends BaseImporter implements Importer {
     result.success = true;
     return Promise.resolve(result);
   }
+
+  private parseRfFields(cipher: any, value: any): void {
+    let fields: string[] = [value.Rf_fields];
+
+    if (value.__parsed_extra != null && value.__parsed_extra.length > 0) {
+      fields = fields.concat(value.__parsed_extra);
+    }
+
+    fields.forEach((field: string) => {
+      const parts = field.split(":");
+      if (parts.length < 3) {
+        return;
+      }
+      const key = parts[0] === "-no-name-" ? null : parts[0];
+      const val = parts.length === 4 && parts[2] === "rck" ? parts[1] : parts[2];
+      this.processKvp(cipher, key, val);
+    });
+  }
+
+  private parseRfFieldsV2(cipher: any, value: any): void {
+    let fields: string[] = [value.RfFieldsV2];
+    if (value.__parsed_extra != null && value.__parsed_extra.length > 0) {
+      fields = fields.concat(value.__parsed_extra);
+    }
+
+    let userIdCount = 1;
+    let passwordCount = 1;
+
+    fields.forEach((field: string) => {
+      const parts = field.split(",");
+      if (parts.length < 5) {
+        return;
+      }
+
+      const key = parts[0] === "-no-name-" ? null : parts[0];
+      const type = parts[3] === "pwd" ? FieldType.Hidden : FieldType.Text;
+      const val = parts[4];
+
+      if (key === "TOTP KEY$") {
+        cipher.login.totp = val;
+        return;
+      }
+
+      // Skip if value matches login fields
+      if (key === "User ID$" && val === cipher.login.username) {
+        return;
+      }
+      if (key === "Password$" && val === cipher.login.password) {
+        return;
+      }
+
+      // Index any extra User IDs or Passwords
+      let displayKey = key;
+      if (key === "User ID$") {
+        displayKey = `Alternate User ID ${userIdCount++}`;
+      } else if (key === "Password$") {
+        displayKey = `Alternate Password ${passwordCount++}`;
+      }
+
+      this.processKvp(cipher, displayKey, val, type);
+    });
+  }
 }
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/banking.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/banking.xml.ts
new file mode 100644
index 00000000000..3a2da1c27bf
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/banking.xml.ts
@@ -0,0 +1,283 @@
+export const BankingTestData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>
+        <group name="tempDB" fingerprint="CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D">            
+            <item>
+                <description>banking type</description>
+                <type>5</type>
+                <password>somePassword</password>
+                <username>someUser</username>
+                <url>some-bank.com</url>
+                <comment>someNote</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:11:29</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">02.05.2027</expirydate>
+                <importance>1</importance>
+                <fingerprint>DEB91652-52C6-402E-9D44-3557829BC6DF</fingerprint>
+                <template>&lt;USER&gt;&lt;TAB&gt;&lt;PASS&gt;&lt;ENTER&gt;</template>
+                <imageindex>127</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr></paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:09:17</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:09:17</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags></tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+                <customfields>
+                    <field>
+                        <name>IDS_ECHolder</name>
+                        <value>account holder</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_ECAccountNumber</name>
+                        <value>1234567890</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_ECBLZ</name>
+                        <value>12345678</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_ECBankName</name>
+                        <value>someBank</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_ECBIC</name>
+                        <value>bic</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_ECIBAN</name>
+                        <value>iban</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_ECCardNumber</name>
+                        <value>12345678</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>10</type>
+                    </field>
+                    <field>
+                        <name>IDS_ECPhone</name>
+                        <value>0049</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_ECLegitimacyID</name>
+                        <value>1234</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_ECPIN</name>
+                        <value>123</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>1</type>
+                    </field>
+                </customfields>
+                <tans>
+                    <tan>
+                        <number>1</number>
+                        <value>1234</value>
+                        <used fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:10:54</used>
+                        <amount> 100,00</amount>
+                        <comment>some TAN note</comment>
+                        <ccode>123</ccode>
+                    </tan>
+                    <tan>
+                        <number>2</number>
+                        <value>4321</value>
+                        <amount> 0,00</amount>
+                        <comment></comment>
+                        <ccode></ccode>
+                    </tan>
+                </tans>
+                <hitems>
+                    <hitem>
+                        <description>banking type</description>
+                        <type>5</type>
+                        <password>somePassword</password>
+                        <username>someUser</username>
+                        <url>some-bank.com</url>
+                        <comment>someNote</comment>
+                        <lastmodified fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:10:35</lastmodified>
+                        <expirydate fmt="dd.mm.yyyy">02.05.2027</expirydate>
+                        <importance>1</importance>
+                        <fingerprint>DEB91652-52C6-402E-9D44-3557829BC6DF</fingerprint>
+                        <template>&lt;USER&gt;&lt;TAB&gt;&lt;PASS&gt;&lt;ENTER&gt;</template>
+                        <imageindex>127</imageindex>
+                        <imagecustom>0</imagecustom>
+                        <wndtitle></wndtitle>
+                        <paramstr></paramstr>
+                        <category>Allgemein</category>
+                        <custombrowser></custombrowser>
+                        <autocompletemethod>0</autocompletemethod>
+                        <loginid></loginid>
+                        <passid></passid>
+                        <created fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:09:17</created>
+                        <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:09:17</lastaccessed>
+                        <donotaddon>0</donotaddon>
+                        <markassafe>0</markassafe>
+                        <safemode>0</safemode>
+                        <rndtype>1</rndtype>
+                        <rndcustom></rndcustom>
+                        <usagecount>0</usagecount>
+                        <keephistory>2</keephistory>
+                        <tags></tags>
+                        <author>DJSMI</author>
+                        <ownerid></ownerid>
+                        <warnmsg></warnmsg>
+                        <warnlvl>0</warnlvl>
+                        <warnverify></warnverify>
+                        <serverrqrd>0</serverrqrd>
+                        <secret></secret>
+                        <istemplate>0</istemplate>
+                        <infotemplate></infotemplate>
+                        <usetabs>161</usetabs>
+                        <islink>0</islink>
+                        <linkeditem></linkeditem>
+                        <customfields>
+                            <field>
+                                <name>IDS_ECHolder</name>
+                                <value>account holder</value>
+                                <visible>-1</visible>
+                                <kind>0</kind>
+                                <type>0</type>
+                            </field>
+                            <field>
+                                <name>IDS_ECAccountNumber</name>
+                                <value>1234567890</value>
+                                <visible>-1</visible>
+                                <kind>0</kind>
+                                <type>0</type>
+                            </field>
+                            <field>
+                                <name>IDS_ECBLZ</name>
+                                <value>12345678</value>
+                                <visible>-1</visible>
+                                <kind>0</kind>
+                                <type>0</type>
+                            </field>
+                            <field>
+                                <name>IDS_ECBankName</name>
+                                <value>someBank</value>
+                                <visible>-1</visible>
+                                <kind>0</kind>
+                                <type>0</type>
+                            </field>
+                            <field>
+                                <name>IDS_ECBIC</name>
+                                <value>bic</value>
+                                <visible>-1</visible>
+                                <kind>0</kind>
+                                <type>0</type>
+                            </field>
+                            <field>
+                                <name>IDS_ECIBAN</name>
+                                <value>iban</value>
+                                <visible>-1</visible>
+                                <kind>0</kind>
+                                <type>0</type>
+                            </field>
+                            <field>
+                                <name>IDS_ECCardNumber</name>
+                                <value>12345678</value>
+                                <visible>-1</visible>
+                                <kind>0</kind>
+                                <type>10</type>
+                            </field>
+                            <field>
+                                <name>IDS_ECPhone</name>
+                                <value>0049</value>
+                                <visible>0</visible>
+                                <kind>0</kind>
+                                <type>0</type>
+                            </field>
+                            <field>
+                                <name>IDS_ECLegitimacyID</name>
+                                <value>1234</value>
+                                <visible>-1</visible>
+                                <kind>0</kind>
+                                <type>0</type>
+                            </field>
+                            <field>
+                                <name>IDS_ECPIN</name>
+                                <value>123</value>
+                                <visible>0</visible>
+                                <kind>0</kind>
+                                <type>1</type>
+                            </field>
+                        </customfields>
+                    </hitem>
+                </hitems>
+            </item>
+        </group>
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>
+        QUY3NEZGODYtRkUzOS00NTg0LThFOTYtRkU5NTBDMjg5REY4DQo=
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>
+        QWxsZ2VtZWluDQpIb21lIEJhbmtpbmcNCkludGVybmV0DQpQcml2YXQNCldpbmRvd3MNCg==
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/certificate.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/certificate.xml.ts
new file mode 100644
index 00000000000..eb8c463d57f
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/certificate.xml.ts
@@ -0,0 +1,76 @@
+export const CertificateTestData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>
+        <group name="tempDB" fingerprint="CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D">            
+            <item>
+                <description>certificate type</description>
+                <type>11</type>
+                <password>somePassword</password>
+                <username></username>
+                <url></url>
+                <comment>someNote</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:15:57</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">00.00.0000</expirydate>
+                <importance>1</importance>
+                <fingerprint>21288702-B042-46D9-9DDF-B44A5CD04A72</fingerprint>
+                <template></template>
+                <imageindex>130</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr></paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:15:26</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:15:26</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags>someTag</tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+            </item>
+        </group>
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>
+        QUY3NEZGODYtRkUzOS00NTg0LThFOTYtRkU5NTBDMjg5REY4DQo=
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>
+        QWxsZ2VtZWluDQpIb21lIEJhbmtpbmcNCkludGVybmV0DQpQcml2YXQNCldpbmRvd3MNCg==
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/credit-card.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/credit-card.xml.ts
new file mode 100644
index 00000000000..f0af49bbfae
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/credit-card.xml.ts
@@ -0,0 +1,148 @@
+export const CreditCardTestData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>
+        <group name="tempDB" fingerprint="CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D">
+            <item>
+                <description>some CreditCard</description>
+                <type>1</type>
+                <password>4222422242224222</password>
+                <username>some CC holder</username>
+                <url></url>
+                <comment>someComment</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">08.05.2025 12:09:47</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">08.05.2026</expirydate>
+                <importance>1</importance>
+                <fingerprint>DD9B52F8-B2CE-42C2-A891-5E20DA23EA20</fingerprint>
+                <template></template>
+                <imageindex>126</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr></paramstr>
+                <category></category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">08.05.2025 12:08:48</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">08.05.2025 12:08:48</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags></tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+                <customfields>
+                    <field>
+                        <name>IDS_CardType</name>
+                        <value>0</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>4</type>
+                    </field>
+                    <field>
+                        <name>IDS_CardHolder</name>
+                        <value>some CC holder</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_CardNumber</name>
+                        <value>4222422242224222</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>10</type>
+                    </field>
+                    <field>
+                        <name>IDS_CardExpires</name>
+                        <value>05/2026</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>3</type>
+                    </field>
+                    <field>
+                        <name>IDS_CardCode</name>
+                        <value>123</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_CardPhone</name>
+                        <value></value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_CardURL</name>
+                        <value></value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>8</type>
+                    </field>
+                    <field>
+                        <name>IDS_CardAdditionalCode</name>
+                        <value></value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_CardAdditionalInfo</name>
+                        <value></value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_CardPIN</name>
+                        <value>123</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>1</type>
+                    </field>
+                </customfields>
+            </item>
+        </group>
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>
+        QUY3NEZGODYtRkUzOS00NTg0LThFOTYtRkU5NTBDMjg5REY4DQo=
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>
+        QWxsZ2VtZWluDQpIb21lIEJhbmtpbmcNCkludGVybmV0DQpQcml2YXQNCldpbmRvd3MNCg==
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/document.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/document.xml.ts
new file mode 100644
index 00000000000..4f607c9b048
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/document.xml.ts
@@ -0,0 +1,99 @@
+export const DocumentTestData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>
+        <group name="tempDB" fingerprint="CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D">
+            <item>
+                <description>document type</description>
+                <type>7</type>
+                <password></password>
+                <username></username>
+                <url></url>
+                <comment>document comment</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">03.06.2025 17:45:30</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">00.00.0000</expirydate>
+                <importance>1</importance>
+                <fingerprint>1B8E7F2C-9229-43C6-AB89-42101809C822</fingerprint>
+                <template></template>
+                <imageindex>133</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr></paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">05.06.2025 21:49:49</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags></tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+                <customfields>
+                    <field>
+                        <name>IDS_DocumentSize</name>
+                        <value>27071</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>4</type>
+                    </field>
+                    <field>
+                        <name>IDS_DocumentFolder</name>
+                        <value>C:\\Users\\DJSMI\\Downloads\\</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_DocumentFile</name>
+                        <value>C:\\Users\\DJSMI\\Downloads\\some.pdf</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                </customfields>
+            </item>
+        </group>
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>
+        QUY3NEZGODYtRkUzOS00NTg0LThFOTYtRkU5NTBDMjg5REY4DQo=
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>
+        QWxsZ2VtZWluDQpIb21lIEJhbmtpbmcNCkludGVybmV0DQpQcml2YXQNCldpbmRvd3MNCg==
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/encrypted-file.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/encrypted-file.xml.ts
new file mode 100644
index 00000000000..2d2e929440a
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/encrypted-file.xml.ts
@@ -0,0 +1,76 @@
+export const EncryptedFileTestData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>
+        <group name="tempDB" fingerprint="CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D">            
+            <item>
+                <description>encrypted file type</description>
+                <type>6</type>
+                <password>somePassword</password>
+                <username></username>
+                <url></url>
+                <comment>some comment</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:15:17</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">00.00.0000</expirydate>
+                <importance>1</importance>
+                <fingerprint>E4CA245D-A326-4359-9488-CC207B33C6C0</fingerprint>
+                <template></template>
+                <imageindex>132</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr></paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:14:58</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:14:58</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags></tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+            </item>
+        </group>
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>
+        QUY3NEZGODYtRkUzOS00NTg0LThFOTYtRkU5NTBDMjg5REY4DQo=
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>
+        QWxsZ2VtZWluDQpIb21lIEJhbmtpbmcNCkludGVybmV0DQpQcml2YXQNCldpbmRvd3MNCg==
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/identity.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/identity.xml.ts
new file mode 100644
index 00000000000..dfa275aa778
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/identity.xml.ts
@@ -0,0 +1,197 @@
+export const IdentityTestData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>
+        <group name="tempDB" fingerprint="CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D">
+            <item>
+                <description>identity type</description>
+                <type>3</type>
+                <password></password>
+                <username>account-name/id</username>
+                <url>website</url>
+                <comment>someNote</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:14:33</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">00.00.0000</expirydate>
+                <importance>1</importance>
+                <fingerprint>0E6085E9-7560-4826-814E-EFE1724E1377</fingerprint>
+                <template></template>
+                <imageindex>129</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr></paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:12:52</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:12:52</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags></tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+                <customfields>
+                    <field>
+                        <name>IDS_IdentityName</name>
+                        <value>account-name/id</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityEmail</name>
+                        <value>email</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityFirstName</name>
+                        <value>firstName</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityLastName</name>
+                        <value>surName</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityCompany</name>
+                        <value>someCompany</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityAddress1</name>
+                        <value>someStreet</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityAddress2</name>
+                        <value>address 2</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityCity</name>
+                        <value>town</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityState</name>
+                        <value>state</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityZIP</name>
+                        <value>zipCode</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityCountry</name>
+                        <value>country</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityPhone</name>
+                        <value>phoneNumber</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityWebsite</name>
+                        <value>website</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>8</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityBirthDate</name>
+                        <value>45789</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>3</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityMobile</name>
+                        <value>mobileNumber</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityFax</name>
+                        <value>faxNumber</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_IdentityHouseNumber</name>
+                        <value>123</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                </customfields>
+            </item>
+        </group>
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>
+        QUY3NEZGODYtRkUzOS00NTg0LThFOTYtRkU5NTBDMjg5REY4DQo=
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>
+        QWxsZ2VtZWluDQpIb21lIEJhbmtpbmcNCkludGVybmV0DQpQcml2YXQNCldpbmRvd3MNCg==
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/index.ts b/libs/importer/src/importers/spec-data/password-depot-xml/index.ts
new file mode 100644
index 00000000000..6d5903ed471
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/index.ts
@@ -0,0 +1,19 @@
+export { InvalidRootNodeData } from "./missing-root-node.xml";
+export { MissingPasswordsNodeData } from "./missing-passwords-node.xml";
+export { InvalidVersionData } from "./wrong-version.xml";
+export { EncryptedFileData } from "./noop-encrypted-file.xml";
+export { PasswordTestData } from "./password.xml";
+export { CreditCardTestData } from "./credit-card.xml";
+export { IdentityTestData } from "./identity.xml";
+export { RDPTestData } from "./rdp.xml";
+export { SoftwareLicenseTestData } from "./software-license.xml";
+export { TeamViewerTestData } from "./team-viewer.xml";
+export { PuttyTestData } from "./putty.xml";
+export { BankingTestData } from "./banking.xml";
+export { InformationTestData } from "./information.xml";
+export { CertificateTestData } from "./certificate.xml";
+export { EncryptedFileTestData } from "./encrypted-file.xml";
+export { DocumentTestData } from "./document.xml";
+export { MacOS_WrongVersion } from "./macos-wrong-version.xml";
+export { MacOS_PasswordDepotXmlFile } from "./macos-customfields.xml";
+export { MacOS_MultipleFolders } from "./macos-multiple-folders.xml";
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/information.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/information.xml.ts
new file mode 100644
index 00000000000..1f07882ea64
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/information.xml.ts
@@ -0,0 +1,85 @@
+export const InformationTestData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>
+        <group name="tempDB" fingerprint="CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D">            
+            <item>
+                <description>information type</description>
+                <type>4</type>
+                <password></password>
+                <username></username>
+                <url></url>
+                <comment></comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:14:54</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">00.00.0000</expirydate>
+                <importance>1</importance>
+                <fingerprint>546AFAE7-6F64-4040-838B-AFE691580356</fingerprint>
+                <template></template>
+                <imageindex>131</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr></paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:14:39</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:14:39</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags></tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+                <customfields>
+                    <field>
+                        <name>IDS_InformationText</name>
+                        <value>some note content</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>2</type>
+                    </field>
+                </customfields>
+            </item>
+        </group>
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>
+        QUY3NEZGODYtRkUzOS00NTg0LThFOTYtRkU5NTBDMjg5REY4DQo=
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>
+        QWxsZ2VtZWluDQpIb21lIEJhbmtpbmcNCkludGVybmV0DQpQcml2YXQNCldpbmRvd3MNCg==
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/macos-customfields.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/macos-customfields.xml.ts
new file mode 100644
index 00000000000..d83eae6bb6d
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/macos-customfields.xml.ts
@@ -0,0 +1,42 @@
+export const MacOS_PasswordDepotXmlFile = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/12.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <encrypted>0</encrypted>
+        <compressed>0</compressed>
+        <authtype>0</authtype>
+        <enctype>1</enctype>
+        <kdftype>1</kdftype>
+        <dataformat>17</dataformat>
+        <lastsynctime FMT="dd.MM.yyyy hh:mm:ss">30.12.1899 00:00:00</lastsynctime>
+        <lastmodified FMT="dd.MM.yyyy hh:mm:ss">23.06.2025 16:30:50</lastmodified>
+        <datetime FMT="dd.MM.yyyy hh:mm:ss">25.06.2025 14:30:47</datetime>
+        <fingerprint>2C1A154A-3BB0-4871-9537-3634DE303F8E</fingerprint>
+        <maxhistory>7</maxhistory>
+    </header>
+    <passwords>
+        <group name="null" fingerprint="null">            
+            <item>
+                <description>card 1</description>
+                <type>1</type>
+                <comment>comment</comment>
+                <lastmodified FMT="dd.MM.yyyy hh:mm:ss">23.06.2025 16:14:33</lastmodified>
+                <fingerprint>EBF4AC3D-86C9-49BE-826B-BAE5FF9E3575</fingerprint>
+                <created FMT="dd.MM.yyyy hh:mm:ss">23.06.2025 16:13:40</created>
+                <lastaccessed FMT="dd.MM.yyyy hh:mm:ss">25.06.2025 14:17:10</lastaccessed>
+                <customfields>
+                    <field name="IDS_CardType" value="2" />
+                    <field name="IDS_CardHolder" value="some CC holder" visible="1" />
+                    <field name="IDS_CardNumber" value="4242424242424242" visible="1" />
+                    <field name="IDS_CardExpires" value="8/2028" visible="1" />
+                    <field name="IDS_CardCode" value="125" visible="1" />
+                    <field name="IDS_CardPhone" visible="1" />
+                    <field name="IDS_CardURL" value="fede.com" visible="1" />
+                    <field name="IDS_CardAdditionalCode" visible="1" />
+                    <field name="IDS_CardAdditionalInfo" visible="1" />
+                    <field name="IDS_CardPIN" value="1122" visible="1" />
+                </customfields>                
+            </item>            
+        </group>
+    </passwords>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/macos-multiple-folders.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/macos-multiple-folders.xml.ts
new file mode 100644
index 00000000000..174e9415fa1
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/macos-multiple-folders.xml.ts
@@ -0,0 +1,215 @@
+export const MacOS_MultipleFolders = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/12.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <encrypted>0</encrypted>
+        <compressed>0</compressed>
+        <authtype>0</authtype>
+        <enctype>1</enctype>
+        <kdftype>1</kdftype>
+        <dataformat>17</dataformat>
+        <lastsynctime FMT="dd.MM.yyyy hh:mm:ss">30.12.1899 00:00:00</lastsynctime>
+        <lastmodified FMT="dd.MM.yyyy hh:mm:ss">27.06.2025 10:39:07</lastmodified>
+        <datetime FMT="dd.MM.yyyy hh:mm:ss">27.06.2025 10:39:27</datetime>
+        <fingerprint>7DCDD3FA-F512-4CD4-AEED-DE2A4C8375CF</fingerprint>
+        <maxhistory>7</maxhistory>
+    </header>
+    <passwords>
+        <group name="null" fingerprint="null">
+            <item>
+                <description>remote desktop</description>
+                <type>8</type>
+                <password>pass</password>
+                <username>username</username>
+                <url>compjter</url>
+                <comment>comment</comment>
+                <lastmodified FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:04:57</lastmodified>
+                <fingerprint>81316050-9B9C-4D9B-9549-45B52A0BE6BB</fingerprint>
+                <template>&lt;USER&gt;&lt;TAB&gt;&lt;PASS&gt;&lt;ENTER&gt;</template>
+                <category>Private</category>
+                <created FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:04:32</created>
+                <lastaccessed FMT="dd.MM.yyyy hh:mm:ss">27.06.2025 10:28:02</lastaccessed>
+                <tags>tgmac</tags>                
+            </item>
+            <item>
+                <description>teamviewer</description>
+                <type>10</type>
+                <password>pass</password>
+                <url>partnerid</url>
+                <comment>comment</comment>
+                <lastmodified FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:05:28</lastmodified>
+                <expirydate FMT="dd.MM.yyyy">26.06.2025</expirydate>
+                <fingerprint>8AAACC16-4FD4-4E52-9C1F-6979B051B510</fingerprint>
+                <category>Internet</category>
+                <created FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:05:03</created>
+                <lastaccessed FMT="dd.MM.yyyy hh:mm:ss">27.06.2025 10:28:02</lastaccessed>
+                <tags>tag</tags>
+                <customfields>
+                    <field name="IDS_TeamViewerMode" value="0" visible="1" />
+                </customfields>
+            </item>
+            <item>
+                <description>ec card</description>
+                <type>5</type>
+                <password>pass</password>
+                <username>user</username>
+                <url>url</url>
+                <lastmodified FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:08:35</lastmodified>
+                <fingerprint>B5C148A4-C408-427C-B69C-F88E7C529FA4</fingerprint>
+                <template>&lt;USER&gt;&lt;TAB&gt;&lt;PASS&gt;&lt;ENTER&gt;</template>
+                <created FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:08:00</created>
+                <lastaccessed FMT="dd.MM.yyyy hh:mm:ss">27.06.2025 10:28:02</lastaccessed>
+                <customfields>
+                    <field name="IDS_ECHolder" value="holder" visible="1" />
+                    <field name="IDS_ECAccountNumber" value="account" visible="1" />
+                    <field name="IDS_ECBLZ" value="bank" visible="1" />
+                    <field name="IDS_ECBankName" value="bank name" visible="1" />
+                    <field name="IDS_ECBIC" value="bic" visible="1" />
+                    <field name="IDS_ECIBAN" value="iban" visible="1" />
+                    <field name="IDS_ECCardNumber" value="6464646464646464" visible="1" />
+                    <field name="IDS_ECPhone" value="1324124" />
+                    <field name="IDS_ECLegitimacyID" value="leg id" visible="1" />
+                    <field name="IDS_ECPIN" value="1234" />
+                </customfields>
+            </item>
+            <item>
+                <description>identity</description>
+                <type>3</type>
+                <lastmodified FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:09:50</lastmodified>
+                <fingerprint>87574AD4-8844-4A01-9381-AFF0907198A3</fingerprint>
+                <created FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:09:19</created>
+                <lastaccessed FMT="dd.MM.yyyy hh:mm:ss">27.06.2025 10:28:02</lastaccessed>
+                <customfields>
+                    <field name="IDS_IdentityName" value="name" visible="1" />
+                    <field name="IDS_IdentityEmail" value="email" visible="1" />
+                    <field name="IDS_IdentityFirstName" value="first" visible="1" />
+                    <field name="IDS_IdentityLastName" value="last" visible="1" />
+                    <field name="IDS_IdentityCompany" value="compant" visible="1" />
+                    <field name="IDS_IdentityAddress1" value="street" visible="1" />
+                    <field name="IDS_IdentityAddress2" value="address" visible="1" />
+                    <field name="IDS_IdentityCity" value="city" visible="1" />
+                    <field name="IDS_IdentityState" value="state" visible="1" />
+                    <field name="IDS_IdentityZIP" value="zip" visible="1" />
+                    <field name="IDS_IdentityCountry" value="country" visible="1" />
+                    <field name="IDS_IdentityPhone" value="phone" visible="1" />
+                    <field name="IDS_IdentityWebsite" value="web" visible="1" />
+                    <field name="IDS_IdentityBirthDate" visible="1" />
+                    <field name="IDS_IdentityMobile" visible="1" />
+                    <field name="IDS_IdentityFax" visible="1" />
+                    <field name="IDS_IdentityHouseNumber" visible="1" />
+                </customfields>
+            </item>
+            <item>
+                <description>credit card</description>
+                <type>1</type>
+                <comment>comment</comment>
+                <lastmodified FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 19:07:38</lastmodified>
+                <fingerprint>E98E3CBA-1578-48AD-8E41-CFD3280045BB</fingerprint>
+                <created FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:06:32</created>
+                <lastaccessed FMT="dd.MM.yyyy hh:mm:ss">27.06.2025 10:28:02</lastaccessed>
+                <customfields>
+                    <field name="IDS_CardType" value="0" />
+                    <field name="IDS_CardHolder" value="holder" visible="1" />
+                    <field name="IDS_CardNumber" value="525252525252525" visible="1" />
+                    <field name="IDS_CardExpires" value="6/2028" visible="1" />
+                    <field name="IDS_CardCode" value="333" visible="1" />
+                    <field name="IDS_CardPhone" value="1234324" visible="1" />
+                    <field name="IDS_CardURL" value="url" visible="1" />
+                    <field name="IDS_CardAdditionalCode" value="code" visible="1" />
+                    <field name="IDS_CardAdditionalInfo" value="addinfo" visible="1" />
+                    <field name="IDS_CardPIN" value="111" visible="1" />
+                </customfields>
+            </item>
+            <group name="folder macos" fingerprint="BF823CF6-B9D1-49FD-AEB9-4F59BDD8DBB5"
+                imageindex="-1" imagecustom="0" category="null" comments="null">
+                <item>
+                    <description>password</description>
+                    <password>passmac</password>
+                    <username>usernam</username>
+                    <comment>comment</comment>
+                    <lastmodified FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:04:30</lastmodified>
+                    <fingerprint>DE8AD61B-8EC0-4E72-9BC8-971E80712B50</fingerprint>
+                    <template>&lt;USER&gt;&lt;TAB&gt;&lt;PASS&gt;&lt;ENTER&gt;</template>
+                    <category>General</category>
+                    <created FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:04:04</created>
+                    <lastaccessed FMT="dd.MM.yyyy hh:mm:ss">27.06.2025 10:28:02</lastaccessed>
+                    <tags>tagmac</tags>
+                </item>
+                <item>
+                    <description>informationb</description>
+                    <type>4</type>
+                    <lastmodified FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:10:01</lastmodified>
+                    <fingerprint>7E9E6941-BB3B-47F2-9E43-33F900EBBF95</fingerprint>
+                    <category>Banking</category>
+                    <created FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:09:53</created>
+                    <lastaccessed FMT="dd.MM.yyyy hh:mm:ss">27.06.2025 10:28:02</lastaccessed>
+                    <customfields>
+                        <field name="IDS_InformationText" value="content" />
+                    </customfields>
+                </item>
+                <item>
+                    <description>certificat</description>
+                    <type>11</type>
+                    <password>passsss</password>
+                    <comment>comment</comment>
+                    <lastmodified FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:10:28</lastmodified>
+                    <expirydate FMT="dd.MM.yyyy">26.06.2025</expirydate>
+                    <fingerprint>1F36748F-0374-445E-B020-282EAE26259F</fingerprint>
+                    <category>Internet</category>
+                    <created FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:10:10</created>
+                    <lastaccessed FMT="dd.MM.yyyy hh:mm:ss">27.06.2025 10:28:02</lastaccessed>
+                    <tags>tag</tags>
+                </item>
+            </group>
+            <group name="folder 2" fingerprint="84E728B7-67AC-47D7-9F8C-4335905A4087"
+                imageindex="-1" imagecustom="0" category="null" comments="null">
+                <item>
+                    <description>putty</description>
+                    <type>9</type>
+                    <password>pass</password>
+                    <username>username</username>
+                    <url>host</url>
+                    <comment>comment</comment>
+                    <lastmodified FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:06:08</lastmodified>
+                    <expirydate FMT="dd.MM.yyyy">26.06.2025</expirydate>
+                    <fingerprint>7947A949-98F0-4F26-BE12-5FFAFE7601C8</fingerprint>
+                    <template>&lt;USER&gt;&lt;TAB&gt;&lt;PASS&gt;&lt;ENTER&gt;</template>
+                    <category>Banking</category>
+                    <created FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:05:38</created>
+                    <lastaccessed FMT="dd.MM.yyyy hh:mm:ss">27.06.2025 10:28:02</lastaccessed>
+                    <tags>tag</tags>
+                    <customfields>
+                        <field name="IDS_PuTTyProtocol" value="0" visible="1" />
+                        <field name="IDS_PuTTyKeyFile" value="keyfile" visible="1" />
+                        <field name="IDS_PuTTyKeyPassword" value="keypass" visible="1" />
+                        <field name="IDS_PuTTyPort" value="port" visible="1" />
+                    </customfields>
+                </item>
+                <item>
+                    <description>soft license</description>
+                    <type>2</type>
+                    <lastmodified FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:09:02</lastmodified>
+                    <fingerprint>2A5CF4C1-70D0-4F27-A1DE-4CFEF5FB71CF</fingerprint>
+                    <created FMT="dd.MM.yyyy hh:mm:ss">26.06.2025 16:08:43</created>
+                    <lastaccessed FMT="dd.MM.yyyy hh:mm:ss">27.06.2025 10:28:02</lastaccessed>
+                    <customfields>
+                        <field name="IDS_LicenseProduct" value="prod" />
+                        <field name="IDS_LicenseVersion" value="version" />
+                        <field name="IDS_LicenseName" value="registered" visible="1" />
+                        <field name="IDS_LicenseKey" visible="1" />
+                        <field name="IDS_LicenseAdditionalKey" visible="1" />
+                        <field name="IDS_LicenseURL" value="url" visible="1" />
+                        <field name="IDS_LicenseProtected" value="protected" />
+                        <field name="IDS_LicenseUserName" value="username" visible="1" />
+                        <field name="IDS_LicensePassword" value="pass" visible="1" />
+                        <field name="IDS_LicensePurchaseDate" value="2147483647" />
+                        <field name="IDS_LicenseOrderNumber"
+                            value="ccbdflbunjrcnilnerjnekirlfvefkbfinhkegljd" visible="1" />
+                        <field name="IDS_LicenseEmail" value="ccc" visible="1" />
+                        <field name="IDS_LicenseExpires" />
+                    </customfields>                    
+                </item>
+            </group>
+        </group>
+    </passwords>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/macos-wrong-version.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/macos-wrong-version.xml.ts
new file mode 100644
index 00000000000..771bf813e48
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/macos-wrong-version.xml.ts
@@ -0,0 +1,21 @@
+export const MacOS_WrongVersion = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/12.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <encrypted>0</encrypted>
+        <compressed>0</compressed>
+        <authtype>0</authtype>
+        <enctype>1</enctype>
+        <kdftype>1</kdftype>
+        <dataformat>18</dataformat>
+        <lastsynctime FMT="dd.MM.yyyy hh:mm:ss">30.12.1899 00:00:00</lastsynctime>
+        <lastmodified FMT="dd.MM.yyyy hh:mm:ss">23.06.2025 16:30:50</lastmodified>
+        <datetime FMT="dd.MM.yyyy hh:mm:ss">25.06.2025 14:30:47</datetime>
+        <fingerprint>2C1A154A-3BB0-4871-9537-3634DE303F8E</fingerprint>
+        <maxhistory>7</maxhistory>
+    </header>
+    <passwords>
+        <group name="null" fingerprint="null">
+        </group>
+    </passwords>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/missing-passwords-node.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/missing-passwords-node.xml.ts
new file mode 100644
index 00000000000..d07beb8521c
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/missing-passwords-node.xml.ts
@@ -0,0 +1,25 @@
+export const MissingPasswordsNodeData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/18.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>    
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>        
+    </favorites>
+    <sitestoignore>
+    </sitestoignore>
+    <categories>        
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/missing-root-node.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/missing-root-node.xml.ts
new file mode 100644
index 00000000000..aca2a2f6fa1
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/missing-root-node.xml.ts
@@ -0,0 +1,28 @@
+export const InvalidRootNodeData = `<?xml version="1.0" encoding="utf-8"?>
+<invalidRootNode xmlns="https://www.password-depot.de/schemas/passwordfile/18.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>        
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>        
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>        
+    </categories>
+</invalidRootNode>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/noop-encrypted-file.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/noop-encrypted-file.xml.ts
new file mode 100644
index 00000000000..e8050726b25
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/noop-encrypted-file.xml.ts
@@ -0,0 +1,27 @@
+export const EncryptedFileData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>True</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>        
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>        
+    </favorites>
+    <sitestoignore>
+    </sitestoignore>
+    <categories>
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/password.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/password.xml.ts
new file mode 100644
index 00000000000..7d15fce3aa8
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/password.xml.ts
@@ -0,0 +1,222 @@
+export const PasswordTestData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>
+        <group name="tempDB" fingerprint="CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D">
+            <item>
+                <description>password type</description>
+                <type>0</type>
+                <password>p6J&lt;]fmjv!:H&amp;iJ7/Mwt@3i8</password>
+                <username>someUser</username>
+                <url>example.com</url>
+                <comment>someComment</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">07.05.2025 13:37:56</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">07.05.2025</expirydate>
+                <importance>0</importance>
+                <fingerprint>27ACAC2D-8DDA-4088-8D3A-E6C5F40ED46E</fingerprint>
+                <template>&lt;USER&gt;&lt;TAB&gt;&lt;PASS&gt;&lt;ENTER&gt;</template>
+                <imageindex>0</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr></paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">07.05.2025 13:36:48</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">07.05.2025 13:36:48</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags>someTag</tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+                <customfields>
+                    <field>
+                        <name>passwort</name>
+                        <value>password</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>1</type>
+                    </field>
+                    <field>
+                        <name>memo</name>
+                        <value>memo</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>2</type>
+                    </field>
+                    <field>
+                        <name>datum</name>
+                        <value>45790</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>3</type>
+                    </field>
+                    <field>
+                        <name>nummer</name>
+                        <value>1</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>4</type>
+                    </field>
+                    <field>
+                        <name>boolean</name>
+                        <value>1</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>5</type>
+                    </field>
+                    <field>
+                        <name>decimal</name>
+                        <value>1,01</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>6</type>
+                    </field>
+                    <field>
+                        <name>email</name>
+                        <value>who@cares.com</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>7</type>
+                    </field>
+                    <field>
+                        <name>url</name>
+                        <value>example.com</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>8</type>
+                    </field>
+                </customfields>
+            </item>
+            <item>
+                <description>password type (2)</description>
+                <type>0</type>
+                <password>p6J&lt;]fmjv!:H&amp;iJ7/Mwt@3i8</password>
+                <username>someUser</username>
+                <url></url>
+                <comment>someComment</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">07.05.2025 13:37:56</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">07.05.2025</expirydate>
+                <importance>0</importance>
+                <fingerprint>AF74FF86-FE39-4584-8E96-FE950C289DF8</fingerprint>
+                <template>&lt;USER&gt;&lt;TAB&gt;&lt;PASS&gt;&lt;ENTER&gt;</template>
+                <imageindex>0</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr></paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">07.05.2025 13:36:48</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">07.05.2025 13:36:48</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags>someTag</tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+            </item>
+             <item>
+                <description>password type (3)</description>
+                <type>0</type>
+                <password>p6J&lt;]fmjv!:H&amp;iJ7/Mwt@3i8</password>
+                <username>someUser</username>
+                <url></url>
+                <comment>someComment</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">07.05.2025 13:37:56</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">07.05.2025</expirydate>
+                <importance>0</importance>
+                <fingerprint>BF74FF86-FA39-4584-8E96-FA950C249DF8</fingerprint>
+                <template>&lt;USER&gt;&lt;TAB&gt;&lt;PASS&gt;&lt;ENTER&gt;</template>
+                <imageindex>0</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr></paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">07.05.2025 13:36:48</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">07.05.2025 13:36:48</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags>someTag</tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+            </item>
+        </group>
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>
+        QUY3NEZGODYtRkUzOS00NTg0LThFOTYtRkU5NTBDMjg5REY4CkJGNzRGRjg2LUZBMzktNDU4NC04RTk2LUZBOTUwQzI0OURGOA==
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>
+        QWxsZ2VtZWluDQpIb21lIEJhbmtpbmcNCkludGVybmV0DQpQcml2YXQNCldpbmRvd3MNCg==
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/putty.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/putty.xml.ts
new file mode 100644
index 00000000000..d878b04cd3c
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/putty.xml.ts
@@ -0,0 +1,106 @@
+export const PuttyTestData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>
+        <group name="tempDB" fingerprint="CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D">            
+            <item>
+                <description>Putty type</description>
+                <type>9</type>
+                <password>somePassword</password>
+                <username>someUser</username>
+                <url>localhost</url>
+                <comment>someNote</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:09:09</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">00.00.0000</expirydate>
+                <importance>1</importance>
+                <fingerprint>32207D79-B70B-4987-BC73-3F7AD75D2C63</fingerprint>
+                <template></template>
+                <imageindex>125</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr>cli command</paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:08:18</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:08:18</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags>someTag</tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+                <customfields>
+                    <field>
+                        <name>IDS_PuTTyProtocol</name>
+                        <value>0</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_PuTTyKeyFile</name>
+                        <value>pathToKeyFile</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_PuTTyKeyPassword</name>
+                        <value>passwordForKeyFile</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>1</type>
+                    </field>
+                    <field>
+                        <name>IDS_PuTTyPort</name>
+                        <value>8080</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>4</type>
+                    </field>
+                </customfields>
+            </item>            
+        </group>
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>
+        QUY3NEZGODYtRkUzOS00NTg0LThFOTYtRkU5NTBDMjg5REY4DQo=
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>
+        QWxsZ2VtZWluDQpIb21lIEJhbmtpbmcNCkludGVybmV0DQpQcml2YXQNCldpbmRvd3MNCg==
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/rdp.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/rdp.xml.ts
new file mode 100644
index 00000000000..fafc375f9a6
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/rdp.xml.ts
@@ -0,0 +1,76 @@
+export const RDPTestData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>
+        <group name="tempDB" fingerprint="CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D">
+            <item>
+                <description>rdp type</description>
+                <type>8</type>
+                <password>somePassword</password>
+                <username>someUser</username>
+                <url>ms-rd:subscribe?url=https://contoso.com</url>
+                <comment>someNote</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:07:33</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">12.05.2025</expirydate>
+                <importance>1</importance>
+                <fingerprint>24CFF328-3036-48E3-99A3-85CD337725D3</fingerprint>
+                <template></template>
+                <imageindex>123</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr>commandline command</paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:06:24</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:06:24</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags>sometag</tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+            </item>
+        </group>
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>
+        QUY3NEZGODYtRkUzOS00NTg0LThFOTYtRkU5NTBDMjg5REY4DQo=
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>
+        QWxsZ2VtZWluDQpIb21lIEJhbmtpbmcNCkludGVybmV0DQpQcml2YXQNCldpbmRvd3MNCg==
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/software-license.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/software-license.xml.ts
new file mode 100644
index 00000000000..5ab9437c3d7
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/software-license.xml.ts
@@ -0,0 +1,169 @@
+export const SoftwareLicenseTestData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>
+        <group name="tempDB" fingerprint="CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D">
+            <item>
+                <description>software-license type</description>
+                <type>2</type>
+                <password>somePassword</password>
+                <username>someUserName</username>
+                <url>example.com</url>
+                <comment>someComment</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:12:48</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">00.00.0000</expirydate>
+                <importance>1</importance>
+                <fingerprint>220206EB-BE82-4E78-8FFB-9316D854721F</fingerprint>
+                <template></template>
+                <imageindex>128</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr></paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:11:33</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:11:33</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags></tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+                <customfields>
+                    <field>
+                        <name>IDS_LicenseProduct</name>
+                        <value>someProduct</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_LicenseVersion</name>
+                        <value>someVersion</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_LicenseName</name>
+                        <value>some User</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_LicenseKey</name>
+                        <value>license-key</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_LicenseAdditionalKey</name>
+                        <value>additional-license-key</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_LicenseURL</name>
+                        <value>example.com</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>8</type>
+                    </field>
+                    <field>
+                        <name>IDS_LicenseProtected</name>
+                        <value>1</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>5</type>
+                    </field>
+                    <field>
+                        <name>IDS_LicenseUserName</name>
+                        <value>someUserName</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_LicensePassword</name>
+                        <value>somePassword</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>1</type>
+                    </field>
+                    <field>
+                        <name>IDS_LicensePurchaseDate</name>
+                        <value>45789</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>3</type>
+                    </field>
+                    <field>
+                        <name>IDS_LicenseOrderNumber</name>
+                        <value>order number</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                    <field>
+                        <name>IDS_LicenseEmail</name>
+                        <value>someEmail</value>
+                        <visible>-1</visible>
+                        <kind>0</kind>
+                        <type>7</type>
+                    </field>
+                    <field>
+                        <name>IDS_LicenseExpires</name>
+                        <value>Nie</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>3</type>
+                    </field>
+                </customfields>
+            </item>            
+        </group>
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>
+        QUY3NEZGODYtRkUzOS00NTg0LThFOTYtRkU5NTBDMjg5REY4DQo=
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>
+        QWxsZ2VtZWluDQpIb21lIEJhbmtpbmcNCkludGVybmV0DQpQcml2YXQNCldpbmRvd3MNCg==
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/team-viewer.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/team-viewer.xml.ts
new file mode 100644
index 00000000000..911c621c59a
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/team-viewer.xml.ts
@@ -0,0 +1,85 @@
+export const TeamViewerTestData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/17.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>17.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>
+        <group name="tempDB" fingerprint="CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D">            
+            <item>
+                <description>TeamViewer type</description>
+                <type>10</type>
+                <password>somePassword</password>
+                <username></username>
+                <url>partnerId</url>
+                <comment>someNote</comment>
+                <lastmodified fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:08:14</lastmodified>
+                <expirydate fmt="dd.mm.yyyy">00.00.0000</expirydate>
+                <importance>1</importance>
+                <fingerprint>AE650032-5963-4D93-8E2E-69F216405C29</fingerprint>
+                <template></template>
+                <imageindex>124</imageindex>
+                <imagecustom>0</imagecustom>
+                <wndtitle></wndtitle>
+                <paramstr></paramstr>
+                <category>Allgemein</category>
+                <custombrowser></custombrowser>
+                <autocompletemethod>0</autocompletemethod>
+                <loginid></loginid>
+                <passid></passid>
+                <created fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:07:41</created>
+                <lastaccessed fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:07:41</lastaccessed>
+                <donotaddon>0</donotaddon>
+                <markassafe>0</markassafe>
+                <safemode>0</safemode>
+                <rndtype>1</rndtype>
+                <rndcustom></rndcustom>
+                <usagecount>0</usagecount>
+                <keephistory>2</keephistory>
+                <tags>someTag</tags>
+                <author>DJSMI</author>
+                <ownerid></ownerid>
+                <warnmsg></warnmsg>
+                <warnlvl>0</warnlvl>
+                <warnverify></warnverify>
+                <serverrqrd>0</serverrqrd>
+                <secret></secret>
+                <istemplate>0</istemplate>
+                <infotemplate></infotemplate>
+                <usetabs>161</usetabs>
+                <islink>0</islink>
+                <linkeditem></linkeditem>
+                <customfields>
+                    <field>
+                        <name>IDS_TeamViewerMode</name>
+                        <value>0</value>
+                        <visible>0</visible>
+                        <kind>0</kind>
+                        <type>0</type>
+                    </field>
+                </customfields>
+            </item>            
+        </group>
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>
+        QUY3NEZGODYtRkUzOS00NTg0LThFOTYtRkU5NTBDMjg5REY4DQo=
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>
+        QWxsZ2VtZWluDQpIb21lIEJhbmtpbmcNCkludGVybmV0DQpQcml2YXQNCldpbmRvd3MNCg==
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/password-depot-xml/wrong-version.xml.ts b/libs/importer/src/importers/spec-data/password-depot-xml/wrong-version.xml.ts
new file mode 100644
index 00000000000..90b766ded1b
--- /dev/null
+++ b/libs/importer/src/importers/spec-data/password-depot-xml/wrong-version.xml.ts
@@ -0,0 +1,28 @@
+export const InvalidVersionData = `<?xml version="1.0" encoding="utf-8"?>
+<passwordfile xmlns="https://www.password-depot.de/schemas/passwordfile/18.0/passwordfile.xsd">
+    <header>
+        <application>Password Depot</application>
+        <version>18.0.0</version>
+        <comments></comments>
+        <hint></hint>
+        <fingerprint>CCDA8015-7F21-4344-BDF0-9EA6AF8AE31D</fingerprint>
+        <datetime fmt="dd.mm.yyyy hh:mm:ss">12.05.2025 15:16:11</datetime>
+        <encrypted>False</encrypted>
+        <backupinterval>0</backupinterval>
+        <lastbackup fmt="dd.mm.yyyy hh:mm:ss">30.12.1899 00:00:00</lastbackup>
+        <hash></hash>
+    </header>
+    <passwords>        
+    </passwords>
+    <recyclebin>
+    </recyclebin>
+    <infotemplates>
+    </infotemplates>
+    <favorites>        
+    </favorites>
+    <sitestoignore>
+
+    </sitestoignore>
+    <categories>        
+    </categories>
+</passwordfile>`;
diff --git a/libs/importer/src/importers/spec-data/roboform-csv/empty-folders.ts b/libs/importer/src/importers/spec-data/roboform-csv/empty-folders.ts
index 0c90f68470d..17ddac4ac8b 100644
--- a/libs/importer/src/importers/spec-data/roboform-csv/empty-folders.ts
+++ b/libs/importer/src/importers/spec-data/roboform-csv/empty-folders.ts
@@ -1,6 +1,5 @@
 export const data = `Name,Url,MatchUrl,Login,Pwd,Note,Folder,RfFieldsV2
 Bitwarden,https://bitwarden.com,https://bitwarden.com,user@bitwarden.com,password,,,"User ID$,,,txt,user@bitwarden.com","Password$,,,pwd,password"
-Test,https://www.test.com/,https://www.test.com/,test@gmail.com,:testPassword,test,,"User ID$,,,txt,test@gmail.com","Password$,,,pwd,:testPassword"
-LoginWebsite,https://login.Website.com/,https://login.Website.com/,test@outlook.com,123password,,,"User ID$,,,txt,test@outlook.com","Password$,,,pwd,123password"
-Website,https://signin.website.com/,https://signin.website.com/,user@bitwarden.com,password123,Website ,,"User ID$,,,txt,user@bitwarden.com","Password$,,,pwd,password123"
+Customfields,https://www.customfields.com,https://www.customfields.com,customfields@gmail.com,customfieldsPassword,,,"User ID$,,,txt,customfields@gmail.com","Password$,,,pwd,customfieldsPassword","Custom Field 1,,,txt,Custom Field 1 Value","Custom Field 2,,,txt,Custom Field 2 Value"
+Totpwebsite,https://www.totpwebsite.com,https://www.totpwebsite.com,totp@gmail.com,totpPassword,,,"User ID$,,,txt,totp@gmail.com","Password$,,,pwd,totpPassword","TOTP KEY$,,,txt,totpKeyValue"
 note - 2023-03-31,,,,,This is a safe note,`;
diff --git a/libs/importer/src/models/import-options.ts b/libs/importer/src/models/import-options.ts
index a8c4b4e0a8a..205dbaf0198 100644
--- a/libs/importer/src/models/import-options.ts
+++ b/libs/importer/src/models/import-options.ts
@@ -73,6 +73,7 @@ export const regularImportOptions = [
   { id: "passkyjson", name: "Passky (json)" },
   { id: "passwordxpcsv", name: "Password XP (csv)" },
   { id: "netwrixpasswordsecure", name: "Netwrix Password Secure (csv)" },
+  { id: "passworddepot17xml", name: "Password Depot 17 (xml)" },
 ] as const;
 
 export type ImportType =
diff --git a/libs/importer/src/services/import.service.spec.ts b/libs/importer/src/services/import.service.spec.ts
index 6c8656f4c1d..f71c34bf209 100644
--- a/libs/importer/src/services/import.service.spec.ts
+++ b/libs/importer/src/services/import.service.spec.ts
@@ -112,10 +112,6 @@ describe("ImportService", () => {
     mockImportTargetFolder.name = "myImportTarget";
 
     it("passing importTarget adds it to folders", async () => {
-      folderService.getAllDecryptedFromState.mockReturnValue(
-        Promise.resolve([mockImportTargetFolder]),
-      );
-
       await importService["setImportTarget"](importResult, null, mockImportTargetFolder);
       expect(importResult.folders.length).toBe(1);
       expect(importResult.folders[0]).toBe(mockImportTargetFolder);
@@ -130,12 +126,6 @@ describe("ImportService", () => {
     mockFolder2.name = "folder2";
 
     it("passing importTarget sets it as new root for all existing folders", async () => {
-      folderService.getAllDecryptedFromState.mockResolvedValue([
-        mockImportTargetFolder,
-        mockFolder1,
-        mockFolder2,
-      ]);
-
       importResult.folders.push(mockFolder1);
       importResult.folders.push(mockFolder2);
 
@@ -166,11 +156,6 @@ describe("ImportService", () => {
     mockCollection1.organizationId = organizationId;
 
     it("passing importTarget adds it to collections", async () => {
-      collectionService.getAllDecrypted.mockResolvedValue([
-        mockImportTargetCollection,
-        mockCollection1,
-      ]);
-
       await importService["setImportTarget"](
         importResult,
         organizationId,
@@ -181,12 +166,6 @@ describe("ImportService", () => {
     });
 
     it("passing importTarget sets it as new root for all existing collections", async () => {
-      collectionService.getAllDecrypted.mockResolvedValue([
-        mockImportTargetCollection,
-        mockCollection1,
-        mockCollection2,
-      ]);
-
       importResult.collections.push(mockCollection1);
       importResult.collections.push(mockCollection2);
 
@@ -226,12 +205,6 @@ describe("ImportService", () => {
     });
 
     it("passing importTarget, collectionRelationship has the expected values", async () => {
-      collectionService.getAllDecrypted.mockResolvedValue([
-        mockImportTargetCollection,
-        mockCollection1,
-        mockCollection2,
-      ]);
-
       importResult.ciphers.push(createCipher({ name: "cipher1" }));
       importResult.ciphers.push(createCipher({ name: "cipher2" }));
       importResult.collectionRelationships.push([0, 0]);
@@ -249,12 +222,6 @@ describe("ImportService", () => {
     });
 
     it("passing importTarget, folderRelationship has the expected values", async () => {
-      folderService.getAllDecryptedFromState.mockResolvedValue([
-        mockImportTargetFolder,
-        mockFolder1,
-        mockFolder2,
-      ]);
-
       importResult.folders.push(mockFolder1);
       importResult.folders.push(mockFolder2);
 
diff --git a/libs/importer/src/services/import.service.ts b/libs/importer/src/services/import.service.ts
index adfa427c660..c9cb325d10b 100644
--- a/libs/importer/src/services/import.service.ts
+++ b/libs/importer/src/services/import.service.ts
@@ -21,7 +21,7 @@ import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.serv
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
-import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherType, toCipherTypeName } from "@bitwarden/common/vault/enums";
 import { CipherRequest } from "@bitwarden/common/vault/models/request/cipher.request";
 import { FolderWithIdRequest } from "@bitwarden/common/vault/models/request/folder-with-id.request";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -90,6 +90,7 @@ import {
   YotiCsvImporter,
   ZohoVaultCsvImporter,
   PasswordXPCsvImporter,
+  PasswordDepot17XmlImporter,
 } from "../importers";
 import { Importer } from "../importers/importer";
 import {
@@ -348,6 +349,8 @@ export class ImportService implements ImportServiceAbstraction {
         return new PasswordXPCsvImporter();
       case "netwrixpasswordsecure":
         return new NetwrixPasswordSecureCsvImporter();
+      case "passworddepot17xml":
+        return new PasswordDepot17XmlImporter();
       default:
         return null;
     }
@@ -362,7 +365,7 @@ export class ImportService implements ImportServiceAbstraction {
       const c = await this.cipherService.encrypt(importResult.ciphers[i], activeUserId);
       request.ciphers.push(new CipherRequest(c));
     }
-    const userKey = await this.keyService.getUserKeyWithLegacySupport(activeUserId);
+    const userKey = await this.keyService.getUserKey(activeUserId);
     if (importResult.folders != null) {
       for (let i = 0; i < importResult.folders.length; i++) {
         const f = await this.folderService.encrypt(importResult.folders[i], userKey);
@@ -426,7 +429,7 @@ export class ImportService implements ImportServiceAbstraction {
       switch (key.match(/^\w+/)[0]) {
         case "Ciphers":
           item = importResult.ciphers[i];
-          itemType = CipherType[item.type];
+          itemType = toCipherTypeName(item.type);
           break;
         case "Folders":
           item = importResult.folders[i];
diff --git a/libs/importer/tsconfig.json b/libs/importer/tsconfig.json
index e16a16a0337..919c7bf77bf 100644
--- a/libs/importer/tsconfig.json
+++ b/libs/importer/tsconfig.json
@@ -1,22 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/components": ["../components/src"],
-      "@bitwarden/generator-core": ["../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/key-management-ui/jest.config.js b/libs/key-management-ui/jest.config.js
index 9373a8d2aed..6a1fbdd63e1 100644
--- a/libs/key-management-ui/jest.config.js
+++ b/libs/key-management-ui/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
@@ -8,13 +8,12 @@ const sharedConfig = require("../../libs/shared/jest.config.angular");
 module.exports = {
   ...sharedConfig,
   displayName: "libs/key management ui tests",
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
     // lets us use @bitwarden/common/spec in tests
-    { "@bitwarden/common/spec": ["../common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
 };
diff --git a/libs/key-management-ui/src/key-rotation/key-rotation-trust-info.component.ts b/libs/key-management-ui/src/key-rotation/key-rotation-trust-info.component.ts
index 51e6058ae5b..a2d3de3b30f 100644
--- a/libs/key-management-ui/src/key-rotation/key-rotation-trust-info.component.ts
+++ b/libs/key-management-ui/src/key-rotation/key-rotation-trust-info.component.ts
@@ -20,7 +20,6 @@ type KeyRotationTrustDialogData = {
 @Component({
   selector: "key-rotation-trust-info",
   templateUrl: "key-rotation-trust-info.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/key-management-ui/src/lock/components/lock.component.ts b/libs/key-management-ui/src/lock/components/lock.component.ts
index 3cb0dbaca52..3d5951a5ac4 100644
--- a/libs/key-management-ui/src/lock/components/lock.component.ts
+++ b/libs/key-management-ui/src/lock/components/lock.component.ts
@@ -16,8 +16,7 @@ import {
 } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { AnonLayoutWrapperDataService } from "@bitwarden/auth/angular";
-import { PinServiceAbstraction } from "@bitwarden/auth/common";
+import { LogoutService, PinServiceAbstraction } from "@bitwarden/auth/common";
 import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -42,6 +41,7 @@ import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/pass
 import { UserKey } from "@bitwarden/common/types/key";
 import {
   AsyncActionsModule,
+  AnonLayoutWrapperDataService,
   ButtonModule,
   DialogService,
   FormFieldModule,
@@ -77,7 +77,6 @@ const AUTOPROMPT_BIOMETRICS_PROCESS_RELOAD_DELAY = 5000;
 @Component({
   selector: "bit-lock",
   templateUrl: "lock.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
@@ -157,6 +156,7 @@ export class LockComponent implements OnInit, OnDestroy {
     private userAsymmetricKeysRegenerationService: UserAsymmetricKeysRegenerationService,
 
     private biometricService: BiometricsService,
+    private logoutService: LogoutService,
 
     private lockComponentService: LockComponentService,
     private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
@@ -249,7 +249,7 @@ export class LockComponent implements OnInit, OnDestroy {
 
   private async handleActiveAccountChange(activeAccount: Account) {
     // this account may be unlocked, prevent any prompts so we can redirect to vault
-    if (await this.keyService.hasUserKeyInMemory(activeAccount.id)) {
+    if (await this.keyService.hasUserKey(activeAccount.id)) {
       return;
     }
 
@@ -354,7 +354,9 @@ export class LockComponent implements OnInit, OnDestroy {
     });
 
     if (confirmed && this.activeAccount != null) {
-      this.messagingService.send("logout", { userId: this.activeAccount.id });
+      await this.logoutService.logout(this.activeAccount.id);
+      // navigate to root so redirect guard can properly route next active user or null user to correct page
+      await this.router.navigate(["/"]);
     }
   }
 
@@ -389,6 +391,8 @@ export class LockComponent implements OnInit, OnDestroy {
         return;
       }
 
+      this.logService.error("[LockComponent] Failed to unlock via biometrics.", e);
+
       let biometricTranslatedErrorDesc;
 
       if (this.clientType === "browser") {
diff --git a/libs/key-management-ui/src/trust/account-recovery-trust.component.ts b/libs/key-management-ui/src/trust/account-recovery-trust.component.ts
index e1ec390a460..8eec776bbb6 100644
--- a/libs/key-management-ui/src/trust/account-recovery-trust.component.ts
+++ b/libs/key-management-ui/src/trust/account-recovery-trust.component.ts
@@ -28,7 +28,6 @@ type AccountRecoveryTrustDialogData = {
 @Component({
   selector: "account-recovery-trust",
   templateUrl: "account-recovery-trust.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/key-management-ui/src/trust/emergency-access-trust.component.ts b/libs/key-management-ui/src/trust/emergency-access-trust.component.ts
index 29ee64798e9..35c6b16c873 100644
--- a/libs/key-management-ui/src/trust/emergency-access-trust.component.ts
+++ b/libs/key-management-ui/src/trust/emergency-access-trust.component.ts
@@ -28,7 +28,6 @@ type EmergencyAccessTrustDialogData = {
 @Component({
   selector: "emergency-access-trust",
   templateUrl: "emergency-access-trust.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/key-management-ui/tsconfig.json b/libs/key-management-ui/tsconfig.json
index bb263f3a2b9..9c607a26b09 100644
--- a/libs/key-management-ui/tsconfig.json
+++ b/libs/key-management-ui/tsconfig.json
@@ -1,22 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/angular": ["../auth/src/angular"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/components": ["../components/src/index.ts"],
-      "@bitwarden/generator-core": ["../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../key-management/src/index.ts"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/key-management-ui/tsconfig.spec.json b/libs/key-management-ui/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/libs/key-management-ui/tsconfig.spec.json
+++ b/libs/key-management-ui/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/libs/key-management/jest.config.js b/libs/key-management/jest.config.js
index ad8023e906b..a074621a098 100644
--- a/libs/key-management/jest.config.js
+++ b/libs/key-management/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
@@ -8,13 +8,12 @@ const sharedConfig = require("../../libs/shared/jest.config.angular");
 module.exports = {
   ...sharedConfig,
   displayName: "libs/key management tests",
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
     // lets us use @bitwarden/common/spec in tests
-    { "@bitwarden/common/spec": ["../common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
 };
diff --git a/libs/key-management/src/abstractions/key.service.ts b/libs/key-management/src/abstractions/key.service.ts
index 95b79890c6a..bbe0dd50f3d 100644
--- a/libs/key-management/src/abstractions/key.service.ts
+++ b/libs/key-management/src/abstractions/key.service.ts
@@ -83,13 +83,18 @@ export abstract class KeyService {
    * Gets the user key from memory and sets it again,
    * kicking off a refresh of any additional keys
    * (such as auto, biometrics, or pin)
+   * @param userId The target user to refresh keys for.
+   * @throws Error when userId is null or undefined.
+   * @throws When userKey doesn't exist in memory for the target user.
    */
-  abstract refreshAdditionalKeys(): Promise<void>;
+  abstract refreshAdditionalKeys(userId: UserId): Promise<void>;
+
   /**
-   * Observable value that returns whether or not the currently active user has ever had auser key,
+   * Observable value that returns whether or not the user has ever had a userKey,
    * i.e. has ever been unlocked/decrypted. This is key for differentiating between TDE locked and standard locked states.
    */
-  abstract everHadUserKey$: Observable<boolean>;
+  abstract everHadUserKey$(userId: UserId): Observable<boolean>;
+
   /**
    * Retrieves the user key
    * @param userId The desired user
@@ -126,30 +131,20 @@ export abstract class KeyService {
    * @param keySuffix The desired version of the user's key to retrieve
    * @param userId The desired user
    * @returns The user key
+   * @throws Error when userId is null or undefined.
    */
   abstract getUserKeyFromStorage(
     keySuffix: KeySuffixOptions,
-    userId?: string,
+    userId: string,
   ): Promise<UserKey | null>;
 
-  /**
-   * Determines whether the user key is available for the given user.
-   * @param userId The desired user. If not provided, the active user will be used. If no active user exists, the method will return false.
-   * @returns True if the user key is available
-   */
-  abstract hasUserKey(userId?: UserId): Promise<boolean>;
   /**
    * Determines whether the user key is available for the given user in memory.
-   * @param userId The desired user. If not provided, the active user will be used. If no active user exists, the method will return false.
-   * @returns True if the user key is available
+   * @param userId The desired user. If null or undefined, will return false.
+   * @returns True if the user key is available, returns false otherwise.
    */
-  abstract hasUserKeyInMemory(userId?: string): Promise<boolean>;
-  /**
-   * @param keySuffix The desired version of the user's key to check
-   * @param userId The desired user
-   * @returns True if the provided version of the user key is stored
-   */
-  abstract hasUserKeyStored(keySuffix: KeySuffixOptions, userId?: string): Promise<boolean>;
+  abstract hasUserKey(userId: UserId): Promise<boolean>;
+
   /**
    * Generates a new user key
    * @throws Error when master key is null and there is no active user
@@ -161,15 +156,9 @@ export abstract class KeyService {
    * Clears the user's stored version of the user key
    * @param keySuffix The desired version of the key to clear
    * @param userId The desired user
+   * @throws Error when userId is null or undefined.
    */
-  abstract clearStoredUserKey(keySuffix: KeySuffixOptions, userId?: string): Promise<void>;
-  /**
-   * Stores the master key encrypted user key
-   * @throws Error when userId is null and there is no active user.
-   * @param userKeyMasterKey The master key encrypted user key to set
-   * @param userId The desired user
-   */
-  abstract setMasterKeyEncryptedUserKey(userKeyMasterKey: string, userId?: UserId): Promise<void>;
+  abstract clearStoredUserKey(keySuffix: KeySuffixOptions, userId: string): Promise<void>;
   /**
    * @throws Error when userId is null and no active user
    * @param password The user's master password that will be used to derive a master key if one isn't found
diff --git a/libs/key-management/src/biometrics/biometrics-commands.ts b/libs/key-management/src/biometrics/biometrics-commands.ts
index 1ef31a31fb4..38a666e45e5 100644
--- a/libs/key-management/src/biometrics/biometrics-commands.ts
+++ b/libs/key-management/src/biometrics/biometrics-commands.ts
@@ -12,8 +12,4 @@ export enum BiometricsCommands {
 
   /** Checks whether the biometric unlock can be enabled. */
   CanEnableBiometricUnlock = "canEnableBiometricUnlock",
-
-  // legacy
-  Unlock = "biometricUnlock",
-  IsAvailable = "biometricUnlockAvailable",
 }
diff --git a/libs/key-management/src/key.service.spec.ts b/libs/key-management/src/key.service.spec.ts
index 6d2e8fd20ec..7d7ac99898d 100644
--- a/libs/key-management/src/key.service.spec.ts
+++ b/libs/key-management/src/key.service.spec.ts
@@ -14,6 +14,7 @@ import { KeyGenerationService } from "@bitwarden/common/platform/abstractions/ke
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { KeySuffixOptions } from "@bitwarden/common/platform/enums";
 import { Encrypted } from "@bitwarden/common/platform/interfaces/encrypted";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString, EncryptedString } from "@bitwarden/common/platform/models/domain/enc-string";
@@ -34,7 +35,6 @@ import {
   FakeAccountService,
   mockAccountServiceWith,
   FakeStateProvider,
-  FakeActiveUserState,
   FakeSingleUserState,
 } from "@bitwarden/common/spec";
 import { CsprngArray } from "@bitwarden/common/types/csprng";
@@ -90,6 +90,35 @@ describe("keyService", () => {
     expect(keyService).not.toBeFalsy();
   });
 
+  describe("refreshAdditionalKeys", () => {
+    test.each([null as unknown as UserId, undefined as unknown as UserId])(
+      "throws when the provided userId is %s",
+      async (userId) => {
+        await expect(keyService.refreshAdditionalKeys(userId)).rejects.toThrow(
+          "UserId is required",
+        );
+      },
+    );
+
+    it("throws error if user key not found", async () => {
+      stateProvider.singleUser.getFake(mockUserId, USER_KEY).nextState(null);
+
+      await expect(keyService.refreshAdditionalKeys(mockUserId)).rejects.toThrow(
+        "No user key found for: " + mockUserId,
+      );
+    });
+
+    it("refreshes additional keys when user key is available", async () => {
+      const mockUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      stateProvider.singleUser.getFake(mockUserId, USER_KEY).nextState(mockUserKey);
+      const setUserKeySpy = jest.spyOn(keyService, "setUserKey");
+
+      await keyService.refreshAdditionalKeys(mockUserId);
+
+      expect(setUserKeySpy).toHaveBeenCalledWith(mockUserKey, mockUserId);
+    });
+  });
+
   describe("getUserKey", () => {
     let mockUserKey: UserKey;
 
@@ -119,39 +148,25 @@ describe("keyService", () => {
     });
   });
 
-  describe.each(["hasUserKey", "hasUserKeyInMemory"])(`%s`, (methodName: string) => {
+  describe("hasUserKey", () => {
     let mockUserKey: UserKey;
-    let method: (userId?: UserId) => Promise<boolean>;
 
     beforeEach(() => {
       const mockRandomBytes = new Uint8Array(64) as CsprngArray;
       mockUserKey = new SymmetricCryptoKey(mockRandomBytes) as UserKey;
-      method =
-        methodName === "hasUserKey"
-          ? keyService.hasUserKey.bind(keyService)
-          : keyService.hasUserKeyInMemory.bind(keyService);
     });
 
+    test.each([null as unknown as UserId, undefined as unknown as UserId])(
+      "returns false when userId is %s",
+      async (userId) => {
+        expect(await keyService.hasUserKey(userId)).toBe(false);
+      },
+    );
+
     it.each([true, false])("returns %s if the user key is set", async (hasKey) => {
       stateProvider.singleUser.getFake(mockUserId, USER_KEY).nextState(hasKey ? mockUserKey : null);
-      expect(await method(mockUserId)).toBe(hasKey);
+      expect(await keyService.hasUserKey(mockUserId)).toBe(hasKey);
     });
-
-    it("returns false when no active userId is set", async () => {
-      accountService.activeAccountSubject.next(null);
-      expect(await method()).toBe(false);
-    });
-
-    it.each([true, false])(
-      "resolves %s for active user id when none is provided",
-      async (hasKey) => {
-        stateProvider.activeUserId$ = of(mockUserId);
-        stateProvider.singleUser
-          .getFake(mockUserId, USER_KEY)
-          .nextState(hasKey ? mockUserKey : null);
-        expect(await method()).toBe(hasKey);
-      },
-    );
   });
 
   describe("getUserKeyWithLegacySupport", () => {
@@ -190,28 +205,28 @@ describe("keyService", () => {
   });
 
   describe("everHadUserKey$", () => {
-    let everHadUserKeyState: FakeActiveUserState<boolean>;
+    let everHadUserKeyState: FakeSingleUserState<boolean>;
 
     beforeEach(() => {
-      everHadUserKeyState = stateProvider.activeUser.getFake(USER_EVER_HAD_USER_KEY);
+      everHadUserKeyState = stateProvider.singleUser.getFake(mockUserId, USER_EVER_HAD_USER_KEY);
     });
 
     it("should return true when stored value is true", async () => {
       everHadUserKeyState.nextState(true);
 
-      expect(await firstValueFrom(keyService.everHadUserKey$)).toBe(true);
+      expect(await firstValueFrom(keyService.everHadUserKey$(mockUserId))).toBe(true);
     });
 
     it("should return false when stored value is false", async () => {
       everHadUserKeyState.nextState(false);
 
-      expect(await firstValueFrom(keyService.everHadUserKey$)).toBe(false);
+      expect(await firstValueFrom(keyService.everHadUserKey$(mockUserId))).toBe(false);
     });
 
     it("should return false when stored value is null", async () => {
       everHadUserKeyState.nextState(null);
 
-      expect(await firstValueFrom(keyService.everHadUserKey$)).toBe(false);
+      expect(await firstValueFrom(keyService.everHadUserKey$(mockUserId))).toBe(false);
     });
   });
 
@@ -381,6 +396,58 @@ describe("keyService", () => {
     });
   });
 
+  describe("makeSendKey", () => {
+    const mockRandomBytes = new Uint8Array(16) as CsprngArray;
+    it("calls keyGenerationService with expected hard coded parameters", async () => {
+      await keyService.makeSendKey(mockRandomBytes);
+
+      expect(keyGenerationService.deriveKeyFromMaterial).toHaveBeenCalledWith(
+        mockRandomBytes,
+        "bitwarden-send",
+        "send",
+      );
+    });
+  });
+
+  describe("clearStoredUserKey", () => {
+    describe("input validation", () => {
+      const invalidUserIdTestCases = [
+        { keySuffix: KeySuffixOptions.Auto, userId: null as unknown as UserId },
+        { keySuffix: KeySuffixOptions.Auto, userId: undefined as unknown as UserId },
+        { keySuffix: KeySuffixOptions.Pin, userId: null as unknown as UserId },
+        { keySuffix: KeySuffixOptions.Pin, userId: undefined as unknown as UserId },
+      ];
+      test.each(invalidUserIdTestCases)(
+        "throws when keySuffix is $keySuffix and userId is $userId",
+        async ({ keySuffix, userId }) => {
+          await expect(keyService.clearStoredUserKey(keySuffix, userId)).rejects.toThrow(
+            "UserId is required",
+          );
+        },
+      );
+    });
+
+    describe("with Auto key suffix", () => {
+      it("UserKeyAutoUnlock is cleared and pin keys are not cleared", async () => {
+        await keyService.clearStoredUserKey(KeySuffixOptions.Auto, mockUserId);
+
+        expect(stateService.setUserKeyAutoUnlock).toHaveBeenCalledWith(null, {
+          userId: mockUserId,
+        });
+        expect(pinService.clearPinKeyEncryptedUserKeyEphemeral).not.toHaveBeenCalled();
+      });
+    });
+
+    describe("with PIN key suffix", () => {
+      it("pin keys are cleared and user key auto unlock not", async () => {
+        await keyService.clearStoredUserKey(KeySuffixOptions.Pin, mockUserId);
+
+        expect(stateService.setUserKeyAutoUnlock).not.toHaveBeenCalled();
+        expect(pinService.clearPinKeyEncryptedUserKeyEphemeral).toHaveBeenCalledWith(mockUserId);
+      });
+    });
+  });
+
   describe("clearKeys", () => {
     test.each([null as unknown as UserId, undefined as unknown as UserId])(
       "throws when the provided userId is %s",
@@ -897,4 +964,84 @@ describe("keyService", () => {
       });
     });
   });
+
+  describe("getUserKeyFromStorage", () => {
+    let mockUserKey: UserKey;
+    let validateUserKeySpy: jest.SpyInstance;
+
+    beforeEach(() => {
+      mockUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
+      validateUserKeySpy = jest.spyOn(keyService, "validateUserKey");
+    });
+
+    afterEach(() => {
+      validateUserKeySpy.mockRestore();
+    });
+
+    describe("input validation", () => {
+      const invalidUserIdTestCases = [
+        { keySuffix: KeySuffixOptions.Auto, userId: null as unknown as UserId },
+        { keySuffix: KeySuffixOptions.Auto, userId: undefined as unknown as UserId },
+        { keySuffix: KeySuffixOptions.Pin, userId: null as unknown as UserId },
+        { keySuffix: KeySuffixOptions.Pin, userId: undefined as unknown as UserId },
+      ];
+
+      test.each(invalidUserIdTestCases)(
+        "throws when keySuffix is $keySuffix and userId is $userId",
+        async ({ keySuffix, userId }) => {
+          await expect(keyService.getUserKeyFromStorage(keySuffix, userId)).rejects.toThrow(
+            "UserId is required",
+          );
+        },
+      );
+    });
+
+    describe("with Pin keySuffix", () => {
+      it("returns null and doesn't validate the key", async () => {
+        const result = await keyService.getUserKeyFromStorage(KeySuffixOptions.Pin, mockUserId);
+
+        expect(result).toBeNull();
+        expect(validateUserKeySpy).not.toHaveBeenCalled();
+      });
+    });
+
+    describe("with Auto keySuffix", () => {
+      it("returns validated key from storage when key exists and is valid", async () => {
+        stateService.getUserKeyAutoUnlock.mockResolvedValue(mockUserKey.keyB64);
+        validateUserKeySpy.mockResolvedValue(true);
+
+        const result = await keyService.getUserKeyFromStorage(KeySuffixOptions.Auto, mockUserId);
+
+        expect(result).toEqual(mockUserKey);
+        expect(validateUserKeySpy).toHaveBeenCalledWith(mockUserKey, mockUserId);
+        expect(stateService.getUserKeyAutoUnlock).toHaveBeenCalledWith({
+          userId: mockUserId,
+        });
+      });
+
+      it("returns null when no key is found in storage", async () => {
+        stateService.getUserKeyAutoUnlock.mockResolvedValue(null as unknown as string);
+
+        const result = await keyService.getUserKeyFromStorage(KeySuffixOptions.Auto, mockUserId);
+
+        expect(result).toBeNull();
+        expect(validateUserKeySpy).not.toHaveBeenCalled();
+      });
+
+      it("clears stored keys when userKey validation fails", async () => {
+        stateService.getUserKeyAutoUnlock.mockResolvedValue(mockUserKey.keyB64);
+        validateUserKeySpy.mockResolvedValue(false);
+
+        const result = await keyService.getUserKeyFromStorage(KeySuffixOptions.Auto, mockUserId);
+
+        expect(result).toEqual(mockUserKey);
+        expect(validateUserKeySpy).toHaveBeenCalledWith(mockUserKey, mockUserId);
+        expect(logService.warning).toHaveBeenCalledWith("Invalid key, throwing away stored keys");
+        expect(pinService.clearPinKeyEncryptedUserKeyEphemeral).toHaveBeenCalledWith(mockUserId);
+        expect(stateService.setUserKeyAutoUnlock).toHaveBeenCalledWith(null, {
+          userId: mockUserId,
+        });
+      });
+    });
+  });
 });
diff --git a/libs/key-management/src/key.service.ts b/libs/key-management/src/key.service.ts
index 1d4fcc86a0c..a8e75123b85 100644
--- a/libs/key-management/src/key.service.ts
+++ b/libs/key-management/src/key.service.ts
@@ -41,7 +41,7 @@ import {
   USER_EVER_HAD_USER_KEY,
   USER_KEY,
 } from "@bitwarden/common/platform/services/key-state/user-key.state";
-import { ActiveUserState, StateProvider } from "@bitwarden/common/platform/state";
+import { StateProvider } from "@bitwarden/common/platform/state";
 import { CsprngArray } from "@bitwarden/common/types/csprng";
 import { OrganizationId, ProviderId, UserId } from "@bitwarden/common/types/guid";
 import {
@@ -63,10 +63,6 @@ import {
 import { KdfConfig } from "./models/kdf-config";
 
 export class DefaultKeyService implements KeyServiceAbstraction {
-  private readonly activeUserEverHadUserKey: ActiveUserState<boolean>;
-
-  readonly everHadUserKey$: Observable<boolean>;
-
   readonly activeUserOrgKeys$: Observable<Record<OrganizationId, OrgKey>>;
 
   constructor(
@@ -82,10 +78,6 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     protected stateProvider: StateProvider,
     protected kdfConfigService: KdfConfigService,
   ) {
-    // User Key
-    this.activeUserEverHadUserKey = stateProvider.getActive(USER_EVER_HAD_USER_KEY);
-    this.everHadUserKey$ = this.activeUserEverHadUserKey.state$.pipe(map((x) => x ?? false));
-
     this.activeUserOrgKeys$ = this.stateProvider.activeUserId$.pipe(
       switchMap((userId) => (userId != null ? this.orgKeys$(userId) : NEVER)),
     ) as Observable<Record<OrganizationId, OrgKey>>;
@@ -130,15 +122,23 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     await this.setPrivateKey(encPrivateKey, userId);
   }
 
-  async refreshAdditionalKeys(): Promise<void> {
-    const activeUserId = await firstValueFrom(this.stateProvider.activeUserId$);
-
-    if (activeUserId == null) {
-      throw new Error("Can only refresh keys while there is an active user.");
+  async refreshAdditionalKeys(userId: UserId): Promise<void> {
+    if (userId == null) {
+      throw new Error("UserId is required.");
     }
 
-    const key = await this.getUserKey(activeUserId);
-    await this.setUserKey(key, activeUserId);
+    const key = await firstValueFrom(this.userKey$(userId));
+    if (key == null) {
+      throw new Error("No user key found for: " + userId);
+    }
+
+    await this.setUserKey(key, userId);
+  }
+
+  everHadUserKey$(userId: UserId): Observable<boolean> {
+    return this.stateProvider
+      .getUser(userId, USER_EVER_HAD_USER_KEY)
+      .state$.pipe(map((x) => x ?? false));
   }
 
   getInMemoryUserKeyFor$(userId: UserId): Observable<UserKey> {
@@ -180,11 +180,10 @@ export class DefaultKeyService implements KeyServiceAbstraction {
 
   async getUserKeyFromStorage(
     keySuffix: KeySuffixOptions,
-    userId?: UserId,
+    userId: UserId,
   ): Promise<UserKey | null> {
-    userId ??= await firstValueFrom(this.stateProvider.activeUserId$);
     if (userId == null) {
-      throw new Error("No active user id found.");
+      throw new Error("UserId is required");
     }
 
     const userKey = await this.getKeyFromStorage(keySuffix, userId);
@@ -199,16 +198,7 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     return userKey;
   }
 
-  async hasUserKey(userId?: UserId): Promise<boolean> {
-    userId ??= await firstValueFrom(this.stateProvider.activeUserId$);
-    if (userId == null) {
-      return false;
-    }
-    return await this.hasUserKeyInMemory(userId);
-  }
-
-  async hasUserKeyInMemory(userId?: UserId): Promise<boolean> {
-    userId ??= await firstValueFrom(this.stateProvider.activeUserId$);
+  async hasUserKey(userId: UserId): Promise<boolean> {
     if (userId == null) {
       return false;
     }
@@ -216,10 +206,6 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     return (await firstValueFrom(this.stateProvider.getUserState$(USER_KEY, userId))) != null;
   }
 
-  async hasUserKeyStored(keySuffix: KeySuffixOptions, userId?: UserId): Promise<boolean> {
-    return (await this.getKeyFromStorage(keySuffix, userId)) != null;
-  }
-
   async makeUserKey(masterKey: MasterKey | null): Promise<[UserKey, EncString]> {
     if (masterKey == null) {
       const userId = await firstValueFrom(this.stateProvider.activeUserId$);
@@ -251,28 +237,17 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     await this.clearAllStoredUserKeys(userId);
   }
 
-  async clearStoredUserKey(keySuffix: KeySuffixOptions, userId?: UserId): Promise<void> {
-    if (keySuffix === KeySuffixOptions.Auto) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.stateService.setUserKeyAutoUnlock(null, { userId: userId });
-    }
-    if (keySuffix === KeySuffixOptions.Pin && userId != null) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      this.pinService.clearPinKeyEncryptedUserKeyEphemeral(userId);
-    }
-  }
-
-  async setMasterKeyEncryptedUserKey(userKeyMasterKey: string, userId?: UserId): Promise<void> {
-    userId ??= await firstValueFrom(this.stateProvider.activeUserId$);
+  async clearStoredUserKey(keySuffix: KeySuffixOptions, userId: UserId): Promise<void> {
     if (userId == null) {
-      throw new Error("No active user id found.");
+      throw new Error("UserId is required");
     }
 
-    await this.masterPasswordService.setMasterKeyEncryptedUserKey(
-      new EncString(userKeyMasterKey),
-      userId,
-    );
+    if (keySuffix === KeySuffixOptions.Auto) {
+      await this.stateService.setUserKeyAutoUnlock(null, { userId: userId });
+    }
+    if (keySuffix === KeySuffixOptions.Pin) {
+      await this.pinService.clearPinKeyEncryptedUserKeyEphemeral(userId);
+    }
   }
 
   // TODO: Move to MasterPasswordService
diff --git a/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.ts b/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.ts
index 096e9236a30..dbdac6bfc99 100644
--- a/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.ts
+++ b/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.ts
@@ -162,17 +162,26 @@ export class DefaultUserAsymmetricKeysRegenerationService
     const ciphers = await this.cipherService.getAll(userId);
     const cipher = ciphers.find((cipher) => cipher.organizationId == null);
 
-    if (cipher != null) {
-      try {
-        await cipher.decrypt(userKey);
-        return true;
-      } catch (error) {
+    if (!cipher) {
+      return false;
+    }
+
+    try {
+      const cipherView = await cipher.decrypt(userKey);
+
+      if (cipherView.decryptionFailure) {
         this.logService.error(
-          "[UserAsymmetricKeyRegeneration] User Symmetric Key validation error: " + error,
+          "[UserAsymmetricKeyRegeneration] User Symmetric Key validation error: Cipher decryption failed",
         );
         return false;
       }
+
+      return true;
+    } catch (error) {
+      this.logService.error(
+        "[UserAsymmetricKeyRegeneration] User Symmetric Key validation error: " + error,
+      );
+      return false;
     }
-    return false;
   }
 }
diff --git a/libs/key-management/tsconfig.json b/libs/key-management/tsconfig.json
index 3d22cb2ec51..9c607a26b09 100644
--- a/libs/key-management/tsconfig.json
+++ b/libs/key-management/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/key-management": ["../key-management/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/key-management/tsconfig.spec.json b/libs/key-management/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/libs/key-management/tsconfig.spec.json
+++ b/libs/key-management/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/libs/logging/README.md b/libs/logging/README.md
new file mode 100644
index 00000000000..d2ef90cb3f9
--- /dev/null
+++ b/libs/logging/README.md
@@ -0,0 +1,5 @@
+# logging
+
+Owned by: platform
+
+Logging primitives
diff --git a/libs/logging/eslint.config.mjs b/libs/logging/eslint.config.mjs
new file mode 100644
index 00000000000..9c37d10e3ff
--- /dev/null
+++ b/libs/logging/eslint.config.mjs
@@ -0,0 +1,3 @@
+import baseConfig from "../../eslint.config.mjs";
+
+export default [...baseConfig];
diff --git a/libs/logging/jest.config.js b/libs/logging/jest.config.js
new file mode 100644
index 00000000000..a231d3bfce9
--- /dev/null
+++ b/libs/logging/jest.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  displayName: "logging",
+  preset: "../../jest.preset.js",
+  testEnvironment: "node",
+  transform: {
+    "^.+\\.[tj]s$": ["ts-jest", { tsconfig: "<rootDir>/tsconfig.spec.json" }],
+  },
+  moduleFileExtensions: ["ts", "js", "html"],
+  coverageDirectory: "../../coverage/libs/logging",
+};
diff --git a/libs/logging/package.json b/libs/logging/package.json
new file mode 100644
index 00000000000..b9cfbe35eb0
--- /dev/null
+++ b/libs/logging/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@bitwarden/logging",
+  "version": "0.0.1",
+  "description": "Logging primitives",
+  "private": true,
+  "type": "commonjs",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "license": "GPL-3.0",
+  "author": "platform"
+}
diff --git a/libs/logging/project.json b/libs/logging/project.json
new file mode 100644
index 00000000000..f2b5db313be
--- /dev/null
+++ b/libs/logging/project.json
@@ -0,0 +1,33 @@
+{
+  "name": "logging",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/logging/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/logging",
+        "main": "libs/logging/src/index.ts",
+        "tsConfig": "libs/logging/tsconfig.lib.json",
+        "assets": ["libs/logging/*.md"]
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/logging/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/logging/jest.config.js"
+      }
+    }
+  }
+}
diff --git a/libs/logging/src/console-log.service.ts b/libs/logging/src/console-log.service.ts
new file mode 100644
index 00000000000..3a4ffe9ead1
--- /dev/null
+++ b/libs/logging/src/console-log.service.ts
@@ -0,0 +1,57 @@
+import { LogLevel } from "./log-level";
+import { LogService } from "./log.service";
+
+export class ConsoleLogService implements LogService {
+  protected timersMap: Map<string, [number, number]> = new Map();
+
+  constructor(
+    protected isDev: boolean,
+    protected filter: ((level: LogLevel) => boolean) | null = null,
+  ) {}
+
+  debug(message?: any, ...optionalParams: any[]) {
+    if (!this.isDev) {
+      return;
+    }
+    this.write(LogLevel.Debug, message, ...optionalParams);
+  }
+
+  info(message?: any, ...optionalParams: any[]) {
+    this.write(LogLevel.Info, message, ...optionalParams);
+  }
+
+  warning(message?: any, ...optionalParams: any[]) {
+    this.write(LogLevel.Warning, message, ...optionalParams);
+  }
+
+  error(message?: any, ...optionalParams: any[]) {
+    this.write(LogLevel.Error, message, ...optionalParams);
+  }
+
+  write(level: LogLevel, message?: any, ...optionalParams: any[]) {
+    if (this.filter != null && this.filter(level)) {
+      return;
+    }
+
+    switch (level) {
+      case LogLevel.Debug:
+        // eslint-disable-next-line
+        console.log(message, ...optionalParams);
+        break;
+      case LogLevel.Info:
+        // eslint-disable-next-line
+        console.log(message, ...optionalParams);
+        break;
+      case LogLevel.Warning:
+        // eslint-disable-next-line
+        console.warn(message, ...optionalParams);
+        break;
+      case LogLevel.Error:
+        // eslint-disable-next-line
+        console.error(message, ...optionalParams);
+        break;
+      default:
+        break;
+    }
+  }
+}
diff --git a/libs/logging/src/index.ts b/libs/logging/src/index.ts
new file mode 100644
index 00000000000..8ce4b62cd3f
--- /dev/null
+++ b/libs/logging/src/index.ts
@@ -0,0 +1,3 @@
+export { LogService } from "./log.service";
+export { LogLevel } from "./log-level";
+export { ConsoleLogService } from "./console-log.service";
diff --git a/libs/logging/src/log-level.ts b/libs/logging/src/log-level.ts
new file mode 100644
index 00000000000..adf6c145c3d
--- /dev/null
+++ b/libs/logging/src/log-level.ts
@@ -0,0 +1,8 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
+export enum LogLevel {
+  Debug,
+  Info,
+  Warning,
+  Error,
+}
diff --git a/libs/logging/src/log.service.ts b/libs/logging/src/log.service.ts
new file mode 100644
index 00000000000..a63ad47c07e
--- /dev/null
+++ b/libs/logging/src/log.service.ts
@@ -0,0 +1,9 @@
+import { LogLevel } from "./log-level";
+
+export abstract class LogService {
+  abstract debug(message?: any, ...optionalParams: any[]): void;
+  abstract info(message?: any, ...optionalParams: any[]): void;
+  abstract warning(message?: any, ...optionalParams: any[]): void;
+  abstract error(message?: any, ...optionalParams: any[]): void;
+  abstract write(level: LogLevel, message?: any, ...optionalParams: any[]): void;
+}
diff --git a/libs/logging/src/logging.spec.ts b/libs/logging/src/logging.spec.ts
new file mode 100644
index 00000000000..04a057a156f
--- /dev/null
+++ b/libs/logging/src/logging.spec.ts
@@ -0,0 +1,8 @@
+import * as lib from "./index";
+
+describe("logging", () => {
+  // This test will fail until something is exported from index.ts
+  it("should work", () => {
+    expect(lib).toBeDefined();
+  });
+});
diff --git a/libs/logging/tsconfig.eslint.json b/libs/logging/tsconfig.eslint.json
new file mode 100644
index 00000000000..3daf120441a
--- /dev/null
+++ b/libs/logging/tsconfig.eslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": ["src/**/*.ts", "src/**/*.js"],
+  "exclude": ["**/build", "**/dist"]
+}
diff --git a/libs/logging/tsconfig.json b/libs/logging/tsconfig.json
new file mode 100644
index 00000000000..62ebbd94647
--- /dev/null
+++ b/libs/logging/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/libs/logging/tsconfig.lib.json b/libs/logging/tsconfig.lib.json
new file mode 100644
index 00000000000..9cbf6736007
--- /dev/null
+++ b/libs/logging/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.js", "src/**/*.spec.ts"]
+}
diff --git a/libs/logging/tsconfig.spec.json b/libs/logging/tsconfig.spec.json
new file mode 100644
index 00000000000..a19b962c49a
--- /dev/null
+++ b/libs/logging/tsconfig.spec.json
@@ -0,0 +1,16 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../..//dist/out-tsc",
+    "module": "commonjs",
+    "moduleResolution": "node10",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts",
+    "src/intercept-console.ts"
+  ]
+}
diff --git a/libs/node/jest.config.js b/libs/node/jest.config.js
index 1a33ad39406..d765efcfa2c 100644
--- a/libs/node/jest.config.js
+++ b/libs/node/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../shared/jest.config.ts");
 
@@ -11,6 +11,6 @@ module.exports = {
   testEnvironment: "node",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
+    prefix: "<rootDir>/../../",
   }),
 };
diff --git a/libs/node/tsconfig.json b/libs/node/tsconfig.json
index 3d22cb2ec51..9c607a26b09 100644
--- a/libs/node/tsconfig.json
+++ b/libs/node/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/key-management": ["../key-management/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/node/tsconfig.spec.json b/libs/node/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/libs/node/tsconfig.spec.json
+++ b/libs/node/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/libs/nx-plugin/README.md b/libs/nx-plugin/README.md
new file mode 100644
index 00000000000..580a7eb72ca
--- /dev/null
+++ b/libs/nx-plugin/README.md
@@ -0,0 +1,5 @@
+# nx-plugin
+
+Owned by: Platform
+
+Custom Nx tools like generators and executors for Bitwarden projects
diff --git a/libs/nx-plugin/eslint.config.mjs b/libs/nx-plugin/eslint.config.mjs
new file mode 100644
index 00000000000..9c37d10e3ff
--- /dev/null
+++ b/libs/nx-plugin/eslint.config.mjs
@@ -0,0 +1,3 @@
+import baseConfig from "../../eslint.config.mjs";
+
+export default [...baseConfig];
diff --git a/libs/nx-plugin/generators.json b/libs/nx-plugin/generators.json
new file mode 100644
index 00000000000..81feaed19c9
--- /dev/null
+++ b/libs/nx-plugin/generators.json
@@ -0,0 +1,9 @@
+{
+  "generators": {
+    "basic-lib": {
+      "factory": "./src/generators/basic-lib",
+      "schema": "./src/generators/schema.json",
+      "description": "basic-lib generator"
+    }
+  }
+}
diff --git a/libs/nx-plugin/jest.config.ts b/libs/nx-plugin/jest.config.ts
new file mode 100644
index 00000000000..60b8bed90bd
--- /dev/null
+++ b/libs/nx-plugin/jest.config.ts
@@ -0,0 +1,10 @@
+export default {
+  displayName: "nx-plugin",
+  preset: "../../jest.preset.js",
+  testEnvironment: "node",
+  transform: {
+    "^.+\\.[tj]s$": ["ts-jest", { tsconfig: "<rootDir>/tsconfig.spec.json" }],
+  },
+  moduleFileExtensions: ["ts", "js", "html"],
+  coverageDirectory: "../../coverage/libs/nx-plugin",
+};
diff --git a/libs/nx-plugin/package.json b/libs/nx-plugin/package.json
new file mode 100644
index 00000000000..8a3bdebf9ac
--- /dev/null
+++ b/libs/nx-plugin/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@bitwarden/nx-plugin",
+  "version": "0.0.1",
+  "description": "Custom Nx tools like generators and executors for Bitwarden projects",
+  "private": true,
+  "type": "commonjs",
+  "main": "./src/index.js",
+  "types": "./src/index.d.ts",
+  "license": "GPL-3.0",
+  "author": "Platform",
+  "generators": "./generators.json"
+}
diff --git a/libs/nx-plugin/project.json b/libs/nx-plugin/project.json
new file mode 100644
index 00000000000..7456cf03264
--- /dev/null
+++ b/libs/nx-plugin/project.json
@@ -0,0 +1,51 @@
+{
+  "name": "nx-plugin",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/nx-plugin/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/nx-plugin",
+        "main": "libs/nx-plugin/src/index.ts",
+        "tsConfig": "libs/nx-plugin/tsconfig.lib.json",
+        "assets": [
+          "libs/nx-plugin/*.md",
+          {
+            "input": "./libs/nx-plugin/src",
+            "glob": "**/!(*.ts)",
+            "output": "./src"
+          },
+          {
+            "input": "./libs/nx-plugin/src",
+            "glob": "**/*.d.ts",
+            "output": "./src"
+          },
+          {
+            "input": "./libs/nx-plugin",
+            "glob": "generators.json",
+            "output": "."
+          },
+          {
+            "input": "./libs/nx-plugin",
+            "glob": "executors.json",
+            "output": "."
+          }
+        ]
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/nx-plugin/jest.config.ts"
+      }
+    }
+  }
+}
diff --git a/libs/nx-plugin/src/generators/basic-lib.spec.ts b/libs/nx-plugin/src/generators/basic-lib.spec.ts
new file mode 100644
index 00000000000..a0357ca1751
--- /dev/null
+++ b/libs/nx-plugin/src/generators/basic-lib.spec.ts
@@ -0,0 +1,85 @@
+import { Tree, readProjectConfiguration } from "@nx/devkit";
+import { createTreeWithEmptyWorkspace } from "@nx/devkit/testing";
+
+import { basicLibGenerator } from "./basic-lib";
+import { BasicLibGeneratorSchema } from "./schema";
+
+describe("basic-lib generator", () => {
+  let tree: Tree;
+  const options: BasicLibGeneratorSchema = {
+    name: "test",
+    description: "test",
+    team: "platform",
+    directory: "libs",
+  };
+
+  beforeEach(() => {
+    tree = createTreeWithEmptyWorkspace();
+  });
+
+  it("should update tsconfig.base.json paths", async () => {
+    tree.write("tsconfig.base.json", JSON.stringify({ compilerOptions: { paths: {} } }));
+    await basicLibGenerator(tree, options);
+    const tsconfigContent = tree.read("tsconfig.base.json");
+    expect(tsconfigContent).not.toBeNull();
+    const tsconfig = JSON.parse(tsconfigContent?.toString() ?? "");
+    expect(tsconfig.compilerOptions.paths[`@bitwarden/${options.name}`]).toEqual([
+      `libs/test/src/index.ts`,
+    ]);
+  });
+
+  it("should update CODEOWNERS file", async () => {
+    tree.write(".github/CODEOWNERS", "# Existing content\n");
+    await basicLibGenerator(tree, options);
+    const codeownersContent = tree.read(".github/CODEOWNERS");
+    expect(codeownersContent).not.toBeNull();
+    const codeowners = codeownersContent?.toString();
+    expect(codeowners).toContain(`libs/test @bitwarden/team-platform-dev`);
+  });
+
+  it("should generate expected files", async () => {
+    await basicLibGenerator(tree, options);
+
+    const config = readProjectConfiguration(tree, "test");
+    expect(config).toBeDefined();
+
+    expect(tree.exists(`libs/test/README.md`)).toBeTruthy();
+    expect(tree.exists(`libs/test/eslint.config.mjs`)).toBeTruthy();
+    expect(tree.exists(`libs/test/jest.config.js`)).toBeTruthy();
+    expect(tree.exists(`libs/test/package.json`)).toBeTruthy();
+    expect(tree.exists(`libs/test/tsconfig.json`)).toBeTruthy();
+    expect(tree.exists(`libs/test/tsconfig.lib.json`)).toBeTruthy();
+    expect(tree.exists(`libs/test/tsconfig.spec.json`)).toBeTruthy();
+    expect(tree.exists(`libs/test/src/index.ts`)).toBeTruthy();
+  });
+
+  it("should handle missing CODEOWNERS file gracefully", async () => {
+    const consoleSpy = jest.spyOn(console, "warn").mockImplementation();
+    await basicLibGenerator(tree, options);
+    expect(consoleSpy).toHaveBeenCalledWith("CODEOWNERS file not found at .github/CODEOWNERS");
+    consoleSpy.mockRestore();
+  });
+
+  it("should map team names to correct GitHub handles", async () => {
+    tree.write(".github/CODEOWNERS", "");
+    await basicLibGenerator(tree, { ...options, team: "vault" });
+    const codeownersContent = tree.read(".github/CODEOWNERS");
+    expect(codeownersContent).not.toBeNull();
+    const codeowners = codeownersContent?.toString();
+    expect(codeowners).toContain(`libs/test @bitwarden/team-vault-dev`);
+  });
+
+  it("should generate expected files", async () => {
+    await basicLibGenerator(tree, options);
+    expect(tree.exists(`libs/test/README.md`)).toBeTruthy();
+    expect(tree.exists(`libs/test/eslint.config.mjs`)).toBeTruthy();
+    expect(tree.exists(`libs/test/jest.config.js`)).toBeTruthy();
+    expect(tree.exists(`libs/test/package.json`)).toBeTruthy();
+    expect(tree.exists(`libs/test/project.json`)).toBeTruthy();
+    expect(tree.exists(`libs/test/tsconfig.json`)).toBeTruthy();
+    expect(tree.exists(`libs/test/tsconfig.lib.json`)).toBeTruthy();
+    expect(tree.exists(`libs/test/tsconfig.spec.json`)).toBeTruthy();
+    expect(tree.exists(`libs/test/src/index.ts`)).toBeTruthy();
+    expect(tree.exists(`libs/test/src/test.spec.ts`)).toBeTruthy();
+  });
+});
diff --git a/libs/nx-plugin/src/generators/basic-lib.ts b/libs/nx-plugin/src/generators/basic-lib.ts
new file mode 100644
index 00000000000..6b214d18921
--- /dev/null
+++ b/libs/nx-plugin/src/generators/basic-lib.ts
@@ -0,0 +1,127 @@
+import { execSync } from "child_process";
+import * as path from "path";
+
+import {
+  formatFiles,
+  generateFiles,
+  Tree,
+  offsetFromRoot,
+  updateJson,
+  runTasksInSerial,
+  GeneratorCallback,
+} from "@nx/devkit";
+
+import { BasicLibGeneratorSchema } from "./schema";
+
+/**
+ * An Nx generator for creating basic libraries.
+ * Generators help automate repetitive tasks like creating new components, libraries, or apps.
+ *
+ * @param {Tree} tree - The virtual file system tree that Nx uses to make changes
+ * @param {BasicLibGeneratorSchema} options - Configuration options for the generator
+ * @returns {Promise<void>} - Returns a promise that resolves when generation is complete
+ */
+export async function basicLibGenerator(
+  tree: Tree,
+  options: BasicLibGeneratorSchema,
+): Promise<GeneratorCallback> {
+  const projectRoot = `${options.directory}/${options.name}`;
+  const srcRoot = `${projectRoot}/src`;
+
+  /**
+   * Generate files from templates in the 'files/' directory.
+   * This copies all template files to the new library location.
+   */
+  generateFiles(tree, path.join(__dirname, "files"), projectRoot, {
+    ...options,
+    // `tmpl` is used in file names for template files. Setting it to an
+    // empty string here lets use be explicit with the naming of template
+    // files, and lets Nx handle stripping out "__tmpl__" from file names.
+    tmpl: "",
+    // `name` is a variable passed to template files for interpolation into
+    // their contents. It is set to the name of the library being generated.
+    name: options.name,
+    root: projectRoot,
+    // `offsetFromRoot` is helper to calculate relative path from the new
+    // library to project root.
+    offsetFromRoot: offsetFromRoot(projectRoot),
+  });
+
+  // Add TypeScript path to the base tsconfig
+  updateTsConfigPath(tree, options.name, srcRoot);
+
+  // Update CODEOWNERS with the new lib
+  updateCodeowners(tree, options.directory, options.name, options.team);
+
+  // Format all new files with prettier
+  await formatFiles(tree);
+
+  const tasks: GeneratorCallback[] = [];
+  // Run npm i after generation. Nx ships a helper function for this called
+  // installPackagesTask. When used here it was leaving package-lock in a
+  // broken state, so a manual approach was used instead.
+  tasks.push(() => {
+    execSync("npm install", { stdio: "inherit" });
+    return Promise.resolve();
+  });
+  return runTasksInSerial(...tasks);
+}
+
+/**
+ * Updates the base tsconfig.json file to include the new library.
+ * This allows importing the library using its alias path.
+ *
+ * @param {Tree} tree - The virtual file system tree
+ * @param {string} name - The library name
+ * @param {string} srcRoot - Path to the library's source files
+ */
+function updateTsConfigPath(tree: Tree, name: string, srcRoot: string) {
+  updateJson(tree, "tsconfig.base.json", (json) => {
+    const paths = json.compilerOptions.paths || {};
+
+    paths[`@bitwarden/${name}`] = [`${srcRoot}/index.ts`];
+
+    json.compilerOptions.paths = paths;
+    return json;
+  });
+}
+
+/**
+ * Updates the CODEOWNERS file to add ownership for the new library
+ *
+ * @param {Tree} tree - The virtual file system tree
+ * @param {string} directory - Directory where the library is created
+ * @param {string} name - The library name
+ * @param {string} team - The team responsible for the library
+ */
+function updateCodeowners(tree: Tree, directory: string, name: string, team: string) {
+  const codeownersPath = ".github/CODEOWNERS";
+
+  if (!tree.exists(codeownersPath)) {
+    console.warn("CODEOWNERS file not found at .github/CODEOWNERS");
+    return;
+  }
+
+  const teamHandleMap: Record<string, string> = {
+    "admin-console": "@bitwarden/team-admin-console-dev",
+    auth: "@bitwarden/team-auth-dev",
+    autofill: "@bitwarden/team-autofill-dev",
+    billing: "@bitwarden/team-billing-dev",
+    "data-insights-and-reporting": "@bitwarden/team-data-insights-and-reporting-dev",
+    "key-management": "@bitwarden/team-key-management-dev",
+    platform: "@bitwarden/team-platform-dev",
+    tools: "@bitwarden/team-tools-dev",
+    "ui-foundation": "@bitwarden/team-ui-foundation",
+    vault: "@bitwarden/team-vault-dev",
+  };
+
+  const teamHandle = teamHandleMap[team] || `@bitwarden/team-${team}-dev`;
+  const libPath = `${directory}/${name}`;
+
+  const newLine = `${libPath} ${teamHandle}\n`;
+
+  const content = tree.read(codeownersPath)?.toString() || "";
+  tree.write(codeownersPath, content + newLine);
+}
+
+export default basicLibGenerator;
diff --git a/libs/nx-plugin/src/generators/files/README.md__tmpl__ b/libs/nx-plugin/src/generators/files/README.md__tmpl__
new file mode 100644
index 00000000000..b14fdadb6b1
--- /dev/null
+++ b/libs/nx-plugin/src/generators/files/README.md__tmpl__
@@ -0,0 +1,4 @@
+# <%= name %>
+Owned by: <%= team %>
+
+<%= description %>
\ No newline at end of file
diff --git a/libs/nx-plugin/src/generators/files/eslint.config.mjs__tmpl__ b/libs/nx-plugin/src/generators/files/eslint.config.mjs__tmpl__
new file mode 100644
index 00000000000..58f75dd7f9f
--- /dev/null
+++ b/libs/nx-plugin/src/generators/files/eslint.config.mjs__tmpl__
@@ -0,0 +1,3 @@
+import baseConfig from "<%= offsetFromRoot %>eslint.config.mjs";
+
+export default [...baseConfig];
\ No newline at end of file
diff --git a/libs/nx-plugin/src/generators/files/jest.config.js__tmpl__ b/libs/nx-plugin/src/generators/files/jest.config.js__tmpl__
new file mode 100644
index 00000000000..b4de0693c97
--- /dev/null
+++ b/libs/nx-plugin/src/generators/files/jest.config.js__tmpl__
@@ -0,0 +1,10 @@
+module.exports = {
+  displayName: '<%= name %>',
+  preset: '<%= offsetFromRoot %>jest.preset.js',
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '<%= offsetFromRoot %>coverage/libs/<%= name %>',
+};
\ No newline at end of file
diff --git a/libs/nx-plugin/src/generators/files/package.json__tmpl__ b/libs/nx-plugin/src/generators/files/package.json__tmpl__
new file mode 100644
index 00000000000..b4da6154ce4
--- /dev/null
+++ b/libs/nx-plugin/src/generators/files/package.json__tmpl__
@@ -0,0 +1,11 @@
+{
+  "name": "@bitwarden/<%= name %>",
+  "version": "0.0.1",
+  "description": "<%= description %>",
+  "private": true,
+  "type": "commonjs",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "license": "GPL-3.0",
+  "author": "<%= team %>"
+}
\ No newline at end of file
diff --git a/libs/nx-plugin/src/generators/files/project.json__tmpl__ b/libs/nx-plugin/src/generators/files/project.json__tmpl__
new file mode 100644
index 00000000000..50671e56715
--- /dev/null
+++ b/libs/nx-plugin/src/generators/files/project.json__tmpl__
@@ -0,0 +1,33 @@
+{
+  "name": "<%= name %>",
+  "$schema": "<%= offsetFromRoot %>node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/<%= name %>/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/<%= name %>",
+        "main": "libs/<%= name %>/src/index.ts",
+        "tsConfig": "libs/<%= name %>/tsconfig.lib.json",
+        "assets": ["libs/<%= name%>/*.md"]
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/<%= name %>/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/<%= name %>/jest.config.js"
+      }
+    }
+  },
+}
\ No newline at end of file
diff --git a/libs/nx-plugin/src/generators/files/src/__name__.spec.ts__tmpl__ b/libs/nx-plugin/src/generators/files/src/__name__.spec.ts__tmpl__
new file mode 100644
index 00000000000..716ea3bcc92
--- /dev/null
+++ b/libs/nx-plugin/src/generators/files/src/__name__.spec.ts__tmpl__
@@ -0,0 +1,8 @@
+import * as lib from './index';
+
+describe('<%= name %>', () => {
+  // This test will fail until something is exported from index.ts
+  it('should work', () => {
+    expect(lib).toBeDefined();
+  });
+});
\ No newline at end of file
diff --git a/libs/nx-plugin/src/generators/files/src/index.ts__tmpl__ b/libs/nx-plugin/src/generators/files/src/index.ts__tmpl__
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/libs/nx-plugin/src/generators/files/tsconfig.eslint.json__tmpl__ b/libs/nx-plugin/src/generators/files/tsconfig.eslint.json__tmpl__
new file mode 100644
index 00000000000..4e2f30c19be
--- /dev/null
+++ b/libs/nx-plugin/src/generators/files/tsconfig.eslint.json__tmpl__
@@ -0,0 +1,6 @@
+{
+  "extends": "<%= offsetFromRoot %>tsconfig.base.json",
+  "files": [],
+  "include": ["src/**/*.ts", "src/**/*.js"],
+  "exclude": ["**/build", "**/dist"]
+}
diff --git a/libs/nx-plugin/src/generators/files/tsconfig.json__tmpl__ b/libs/nx-plugin/src/generators/files/tsconfig.json__tmpl__
new file mode 100644
index 00000000000..90285022eb8
--- /dev/null
+++ b/libs/nx-plugin/src/generators/files/tsconfig.json__tmpl__
@@ -0,0 +1,13 @@
+{
+  "extends": "<%= offsetFromRoot %>tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/libs/nx-plugin/src/generators/files/tsconfig.lib.json__tmpl__ b/libs/nx-plugin/src/generators/files/tsconfig.lib.json__tmpl__
new file mode 100644
index 00000000000..9495389619e
--- /dev/null
+++ b/libs/nx-plugin/src/generators/files/tsconfig.lib.json__tmpl__
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.js", "src/**/*.spec.ts"]
+}
\ No newline at end of file
diff --git a/libs/nx-plugin/src/generators/files/tsconfig.spec.json__tmpl__ b/libs/nx-plugin/src/generators/files/tsconfig.spec.json__tmpl__
new file mode 100644
index 00000000000..c011a34d3d2
--- /dev/null
+++ b/libs/nx-plugin/src/generators/files/tsconfig.spec.json__tmpl__
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
+    "module": "commonjs",
+    "moduleResolution": "node10",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/libs/nx-plugin/src/generators/schema.d.ts b/libs/nx-plugin/src/generators/schema.d.ts
new file mode 100644
index 00000000000..ba1a53cefab
--- /dev/null
+++ b/libs/nx-plugin/src/generators/schema.d.ts
@@ -0,0 +1,6 @@
+export interface BasicLibGeneratorSchema {
+  name: string;
+  description: string;
+  team: string;
+  directory: string;
+}
diff --git a/libs/nx-plugin/src/generators/schema.json b/libs/nx-plugin/src/generators/schema.json
new file mode 100644
index 00000000000..2b9aeca3227
--- /dev/null
+++ b/libs/nx-plugin/src/generators/schema.json
@@ -0,0 +1,96 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "BasicLib",
+  "title": "",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "Library name",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "pattern": "^[a-z0-9]+(-[a-z0-9]+)*$",
+      "x-prompt": "What name would you like to use? (kebab-case, alphanumeric)",
+      "x-priority": "important"
+    },
+    "description": {
+      "type": "string",
+      "description": "Library description",
+      "x-prompt": "Please describe your library in one sentence (for package.json and README)",
+      "x-priority": "important"
+    },
+    "directory": {
+      "type": "string",
+      "description": "Directory where the library will be created",
+      "default": "libs",
+      "x-prompt": "What directory would you like your lib in?",
+      "x-priority": "important"
+    },
+    "team": {
+      "type": "string",
+      "description": "Maintaining team",
+      "x-priority": "important",
+      "x-prompt": {
+        "message": "What team maintains this library?",
+        "type": "list",
+        "items": [
+          {
+            "value": "admin-console",
+            "label": "Admin Console"
+          },
+          {
+            "value": "auth",
+            "label": "Auth"
+          },
+          {
+            "value": "autofill",
+            "label": "Autofill"
+          },
+          {
+            "value": "billing",
+            "label": "Billing"
+          },
+          {
+            "value": "data-insights-and-reporting",
+            "label": "Data Insights And Reporting"
+          },
+          {
+            "value": "key-management",
+            "label": "Key Management"
+          },
+          {
+            "value": "platform",
+            "label": "Platform"
+          },
+          {
+            "value": "tools",
+            "label": "Tools"
+          },
+          {
+            "value": "ui-foundation",
+            "label": "UI Foundation"
+          },
+          {
+            "value": "vault",
+            "label": "Vault"
+          }
+        ]
+      },
+      "enum": [
+        "admin-console",
+        "auth",
+        "autofill",
+        "billing",
+        "data-insights-and-reporting",
+        "key-management",
+        "platform",
+        "tools",
+        "ui-foundation",
+        "vault"
+      ]
+    }
+  },
+  "required": ["name", "description", "team"]
+}
diff --git a/libs/nx-plugin/src/index.ts b/libs/nx-plugin/src/index.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/libs/nx-plugin/tsconfig.eslint.json b/libs/nx-plugin/tsconfig.eslint.json
new file mode 100644
index 00000000000..3daf120441a
--- /dev/null
+++ b/libs/nx-plugin/tsconfig.eslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": ["src/**/*.ts", "src/**/*.js"],
+  "exclude": ["**/build", "**/dist"]
+}
diff --git a/libs/nx-plugin/tsconfig.json b/libs/nx-plugin/tsconfig.json
new file mode 100644
index 00000000000..19b9eece4df
--- /dev/null
+++ b/libs/nx-plugin/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs"
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/libs/nx-plugin/tsconfig.lib.json b/libs/nx-plugin/tsconfig.lib.json
new file mode 100644
index 00000000000..33eca2c2cdf
--- /dev/null
+++ b/libs/nx-plugin/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
+}
diff --git a/libs/nx-plugin/tsconfig.spec.json b/libs/nx-plugin/tsconfig.spec.json
new file mode 100644
index 00000000000..1275f148a18
--- /dev/null
+++ b/libs/nx-plugin/tsconfig.spec.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "moduleResolution": "node10",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/libs/platform/jest.config.js b/libs/platform/jest.config.js
index 063fb847d8f..174c430a901 100644
--- a/libs/platform/jest.config.js
+++ b/libs/platform/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
@@ -8,9 +8,8 @@ const sharedConfig = require("../../libs/shared/jest.config.angular");
 module.exports = {
   ...sharedConfig,
   displayName: "libs/platform tests",
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
+    prefix: "<rootDir>/../../",
   }),
 };
diff --git a/libs/platform/tsconfig.json b/libs/platform/tsconfig.json
index 898f9e41c6a..9c607a26b09 100644
--- a/libs/platform/tsconfig.json
+++ b/libs/platform/tsconfig.json
@@ -1,10 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/common/*": ["../common/src/*"]
-    }
-  },
+  "extends": "../../tsconfig.base",
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/platform/tsconfig.spec.json b/libs/platform/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/libs/platform/tsconfig.spec.json
+++ b/libs/platform/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/libs/shared/jest.config.angular.js b/libs/shared/jest.config.angular.js
index 311318e46a4..6a9b52395f6 100644
--- a/libs/shared/jest.config.angular.js
+++ b/libs/shared/jest.config.angular.js
@@ -1,9 +1,20 @@
 /* eslint-env node */
 /* eslint-disable @typescript-eslint/no-require-imports */
-const { defaultTransformerOptions } = require("jest-preset-angular/presets");
+const { createCjsPreset } = require("jest-preset-angular/presets");
+
+const presetConfig = createCjsPreset({
+  tsconfig: "<rootDir>/tsconfig.spec.json",
+  astTransformers: {
+    before: ["<rootDir>/../../libs/shared/es2020-transformer.ts"],
+  },
+  diagnostics: {
+    ignoreCodes: ["TS151001"],
+  },
+});
 
 /** @type {import('jest').Config} */
 module.exports = {
+  ...presetConfig,
   testMatch: ["**/+(*.)+(spec).+(ts)"],
 
   testPathIgnorePatterns: [
@@ -13,23 +24,4 @@ module.exports = {
 
   // Improves on-demand performance, for watches prefer 25%, overridable by setting --maxWorkers
   maxWorkers: "50%",
-
-  transform: {
-    "^.+\\.(ts|js|mjs|svg)$": [
-      "jest-preset-angular",
-      {
-        ...defaultTransformerOptions,
-        // Jest does not use tsconfig.spec.json by default
-        tsconfig: "<rootDir>/tsconfig.spec.json",
-        // Further workaround for memory leak, recommended here:
-        // https://github.com/kulshekhar/ts-jest/issues/1967#issuecomment-697494014
-        // Makes tests run faster and reduces size/rate of leak, but loses typechecking on test code
-        // See https://bitwarden.atlassian.net/browse/EC-497 for more info
-        isolatedModules: true,
-        astTransformers: {
-          before: ["<rootDir>/../../libs/shared/es2020-transformer.ts"],
-        },
-      },
-    ],
-  },
 };
diff --git a/libs/shared/tsconfig.json b/libs/shared/tsconfig.json
deleted file mode 100644
index 2161d2fb7d1..00000000000
--- a/libs/shared/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "compilerOptions": {
-    "pretty": true,
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "target": "ES6",
-    "module": "es2020",
-    "lib": ["es5", "es6", "es7", "dom"],
-    "sourceMap": true,
-    "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "outDir": "dist",
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ]
-  }
-}
diff --git a/libs/shared/tsconfig.spec.json b/libs/shared/tsconfig.spec.json
index 6d2c7498129..3706663ecf1 100644
--- a/libs/shared/tsconfig.spec.json
+++ b/libs/shared/tsconfig.spec.json
@@ -1,33 +1,3 @@
 {
-  "extends": "./tsconfig",
-  "compilerOptions": {
-    "resolveJsonModule": true,
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/angular": ["../auth/src/angular"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/billing": ["../billing/src"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/components": ["../components/src"],
-      "@bitwarden/generator-components": ["../tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer-core": ["../importer/src"],
-      "@bitwarden/importer-ui": ["../importer/src/components"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/key-management-ui": ["../key-management-ui/src/index.ts"],
-      "@bitwarden/node/*": ["../node/src/*"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/send-ui": ["../tools/send/send-ui/src"],
-      "@bitwarden/tools-card": ["../tools/card/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../ui/common/src/setup-jest"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault-export-ui": ["../tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["../vault/src"]
-    }
-  }
+  "extends": "../../tsconfig.base"
 }
diff --git a/libs/storage-core/README.md b/libs/storage-core/README.md
new file mode 100644
index 00000000000..5a5bd5d2368
--- /dev/null
+++ b/libs/storage-core/README.md
@@ -0,0 +1,5 @@
+# storage-core
+
+Owned by: platform
+
+Abstractions over storage APIs
diff --git a/libs/storage-core/eslint.config.mjs b/libs/storage-core/eslint.config.mjs
new file mode 100644
index 00000000000..9c37d10e3ff
--- /dev/null
+++ b/libs/storage-core/eslint.config.mjs
@@ -0,0 +1,3 @@
+import baseConfig from "../../eslint.config.mjs";
+
+export default [...baseConfig];
diff --git a/libs/storage-core/jest.config.js b/libs/storage-core/jest.config.js
new file mode 100644
index 00000000000..7bc9886d65a
--- /dev/null
+++ b/libs/storage-core/jest.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  displayName: "storage-core",
+  preset: "../../jest.preset.js",
+  testEnvironment: "node",
+  transform: {
+    "^.+\\.[tj]s$": ["ts-jest", { tsconfig: "<rootDir>/tsconfig.spec.json" }],
+  },
+  moduleFileExtensions: ["ts", "js", "html"],
+  coverageDirectory: "../../coverage/libs/storage-core",
+};
diff --git a/libs/storage-core/package.json b/libs/storage-core/package.json
new file mode 100644
index 00000000000..7b18e4dcb5f
--- /dev/null
+++ b/libs/storage-core/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@bitwarden/storage-core",
+  "version": "0.0.1",
+  "description": "Abstractions over storage APIs",
+  "private": true,
+  "type": "commonjs",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "license": "GPL-3.0",
+  "author": "platform"
+}
diff --git a/libs/storage-core/project.json b/libs/storage-core/project.json
new file mode 100644
index 00000000000..9b4a3e00fc1
--- /dev/null
+++ b/libs/storage-core/project.json
@@ -0,0 +1,33 @@
+{
+  "name": "storage-core",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/storage-core/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/storage-core",
+        "main": "libs/storage-core/src/index.ts",
+        "tsConfig": "libs/storage-core/tsconfig.lib.json",
+        "assets": ["libs/storage-core/*.md"]
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/storage-core/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/storage-core/jest.config.js"
+      }
+    }
+  }
+}
diff --git a/libs/storage-core/src/client-locations.ts b/libs/storage-core/src/client-locations.ts
new file mode 100644
index 00000000000..6ae8462fc31
--- /dev/null
+++ b/libs/storage-core/src/client-locations.ts
@@ -0,0 +1,31 @@
+import { StorageLocation } from "./storage-location";
+
+/**
+ * *Note*: The property names of this object should match exactly with the string values of the {@link ClientType} enum
+ */
+export type ClientLocations = {
+  /**
+   * Overriding storage location for the web client.
+   *
+   * Includes an extra storage location to store data in `localStorage`
+   * that is available from different tabs and after a tab has closed.
+   */
+  web: StorageLocation | "disk-local";
+  /**
+   * Overriding storage location for browser clients.
+   *
+   * `"memory-large-object"` is used to store non-countable objects in memory. This exists due to limited persistent memory available to browser extensions.
+   *
+   * `"disk-backup-local-storage"` is used to store object in both disk and in `localStorage`. Data is stored in both locations but is only retrieved
+   * from `localStorage` when a null-ish value is retrieved from disk first.
+   */
+  browser: StorageLocation | "memory-large-object" | "disk-backup-local-storage";
+  /**
+   * Overriding storage location for desktop clients.
+   */
+  //desktop: StorageLocation;
+  /**
+   * Overriding storage location for CLI clients.
+   */
+  //cli: StorageLocation;
+};
diff --git a/libs/storage-core/src/html-storage-location.enum.ts b/libs/storage-core/src/html-storage-location.enum.ts
new file mode 100644
index 00000000000..1d018a72869
--- /dev/null
+++ b/libs/storage-core/src/html-storage-location.enum.ts
@@ -0,0 +1,7 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
+export enum HtmlStorageLocation {
+  Local = "local",
+  Memory = "memory",
+  Session = "session",
+}
diff --git a/libs/storage-core/src/index.ts b/libs/storage-core/src/index.ts
new file mode 100644
index 00000000000..681bdd40de7
--- /dev/null
+++ b/libs/storage-core/src/index.ts
@@ -0,0 +1,11 @@
+export * from "./client-locations";
+export * from "./html-storage-location.enum";
+export * from "./memory-storage.service";
+export * from "./serialized-memory-storage.service";
+export * from "./storage-location";
+export * from "./storage-location.enum";
+export * from "./storage-options";
+export * from "./storage-service.provider";
+// Renamed to just "StorageService", to be removed when references are updated
+export { StorageService as AbstractStorageService } from "./storage.service";
+export * from "./storage.service";
diff --git a/libs/storage-core/src/memory-storage.service.ts b/libs/storage-core/src/memory-storage.service.ts
new file mode 100644
index 00000000000..425547f9aa7
--- /dev/null
+++ b/libs/storage-core/src/memory-storage.service.ts
@@ -0,0 +1,47 @@
+// FIXME: Update this file to be type safe and remove this and next line
+// @ts-strict-ignore
+import { Subject } from "rxjs";
+
+import { StorageService, StorageUpdate } from "./storage.service";
+
+export class MemoryStorageService extends StorageService {
+  protected store = new Map<string, unknown>();
+  private updatesSubject = new Subject<StorageUpdate>();
+
+  get valuesRequireDeserialization(): boolean {
+    return false;
+  }
+  get updates$() {
+    return this.updatesSubject.asObservable();
+  }
+
+  get<T>(key: string): Promise<T> {
+    if (this.store.has(key)) {
+      const obj = this.store.get(key);
+      return Promise.resolve(obj as T);
+    }
+    return Promise.resolve(null);
+  }
+
+  async has(key: string): Promise<boolean> {
+    return (await this.get(key)) != null;
+  }
+
+  save<T>(key: string, obj: T): Promise<void> {
+    if (obj == null) {
+      return this.remove(key);
+    }
+    // TODO: Remove once foreground/background contexts are separated in browser
+    // Needed to ensure ownership of all memory by the context running the storage service
+    const toStore = structuredClone(obj);
+    this.store.set(key, toStore);
+    this.updatesSubject.next({ key, updateType: "save" });
+    return Promise.resolve();
+  }
+
+  remove(key: string): Promise<void> {
+    this.store.delete(key);
+    this.updatesSubject.next({ key, updateType: "remove" });
+    return Promise.resolve();
+  }
+}
diff --git a/libs/common/src/platform/state/storage/memory-storage.service.spec.ts b/libs/storage-core/src/serialized-memory-storage.service.spec.ts
similarity index 84%
rename from libs/common/src/platform/state/storage/memory-storage.service.spec.ts
rename to libs/storage-core/src/serialized-memory-storage.service.spec.ts
index 419934ffdf9..3f51a84494e 100644
--- a/libs/common/src/platform/state/storage/memory-storage.service.spec.ts
+++ b/libs/storage-core/src/serialized-memory-storage.service.spec.ts
@@ -1,12 +1,12 @@
-import { MemoryStorageService } from "./memory-storage.service";
+import { SerializedMemoryStorageService } from "./serialized-memory-storage.service";
 
-describe("MemoryStorageService", () => {
-  let sut: MemoryStorageService;
+describe("SerializedMemoryStorageService", () => {
+  let sut: SerializedMemoryStorageService;
   const key = "key";
   const value = { test: "value" };
 
   beforeEach(() => {
-    sut = new MemoryStorageService();
+    sut = new SerializedMemoryStorageService();
   });
 
   afterEach(() => {
diff --git a/libs/storage-core/src/serialized-memory-storage.service.ts b/libs/storage-core/src/serialized-memory-storage.service.ts
new file mode 100644
index 00000000000..ce52efc44ff
--- /dev/null
+++ b/libs/storage-core/src/serialized-memory-storage.service.ts
@@ -0,0 +1,50 @@
+// FIXME: Update this file to be type safe and remove this and next line
+// @ts-strict-ignore
+import { Subject } from "rxjs";
+
+import { StorageService, ObservableStorageService, StorageUpdate } from "./storage.service";
+
+export class SerializedMemoryStorageService
+  extends StorageService
+  implements ObservableStorageService
+{
+  protected store: Record<string, string> = {};
+  private updatesSubject = new Subject<StorageUpdate>();
+
+  get valuesRequireDeserialization(): boolean {
+    return true;
+  }
+  get updates$() {
+    return this.updatesSubject.asObservable();
+  }
+
+  get<T>(key: string): Promise<T> {
+    const json = this.store[key];
+    if (json) {
+      const obj = JSON.parse(json as string);
+      return Promise.resolve(obj as T);
+    }
+    return Promise.resolve(null);
+  }
+
+  async has(key: string): Promise<boolean> {
+    return (await this.get(key)) != null;
+  }
+
+  save<T>(key: string, obj: T): Promise<void> {
+    if (obj == null) {
+      return this.remove(key);
+    }
+    // TODO: Remove once foreground/background contexts are separated in browser
+    // Needed to ensure ownership of all memory by the context running the storage service
+    this.store[key] = JSON.stringify(obj);
+    this.updatesSubject.next({ key, updateType: "save" });
+    return Promise.resolve();
+  }
+
+  remove(key: string): Promise<void> {
+    delete this.store[key];
+    this.updatesSubject.next({ key, updateType: "remove" });
+    return Promise.resolve();
+  }
+}
diff --git a/libs/storage-core/src/storage-core.spec.ts b/libs/storage-core/src/storage-core.spec.ts
new file mode 100644
index 00000000000..32c124adb4d
--- /dev/null
+++ b/libs/storage-core/src/storage-core.spec.ts
@@ -0,0 +1,8 @@
+import * as lib from "./index";
+
+describe("storage-core", () => {
+  // This test will fail until something is exported from index.ts
+  it("should work", () => {
+    expect(lib).toBeDefined();
+  });
+});
diff --git a/libs/storage-core/src/storage-location.enum.ts b/libs/storage-core/src/storage-location.enum.ts
new file mode 100644
index 00000000000..3ee8926ad59
--- /dev/null
+++ b/libs/storage-core/src/storage-location.enum.ts
@@ -0,0 +1,7 @@
+// FIXME: update to use a const object instead of a typescript enum
+// eslint-disable-next-line @bitwarden/platform/no-enums
+export enum StorageLocationEnum {
+  Both = "both",
+  Disk = "disk",
+  Memory = "memory",
+}
diff --git a/libs/storage-core/src/storage-location.ts b/libs/storage-core/src/storage-location.ts
new file mode 100644
index 00000000000..c3ad76860fc
--- /dev/null
+++ b/libs/storage-core/src/storage-location.ts
@@ -0,0 +1,12 @@
+/**
+ * Default storage location options.
+ *
+ * `disk` generally means state that is accessible between restarts of the application,
+ * with the exception of the web client. In web this means `sessionStorage`. The data
+ * persists through refreshes of the page but not available once that tab is closed or
+ * from any other tabs.
+ *
+ * `memory` means that the information stored there goes away during application
+ * restarts.
+ */
+export type StorageLocation = "disk" | "memory";
diff --git a/libs/storage-core/src/storage-options.ts b/libs/storage-core/src/storage-options.ts
new file mode 100644
index 00000000000..16c888e8037
--- /dev/null
+++ b/libs/storage-core/src/storage-options.ts
@@ -0,0 +1,10 @@
+import { HtmlStorageLocation } from "./html-storage-location.enum";
+import { StorageLocationEnum as StorageLocation } from "./storage-location.enum";
+
+export type StorageOptions = {
+  storageLocation?: StorageLocation;
+  useSecureStorage?: boolean;
+  userId?: string;
+  htmlStorageLocation?: HtmlStorageLocation;
+  keySuffix?: string;
+};
diff --git a/libs/common/src/platform/services/storage-service.provider.spec.ts b/libs/storage-core/src/storage-service.provider.spec.ts
similarity index 74%
rename from libs/common/src/platform/services/storage-service.provider.spec.ts
rename to libs/storage-core/src/storage-service.provider.spec.ts
index 35f45064d49..9e40e5cd433 100644
--- a/libs/common/src/platform/services/storage-service.provider.spec.ts
+++ b/libs/storage-core/src/storage-service.provider.spec.ts
@@ -1,12 +1,11 @@
 import { mock } from "jest-mock-extended";
 
-import { AbstractStorageService, ObservableStorageService } from "../abstractions/storage.service";
-
 import { StorageServiceProvider } from "./storage-service.provider";
+import { StorageService, ObservableStorageService } from "./storage.service";
 
 describe("StorageServiceProvider", () => {
-  const mockDiskStorage = mock<AbstractStorageService & ObservableStorageService>();
-  const mockMemoryStorage = mock<AbstractStorageService & ObservableStorageService>();
+  const mockDiskStorage = mock<StorageService & ObservableStorageService>();
+  const mockMemoryStorage = mock<StorageService & ObservableStorageService>();
 
   const sut = new StorageServiceProvider(mockDiskStorage, mockMemoryStorage);
 
diff --git a/libs/storage-core/src/storage-service.provider.ts b/libs/storage-core/src/storage-service.provider.ts
new file mode 100644
index 00000000000..dcf54c821c4
--- /dev/null
+++ b/libs/storage-core/src/storage-service.provider.ts
@@ -0,0 +1,39 @@
+import { ClientLocations } from "./client-locations";
+import { StorageLocation } from "./storage-location";
+import { StorageService, ObservableStorageService } from "./storage.service";
+
+export type PossibleLocation = StorageLocation | ClientLocations[keyof ClientLocations];
+
+/**
+ * A provider for getting client specific computed storage locations and services.
+ */
+export class StorageServiceProvider {
+  constructor(
+    protected readonly diskStorageService: StorageService & ObservableStorageService,
+    protected readonly memoryStorageService: StorageService & ObservableStorageService,
+  ) {}
+
+  /**
+   * Computes the location and corresponding service for a given client.
+   *
+   * **NOTE** The default implementation does not respect client overrides and if clients
+   * have special overrides they are responsible for implementing this service.
+   * @param defaultLocation The default location to use if no client specific override is preferred.
+   * @param overrides Client specific overrides
+   * @returns The computed storage location and corresponding storage service to use to get/store state.
+   * @throws If there is no configured storage service for the given inputs.
+   */
+  get(
+    defaultLocation: PossibleLocation,
+    overrides: Partial<ClientLocations>,
+  ): [location: PossibleLocation, service: StorageService & ObservableStorageService] {
+    switch (defaultLocation) {
+      case "disk":
+        return [defaultLocation, this.diskStorageService];
+      case "memory":
+        return [defaultLocation, this.memoryStorageService];
+      default:
+        throw new Error(`Unexpected location: ${defaultLocation}`);
+    }
+  }
+}
diff --git a/libs/storage-core/src/storage.service.ts b/libs/storage-core/src/storage.service.ts
new file mode 100644
index 00000000000..49dc0c45778
--- /dev/null
+++ b/libs/storage-core/src/storage.service.ts
@@ -0,0 +1,26 @@
+import { Observable } from "rxjs";
+
+import { StorageOptions } from "./storage-options";
+
+export type StorageUpdateType = "save" | "remove";
+export type StorageUpdate = {
+  key: string;
+  updateType: StorageUpdateType;
+};
+
+export interface ObservableStorageService {
+  /**
+   * Provides an {@link Observable} that represents a stream of updates that
+   * have happened in this storage service or in the storage this service provides
+   * an interface to.
+   */
+  get updates$(): Observable<StorageUpdate>;
+}
+
+export abstract class StorageService {
+  abstract get valuesRequireDeserialization(): boolean;
+  abstract get<T>(key: string, options?: StorageOptions): Promise<T>;
+  abstract has(key: string, options?: StorageOptions): Promise<boolean>;
+  abstract save<T>(key: string, obj: T, options?: StorageOptions): Promise<void>;
+  abstract remove(key: string, options?: StorageOptions): Promise<void>;
+}
diff --git a/libs/storage-core/tsconfig.eslint.json b/libs/storage-core/tsconfig.eslint.json
new file mode 100644
index 00000000000..3daf120441a
--- /dev/null
+++ b/libs/storage-core/tsconfig.eslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": ["src/**/*.ts", "src/**/*.js"],
+  "exclude": ["**/build", "**/dist"]
+}
diff --git a/libs/storage-core/tsconfig.json b/libs/storage-core/tsconfig.json
new file mode 100644
index 00000000000..62ebbd94647
--- /dev/null
+++ b/libs/storage-core/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/libs/storage-core/tsconfig.lib.json b/libs/storage-core/tsconfig.lib.json
new file mode 100644
index 00000000000..9cbf6736007
--- /dev/null
+++ b/libs/storage-core/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.js", "src/**/*.spec.ts"]
+}
diff --git a/libs/storage-core/tsconfig.spec.json b/libs/storage-core/tsconfig.spec.json
new file mode 100644
index 00000000000..1275f148a18
--- /dev/null
+++ b/libs/storage-core/tsconfig.spec.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "moduleResolution": "node10",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/libs/storage-test-utils/README.md b/libs/storage-test-utils/README.md
new file mode 100644
index 00000000000..2be8817e402
--- /dev/null
+++ b/libs/storage-test-utils/README.md
@@ -0,0 +1,5 @@
+# storage-test-utils
+
+Owned by: platform
+
+Test tools for the storage library
diff --git a/libs/storage-test-utils/eslint.config.mjs b/libs/storage-test-utils/eslint.config.mjs
new file mode 100644
index 00000000000..9c37d10e3ff
--- /dev/null
+++ b/libs/storage-test-utils/eslint.config.mjs
@@ -0,0 +1,3 @@
+import baseConfig from "../../eslint.config.mjs";
+
+export default [...baseConfig];
diff --git a/libs/storage-test-utils/jest.config.js b/libs/storage-test-utils/jest.config.js
new file mode 100644
index 00000000000..a145b5b2f4c
--- /dev/null
+++ b/libs/storage-test-utils/jest.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  displayName: "storage-test-utils",
+  preset: "../../jest.preset.js",
+  testEnvironment: "node",
+  transform: {
+    "^.+\\.[tj]s$": ["ts-jest", { tsconfig: "<rootDir>/tsconfig.spec.json" }],
+  },
+  moduleFileExtensions: ["ts", "js", "html"],
+  coverageDirectory: "../../coverage/libs/storage-test-utils",
+};
diff --git a/libs/storage-test-utils/package.json b/libs/storage-test-utils/package.json
new file mode 100644
index 00000000000..22d83f2334e
--- /dev/null
+++ b/libs/storage-test-utils/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@bitwarden/storage-test-utils",
+  "version": "0.0.1",
+  "description": "Test tools for the storage library",
+  "private": true,
+  "type": "commonjs",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "license": "GPL-3.0",
+  "author": "platform"
+}
diff --git a/libs/storage-test-utils/project.json b/libs/storage-test-utils/project.json
new file mode 100644
index 00000000000..f1aad63c9e3
--- /dev/null
+++ b/libs/storage-test-utils/project.json
@@ -0,0 +1,33 @@
+{
+  "name": "storage-test-utils",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/storage-test-utils/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/storage-test-utils",
+        "main": "libs/storage-test-utils/src/index.ts",
+        "tsConfig": "libs/storage-test-utils/tsconfig.lib.json",
+        "assets": ["libs/storage-test-utils/*.md"]
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/storage-test-utils/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/storage-test-utils/jest.config.js"
+      }
+    }
+  }
+}
diff --git a/libs/storage-test-utils/src/fake-storage.service.ts b/libs/storage-test-utils/src/fake-storage.service.ts
new file mode 100644
index 00000000000..aa902cf0da8
--- /dev/null
+++ b/libs/storage-test-utils/src/fake-storage.service.ts
@@ -0,0 +1,119 @@
+import { MockProxy, mock } from "jest-mock-extended";
+import { Subject } from "rxjs";
+
+import {
+  AbstractStorageService,
+  ObservableStorageService,
+  StorageUpdate,
+  StorageOptions,
+} from "@bitwarden/storage-core";
+
+const INTERNAL_KEY = "__internal__";
+
+export class FakeStorageService implements AbstractStorageService, ObservableStorageService {
+  private store: Record<string, unknown>;
+  private updatesSubject = new Subject<StorageUpdate>();
+  private _valuesRequireDeserialization = false;
+
+  /**
+   * Returns a mock of a {@see AbstractStorageService} for asserting the expected
+   * amount of calls. It is not recommended to use this to mock implementations as
+   * they are not respected.
+   */
+  mock: MockProxy<AbstractStorageService>;
+
+  constructor(initial?: Record<string, unknown>) {
+    this.store = initial ?? {};
+    this.mock = mock<AbstractStorageService>();
+  }
+
+  /**
+   * Updates the internal store for this fake implementation, this bypasses any mock calls
+   * or updates to the {@link updates$} observable.
+   * @param store
+   */
+  internalUpdateStore(store: Record<string, unknown>) {
+    this.store = store;
+  }
+
+  get internalStore() {
+    return this.store;
+  }
+
+  internalUpdateValuesRequireDeserialization(value: boolean) {
+    this._valuesRequireDeserialization = value;
+  }
+
+  get valuesRequireDeserialization(): boolean {
+    return this._valuesRequireDeserialization;
+  }
+
+  get updates$() {
+    return this.updatesSubject.asObservable();
+  }
+
+  get<T>(key: string, options?: StorageOptions): Promise<T> {
+    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    this.mock.get(key, options);
+    const value = this.store[key] as T;
+    return Promise.resolve(value);
+  }
+  has(key: string, options?: StorageOptions): Promise<boolean> {
+    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    this.mock.has(key, options);
+    return Promise.resolve(this.store[key] != null);
+  }
+  async save<T>(key: string, obj: T, options?: StorageOptions): Promise<void> {
+    // These exceptions are copied from https://github.com/sindresorhus/conf/blob/608adb0c46fb1680ddbd9833043478367a64c120/source/index.ts#L193-L203
+    // which is a library that is used by `ElectronStorageService`. We add them here to ensure that the behavior in our testing mirrors the real world.
+    if (typeof key !== "string" && typeof key !== "object") {
+      throw new TypeError(
+        `Expected \`key\` to be of type \`string\` or \`object\`, got ${typeof key}`,
+      );
+    }
+
+    // We don't throw this error because ElectronStorageService automatically detects this case
+    // and calls `delete()` instead of `set()`.
+    // if (typeof key !== "object" && obj === undefined) {
+    //   throw new TypeError("Use `delete()` to clear values");
+    // }
+
+    if (this._containsReservedKey(key)) {
+      throw new TypeError(
+        `Please don't use the ${INTERNAL_KEY} key, as it's used to manage this module internal operations.`,
+      );
+    }
+
+    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    this.mock.save(key, obj, options);
+    this.store[key] = obj;
+    this.updatesSubject.next({ key: key, updateType: "save" });
+  }
+  remove(key: string, options?: StorageOptions): Promise<void> {
+    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    this.mock.remove(key, options);
+    delete this.store[key];
+    this.updatesSubject.next({ key: key, updateType: "remove" });
+    return Promise.resolve();
+  }
+
+  private _containsReservedKey(key: string | Partial<unknown>): boolean {
+    if (typeof key === "object") {
+      const firsKey = Object.keys(key)[0];
+
+      if (firsKey === INTERNAL_KEY) {
+        return true;
+      }
+    }
+
+    if (typeof key !== "string") {
+      return false;
+    }
+
+    return false;
+  }
+}
diff --git a/libs/storage-test-utils/src/index.ts b/libs/storage-test-utils/src/index.ts
new file mode 100644
index 00000000000..dc5fdc1125b
--- /dev/null
+++ b/libs/storage-test-utils/src/index.ts
@@ -0,0 +1 @@
+export * from "./fake-storage.service";
diff --git a/libs/storage-test-utils/src/storage-test-utils.spec.ts b/libs/storage-test-utils/src/storage-test-utils.spec.ts
new file mode 100644
index 00000000000..c323d4ce386
--- /dev/null
+++ b/libs/storage-test-utils/src/storage-test-utils.spec.ts
@@ -0,0 +1,8 @@
+import * as lib from "./index";
+
+describe("storage-test-utils", () => {
+  // This test will fail until something is exported from index.ts
+  it("should work", () => {
+    expect(lib).toBeDefined();
+  });
+});
diff --git a/libs/storage-test-utils/tsconfig.eslint.json b/libs/storage-test-utils/tsconfig.eslint.json
new file mode 100644
index 00000000000..3daf120441a
--- /dev/null
+++ b/libs/storage-test-utils/tsconfig.eslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": ["src/**/*.ts", "src/**/*.js"],
+  "exclude": ["**/build", "**/dist"]
+}
diff --git a/libs/storage-test-utils/tsconfig.json b/libs/storage-test-utils/tsconfig.json
new file mode 100644
index 00000000000..62ebbd94647
--- /dev/null
+++ b/libs/storage-test-utils/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/libs/storage-test-utils/tsconfig.lib.json b/libs/storage-test-utils/tsconfig.lib.json
new file mode 100644
index 00000000000..9cbf6736007
--- /dev/null
+++ b/libs/storage-test-utils/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.js", "src/**/*.spec.ts"]
+}
diff --git a/libs/storage-test-utils/tsconfig.spec.json b/libs/storage-test-utils/tsconfig.spec.json
new file mode 100644
index 00000000000..901c72378dd
--- /dev/null
+++ b/libs/storage-test-utils/tsconfig.spec.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../..//dist/out-tsc",
+    "module": "commonjs",
+    "moduleResolution": "node10",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/libs/tools/card/README.md b/libs/tools/card/README.md
deleted file mode 100644
index 5e28e62d154..00000000000
--- a/libs/tools/card/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## Tools Card
-
-Package name: `@bitwarden/tools-card`
-
-Generic Tools Card Component
diff --git a/libs/tools/card/tsconfig.json b/libs/tools/card/tsconfig.json
deleted file mode 100644
index 050a1748b7b..00000000000
--- a/libs/tools/card/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "extends": "../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../angular/src/*"],
-      "@bitwarden/auth/common": ["../../auth/src/common"],
-      "@bitwarden/common/*": ["../../common/src/*"],
-      "@bitwarden/components": ["../../components/src"],
-      "@bitwarden/key-management": ["../../key-management/src"],
-      "@bitwarden/platform": ["../../platform/src"],
-      "@bitwarden/ui-common": ["../../ui/common/src"]
-    }
-  },
-  "include": ["src"],
-  "exclude": ["node_modules", "dist"]
-}
diff --git a/libs/tools/export/vault-export/vault-export-core/jest.config.js b/libs/tools/export/vault-export/vault-export-core/jest.config.js
index 0a78a9855dc..066309a8bfc 100644
--- a/libs/tools/export/vault-export/vault-export-core/jest.config.js
+++ b/libs/tools/export/vault-export/vault-export-core/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../../tsconfig.base");
 
 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
   preset: "ts-jest",
   testEnvironment: "jsdom",
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../../",
+    prefix: "<rootDir>/../../../../../",
   }),
 };
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.spec.ts b/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.spec.ts
index 6ed4caa3f8d..d539c85c94c 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.spec.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.spec.ts
@@ -25,6 +25,10 @@ import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.v
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
+import {
+  RestrictedCipherType,
+  RestrictedItemTypesService,
+} from "@bitwarden/common/vault/services/restricted-item-types.service";
 import {
   DEFAULT_KDF_CONFIG,
   PBKDF2KdfConfig,
@@ -170,6 +174,8 @@ describe("VaultExportService", () => {
   let kdfConfigService: MockProxy<KdfConfigService>;
   let accountService: MockProxy<AccountService>;
   let apiService: MockProxy<ApiService>;
+  let restrictedSubject: BehaviorSubject<RestrictedCipherType[]>;
+  let restrictedItemTypesService: Partial<RestrictedItemTypesService>;
   let fetchMock: jest.Mock;
 
   const userId = "" as UserId;
@@ -186,6 +192,12 @@ describe("VaultExportService", () => {
     apiService = mock<ApiService>();
 
     keyService.userKey$.mockReturnValue(new BehaviorSubject("mockOriginalUserKey" as any));
+    restrictedSubject = new BehaviorSubject<RestrictedCipherType[]>([]);
+    restrictedItemTypesService = {
+      restricted$: new BehaviorSubject<RestrictedCipherType[]>([]),
+      isCipherRestricted: jest.fn().mockReturnValue(false),
+      isCipherRestricted$: jest.fn().mockReturnValue(of(false)),
+    };
 
     const accountInfo: AccountInfo = {
       email: "",
@@ -223,6 +235,7 @@ describe("VaultExportService", () => {
       kdfConfigService,
       accountService,
       apiService,
+      restrictedItemTypesService as RestrictedItemTypesService,
     );
   });
 
@@ -262,6 +275,46 @@ describe("VaultExportService", () => {
     expectEqualCiphers(UserCipherDomains.slice(0, 2), exportedData.data);
   });
 
+  it("does not unencrypted export restricted user items", async () => {
+    restrictedSubject.next([{ cipherType: CipherType.Card, allowViewOrgIds: [] }]);
+    const cardCipher = generateCipherView(false);
+    cardCipher.type = CipherType.Card;
+
+    (restrictedItemTypesService.isCipherRestricted as jest.Mock)
+      .mockReturnValueOnce(false)
+      .mockReturnValueOnce(true) // cardCipher - restricted
+      .mockReturnValueOnce(false);
+
+    const testCiphers = [UserCipherViews[0], cardCipher, UserCipherViews[1]];
+    cipherService.getAllDecrypted.mockResolvedValue(testCiphers);
+
+    const actual = await exportService.getExport("json");
+    expect(typeof actual.data).toBe("string");
+    const exportedData = actual as ExportedVaultAsString;
+
+    expectEqualCiphers([UserCipherViews[0], UserCipherViews[1]], exportedData.data);
+  });
+
+  it("does not encrypted export restricted user items", async () => {
+    restrictedSubject.next([{ cipherType: CipherType.Card, allowViewOrgIds: [] }]);
+    const cardCipher = generateCipherDomain(false);
+    cardCipher.type = CipherType.Card;
+
+    (restrictedItemTypesService.isCipherRestricted as jest.Mock)
+      .mockReturnValueOnce(false)
+      .mockReturnValueOnce(true) // cardCipher - restricted
+      .mockReturnValueOnce(false);
+
+    const testCiphers = [UserCipherDomains[0], cardCipher, UserCipherDomains[1]];
+    cipherService.getAll.mockResolvedValue(testCiphers);
+
+    const actual = await exportService.getExport("encrypted_json");
+    expect(typeof actual.data).toBe("string");
+    const exportedData = actual as ExportedVaultAsString;
+
+    expectEqualCiphers([UserCipherDomains[0], UserCipherDomains[1]], exportedData.data);
+  });
+
   describe("zip export", () => {
     it("contains data.json", async () => {
       cipherService.getAllDecrypted.mockResolvedValue([]);
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.ts b/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.ts
index 537585aac7e..4d4ef217c66 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.ts
@@ -20,6 +20,7 @@ import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { Folder } from "@bitwarden/common/vault/models/domain/folder";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { KdfConfigService, KeyService } from "@bitwarden/key-management";
 
 import {
@@ -50,6 +51,7 @@ export class IndividualVaultExportService
     kdfConfigService: KdfConfigService,
     private accountService: AccountService,
     private apiService: ApiService,
+    private restrictedItemTypesService: RestrictedItemTypesService,
   ) {
     super(pinService, encryptService, cryptoFunctionService, kdfConfigService);
   }
@@ -169,9 +171,15 @@ export class IndividualVaultExportService
       }),
     );
 
+    const restrictions = await firstValueFrom(this.restrictedItemTypesService.restricted$);
+
     promises.push(
       this.cipherService.getAllDecrypted(activeUserId).then((ciphers) => {
-        decCiphers = ciphers.filter((f) => f.deletedDate == null);
+        decCiphers = ciphers.filter(
+          (f) =>
+            f.deletedDate == null &&
+            !this.restrictedItemTypesService.isCipherRestricted(f, restrictions),
+        );
       }),
     );
 
@@ -203,15 +211,21 @@ export class IndividualVaultExportService
       }),
     );
 
+    const restrictions = await firstValueFrom(this.restrictedItemTypesService.restricted$);
+
     promises.push(
       this.cipherService.getAll(activeUserId).then((c) => {
-        ciphers = c.filter((f) => f.deletedDate == null);
+        ciphers = c.filter(
+          (f) =>
+            f.deletedDate == null &&
+            !this.restrictedItemTypesService.isCipherRestricted(f, restrictions),
+        );
       }),
     );
 
     await Promise.all(promises);
 
-    const userKey = await this.keyService.getUserKeyWithLegacySupport(activeUserId);
+    const userKey = await this.keyService.getUserKey(activeUserId);
     const encKeyValidation = await this.encryptService.encryptString(Utils.newGuid(), userKey);
 
     const jsonDoc: BitwardenEncryptedIndividualJsonExport = {
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts b/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts
index 4f30f299062..61fbcd261f4 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/org-vault-export.service.ts
@@ -24,6 +24,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { KdfConfigService, KeyService } from "@bitwarden/key-management";
 
 import {
@@ -52,6 +53,7 @@ export class OrganizationVaultExportService
     private collectionService: CollectionService,
     kdfConfigService: KdfConfigService,
     private accountService: AccountService,
+    private restrictedItemTypesService: RestrictedItemTypesService,
   ) {
     super(pinService, encryptService, cryptoFunctionService, kdfConfigService);
   }
@@ -133,6 +135,8 @@ export class OrganizationVaultExportService
     const decCiphers: CipherView[] = [];
     const promises = [];
 
+    const restrictions = await firstValueFrom(this.restrictedItemTypesService.restricted$);
+
     promises.push(
       this.apiService.getOrganizationExport(organizationId).then((exportData) => {
         const exportPromises: any = [];
@@ -156,7 +160,11 @@ export class OrganizationVaultExportService
                 const cipher = new Cipher(new CipherData(c));
                 exportPromises.push(
                   this.cipherService.decrypt(cipher, activeUserId).then((decCipher) => {
-                    decCiphers.push(decCipher);
+                    if (
+                      !this.restrictedItemTypesService.isCipherRestricted(decCipher, restrictions)
+                    ) {
+                      decCiphers.push(decCipher);
+                    }
                   }),
                 );
               });
@@ -176,7 +184,7 @@ export class OrganizationVaultExportService
 
   private async getOrganizationEncryptedExport(organizationId: string): Promise<string> {
     const collections: Collection[] = [];
-    const ciphers: Cipher[] = [];
+    let ciphers: Cipher[] = [];
     const promises = [];
 
     promises.push(
@@ -190,15 +198,17 @@ export class OrganizationVaultExportService
       }),
     );
 
+    const restrictions = await firstValueFrom(this.restrictedItemTypesService.restricted$);
+
     promises.push(
       this.apiService.getCiphersOrganization(organizationId).then((c) => {
         if (c != null && c.data != null && c.data.length > 0) {
-          c.data
+          ciphers = c.data
             .filter((item) => item.deletedDate === null)
-            .forEach((item) => {
-              const cipher = new Cipher(new CipherData(item));
-              ciphers.push(cipher);
-            });
+            .map((item) => new Cipher(new CipherData(item)))
+            .filter(
+              (cipher) => !this.restrictedItemTypesService.isCipherRestricted(cipher, restrictions),
+            );
         }
       }),
     );
@@ -231,11 +241,14 @@ export class OrganizationVaultExportService
     );
     await Promise.all(promises);
 
+    const restrictions = await firstValueFrom(this.restrictedItemTypesService.restricted$);
+
     decCiphers = allDecCiphers.filter(
       (f) =>
         f.deletedDate == null &&
         f.organizationId == organizationId &&
-        decCollections.some((dC) => f.collectionIds.some((cId) => dC.id === cId)),
+        decCollections.some((dC) => f.collectionIds.some((cId) => dC.id === cId)) &&
+        !this.restrictedItemTypesService.isCipherRestricted(f, restrictions),
     );
 
     if (format === "csv") {
@@ -267,11 +280,14 @@ export class OrganizationVaultExportService
 
     await Promise.all(promises);
 
+    const restrictions = await firstValueFrom(this.restrictedItemTypesService.restricted$);
+
     encCiphers = allCiphers.filter(
       (f) =>
         f.deletedDate == null &&
         f.organizationId == organizationId &&
-        encCollections.some((eC) => f.collectionIds.some((cId) => eC.id === cId)),
+        encCollections.some((eC) => f.collectionIds.some((cId) => eC.id === cId)) &&
+        !this.restrictedItemTypesService.isCipherRestricted(f, restrictions),
     );
 
     return this.BuildEncryptedExport(organizationId, encCollections, encCiphers);
diff --git a/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.spec.ts b/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.spec.ts
index 4e0dbfcc330..931cb6af740 100644
--- a/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.spec.ts
+++ b/libs/tools/export/vault-export/vault-export-core/src/services/vault-export.service.spec.ts
@@ -19,6 +19,10 @@ import { Login } from "@bitwarden/common/vault/models/domain/login";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
+import {
+  RestrictedCipherType,
+  RestrictedItemTypesService,
+} from "@bitwarden/common/vault/services/restricted-item-types.service";
 import {
   DEFAULT_KDF_CONFIG,
   PBKDF2KdfConfig,
@@ -159,6 +163,7 @@ describe("VaultExportService", () => {
   let accountService: MockProxy<AccountService>;
   let kdfConfigService: MockProxy<KdfConfigService>;
   let apiService: MockProxy<ApiService>;
+  let restrictedItemTypesService: Partial<RestrictedItemTypesService>;
 
   beforeEach(() => {
     cryptoFunctionService = mock<CryptoFunctionService>();
@@ -186,6 +191,12 @@ describe("VaultExportService", () => {
     const activeAccount = { id: userId, ...accountInfo };
     accountService.activeAccount$ = new BehaviorSubject(activeAccount);
 
+    restrictedItemTypesService = {
+      restricted$: new BehaviorSubject<RestrictedCipherType[]>([]),
+      isCipherRestricted: jest.fn().mockReturnValue(false),
+      isCipherRestricted$: jest.fn().mockReturnValue(of(false)),
+    };
+
     exportService = new IndividualVaultExportService(
       folderService,
       cipherService,
@@ -196,6 +207,7 @@ describe("VaultExportService", () => {
       kdfConfigService,
       accountService,
       apiService,
+      restrictedItemTypesService as RestrictedItemTypesService,
     );
   });
 
diff --git a/libs/tools/export/vault-export/vault-export-core/tsconfig.json b/libs/tools/export/vault-export/vault-export-core/tsconfig.json
index 7652a271044..06123643d63 100644
--- a/libs/tools/export/vault-export/vault-export-core/tsconfig.json
+++ b/libs/tools/export/vault-export/vault-export-core/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../../common/src/*"],
-      "@bitwarden/key-management": ["../../../../key-management/src"]
-    }
-  },
+  "extends": "../../../../../tsconfig",
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/export/vault-export/vault-export-ui/jest.config.js b/libs/tools/export/vault-export/vault-export-ui/jest.config.js
index 0a78a9855dc..066309a8bfc 100644
--- a/libs/tools/export/vault-export/vault-export-ui/jest.config.js
+++ b/libs/tools/export/vault-export/vault-export-ui/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../../tsconfig.base");
 
 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
   preset: "ts-jest",
   testEnvironment: "jsdom",
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../../",
+    prefix: "<rootDir>/../../../../../",
   }),
 };
diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export-scope-callout.component.ts b/libs/tools/export/vault-export/vault-export-ui/src/components/export-scope-callout.component.ts
index cb16c759ba2..2b03234c5e2 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export-scope-callout.component.ts
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export-scope-callout.component.ts
@@ -16,7 +16,6 @@ import { CalloutModule } from "@bitwarden/components";
 @Component({
   selector: "tools-export-scope-callout",
   templateUrl: "export-scope-callout.component.html",
-  standalone: true,
   imports: [CommonModule, JslibModule, CalloutModule],
 })
 export class ExportScopeCalloutComponent {
diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html
index d6b1bbe216a..398085c135c 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html
@@ -19,7 +19,7 @@
           [label]="'myVault' | i18n"
           value="myVault"
           icon="bwi-user"
-          *ngIf="!(disablePersonalOwnershipPolicy$ | async)"
+          *ngIf="!(organizationDataOwnershipPolicy$ | async)"
         />
         <bit-option
           *ngFor="let o of organizations$ | async"
diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
index 956cc611c2e..6af6d5121fb 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
@@ -67,7 +67,6 @@ import { ExportScopeCalloutComponent } from "./export-scope-callout.component";
 @Component({
   selector: "tools-export",
   templateUrl: "export.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     ReactiveFormsModule,
@@ -154,7 +153,7 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   disablePersonalVaultExportPolicy$: Observable<boolean>;
-  disablePersonalOwnershipPolicy$: Observable<boolean>;
+  organizationDataOwnershipPolicy$: Observable<boolean>;
 
   exportForm = this.formBuilder.group({
     vaultSelector: [
@@ -210,10 +209,10 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
       ),
     );
 
-    this.disablePersonalOwnershipPolicy$ = this.accountService.activeAccount$.pipe(
+    this.organizationDataOwnershipPolicy$ = this.accountService.activeAccount$.pipe(
       getUserId,
       switchMap((userId) =>
-        this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
+        this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
       ),
     );
 
@@ -295,21 +294,21 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
 
     combineLatest([
       this.disablePersonalVaultExportPolicy$,
-      this.disablePersonalOwnershipPolicy$,
+      this.organizationDataOwnershipPolicy$,
       this.organizations$,
     ])
       .pipe(
-        tap(([disablePersonalVaultExport, disablePersonalOwnership, organizations]) => {
+        tap(([disablePersonalVaultExport, organizationDataOwnership, organizations]) => {
           this._disabledByPolicy = disablePersonalVaultExport;
 
-          // When personalOwnership is disabled and we have orgs, set the first org as the selected vault
-          if (disablePersonalOwnership && organizations.length > 0) {
+          // When organizationDataOwnership is enabled and we have orgs, set the first org as the selected vault
+          if (organizationDataOwnership && organizations.length > 0) {
             this.exportForm.enable();
             this.exportForm.controls.vaultSelector.setValue(organizations[0].id);
           }
 
-          // When personalOwnership is disabled and we have no orgs, disable the form
-          if (disablePersonalOwnership && organizations.length === 0) {
+          // When organizationDataOwnership is enabled and we have no orgs, disable the form
+          if (organizationDataOwnership && organizations.length === 0) {
             this.exportForm.disable();
           }
 
@@ -319,7 +318,7 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
           }
 
           // When neither policy is enabled, enable the form and set the default vault to "myVault"
-          if (!disablePersonalVaultExport && !disablePersonalOwnership) {
+          if (!disablePersonalVaultExport && !organizationDataOwnership) {
             this.exportForm.controls.vaultSelector.setValue("myVault");
           }
         }),
diff --git a/libs/tools/export/vault-export/vault-export-ui/tsconfig.json b/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
index 6f2a0242dac..06123643d63 100644
--- a/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
+++ b/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
@@ -1,26 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../../../angular/src/*"],
-      "@bitwarden/auth/angular": ["../../../../auth/src/angular"],
-      "@bitwarden/auth/common": ["../../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../../common/src/*"],
-      "@bitwarden/components": ["../../../../components/src"],
-      "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
-      "@bitwarden/generator-components": ["../../../../tools/generator/components/src"],
-      "@bitwarden/generator-history": ["../../../../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../../../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../../../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../../../../key-management/src"],
-      "@bitwarden/platform": ["../../../../platform/src"],
-      "@bitwarden/ui-common": ["../../../../ui/common/src"],
-      "@bitwarden/vault-export-core": [
-        "../../../../tools/export/vault-export/vault-export-core/src"
-      ]
-    }
-  },
+  "extends": "../../../../../tsconfig",
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/generator/components/jest.config.js b/libs/tools/generator/components/jest.config.js
index bf5e465f398..e8a7d433d1d 100644
--- a/libs/tools/generator/components/jest.config.js
+++ b/libs/tools/generator/components/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../shared/tsconfig.spec.json");
+const { compilerOptions } = require("../../../../tsconfig.base");
 
 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
   preset: "ts-jest",
   testEnvironment: "../../../shared/test.environment.ts",
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../",
+    prefix: "<rootDir>/../../../../",
   }),
 };
diff --git a/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts b/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts
index 7559dee130c..9ec0e636f9a 100644
--- a/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts
+++ b/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts
@@ -29,7 +29,6 @@ import { EmptyCredentialHistoryComponent } from "./empty-credential-history.comp
 
 @Component({
   templateUrl: "credential-generator-history-dialog.component.html",
-  standalone: true,
   imports: [
     ButtonModule,
     CommonModule,
diff --git a/libs/tools/generator/components/src/credential-generator-history.component.ts b/libs/tools/generator/components/src/credential-generator-history.component.ts
index 76dfbaea867..3965b2be83e 100644
--- a/libs/tools/generator/components/src/credential-generator-history.component.ts
+++ b/libs/tools/generator/components/src/credential-generator-history.component.ts
@@ -27,7 +27,6 @@ import { GeneratorModule } from "./generator.module";
 import { translate } from "./util";
 
 @Component({
-  standalone: true,
   selector: "bit-credential-generator-history",
   templateUrl: "credential-generator-history.component.html",
   imports: [
diff --git a/libs/tools/generator/components/src/empty-credential-history.component.ts b/libs/tools/generator/components/src/empty-credential-history.component.ts
index 1e23adf0bb1..29c9fc277fc 100644
--- a/libs/tools/generator/components/src/empty-credential-history.component.ts
+++ b/libs/tools/generator/components/src/empty-credential-history.component.ts
@@ -6,7 +6,6 @@ import { IconModule, TypographyModule } from "@bitwarden/components";
 import { NoCredentialsIcon } from "./icons/no-credentials.icon";
 
 @Component({
-  standalone: true,
   selector: "bit-empty-credential-history",
   templateUrl: "empty-credential-history.component.html",
   imports: [JslibModule, IconModule, TypographyModule],
diff --git a/libs/tools/generator/components/src/nudge-generator-spotlight.component.html b/libs/tools/generator/components/src/nudge-generator-spotlight.component.html
index 9c65a1cea96..581825936be 100644
--- a/libs/tools/generator/components/src/nudge-generator-spotlight.component.html
+++ b/libs/tools/generator/components/src/nudge-generator-spotlight.component.html
@@ -3,13 +3,14 @@
     [title]="'generatorNudgeTitle' | i18n"
     (onDismiss)="dismissGeneratorSpotlight(NudgeType.GeneratorNudgeStatus)"
   >
-    <p
-      class="tw-text-main"
-      bitTypography="body2"
-      [attr.aria-label]="'generatorNudgeIconAria' | i18n"
-    >
-      {{ "generatorNudgeBodyOne" | i18n }} <i class="bwi bwi-generate"></i>
-      {{ "generatorNudgeBodyTwo" | i18n }}
+    <p class="tw-text-main tw-mb-0" bitTypography="body2">
+      <span class="tw-sr-only">
+        {{ "generatorNudgeBodyAria" | i18n }}
+      </span>
+      <span aria-hidden="true">
+        {{ "generatorNudgeBodyOne" | i18n }} <i class="bwi bwi-generate"></i>
+        {{ "generatorNudgeBodyTwo" | i18n }}
+      </span>
     </p>
   </bit-spotlight>
 </div>
diff --git a/libs/tools/generator/components/src/nudge-generator-spotlight.component.ts b/libs/tools/generator/components/src/nudge-generator-spotlight.component.ts
index a0008bac782..6807a987a85 100644
--- a/libs/tools/generator/components/src/nudge-generator-spotlight.component.ts
+++ b/libs/tools/generator/components/src/nudge-generator-spotlight.component.ts
@@ -11,7 +11,6 @@ import { TypographyModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
 @Component({
-  standalone: true,
   selector: "nudge-generator-spotlight",
   templateUrl: "nudge-generator-spotlight.component.html",
   imports: [I18nPipe, SpotlightComponent, AsyncPipe, CommonModule, TypographyModule],
diff --git a/libs/tools/generator/components/tsconfig.json b/libs/tools/generator/components/tsconfig.json
index 9a3a08b40fc..5010a206c9b 100644
--- a/libs/tools/generator/components/tsconfig.json
+++ b/libs/tools/generator/components/tsconfig.json
@@ -1,20 +1,5 @@
 {
-  "extends": "../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../../angular/src/*"],
-      "@bitwarden/auth/common": ["../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../common/src/*"],
-      "@bitwarden/components": ["../../../components/src"],
-      "@bitwarden/generator-core": ["../../../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../../tools/generator/extensions/history/src"],
-      "@bitwarden/key-management": ["../../../key-management/src"],
-      "@bitwarden/platform": ["../../../platform/src"],
-      "@bitwarden/ui-common": ["../../../ui/common/src"],
-      "@bitwarden/vault": ["../../../vault/src"]
-    }
-  },
+  "extends": "../../../../tsconfig.base",
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/generator/core/jest.config.js b/libs/tools/generator/core/jest.config.js
index b052672c4af..e8a7d433d1d 100644
--- a/libs/tools/generator/core/jest.config.js
+++ b/libs/tools/generator/core/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../tsconfig.base");
 
 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
   preset: "ts-jest",
   testEnvironment: "../../../shared/test.environment.ts",
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../",
+    prefix: "<rootDir>/../../../../",
   }),
 };
diff --git a/libs/tools/generator/core/src/metadata/password/sdk-eff-word-list.ts b/libs/tools/generator/core/src/metadata/password/sdk-eff-word-list.ts
index 8892016b609..9a653f88ede 100644
--- a/libs/tools/generator/core/src/metadata/password/sdk-eff-word-list.ts
+++ b/libs/tools/generator/core/src/metadata/password/sdk-eff-word-list.ts
@@ -31,7 +31,7 @@ const sdkPassphrase: GeneratorMetadata<PassphraseGenerationOptions> = {
     create(
       dependencies: GeneratorDependencyProvider,
     ): CredentialGenerator<PassphraseGenerationOptions> {
-      return new SdkPasswordRandomizer(new BitwardenClient(), Date.now); // @TODO hook up a real SDK client
+      return new SdkPasswordRandomizer(new BitwardenClient(null), Date.now); // @TODO hook up a real SDK client
     },
   },
   profiles: {
diff --git a/libs/tools/generator/core/src/metadata/password/sdk-random-password.ts b/libs/tools/generator/core/src/metadata/password/sdk-random-password.ts
index d6544fa115e..d9e06408d1d 100644
--- a/libs/tools/generator/core/src/metadata/password/sdk-random-password.ts
+++ b/libs/tools/generator/core/src/metadata/password/sdk-random-password.ts
@@ -31,7 +31,7 @@ const sdkPassword: GeneratorMetadata<PasswordGeneratorSettings> = deepFreeze({
     create(
       dependencies: GeneratorDependencyProvider,
     ): CredentialGenerator<PasswordGeneratorSettings> {
-      return new SdkPasswordRandomizer(new BitwardenClient(), Date.now); // @TODO hook up a real SDK client
+      return new SdkPasswordRandomizer(new BitwardenClient(null), Date.now); // @TODO hook up a real SDK client
     },
   },
   profiles: {
diff --git a/libs/tools/generator/core/src/providers/generator-profile-provider.spec.ts b/libs/tools/generator/core/src/providers/generator-profile-provider.spec.ts
index 1053834eca7..32d99aa8a1f 100644
--- a/libs/tools/generator/core/src/providers/generator-profile-provider.spec.ts
+++ b/libs/tools/generator/core/src/providers/generator-profile-provider.spec.ts
@@ -172,7 +172,7 @@ describe("GeneratorProfileProvider", () => {
       await awaitAsync();
       const result = await firstValueFrom(stateProvider.getUserState$(SettingsKey, SomeUser));
 
-      expect(result).toEqual({ foo: "next value" });
+      expect(result).toMatchObject({ foo: "next value" });
     });
 
     it("waits for the user to become available", async () => {
diff --git a/libs/tools/generator/core/tsconfig.json b/libs/tools/generator/core/tsconfig.json
index 303f913ba23..5010a206c9b 100644
--- a/libs/tools/generator/core/tsconfig.json
+++ b/libs/tools/generator/core/tsconfig.json
@@ -1,13 +1,5 @@
 {
-  "extends": "../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../common/src/*"],
-      "@bitwarden/key-management": ["../../../key-management/src"]
-    }
-  },
+  "extends": "../../../../tsconfig.base",
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/generator/extensions/history/jest.config.js b/libs/tools/generator/extensions/history/jest.config.js
index f90801cd7c4..598c83fe7d7 100644
--- a/libs/tools/generator/extensions/history/jest.config.js
+++ b/libs/tools/generator/extensions/history/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../../tsconfig.base");
 
 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
   preset: "ts-jest",
   testEnvironment: "../../../../shared/test.environment.ts",
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../../",
+    prefix: "<rootDir>/../../../../../",
   }),
 };
diff --git a/libs/tools/generator/extensions/history/tsconfig.json b/libs/tools/generator/extensions/history/tsconfig.json
index 5fc1caf014f..84e562664f4 100644
--- a/libs/tools/generator/extensions/history/tsconfig.json
+++ b/libs/tools/generator/extensions/history/tsconfig.json
@@ -1,14 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../../common/src/*"],
-      "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
-      "@bitwarden/key-management": ["../../../../key-management/src"]
-    }
-  },
+  "extends": "../../../../../tsconfig.base",
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/generator/extensions/legacy/jest.config.js b/libs/tools/generator/extensions/legacy/jest.config.js
index f90801cd7c4..598c83fe7d7 100644
--- a/libs/tools/generator/extensions/legacy/jest.config.js
+++ b/libs/tools/generator/extensions/legacy/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../../tsconfig.base");
 
 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
   preset: "ts-jest",
   testEnvironment: "../../../../shared/test.environment.ts",
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../../",
+    prefix: "<rootDir>/../../../../../",
   }),
 };
diff --git a/libs/tools/generator/extensions/legacy/tsconfig.json b/libs/tools/generator/extensions/legacy/tsconfig.json
index 9a09e28ea3d..06123643d63 100644
--- a/libs/tools/generator/extensions/legacy/tsconfig.json
+++ b/libs/tools/generator/extensions/legacy/tsconfig.json
@@ -1,16 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../../common/src/*"],
-      "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../../../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-navigation": ["../../../../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../../../../key-management/src"]
-    }
-  },
+  "extends": "../../../../../tsconfig",
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/generator/extensions/navigation/jest.config.js b/libs/tools/generator/extensions/navigation/jest.config.js
index f90801cd7c4..598c83fe7d7 100644
--- a/libs/tools/generator/extensions/navigation/jest.config.js
+++ b/libs/tools/generator/extensions/navigation/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../../tsconfig.base");
 
 /** @type {import('jest').Config} */
 module.exports = {
@@ -8,6 +8,6 @@ module.exports = {
   preset: "ts-jest",
   testEnvironment: "../../../../shared/test.environment.ts",
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../../",
+    prefix: "<rootDir>/../../../../../",
   }),
 };
diff --git a/libs/tools/generator/extensions/navigation/tsconfig.json b/libs/tools/generator/extensions/navigation/tsconfig.json
index 5fc1caf014f..06123643d63 100644
--- a/libs/tools/generator/extensions/navigation/tsconfig.json
+++ b/libs/tools/generator/extensions/navigation/tsconfig.json
@@ -1,14 +1,5 @@
 {
-  "extends": "../../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../../common/src/*"],
-      "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
-      "@bitwarden/key-management": ["../../../../key-management/src"]
-    }
-  },
+  "extends": "../../../../../tsconfig",
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/send/send-ui/jest.config.js b/libs/tools/send/send-ui/jest.config.js
index 952e9ce0e2e..2ab935f0bfd 100644
--- a/libs/tools/send/send-ui/jest.config.js
+++ b/libs/tools/send/send-ui/jest.config.js
@@ -1,13 +1,26 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../shared/tsconfig.spec");
+const { compilerOptions } = require("../../../../tsconfig.base");
+
+const { createCjsPreset } = require("jest-preset-angular/presets");
+
+// FIXME: Should use the shared config!
+const presetConfig = createCjsPreset({
+  tsconfig: "<rootDir>/tsconfig.spec.json",
+  astTransformers: {
+    before: ["<rootDir>/../../../shared/es2020-transformer.ts"],
+  },
+  diagnostics: {
+    ignoreCodes: ["TS151001"],
+  },
+});
 
 /** @type {import('jest').Config} */
 module.exports = {
-  testMatch: ["**/+(*.)+(spec).+(ts)"],
-  preset: "jest-preset-angular",
+  ...presetConfig,
+  displayName: "tools/send-ui tests",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/../../",
+    prefix: "<rootDir>/../../../../",
   }),
 };
diff --git a/libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.ts b/libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.ts
index 0bb753d3f37..4bcf11bf94f 100644
--- a/libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.ts
+++ b/libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.ts
@@ -54,7 +54,6 @@ export enum SendItemDialogResult {
  */
 @Component({
   templateUrl: "send-add-edit-dialog.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     SearchModule,
diff --git a/libs/tools/send/send-ui/src/icons/send-created.icon.ts b/libs/tools/send/send-ui/src/icons/active-send.icon.ts
similarity index 98%
rename from libs/tools/send/send-ui/src/icons/send-created.icon.ts
rename to libs/tools/send/send-ui/src/icons/active-send.icon.ts
index 099baebb9ad..da5932bf95c 100644
--- a/libs/tools/send/send-ui/src/icons/send-created.icon.ts
+++ b/libs/tools/send/send-ui/src/icons/active-send.icon.ts
@@ -1,6 +1,6 @@
 import { svgIcon } from "@bitwarden/components";
 
-export const SendCreatedIcon = svgIcon`
+export const ActiveSendIcon = svgIcon`
 <svg width="96" height="95" viewBox="0 0 96 95" fill="none" xmlns="http://www.w3.org/2000/svg">
   <path class="tw-stroke-art-primary" d="M89.4998 48.3919C89.4998 70.5749 70.9198 88.5573 47.9998 88.5573C46.0374 88.5573 44.1068 88.4257 42.217 88.1707M6.49976 48.3919C6.49976 26.2092 25.08 8.22656 47.9998 8.22656C51.8283 8.22656 55.5353 8.72824 59.0553 9.66744" stroke-linecap="round" stroke-linejoin="round"/>
   <path class="tw-stroke-art-primary" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="M5.47085 67.8617C2.60335 61.9801 1 55.4075 1 48.4729C1 23.3503 22.0426 2.98438 48 2.98438C52.3355 2.98438 56.534 3.55257 60.5205 4.61618M92.211 32.9993C94.016 37.8295 95 43.0399 95 48.4729C95 73.5956 73.9575 93.9614 48 93.9614C45.7775 93.9614 43.5911 93.8119 41.4508 93.5235" />
diff --git a/libs/tools/send/send-ui/src/icons/index.ts b/libs/tools/send/send-ui/src/icons/index.ts
index 4460070f43b..57636daadcf 100644
--- a/libs/tools/send/send-ui/src/icons/index.ts
+++ b/libs/tools/send/send-ui/src/icons/index.ts
@@ -1,3 +1,3 @@
 export { ExpiredSendIcon } from "./expired-send.icon";
 export { NoSendsIcon } from "./no-send.icon";
-export { SendCreatedIcon } from "./send-created.icon";
+export { ActiveSendIcon } from "./active-send.icon";
diff --git a/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts b/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts
index 6563789f1c7..ba5176e5db5 100644
--- a/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts
+++ b/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts
@@ -12,7 +12,6 @@ import { BadgeModule, ButtonModule, ButtonType, MenuModule } from "@bitwarden/co
 @Component({
   selector: "tools-new-send-dropdown",
   templateUrl: "new-send-dropdown.component.html",
-  standalone: true,
   imports: [JslibModule, CommonModule, ButtonModule, RouterLink, MenuModule, BadgeModule],
 })
 export class NewSendDropdownComponent implements OnInit {
diff --git a/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts b/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts
index 30775aa8a83..b2ab149f2f2 100644
--- a/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts
+++ b/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts
@@ -36,7 +36,6 @@ import { SendFormContainer } from "../../send-form-container";
 @Component({
   selector: "tools-send-options",
   templateUrl: "./send-options.component.html",
-  standalone: true,
   imports: [
     AsyncActionsModule,
     ButtonModule,
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.ts b/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.ts
index 9ca9aefb4ac..e1fbf5dbc50 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.ts
+++ b/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.ts
@@ -50,7 +50,6 @@ export interface DatePresetSelectOption {
 @Component({
   selector: "tools-send-details",
   templateUrl: "./send-details.component.html",
-  standalone: true,
   imports: [
     SectionComponent,
     SectionHeaderComponent,
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts b/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts
index a8f878aab23..9d967e15ba8 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts
+++ b/libs/tools/send/send-ui/src/send-form/components/send-details/send-file-details.component.ts
@@ -22,7 +22,6 @@ import { SendFormContainer } from "../../send-form-container";
 @Component({
   selector: "tools-send-file-details",
   templateUrl: "./send-file-details.component.html",
-  standalone: true,
   imports: [
     ButtonModule,
     CommonModule,
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-details/send-text-details.component.ts b/libs/tools/send/send-ui/src/send-form/components/send-details/send-text-details.component.ts
index e896f4c2bc2..ac8ee0c8d71 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-details/send-text-details.component.ts
+++ b/libs/tools/send/send-ui/src/send-form/components/send-details/send-text-details.component.ts
@@ -15,7 +15,6 @@ import { SendFormContainer } from "../../send-form-container";
 @Component({
   selector: "tools-send-text-details",
   templateUrl: "./send-text-details.component.html",
-  standalone: true,
   imports: [
     CheckboxModule,
     CommonModule,
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-form.component.ts b/libs/tools/send/send-ui/src/send-form/components/send-form.component.ts
index 13c00a6bb78..b8593c735b7 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-form.component.ts
+++ b/libs/tools/send/send-ui/src/send-form/components/send-form.component.ts
@@ -41,7 +41,6 @@ import { SendDetailsComponent } from "./send-details/send-details.component";
 @Component({
   selector: "tools-send-form",
   templateUrl: "./send-form.component.html",
-  standalone: true,
   providers: [
     {
       provide: SendFormContainer,
diff --git a/libs/tools/send/send-ui/src/send-list-filters/send-list-filters.component.ts b/libs/tools/send/send-ui/src/send-list-filters/send-list-filters.component.ts
index d42eab382e9..b7c60145bbf 100644
--- a/libs/tools/send/send-ui/src/send-list-filters/send-list-filters.component.ts
+++ b/libs/tools/send/send-ui/src/send-list-filters/send-list-filters.component.ts
@@ -11,7 +11,6 @@ import { ChipSelectComponent } from "@bitwarden/components";
 import { SendListFiltersService } from "../services/send-list-filters.service";
 
 @Component({
-  standalone: true,
   selector: "app-send-list-filters",
   templateUrl: "./send-list-filters.component.html",
   imports: [CommonModule, JslibModule, ChipSelectComponent, ReactiveFormsModule],
diff --git a/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html b/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html
index 9b0f0fca26f..94ebfc3e5e6 100644
--- a/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html
+++ b/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html
@@ -26,6 +26,16 @@
           ></i>
         </div>
         {{ send.name }}
+        <ng-container *ngIf="send.maxAccessCountReached">
+          <i
+            class="bwi bwi-exclamation-triangle"
+            appStopProp
+            title="{{ 'maxAccessCountReached' | i18n }}"
+            aria-hidden="true"
+          ></i>
+          <span class="tw-sr-only">{{ "maxAccessCountReached" | i18n }}</span>
+        </ng-container>
+
         <span slot="secondary">
           {{ "deletionDate" | i18n }}:&nbsp;{{ send.deletionDate | date: "mediumDate" }}
         </span>
diff --git a/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.ts b/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.ts
index ab73e71c4ab..f67880eb73f 100644
--- a/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.ts
+++ b/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.ts
@@ -40,7 +40,6 @@ import {
   ],
   selector: "app-send-list-items-container",
   templateUrl: "send-list-items-container.component.html",
-  standalone: true,
 })
 export class SendListItemsContainerComponent {
   sendType = SendType;
diff --git a/libs/tools/send/send-ui/src/send-search/send-search.component.ts b/libs/tools/send/send-ui/src/send-search/send-search.component.ts
index 8142ce58f64..90b31a206fc 100644
--- a/libs/tools/send/send-ui/src/send-search/send-search.component.ts
+++ b/libs/tools/send/send-ui/src/send-search/send-search.component.ts
@@ -13,7 +13,6 @@ const SearchTextDebounceInterval = 200;
 
 @Component({
   imports: [CommonModule, SearchModule, JslibModule, FormsModule],
-  standalone: true,
   selector: "tools-send-search",
   templateUrl: "send-search.component.html",
 })
diff --git a/libs/tools/send/send-ui/src/services/send-items.service.spec.ts b/libs/tools/send/send-ui/src/services/send-items.service.spec.ts
index 77e3725e813..cf46c909da5 100644
--- a/libs/tools/send/send-ui/src/services/send-items.service.spec.ts
+++ b/libs/tools/send/send-ui/src/services/send-items.service.spec.ts
@@ -2,11 +2,11 @@ import { TestBed } from "@angular/core/testing";
 import { mock } from "jest-mock-extended";
 import { BehaviorSubject, first, Subject } from "rxjs";
 
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 import { UserId } from "@bitwarden/common/types/guid";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 
 import { mockAccountServiceWith } from "../../../../../common/spec";
 
diff --git a/libs/tools/send/send-ui/src/services/send-items.service.ts b/libs/tools/send/send-ui/src/services/send-items.service.ts
index 1ade6f37f71..52e1e3d669e 100644
--- a/libs/tools/send/send-ui/src/services/send-items.service.ts
+++ b/libs/tools/send/send-ui/src/services/send-items.service.ts
@@ -14,11 +14,11 @@ import {
   tap,
 } from "rxjs";
 
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
+import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 
 import { SendListFiltersService } from "./send-list-filters.service";
 
diff --git a/libs/tools/send/send-ui/tsconfig.json b/libs/tools/send/send-ui/tsconfig.json
index e6d6680ad40..5010a206c9b 100644
--- a/libs/tools/send/send-ui/tsconfig.json
+++ b/libs/tools/send/send-ui/tsconfig.json
@@ -1,22 +1,5 @@
 {
-  "extends": "../../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/admin-console/common": ["../../../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../../../angular/src/*"],
-      "@bitwarden/auth/common": ["../../../auth/src/common"],
-      "@bitwarden/common/*": ["../../../common/src/*"],
-      "@bitwarden/components": ["../../../components/src"],
-      "@bitwarden/generator-components": ["../../../tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../../../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../../../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../../../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../../../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../../../key-management/src"],
-      "@bitwarden/platform": ["../../../platform/src"],
-      "@bitwarden/ui-common": ["../../../ui/common/src"]
-    }
-  },
+  "extends": "../../../../tsconfig.base",
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/send/send-ui/tsconfig.spec.json b/libs/tools/send/send-ui/tsconfig.spec.json
index 919530506de..238f1a9dca0 100644
--- a/libs/tools/send/send-ui/tsconfig.spec.json
+++ b/libs/tools/send/send-ui/tsconfig.spec.json
@@ -1,5 +1,9 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "include": ["src"],
   "files": ["./test.setup.ts"],
   "exclude": ["node_modules", "dist"]
diff --git a/libs/ui/common/src/i18n.pipe.ts b/libs/ui/common/src/i18n.pipe.ts
index fdcfec0ceac..ec30bd85092 100644
--- a/libs/ui/common/src/i18n.pipe.ts
+++ b/libs/ui/common/src/i18n.pipe.ts
@@ -13,7 +13,6 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
  */
 @Pipe({
   name: "i18n",
-  standalone: true,
 })
 export class I18nPipe implements PipeTransform {
   constructor(private i18nService: I18nService) {}
diff --git a/libs/ui/common/src/setup-jest.ts b/libs/ui/common/src/setup-jest.ts
index cada139500f..16669ac17fb 100644
--- a/libs/ui/common/src/setup-jest.ts
+++ b/libs/ui/common/src/setup-jest.ts
@@ -1,12 +1,3 @@
-import "jest-preset-angular/setup-jest";
-import { getTestBed } from "@angular/core/testing";
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from "@angular/platform-browser-dynamic/testing";
+import { setupZoneTestEnv } from "jest-preset-angular/setup-env/zone";
 
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  errorOnUnknownElements: true,
-  errorOnUnknownProperties: true,
-});
+setupZoneTestEnv({ errorOnUnknownElements: true, errorOnUnknownProperties: true });
diff --git a/libs/ui/common/tsconfig.json b/libs/ui/common/tsconfig.json
index 31062d41a1c..941c32b5b2a 100644
--- a/libs/ui/common/tsconfig.json
+++ b/libs/ui/common/tsconfig.json
@@ -1,10 +1,5 @@
 {
-  "extends": "../../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "@bitwarden/common/*": ["../../common/src/*"]
-    }
-  },
+  "extends": "../../../tsconfig.base",
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/user-core/README.md b/libs/user-core/README.md
new file mode 100644
index 00000000000..57975746606
--- /dev/null
+++ b/libs/user-core/README.md
@@ -0,0 +1,6 @@
+# user-core
+
+Owned by: auth
+
+The very basic concept that constitutes a user, this needs to be very low level to facilitate
+Platform keeping their own code low level.
diff --git a/libs/user-core/eslint.config.mjs b/libs/user-core/eslint.config.mjs
new file mode 100644
index 00000000000..9c37d10e3ff
--- /dev/null
+++ b/libs/user-core/eslint.config.mjs
@@ -0,0 +1,3 @@
+import baseConfig from "../../eslint.config.mjs";
+
+export default [...baseConfig];
diff --git a/libs/user-core/jest.config.js b/libs/user-core/jest.config.js
new file mode 100644
index 00000000000..e38a12f3eb5
--- /dev/null
+++ b/libs/user-core/jest.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  displayName: "user-core",
+  preset: "../../jest.preset.js",
+  testEnvironment: "node",
+  transform: {
+    "^.+\\.[tj]s$": ["ts-jest", { tsconfig: "<rootDir>/tsconfig.spec.json" }],
+  },
+  moduleFileExtensions: ["ts", "js", "html"],
+  coverageDirectory: "../../coverage/libs/user-core",
+};
diff --git a/libs/user-core/package.json b/libs/user-core/package.json
new file mode 100644
index 00000000000..2251d2ceace
--- /dev/null
+++ b/libs/user-core/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@bitwarden/user-core",
+  "version": "0.0.0",
+  "description": "The very basic concept that constitutes a user, this needs to be very low level to facilitate Platform keeping their own code low level.",
+  "type": "commonjs",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "license": "GPL-3.0",
+  "author": "auth"
+}
diff --git a/libs/user-core/project.json b/libs/user-core/project.json
new file mode 100644
index 00000000000..60d5873208d
--- /dev/null
+++ b/libs/user-core/project.json
@@ -0,0 +1,27 @@
+{
+  "name": "user-core",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/user-core/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/user-core",
+        "main": "libs/user-core/src/index.ts",
+        "tsConfig": "libs/user-core/tsconfig.lib.json",
+        "assets": ["libs/user-core/*.md"]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/user-core/jest.config.js",
+        "passWithNoTests": true
+      }
+    }
+  }
+}
diff --git a/libs/user-core/src/index.ts b/libs/user-core/src/index.ts
new file mode 100644
index 00000000000..42e663c851a
--- /dev/null
+++ b/libs/user-core/src/index.ts
@@ -0,0 +1,9 @@
+import { Opaque } from "type-fest";
+
+/**
+ * The main identifier for a user. It is a string that should be in valid guid format.
+ *
+ * You should avoid `as UserId`-ing strings as much as possible and instead retrieve the {@see UserId} from
+ * a valid source instead.
+ */
+export type UserId = Opaque<string, "UserId">;
diff --git a/libs/user-core/tsconfig.eslint.json b/libs/user-core/tsconfig.eslint.json
new file mode 100644
index 00000000000..3daf120441a
--- /dev/null
+++ b/libs/user-core/tsconfig.eslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": ["src/**/*.ts", "src/**/*.js"],
+  "exclude": ["**/build", "**/dist"]
+}
diff --git a/libs/user-core/tsconfig.json b/libs/user-core/tsconfig.json
new file mode 100644
index 00000000000..62ebbd94647
--- /dev/null
+++ b/libs/user-core/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/libs/user-core/tsconfig.lib.json b/libs/user-core/tsconfig.lib.json
new file mode 100644
index 00000000000..9cbf6736007
--- /dev/null
+++ b/libs/user-core/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.js", "src/**/*.spec.ts"]
+}
diff --git a/libs/user-core/tsconfig.spec.json b/libs/user-core/tsconfig.spec.json
new file mode 100644
index 00000000000..1275f148a18
--- /dev/null
+++ b/libs/user-core/tsconfig.spec.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "moduleResolution": "node10",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/libs/vault/jest.config.js b/libs/vault/jest.config.js
index 16db37527ac..05c5b5c5d3a 100644
--- a/libs/vault/jest.config.js
+++ b/libs/vault/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.spec");
+const { compilerOptions } = require("../../tsconfig.base");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
@@ -8,13 +8,12 @@ const sharedConfig = require("../../libs/shared/jest.config.angular");
 module.exports = {
   ...sharedConfig,
   displayName: "libs/vault tests",
-  preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(
     // lets us use @bitwarden/common/spec in tests
-    { "@bitwarden/common/spec": ["../common/spec"], ...(compilerOptions?.paths ?? {}) },
+    { "@bitwarden/common/spec": ["libs/common/spec"], ...(compilerOptions?.paths ?? {}) },
     {
-      prefix: "<rootDir>/",
+      prefix: "<rootDir>/../../",
     },
   ),
 };
diff --git a/libs/vault/src/cipher-form/abstractions/cipher-form-config.service.ts b/libs/vault/src/cipher-form/abstractions/cipher-form-config.service.ts
index 71f12340ebc..d1792da422c 100644
--- a/libs/vault/src/cipher-form/abstractions/cipher-form-config.service.ts
+++ b/libs/vault/src/cipher-form/abstractions/cipher-form-config.service.ts
@@ -77,7 +77,7 @@ type BaseCipherFormConfig = {
    * Flag to indicate if the user is allowed to create ciphers in their own Vault. If false, configuration must
    * supply a list of organizations that the user can create ciphers in.
    */
-  allowPersonalOwnership: boolean;
+  organizationDataOwnershipDisabled: boolean;
 
   /**
    * The original cipher that is being edited or cloned. This can be undefined when creating a new cipher.
@@ -131,18 +131,18 @@ type CreateNewCipherConfig = BaseCipherFormConfig & {
 type CombinedAddEditConfig = ExistingCipherConfig | CreateNewCipherConfig;
 
 /**
- * Configuration object for the cipher form when personal ownership is allowed.
+ * Configuration object for the cipher form when organization data ownership is not allowed.
  */
-type PersonalOwnershipAllowed = CombinedAddEditConfig & {
-  allowPersonalOwnership: true;
+type OrganizationDataOwnershipDisabled = CombinedAddEditConfig & {
+  organizationDataOwnershipDisabled: true;
 };
 
 /**
- * Configuration object for the cipher form when personal ownership is not allowed.
+ * Configuration object for the cipher form when organization data ownership is allowed.
  * Organizations must be provided.
  */
-type PersonalOwnershipNotAllowed = CombinedAddEditConfig & {
-  allowPersonalOwnership: false;
+type OrganizationDataOwnershipEnabled = CombinedAddEditConfig & {
+  organizationDataOwnershipDisabled: false;
   organizations: Organization[];
 };
 
@@ -150,7 +150,7 @@ type PersonalOwnershipNotAllowed = CombinedAddEditConfig & {
  * Configuration object for the cipher form.
  * Determines the behavior of the form and the controls that are displayed/enabled.
  */
-export type CipherFormConfig = PersonalOwnershipAllowed | PersonalOwnershipNotAllowed;
+export type CipherFormConfig = OrganizationDataOwnershipDisabled | OrganizationDataOwnershipEnabled;
 
 /**
  * Service responsible for building the configuration object for the cipher form.
diff --git a/libs/vault/src/cipher-form/cipher-form.stories.ts b/libs/vault/src/cipher-form/cipher-form.stories.ts
index 3d68b7124c1..25494350dc3 100644
--- a/libs/vault/src/cipher-form/cipher-form.stories.ts
+++ b/libs/vault/src/cipher-form/cipher-form.stories.ts
@@ -19,6 +19,7 @@ import { ViewCacheService } from "@bitwarden/angular/platform/view-cache";
 import { NudgeStatus, NudgesService } from "@bitwarden/angular/vault";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
@@ -57,7 +58,7 @@ const defaultConfig: CipherFormConfig = {
   mode: "add",
   cipherType: CipherType.Login,
   admin: false,
-  allowPersonalOwnership: true,
+  organizationDataOwnershipDisabled: true,
   collections: [
     {
       id: "col1",
@@ -243,6 +244,7 @@ export default {
           provide: ConfigService,
           useValue: {
             getFeatureFlag: () => Promise.resolve(false),
+            getFeatureFlag$: () => new BehaviorSubject(false),
           },
         },
         {
@@ -253,6 +255,12 @@ export default {
             },
           },
         },
+        {
+          provide: PolicyService,
+          useValue: {
+            policiesByType$: new BehaviorSubject([]),
+          },
+        },
       ],
     }),
     componentWrapperDecorator(
@@ -354,13 +362,13 @@ export const WithSubmitButton: Story = {
   },
 };
 
-export const NoPersonalOwnership: Story = {
+export const OrganizationDataOwnershipEnabled: Story = {
   ...Add,
   args: {
     config: {
       ...defaultConfig,
       mode: "add",
-      allowPersonalOwnership: false,
+      organizationDataOwnershipDisabled: false,
       originalCipher: defaultConfig.originalCipher,
       organizations: defaultConfig.organizations!,
     },
diff --git a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.spec.ts b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.spec.ts
index f1c8085ae15..5b93a7bdefe 100644
--- a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.spec.ts
@@ -14,7 +14,6 @@ import { CustomFieldsComponent } from "../custom-fields/custom-fields.component"
 import { AdditionalOptionsSectionComponent } from "./additional-options-section.component";
 
 @Component({
-  standalone: true,
   selector: "vault-custom-fields",
   template: "",
 })
diff --git a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.ts b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.ts
index 14f3494652a..7877144f9f0 100644
--- a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.ts
+++ b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.ts
@@ -24,7 +24,6 @@ import { CustomFieldsComponent } from "../custom-fields/custom-fields.component"
 @Component({
   selector: "vault-additional-options-section",
   templateUrl: "./additional-options-section.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     SectionHeaderComponent,
diff --git a/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.spec.ts b/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.spec.ts
index da827addf67..439c651e5ad 100644
--- a/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.spec.ts
@@ -27,7 +27,6 @@ import { CipherAttachmentsComponent } from "./cipher-attachments.component";
 import { DeleteAttachmentComponent } from "./delete-attachment/delete-attachment.component";
 
 @Component({
-  standalone: true,
   selector: "app-download-attachment",
   template: "",
 })
diff --git a/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.ts b/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.ts
index aa9769ec392..0bcb31c7af9 100644
--- a/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.ts
+++ b/libs/vault/src/cipher-form/components/attachments/cipher-attachments.component.ts
@@ -57,7 +57,6 @@ type CipherAttachmentForm = FormGroup<{
 }>;
 
 @Component({
-  standalone: true,
   selector: "app-cipher-attachments",
   templateUrl: "./cipher-attachments.component.html",
   imports: [
diff --git a/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts b/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts
index ce7a5a22dd8..be6f10c01de 100644
--- a/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts
+++ b/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts
@@ -18,7 +18,6 @@ import {
 } from "@bitwarden/components";
 
 @Component({
-  standalone: true,
   selector: "app-delete-attachment",
   templateUrl: "./delete-attachment.component.html",
   imports: [AsyncActionsModule, CommonModule, JslibModule, ButtonModule, IconButtonModule],
diff --git a/libs/vault/src/cipher-form/components/autofill-options/advanced-uri-option-dialog.component.html b/libs/vault/src/cipher-form/components/autofill-options/advanced-uri-option-dialog.component.html
new file mode 100644
index 00000000000..6c792d240df
--- /dev/null
+++ b/libs/vault/src/cipher-form/components/autofill-options/advanced-uri-option-dialog.component.html
@@ -0,0 +1,27 @@
+<bit-simple-dialog>
+  <i
+    bitDialogIcon
+    class="bwi tw-text-3xl bwi-exclamation-triangle tw-text-warning"
+    aria-hidden="true"
+  ></i>
+  <span bitDialogTitle>
+    {{ "warningCapitalized" | i18n }}
+  </span>
+  <div bitDialogContent class="tw-mb-1">
+    <p class="tw-mb-1 tw-hyphens-none">
+      {{ contentKey | i18n }}
+      <br />
+      <button bitLink type="button" linkType="primary" (click)="openLink($event)">
+        {{ "uriMatchWarningDialogLink" | i18n }}
+      </button>
+    </p>
+  </div>
+  <ng-container bitDialogFooter>
+    <button bitButton type="button" buttonType="primary" (click)="onContinue()">
+      {{ "continue" | i18n }}
+    </button>
+    <button bitButton type="button" buttonType="secondary" (click)="onCancel()">
+      {{ "cancel" | i18n }}
+    </button>
+  </ng-container>
+</bit-simple-dialog>
diff --git a/libs/vault/src/cipher-form/components/autofill-options/advanced-uri-option-dialog.component.ts b/libs/vault/src/cipher-form/components/autofill-options/advanced-uri-option-dialog.component.ts
new file mode 100644
index 00000000000..e63aa224149
--- /dev/null
+++ b/libs/vault/src/cipher-form/components/autofill-options/advanced-uri-option-dialog.component.ts
@@ -0,0 +1,58 @@
+import { Component, inject } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import {
+  ButtonLinkDirective,
+  ButtonModule,
+  DialogModule,
+  DialogService,
+  DIALOG_DATA,
+  DialogRef,
+} from "@bitwarden/components";
+
+export type AdvancedUriOptionDialogParams = {
+  contentKey: string;
+  onCancel: () => void;
+  onContinue: () => void;
+};
+
+@Component({
+  templateUrl: "advanced-uri-option-dialog.component.html",
+  imports: [ButtonLinkDirective, ButtonModule, DialogModule, JslibModule],
+})
+export class AdvancedUriOptionDialogComponent {
+  constructor(private dialogRef: DialogRef<boolean>) {}
+
+  protected platformUtilsService = inject(PlatformUtilsService);
+  protected params = inject<AdvancedUriOptionDialogParams>(DIALOG_DATA);
+
+  get contentKey(): string {
+    return this.params.contentKey;
+  }
+
+  onCancel() {
+    this.params.onCancel?.();
+    this.dialogRef.close(false);
+  }
+
+  onContinue() {
+    this.params.onContinue?.();
+    this.dialogRef.close(true);
+  }
+
+  openLink(event: Event) {
+    event.preventDefault();
+    this.platformUtilsService.launchUri("https://bitwarden.com/help/uri-match-detection/");
+  }
+
+  static open(
+    dialogService: DialogService,
+    params: AdvancedUriOptionDialogParams,
+  ): DialogRef<boolean> {
+    return dialogService.open<boolean>(AdvancedUriOptionDialogComponent, {
+      data: params,
+      disableClose: true,
+    });
+  }
+}
diff --git a/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.ts b/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.ts
index ccbc792648e..b328c0ddd72 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.ts
+++ b/libs/vault/src/cipher-form/components/autofill-options/autofill-options.component.ts
@@ -39,7 +39,6 @@ interface UriField {
 @Component({
   selector: "vault-autofill-options",
   templateUrl: "./autofill-options.component.html",
-  standalone: true,
   imports: [
     DragDropModule,
     SectionHeaderComponent,
diff --git a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html
index 84b43edfbac..2e88a68a0d4 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html
+++ b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html
@@ -6,7 +6,7 @@
         <input bitInput formControlName="uri" #uriInput />
         <button
           type="button"
-          bitIconButton="bwi-cog"
+          [bitIconButton]="showMatchDetection ? 'bwi-cog-f' : 'bwi-cog'"
           bitSuffix
           [appA11yTitle]="toggleTitle"
           (click)="toggleMatchDetection()"
@@ -43,8 +43,16 @@
           *ngFor="let o of uriMatchOptions"
           [label]="o.label"
           [value]="o.value"
+          [disabled]="o.disabled"
         ></bit-option>
       </bit-select>
+      <bit-hint *ngIf="getMatchHints() as hints">
+        {{ hints[0] | i18n }}
+        <ng-container *ngIf="hints.length > 1">
+          <b>{{ "warningCapitalized" | i18n }}:</b>
+          {{ hints[1] | i18n }}
+        </ng-container>
+      </bit-hint>
     </bit-form-field>
   </div>
 </ng-container>
diff --git a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.spec.ts b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.spec.ts
index d259566cc57..0d7f3663967 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.spec.ts
@@ -1,14 +1,19 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { NG_VALUE_ACCESSOR } from "@angular/forms";
+import { of } from "rxjs";
 
 import { UriMatchStrategy } from "@bitwarden/common/models/domain/domain-service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DialogRef, DialogService } from "@bitwarden/components";
 
+import { AdvancedUriOptionDialogComponent } from "./advanced-uri-option-dialog.component";
 import { UriOptionComponent } from "./uri-option.component";
 
 describe("UriOptionComponent", () => {
   let component: UriOptionComponent;
   let fixture: ComponentFixture<UriOptionComponent>;
+  let dialogServiceMock: jest.Mocked<DialogService>;
+  let dialogRefMock: jest.Mocked<DialogRef<boolean>>;
 
   const getToggleMatchDetectionBtn = () =>
     fixture.nativeElement.querySelector(
@@ -26,9 +31,19 @@ describe("UriOptionComponent", () => {
     ) as HTMLButtonElement;
 
   beforeEach(async () => {
+    dialogServiceMock = {
+      open: jest.fn().mockReturnValue(dialogRefMock),
+    } as unknown as jest.Mocked<DialogService>;
+
+    dialogRefMock = {
+      close: jest.fn(),
+      afterClosed: jest.fn().mockReturnValue(of(true)),
+    } as unknown as jest.Mocked<DialogRef<boolean>>;
+
     await TestBed.configureTestingModule({
       imports: [UriOptionComponent],
       providers: [
+        { provide: DialogService, useValue: dialogServiceMock },
         {
           provide: I18nService,
           useValue: { t: (...keys: string[]) => keys.filter(Boolean).join(" ") },
@@ -165,4 +180,36 @@ describe("UriOptionComponent", () => {
       expect(component.remove.emit).toHaveBeenCalled();
     });
   });
+
+  describe("advanced match strategy dialog", () => {
+    function testDialogAction(action: "onContinue" | "onCancel", expected: number) {
+      const openSpy = jest
+        .spyOn(AdvancedUriOptionDialogComponent, "open")
+        .mockReturnValue(dialogRefMock);
+
+      component["uriForm"].controls.matchDetection.setValue(UriMatchStrategy.Domain);
+      component["uriForm"].controls.matchDetection.setValue(UriMatchStrategy.StartsWith);
+
+      const [, params] = openSpy.mock.calls[0] as [
+        DialogService,
+        {
+          contentKey: string;
+          onContinue: () => void;
+          onCancel: () => void;
+        },
+      ];
+
+      params[action]();
+
+      expect(component["uriForm"].value.matchDetection).toBe(expected);
+    }
+
+    it("should apply the advanced match strategy when the user continues", () => {
+      testDialogAction("onContinue", UriMatchStrategy.StartsWith);
+    });
+
+    it("should revert to the previous strategy when the user cancels", () => {
+      testDialogAction("onCancel", UriMatchStrategy.Domain);
+    });
+  });
 });
diff --git a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.ts b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.ts
index 07bf7bef775..4287d5b96c8 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.ts
+++ b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.ts
@@ -18,6 +18,7 @@ import {
   NG_VALUE_ACCESSOR,
   ReactiveFormsModule,
 } from "@angular/forms";
+import { concatMap, pairwise } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import {
@@ -26,16 +27,18 @@ import {
 } from "@bitwarden/common/models/domain/domain-service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import {
+  DialogService,
   FormFieldModule,
   IconButtonModule,
   SelectComponent,
   SelectModule,
 } from "@bitwarden/components";
 
+import { AdvancedUriOptionDialogComponent } from "./advanced-uri-option-dialog.component";
+
 @Component({
   selector: "vault-autofill-uri-option",
   templateUrl: "./uri-option.component.html",
-  standalone: true,
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
@@ -66,16 +69,26 @@ export class UriOptionComponent implements ControlValueAccessor {
     matchDetection: [null as UriMatchStrategySetting],
   });
 
-  protected uriMatchOptions: { label: string; value: UriMatchStrategySetting }[] = [
+  protected uriMatchOptions: {
+    label: string;
+    value: UriMatchStrategySetting;
+    disabled?: boolean;
+  }[] = [
     { label: this.i18nService.t("default"), value: null },
     { label: this.i18nService.t("baseDomain"), value: UriMatchStrategy.Domain },
     { label: this.i18nService.t("host"), value: UriMatchStrategy.Host },
-    { label: this.i18nService.t("startsWith"), value: UriMatchStrategy.StartsWith },
-    { label: this.i18nService.t("regEx"), value: UriMatchStrategy.RegularExpression },
     { label: this.i18nService.t("exact"), value: UriMatchStrategy.Exact },
     { label: this.i18nService.t("never"), value: UriMatchStrategy.Never },
+    { label: this.i18nService.t("uriAdvancedOption"), value: null, disabled: true },
+    { label: this.i18nService.t("startsWith"), value: UriMatchStrategy.StartsWith },
+    { label: this.i18nService.t("regEx"), value: UriMatchStrategy.RegularExpression },
   ];
 
+  protected advancedOptionWarningMap: Partial<Record<UriMatchStrategySetting, string>> = {
+    [UriMatchStrategy.StartsWith]: "startsWithAdvancedOptionWarning",
+    [UriMatchStrategy.RegularExpression]: "regExAdvancedOptionWarning",
+  };
+
   /**
    * Whether the option can be reordered. If false, the reorder button will be hidden.
    */
@@ -148,6 +161,7 @@ export class UriOptionComponent implements ControlValueAccessor {
   }
 
   constructor(
+    private dialogService: DialogService,
     private formBuilder: FormBuilder,
     private i18nService: I18nService,
   ) {
@@ -158,6 +172,36 @@ export class UriOptionComponent implements ControlValueAccessor {
     this.uriForm.statusChanges.pipe(takeUntilDestroyed()).subscribe(() => {
       this.onTouched();
     });
+
+    this.uriForm.controls.matchDetection.valueChanges
+      .pipe(
+        pairwise(),
+        concatMap(([previous, current]) => this.handleAdvancedMatch(previous, current)),
+        takeUntilDestroyed(),
+      )
+      .subscribe();
+  }
+
+  private async handleAdvancedMatch(
+    previous: UriMatchStrategySetting,
+    current: UriMatchStrategySetting,
+  ) {
+    const valueChange = previous !== current;
+    const isAdvanced =
+      current === UriMatchStrategy.StartsWith || current === UriMatchStrategy.RegularExpression;
+
+    if (!valueChange || !isAdvanced) {
+      return;
+    }
+    AdvancedUriOptionDialogComponent.open(this.dialogService, {
+      contentKey: this.advancedOptionWarningMap[current],
+      onContinue: () => {
+        this.uriForm.controls.matchDetection.setValue(current);
+      },
+      onCancel: () => {
+        this.uriForm.controls.matchDetection.setValue(previous);
+      },
+    });
   }
 
   focusInput() {
@@ -194,4 +238,16 @@ export class UriOptionComponent implements ControlValueAccessor {
   setDisabledState?(isDisabled: boolean): void {
     isDisabled ? this.uriForm.disable() : this.uriForm.enable();
   }
+
+  getMatchHints() {
+    const hints = ["uriMatchDefaultStrategyHint"];
+    const strategy = this.uriForm.get("matchDetection")?.value;
+    if (
+      strategy === UriMatchStrategy.StartsWith ||
+      strategy === UriMatchStrategy.RegularExpression
+    ) {
+      hints.push(this.advancedOptionWarningMap[strategy]);
+    }
+    return hints;
+  }
 }
diff --git a/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.ts b/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.ts
index 8086d2bf0c4..a71f57481ff 100644
--- a/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.ts
+++ b/libs/vault/src/cipher-form/components/card-details-section/card-details-section.component.ts
@@ -26,7 +26,6 @@ import { CipherFormContainer } from "../../cipher-form-container";
 @Component({
   selector: "vault-card-details-section",
   templateUrl: "./card-details-section.component.html",
-  standalone: true,
   imports: [
     CardComponent,
     TypographyModule,
diff --git a/libs/vault/src/cipher-form/components/cipher-form.component.ts b/libs/vault/src/cipher-form/components/cipher-form.component.ts
index 08dc71c9886..b8815235ee8 100644
--- a/libs/vault/src/cipher-form/components/cipher-form.component.ts
+++ b/libs/vault/src/cipher-form/components/cipher-form.component.ts
@@ -49,7 +49,6 @@ import { SshKeySectionComponent } from "./sshkey-section/sshkey-section.componen
 @Component({
   selector: "vault-cipher-form",
   templateUrl: "./cipher-form.component.html",
-  standalone: true,
   providers: [
     {
       provide: CipherFormContainer,
diff --git a/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.spec.ts b/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.spec.ts
index 7949c1fcc11..e98e4805d19 100644
--- a/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.spec.ts
@@ -9,7 +9,6 @@ import { CipherFormGeneratorComponent } from "@bitwarden/vault";
 @Component({
   selector: "tools-password-generator",
   template: `<ng-content></ng-content>`,
-  standalone: true,
 })
 class MockPasswordGeneratorComponent {
   @Output() onGenerated = new EventEmitter();
@@ -18,7 +17,6 @@ class MockPasswordGeneratorComponent {
 @Component({
   selector: "tools-username-generator",
   template: `<ng-content></ng-content>`,
-  standalone: true,
 })
 class MockUsernameGeneratorComponent {
   @Output() onGenerated = new EventEmitter();
diff --git a/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.ts b/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.ts
index b9e5ed3c0ab..f1e4c5c177c 100644
--- a/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.ts
+++ b/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.ts
@@ -12,7 +12,6 @@ import { AlgorithmInfo, GeneratedCredential } from "@bitwarden/generator-core";
 @Component({
   selector: "vault-cipher-form-generator",
   templateUrl: "./cipher-form-generator.component.html",
-  standalone: true,
   imports: [CommonModule, GeneratorModule],
 })
 export class CipherFormGeneratorComponent {
diff --git a/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.ts b/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.ts
index 72bdf5dca1a..7ddcf902d70 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.ts
@@ -29,7 +29,6 @@ export type AddEditCustomFieldDialogData = {
 };
 
 @Component({
-  standalone: true,
   selector: "vault-add-edit-custom-field-dialog",
   templateUrl: "./add-edit-custom-field-dialog.component.html",
   imports: [
diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
index 5d43f52788a..c8edba6c9fd 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
@@ -69,7 +69,6 @@ export type CustomField = {
 };
 
 @Component({
-  standalone: true,
   selector: "vault-custom-fields",
   templateUrl: "./custom-fields.component.html",
   imports: [
@@ -156,7 +155,7 @@ export class CustomFieldsComponent implements OnInit, AfterViewInit {
     // Populate options for linked custom fields
     this.linkedFieldOptions = optionsArray.map(([id, linkedFieldOption]) => ({
       name: this.i18nService.t(linkedFieldOption.i18nKey),
-      value: id,
+      value: id as LinkedIdType,
     }));
 
     const prefillCipher = this.cipherFormContainer.getInitialCipherView();
diff --git a/libs/vault/src/cipher-form/components/identity/identity.component.ts b/libs/vault/src/cipher-form/components/identity/identity.component.ts
index 3cc8e73697f..119ce1caf6e 100644
--- a/libs/vault/src/cipher-form/components/identity/identity.component.ts
+++ b/libs/vault/src/cipher-form/components/identity/identity.component.ts
@@ -22,7 +22,6 @@ import {
 import { CipherFormContainer } from "../../cipher-form-container";
 
 @Component({
-  standalone: true,
   selector: "vault-identity-section",
   templateUrl: "./identity.component.html",
   imports: [
diff --git a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html
index 5fd3e08f22d..c61312c13eb 100644
--- a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html
+++ b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html
@@ -22,7 +22,7 @@
       <bit-label>{{ "owner" | i18n }}</bit-label>
       <bit-select formControlName="organizationId">
         <bit-option
-          *ngIf="showPersonalOwnerOption"
+          *ngIf="showOrganizationDataOwnershipOption"
           [value]="null"
           [label]="userEmail$ | async"
         ></bit-option>
diff --git a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.spec.ts b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.spec.ts
index 1e9916e76a4..99c377a0873 100644
--- a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.spec.ts
@@ -3,18 +3,24 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from "@angular/core/testin
 import { ReactiveFormsModule } from "@angular/forms";
 import { By } from "@angular/platform-browser";
 import { mock, MockProxy } from "jest-mock-extended";
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, of } from "rxjs";
 
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
-import { CollectionView } from "@bitwarden/admin-console/common";
+import { CollectionTypes, CollectionView } from "@bitwarden/admin-console/common";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { SelectComponent } from "@bitwarden/components";
 
-import { CipherFormConfig } from "../../abstractions/cipher-form-config.service";
+import {
+  CipherFormConfig,
+  OptionalInitialValues,
+} from "../../abstractions/cipher-form-config.service";
 import { CipherFormContainer } from "../../cipher-form-container";
 
 import { ItemDetailsSectionComponent } from "./item-details-section.component";
@@ -35,6 +41,7 @@ const createMockCollection = (
     hidePasswords: false,
     manage: true,
     assigned: true,
+    type: CollectionTypes.DefaultUserCollection,
     canEditItems: jest.fn().mockReturnValue(canEdit),
     canEdit: jest.fn(),
     canDelete: jest.fn(),
@@ -47,6 +54,8 @@ describe("ItemDetailsSectionComponent", () => {
   let fixture: ComponentFixture<ItemDetailsSectionComponent>;
   let cipherFormProvider: MockProxy<CipherFormContainer>;
   let i18nService: MockProxy<I18nService>;
+  let mockConfigService: MockProxy<ConfigService>;
+  let mockPolicyService: MockProxy<PolicyService>;
 
   const activeAccount$ = new BehaviorSubject<{ email: string }>({ email: "test@example.com" });
   const getInitialCipherView = jest.fn(() => null);
@@ -65,12 +74,19 @@ describe("ItemDetailsSectionComponent", () => {
       compare: (a: string, b: string) => a.localeCompare(b),
     } as Intl.Collator;
 
+    mockConfigService = mock<ConfigService>();
+    mockConfigService.getFeatureFlag$.mockReturnValue(of(true));
+    mockPolicyService = mock<PolicyService>();
+    mockPolicyService.policiesByType$.mockReturnValue(of([]));
+
     await TestBed.configureTestingModule({
       imports: [ItemDetailsSectionComponent, CommonModule, ReactiveFormsModule],
       providers: [
         { provide: CipherFormContainer, useValue: cipherFormProvider },
         { provide: I18nService, useValue: i18nService },
         { provide: AccountService, useValue: { activeAccount$ } },
+        { provide: ConfigService, useValue: mockConfigService },
+        { provide: PolicyService, useValue: mockPolicyService },
       ],
     }).compileComponents();
 
@@ -92,8 +108,8 @@ describe("ItemDetailsSectionComponent", () => {
   });
 
   describe("ngOnInit", () => {
-    it("should throw an error if no organizations are available for ownership and personal ownership is not allowed", async () => {
-      component.config.allowPersonalOwnership = false;
+    it("should throw an error if no organizations are available for ownership and organization data ownership is enabled", async () => {
+      component.config.organizationDataOwnershipDisabled = false;
       component.config.organizations = [];
       await expect(component.ngOnInit()).rejects.toThrow(
         "No organizations available for ownership.",
@@ -101,7 +117,7 @@ describe("ItemDetailsSectionComponent", () => {
     });
 
     it("should initialize form with default values if no originalCipher is provided", fakeAsync(async () => {
-      component.config.allowPersonalOwnership = true;
+      component.config.organizationDataOwnershipDisabled = true;
       component.config.organizations = [{ id: "org1" } as Organization];
       await component.ngOnInit();
       tick();
@@ -119,7 +135,7 @@ describe("ItemDetailsSectionComponent", () => {
     }));
 
     it("should initialize form with values from originalCipher if provided", fakeAsync(async () => {
-      component.config.allowPersonalOwnership = true;
+      component.config.organizationDataOwnershipDisabled = true;
       component.config.organizations = [{ id: "org1" } as Organization];
       component.config.collections = [
         createMockCollection("col1", "Collection 1", "org1") as CollectionView,
@@ -149,7 +165,7 @@ describe("ItemDetailsSectionComponent", () => {
     }));
 
     it("should disable organizationId control if ownership change is not allowed", async () => {
-      component.config.allowPersonalOwnership = false;
+      component.config.organizationDataOwnershipDisabled = false;
       component.config.organizations = [{ id: "org1" } as Organization];
       jest.spyOn(component, "allowOwnershipChange", "get").mockReturnValue(false);
 
@@ -187,15 +203,15 @@ describe("ItemDetailsSectionComponent", () => {
       expect(component.allowOwnershipChange).toBe(false);
     });
 
-    it("should allow ownership change if personal ownership is allowed and there is at least one organization", () => {
-      component.config.allowPersonalOwnership = true;
+    it("should allow ownership change if organization data ownership is disabled and there is at least one organization", () => {
+      component.config.organizationDataOwnershipDisabled = true;
       component.config.organizations = [{ id: "org1", name: "org1" } as Organization];
       fixture.detectChanges();
       expect(component.allowOwnershipChange).toBe(true);
     });
 
-    it("should allow ownership change if personal ownership is not allowed but there is more than one organization", () => {
-      component.config.allowPersonalOwnership = false;
+    it("should allow ownership change if organization data ownership is enabled but there is more than one organization", () => {
+      component.config.organizationDataOwnershipDisabled = false;
       component.config.organizations = [
         { id: "org1", name: "org1" } as Organization,
         { id: "org2", name: "org2" } as Organization,
@@ -206,23 +222,23 @@ describe("ItemDetailsSectionComponent", () => {
   });
 
   describe("defaultOwner", () => {
-    it("should return null if personal ownership is allowed", () => {
-      component.config.allowPersonalOwnership = true;
+    it("should return null if organization data ownership is disabled", () => {
+      component.config.organizationDataOwnershipDisabled = true;
       expect(component.defaultOwner).toBeNull();
     });
 
-    it("should return the first organization id if personal ownership is not allowed", () => {
-      component.config.allowPersonalOwnership = false;
+    it("should return the first organization id if organization data ownership is enabled", () => {
+      component.config.organizationDataOwnershipDisabled = false;
       component.config.organizations = [{ id: "org1", name: "Organization 1" } as Organization];
       fixture.detectChanges();
       expect(component.defaultOwner).toBe("org1");
     });
   });
 
-  describe("showPersonalOwnerOption", () => {
-    it("should show personal ownership when the configuration allows", () => {
+  describe("showOrganizationDataOwnershipOption", () => {
+    it("should show organization data ownership when the configuration allows", () => {
       component.config.mode = "edit";
-      component.config.allowPersonalOwnership = true;
+      component.config.organizationDataOwnershipDisabled = true;
       component.originalCipherView = {} as CipherView;
       component.config.organizations = [{ id: "134-433-22" } as Organization];
       fixture.detectChanges();
@@ -234,9 +250,9 @@ describe("ItemDetailsSectionComponent", () => {
       expect(label).toBe("test@example.com");
     });
 
-    it("should show personal ownership when the control is disabled", async () => {
+    it("should show organization data ownership when the control is disabled", async () => {
       component.config.mode = "edit";
-      component.config.allowPersonalOwnership = false;
+      component.config.organizationDataOwnershipDisabled = false;
       component.originalCipherView = {} as CipherView;
       component.config.organizations = [{ id: "134-433-22" } as Organization];
       await component.ngOnInit();
@@ -252,7 +268,7 @@ describe("ItemDetailsSectionComponent", () => {
 
   describe("showOwnership", () => {
     it("should return true if ownership change is allowed or in edit mode with at least one organization", () => {
-      component.config.allowPersonalOwnership = true;
+      component.config.organizationDataOwnershipDisabled = true;
       jest.spyOn(component, "allowOwnershipChange", "get").mockReturnValue(true);
       expect(component.showOwnership).toBe(true);
 
@@ -264,7 +280,7 @@ describe("ItemDetailsSectionComponent", () => {
     });
 
     it("should hide the ownership control if showOwnership is false", async () => {
-      component.config.allowPersonalOwnership = true;
+      component.config.organizationDataOwnershipDisabled = true;
       jest.spyOn(component, "showOwnership", "get").mockReturnValue(false);
       fixture.detectChanges();
       await fixture.whenStable();
@@ -275,7 +291,7 @@ describe("ItemDetailsSectionComponent", () => {
     });
 
     it("should show the ownership control if showOwnership is true", async () => {
-      component.config.allowPersonalOwnership = true;
+      component.config.organizationDataOwnershipDisabled = true;
       jest.spyOn(component, "allowOwnershipChange", "get").mockReturnValue(true);
       fixture.detectChanges();
       await fixture.whenStable();
@@ -292,7 +308,7 @@ describe("ItemDetailsSectionComponent", () => {
     });
 
     it("should append '- Clone' to the title if in clone mode", async () => {
-      component.config.allowPersonalOwnership = true;
+      component.config.organizationDataOwnershipDisabled = true;
       const cipher = {
         name: "cipher1",
         organizationId: null,
@@ -311,7 +327,7 @@ describe("ItemDetailsSectionComponent", () => {
     });
 
     it("does not append clone when the cipher was populated from the cache", async () => {
-      component.config.allowPersonalOwnership = true;
+      component.config.organizationDataOwnershipDisabled = true;
       const cipher = {
         name: "from cache cipher",
         organizationId: null,
@@ -331,8 +347,8 @@ describe("ItemDetailsSectionComponent", () => {
       expect(component.itemDetailsForm.controls.name.value).toBe("from cache cipher");
     });
 
-    it("should select the first organization if personal ownership is not allowed", async () => {
-      component.config.allowPersonalOwnership = false;
+    it("should select the first organization if organization data ownership is enabled", async () => {
+      component.config.organizationDataOwnershipDisabled = false;
       component.config.organizations = [
         { id: "org1", name: "org1" } as Organization,
         { id: "org2", name: "org2" } as Organization,
@@ -353,7 +369,7 @@ describe("ItemDetailsSectionComponent", () => {
 
   describe("collectionOptions", () => {
     it("should reset and disable/hide collections control when no organization is selected", async () => {
-      component.config.allowPersonalOwnership = true;
+      component.config.organizationDataOwnershipDisabled = true;
       component.itemDetailsForm.controls.organizationId.setValue(null);
 
       fixture.detectChanges();
@@ -368,8 +384,8 @@ describe("ItemDetailsSectionComponent", () => {
       expect(collectionSelect).toBeNull();
     });
 
-    it("should enable/show collection control when an organization is selected", async () => {
-      component.config.allowPersonalOwnership = true;
+    it("should enable/show collection control when an organization is selected", fakeAsync(() => {
+      component.config.organizationDataOwnershipDisabled = true;
       component.config.organizations = [{ id: "org1" } as Organization];
       component.config.collections = [
         createMockCollection("col1", "Collection 1", "org1") as CollectionView,
@@ -377,12 +393,12 @@ describe("ItemDetailsSectionComponent", () => {
       ];
 
       fixture.detectChanges();
-      await fixture.whenStable();
+      tick();
 
       component.itemDetailsForm.controls.organizationId.setValue("org1");
 
+      tick();
       fixture.detectChanges();
-      await fixture.whenStable();
 
       const collectionSelect = fixture.nativeElement.querySelector(
         "bit-multi-select[formcontrolname='collectionIds']",
@@ -390,7 +406,7 @@ describe("ItemDetailsSectionComponent", () => {
 
       expect(component.itemDetailsForm.controls.collectionIds.enabled).toBe(true);
       expect(collectionSelect).not.toBeNull();
-    });
+    }));
 
     it("should set collectionIds to originalCipher collections on first load", async () => {
       component.config.mode = "clone";
@@ -420,7 +436,7 @@ describe("ItemDetailsSectionComponent", () => {
     });
 
     it("should automatically select the first collection if only one is available", async () => {
-      component.config.allowPersonalOwnership = true;
+      component.config.organizationDataOwnershipDisabled = true;
       component.config.organizations = [{ id: "org1" } as Organization];
       component.config.collections = [
         createMockCollection("col1", "Collection 1", "org1") as CollectionView,
@@ -474,7 +490,7 @@ describe("ItemDetailsSectionComponent", () => {
 
     it("should allow all collections to be altered when `config.admin` is true", async () => {
       component.config.admin = true;
-      component.config.allowPersonalOwnership = true;
+      component.config.organizationDataOwnershipDisabled = true;
       component.config.organizations = [{ id: "org1" } as Organization];
       component.config.collections = [
         createMockCollection("col1", "Collection 1", "org1", true, false) as CollectionView,
@@ -487,10 +503,12 @@ describe("ItemDetailsSectionComponent", () => {
 
       component.itemDetailsForm.controls.organizationId.setValue("org1");
 
+      fixture.detectChanges();
+      await fixture.whenStable();
+
       expect(component["collectionOptions"].map((c) => c.id)).toEqual(["col1", "col2", "col3"]);
     });
   });
-
   describe("readonlyCollections", () => {
     beforeEach(() => {
       component.config.mode = "edit";
@@ -548,4 +566,27 @@ describe("ItemDetailsSectionComponent", () => {
       expect(label).toBe("org1");
     });
   });
+
+  describe("getDefaultCollectionId", () => {
+    it("returns matching default when flag & policy match", async () => {
+      const def = createMockCollection("def1", "Def", "orgA");
+      component.config.collections = [def] as CollectionView[];
+      component.config.initialValues = { collectionIds: [] } as OptionalInitialValues;
+      mockConfigService.getFeatureFlag.mockResolvedValue(true);
+      mockPolicyService.policiesByType$.mockReturnValue(of([{ organizationId: "orgA" } as Policy]));
+
+      const id = await (component as any).getDefaultCollectionId("orgA");
+      expect(id).toEqual("def1");
+    });
+
+    it("returns undefined when no default found", async () => {
+      component.config.collections = [createMockCollection("c1", "C1", "orgB")] as CollectionView[];
+      component.config.initialValues = { collectionIds: [] } as OptionalInitialValues;
+      mockConfigService.getFeatureFlag.mockResolvedValue(true);
+      mockPolicyService.policiesByType$.mockReturnValue(of([{ organizationId: "orgA" } as Policy]));
+
+      const result = await (component as any).getDefaultCollectionId("orgA");
+      expect(result).toBeUndefined();
+    });
+  });
 });
diff --git a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts
index a1cf33c449b..1064980050f 100644
--- a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts
+++ b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts
@@ -4,15 +4,19 @@ import { CommonModule } from "@angular/common";
 import { Component, DestroyRef, Input, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormBuilder, FormControl, ReactiveFormsModule, Validators } from "@angular/forms";
-import { concatMap, map } from "rxjs";
+import { concatMap, firstValueFrom, map } from "rxjs";
 
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
-import { CollectionView } from "@bitwarden/admin-console/common";
+import { CollectionTypes, CollectionView } from "@bitwarden/admin-console/common";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { OrganizationUserType } from "@bitwarden/common/admin-console/enums";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { OrganizationUserType, PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
@@ -36,7 +40,6 @@ import { CipherFormContainer } from "../../cipher-form-container";
 @Component({
   selector: "vault-item-details-section",
   templateUrl: "./item-details-section.component.html",
-  standalone: true,
   imports: [
     CardComponent,
     TypographyModule,
@@ -93,8 +96,8 @@ export class ItemDetailsSectionComponent implements OnInit {
     return this.config.mode === "partial-edit";
   }
 
-  get allowPersonalOwnership() {
-    return this.config.allowPersonalOwnership;
+  get organizationDataOwnershipDisabled() {
+    return this.config.organizationDataOwnershipDisabled;
   }
 
   get collections(): CollectionView[] {
@@ -106,14 +109,17 @@ export class ItemDetailsSectionComponent implements OnInit {
   }
 
   /**
-   * Show the personal ownership option in the Owner dropdown when:
-   * - Personal ownership is allowed
+   * Show the organization data ownership option in the Owner dropdown when:
+   * - organization data ownership is disabled
    * - The `organizationId` control is disabled. This avoids the scenario
    * where a the dropdown is empty because the user personally owns the cipher
    * but cannot edit the ownership.
    */
-  get showPersonalOwnerOption() {
-    return this.allowPersonalOwnership || !this.itemDetailsForm.controls.organizationId.enabled;
+  get showOrganizationDataOwnershipOption() {
+    return (
+      this.organizationDataOwnershipDisabled ||
+      !this.itemDetailsForm.controls.organizationId.enabled
+    );
   }
 
   constructor(
@@ -122,6 +128,8 @@ export class ItemDetailsSectionComponent implements OnInit {
     private i18nService: I18nService,
     private destroyRef: DestroyRef,
     private accountService: AccountService,
+    private configService: ConfigService,
+    private policyService: PolicyService,
   ) {
     this.cipherFormContainer.registerChildForm("itemDetails", this.itemDetailsForm);
     this.itemDetailsForm.valueChanges
@@ -162,7 +170,7 @@ export class ItemDetailsSectionComponent implements OnInit {
     }
 
     // If personal ownership is allowed and there is at least one organization, allow ownership change.
-    if (this.allowPersonalOwnership) {
+    if (this.organizationDataOwnershipDisabled) {
       return this.organizations.length > 0;
     }
 
@@ -181,7 +189,7 @@ export class ItemDetailsSectionComponent implements OnInit {
   }
 
   get defaultOwner() {
-    return this.allowPersonalOwnership ? null : this.organizations[0].id;
+    return this.organizationDataOwnershipDisabled ? null : this.organizations[0].id;
   }
 
   async ngOnInit() {
@@ -189,7 +197,7 @@ export class ItemDetailsSectionComponent implements OnInit {
       Utils.getSortFunction(this.i18nService, "name"),
     );
 
-    if (!this.allowPersonalOwnership && this.organizations.length === 0) {
+    if (!this.organizationDataOwnershipDisabled && this.organizations.length === 0) {
       throw new Error("No organizations available for ownership.");
     }
 
@@ -198,30 +206,61 @@ export class ItemDetailsSectionComponent implements OnInit {
     if (prefillCipher) {
       await this.initFromExistingCipher(prefillCipher);
     } else {
+      const orgId = this.initialValues?.organizationId;
       this.itemDetailsForm.setValue({
         name: this.initialValues?.name || "",
-        organizationId: this.initialValues?.organizationId || this.defaultOwner,
+        organizationId: orgId || this.defaultOwner,
         folderId: this.initialValues?.folderId || null,
         collectionIds: [],
         favorite: false,
       });
-      await this.updateCollectionOptions(this.initialValues?.collectionIds || []);
+      await this.updateCollectionOptions(this.initialValues?.collectionIds);
     }
-
     if (!this.allowOwnershipChange) {
       this.itemDetailsForm.controls.organizationId.disable();
     }
-
     this.itemDetailsForm.controls.organizationId.valueChanges
       .pipe(
         takeUntilDestroyed(this.destroyRef),
-        concatMap(async () => {
-          await this.updateCollectionOptions();
-        }),
+        concatMap(async () => await this.updateCollectionOptions()),
       )
       .subscribe();
   }
 
+  /**
+   * Gets the default collection IDs for the selected organization.
+   * Returns null if any of the following apply:
+   * - the feature flag is disabled
+   * - no org is currently selected
+   * - the selected org doesn't have the "no private data policy" enabled
+   */
+  private async getDefaultCollectionId(orgId?: OrganizationId) {
+    if (!orgId) {
+      return;
+    }
+    const isFeatureEnabled = await this.configService.getFeatureFlag(
+      FeatureFlag.CreateDefaultLocation,
+    );
+    if (!isFeatureEnabled) {
+      return;
+    }
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    const selectedOrgHasPolicyEnabled = (
+      await firstValueFrom(
+        this.policyService.policiesByType$(PolicyType.OrganizationDataOwnership, userId),
+      )
+    ).find((p) => p.organizationId);
+    if (!selectedOrgHasPolicyEnabled) {
+      return;
+    }
+    const defaultUserCollection = this.collections.find(
+      (c) => c.organizationId === orgId && c.type === CollectionTypes.DefaultUserCollection,
+    );
+    // If the user was added after the policy was enabled as they will not have any private data
+    // and will not have a default collection.
+    return defaultUserCollection?.id;
+  }
+
   private async initFromExistingCipher(prefillCipher: CipherView) {
     const { name, folderId, collectionIds } = prefillCipher;
 
@@ -245,7 +284,7 @@ export class ItemDetailsSectionComponent implements OnInit {
         );
       }
 
-      if (!this.allowPersonalOwnership && prefillCipher.organizationId == null) {
+      if (!this.organizationDataOwnershipDisabled && prefillCipher.organizationId == null) {
         this.itemDetailsForm.controls.organizationId.setValue(this.defaultOwner);
       }
     }
@@ -330,6 +369,11 @@ export class ItemDetailsSectionComponent implements OnInit {
         // Non-admins can only select assigned collections that are not read only. (Non-AC)
         return c.assigned && !c.readOnly;
       })
+      .sort((a, b) => {
+        const aIsDefaultCollection = a.type === CollectionTypes.DefaultUserCollection ? -1 : 0;
+        const bIsDefaultCollection = b.type === CollectionTypes.DefaultUserCollection ? -1 : 0;
+        return aIsDefaultCollection - bIsDefaultCollection;
+      })
       .map((c) => ({
         id: c.id,
         name: c.name,
@@ -347,10 +391,17 @@ export class ItemDetailsSectionComponent implements OnInit {
       return;
     }
 
-    if (startingSelection.length > 0) {
+    if (startingSelection.filter(Boolean).length > 0) {
       collectionsControl.setValue(
         this.collectionOptions.filter((c) => startingSelection.includes(c.id as CollectionId)),
       );
+    } else {
+      const defaultCollectionId = await this.getDefaultCollectionId(orgId);
+      if (defaultCollectionId) {
+        collectionsControl.setValue(
+          this.collectionOptions.filter((c) => c.id === defaultCollectionId),
+        );
+      }
     }
   }
 }
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.spec.ts b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.spec.ts
index e0ba52a54a2..c5b1fc7897b 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.spec.ts
@@ -23,7 +23,6 @@ import { AutofillOptionsComponent } from "../autofill-options/autofill-options.c
 import { LoginDetailsSectionComponent } from "./login-details-section.component";
 
 @Component({
-  standalone: true,
   selector: "vault-autofill-options",
   template: "",
 })
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts
index c6b8433dcfa..e74d9915cdb 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts
@@ -33,7 +33,6 @@ import { AutofillOptionsComponent } from "../autofill-options/autofill-options.c
 @Component({
   selector: "vault-login-details-section",
   templateUrl: "./login-details-section.component.html",
-  standalone: true,
   imports: [
     ReactiveFormsModule,
     SectionHeaderComponent,
diff --git a/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.html b/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.html
index 5cd1246fd36..58dc181f826 100644
--- a/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.html
+++ b/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="showNewItemSpotlight">
+<ng-container *ngIf="showNewItemSpotlight$ | async">
   <bit-spotlight
     [title]="nudgeTitle"
     [subtitle]="nudgeBody"
diff --git a/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.spec.ts b/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.spec.ts
index 0cc23456b4c..b3c8172a7a3 100644
--- a/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.spec.ts
@@ -1,27 +1,30 @@
 import { CommonModule } from "@angular/common";
+import { ComponentRef } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { mock, MockProxy } from "jest-mock-extended";
 import { of } from "rxjs";
 
 import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
-import { AccountService, Account } from "@bitwarden/common/auth/abstractions/account.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { UserId } from "@bitwarden/common/types/guid";
 import { CipherType } from "@bitwarden/sdk-internal";
 
+import { FakeAccountService, mockAccountServiceWith } from "../../../../../common/spec";
+
 import { NewItemNudgeComponent } from "./new-item-nudge.component";
 
 describe("NewItemNudgeComponent", () => {
   let component: NewItemNudgeComponent;
+  let componentRef: ComponentRef<NewItemNudgeComponent>;
   let fixture: ComponentFixture<NewItemNudgeComponent>;
 
   let i18nService: MockProxy<I18nService>;
-  let accountService: MockProxy<AccountService>;
   let nudgesService: MockProxy<NudgesService>;
+  const accountService: FakeAccountService = mockAccountServiceWith("test-user-id" as UserId);
 
   beforeEach(async () => {
     i18nService = mock<I18nService>({ t: (key: string) => key });
-    accountService = mock<AccountService>();
     nudgesService = mock<NudgesService>();
 
     await TestBed.configureTestingModule({
@@ -37,7 +40,8 @@ describe("NewItemNudgeComponent", () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(NewItemNudgeComponent);
     component = fixture.componentInstance;
-    component.configType = null; // Set to null for initial state
+    componentRef = fixture.componentRef;
+    componentRef.setInput("configType", null); // Set a default type for testing
     fixture.detectChanges();
   });
 
@@ -46,13 +50,11 @@ describe("NewItemNudgeComponent", () => {
   });
 
   it("should set nudge title and body for CipherType.Login type", async () => {
-    component.configType = CipherType.Login;
-    accountService.activeAccount$ = of({ id: "test-user-id" as UserId } as Account);
-    jest.spyOn(component, "checkHasSpotlightDismissed").mockResolvedValue(true);
-
-    await component.ngOnInit();
-
-    expect(component.showNewItemSpotlight).toBe(true);
+    componentRef.setInput("configType", CipherType.Login);
+    fixture.detectChanges();
+    component.showNewItemSpotlight$.subscribe((value) => {
+      expect(value).toEqual(true);
+    });
     expect(component.nudgeTitle).toBe("newLoginNudgeTitle");
     expect(component.nudgeBody).toBe(
       "newLoginNudgeBodyOne <strong>newLoginNudgeBodyBold</strong> newLoginNudgeBodyTwo",
@@ -61,39 +63,38 @@ describe("NewItemNudgeComponent", () => {
   });
 
   it("should set nudge title and body for CipherType.Card type", async () => {
-    component.configType = CipherType.Card;
-    accountService.activeAccount$ = of({ id: "test-user-id" as UserId } as Account);
-    jest.spyOn(component, "checkHasSpotlightDismissed").mockResolvedValue(true);
-
-    await component.ngOnInit();
-
-    expect(component.showNewItemSpotlight).toBe(true);
+    componentRef.setInput("configType", CipherType.Card);
+    fixture.detectChanges();
+    component.showNewItemSpotlight$.subscribe((value) => {
+      expect(value).toEqual(true);
+    });
     expect(component.nudgeTitle).toBe("newCardNudgeTitle");
     expect(component.nudgeBody).toBe("newCardNudgeBody");
     expect(component.dismissalNudgeType).toBe(NudgeType.NewCardItemStatus);
   });
 
   it("should not show anything if spotlight has been dismissed", async () => {
-    component.configType = CipherType.Identity;
-    accountService.activeAccount$ = of({ id: "test-user-id" as UserId } as Account);
-    jest.spyOn(component, "checkHasSpotlightDismissed").mockResolvedValue(false);
-
-    await component.ngOnInit();
-
-    expect(component.showNewItemSpotlight).toBe(false);
+    componentRef.setInput("configType", CipherType.Identity);
+    fixture.detectChanges();
+    component.showNewItemSpotlight$.subscribe((value) => {
+      expect(value).toEqual(false);
+    });
     expect(component.dismissalNudgeType).toBe(NudgeType.NewIdentityItemStatus);
   });
 
   it("should set showNewItemSpotlight to false when user dismisses spotlight", async () => {
-    component.showNewItemSpotlight = true;
+    component.showNewItemSpotlight$ = of(true);
     component.dismissalNudgeType = NudgeType.NewLoginItemStatus;
-    component.activeUserId = "test-user-id" as UserId;
+    const activeUserId = "test-user-id" as UserId;
+    component.activeUserId$ = of(activeUserId);
 
     const dismissSpy = jest.spyOn(nudgesService, "dismissNudge").mockResolvedValue();
 
     await component.dismissNewItemSpotlight();
 
-    expect(component.showNewItemSpotlight).toBe(false);
-    expect(dismissSpy).toHaveBeenCalledWith(NudgeType.NewLoginItemStatus, component.activeUserId);
+    component.showNewItemSpotlight$.subscribe((value) => {
+      expect(value).toEqual(false);
+    });
+    expect(dismissSpy).toHaveBeenCalledWith(NudgeType.NewLoginItemStatus, activeUserId);
   });
 });
diff --git a/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.ts b/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.ts
index 705b98f241a..eccf8f65715 100644
--- a/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.ts
+++ b/libs/vault/src/cipher-form/components/new-item-nudge/new-item-nudge.component.ts
@@ -1,6 +1,7 @@
-import { NgIf } from "@angular/common";
-import { Component, Input, OnInit } from "@angular/core";
-import { firstValueFrom } from "rxjs";
+import { AsyncPipe, NgIf } from "@angular/common";
+import { Component, input } from "@angular/core";
+import { toObservable } from "@angular/core/rxjs-interop";
+import { combineLatest, firstValueFrom, map, of, switchMap } from "rxjs";
 
 import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
 import { SpotlightComponent } from "@bitwarden/angular/vault/components/spotlight/spotlight.component";
@@ -13,13 +14,17 @@ import { CipherType } from "@bitwarden/sdk-internal";
 @Component({
   selector: "vault-new-item-nudge",
   templateUrl: "./new-item-nudge.component.html",
-  standalone: true,
-  imports: [NgIf, SpotlightComponent],
+  imports: [NgIf, SpotlightComponent, AsyncPipe],
 })
-export class NewItemNudgeComponent implements OnInit {
-  @Input({ required: true }) configType: CipherType | null = null;
-  activeUserId: UserId | null = null;
-  showNewItemSpotlight: boolean = false;
+export class NewItemNudgeComponent {
+  configType = input.required<CipherType | null>();
+  activeUserId$ = this.accountService.activeAccount$.pipe(getUserId);
+  showNewItemSpotlight$ = combineLatest([
+    this.activeUserId$,
+    toObservable(this.configType).pipe(map((cipherType) => this.mapToNudgeType(cipherType))),
+  ]).pipe(
+    switchMap(([userId, nudgeType]) => this.nudgesService.showNudgeSpotlight$(nudgeType, userId)),
+  );
   nudgeTitle: string = "";
   nudgeBody: string = "";
   dismissalNudgeType: NudgeType | null = null;
@@ -30,10 +35,8 @@ export class NewItemNudgeComponent implements OnInit {
     private nudgesService: NudgesService,
   ) {}
 
-  async ngOnInit() {
-    this.activeUserId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
-
-    switch (this.configType) {
+  mapToNudgeType(cipherType: CipherType | null): NudgeType {
+    switch (cipherType) {
       case CipherType.Login: {
         const nudgeBodyOne = this.i18nService.t("newLoginNudgeBodyOne");
         const nudgeBodyBold = this.i18nService.t("newLoginNudgeBodyBold");
@@ -41,25 +44,25 @@ export class NewItemNudgeComponent implements OnInit {
         this.dismissalNudgeType = NudgeType.NewLoginItemStatus;
         this.nudgeTitle = this.i18nService.t("newLoginNudgeTitle");
         this.nudgeBody = `${nudgeBodyOne} <strong>${nudgeBodyBold}</strong> ${nudgeBodyTwo}`;
-        break;
+        return NudgeType.NewLoginItemStatus;
       }
       case CipherType.Card:
         this.dismissalNudgeType = NudgeType.NewCardItemStatus;
         this.nudgeTitle = this.i18nService.t("newCardNudgeTitle");
         this.nudgeBody = this.i18nService.t("newCardNudgeBody");
-        break;
+        return NudgeType.NewCardItemStatus;
 
       case CipherType.Identity:
         this.dismissalNudgeType = NudgeType.NewIdentityItemStatus;
         this.nudgeTitle = this.i18nService.t("newIdentityNudgeTitle");
         this.nudgeBody = this.i18nService.t("newIdentityNudgeBody");
-        break;
+        return NudgeType.NewIdentityItemStatus;
 
       case CipherType.SecureNote:
         this.dismissalNudgeType = NudgeType.NewNoteItemStatus;
         this.nudgeTitle = this.i18nService.t("newNoteNudgeTitle");
         this.nudgeBody = this.i18nService.t("newNoteNudgeBody");
-        break;
+        return NudgeType.NewNoteItemStatus;
 
       case CipherType.SshKey: {
         const sshPartOne = this.i18nService.t("newSshNudgeBodyOne");
@@ -68,25 +71,18 @@ export class NewItemNudgeComponent implements OnInit {
         this.dismissalNudgeType = NudgeType.NewSshItemStatus;
         this.nudgeTitle = this.i18nService.t("newSshNudgeTitle");
         this.nudgeBody = `${sshPartOne} <a href="https://bitwarden.com/help/ssh-agent" class="tw-text-primary-600 tw-font-bold" target="_blank">${sshPartTwo}</a>`;
-        break;
+        return NudgeType.NewSshItemStatus;
       }
       default:
         throw new Error("Unsupported cipher type");
     }
-    this.showNewItemSpotlight = await this.checkHasSpotlightDismissed(
-      this.dismissalNudgeType as NudgeType,
-      this.activeUserId,
-    );
   }
 
   async dismissNewItemSpotlight() {
-    if (this.dismissalNudgeType && this.activeUserId) {
-      await this.nudgesService.dismissNudge(this.dismissalNudgeType, this.activeUserId as UserId);
-      this.showNewItemSpotlight = false;
+    const activeUserId = await firstValueFrom(this.activeUserId$);
+    if (this.dismissalNudgeType && activeUserId) {
+      await this.nudgesService.dismissNudge(this.dismissalNudgeType, activeUserId as UserId);
+      this.showNewItemSpotlight$ = of(false);
     }
   }
-
-  async checkHasSpotlightDismissed(nudgeType: NudgeType, userId: UserId): Promise<boolean> {
-    return await firstValueFrom(this.nudgesService.showNudgeSpotlight$(nudgeType, userId));
-  }
 }
diff --git a/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.html b/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.html
index b919ed69f0d..de528267db0 100644
--- a/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.html
+++ b/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.html
@@ -21,6 +21,7 @@
         bitSuffix
         data-testid="import-privateKey"
         *ngIf="showImport"
+        appA11yTitle="{{ 'importSshKeyFromClipboard' | i18n }}"
         (click)="importSshKeyFromClipboard()"
       ></button>
     </bit-form-field>
diff --git a/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.ts b/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.ts
index fcf2ba0d9f7..71f85e0e1b3 100644
--- a/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.ts
+++ b/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.ts
@@ -28,7 +28,6 @@ import { CipherFormContainer } from "../../cipher-form-container";
 @Component({
   selector: "vault-sshkey-section",
   templateUrl: "./sshkey-section.component.html",
-  standalone: true,
   imports: [
     CardComponent,
     TypographyModule,
diff --git a/libs/vault/src/cipher-form/index.ts b/libs/vault/src/cipher-form/index.ts
index 0172733b682..37eda4a48b0 100644
--- a/libs/vault/src/cipher-form/index.ts
+++ b/libs/vault/src/cipher-form/index.ts
@@ -11,3 +11,4 @@ export { DefaultCipherFormConfigService } from "./services/default-cipher-form-c
 export { CipherFormGeneratorComponent } from "./components/cipher-generator/cipher-form-generator.component";
 export { CipherFormContainer } from "../cipher-form/cipher-form-container";
 export { CipherFormComponent } from "./components/cipher-form.component";
+export { AdvancedUriOptionDialogComponent } from "./components/autofill-options/advanced-uri-option-dialog.component";
diff --git a/libs/vault/src/cipher-form/services/default-cipher-form-config.service.ts b/libs/vault/src/cipher-form/services/default-cipher-form-config.service.ts
index a91a84e91c1..c47e5842987 100644
--- a/libs/vault/src/cipher-form/services/default-cipher-form-config.service.ts
+++ b/libs/vault/src/cipher-form/services/default-cipher-form-config.service.ts
@@ -44,7 +44,7 @@ export class DefaultCipherFormConfigService implements CipherFormConfigService {
   ): Promise<CipherFormConfig> {
     const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
 
-    const [organizations, collections, allowPersonalOwnership, folders, cipher] =
+    const [organizations, collections, organizationDataOwnershipDisabled, folders, cipher] =
       await firstValueFrom(
         combineLatest([
           this.organizations$(activeUserId),
@@ -55,7 +55,7 @@ export class DefaultCipherFormConfigService implements CipherFormConfigService {
               ),
             ),
           ),
-          this.allowPersonalOwnership$,
+          this.organizationDataOwnershipDisabled$,
           this.folderService.folders$(activeUserId).pipe(
             switchMap((f) =>
               this.folderService.folderViews$(activeUserId).pipe(
@@ -71,7 +71,7 @@ export class DefaultCipherFormConfigService implements CipherFormConfigService {
       mode,
       cipherType: cipher?.type ?? cipherType ?? CipherType.Login,
       admin: false,
-      allowPersonalOwnership,
+      organizationDataOwnershipDisabled,
       originalCipher: cipher,
       collections,
       organizations,
@@ -91,10 +91,10 @@ export class DefaultCipherFormConfigService implements CipherFormConfigService {
       );
   }
 
-  private allowPersonalOwnership$ = this.accountService.activeAccount$.pipe(
+  private organizationDataOwnershipDisabled$ = this.accountService.activeAccount$.pipe(
     getUserId,
     switchMap((userId) =>
-      this.policyService.policyAppliesToUser$(PolicyType.PersonalOwnership, userId),
+      this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
     ),
     map((p) => !p),
   );
diff --git a/libs/vault/src/cipher-form/services/default-cipher-form.service.spec.ts b/libs/vault/src/cipher-form/services/default-cipher-form.service.spec.ts
new file mode 100644
index 00000000000..3b2573b8f94
--- /dev/null
+++ b/libs/vault/src/cipher-form/services/default-cipher-form.service.spec.ts
@@ -0,0 +1,161 @@
+import { TestBed } from "@angular/core/testing";
+import { mock } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { UserId } from "@bitwarden/common/types/guid";
+import {
+  CipherService,
+  EncryptionContext,
+} from "@bitwarden/common/vault/abstractions/cipher.service";
+import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
+import { SecurityTaskType, TaskService } from "@bitwarden/common/vault/tasks";
+import { CipherType } from "@bitwarden/sdk-internal";
+
+import { CipherFormConfig } from "../abstractions/cipher-form-config.service";
+
+import { DefaultCipherFormService } from "./default-cipher-form.service";
+
+describe("DefaultCipherFormService", () => {
+  let service: DefaultCipherFormService;
+  let testBed: TestBed;
+  const cipherServiceMock = mock<CipherService>();
+
+  let markAsCompleteMock: jest.Mock;
+  let pendingTasks$: jest.Mock;
+
+  beforeEach(() => {
+    markAsCompleteMock = jest.fn().mockResolvedValue(undefined);
+    pendingTasks$ = jest.fn().mockReturnValue(of([]));
+    cipherServiceMock.encrypt.mockResolvedValue({} as EncryptionContext);
+
+    testBed = TestBed.configureTestingModule({
+      providers: [
+        { provide: CipherService, useValue: cipherServiceMock },
+        { provide: TaskService, useValue: { markAsComplete: markAsCompleteMock, pendingTasks$ } },
+        {
+          provide: AccountService,
+          useValue: { activeAccount$: of({ id: "user-1" as UserId } as Account) },
+        },
+        DefaultCipherFormService,
+      ],
+    });
+
+    service = testBed.inject(DefaultCipherFormService);
+  });
+
+  describe("markAssociatedTaskAsComplete", () => {
+    it("does not call markAsComplete when the cipher is not a login", async () => {
+      pendingTasks$.mockReturnValueOnce(
+        of([
+          {
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            cipherId: "cipher-1",
+            userId: "user-1" as UserId,
+          },
+        ]),
+      );
+
+      const cardCipher = new CipherView();
+      cardCipher.type = CipherType.Card;
+      cardCipher.id = "cipher-1";
+
+      await service.saveCipher(cardCipher, {
+        originalCipher: new Cipher(),
+        admin: false,
+      } as CipherFormConfig);
+
+      expect(markAsCompleteMock).not.toHaveBeenCalled();
+    });
+
+    it("does not call markAsComplete when there is no associated credential tasks", async () => {
+      pendingTasks$.mockReturnValueOnce(of([]));
+
+      const originalCipher = new Cipher();
+      originalCipher.type = CipherType.Login;
+
+      const cipher = new CipherView();
+      cipher.type = CipherType.Login;
+      cipher.id = "cipher-1";
+      cipher.login = new LoginView();
+      cipher.login.password = "password123";
+
+      cipherServiceMock.decrypt.mockResolvedValue({
+        ...cipher,
+        login: {
+          ...cipher.login,
+          password: "newPassword123",
+        },
+      } as CipherView);
+
+      await service.saveCipher(cipher, {
+        originalCipher: originalCipher,
+        admin: false,
+      } as CipherFormConfig);
+
+      expect(markAsCompleteMock).not.toHaveBeenCalled();
+    });
+
+    it("does not call markAsComplete when the password has not changed", async () => {
+      pendingTasks$.mockReturnValueOnce(
+        of([
+          {
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            cipherId: "cipher-1",
+            userId: "user-1" as UserId,
+          },
+        ]),
+      );
+
+      const cipher = new CipherView();
+      cipher.type = CipherType.Login;
+      cipher.id = "cipher-1";
+      cipher.login = new LoginView();
+      cipher.login.password = "password123";
+
+      cipherServiceMock.decrypt.mockResolvedValue(cipher);
+
+      await service.saveCipher(cipher, {
+        originalCipher: new Cipher(),
+        admin: false,
+      } as CipherFormConfig);
+
+      expect(markAsCompleteMock).not.toHaveBeenCalled();
+    });
+
+    it("calls markAsComplete when the cipher password has changed and there is an associated credential task", async () => {
+      pendingTasks$.mockReturnValueOnce(
+        of([
+          {
+            type: SecurityTaskType.UpdateAtRiskCredential,
+            cipherId: "cipher-1",
+            userId: "user-1" as UserId,
+          },
+        ]),
+      );
+
+      const cipher = new CipherView();
+      cipher.type = CipherType.Login;
+      cipher.id = "cipher-1";
+      cipher.login = new LoginView();
+      cipher.login.password = "password123";
+
+      cipherServiceMock.decrypt.mockResolvedValue({
+        ...cipher,
+        login: {
+          ...cipher.login,
+          password: "newPassword123",
+        },
+      } as CipherView);
+
+      await service.saveCipher(cipher, {
+        originalCipher: new Cipher(),
+        admin: false,
+      } as CipherFormConfig);
+
+      expect(markAsCompleteMock).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/libs/vault/src/cipher-form/services/default-cipher-form.service.ts b/libs/vault/src/cipher-form/services/default-cipher-form.service.ts
index 68eac4f0da2..5228c85c3f7 100644
--- a/libs/vault/src/cipher-form/services/default-cipher-form.service.ts
+++ b/libs/vault/src/cipher-form/services/default-cipher-form.service.ts
@@ -1,13 +1,16 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { inject, Injectable } from "@angular/core";
-import { firstValueFrom } from "rxjs";
+import { firstValueFrom, map } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { SecurityTaskType, TaskService } from "@bitwarden/common/vault/tasks";
 
 import { CipherFormConfig } from "../abstractions/cipher-form-config.service";
 import { CipherFormService } from "../abstractions/cipher-form.service";
@@ -20,6 +23,7 @@ function isSetEqual(a: Set<string>, b: Set<string>) {
 export class DefaultCipherFormService implements CipherFormService {
   private cipherService: CipherService = inject(CipherService);
   private accountService: AccountService = inject(AccountService);
+  private taskService: TaskService = inject(TaskService);
 
   async decryptCipher(cipher: Cipher): Promise<CipherView> {
     const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
@@ -29,19 +33,20 @@ export class DefaultCipherFormService implements CipherFormService {
   async saveCipher(cipher: CipherView, config: CipherFormConfig): Promise<CipherView> {
     // Passing the original cipher is important here as it is responsible for appending to password history
     const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    const encryptedCipher = await this.cipherService.encrypt(
+    const encrypted = await this.cipherService.encrypt(
       cipher,
       activeUserId,
       null,
       null,
       config.originalCipher ?? null,
     );
+    const encryptedCipher = encrypted.cipher;
 
     let savedCipher: Cipher;
 
     // Creating a new cipher
     if (cipher.id == null) {
-      savedCipher = await this.cipherService.createWithServer(encryptedCipher, config.admin);
+      savedCipher = await this.cipherService.createWithServer(encrypted, config.admin);
       return await this.cipherService.decrypt(savedCipher, activeUserId);
     }
 
@@ -64,13 +69,13 @@ export class DefaultCipherFormService implements CipherFormService {
       );
       // If the collectionIds are the same, update the cipher normally
     } else if (isSetEqual(originalCollectionIds, newCollectionIds)) {
-      savedCipher = await this.cipherService.updateWithServer(encryptedCipher, config.admin);
+      savedCipher = await this.cipherService.updateWithServer(encrypted, config.admin);
     } else {
       // Updating a cipher with collection changes is not supported with a single request currently
       // First update the cipher with the original collectionIds
       encryptedCipher.collectionIds = config.originalCipher.collectionIds;
       await this.cipherService.updateWithServer(
-        encryptedCipher,
+        encrypted,
         config.admin || originalCollectionIds.size === 0,
       );
 
@@ -88,6 +93,8 @@ export class DefaultCipherFormService implements CipherFormService {
       }
     }
 
+    await this.markAssociatedTaskAsComplete(activeUserId, cipher, config);
+
     // Its possible the cipher was made no longer available due to collection assignment changes
     // e.g. The cipher was moved to a collection that the user no longer has access to
     if (savedCipher == null) {
@@ -96,4 +103,47 @@ export class DefaultCipherFormService implements CipherFormService {
 
     return await this.cipherService.decrypt(savedCipher, activeUserId);
   }
+
+  /**
+   * When a cipher has an associated pending `UpdateAtRiskCredential` task
+   * and the password has changed, mark the task as complete.
+   */
+  private async markAssociatedTaskAsComplete(
+    userId: UserId,
+    updatedCipher: CipherView,
+    config: CipherFormConfig,
+  ) {
+    const decryptedOriginalCipherCipher = await this.cipherService.decrypt(
+      config.originalCipher,
+      userId,
+    );
+
+    const associatedPendingTask = await firstValueFrom(
+      this.taskService
+        .pendingTasks$(userId)
+        .pipe(
+          map((tasks) =>
+            tasks.find(
+              (task) =>
+                task.type === SecurityTaskType.UpdateAtRiskCredential &&
+                task.cipherId === updatedCipher.id,
+            ),
+          ),
+        ),
+    );
+
+    const passwordHasChanged =
+      updatedCipher.type === CipherType.Login &&
+      updatedCipher.login.password &&
+      updatedCipher.login.password !== decryptedOriginalCipherCipher?.login?.password;
+
+    // When there is not an associated pending task or the password has not changed,
+    // no action needed-return early.
+    if (!associatedPendingTask || !passwordHasChanged) {
+      return;
+    }
+
+    // If the cipher is a login and the password has changed, mark the associated task as complete
+    await this.taskService.markAsComplete(associatedPendingTask.id, userId);
+  }
 }
diff --git a/libs/vault/src/cipher-view/additional-options/additional-options.component.ts b/libs/vault/src/cipher-view/additional-options/additional-options.component.ts
index 0f2c99800f8..3e632983d49 100644
--- a/libs/vault/src/cipher-view/additional-options/additional-options.component.ts
+++ b/libs/vault/src/cipher-view/additional-options/additional-options.component.ts
@@ -14,7 +14,6 @@ import {
 @Component({
   selector: "app-additional-options",
   templateUrl: "additional-options.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/vault/src/cipher-view/attachments/attachments-v2-view.component.ts b/libs/vault/src/cipher-view/attachments/attachments-v2-view.component.ts
index 04e69fcccd6..711c63878e3 100644
--- a/libs/vault/src/cipher-view/attachments/attachments-v2-view.component.ts
+++ b/libs/vault/src/cipher-view/attachments/attachments-v2-view.component.ts
@@ -25,7 +25,6 @@ import { DownloadAttachmentComponent } from "../../components/download-attachmen
 @Component({
   selector: "app-attachments-v2-view",
   templateUrl: "attachments-v2-view.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/vault/src/cipher-view/attachments/attachments-v2.component.ts b/libs/vault/src/cipher-view/attachments/attachments-v2.component.ts
index b34d0d3a312..11c15f63505 100644
--- a/libs/vault/src/cipher-view/attachments/attachments-v2.component.ts
+++ b/libs/vault/src/cipher-view/attachments/attachments-v2.component.ts
@@ -4,6 +4,7 @@ import { CommonModule } from "@angular/common";
 import { Component, Inject } from "@angular/core";
 
 import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   ButtonModule,
   DialogModule,
@@ -24,13 +25,13 @@ export interface AttachmentsDialogParams {
 /**
  * Enum representing the possible results of the attachment dialog.
  */
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum AttachmentDialogResult {
-  Uploaded = "uploaded",
-  Removed = "removed",
-  Closed = "closed",
-}
+export const AttachmentDialogResult = {
+  Uploaded: "uploaded",
+  Removed: "removed",
+  Closed: "closed",
+} as const;
+
+export type AttachmentDialogResult = UnionOfValues<typeof AttachmentDialogResult>;
 
 export interface AttachmentDialogCloseResult {
   action: AttachmentDialogResult;
@@ -42,7 +43,6 @@ export interface AttachmentDialogCloseResult {
 @Component({
   selector: "app-vault-attachments-v2",
   templateUrl: "attachments-v2.component.html",
-  standalone: true,
   imports: [ButtonModule, CommonModule, DialogModule, I18nPipe, CipherAttachmentsComponent],
 })
 export class AttachmentsV2Component {
diff --git a/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.html b/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.html
index 22049b2a72e..1e17886f50b 100644
--- a/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.html
+++ b/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.html
@@ -32,7 +32,7 @@
           bitIconButton="bwi-clone"
           bitSuffix
           type="button"
-          [appCopyClick]="login.launchUri"
+          [appCopyClick]="login.uri"
           [valueLabel]="'website' | i18n"
           showToast
           [appA11yTitle]="'copyWebsite' | i18n"
diff --git a/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.ts b/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.ts
index bab37324993..0643737d846 100644
--- a/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.ts
+++ b/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.ts
@@ -21,7 +21,6 @@ import {
 @Component({
   selector: "app-autofill-options-view",
   templateUrl: "autofill-options-view.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/vault/src/cipher-view/card-details/card-details-view.component.ts b/libs/vault/src/cipher-view/card-details/card-details-view.component.ts
index 2d1b2800c79..502214848f3 100644
--- a/libs/vault/src/cipher-view/card-details/card-details-view.component.ts
+++ b/libs/vault/src/cipher-view/card-details/card-details-view.component.ts
@@ -20,7 +20,6 @@ import { ReadOnlyCipherCardComponent } from "../read-only-cipher-card/read-only-
 @Component({
   selector: "app-card-details-view",
   templateUrl: "card-details-view.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/vault/src/cipher-view/cipher-view.component.ts b/libs/vault/src/cipher-view/cipher-view.component.ts
index 02968d6d149..66910ad8ac7 100644
--- a/libs/vault/src/cipher-view/cipher-view.component.ts
+++ b/libs/vault/src/cipher-view/cipher-view.component.ts
@@ -41,7 +41,6 @@ import { ViewIdentitySectionsComponent } from "./view-identity-sections/view-ide
 @Component({
   selector: "app-cipher-view",
   templateUrl: "cipher-view.component.html",
-  standalone: true,
   imports: [
     CalloutModule,
     CommonModule,
diff --git a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.spec.ts b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.spec.ts
new file mode 100644
index 00000000000..510a5a86179
--- /dev/null
+++ b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.spec.ts
@@ -0,0 +1,64 @@
+import { SimpleChanges } from "@angular/core";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { mock } from "jest-mock-extended";
+
+import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
+import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
+
+import { CustomFieldV2Component } from "./custom-fields-v2.component";
+
+describe("CustomFieldV2Component", () => {
+  let component: CustomFieldV2Component;
+  let fixture: ComponentFixture<CustomFieldV2Component>;
+
+  const currentCipher = new CipherView();
+  currentCipher.type = CipherType.Login;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [],
+      providers: [
+        { provide: I18nService, useValue: { t: (key: string) => key } },
+        { provide: EventCollectionService, useValue: mock<EventCollectionService>() },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(CustomFieldV2Component);
+    component = fixture.componentInstance;
+    component.cipher = currentCipher;
+    fixture.detectChanges();
+  });
+
+  it("updates fieldOptions on cipher change", () => {
+    component.ngOnChanges({
+      cipher: {
+        currentValue: currentCipher,
+        previousValue: null,
+        firstChange: true,
+        isFirstChange: () => true,
+      },
+    } as SimpleChanges);
+
+    expect(component.fieldOptions).toEqual(LoginView.prototype.linkedFieldOptions);
+
+    const newCipher = new CipherView();
+    newCipher.type = CipherType.Identity;
+
+    component.cipher = newCipher;
+    component.ngOnChanges({
+      cipher: {
+        currentValue: newCipher,
+        previousValue: currentCipher,
+        firstChange: false,
+        isFirstChange: () => false,
+      },
+    } as SimpleChanges);
+    fixture.detectChanges();
+
+    expect(component.fieldOptions).toEqual(IdentityView.prototype.linkedFieldOptions);
+  });
+});
diff --git a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.ts b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.ts
index 4d20eceb285..2fc35574ba5 100644
--- a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.ts
+++ b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CommonModule } from "@angular/common";
 import { Component, Input, OnChanges, OnInit, SimpleChanges } from "@angular/core";
 
@@ -8,6 +6,7 @@ import { EventCollectionService } from "@bitwarden/common/abstractions/event/eve
 import { EventType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherType, FieldType, LinkedIdType } from "@bitwarden/common/vault/enums";
+import { LinkedMetadata } from "@bitwarden/common/vault/linked-field-option.decorator";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
@@ -28,7 +27,6 @@ import { VaultAutosizeReadOnlyTextArea } from "../../directives/readonly-textare
 @Component({
   selector: "app-custom-fields-v2",
   templateUrl: "custom-fields-v2.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
@@ -44,9 +42,9 @@ import { VaultAutosizeReadOnlyTextArea } from "../../directives/readonly-textare
   ],
 })
 export class CustomFieldV2Component implements OnInit, OnChanges {
-  @Input() cipher: CipherView;
+  @Input({ required: true }) cipher!: CipherView;
   fieldType = FieldType;
-  fieldOptions: any;
+  fieldOptions: Map<number, LinkedMetadata> | null = null;
 
   /** Indexes of hidden fields that are revealed */
   revealedHiddenFields: number[] = [];
@@ -68,12 +66,14 @@ export class CustomFieldV2Component implements OnInit, OnChanges {
   ngOnChanges(changes: SimpleChanges): void {
     if (changes["cipher"]) {
       this.revealedHiddenFields = [];
+      this.fieldOptions = this.getLinkedFieldsOptionsForCipher();
     }
   }
 
   getLinkedType(linkedId: LinkedIdType) {
-    const linkedType = this.fieldOptions.get(linkedId);
-    return this.i18nService.t(linkedType.i18nKey);
+    const linkedType = this.fieldOptions?.get(linkedId);
+
+    return linkedType ? this.i18nService.t(linkedType.i18nKey) : null;
   }
 
   get canViewPassword() {
diff --git a/libs/vault/src/cipher-view/item-details/item-details-v2.component.ts b/libs/vault/src/cipher-view/item-details/item-details-v2.component.ts
index fbedcbb54df..8f0fedbe599 100644
--- a/libs/vault/src/cipher-view/item-details/item-details-v2.component.ts
+++ b/libs/vault/src/cipher-view/item-details/item-details-v2.component.ts
@@ -22,7 +22,6 @@ import { OrgIconDirective } from "../../components/org-icon.directive";
 @Component({
   selector: "app-item-details-v2",
   templateUrl: "item-details-v2.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/vault/src/cipher-view/item-history/item-history-v2.component.ts b/libs/vault/src/cipher-view/item-history/item-history-v2.component.ts
index f49d7030d77..2bbb6418934 100644
--- a/libs/vault/src/cipher-view/item-history/item-history-v2.component.ts
+++ b/libs/vault/src/cipher-view/item-history/item-history-v2.component.ts
@@ -19,7 +19,6 @@ import {
 @Component({
   selector: "app-item-history-v2",
   templateUrl: "item-history-v2.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts
index 5f7d0b32201..5eeb3f9e8f3 100644
--- a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts
+++ b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts
@@ -42,7 +42,6 @@ type TotpCodeValues = {
 @Component({
   selector: "app-login-credentials-view",
   templateUrl: "login-credentials-view.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
diff --git a/libs/vault/src/cipher-view/read-only-cipher-card/read-only-cipher-card.component.ts b/libs/vault/src/cipher-view/read-only-cipher-card/read-only-cipher-card.component.ts
index 9005ea9674c..8f6b9954a9f 100644
--- a/libs/vault/src/cipher-view/read-only-cipher-card/read-only-cipher-card.component.ts
+++ b/libs/vault/src/cipher-view/read-only-cipher-card/read-only-cipher-card.component.ts
@@ -5,7 +5,6 @@ import { CardComponent, BitFormFieldComponent } from "@bitwarden/components";
 @Component({
   selector: "read-only-cipher-card",
   templateUrl: "./read-only-cipher-card.component.html",
-  standalone: true,
   imports: [CardComponent],
 })
 /**
diff --git a/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.html b/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.html
index 2a31cd01c3a..e74c0b06818 100644
--- a/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.html
+++ b/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.html
@@ -19,6 +19,7 @@
         bitIconButton
         bitPasswordInputToggle
         data-testid="toggle-privateKey"
+        [(toggled)]="revealSshKey"
       ></button>
       <button
         bitIconButton="bwi-clone"
diff --git a/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.ts b/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.ts
index e0ec1358ee1..535c41b9aea 100644
--- a/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.ts
+++ b/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { CommonModule } from "@angular/common";
-import { Component, Input } from "@angular/core";
+import { Component, Input, OnChanges, SimpleChanges } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { SshKeyView } from "@bitwarden/common/vault/models/view/ssh-key.view";
@@ -17,7 +17,6 @@ import { ReadOnlyCipherCardComponent } from "../read-only-cipher-card/read-only-
 @Component({
   selector: "app-sshkey-view",
   templateUrl: "sshkey-view.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
@@ -28,6 +27,14 @@ import { ReadOnlyCipherCardComponent } from "../read-only-cipher-card/read-only-
     IconButtonModule,
   ],
 })
-export class SshKeyViewComponent {
+export class SshKeyViewComponent implements OnChanges {
   @Input() sshKey: SshKeyView;
+
+  revealSshKey = false;
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes["sshKey"]) {
+      this.revealSshKey = false;
+    }
+  }
 }
diff --git a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.ts b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.ts
index 3b710812b36..f9cb9d2b549 100644
--- a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.ts
+++ b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.ts
@@ -13,7 +13,6 @@ import {
 import { ReadOnlyCipherCardComponent } from "../read-only-cipher-card/read-only-cipher-card.component";
 
 @Component({
-  standalone: true,
   selector: "app-view-identity-sections",
   templateUrl: "./view-identity-sections.component.html",
   imports: [
diff --git a/libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.ts b/libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.ts
index dd3cbc4c5c9..381893d54af 100644
--- a/libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.ts
+++ b/libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.ts
@@ -19,6 +19,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   DIALOG_DATA,
   DialogRef,
@@ -34,12 +35,12 @@ import {
 } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum AddEditFolderDialogResult {
-  Created = "created",
-  Deleted = "deleted",
-}
+export const AddEditFolderDialogResult = {
+  Created: "created",
+  Deleted: "deleted",
+} as const;
+
+export type AddEditFolderDialogResult = UnionOfValues<typeof AddEditFolderDialogResult>;
 
 export type AddEditFolderDialogData = {
   /** When provided, dialog will display edit folder variant */
@@ -47,7 +48,6 @@ export type AddEditFolderDialogData = {
 };
 
 @Component({
-  standalone: true,
   selector: "vault-add-edit-folder-dialog",
   templateUrl: "./add-edit-folder-dialog.component.html",
   imports: [
diff --git a/libs/vault/src/components/assign-collections.component.ts b/libs/vault/src/components/assign-collections.component.ts
index faa2dae072a..124dc783034 100644
--- a/libs/vault/src/components/assign-collections.component.ts
+++ b/libs/vault/src/components/assign-collections.component.ts
@@ -40,6 +40,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { CipherId, CollectionId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   AsyncActionsModule,
   BitSubmitDirective,
@@ -82,19 +83,18 @@ export interface CollectionAssignmentParams {
   isSingleCipherAdmin?: boolean;
 }
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-export enum CollectionAssignmentResult {
-  Saved = "saved",
-  Canceled = "canceled",
-}
+export const CollectionAssignmentResult = {
+  Saved: "saved",
+  Canceled: "canceled",
+} as const;
+
+export type CollectionAssignmentResult = UnionOfValues<typeof CollectionAssignmentResult>;
 
 const MY_VAULT_ID = "MyVault";
 
 @Component({
   selector: "assign-collections",
   templateUrl: "assign-collections.component.html",
-  standalone: true,
   imports: [
     CommonModule,
     JslibModule,
@@ -506,7 +506,7 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI
   private async updateAssignedCollections(cipherView: CipherView, userId: UserId) {
     const { collections } = this.formGroup.getRawValue();
     cipherView.collectionIds = collections.map((i) => i.id as CollectionId);
-    const cipher = await this.cipherService.encrypt(cipherView, userId);
+    const { cipher } = await this.cipherService.encrypt(cipherView, userId);
     if (this.params.isSingleCipherAdmin) {
       await this.cipherService.saveCollectionsWithServerAdmin(cipher);
     } else {
diff --git a/libs/vault/src/components/can-delete-cipher.directive.ts b/libs/vault/src/components/can-delete-cipher.directive.ts
index c1c7706a1fa..7eadedc7ada 100644
--- a/libs/vault/src/components/can-delete-cipher.directive.ts
+++ b/libs/vault/src/components/can-delete-cipher.directive.ts
@@ -9,7 +9,6 @@ import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cip
  */
 @Directive({
   selector: "[appCanDeleteCipher]",
-  standalone: true,
 })
 export class CanDeleteCipherDirective implements OnDestroy {
   private destroy$ = new Subject<void>();
diff --git a/libs/vault/src/components/carousel/carousel-button/carousel-button.component.ts b/libs/vault/src/components/carousel/carousel-button/carousel-button.component.ts
index d0e353dcc76..7b5f7d3b164 100644
--- a/libs/vault/src/components/carousel/carousel-button/carousel-button.component.ts
+++ b/libs/vault/src/components/carousel/carousel-button/carousel-button.component.ts
@@ -10,7 +10,6 @@ import { VaultCarouselSlideComponent } from "../carousel-slide/carousel-slide.co
 @Component({
   selector: "vault-carousel-button",
   templateUrl: "carousel-button.component.html",
-  standalone: true,
   imports: [CommonModule, IconModule],
 })
 export class VaultCarouselButtonComponent implements FocusableOption {
diff --git a/libs/vault/src/components/carousel/carousel-content/carousel-content.component.spec.ts b/libs/vault/src/components/carousel/carousel-content/carousel-content.component.spec.ts
index 2900225b886..bc1c9250c2c 100644
--- a/libs/vault/src/components/carousel/carousel-content/carousel-content.component.spec.ts
+++ b/libs/vault/src/components/carousel/carousel-content/carousel-content.component.spec.ts
@@ -7,7 +7,6 @@ import { VaultCarouselContentComponent } from "./carousel-content.component";
 
 @Component({
   selector: "app-test-template-ref",
-  standalone: true,
   imports: [VaultCarouselContentComponent],
   template: `
     <ng-template #template>
diff --git a/libs/vault/src/components/carousel/carousel-content/carousel-content.component.ts b/libs/vault/src/components/carousel/carousel-content/carousel-content.component.ts
index 7051a8ff8fa..47027a77ae9 100644
--- a/libs/vault/src/components/carousel/carousel-content/carousel-content.component.ts
+++ b/libs/vault/src/components/carousel/carousel-content/carousel-content.component.ts
@@ -4,7 +4,6 @@ import { Component, Input } from "@angular/core";
 @Component({
   selector: "vault-carousel-content",
   templateUrl: "carousel-content.component.html",
-  standalone: true,
   imports: [CdkPortalOutlet],
 })
 export class VaultCarouselContentComponent {
diff --git a/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.spec.ts b/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.spec.ts
index e69a2a2d758..46f06f6dcb4 100644
--- a/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.spec.ts
+++ b/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.spec.ts
@@ -7,7 +7,6 @@ import { VaultCarouselSlideComponent } from "./carousel-slide.component";
 
 @Component({
   selector: "app-test-carousel-slide",
-  standalone: true,
   imports: [VaultCarouselSlideComponent],
   template: ` <vault-carousel-slide><p>Carousel Slide Content!</p></vault-carousel-slide> `,
 })
diff --git a/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.ts b/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.ts
index a516914f0c0..811572881da 100644
--- a/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.ts
+++ b/libs/vault/src/components/carousel/carousel-slide/carousel-slide.component.ts
@@ -14,7 +14,6 @@ import {
 @Component({
   selector: "vault-carousel-slide",
   templateUrl: "./carousel-slide.component.html",
-  standalone: true,
   imports: [CommonModule],
 })
 export class VaultCarouselSlideComponent implements OnInit {
diff --git a/libs/vault/src/components/carousel/carousel.component.spec.ts b/libs/vault/src/components/carousel/carousel.component.spec.ts
index 500b8115bad..1409aea0cb2 100644
--- a/libs/vault/src/components/carousel/carousel.component.spec.ts
+++ b/libs/vault/src/components/carousel/carousel.component.spec.ts
@@ -7,7 +7,6 @@ import { VaultCarouselComponent } from "./carousel.component";
 
 @Component({
   selector: "app-test-carousel-slide",
-  standalone: true,
   imports: [VaultCarouselComponent, VaultCarouselSlideComponent],
   template: `
     <vault-carousel label="Storybook Demo">
diff --git a/libs/vault/src/components/carousel/carousel.component.ts b/libs/vault/src/components/carousel/carousel.component.ts
index 2346ee29902..f2d211697df 100644
--- a/libs/vault/src/components/carousel/carousel.component.ts
+++ b/libs/vault/src/components/carousel/carousel.component.ts
@@ -6,15 +6,19 @@ import {
   ChangeDetectorRef,
   Component,
   ContentChildren,
+  DestroyRef,
   ElementRef,
   EventEmitter,
   inject,
   Input,
+  NgZone,
   Output,
   QueryList,
   ViewChild,
   ViewChildren,
 } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { take } from "rxjs";
 
 import { ButtonModule } from "@bitwarden/components";
 
@@ -25,7 +29,6 @@ import { VaultCarouselSlideComponent } from "./carousel-slide/carousel-slide.com
 @Component({
   selector: "vault-carousel",
   templateUrl: "./carousel.component.html",
-  standalone: true,
   imports: [
     CdkPortalOutlet,
     CommonModule,
@@ -45,7 +48,7 @@ export class VaultCarouselComponent implements AfterViewInit {
   @Input({ required: true }) label = "";
 
   /**
-   * Emits the index of of the newly selected slide.
+   * Emits the index of the newly selected slide.
    */
   @Output() slideChange = new EventEmitter<number>();
 
@@ -83,6 +86,11 @@ export class VaultCarouselComponent implements AfterViewInit {
    */
   protected keyManager: FocusKeyManager<VaultCarouselButtonComponent> | null = null;
 
+  constructor(
+    private ngZone: NgZone,
+    private destroyRef: DestroyRef,
+  ) {}
+
   /** Set the selected index of the carousel. */
   protected selectSlide(index: number) {
     this.selectedIndex = index;
@@ -98,7 +106,9 @@ export class VaultCarouselComponent implements AfterViewInit {
     // Set the first carousel button as active, this avoids having to double tab the arrow keys on initial focus.
     this.keyManager.setFirstItemActive();
 
-    await this.setMinHeightOfCarousel();
+    this.ngZone.onStable.pipe(take(1), takeUntilDestroyed(this.destroyRef)).subscribe(() => {
+      void this.setMinHeightOfCarousel();
+    });
   }
 
   /**
diff --git a/libs/vault/src/components/copy-cipher-field.directive.ts b/libs/vault/src/components/copy-cipher-field.directive.ts
index 324b43f12d4..0ab7400a6dd 100644
--- a/libs/vault/src/components/copy-cipher-field.directive.ts
+++ b/libs/vault/src/components/copy-cipher-field.directive.ts
@@ -18,7 +18,6 @@ import { CopyAction, CopyCipherFieldService } from "@bitwarden/vault";
  * ```
  */
 @Directive({
-  standalone: true,
   selector: "[appCopyField]",
 })
 export class CopyCipherFieldDirective implements OnChanges {
diff --git a/libs/vault/src/components/dark-image-source.directive.ts b/libs/vault/src/components/dark-image-source.directive.ts
index 9867f264365..ee54f61209a 100644
--- a/libs/vault/src/components/dark-image-source.directive.ts
+++ b/libs/vault/src/components/dark-image-source.directive.ts
@@ -24,7 +24,6 @@ import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-stat
  */
 @Directive({
   selector: "[appDarkImgSrc]",
-  standalone: true,
 })
 export class DarkImageSourceDirective implements OnInit {
   private themeService = inject(ThemeStateService);
diff --git a/libs/vault/src/components/decryption-failure-dialog/decryption-failure-dialog.component.ts b/libs/vault/src/components/decryption-failure-dialog/decryption-failure-dialog.component.ts
index cbddcc24dc0..91b1cef364c 100644
--- a/libs/vault/src/components/decryption-failure-dialog/decryption-failure-dialog.component.ts
+++ b/libs/vault/src/components/decryption-failure-dialog/decryption-failure-dialog.component.ts
@@ -20,7 +20,6 @@ export type DecryptionFailureDialogParams = {
 };
 
 @Component({
-  standalone: true,
   selector: "vault-decryption-failure-dialog",
   templateUrl: "./decryption-failure-dialog.component.html",
   imports: [
diff --git a/libs/vault/src/components/download-attachment/download-attachment.component.ts b/libs/vault/src/components/download-attachment/download-attachment.component.ts
index f06d6db582a..e4c0c253f4f 100644
--- a/libs/vault/src/components/download-attachment/download-attachment.component.ts
+++ b/libs/vault/src/components/download-attachment/download-attachment.component.ts
@@ -17,7 +17,6 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { AsyncActionsModule, IconButtonModule, ToastService } from "@bitwarden/components";
 
 @Component({
-  standalone: true,
   selector: "app-download-attachment",
   templateUrl: "./download-attachment.component.html",
   imports: [AsyncActionsModule, CommonModule, JslibModule, IconButtonModule],
diff --git a/libs/vault/src/components/org-icon.directive.ts b/libs/vault/src/components/org-icon.directive.ts
index 69a19b46c65..d9c8f240474 100644
--- a/libs/vault/src/components/org-icon.directive.ts
+++ b/libs/vault/src/components/org-icon.directive.ts
@@ -5,7 +5,6 @@ import { ProductTierType } from "@bitwarden/common/billing/enums";
 export type OrgIconSize = "default" | "small" | "large";
 
 @Directive({
-  standalone: true,
   selector: "[appOrgIcon]",
 })
 export class OrgIconDirective {
diff --git a/libs/vault/src/components/password-history-view/password-history-view.component.ts b/libs/vault/src/components/password-history-view/password-history-view.component.ts
index 0f3c54d9d2b..427644f3e77 100644
--- a/libs/vault/src/components/password-history-view/password-history-view.component.ts
+++ b/libs/vault/src/components/password-history-view/password-history-view.component.ts
@@ -11,7 +11,6 @@ import { ItemModule, ColorPasswordModule, IconButtonModule } from "@bitwarden/co
 @Component({
   selector: "vault-password-history-view",
   templateUrl: "./password-history-view.component.html",
-  standalone: true,
   imports: [CommonModule, ItemModule, ColorPasswordModule, IconButtonModule, JslibModule],
 })
 export class PasswordHistoryViewComponent implements OnInit {
diff --git a/libs/vault/src/components/password-history/password-history.component.ts b/libs/vault/src/components/password-history/password-history.component.ts
index 5af785d1a70..7845edb2369 100644
--- a/libs/vault/src/components/password-history/password-history.component.ts
+++ b/libs/vault/src/components/password-history/password-history.component.ts
@@ -29,7 +29,6 @@ export interface ViewPasswordHistoryDialogParams {
 @Component({
   selector: "app-vault-password-history",
   templateUrl: "password-history.component.html",
-  standalone: true,
   imports: [
     ButtonModule,
     CommonModule,
diff --git a/libs/vault/src/components/password-reprompt.component.ts b/libs/vault/src/components/password-reprompt.component.ts
index 11decbd4e65..7665b22be49 100644
--- a/libs/vault/src/components/password-reprompt.component.ts
+++ b/libs/vault/src/components/password-reprompt.component.ts
@@ -23,7 +23,6 @@ import { KeyService } from "@bitwarden/key-management";
  * See UserVerificationComponent for any other situation where you need to verify the user's identity.
  */
 @Component({
-  standalone: true,
   selector: "vault-password-reprompt",
   imports: [
     JslibModule,
diff --git a/libs/vault/src/components/totp-countdown/totp-countdown.component.spec.ts b/libs/vault/src/components/totp-countdown/totp-countdown.component.spec.ts
new file mode 100644
index 00000000000..58c03b3388f
--- /dev/null
+++ b/libs/vault/src/components/totp-countdown/totp-countdown.component.spec.ts
@@ -0,0 +1,95 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { mock } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+
+import { BitTotpCountdownComponent } from "./totp-countdown.component";
+
+describe("BitTotpCountdownComponent", () => {
+  let component: BitTotpCountdownComponent;
+  let fixture: ComponentFixture<BitTotpCountdownComponent>;
+  let totpService: jest.Mocked<TotpService>;
+
+  const mockCipher1 = {
+    id: "cipher-id",
+    name: "Test Cipher",
+    login: { totp: "totp-secret" },
+  } as CipherView;
+
+  const mockCipher2 = {
+    id: "cipher-id-2",
+    name: "Test Cipher 2",
+    login: { totp: "totp-secret-2" },
+  } as CipherView;
+
+  const mockTotpResponse1 = {
+    code: "123456",
+    period: 30,
+  };
+
+  const mockTotpResponse2 = {
+    code: "987654",
+    period: 10,
+  };
+
+  beforeEach(async () => {
+    totpService = mock<TotpService>({
+      getCode$: jest.fn().mockImplementation((totp) => {
+        if (totp === mockCipher1.login.totp) {
+          return of(mockTotpResponse1);
+        }
+
+        return of(mockTotpResponse2);
+      }),
+    });
+
+    await TestBed.configureTestingModule({
+      providers: [{ provide: TotpService, useValue: totpService }],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(BitTotpCountdownComponent);
+    component = fixture.componentInstance;
+    component.cipher = mockCipher1;
+    fixture.detectChanges();
+  });
+
+  it("initializes totpInfo$ observable", (done) => {
+    component.totpInfo$?.subscribe((info) => {
+      expect(info.totpCode).toBe(mockTotpResponse1.code);
+      expect(info.totpCodeFormatted).toBe("123 456");
+      done();
+    });
+  });
+
+  it("emits sendCopyCode when TOTP code is available", (done) => {
+    const emitter = jest.spyOn(component.sendCopyCode, "emit");
+
+    component.totpInfo$?.subscribe((info) => {
+      expect(emitter).toHaveBeenCalledWith({
+        totpCode: info.totpCode,
+        totpCodeFormatted: info.totpCodeFormatted,
+      });
+      done();
+    });
+  });
+
+  it("updates totpInfo$ when cipher changes", (done) => {
+    component.cipher = mockCipher2;
+    component.ngOnChanges({
+      cipher: {
+        currentValue: mockCipher2,
+        previousValue: mockCipher1,
+        firstChange: false,
+        isFirstChange: () => false,
+      },
+    });
+
+    component.totpInfo$?.subscribe((info) => {
+      expect(info.totpCode).toBe(mockTotpResponse2.code);
+      expect(info.totpCodeFormatted).toBe("987 654");
+      done();
+    });
+  });
+});
diff --git a/libs/vault/src/components/totp-countdown/totp-countdown.component.ts b/libs/vault/src/components/totp-countdown/totp-countdown.component.ts
index 08587cbb9fa..5274ce621f0 100644
--- a/libs/vault/src/components/totp-countdown/totp-countdown.component.ts
+++ b/libs/vault/src/components/totp-countdown/totp-countdown.component.ts
@@ -1,7 +1,13 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CommonModule } from "@angular/common";
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  OnChanges,
+  SimpleChanges,
+} from "@angular/core";
 import { Observable, map, tap } from "rxjs";
 
 import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
@@ -12,11 +18,10 @@ import { TypographyModule } from "@bitwarden/components";
 @Component({
   selector: "[bitTotpCountdown]",
   templateUrl: "totp-countdown.component.html",
-  standalone: true,
   imports: [CommonModule, TypographyModule],
 })
-export class BitTotpCountdownComponent implements OnInit {
-  @Input() cipher: CipherView;
+export class BitTotpCountdownComponent implements OnInit, OnChanges {
+  @Input({ required: true }) cipher!: CipherView;
   @Output() sendCopyCode = new EventEmitter();
 
   /**
@@ -27,6 +32,16 @@ export class BitTotpCountdownComponent implements OnInit {
   constructor(protected totpService: TotpService) {}
 
   async ngOnInit() {
+    this.setTotpInfo();
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes["cipher"]) {
+      this.setTotpInfo();
+    }
+  }
+
+  private setTotpInfo(): void {
     this.totpInfo$ = this.cipher?.login?.totp
       ? this.totpService.getCode$(this.cipher.login.totp).pipe(
           map((response) => {
diff --git a/libs/vault/src/icons/index.ts b/libs/vault/src/icons/index.ts
index ef4a7f52a3d..904399da4b3 100644
--- a/libs/vault/src/icons/index.ts
+++ b/libs/vault/src/icons/index.ts
@@ -8,3 +8,4 @@ export * from "./security-handshake";
 export * from "./login-cards";
 export * from "./secure-user";
 export * from "./secure-devices";
+export * from "./party";
diff --git a/libs/vault/src/icons/party.ts b/libs/vault/src/icons/party.ts
new file mode 100644
index 00000000000..2e506c5d705
--- /dev/null
+++ b/libs/vault/src/icons/party.ts
@@ -0,0 +1,30 @@
+import { svgIcon } from "@bitwarden/components";
+
+export const Party = svgIcon`
+  <svg width="90" height="89" viewBox="0 0 90 89" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path class="tw-fill-illustration-tertiary" d="M58.4596 65.7743L7.72887 86.9121C6.14906 87.5704 4.32819 87.2102 3.11801 86C1.90783 84.7898 1.54761 82.9689 2.20587 81.3891L23.3437 30.6584C24.9201 26.8749 29.1011 24.8949 33.0271 26.0727L34.4564 26.5015C47.9795 30.5585 58.5595 41.1384 62.6165 54.6616L63.0453 56.0909C64.2231 60.0169 62.2431 64.1979 58.4596 65.7743Z" />
+    <path class="tw-fill-illustration-bg-tertiary" fill-rule="evenodd" clip-rule="evenodd" d="M26.7218 78.9986C23.7051 76.7004 20.7338 74.1105 17.8708 71.2476C15.0079 68.3846 12.418 65.4133 10.1198 62.3967L11.0125 60.2543C13.421 63.5125 16.1857 66.734 19.2851 69.8334C22.3844 72.9327 25.6059 75.6974 28.8641 78.106L26.7218 78.9986ZM18.2831 82.5147C16.2281 80.7619 14.1998 78.8905 12.2139 76.9046C10.2279 74.9186 8.35655 72.8904 6.60371 70.8354L5.74316 72.9007C7.3385 74.7346 9.02504 76.5442 10.7996 78.3188C12.5742 80.0934 14.3838 81.7799 16.2178 83.3753L18.2831 82.5147ZM38.0519 74.2777C33.6361 71.6409 29.2069 68.2051 25.0601 64.0583C20.9133 59.9115 17.4775 55.4823 14.8407 51.0666L15.8077 48.7457C18.4319 53.4237 22.0191 58.1889 26.4743 62.6441C30.9295 67.0993 35.6947 70.6865 40.3728 73.3107L38.0519 74.2777ZM20.1695 38.2775C21.8284 44.3268 25.9054 51.1409 31.9414 57.177C37.9775 63.213 44.7916 67.2901 50.8409 68.9489L54.0834 67.5979C53.0546 67.4469 51.9666 67.2041 50.8243 66.8641C45.3003 65.2204 39.0089 61.416 33.3557 55.7627C27.7024 50.1095 23.898 43.8181 22.2543 38.2941C21.9144 37.1519 21.6715 36.0638 21.5205 35.035L20.1695 38.2775Z"/>
+    <path class="tw-fill-illustration-bg-secondary" d="M49.7753 39.3432C57.9763 47.5442 62.0918 56.7251 58.9676 59.8492C55.8434 62.9734 46.6626 58.8579 38.4615 50.6569C30.2605 42.4558 26.145 33.275 29.2692 30.1508C32.3934 27.0266 41.5742 31.1421 49.7753 39.3432Z" />
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M56.7934 52.3181C55.2526 48.881 52.3347 44.731 48.361 40.7574C44.3874 36.7837 40.2374 33.8658 36.8003 32.325C35.0749 31.5516 33.6291 31.1703 32.5336 31.1131C31.4375 31.0558 30.9236 31.3248 30.6834 31.565C30.4432 31.8052 30.1742 32.3191 30.2315 33.4152C30.2887 34.5107 30.67 35.9565 31.4434 37.6819C32.9842 41.119 35.9021 45.269 39.8758 49.2426C43.8494 53.2163 47.9994 56.1342 51.4365 57.675C53.1619 58.4484 54.6077 58.8297 55.7032 58.8869C56.7993 58.9442 57.3132 58.6752 57.5534 58.435C57.7936 58.1948 58.0626 57.6809 58.0053 56.5848C57.9481 55.4893 57.5668 54.0435 56.7934 52.3181ZM58.9676 59.8492C62.0918 56.7251 57.9763 47.5442 49.7753 39.3432C41.5742 31.1421 32.3934 27.0266 29.2692 30.1508C26.145 33.275 30.2605 42.4558 38.4615 50.6569C46.6626 58.8579 55.8434 62.9734 58.9676 59.8492Z" />
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M32.7398 27.0305C29.3046 26 25.6462 27.7324 24.2668 31.043L3.12897 81.7738C2.62658 82.9795 2.9015 84.3692 3.82515 85.2929C4.74879 86.2165 6.13853 86.4915 7.34428 85.9891L58.075 64.8512C61.3856 63.4718 63.118 59.8135 62.0875 56.3783L61.6587 54.9489C57.6983 41.7478 47.3703 31.4197 34.1691 27.4593L32.7398 27.0305ZM22.4206 30.2738C24.1941 26.0173 28.8978 23.7899 33.3144 25.1149L34.7438 25.5437C48.5889 29.6972 59.4208 40.5291 63.5743 54.3742L64.0031 55.8036C65.3281 60.2202 63.1007 64.9239 58.8442 66.6974L8.11351 87.8352C6.15966 88.6493 3.90765 88.2038 2.41093 86.7071C0.914216 85.2104 0.468712 82.9584 1.28282 81.0045L22.4206 30.2738Z" />
+    <path class="tw-fill-illustration-outline" d="M44.382 0.584344C44.4617 0.242133 44.7668 0 45.1182 0C45.4695 0 45.7746 0.242133 45.8543 0.584344L45.8917 0.744718C46.4103 2.97018 48.148 4.70786 50.3734 5.22646L50.5338 5.26383C50.876 5.34358 51.1182 5.64862 51.1182 6C51.1182 6.35138 50.876 6.65642 50.5338 6.73617L50.3734 6.77354C48.148 7.29214 46.4103 9.02982 45.8917 11.2553L45.8543 11.4157C45.7746 11.7579 45.4695 12 45.1182 12C44.7668 12 44.4617 11.7579 44.382 11.4157L44.3446 11.2553C43.826 9.02982 42.0883 7.29214 39.8629 6.77354L39.7025 6.73617C39.3603 6.65642 39.1182 6.35138 39.1182 6C39.1182 5.64862 39.3603 5.34358 39.7025 5.26383L39.8629 5.22646C42.0883 4.70786 43.826 2.97018 44.3446 0.744717L44.382 0.584344Z" />
+    <path class="tw-fill-illustration-outline" d="M82.382 15.5843C82.4617 15.2421 82.7668 15 83.1182 15C83.4695 15 83.7746 15.2421 83.8543 15.5843L83.8917 15.7447C84.4103 17.9702 86.148 19.7079 88.3734 20.2265L88.5338 20.2638C88.876 20.3436 89.1182 20.6486 89.1182 21C89.1182 21.3514 88.876 21.6564 88.5338 21.7362L88.3734 21.7735C86.148 22.2921 84.4103 24.0298 83.8917 26.2553L83.8543 26.4157C83.7746 26.7579 83.4695 27 83.1182 27C82.7668 27 82.4617 26.7579 82.382 26.4157L82.3446 26.2553C81.826 24.0298 80.0883 22.2921 77.8629 21.7735L77.7025 21.7362C77.3603 21.6564 77.1182 21.3514 77.1182 21C77.1182 20.6486 77.3603 20.3436 77.7025 20.2638L77.8629 20.2265C80.0883 19.7079 81.826 17.9702 82.3446 15.7447L82.382 15.5843Z" />
+    <path class="tw-fill-illustration-outline" d="M69.382 76.5843C69.4617 76.2421 69.7668 76 70.1182 76C70.4695 76 70.7746 76.2421 70.8543 76.5843L70.8917 76.7447C71.4103 78.9702 73.148 80.7079 75.3734 81.2265L75.5338 81.2638C75.876 81.3436 76.1182 81.6486 76.1182 82C76.1182 82.3514 75.876 82.6564 75.5338 82.7362L75.3734 82.7735C73.148 83.2921 71.4103 85.0298 70.8917 87.2553L70.8543 87.4157C70.7746 87.7579 70.4695 88 70.1182 88C69.7668 88 69.4617 87.7579 69.382 87.4157L69.3446 87.2553C68.826 85.0298 67.0883 83.2921 64.8629 82.7735L64.7025 82.7362C64.3603 82.6564 64.1182 82.3514 64.1182 82C64.1182 81.6486 64.3603 81.3436 64.7025 81.2638L64.8629 81.2265C67.0883 80.7079 68.826 78.9702 69.3446 76.7447L69.382 76.5843Z" />
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M77.7251 48.364C74.9915 45.6303 70.5593 45.6303 67.8256 48.364C67.4351 48.7545 66.802 48.7545 66.4114 48.364C66.0209 47.9735 66.0209 47.3403 66.4114 46.9498C69.9261 43.4351 75.6246 43.4351 79.1394 46.9498C79.5299 47.3403 79.5299 47.9735 79.1394 48.364C78.7488 48.7545 78.1157 48.7545 77.7251 48.364Z" />
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M82.243 38.3173C76.5502 35.0305 69.2707 36.981 65.9839 42.6739C65.7078 43.1522 65.0962 43.316 64.6179 43.0399C64.1396 42.7637 63.9757 42.1522 64.2519 41.6739C68.091 35.0244 76.5936 32.7461 83.243 36.5852C83.7213 36.8614 83.8852 37.4729 83.609 37.9512C83.3329 38.4295 82.7213 38.5934 82.243 38.3173Z" />
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M21.1182 14C24.9842 14 28.1182 17.134 28.1182 21C28.1182 21.5523 28.5659 22 29.1182 22C29.6704 22 30.1182 21.5523 30.1182 21C30.1182 16.0294 26.0887 12 21.1182 12C20.5659 12 20.1182 12.4477 20.1182 13C20.1182 13.5523 20.5659 14 21.1182 14Z" />
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M26.5636 5.93701C30.1861 7.2874 32.028 11.3187 30.6776 14.9412C30.4847 15.4587 30.7478 16.0346 31.2653 16.2275C31.7828 16.4204 32.3587 16.1573 32.5516 15.6398C34.2878 10.9823 31.9197 5.79919 27.2622 4.06299C26.7447 3.87008 26.1688 4.13321 25.9759 4.65071C25.783 5.1682 26.0461 5.7441 26.5636 5.93701Z" />
+    <path class="tw-fill-illustration-bg-secondary" d="M62.1182 17C62.1182 19.2091 60.3273 21 58.1182 21C55.909 21 54.1182 19.2091 54.1182 17C54.1182 14.7909 55.909 13 58.1182 13C60.3273 13 62.1182 14.7909 62.1182 17Z" />
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M58.1182 19C59.2227 19 60.1182 18.1046 60.1182 17C60.1182 15.8954 59.2227 15 58.1182 15C57.0136 15 56.1182 15.8954 56.1182 17C56.1182 18.1046 57.0136 19 58.1182 19ZM58.1182 21C60.3273 21 62.1182 19.2091 62.1182 17C62.1182 14.7909 60.3273 13 58.1182 13C55.909 13 54.1182 14.7909 54.1182 17C54.1182 19.2091 55.909 21 58.1182 21Z" />
+    <path class="tw-fill-illustration-bg-secondary" d="M68.1182 29C68.1182 30.6569 66.775 32 65.1182 32C63.4613 32 62.1182 30.6569 62.1182 29C62.1182 27.3431 63.4613 26 65.1182 26C66.775 26 68.1182 27.3431 68.1182 29Z" />
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M65.1182 30C65.6704 30 66.1182 29.5523 66.1182 29C66.1182 28.4477 65.6704 28 65.1182 28C64.5659 28 64.1182 28.4477 64.1182 29C64.1182 29.5523 64.5659 30 65.1182 30ZM65.1182 32C66.775 32 68.1182 30.6569 68.1182 29C68.1182 27.3431 66.775 26 65.1182 26C63.4613 26 62.1182 27.3431 62.1182 29C62.1182 30.6569 63.4613 32 65.1182 32Z" />
+    <path class="tw-fill-illustration-bg-secondary" d="M57.1182 78C57.1182 79.6569 55.775 81 54.1182 81C52.4613 81 51.1182 79.6569 51.1182 78C51.1182 76.3431 52.4613 75 54.1182 75C55.775 75 57.1182 76.3431 57.1182 78Z" />
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M54.1182 79C54.6704 79 55.1182 78.5523 55.1182 78C55.1182 77.4477 54.6704 77 54.1182 77C53.5659 77 53.1182 77.4477 53.1182 78C53.1182 78.5523 53.5659 79 54.1182 79ZM54.1182 81C55.775 81 57.1182 79.6569 57.1182 78C57.1182 76.3431 55.775 75 54.1182 75C52.4613 75 51.1182 76.3431 51.1182 78C51.1182 79.6569 52.4613 81 54.1182 81Z" />
+    <path class="tw-fill-illustration-tertiary" d="M85.1182 60C85.1182 62.7614 82.8796 65 80.1182 65C77.3567 65 75.1182 62.7614 75.1182 60C75.1182 57.2386 77.3567 55 80.1182 55C82.8796 55 85.1182 57.2386 85.1182 60Z" />
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M80.1182 63C81.775 63 83.1182 61.6569 83.1182 60C83.1182 58.3431 81.775 57 80.1182 57C78.4613 57 77.1182 58.3431 77.1182 60C77.1182 61.6569 78.4613 63 80.1182 63ZM80.1182 65C82.8796 65 85.1182 62.7614 85.1182 60C85.1182 57.2386 82.8796 55 80.1182 55C77.3567 55 75.1182 57.2386 75.1182 60C75.1182 62.7614 77.3567 65 80.1182 65Z" />
+    <path class="tw-fill-illustration-tertiary" d="M52.1182 23.5C52.1182 25.433 50.5512 27 48.6182 27C46.6852 27 45.1182 25.433 45.1182 23.5C45.1182 21.567 46.6852 20 48.6182 20C50.5512 20 52.1182 21.567 52.1182 23.5Z" />
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M48.6182 25C49.4466 25 50.1182 24.3284 50.1182 23.5C50.1182 22.6716 49.4466 22 48.6182 22C47.7897 22 47.1182 22.6716 47.1182 23.5C47.1182 24.3284 47.7897 25 48.6182 25ZM48.6182 27C50.5512 27 52.1182 25.433 52.1182 23.5C52.1182 21.567 50.5512 20 48.6182 20C46.6852 20 45.1182 21.567 45.1182 23.5C45.1182 25.433 46.6852 27 48.6182 27Z" />
+    <path class="tw-fill-illustration-bg-tertiary" d="M81.1182 7C81.1182 10.866 77.9842 14 74.1182 14C70.2522 14 67.1182 10.866 67.1182 7C67.1182 3.13401 70.2522 0 74.1182 0C77.9842 0 81.1182 3.13401 81.1182 7Z" />
+    <path class="tw-fill-illustration-outline" fill-rule="evenodd" clip-rule="evenodd" d="M74.1182 12C76.8796 12 79.1182 9.76142 79.1182 7C79.1182 4.23858 76.8796 2 74.1182 2C71.3567 2 69.1182 4.23858 69.1182 7C69.1182 9.76142 71.3567 12 74.1182 12ZM74.1182 14C77.9842 14 81.1182 10.866 81.1182 7C81.1182 3.13401 77.9842 0 74.1182 0C70.2522 0 67.1182 3.13401 67.1182 7C67.1182 10.866 70.2522 14 74.1182 14Z" />
+  </svg>
+`;
diff --git a/libs/vault/tsconfig.json b/libs/vault/tsconfig.json
index 6039dccd811..9c607a26b09 100644
--- a/libs/vault/tsconfig.json
+++ b/libs/vault/tsconfig.json
@@ -1,26 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "resolveJsonModule": true,
-    "paths": {
-      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/components": ["../components/src"],
-      "@bitwarden/importer-ui": ["../importer/src/components"],
-      "@bitwarden/generator-components": ["../tools/generator/components/src"],
-      "@bitwarden/generator-core": ["../tools/generator/core/src"],
-      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/vault": ["../vault/src"]
-    }
-  },
+  "extends": "../../tsconfig.base",
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/vault/tsconfig.spec.json b/libs/vault/tsconfig.spec.json
index de184bd7608..d52d889aa78 100644
--- a/libs/vault/tsconfig.spec.json
+++ b/libs/vault/tsconfig.spec.json
@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": true,
+    "emitDecoratorMetadata": false
+  },
   "files": ["./test.setup.ts"]
 }
diff --git a/nx.json b/nx.json
index 7da50182873..beef6c39168 100644
--- a/nx.json
+++ b/nx.json
@@ -1,10 +1,42 @@
 {
+  "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "cacheDirectory": ".nx/cache",
   "defaultBase": "main",
   "namedInputs": {
-    "default": ["{projectRoot}/**/*"],
-    "production": ["!{projectRoot}/**/*.spec.ts"]
+    "default": ["{projectRoot}/**/*", "sharedGlobals"],
+    "production": ["default", "!{projectRoot}/**/*.spec.ts", "!{projectRoot}/tsconfig.spec.json"],
+    "sharedGlobals": ["{workspaceRoot}/tsconfig.base.json", "{workspaceRoot}/package.json"]
   },
+  "plugins": [
+    {
+      "plugin": "@nx/js",
+      "options": {
+        "compiler": "tsc",
+        "configName": "tsconfig.lib.json",
+        "targetName": "build"
+      }
+    },
+    {
+      "plugin": "@nx/jest/plugin",
+      "options": {
+        "targetName": "test"
+      }
+    },
+    {
+      "plugin": "@nx/eslint/plugin",
+      "options": {
+        "targetName": "lint"
+      }
+    },
+    "@bitwarden/nx-plugin"
+  ],
   "parallel": 4,
-  "targetDefaults": {}
+  "targetDefaults": {
+    "build": {
+      "dependsOn": ["^build"],
+      "inputs": ["production", "^production"],
+      "outputs": ["{options.outputPath}"],
+      "cache": true
+    }
+  }
 }
diff --git a/package-lock.json b/package-lock.json
index 691705cc280..ea003e2b3f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,23 +15,27 @@
         "libs/**/*"
       ],
       "dependencies": {
-        "@angular/animations": "18.2.13",
-        "@angular/cdk": "18.2.14",
-        "@angular/common": "18.2.13",
-        "@angular/compiler": "18.2.13",
-        "@angular/core": "18.2.13",
-        "@angular/forms": "18.2.13",
-        "@angular/platform-browser": "18.2.13",
-        "@angular/platform-browser-dynamic": "18.2.13",
-        "@angular/router": "18.2.13",
-        "@bitwarden/sdk-internal": "0.2.0-main.177",
+        "@angular/animations": "19.2.14",
+        "@angular/cdk": "19.2.18",
+        "@angular/common": "19.2.14",
+        "@angular/compiler": "19.2.14",
+        "@angular/core": "19.2.14",
+        "@angular/forms": "19.2.14",
+        "@angular/platform-browser": "19.2.14",
+        "@angular/platform-browser-dynamic": "19.2.14",
+        "@angular/router": "19.2.14",
+        "@bitwarden/sdk-internal": "0.2.0-main.225",
         "@electron/fuses": "1.8.0",
         "@emotion/css": "11.13.5",
-        "@koa/multer": "3.1.0",
+        "@koa/multer": "4.0.0",
         "@koa/router": "13.1.0",
         "@microsoft/signalr": "8.0.7",
         "@microsoft/signalr-protocol-msgpack": "8.0.7",
-        "@ng-select/ng-select": "13.9.1",
+        "@ng-select/ng-select": "14.9.0",
+        "@nx/devkit": "21.1.2",
+        "@nx/eslint": "21.1.2",
+        "@nx/jest": "21.1.2",
+        "@nx/js": "21.1.2",
         "argon2": "0.41.1",
         "argon2-browser": "1.18.0",
         "big-integer": "1.6.52",
@@ -42,7 +46,7 @@
         "chalk": "4.1.2",
         "commander": "11.1.0",
         "core-js": "3.42.0",
-        "form-data": "4.0.1",
+        "form-data": "4.0.2",
         "https-proxy-agent": "7.0.6",
         "inquirer": "8.2.6",
         "jsdom": "26.1.0",
@@ -58,32 +62,34 @@
         "node-fetch": "2.6.12",
         "node-forge": "1.3.1",
         "oidc-client-ts": "2.4.1",
-        "open": "8.4.2",
+        "open": "10.1.2",
         "papaparse": "5.5.3",
         "patch-package": "8.0.0",
         "proper-lockfile": "4.1.2",
         "qrcode-parser": "2.1.3",
         "qrious": "4.0.2",
         "rxjs": "7.8.1",
+        "semver": "7.7.2",
         "tabbable": "6.2.0",
         "tldts": "7.0.1",
+        "ts-node": "10.9.2",
         "utf-8-validate": "6.0.5",
-        "zone.js": "0.14.10",
+        "zone.js": "0.15.1",
         "zxcvbn": "4.4.2"
       },
       "devDependencies": {
-        "@angular-devkit/build-angular": "18.2.19",
-        "@angular-eslint/schematics": "18.4.3",
-        "@angular/cli": "18.2.19",
-        "@angular/compiler-cli": "18.2.13",
+        "@angular-devkit/build-angular": "19.2.14",
+        "@angular-eslint/schematics": "19.6.0",
+        "@angular/cli": "19.2.14",
+        "@angular/compiler-cli": "19.2.14",
         "@babel/core": "7.24.9",
         "@babel/preset-env": "7.24.8",
         "@compodoc/compodoc": "1.1.26",
-        "@electron/notarize": "2.5.0",
+        "@electron/notarize": "3.0.1",
         "@electron/rebuild": "3.7.2",
         "@eslint/compat": "1.2.9",
         "@lit-labs/signals": "0.1.2",
-        "@ngtools/webpack": "18.2.19",
+        "@ngtools/webpack": "19.2.14",
         "@storybook/addon-a11y": "8.6.12",
         "@storybook/addon-actions": "8.6.12",
         "@storybook/addon-designs": "8.2.1",
@@ -100,7 +106,7 @@
         "@types/chrome": "0.0.306",
         "@types/firefox-webext-browser": "120.0.4",
         "@types/inquirer": "8.2.10",
-        "@types/jest": "29.5.12",
+        "@types/jest": "29.5.14",
         "@types/jsdom": "21.1.7",
         "@types/koa": "2.15.0",
         "@types/koa__multer": "2.0.7",
@@ -120,20 +126,20 @@
         "@typescript-eslint/utils": "8.31.0",
         "@webcomponents/custom-elements": "1.6.0",
         "@yao-pkg/pkg": "5.16.1",
-        "angular-eslint": "18.4.3",
+        "angular-eslint": "19.6.0",
         "autoprefixer": "10.4.21",
         "axe-playwright": "2.1.0",
         "babel-loader": "9.2.1",
         "base64-loader": "1.0.0",
         "browserslist": "4.23.2",
-        "chromatic": "11.28.2",
+        "chromatic": "13.1.2",
         "concurrently": "9.1.2",
         "copy-webpack-plugin": "13.0.0",
         "cross-env": "7.0.3",
         "css-loader": "7.1.2",
-        "electron": "34.0.0",
-        "electron-builder": "24.13.3",
-        "electron-log": "5.2.4",
+        "electron": "36.4.0",
+        "electron-builder": "26.0.12",
+        "electron-log": "5.4.0",
         "electron-reload": "2.0.0-alpha.1",
         "electron-store": "8.2.0",
         "electron-updater": "6.6.4",
@@ -152,11 +158,11 @@
         "jest-diff": "29.7.0",
         "jest-junit": "16.0.0",
         "jest-mock-extended": "3.0.7",
-        "jest-preset-angular": "14.1.1",
+        "jest-preset-angular": "14.6.0",
         "json5": "2.2.3",
         "lint-staged": "16.0.0",
         "mini-css-extract-plugin": "2.9.2",
-        "nx": "20.8.0",
+        "nx": "21.1.2",
         "postcss": "8.5.3",
         "postcss-loader": "8.1.1",
         "prettier": "3.5.3",
@@ -169,7 +175,7 @@
         "storybook": "8.6.12",
         "style-loader": "4.0.0",
         "tailwindcss": "3.4.17",
-        "ts-jest": "29.2.2",
+        "ts-jest": "29.3.4",
         "ts-loader": "9.5.2",
         "tsconfig-paths-webpack-plugin": "4.2.0",
         "type-fest": "2.19.0",
@@ -181,24 +187,24 @@
         "wait-on": "8.0.3",
         "webpack": "5.99.7",
         "webpack-cli": "6.0.1",
-        "webpack-dev-server": "5.2.0",
+        "webpack-dev-server": "5.2.1",
         "webpack-node-externals": "3.0.0"
       },
       "engines": {
-        "node": "~20",
+        "node": "~22",
         "npm": "~10"
       }
     },
     "apps/browser": {
       "name": "@bitwarden/browser",
-      "version": "2025.5.1"
+      "version": "2025.7.0"
     },
     "apps/cli": {
       "name": "@bitwarden/cli",
-      "version": "2025.5.0",
+      "version": "2025.7.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
-        "@koa/multer": "3.1.0",
+        "@koa/multer": "4.0.0",
         "@koa/router": "13.1.0",
         "argon2": "0.41.1",
         "big-integer": "1.6.52",
@@ -206,7 +212,7 @@
         "chalk": "4.1.2",
         "commander": "11.1.0",
         "core-js": "3.42.0",
-        "form-data": "4.0.1",
+        "form-data": "4.0.2",
         "https-proxy-agent": "7.0.6",
         "inquirer": "8.2.6",
         "jsdom": "26.1.0",
@@ -219,20 +225,70 @@
         "multer": "1.4.5-lts.2",
         "node-fetch": "2.6.12",
         "node-forge": "1.3.1",
-        "open": "8.4.2",
+        "open": "10.1.2",
         "papaparse": "5.5.3",
         "proper-lockfile": "4.1.2",
         "rxjs": "7.8.1",
+        "semver": "7.7.2",
         "tldts": "7.0.1",
         "zxcvbn": "4.4.2"
       },
       "bin": {
         "bw": "build/bw.js"
+      },
+      "engines": {
+        "node": "~20",
+        "npm": "~10"
+      }
+    },
+    "apps/cli/node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "apps/cli/node_modules/is-docker": {
+      "version": "2.2.1",
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "apps/cli/node_modules/is-wsl": {
+      "version": "2.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "apps/cli/node_modules/open": {
+      "version": "8.4.2",
+      "license": "MIT",
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2025.5.0",
+      "version": "2025.7.1",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },
@@ -246,7 +302,7 @@
     },
     "apps/web": {
       "name": "@bitwarden/web-vault",
-      "version": "2025.5.1"
+      "version": "2025.7.1"
     },
     "libs/admin-console": {
       "name": "@bitwarden/admin-console",
@@ -277,6 +333,11 @@
       "name": "@bitwarden/components",
       "version": "0.0.0"
     },
+    "libs/dirt/card": {
+      "name": "@bitwarden/dirt-card",
+      "version": "0.0.0",
+      "license": "GPL-3.0"
+    },
     "libs/importer": {
       "name": "@bitwarden/importer",
       "version": "0.0.0",
@@ -292,19 +353,34 @@
       "version": "0.0.0",
       "license": "GPL-3.0"
     },
+    "libs/logging": {
+      "name": "@bitwarden/logging",
+      "version": "0.0.1",
+      "license": "GPL-3.0"
+    },
     "libs/node": {
       "name": "@bitwarden/node",
       "version": "0.0.0",
       "license": "GPL-3.0"
     },
+    "libs/nx-plugin": {
+      "name": "@bitwarden/nx-plugin",
+      "version": "0.0.1",
+      "license": "GPL-3.0"
+    },
     "libs/platform": {
       "name": "@bitwarden/platform",
       "version": "0.0.0",
       "license": "GPL-3.0"
     },
-    "libs/tools/card": {
-      "name": "@bitwarden/tools-card",
-      "version": "0.0.0",
+    "libs/storage-core": {
+      "name": "@bitwarden/storage-core",
+      "version": "0.0.1",
+      "license": "GPL-3.0"
+    },
+    "libs/storage-test-utils": {
+      "name": "@bitwarden/storage-test-utils",
+      "version": "0.0.1",
       "license": "GPL-3.0"
     },
     "libs/tools/export/vault-export/vault-export-core": {
@@ -352,6 +428,11 @@
       "version": "0.0.0",
       "license": "GPL-3.0"
     },
+    "libs/user-core": {
+      "name": "@bitwarden/user-core",
+      "version": "0.0.0",
+      "license": "GPL-3.0"
+    },
     "libs/vault": {
       "name": "@bitwarden/vault",
       "version": "0.0.0",
@@ -388,7 +469,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
       "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
@@ -399,14 +479,13 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1902.13",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.13.tgz",
-      "integrity": "sha512-ZMj+PjK22Ph2U8usG6L7LqEfvWlbaOvmiWXSrEt9YiC9QJt6rsumCkOgUIsmHQtucm/lK+9CMtyYdwH2fYycjg==",
+      "version": "0.1902.15",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.15.tgz",
+      "integrity": "sha512-RbqhStc6ZoRv57ZqLB36VOkBkAdU3nNezCvIs0AJV5V4+vLPMrb0hpIB0sF+9yMlMjWsolnRsj0/Fil+zQG3bw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@angular-devkit/core": "19.2.13",
+        "@angular-devkit/core": "19.2.15",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -416,17 +495,17 @@
       }
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.19.tgz",
-      "integrity": "sha512-xwY7v+nGE7TXOc4pgY6u57bLzIPSHuecosYr3TiWHAl9iEcKHzkCCFKsLZyunohHmq/i1uA6g3cC6iwp2xNYyg==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-19.2.14.tgz",
+      "integrity": "sha512-0K8vZxXdkME31fd6/+WACug8j4eLlU7mxR2/XJvS+VQ+a7bqdEsVddZDkwdWE+Y3ccZXvD/aNLZSEuSKmVFsnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1802.19",
-        "@angular-devkit/build-webpack": "0.1802.19",
-        "@angular-devkit/core": "18.2.19",
-        "@angular/build": "18.2.19",
+        "@angular-devkit/architect": "0.1902.14",
+        "@angular-devkit/build-webpack": "0.1902.14",
+        "@angular-devkit/core": "19.2.14",
+        "@angular/build": "19.2.14",
         "@babel/core": "7.26.10",
         "@babel/generator": "7.26.10",
         "@babel/helper-annotate-as-pure": "7.25.9",
@@ -436,50 +515,45 @@
         "@babel/plugin-transform-runtime": "7.26.10",
         "@babel/preset-env": "7.26.9",
         "@babel/runtime": "7.26.10",
-        "@discoveryjs/json-ext": "0.6.1",
-        "@ngtools/webpack": "18.2.19",
+        "@discoveryjs/json-ext": "0.6.3",
+        "@ngtools/webpack": "19.2.14",
+        "@vitejs/plugin-basic-ssl": "1.2.0",
         "ansi-colors": "4.1.3",
         "autoprefixer": "10.4.20",
-        "babel-loader": "9.1.3",
+        "babel-loader": "9.2.1",
         "browserslist": "^4.21.5",
         "copy-webpack-plugin": "12.0.2",
-        "critters": "0.0.24",
         "css-loader": "7.1.2",
-        "esbuild-wasm": "0.23.0",
-        "fast-glob": "3.3.2",
+        "esbuild-wasm": "0.25.4",
+        "fast-glob": "3.3.3",
         "http-proxy-middleware": "3.0.5",
-        "https-proxy-agent": "7.0.5",
         "istanbul-lib-instrument": "6.0.3",
         "jsonc-parser": "3.3.1",
         "karma-source-map-support": "1.4.0",
-        "less": "4.2.0",
+        "less": "4.2.2",
         "less-loader": "12.2.0",
         "license-webpack-plugin": "4.0.2",
         "loader-utils": "3.3.1",
-        "magic-string": "0.30.11",
-        "mini-css-extract-plugin": "2.9.0",
-        "mrmime": "2.0.0",
+        "mini-css-extract-plugin": "2.9.2",
         "open": "10.1.0",
         "ora": "5.4.1",
-        "parse5-html-rewriting-stream": "7.0.0",
         "picomatch": "4.0.2",
-        "piscina": "4.6.1",
-        "postcss": "8.4.41",
+        "piscina": "4.8.0",
+        "postcss": "8.5.2",
         "postcss-loader": "8.1.1",
         "resolve-url-loader": "5.0.0",
         "rxjs": "7.8.1",
-        "sass": "1.77.6",
-        "sass-loader": "16.0.0",
-        "semver": "7.6.3",
+        "sass": "1.85.0",
+        "sass-loader": "16.0.5",
+        "semver": "7.7.1",
         "source-map-loader": "5.0.0",
         "source-map-support": "0.5.21",
-        "terser": "5.31.6",
+        "terser": "5.39.0",
         "tree-kill": "1.2.2",
-        "tslib": "2.6.3",
-        "watchpack": "2.4.1",
-        "webpack": "5.94.0",
+        "tslib": "2.8.1",
+        "webpack": "5.98.0",
         "webpack-dev-middleware": "7.4.2",
-        "webpack-dev-server": "5.0.4",
+        "webpack-dev-server": "5.2.0",
         "webpack-merge": "6.0.1",
         "webpack-subresource-integrity": "5.1.0"
       },
@@ -489,22 +563,23 @@
         "yarn": ">= 1.13.0"
       },
       "optionalDependencies": {
-        "esbuild": "0.23.0"
+        "esbuild": "0.25.4"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": "^18.0.0",
-        "@angular/localize": "^18.0.0",
-        "@angular/platform-server": "^18.0.0",
-        "@angular/service-worker": "^18.0.0",
-        "@web/test-runner": "^0.18.0",
+        "@angular/compiler-cli": "^19.0.0 || ^19.2.0-next.0",
+        "@angular/localize": "^19.0.0 || ^19.2.0-next.0",
+        "@angular/platform-server": "^19.0.0 || ^19.2.0-next.0",
+        "@angular/service-worker": "^19.0.0 || ^19.2.0-next.0",
+        "@angular/ssr": "^19.2.14",
+        "@web/test-runner": "^0.20.0",
         "browser-sync": "^3.0.2",
         "jest": "^29.5.0",
         "jest-environment-jsdom": "^29.5.0",
         "karma": "^6.3.0",
-        "ng-packagr": "^18.0.0",
+        "ng-packagr": "^19.0.0 || ^19.2.0-next.0",
         "protractor": "^7.0.0",
-        "tailwindcss": "^2.0.0 || ^3.0.0",
-        "typescript": ">=5.4 <5.6"
+        "tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0",
+        "typescript": ">=5.5 <5.9"
       },
       "peerDependenciesMeta": {
         "@angular/localize": {
@@ -516,6 +591,9 @@
         "@angular/service-worker": {
           "optional": true
         },
+        "@angular/ssr": {
+          "optional": true
+        },
         "@web/test-runner": {
           "optional": true
         },
@@ -543,13 +621,13 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
-      "version": "0.1802.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.19.tgz",
-      "integrity": "sha512-M4B1tzxGX1nWCZr9GMM8OO0yBJO2HFSdK8M8P74vEFQfKIeq3y16IQ5zlEveJrkCOFVtmlIy2C9foMCdNyBRMA==",
+      "version": "0.1902.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.14.tgz",
+      "integrity": "sha512-rgMkqOrxedzqLZ8w59T/0YrpWt7LDmGwt+ZhNHE7cn27jZ876yGC2Bhcn58YZh2+R03WEJ9q0ePblaBYz03SMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "18.2.19",
+        "@angular-devkit/core": "19.2.14",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -559,9 +637,9 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.19.tgz",
-      "integrity": "sha512-Ptf92Zomc6FCr7GWmHKdgOUbA1GpctZwH/hRcpYpU3tM56MG2t5FOFpufnE595GgolOCktabkFEoODMG8PBVDQ==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.14.tgz",
+      "integrity": "sha512-aaPEnRNIBoYT4XrrYcZlHadX8vFDTUR+4wUgcmr0cNDLeWzWtoPFeVq8TQD6kFDeqovSx/UVEblGgg/28WvHyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -578,7 +656,7 @@
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "chokidar": "^3.5.2"
+        "chokidar": "^4.0.0"
       },
       "peerDependenciesMeta": {
         "chokidar": {
@@ -627,22 +705,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
-      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/@babel/preset-env": {
       "version": "7.26.9",
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.9.tgz",
@@ -738,9 +800,9 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@types/express": {
-      "version": "4.17.22",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.22.tgz",
-      "integrity": "sha512-eZUmSnhRX9YRSkplpz0N+k6NljUUn5l3EWZIKZvYzhvMphEuNiyyy1viH/ejgt66JWgALwC/gtSUAeQKtSwW/w==",
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz",
+      "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -777,16 +839,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/autoprefixer": {
       "version": "10.4.20",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
@@ -825,24 +877,6 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/babel-loader": {
-      "version": "9.1.3",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
-      "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-cache-dir": "^4.0.0",
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0",
-        "webpack": ">=5"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/body-parser": {
       "version": "1.20.3",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
@@ -886,9 +920,9 @@
       "license": "MIT"
     },
     "node_modules/@angular-devkit/build-angular/node_modules/browserslist": {
-      "version": "4.24.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
-      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
+      "version": "4.25.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
+      "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
       "dev": true,
       "funding": [
         {
@@ -906,8 +940,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001716",
-        "electron-to-chromium": "^1.5.149",
+        "caniuse-lite": "^1.0.30001718",
+        "electron-to-chromium": "^1.5.160",
         "node-releases": "^2.0.19",
         "update-browserslist-db": "^1.1.3"
       },
@@ -918,44 +952,6 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/chokidar/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -1018,19 +1014,6 @@
         "webpack": "^5.1.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/define-lazy-prop": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
-      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -1165,41 +1148,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/https-proxy-agent": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -1213,13 +1161,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/immutable": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
-      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/ipaddr.js": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
@@ -1243,38 +1184,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/is-wsl": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
-      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-inside-container": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/jackspeak": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -1282,20 +1191,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -1352,27 +1247,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/mini-css-extract-plugin": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz",
-      "integrity": "sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "schema-utils": "^4.0.0",
-        "tapable": "^2.2.1"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -1402,23 +1276,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/path-scurry": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/path-to-regexp": {
       "version": "0.1.12",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
@@ -1427,9 +1284,9 @@
       "license": "MIT"
     },
     "node_modules/@angular-devkit/build-angular/node_modules/postcss": {
-      "version": "8.4.41",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
-      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
+      "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
       "dev": true,
       "funding": [
         {
@@ -1447,9 +1304,9 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
+        "nanoid": "^3.3.8",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -1513,31 +1370,15 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/rimraf": {
-      "version": "5.0.10",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
-      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^10.3.7"
-      },
-      "bin": {
-        "rimraf": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/sass": {
-      "version": "1.77.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
-      "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==",
+      "version": "1.85.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.85.0.tgz",
+      "integrity": "sha512-3ToiC1xZ1Y8aU7+CkgCI/tqyuPXEmYGJXO7H4uqp0xkLXUqp88rQQ4j1HmP37xSJLbCJPaIiv+cT1y+grssrww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
+        "chokidar": "^4.0.0",
+        "immutable": "^5.0.2",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -1545,12 +1386,15 @@
       },
       "engines": {
         "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/sass-loader": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.0.tgz",
-      "integrity": "sha512-n13Z+3rU9A177dk4888czcVFiC8CL9dii4qpXWUg3YIIgZEvi9TCFKjOQcbK0kJM7DJu9VucrZFddvNfYCPwtw==",
+      "version": "16.0.5",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.5.tgz",
+      "integrity": "sha512-oL+CMBXrj6BZ/zOq4os+UECPL+bWqt6OAC6DWS8Ln8GZRcMDjlJ4JC3FBDuHJdYaFWIdKNIBYmtZtK2MaMkNIw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1588,6 +1432,19 @@
         }
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/send": {
       "version": "0.19.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
@@ -1656,6 +1513,16 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -1671,19 +1538,19 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
-      "version": "5.94.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
-      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+      "version": "5.98.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
+      "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "^1.0.5",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
         "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
@@ -1695,9 +1562,9 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.2.0",
+        "schema-utils": "^4.3.0",
         "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.10",
+        "terser-webpack-plugin": "^5.3.11",
         "watchpack": "^2.4.1",
         "webpack-sources": "^3.2.3"
       },
@@ -1718,9 +1585,9 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz",
-      "integrity": "sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.0.tgz",
+      "integrity": "sha512-90SqqYXA2SK36KcT6o1bvwvZfJFcmoamqeJY7+boioffX9g9C0wjjJRGUrQIuh43pb0ttX7+ssavmj/WN2RHtA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1737,23 +1604,20 @@
         "colorette": "^2.0.10",
         "compression": "^1.7.4",
         "connect-history-api-fallback": "^2.0.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
+        "express": "^4.21.2",
         "graceful-fs": "^4.2.6",
-        "html-entities": "^2.4.0",
-        "http-proxy-middleware": "^2.0.3",
+        "http-proxy-middleware": "^2.0.7",
         "ipaddr.js": "^2.1.0",
         "launch-editor": "^2.6.1",
         "open": "^10.0.3",
         "p-retry": "^6.2.0",
-        "rimraf": "^5.0.5",
         "schema-utils": "^4.2.0",
         "selfsigned": "^2.4.1",
         "serve-index": "^1.9.1",
         "sockjs": "^0.3.24",
         "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^7.1.0",
-        "ws": "^8.16.0"
+        "webpack-dev-middleware": "^7.4.2",
+        "ws": "^8.18.0"
       },
       "bin": {
         "webpack-dev-server": "bin/webpack-dev-server.js"
@@ -1777,6 +1641,44 @@
         }
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server/node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server/node_modules/http-proxy-middleware": {
       "version": "2.0.9",
       "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
@@ -1802,60 +1704,14 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/webpack/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/webpack/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1802.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.19.tgz",
-      "integrity": "sha512-axz1Sasn+c+GJpJexBL+B3Rh1w3wJrQq8k8gkniodjJ594p4ti2qGk7i9Tj8A4cXx5fGY+EpuZvKfI/9Tr7QwA==",
+      "version": "0.1902.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1902.14.tgz",
+      "integrity": "sha512-XDNB8Nlau/v59Ukd6UgBRBRnTnUmC244832SECmMxXHs1ljJMWGlI1img2xPErGd8426rUA9Iws4RkQiqbsybQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/architect": "0.1802.19",
+        "@angular-devkit/architect": "0.1902.14",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -1869,13 +1725,13 @@
       }
     },
     "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": {
-      "version": "0.1802.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.19.tgz",
-      "integrity": "sha512-M4B1tzxGX1nWCZr9GMM8OO0yBJO2HFSdK8M8P74vEFQfKIeq3y16IQ5zlEveJrkCOFVtmlIy2C9foMCdNyBRMA==",
+      "version": "0.1902.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.14.tgz",
+      "integrity": "sha512-rgMkqOrxedzqLZ8w59T/0YrpWt7LDmGwt+ZhNHE7cn27jZ876yGC2Bhcn58YZh2+R03WEJ9q0ePblaBYz03SMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "18.2.19",
+        "@angular-devkit/core": "19.2.14",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -1885,9 +1741,9 @@
       }
     },
     "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.19.tgz",
-      "integrity": "sha512-Ptf92Zomc6FCr7GWmHKdgOUbA1GpctZwH/hRcpYpU3tM56MG2t5FOFpufnE595GgolOCktabkFEoODMG8PBVDQ==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.14.tgz",
+      "integrity": "sha512-aaPEnRNIBoYT4XrrYcZlHadX8vFDTUR+4wUgcmr0cNDLeWzWtoPFeVq8TQD6kFDeqovSx/UVEblGgg/28WvHyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1904,7 +1760,7 @@
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "chokidar": "^3.5.2"
+        "chokidar": "^4.0.0"
       },
       "peerDependenciesMeta": {
         "chokidar": {
@@ -1912,85 +1768,12 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-webpack/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack/node_modules/readdirp/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/@angular-devkit/core": {
-      "version": "19.2.13",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.13.tgz",
-      "integrity": "sha512-iq73hE5Uvms1w3uMUSk4i4NDXDMQ863VAifX8LOTadhG6U0xISjNJ11763egVCxQmaKmg7zbG4rda88wHJATzA==",
+      "version": "19.2.15",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.15.tgz",
+      "integrity": "sha512-pU2RZYX6vhd7uLSdLwPnuBcr0mXJSjp3EgOXKsrlQFQZevc+Qs+2JdXgIElnOT/aDqtRtriDmLlSbtdE8n3ZbA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ajv": "8.17.1",
         "ajv-formats": "3.0.1",
@@ -2014,15 +1797,15 @@
       }
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.19.tgz",
-      "integrity": "sha512-P/0KjkzOf2ZShuShx3cBbjLI7XlcS6B/yCRBo1MQfCC4cZfmzPQoUEOSQeYZgy5pnC24f+dKh/+TWc5uYL/Lvg==",
+      "version": "19.2.15",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.2.15.tgz",
+      "integrity": "sha512-kNOJ+3vekJJCQKWihNmxBkarJzNW09kP5a9E1SRNiQVNOUEeSwcRR0qYotM65nx821gNzjjhJXnAZ8OazWldrg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "18.2.19",
+        "@angular-devkit/core": "19.2.15",
         "jsonc-parser": "3.3.1",
-        "magic-string": "0.30.11",
+        "magic-string": "0.30.17",
         "ora": "5.4.1",
         "rxjs": "7.8.1"
       },
@@ -2032,253 +1815,37 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.19.tgz",
-      "integrity": "sha512-Ptf92Zomc6FCr7GWmHKdgOUbA1GpctZwH/hRcpYpU3tM56MG2t5FOFpufnE595GgolOCktabkFEoODMG8PBVDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "8.17.1",
-        "ajv-formats": "3.0.1",
-        "jsonc-parser": "3.3.1",
-        "picomatch": "4.0.2",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/readdirp/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/@angular-eslint/builder": {
-      "version": "18.4.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.4.3.tgz",
-      "integrity": "sha512-NzmrXlr7GFE+cjwipY/CxBscZXNqnuK0us1mO6Z2T6MeH6m+rRcdlY/rZyKoRniyNNvuzl6vpEsfMIMmnfebrA==",
+      "version": "19.6.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-19.6.0.tgz",
+      "integrity": "sha512-hUdYS1mSB09b5ABi2tuWeMTVprYHW+x6KmeAFJfXC6aMOa4NYQBdetIjOLwr7qUDlq1S/+2+HiX/FO76FPHClw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/architect": ">= 0.1800.0 < 0.1900.0",
-        "@angular-devkit/core": ">= 18.0.0 < 19.0.0"
+        "@angular-devkit/architect": ">= 0.1900.0 < 0.2000.0",
+        "@angular-devkit/core": ">= 19.0.0 < 20.0.0"
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
-    "node_modules/@angular-eslint/builder/node_modules/@angular-devkit/architect": {
-      "version": "0.1802.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.19.tgz",
-      "integrity": "sha512-M4B1tzxGX1nWCZr9GMM8OO0yBJO2HFSdK8M8P74vEFQfKIeq3y16IQ5zlEveJrkCOFVtmlIy2C9foMCdNyBRMA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@angular-devkit/core": "18.2.19",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-eslint/builder/node_modules/@angular-devkit/core": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.19.tgz",
-      "integrity": "sha512-Ptf92Zomc6FCr7GWmHKdgOUbA1GpctZwH/hRcpYpU3tM56MG2t5FOFpufnE595GgolOCktabkFEoODMG8PBVDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "8.17.1",
-        "ajv-formats": "3.0.1",
-        "jsonc-parser": "3.3.1",
-        "picomatch": "4.0.2",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/builder/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/@angular-eslint/builder/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@angular-eslint/builder/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/@angular-eslint/builder/node_modules/readdirp/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/@angular-eslint/bundled-angular-compiler": {
-      "version": "18.4.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.4.3.tgz",
-      "integrity": "sha512-zdrA8mR98X+U4YgHzUKmivRU+PxzwOL/j8G7eTOvBuq8GPzsP+hvak+tyxlgeGm9HsvpFj9ERHLtJ0xDUPs8fg==",
+      "version": "19.6.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-19.6.0.tgz",
+      "integrity": "sha512-ro+seaTAg5GvtJ72uWEEnP9J5mT0vtgdqH6YMrmMt4pZbSZxvkLfLjZGkXo/HjVDVcCjPnmZeMwKN+uoEc27Jg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@angular-eslint/eslint-plugin": {
-      "version": "18.4.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.4.3.tgz",
-      "integrity": "sha512-AyJbupiwTBR81P6T59v+aULEnPpZBCBxL2S5QFWfAhNCwWhcof4GihvdK2Z87yhvzDGeAzUFSWl/beJfeFa+PA==",
+      "version": "19.6.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-19.6.0.tgz",
+      "integrity": "sha512-IOMfFi/rPNrPwxZwIGTqWw0C5pC2Facwg3llmJoQFq8w2sUE0nNBL5uSQv5dT8s6ucum4g+RFNYHNe20SEOvRw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "18.4.3",
-        "@angular-eslint/utils": "18.4.3"
+        "@angular-eslint/bundled-angular-compiler": "19.6.0",
+        "@angular-eslint/utils": "19.6.0"
       },
       "peerDependencies": {
         "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
@@ -2287,14 +1854,14 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin-template": {
-      "version": "18.4.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.4.3.tgz",
-      "integrity": "sha512-ijGlX2N01ayMXTpeQivOA31AszO8OEbu9ZQUCxnu9AyMMhxyi2q50bujRChAvN9YXQfdQtbxuajxV6+aiWb5BQ==",
+      "version": "19.6.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-19.6.0.tgz",
+      "integrity": "sha512-SDGbNSCUuPmqVesy5SvRE2MV7AKvvA/bVJwL9Fz5KYCHYxJz1rrJ8FknjWAfmg0qO2TMs1ZI9hov8JL+Bc4BBw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "18.4.3",
-        "@angular-eslint/utils": "18.4.3",
+        "@angular-eslint/bundled-angular-compiler": "19.6.0",
+        "@angular-eslint/utils": "19.6.0",
         "aria-query": "5.3.2",
         "axobject-query": "4.1.0"
       },
@@ -2306,129 +1873,29 @@
       }
     },
     "node_modules/@angular-eslint/schematics": {
-      "version": "18.4.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.4.3.tgz",
-      "integrity": "sha512-D5maKn5e6n58+8n7jLFLD4g+RGPOPeDSsvPc1sqial5tEKLxAJQJS9WZ28oef3bhkob6C60D+1H0mMmEEVvyVA==",
+      "version": "19.6.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-19.6.0.tgz",
+      "integrity": "sha512-lJzwHju7bhJ3p+SZnY0JVwGjxF2q68gUdOYhdU62pglfYkS5lm+A5LM/VznRvdpZOH69vvZ9gizQ8W1P525cdw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": ">= 18.0.0 < 19.0.0",
-        "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0",
-        "@angular-eslint/eslint-plugin": "18.4.3",
-        "@angular-eslint/eslint-plugin-template": "18.4.3",
-        "ignore": "6.0.2",
-        "semver": "7.6.3",
+        "@angular-devkit/core": ">= 19.0.0 < 20.0.0",
+        "@angular-devkit/schematics": ">= 19.0.0 < 20.0.0",
+        "@angular-eslint/eslint-plugin": "19.6.0",
+        "@angular-eslint/eslint-plugin-template": "19.6.0",
+        "ignore": "7.0.4",
+        "semver": "7.7.2",
         "strip-json-comments": "3.1.1"
       }
     },
-    "node_modules/@angular-eslint/schematics/node_modules/@angular-devkit/core": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.19.tgz",
-      "integrity": "sha512-Ptf92Zomc6FCr7GWmHKdgOUbA1GpctZwH/hRcpYpU3tM56MG2t5FOFpufnE595GgolOCktabkFEoODMG8PBVDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "8.17.1",
-        "ajv-formats": "3.0.1",
-        "jsonc-parser": "3.3.1",
-        "picomatch": "4.0.2",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/schematics/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/@angular-eslint/schematics/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@angular-eslint/schematics/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/@angular-eslint/schematics/node_modules/readdirp/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/@angular-eslint/template-parser": {
-      "version": "18.4.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.4.3.tgz",
-      "integrity": "sha512-JZMPtEB8yNip3kg4WDEWQyObSo2Hwf+opq2ElYuwe85GQkGhfJSJ2CQYo4FSwd+c5MUQAqESNRg9QqGYauDsiw==",
+      "version": "19.6.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-19.6.0.tgz",
+      "integrity": "sha512-NGxXUZkI5lXjoKnmL51C8DoJx8AjwF9sonieC2EVxgXycK2MYAamFWYGHMiVemzFsg1nIv+JvhHITgjSjyC3HQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "18.4.3",
+        "@angular-eslint/bundled-angular-compiler": "19.6.0",
         "eslint-scope": "^8.0.2"
       },
       "peerDependencies": {
@@ -2437,13 +1904,13 @@
       }
     },
     "node_modules/@angular-eslint/utils": {
-      "version": "18.4.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.4.3.tgz",
-      "integrity": "sha512-w0bJ9+ELAEiPBSTPPm9bvDngfu1d8JbzUhvs2vU+z7sIz/HMwUZT5S4naypj2kNN0gZYGYrW0lt+HIbW87zTAQ==",
+      "version": "19.6.0",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-19.6.0.tgz",
+      "integrity": "sha512-ygtsmRKHNqrzG2mpUj1XwLNRoG+ikYkizsOuq5xPRM8o6dCw03H5eel4s7hnXT4c09WbpnoaVNi9O3xFLIETJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "18.4.3"
+        "@angular-eslint/bundled-angular-compiler": "19.6.0"
       },
       "peerDependencies": {
         "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
@@ -2452,9 +1919,9 @@
       }
     },
     "node_modules/@angular/animations": {
-      "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.13.tgz",
-      "integrity": "sha512-rG5J5Ek5Hg+Tz2NjkNOaG6PupiNK/lPfophXpsR1t/nWujqnMWX2krahD/i6kgD+jNWNKCJCYSOVvCx/BHOtKA==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-19.2.14.tgz",
+      "integrity": "sha512-xhl8fLto5HHJdVj8Nb6EoBEiTAcXuWDYn1q5uHcGxyVH3kiwENWy/2OQXgCr2CuWo2e6hNUGzSLf/cjbsMNqEA==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -2463,56 +1930,65 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "18.2.13"
+        "@angular/common": "19.2.14",
+        "@angular/core": "19.2.14"
       }
     },
     "node_modules/@angular/build": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.19.tgz",
-      "integrity": "sha512-dTqR+mhcZWtCRyOafvzHNVpYxMQnt8HHHqNM0kyEMzcztXL2L9zDlKr0H9d+AgGGq/v4qwCh+1gFDxsHByZwMQ==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/build/-/build-19.2.14.tgz",
+      "integrity": "sha512-PAUR8vZpGKXy0Vc5gpJkigOthoj5YeGDpeykl/yLi6sx6yAIlXcE0MD+LGehKeqFSBL56rEpn9n710lI7eTJwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1802.19",
-        "@babel/core": "7.25.2",
-        "@babel/helper-annotate-as-pure": "7.24.7",
+        "@angular-devkit/architect": "0.1902.14",
+        "@babel/core": "7.26.10",
+        "@babel/helper-annotate-as-pure": "7.25.9",
         "@babel/helper-split-export-declaration": "7.24.7",
-        "@babel/plugin-syntax-import-attributes": "7.24.7",
-        "@inquirer/confirm": "3.1.22",
-        "@vitejs/plugin-basic-ssl": "1.1.0",
+        "@babel/plugin-syntax-import-attributes": "7.26.0",
+        "@inquirer/confirm": "5.1.6",
+        "@vitejs/plugin-basic-ssl": "1.2.0",
+        "beasties": "0.3.2",
         "browserslist": "^4.23.0",
-        "critters": "0.0.24",
-        "esbuild": "0.23.0",
-        "fast-glob": "3.3.2",
-        "https-proxy-agent": "7.0.5",
-        "listr2": "8.2.4",
-        "lmdb": "3.0.13",
-        "magic-string": "0.30.11",
-        "mrmime": "2.0.0",
+        "esbuild": "0.25.4",
+        "fast-glob": "3.3.3",
+        "https-proxy-agent": "7.0.6",
+        "istanbul-lib-instrument": "6.0.3",
+        "listr2": "8.2.5",
+        "magic-string": "0.30.17",
+        "mrmime": "2.0.1",
         "parse5-html-rewriting-stream": "7.0.0",
         "picomatch": "4.0.2",
-        "piscina": "4.6.1",
-        "rollup": "4.22.4",
-        "sass": "1.77.6",
-        "semver": "7.6.3",
-        "vite": "~5.4.17",
-        "watchpack": "2.4.1"
+        "piscina": "4.8.0",
+        "rollup": "4.34.8",
+        "sass": "1.85.0",
+        "semver": "7.7.1",
+        "source-map-support": "0.5.21",
+        "vite": "6.2.7",
+        "watchpack": "2.4.2"
       },
       "engines": {
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       },
+      "optionalDependencies": {
+        "lmdb": "3.2.6"
+      },
       "peerDependencies": {
-        "@angular/compiler-cli": "^18.0.0",
-        "@angular/localize": "^18.0.0",
-        "@angular/platform-server": "^18.0.0",
-        "@angular/service-worker": "^18.0.0",
+        "@angular/compiler": "^19.0.0 || ^19.2.0-next.0",
+        "@angular/compiler-cli": "^19.0.0 || ^19.2.0-next.0",
+        "@angular/localize": "^19.0.0 || ^19.2.0-next.0",
+        "@angular/platform-server": "^19.0.0 || ^19.2.0-next.0",
+        "@angular/service-worker": "^19.0.0 || ^19.2.0-next.0",
+        "@angular/ssr": "^19.2.14",
+        "karma": "^6.4.0",
         "less": "^4.2.0",
+        "ng-packagr": "^19.0.0 || ^19.2.0-next.0",
         "postcss": "^8.4.0",
-        "tailwindcss": "^2.0.0 || ^3.0.0",
-        "typescript": ">=5.4 <5.6"
+        "tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0",
+        "typescript": ">=5.5 <5.9"
       },
       "peerDependenciesMeta": {
         "@angular/localize": {
@@ -2524,9 +2000,18 @@
         "@angular/service-worker": {
           "optional": true
         },
+        "@angular/ssr": {
+          "optional": true
+        },
+        "karma": {
+          "optional": true
+        },
         "less": {
           "optional": true
         },
+        "ng-packagr": {
+          "optional": true
+        },
         "postcss": {
           "optional": true
         },
@@ -2536,13 +2021,13 @@
       }
     },
     "node_modules/@angular/build/node_modules/@angular-devkit/architect": {
-      "version": "0.1802.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.19.tgz",
-      "integrity": "sha512-M4B1tzxGX1nWCZr9GMM8OO0yBJO2HFSdK8M8P74vEFQfKIeq3y16IQ5zlEveJrkCOFVtmlIy2C9foMCdNyBRMA==",
+      "version": "0.1902.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.14.tgz",
+      "integrity": "sha512-rgMkqOrxedzqLZ8w59T/0YrpWt7LDmGwt+ZhNHE7cn27jZ876yGC2Bhcn58YZh2+R03WEJ9q0ePblaBYz03SMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "18.2.19",
+        "@angular-devkit/core": "19.2.14",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -2552,9 +2037,9 @@
       }
     },
     "node_modules/@angular/build/node_modules/@angular-devkit/core": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.19.tgz",
-      "integrity": "sha512-Ptf92Zomc6FCr7GWmHKdgOUbA1GpctZwH/hRcpYpU3tM56MG2t5FOFpufnE595GgolOCktabkFEoODMG8PBVDQ==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.14.tgz",
+      "integrity": "sha512-aaPEnRNIBoYT4XrrYcZlHadX8vFDTUR+4wUgcmr0cNDLeWzWtoPFeVq8TQD6kFDeqovSx/UVEblGgg/28WvHyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2571,7 +2056,7 @@
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "chokidar": "^3.5.2"
+        "chokidar": "^4.0.0"
       },
       "peerDependenciesMeta": {
         "chokidar": {
@@ -2580,22 +2065,22 @@
       }
     },
     "node_modules/@angular/build/node_modules/@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz",
+      "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.10",
+        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.10",
+        "@babel/parser": "^7.26.10",
+        "@babel/template": "^7.26.9",
+        "@babel/traverse": "^7.26.10",
+        "@babel/types": "^7.26.10",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -2620,54 +2105,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@angular/build/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@angular/build/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@angular/build/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/@angular/build/node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
@@ -2675,75 +2112,15 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@angular/build/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@angular/build/node_modules/https-proxy-agent": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@angular/build/node_modules/immutable": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
-      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@angular/build/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/@angular/build/node_modules/readdirp/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/@angular/build/node_modules/sass": {
-      "version": "1.77.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
-      "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==",
+      "version": "1.85.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.85.0.tgz",
+      "integrity": "sha512-3ToiC1xZ1Y8aU7+CkgCI/tqyuPXEmYGJXO7H4uqp0xkLXUqp88rQQ4j1HmP37xSJLbCJPaIiv+cT1y+grssrww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
+        "chokidar": "^4.0.0",
+        "immutable": "^5.0.2",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -2751,47 +2128,133 @@
       },
       "engines": {
         "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
+      }
+    },
+    "node_modules/@angular/build/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@angular/build/node_modules/vite": {
+      "version": "6.2.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.7.tgz",
+      "integrity": "sha512-qg3LkeuinTrZoJHHF94coSaTfIPyBYoywp+ys4qu20oSJFbKMYoIJo0FWJT9q6Vp49l6z9IsJRbHdcGtiKbGoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.25.0",
+        "postcss": "^8.5.3",
+        "rollup": "^4.30.1"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "jiti": ">=1.21.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.16.0",
+        "tsx": "^4.8.1",
+        "yaml": "^2.4.2"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "jiti": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
+        }
       }
     },
     "node_modules/@angular/cdk": {
-      "version": "18.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.14.tgz",
-      "integrity": "sha512-vDyOh1lwjfVk9OqoroZAP8pf3xxKUvyl+TVR8nJxL4c5fOfUFkD7l94HaanqKSRwJcI2xiztuu92IVoHn8T33Q==",
+      "version": "19.2.18",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-19.2.18.tgz",
+      "integrity": "sha512-aGMHOYK/VV9PhxGTUDwiu/4ozoR/RKz8cimI+QjRxEBhzn4EPqjUDSganvlhmgS7cTN3+aqozdvF/GopMRJjLg==",
       "license": "MIT",
       "dependencies": {
+        "parse5": "^7.1.2",
         "tslib": "^2.3.0"
       },
-      "optionalDependencies": {
-        "parse5": "^7.1.2"
-      },
       "peerDependencies": {
-        "@angular/common": "^18.0.0 || ^19.0.0",
-        "@angular/core": "^18.0.0 || ^19.0.0",
+        "@angular/common": "^19.0.0 || ^20.0.0",
+        "@angular/core": "^19.0.0 || ^20.0.0",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/cli": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.19.tgz",
-      "integrity": "sha512-LGVMTc36JQuw8QX8Sclxyei306EQW3KslopXbf7cfqt6D5/fHS+FqqA0O7V8ob/vOGMca+l6hQD27nW5Y3W6pA==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-19.2.14.tgz",
+      "integrity": "sha512-jZvNHAwmyhgUqSIs6OW8YH1rX9XKytm4zPxJol1Xk56F8yAhnrUtukcOi3b7Dv19Z+9eXkwV/Db+2dGjWIE0DA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/architect": "0.1802.19",
-        "@angular-devkit/core": "18.2.19",
-        "@angular-devkit/schematics": "18.2.19",
-        "@inquirer/prompts": "5.3.8",
-        "@listr2/prompt-adapter-inquirer": "2.0.15",
-        "@schematics/angular": "18.2.19",
+        "@angular-devkit/architect": "0.1902.14",
+        "@angular-devkit/core": "19.2.14",
+        "@angular-devkit/schematics": "19.2.14",
+        "@inquirer/prompts": "7.3.2",
+        "@listr2/prompt-adapter-inquirer": "2.0.18",
+        "@schematics/angular": "19.2.14",
         "@yarnpkg/lockfile": "1.1.0",
-        "ini": "4.1.3",
+        "ini": "5.0.0",
         "jsonc-parser": "3.3.1",
-        "listr2": "8.2.4",
-        "npm-package-arg": "11.0.3",
-        "npm-pick-manifest": "9.1.0",
-        "pacote": "18.0.6",
-        "resolve": "1.22.8",
-        "semver": "7.6.3",
+        "listr2": "8.2.5",
+        "npm-package-arg": "12.0.2",
+        "npm-pick-manifest": "10.0.0",
+        "pacote": "20.0.0",
+        "resolve": "1.22.10",
+        "semver": "7.7.1",
         "symbol-observable": "4.0.0",
         "yargs": "17.7.2"
       },
@@ -2805,13 +2268,13 @@
       }
     },
     "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
-      "version": "0.1802.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.19.tgz",
-      "integrity": "sha512-M4B1tzxGX1nWCZr9GMM8OO0yBJO2HFSdK8M8P74vEFQfKIeq3y16IQ5zlEveJrkCOFVtmlIy2C9foMCdNyBRMA==",
+      "version": "0.1902.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.14.tgz",
+      "integrity": "sha512-rgMkqOrxedzqLZ8w59T/0YrpWt7LDmGwt+ZhNHE7cn27jZ876yGC2Bhcn58YZh2+R03WEJ9q0ePblaBYz03SMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "18.2.19",
+        "@angular-devkit/core": "19.2.14",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -2821,9 +2284,9 @@
       }
     },
     "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.19.tgz",
-      "integrity": "sha512-Ptf92Zomc6FCr7GWmHKdgOUbA1GpctZwH/hRcpYpU3tM56MG2t5FOFpufnE595GgolOCktabkFEoODMG8PBVDQ==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.14.tgz",
+      "integrity": "sha512-aaPEnRNIBoYT4XrrYcZlHadX8vFDTUR+4wUgcmr0cNDLeWzWtoPFeVq8TQD6kFDeqovSx/UVEblGgg/28WvHyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2840,7 +2303,7 @@
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "chokidar": "^3.5.2"
+        "chokidar": "^4.0.0"
       },
       "peerDependenciesMeta": {
         "chokidar": {
@@ -2848,82 +2311,42 @@
         }
       }
     },
-    "node_modules/@angular/cli/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+    "node_modules/@angular/cli/node_modules/@angular-devkit/schematics": {
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.2.14.tgz",
+      "integrity": "sha512-s89/MWXHy8+GP/cRfFbSECIG3FQQQwNVv44OOmghPVgKQgQ+EoE/zygL2hqKYTUPoPaS/IhNXdXjSE5pS9yLeg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
+        "@angular-devkit/core": "19.2.14",
+        "jsonc-parser": "3.3.1",
+        "magic-string": "0.30.17",
+        "ora": "5.4.1",
+        "rxjs": "7.8.1"
       },
       "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "node_modules/@angular/cli/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
       "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/readdirp/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+        "node": ">=10"
       }
     },
     "node_modules/@angular/common": {
-      "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.13.tgz",
-      "integrity": "sha512-4ZqrNp1PoZo7VNvW+sbSc2CB2axP1sCH2wXl8B0wdjsj8JY1hF1OhuugwhpAHtGxqewed2kCXayE+ZJqSTV4jw==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.2.14.tgz",
+      "integrity": "sha512-NcNklcuyqaTjOVGf7aru8APX9mjsnZ01gFZrn47BxHozhaR0EMRrotYQTdi8YdVjPkeYFYanVntSLfhyobq/jg==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -2932,38 +2355,30 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "18.2.13",
+        "@angular/core": "19.2.14",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.13.tgz",
-      "integrity": "sha512-TzWcrkopyjFF+WeDr2cRe8CcHjU72KfYV3Sm2TkBkcXrkYX5sDjGWrBGrG3hRB4e4okqchrOCvm1MiTdy2vKMA==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-19.2.14.tgz",
+      "integrity": "sha512-ZqJDYOdhgKpVGNq3+n/Gbxma8DVYElDsoRe0tvNtjkWBVdaOxdZZUqmJ3kdCBsqD/aqTRvRBu0KGo9s2fCChkA==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "18.2.13"
-      },
-      "peerDependenciesMeta": {
-        "@angular/core": {
-          "optional": true
-        }
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.13.tgz",
-      "integrity": "sha512-DBSh4AQwkiJDSiVvJATRmjxf6wyUs9pwQLgaFdSlfuTRO+sdb0J2z1r3BYm8t0IqdoyXzdZq2YCH43EmyvD71g==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-19.2.14.tgz",
+      "integrity": "sha512-e9/h86ETjoIK2yTLE9aUeMCKujdg/du2pq7run/aINjop4RtnNOw+ZlSTUa6R65lP5CVwDup1kPytpAoifw8cA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "7.25.2",
+        "@babel/core": "7.26.9",
         "@jridgewell/sourcemap-codec": "^1.4.14",
         "chokidar": "^4.0.0",
         "convert-source-map": "^1.5.1",
@@ -2981,27 +2396,27 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "18.2.13",
-        "typescript": ">=5.4 <5.6"
+        "@angular/compiler": "19.2.14",
+        "typescript": ">=5.5 <5.9"
       }
     },
     "node_modules/@angular/compiler-cli/node_modules/@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz",
+      "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.9",
+        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.9",
+        "@babel/parser": "^7.26.9",
+        "@babel/template": "^7.26.9",
+        "@babel/traverse": "^7.26.9",
+        "@babel/types": "^7.26.9",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -3034,9 +2449,9 @@
       }
     },
     "node_modules/@angular/core": {
-      "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.13.tgz",
-      "integrity": "sha512-8mbWHMgO95OuFV1Ejy4oKmbe9NOJ3WazQf/f7wks8Bck7pcihd0IKhlPBNjFllbF5o+04EYSwFhEtvEgjMDClA==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-19.2.14.tgz",
+      "integrity": "sha512-EVErpW9tGqJ/wNcAN3G/ErH8pHCJ8mM1E6bsJ8UJIpDTZkpqqYjBMtZS9YWH5n3KwUd1tAkAB2w8FK125AjDUQ==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -3046,13 +2461,13 @@
       },
       "peerDependencies": {
         "rxjs": "^6.5.3 || ^7.4.0",
-        "zone.js": "~0.14.10"
+        "zone.js": "~0.15.0"
       }
     },
     "node_modules/@angular/forms": {
-      "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.13.tgz",
-      "integrity": "sha512-A67D867fu3DSBhdLWWZl/F5pr7v2+dRM2u3U7ZJ0ewh4a+sv+0yqWdJW+a8xIoiHxS+btGEJL2qAKJiH+MCFfg==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-19.2.14.tgz",
+      "integrity": "sha512-hWtDOj2B0AuRTf+nkMJeodnFpDpmEK9OIhIv1YxcRe73ooaxrIdjgugkElO8I9Tj0E4/7m117ezhWDUkbqm1zA==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -3061,16 +2476,16 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.13",
-        "@angular/core": "18.2.13",
-        "@angular/platform-browser": "18.2.13",
+        "@angular/common": "19.2.14",
+        "@angular/core": "19.2.14",
+        "@angular/platform-browser": "19.2.14",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/platform-browser": {
-      "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.13.tgz",
-      "integrity": "sha512-tu7ZzY6qD3ATdWFzcTcsAKe7M6cJeWbT/4/bF9unyGO3XBPcNYDKoiz10+7ap2PUd0fmPwvuvTvSNJiFEBnB8Q==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-19.2.14.tgz",
+      "integrity": "sha512-hzkT5nmA64oVBQl6PRjdL4dIFT1n7lfM9rm5cAoS+6LUUKRgiE2d421Kpn/Hz3jaCJfo+calMIdtSMIfUJBmww==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -3079,9 +2494,9 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/animations": "18.2.13",
-        "@angular/common": "18.2.13",
-        "@angular/core": "18.2.13"
+        "@angular/animations": "19.2.14",
+        "@angular/common": "19.2.14",
+        "@angular/core": "19.2.14"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -3090,9 +2505,9 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.13.tgz",
-      "integrity": "sha512-kbQCf9+8EpuJC7buBxhSiwBtXvjAwAKh6MznD6zd2pyCYqfY6gfRCZQRtK59IfgVtKmEONWI9grEyNIRoTmqJg==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-19.2.14.tgz",
+      "integrity": "sha512-Hfz0z1KDQmIdnFXVFCwCPykuIsHPkr1uW2aY396eARwZ6PK8i0Aadcm1ZOnpd3MR1bMyDrJo30VRS5kx89QWvA==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -3101,16 +2516,16 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.13",
-        "@angular/compiler": "18.2.13",
-        "@angular/core": "18.2.13",
-        "@angular/platform-browser": "18.2.13"
+        "@angular/common": "19.2.14",
+        "@angular/compiler": "19.2.14",
+        "@angular/core": "19.2.14",
+        "@angular/platform-browser": "19.2.14"
       }
     },
     "node_modules/@angular/router": {
-      "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.13.tgz",
-      "integrity": "sha512-VKmfgi/r/CkyBq9nChQ/ptmfu0JT/8ONnLVJ5H+SkFLRYJcIRyHLKjRihMCyVm6xM5yktOdCaW73NTQrFz7+bg==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-19.2.14.tgz",
+      "integrity": "sha512-cBTWY9Jx7YhbmDYDb7Hqz4Q7UNIMlKTkdKToJd2pbhIXyoS+kHVQrySmyca+jgvYMjWnIjsAEa3dpje12D4mFw==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -3119,9 +2534,9 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.13",
-        "@angular/core": "18.2.13",
-        "@angular/platform-browser": "18.2.13",
+        "@angular/common": "19.2.14",
+        "@angular/core": "19.2.14",
+        "@angular/platform-browser": "19.2.14",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
@@ -3159,10 +2574,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.2.tgz",
-      "integrity": "sha512-TUtMJYRPyUb/9aU8f3K0mjmjf6M9N5Woshn2CS6nqJSeJtTtQcpLUXjGt9vbF8ZGff0El99sWkLgzwW3VXnxZQ==",
-      "dev": true,
+      "version": "7.27.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.5.tgz",
+      "integrity": "sha512-KiRAp/VoJaWkkte84TvUd9qjdbZAdiqyvMxrGl1N6vzFogKmaLgoM3L1kgtLicp2HP5fBJS8JrZKLVIZGVJAVg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -3172,7 +2586,6 @@
       "version": "7.24.9",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz",
       "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
@@ -3203,14 +2616,12 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@babel/core/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -3220,7 +2631,6 @@
       "version": "7.26.10",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.10.tgz",
       "integrity": "sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.26.10",
@@ -3250,7 +2660,6 @@
       "version": "7.27.2",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
       "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.27.2",
@@ -3264,10 +2673,9 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/browserslist": {
-      "version": "4.24.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
-      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
-      "dev": true,
+      "version": "4.25.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
+      "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
       "funding": [
         {
           "type": "opencollective",
@@ -3284,8 +2692,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001716",
-        "electron-to-chromium": "^1.5.149",
+        "caniuse-lite": "^1.0.30001718",
+        "electron-to-chromium": "^1.5.160",
         "node-releases": "^2.0.19",
         "update-browserslist-db": "^1.1.3"
       },
@@ -3300,7 +2708,6 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -3310,7 +2717,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz",
       "integrity": "sha512-QwGAmuvM17btKU5VqXfb+Giw4JcN0hjuufz3DYnpeVDvZLAObloM77bhMXiqry3Iio+Ai4phVRDwl6WU10+r5A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.27.1",
@@ -3329,13 +2735,12 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz",
-      "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==",
-      "dev": true,
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.1"
+        "@babel/types": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3345,7 +2750,6 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -3355,7 +2759,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.1.tgz",
       "integrity": "sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.27.1",
@@ -3370,13 +2773,12 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz",
-      "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==",
-      "dev": true,
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.1"
+        "@babel/types": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3386,7 +2788,6 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -3396,7 +2797,6 @@
       "version": "0.6.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.4.tgz",
       "integrity": "sha512-jljfR1rGnXXNWnmQg2K3+bvhkxB51Rl32QRaOTuwwjviGrHzIbSc8+x9CpraDtbT7mfyjXObULP4w/adunNwAw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -3413,7 +2813,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz",
       "integrity": "sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/traverse": "^7.27.1",
@@ -3437,15 +2836,14 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.1.tgz",
-      "integrity": "sha512-9yHn519/8KvTU5BjTVEEeIM3w9/2yXNKoD82JifINImhpKkARMJKPP59kLo+BafpdN5zgNeIcS4jsGDmd3l58g==",
-      "dev": true,
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
+      "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.27.1",
         "@babel/helper-validator-identifier": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/traverse": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3458,7 +2856,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz",
       "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.27.1"
@@ -3471,7 +2868,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
       "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -3481,7 +2877,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz",
       "integrity": "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.27.1",
@@ -3496,13 +2891,12 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz",
-      "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==",
-      "dev": true,
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.1"
+        "@babel/types": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3512,7 +2906,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz",
       "integrity": "sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-member-expression-to-functions": "^7.27.1",
@@ -3530,7 +2923,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz",
       "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/traverse": "^7.27.1",
@@ -3575,7 +2967,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
       "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -3585,7 +2976,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.27.1.tgz",
       "integrity": "sha512-NFJK2sHUvrjo8wAU/nQTWU890/zB2jj0qBcCbZbbf+005cAsv6tMjXz31fBign6M5ov1o0Bllu+9nbqkfsjjJQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.27.1",
@@ -3597,26 +2987,25 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.1.tgz",
-      "integrity": "sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==",
-      "dev": true,
+      "version": "7.27.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
+      "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.27.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz",
-      "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==",
+      "version": "7.27.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.5.tgz",
+      "integrity": "sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.1"
+        "@babel/types": "^7.27.3"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -3629,7 +3018,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz",
       "integrity": "sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
@@ -3662,7 +3050,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz",
       "integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -3678,7 +3065,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz",
       "integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
@@ -3696,7 +3082,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.27.1.tgz",
       "integrity": "sha512-6BpaYGDavZqkI6yT+KSPdpZFfpnd68UKXbcjI9pJ13pvHhPrCKWOOLp+ysvMeA+DxnhuPpgIaRpxRxo5A9t5jw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
@@ -3709,11 +3094,27 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "node_modules/@babel/plugin-proposal-decorators": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.27.1.tgz",
+      "integrity": "sha512-DTxe4LBPrtFdsWzgpmbBKevg3e9PBy+dXRt19kSbucbZvL2uqtdqwwpluL1jfxYE0wIDTFp1nTy/q6gNLsxXrg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-syntax-decorators": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
       "version": "7.21.0-placeholder-for-preset-env.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
       "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -3726,7 +3127,6 @@
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -3739,7 +3139,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
       "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -3752,7 +3151,6 @@
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
@@ -3765,7 +3163,6 @@
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
       "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -3777,11 +3174,25 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-syntax-decorators": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.27.1.tgz",
+      "integrity": "sha512-YMq8Z87Lhl8EGkmb0MwYkt36QnxC+fzCgrl66ereamPlYToRpIk5nUjKUY3QKLWq8mwUB1BgbeXcTJhZOCDg5A==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-syntax-dynamic-import": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
       "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -3794,7 +3205,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
       "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.3"
@@ -3807,7 +3217,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.27.1.tgz",
       "integrity": "sha512-UT/Jrhw57xg4ILHLFnzFpPDlMbcdEicaAtjPQpbj9wa8T4r5KVWCimHcL/460g8Ht0DMxDyjsLgiWSkVjnwPFg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -3820,13 +3229,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
-      "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==",
-      "dev": true,
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+      "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3839,7 +3247,6 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
       "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -3852,7 +3259,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -3865,7 +3271,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
       "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -3881,7 +3286,6 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -3894,7 +3298,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -3907,7 +3310,6 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -3920,7 +3322,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -3933,7 +3334,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -3946,7 +3346,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -3959,7 +3358,6 @@
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
       "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -3975,7 +3373,6 @@
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -3991,7 +3388,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
       "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4007,7 +3403,6 @@
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
       "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.18.6",
@@ -4024,7 +3419,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz",
       "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4040,7 +3434,6 @@
       "version": "7.26.8",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz",
       "integrity": "sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.26.5",
@@ -4058,7 +3451,6 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
       "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.25.9",
@@ -4076,7 +3468,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz",
       "integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4089,10 +3480,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.27.1.tgz",
-      "integrity": "sha512-QEcFlMl9nGTgh1rn2nIeU5bkfb9BAjaQcWbiP4LvKxUot52ABcTkpcyJ7f2Q2U2RuQ84BNLgts3jRme2dTx6Fw==",
-      "dev": true,
+      "version": "7.27.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.27.5.tgz",
+      "integrity": "sha512-JF6uE2s67f0y2RZcm2kpAUEbD50vH62TyWVebxwHAlbSdM49VqPz8t4a1uIjp4NIOIZ4xzLfjY5emt/RCyC7TQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4108,7 +3498,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.27.1.tgz",
       "integrity": "sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.27.1",
@@ -4125,7 +3514,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz",
       "integrity": "sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.27.1",
@@ -4142,7 +3530,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.27.1.tgz",
       "integrity": "sha512-7iLhfFAubmpeJe/Wo2TVuDrykh/zlWXLzPNdL0Jqn/Xu8R3QQ8h9ff8FQoISZOsw74/HFqFI7NX63HN7QFIHKA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.27.1",
@@ -4160,13 +3547,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz",
-      "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==",
-      "dev": true,
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.1"
+        "@babel/types": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -4176,7 +3562,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.27.1.tgz",
       "integrity": "sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
@@ -4190,10 +3575,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.27.1.tgz",
-      "integrity": "sha512-ttDCqhfvpE9emVkXbPD8vyxxh4TWYACVybGkDj+oReOGwnp066ITEivDlLwe0b1R0+evJ13IXQuLNB5w1fhC5Q==",
-      "dev": true,
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.27.3.tgz",
+      "integrity": "sha512-s4Jrok82JpiaIprtY2nHsYmrThKvvwgHwjgd7UMiYhZaN0asdXNLr0y+NjTfkA7SyQE5i2Fb7eawUOZmLvyqOA==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4209,7 +3593,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.27.1.tgz",
       "integrity": "sha512-gEbkDVGRvjj7+T1ivxrfgygpT7GUd4vmODtYpbs0gZATdkX8/iSnOtZSxiZnsgm1YjTgjI6VKBGSJJevkrclzw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.27.1",
@@ -4226,7 +3609,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz",
       "integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4259,7 +3641,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz",
       "integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4275,7 +3656,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz",
       "integrity": "sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4291,7 +3671,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz",
       "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4307,7 +3686,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz",
       "integrity": "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
@@ -4324,7 +3702,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz",
       "integrity": "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.27.1",
@@ -4342,7 +3719,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.27.1.tgz",
       "integrity": "sha512-6WVLVJiTjqcQauBhn1LkICsR2H+zm62I3h9faTDKt1qP4jn2o72tSvqMwtGFKGTpojce0gJs+76eZ2uCHRZh0Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4358,7 +3734,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz",
       "integrity": "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4374,7 +3749,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz",
       "integrity": "sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4390,7 +3764,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz",
       "integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4406,7 +3779,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz",
       "integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-transforms": "^7.27.1",
@@ -4423,7 +3795,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz",
       "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-transforms": "^7.27.1",
@@ -4440,7 +3811,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz",
       "integrity": "sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-transforms": "^7.27.1",
@@ -4459,7 +3829,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz",
       "integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-transforms": "^7.27.1",
@@ -4476,7 +3845,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.27.1.tgz",
       "integrity": "sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.27.1",
@@ -4493,7 +3861,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz",
       "integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4509,7 +3876,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.27.1.tgz",
       "integrity": "sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4525,7 +3891,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.27.1.tgz",
       "integrity": "sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4538,15 +3903,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.27.2.tgz",
-      "integrity": "sha512-AIUHD7xJ1mCrj3uPozvtngY3s0xpv7Nu7DoUSnzNY6Xam1Cy4rUznR//pvMHOhQ4AvbCexhbqXCtpxGHOGOO6g==",
-      "dev": true,
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.27.3.tgz",
+      "integrity": "sha512-7ZZtznF9g4l2JCImCo5LNKFHB5eXnN39lLtLY5Tg+VkR0jwOt7TBciMckuiQIOIW7L5tkQOCh3bVGYeXgMx52Q==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.27.2",
         "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/plugin-transform-destructuring": "^7.27.1",
+        "@babel/plugin-transform-destructuring": "^7.27.3",
         "@babel/plugin-transform-parameters": "^7.27.1"
       },
       "engines": {
@@ -4560,7 +3924,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz",
       "integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
@@ -4577,7 +3940,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.27.1.tgz",
       "integrity": "sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4593,7 +3955,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",
       "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
@@ -4610,7 +3971,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.1.tgz",
       "integrity": "sha512-018KRk76HWKeZ5l4oTj2zPpSh+NbGdt0st5S6x0pga6HgrjBOJb24mMDHorFopOOd6YHkLgOZ+zaCjZGPO4aKg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4626,7 +3986,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.27.1.tgz",
       "integrity": "sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.27.1",
@@ -4643,7 +4002,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.27.1.tgz",
       "integrity": "sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.27.1",
@@ -4658,13 +4016,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz",
-      "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==",
-      "dev": true,
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.1"
+        "@babel/types": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -4674,7 +4031,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz",
       "integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4687,10 +4043,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.27.1.tgz",
-      "integrity": "sha512-B19lbbL7PMrKr52BNPjCqg1IyNUIjTcxKj8uX9zHO+PmWN93s19NDr/f69mIkEp2x9nmDJ08a7lgHaTTzvW7mw==",
-      "dev": true,
+      "version": "7.27.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.27.5.tgz",
+      "integrity": "sha512-uhB8yHerfe3MWnuLAhEbeQ4afVoqv8BQsPqrTv7e/jZ9y00kJL6l9a/f4OWaKxotmjzewfEyXE1vgDJenkQ2/Q==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4723,7 +4078,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz",
       "integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4739,7 +4093,6 @@
       "version": "7.26.10",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.26.10.tgz",
       "integrity": "sha512-NWaL2qG6HRpONTnj4JvDU6th4jYeZOJgu3QhmFTCihib0ermtOJqktA5BduGm3suhhVe9EMP9c9+mfJ/I9slqw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.25.9",
@@ -4760,7 +4113,6 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -4770,7 +4122,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz",
       "integrity": "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4786,7 +4137,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.27.1.tgz",
       "integrity": "sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
@@ -4803,7 +4153,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz",
       "integrity": "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4819,7 +4168,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz",
       "integrity": "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4835,7 +4183,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz",
       "integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4847,11 +4194,41 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-typescript": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.27.1.tgz",
+      "integrity": "sha512-Q5sT5+O4QUebHdbwKedFBEwRLb02zJ7r4A5Gg2hUoLuU3FjdMcyqcywqUrLCaDsFCxzokf7u9kuy7qz51YUuAg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/plugin-syntax-typescript": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typescript/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.27.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz",
       "integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
@@ -4867,7 +4244,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.27.1.tgz",
       "integrity": "sha512-uW20S39PnaTImxp39O5qFlHLS9LJEmANjMG7SxIhap8rCHqu0Ik+tLEPX5DKmHn6CsWQ7j3lix2tFOa5YtL12Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.27.1",
@@ -4884,7 +4260,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz",
       "integrity": "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.27.1",
@@ -4901,7 +4276,6 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.27.1.tgz",
       "integrity": "sha512-EtkOujbc4cgvb0mlpQefi4NTPBzhSIevblFevACNLUspmrALgmEBdL/XfnyyITfd8fKBZrZys92zOWcik7j9Tw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.27.1",
@@ -4918,7 +4292,6 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.8.tgz",
       "integrity": "sha512-vObvMZB6hNWuDxhSaEPTKCwcqkAIuDtE+bQGn4XMXne1DSLzFVY8Vmj1bm+mUQXYNN8NmaQEO+r8MMbzPr1jBQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.24.8",
@@ -5014,7 +4387,6 @@
       "version": "0.10.6",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
       "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.6.2",
@@ -5028,7 +4400,6 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -5038,7 +4409,6 @@
       "version": "0.1.6-no-external-plugins",
       "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
       "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -5049,6 +4419,25 @@
         "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
       }
     },
+    "node_modules/@babel/preset-typescript": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.27.1.tgz",
+      "integrity": "sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+        "@babel/plugin-transform-typescript": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/runtime": {
       "version": "7.26.10",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz",
@@ -5076,16 +4465,16 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.1.tgz",
-      "integrity": "sha512-ZCYtZciz1IWJB4U61UPu4KEaqyfj+r5T1Q5mqPo+IBpcG9kHv30Z0aD8LXPgC1trYa6rK0orRyAhqUgk4MjmEg==",
+      "version": "7.27.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.4.tgz",
+      "integrity": "sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.27.1",
-        "@babel/parser": "^7.27.1",
-        "@babel/template": "^7.27.1",
-        "@babel/types": "^7.27.1",
+        "@babel/generator": "^7.27.3",
+        "@babel/parser": "^7.27.4",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.27.3",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -5094,13 +4483,13 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.1.tgz",
-      "integrity": "sha512-UnJfnIpc/+JO0/+KRVQNGU+y5taA5vCbwN8+azkX6beii/ZF+enZJSOKo11ZSzGJjlNfJHfQtmQT8H+9TXPG2w==",
+      "version": "7.27.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.5.tgz",
+      "integrity": "sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.27.1",
-        "@babel/types": "^7.27.1",
+        "@babel/parser": "^7.27.5",
+        "@babel/types": "^7.27.3",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -5110,9 +4499,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz",
-      "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==",
+      "version": "7.27.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.6.tgz",
+      "integrity": "sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -5126,7 +4515,6 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@bitwarden/admin-console": {
@@ -5169,6 +4557,10 @@
       "resolved": "apps/desktop/desktop_native/napi",
       "link": true
     },
+    "node_modules/@bitwarden/dirt-card": {
+      "resolved": "libs/dirt/card",
+      "link": true
+    },
     "node_modules/@bitwarden/generator-components": {
       "resolved": "libs/tools/generator/components",
       "link": true
@@ -5201,32 +4593,63 @@
       "resolved": "libs/key-management-ui",
       "link": true
     },
+    "node_modules/@bitwarden/logging": {
+      "resolved": "libs/logging",
+      "link": true
+    },
     "node_modules/@bitwarden/node": {
       "resolved": "libs/node",
       "link": true
     },
+    "node_modules/@bitwarden/nx-plugin": {
+      "resolved": "libs/nx-plugin",
+      "link": true
+    },
     "node_modules/@bitwarden/platform": {
       "resolved": "libs/platform",
       "link": true
     },
     "node_modules/@bitwarden/sdk-internal": {
-      "version": "0.2.0-main.177",
-      "resolved": "https://registry.npmjs.org/@bitwarden/sdk-internal/-/sdk-internal-0.2.0-main.177.tgz",
-      "integrity": "sha512-2fp/g0WJDPPrIqrU88QrwoJsZTzoi7S7eCf+Qq0/8x3ImqQyoYJEdHdz06YHjUdS0CzucPrwTo5zJ/ZvcLNOmQ==",
-      "license": "GPL-3.0"
+      "version": "0.2.0-main.225",
+      "resolved": "https://registry.npmjs.org/@bitwarden/sdk-internal/-/sdk-internal-0.2.0-main.225.tgz",
+      "integrity": "sha512-bhSFNX584GPJ9wMBYff1d18/Hfj+o+D4E1l3uDLZNXRI9s7w919AQWqJ0xUy1vh8gpkLJovkf64HQGqs0OiQQA==",
+      "license": "GPL-3.0",
+      "dependencies": {
+        "type-fest": "^4.41.0"
+      }
+    },
+    "node_modules/@bitwarden/sdk-internal/node_modules/type-fest": {
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/@bitwarden/send-ui": {
       "resolved": "libs/tools/send/send-ui",
       "link": true
     },
-    "node_modules/@bitwarden/tools-card": {
-      "resolved": "libs/tools/card",
+    "node_modules/@bitwarden/storage-core": {
+      "resolved": "libs/storage-core",
+      "link": true
+    },
+    "node_modules/@bitwarden/storage-test-utils": {
+      "resolved": "libs/storage-test-utils",
       "link": true
     },
     "node_modules/@bitwarden/ui-common": {
       "resolved": "libs/ui/common",
       "link": true
     },
+    "node_modules/@bitwarden/user-core": {
+      "resolved": "libs/user-core",
+      "link": true
+    },
     "node_modules/@bitwarden/vault": {
       "resolved": "libs/vault",
       "link": true
@@ -5461,22 +4884,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@compodoc/compodoc/node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
-      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@compodoc/compodoc/node_modules/@babel/plugin-transform-private-methods": {
       "version": "7.25.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.7.tgz",
@@ -5633,6 +5040,16 @@
         "node": ">= 6"
       }
     },
+    "node_modules/@compodoc/compodoc/node_modules/magic-string": {
+      "version": "0.30.11",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0"
+      }
+    },
     "node_modules/@compodoc/compodoc/node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -5717,6 +5134,16 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/@compodoc/live-server/node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@compodoc/live-server/node_modules/glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -5730,6 +5157,35 @@
         "node": ">= 6"
       }
     },
+    "node_modules/@compodoc/live-server/node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@compodoc/live-server/node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@compodoc/live-server/node_modules/open": {
       "version": "8.4.0",
       "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
@@ -5805,6 +5261,28 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
     "node_modules/@csstools/color-helpers": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz",
@@ -5825,9 +5303,9 @@
       }
     },
     "node_modules/@csstools/css-calc": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.3.tgz",
-      "integrity": "sha512-XBG3talrhid44BY1x3MHzUx/aTG8+x/Zi57M4aTKK9RFB4aLlF3TTSzfzn8nWVHWL3FgAXAxmupmDd6VWww+pw==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
+      "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
       "funding": [
         {
           "type": "github",
@@ -5843,14 +5321,14 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.9.tgz",
-      "integrity": "sha512-wILs5Zk7BU86UArYBJTPy/FMPPKVKHMj1ycCEyf3VUptol0JNRLFU/BZsJ4aiIHJEbSLiizzRrw8Pc1uAEDrXw==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.10.tgz",
+      "integrity": "sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==",
       "funding": [
         {
           "type": "github",
@@ -5864,20 +5342,20 @@
       "license": "MIT",
       "dependencies": {
         "@csstools/color-helpers": "^5.0.2",
-        "@csstools/css-calc": "^2.1.3"
+        "@csstools/css-calc": "^2.1.4"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz",
-      "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
       "funding": [
         {
           "type": "github",
@@ -5893,13 +5371,13 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-tokenizer": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz",
-      "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
       "funding": [
         {
           "type": "github",
@@ -5968,9 +5446,9 @@
       "license": "MIT"
     },
     "node_modules/@discoveryjs/json-ext": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.1.tgz",
-      "integrity": "sha512-boghen8F0Q8D+0/Q1/1r6DUEieUJ8w2a1gIknExMSHBsJFOr2+0KUfHiVYBvucPwl3+RU5PFBK833FjFCh3BhA==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
+      "integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5978,9 +5456,9 @@
       }
     },
     "node_modules/@electron/asar": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.4.1.tgz",
-      "integrity": "sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.18.tgz",
+      "integrity": "sha512-2XyvMe3N3Nrs8cV39IKELRHTYUWFKrmqqSY1U+GMlc0jvqjIVnoxhNd2H4JolWQncbJi1DCvb5TNxZuI2fEjWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5996,9 +5474,9 @@
       }
     },
     "node_modules/@electron/asar/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6150,7 +5628,7 @@
     "node_modules/@electron/node-gyp": {
       "version": "10.2.0-electron.1",
       "resolved": "git+ssh://git@github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2",
-      "integrity": "sha512-CrYo6TntjpoMO1SHjl5Pa/JoUsECNqNdB7Kx49WLQpWzPw53eEITJ2Hs9fh/ryUYDn4pxZz11StaBYBrLFJdqg==",
+      "integrity": "sha512-lBSgDMQqt7QWMuIjS8zNAq5FI5o5RVBAcJUGWGI6GgoQITJt3msAkUrHp8YHj3RTVE+h70ndqMGqURjp3IfRyQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6207,40 +5685,23 @@
       }
     },
     "node_modules/@electron/notarize": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz",
-      "integrity": "sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-3.0.1.tgz",
+      "integrity": "sha512-5xzcOwvMGNjkSk7s0sPx4XcKWei9FYk4f2S5NkSorWW0ce5yktTOtlPa0W5yQHcREILh+C3JdH+t+M637g9TmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "debug": "^4.1.1",
-        "fs-extra": "^9.0.1",
+        "debug": "^4.4.0",
         "promise-retry": "^2.0.1"
       },
       "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/@electron/notarize/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "node": ">= 22.12.0"
       }
     },
     "node_modules/@electron/osx-sign": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.5.tgz",
-      "integrity": "sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.1.tgz",
+      "integrity": "sha512-BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -6332,92 +5793,50 @@
       }
     },
     "node_modules/@electron/universal": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.5.1.tgz",
-      "integrity": "sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.1.tgz",
+      "integrity": "sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@electron/asar": "^3.2.1",
-        "@malept/cross-spawn-promise": "^1.1.0",
+        "@electron/asar": "^3.2.7",
+        "@malept/cross-spawn-promise": "^2.0.0",
         "debug": "^4.3.1",
-        "dir-compare": "^3.0.0",
-        "fs-extra": "^9.0.1",
-        "minimatch": "^3.0.4",
-        "plist": "^3.0.4"
+        "dir-compare": "^4.2.0",
+        "fs-extra": "^11.1.1",
+        "minimatch": "^9.0.3",
+        "plist": "^3.1.0"
       },
       "engines": {
-        "node": ">=8.6"
+        "node": ">=16.4"
       }
     },
-    "node_modules/@electron/universal/node_modules/@malept/cross-spawn-promise": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
-      "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==",
+    "node_modules/@electron/windows-sign": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.2.tgz",
+      "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==",
       "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/malept"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund"
-        }
-      ],
-      "license": "Apache-2.0",
+      "license": "BSD-2-Clause",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "cross-spawn": "^7.0.1"
+        "cross-dirname": "^0.1.0",
+        "debug": "^4.3.4",
+        "fs-extra": "^11.1.1",
+        "minimist": "^1.2.8",
+        "postject": "^1.0.0-alpha.6"
+      },
+      "bin": {
+        "electron-windows-sign": "bin/electron-windows-sign.js"
       },
       "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@electron/universal/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/@electron/universal/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@electron/universal/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
+        "node": ">=14.14"
       }
     },
     "node_modules/@emnapi/core": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz",
       "integrity": "sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@emnapi/wasi-threads": "1.0.2",
@@ -6428,7 +5847,6 @@
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz",
       "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.4.0"
@@ -6438,7 +5856,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.2.tgz",
       "integrity": "sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.4.0"
@@ -6548,9 +5965,9 @@
       "license": "MIT"
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz",
-      "integrity": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
+      "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==",
       "cpu": [
         "ppc64"
       ],
@@ -6565,9 +5982,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.0.tgz",
-      "integrity": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz",
+      "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==",
       "cpu": [
         "arm"
       ],
@@ -6582,9 +5999,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz",
-      "integrity": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz",
+      "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==",
       "cpu": [
         "arm64"
       ],
@@ -6599,9 +6016,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.0.tgz",
-      "integrity": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz",
+      "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==",
       "cpu": [
         "x64"
       ],
@@ -6616,9 +6033,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz",
-      "integrity": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
+      "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
       "cpu": [
         "arm64"
       ],
@@ -6633,9 +6050,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz",
-      "integrity": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz",
+      "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==",
       "cpu": [
         "x64"
       ],
@@ -6650,9 +6067,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz",
-      "integrity": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz",
+      "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==",
       "cpu": [
         "arm64"
       ],
@@ -6667,9 +6084,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz",
-      "integrity": "sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz",
+      "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==",
       "cpu": [
         "x64"
       ],
@@ -6684,9 +6101,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz",
-      "integrity": "sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz",
+      "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==",
       "cpu": [
         "arm"
       ],
@@ -6701,9 +6118,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz",
-      "integrity": "sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz",
+      "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==",
       "cpu": [
         "arm64"
       ],
@@ -6718,9 +6135,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz",
-      "integrity": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz",
+      "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==",
       "cpu": [
         "ia32"
       ],
@@ -6735,9 +6152,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz",
-      "integrity": "sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz",
+      "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==",
       "cpu": [
         "loong64"
       ],
@@ -6752,9 +6169,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz",
-      "integrity": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz",
+      "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==",
       "cpu": [
         "mips64el"
       ],
@@ -6769,9 +6186,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz",
-      "integrity": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz",
+      "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==",
       "cpu": [
         "ppc64"
       ],
@@ -6786,9 +6203,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz",
-      "integrity": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz",
+      "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==",
       "cpu": [
         "riscv64"
       ],
@@ -6803,9 +6220,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz",
-      "integrity": "sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz",
+      "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==",
       "cpu": [
         "s390x"
       ],
@@ -6820,9 +6237,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz",
-      "integrity": "sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz",
+      "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==",
       "cpu": [
         "x64"
       ],
@@ -6836,10 +6253,27 @@
         "node": ">=18"
       }
     },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.4.tgz",
+      "integrity": "sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz",
-      "integrity": "sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz",
+      "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==",
       "cpu": [
         "x64"
       ],
@@ -6854,9 +6288,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz",
-      "integrity": "sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz",
+      "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==",
       "cpu": [
         "arm64"
       ],
@@ -6871,9 +6305,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz",
-      "integrity": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz",
+      "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==",
       "cpu": [
         "x64"
       ],
@@ -6888,9 +6322,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz",
-      "integrity": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz",
+      "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==",
       "cpu": [
         "x64"
       ],
@@ -6905,9 +6339,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz",
-      "integrity": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz",
+      "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==",
       "cpu": [
         "arm64"
       ],
@@ -6922,9 +6356,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz",
-      "integrity": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz",
+      "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==",
       "cpu": [
         "ia32"
       ],
@@ -6939,9 +6373,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz",
-      "integrity": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz",
+      "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==",
       "cpu": [
         "x64"
       ],
@@ -6959,7 +6393,6 @@
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
       "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^3.4.3"
@@ -6978,7 +6411,6 @@
       "version": "4.12.1",
       "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
       "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -7003,10 +6435,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
-      "dev": true,
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
+      "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@eslint/object-schema": "^2.1.6",
@@ -7018,10 +6449,9 @@
       }
     },
     "node_modules/@eslint/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -7032,7 +6462,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -7042,10 +6471,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
-      "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
-      "dev": true,
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.3.tgz",
+      "integrity": "sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==",
       "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7055,7 +6483,6 @@
       "version": "0.13.0",
       "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
       "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@types/json-schema": "^7.0.15"
@@ -7068,7 +6495,6 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
       "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
@@ -7092,7 +6518,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -7106,10 +6531,9 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -7120,7 +6544,6 @@
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
       "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -7133,24 +6556,33 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
       "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@eslint/eslintrc/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -7163,7 +6595,6 @@
       "version": "9.26.0",
       "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.26.0.tgz",
       "integrity": "sha512-I9XlJawFdSMvWjDt6wksMCrgns5ggLNfFwFvnShsleWruvXM514Qxk8V246efTw+eo9JABvVz+u3q2RiAowKxQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7173,7 +6604,6 @@
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
       "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
-      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7183,7 +6613,6 @@
       "version": "0.2.8",
       "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz",
       "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@eslint/core": "^0.13.0",
@@ -7295,7 +6724,6 @@
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
       "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
-      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=18.18.0"
@@ -7305,7 +6733,6 @@
       "version": "0.16.6",
       "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
       "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@humanfs/core": "^0.19.1",
@@ -7319,7 +6746,6 @@
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
       "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
-      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=18.18"
@@ -7333,7 +6759,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=12.22"
@@ -7347,7 +6772,6 @@
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
       "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
-      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=18.18"
@@ -7358,107 +6782,130 @@
       }
     },
     "node_modules/@inquirer/checkbox": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.5.0.tgz",
-      "integrity": "sha512-sMgdETOfi2dUHT8r7TT1BTKOwNvdDGFDXYWtQ2J69SvlYNntk9I/gJe7r5yvMwwsuKnYbuRs3pNhx4tgNck5aA==",
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.1.8.tgz",
+      "integrity": "sha512-d/QAsnwuHX2OPolxvYcgSj7A9DO9H6gVOy2DvBTx+P2LH2iRTo/RSGV3iwCzW024nP9hw98KIuDmdyhZQj1UQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/figures": "^1.0.5",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/figures": "^1.0.12",
+        "@inquirer/type": "^3.0.7",
         "ansi-escapes": "^4.3.2",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
     "node_modules/@inquirer/confirm": {
-      "version": "3.1.22",
-      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.22.tgz",
-      "integrity": "sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.6.tgz",
+      "integrity": "sha512-6ZXYK3M1XmaVBZX6FCfChgtponnL0R6I7k8Nu+kaoNkT828FVZTcca1MqmWQipaW2oNREQl5AaPCUOOCVNdRMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.0.10",
-        "@inquirer/type": "^1.5.2"
+        "@inquirer/core": "^10.1.7",
+        "@inquirer/type": "^3.0.4"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
     "node_modules/@inquirer/core": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.2.1.tgz",
-      "integrity": "sha512-F2VBt7W/mwqEU4bL0RnHNZmC/OxzNx9cOYxHqnXX3MP6ruYvZUZAW9imgN9+h/uBT/oP8Gh888J2OZSbjSeWcg==",
+      "version": "10.1.13",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.13.tgz",
+      "integrity": "sha512-1viSxebkYN2nJULlzCxES6G9/stgHSepZ9LqqfdIGPHj5OHhiBUXVS0a6R0bEC2A+VL4D9w6QB66ebCr6HGllA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/figures": "^1.0.6",
-        "@inquirer/type": "^2.0.0",
-        "@types/mute-stream": "^0.0.4",
-        "@types/node": "^22.5.5",
-        "@types/wrap-ansi": "^3.0.0",
+        "@inquirer/figures": "^1.0.12",
+        "@inquirer/type": "^3.0.7",
         "ansi-escapes": "^4.3.2",
         "cli-width": "^4.1.0",
-        "mute-stream": "^1.0.0",
+        "mute-stream": "^2.0.0",
         "signal-exit": "^4.1.0",
-        "strip-ansi": "^6.0.1",
         "wrap-ansi": "^6.2.0",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
         "node": ">=18"
-      }
-    },
-    "node_modules/@inquirer/core/node_modules/@inquirer/type": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-2.0.0.tgz",
-      "integrity": "sha512-XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mute-stream": "^1.0.0"
       },
-      "engines": {
-        "node": ">=18"
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
     "node_modules/@inquirer/editor": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.2.0.tgz",
-      "integrity": "sha512-9KHOpJ+dIL5SZli8lJ6xdaYLPPzB8xB9GZItg39MBybzhxA16vxmszmQFrRwbOA918WA2rvu8xhDEg/p6LXKbw==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.13.tgz",
+      "integrity": "sha512-WbicD9SUQt/K8O5Vyk9iC2ojq5RHoCLK6itpp2fHsWe44VxxcA9z3GTWlvjSTGmMQpZr+lbVmrxdHcumJoLbMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7",
         "external-editor": "^3.1.0"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
     "node_modules/@inquirer/expand": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.3.0.tgz",
-      "integrity": "sha512-qnJsUcOGCSG1e5DTOErmv2BPQqrtT6uzqn1vI/aYGiPKq+FgslGZmtdnXbhuI7IlT7OByDoEEqdnhUnVR2hhLw==",
+      "version": "4.0.15",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.15.tgz",
+      "integrity": "sha512-4Y+pbr/U9Qcvf+N/goHzPEXiHH8680lM3Dr3Y9h9FFw4gHS+zVpbj8LfbKWIb/jayIB4aSO4pWiBTrBYWkvi5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
     "node_modules/@inquirer/figures": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.11.tgz",
-      "integrity": "sha512-eOg92lvrn/aRUqbxRyvpEWnrvRuTYRifixHkYVpJiygTgVSBIHDqLh0SrMQXkafvULg3ck11V7xvR+zcgvpHFw==",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.12.tgz",
+      "integrity": "sha512-MJttijd8rMFcKJC8NYmprWr6hD3r9Gd9qUC0XwPNwoEPWSMVJwA2MlXxF+nhZZNMY+HXsWa+o7KY2emWYIn0jQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7466,129 +6913,213 @@
       }
     },
     "node_modules/@inquirer/input": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.3.0.tgz",
-      "integrity": "sha512-XfnpCStx2xgh1LIRqPXrTNEEByqQWoxsWYzNRSEUxJ5c6EQlhMogJ3vHKu8aXuTacebtaZzMAHwEL0kAflKOBw==",
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.1.12.tgz",
+      "integrity": "sha512-xJ6PFZpDjC+tC1P8ImGprgcsrzQRsUh9aH3IZixm1lAZFK49UGHxM3ltFfuInN2kPYNfyoPRh+tU4ftsjPLKqQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/type": "^1.5.3"
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
     "node_modules/@inquirer/number": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.1.0.tgz",
-      "integrity": "sha512-ilUnia/GZUtfSZy3YEErXLJ2Sljo/mf9fiKc08n18DdwdmDbOzRcTv65H1jjDvlsAuvdFXf4Sa/aL7iw/NanVA==",
+      "version": "3.0.15",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.15.tgz",
+      "integrity": "sha512-xWg+iYfqdhRiM55MvqiTCleHzszpoigUpN5+t1OMcRkJrUrw7va3AzXaxvS+Ak7Gny0j2mFSTv2JJj8sMtbV2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/type": "^1.5.3"
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
     "node_modules/@inquirer/password": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.2.0.tgz",
-      "integrity": "sha512-5otqIpgsPYIshqhgtEwSspBQE40etouR8VIxzpJkv9i0dVHIpyhiivbkH9/dGiMLdyamT54YRdGJLfl8TFnLHg==",
+      "version": "4.0.15",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.15.tgz",
+      "integrity": "sha512-75CT2p43DGEnfGTaqFpbDC2p2EEMrq0S+IRrf9iJvYreMy5mAWj087+mdKyLHapUEPLjN10mNvABpGbk8Wdraw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7",
         "ansi-escapes": "^4.3.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
     "node_modules/@inquirer/prompts": {
-      "version": "5.3.8",
-      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.3.8.tgz",
-      "integrity": "sha512-b2BudQY/Si4Y2a0PdZZL6BeJtl8llgeZa7U2j47aaJSCeAl1e4UI7y8a9bSkO3o/ZbZrgT5muy/34JbsjfIWxA==",
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.3.2.tgz",
+      "integrity": "sha512-G1ytyOoHh5BphmEBxSwALin3n1KGNYB6yImbICcRQdzXfOGbuJ9Jske/Of5Sebk339NSGGNfUshnzK8YWkTPsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/checkbox": "^2.4.7",
-        "@inquirer/confirm": "^3.1.22",
-        "@inquirer/editor": "^2.1.22",
-        "@inquirer/expand": "^2.1.22",
-        "@inquirer/input": "^2.2.9",
-        "@inquirer/number": "^1.0.10",
-        "@inquirer/password": "^2.1.22",
-        "@inquirer/rawlist": "^2.2.4",
-        "@inquirer/search": "^1.0.7",
-        "@inquirer/select": "^2.4.7"
+        "@inquirer/checkbox": "^4.1.2",
+        "@inquirer/confirm": "^5.1.6",
+        "@inquirer/editor": "^4.2.7",
+        "@inquirer/expand": "^4.0.9",
+        "@inquirer/input": "^4.1.6",
+        "@inquirer/number": "^3.0.9",
+        "@inquirer/password": "^4.0.9",
+        "@inquirer/rawlist": "^4.0.9",
+        "@inquirer/search": "^3.0.9",
+        "@inquirer/select": "^4.0.9"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
     "node_modules/@inquirer/rawlist": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.3.0.tgz",
-      "integrity": "sha512-zzfNuINhFF7OLAtGHfhwOW2TlYJyli7lOUoJUXw/uyklcwalV6WRXBXtFIicN8rTRK1XTiPWB4UY+YuW8dsnLQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.1.3.tgz",
+      "integrity": "sha512-7XrV//6kwYumNDSsvJIPeAqa8+p7GJh7H5kRuxirct2cgOcSWwwNGoXDRgpNFbY/MG2vQ4ccIWCi8+IXXyFMZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
     "node_modules/@inquirer/search": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.1.0.tgz",
-      "integrity": "sha512-h+/5LSj51dx7hp5xOn4QFnUaKeARwUCLs6mIhtkJ0JYPBLmEYjdHSYh7I6GrLg9LwpJ3xeX0FZgAG1q0QdCpVQ==",
+      "version": "3.0.15",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.15.tgz",
+      "integrity": "sha512-YBMwPxYBrADqyvP4nNItpwkBnGGglAvCLVW8u4pRmmvOsHUtCAUIMbUrLX5B3tFL1/WsLGdQ2HNzkqswMs5Uaw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/figures": "^1.0.5",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/figures": "^1.0.12",
+        "@inquirer/type": "^3.0.7",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
     "node_modules/@inquirer/select": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.5.0.tgz",
-      "integrity": "sha512-YmDobTItPP3WcEI86GvPo+T2sRHkxxOq/kXmsBjHS5BVXUgvgZ5AfJjkvQvZr03T81NnI3KrrRuMzeuYUQRFOA==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.2.3.tgz",
+      "integrity": "sha512-OAGhXU0Cvh0PhLz9xTF/kx6g6x+sP+PcyTiLvCrewI99P3BBeexD+VbuwkNDvqGkk3y2h5ZiWLeRP7BFlhkUDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^9.1.0",
-        "@inquirer/figures": "^1.0.5",
-        "@inquirer/type": "^1.5.3",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/figures": "^1.0.12",
+        "@inquirer/type": "^3.0.7",
         "ansi-escapes": "^4.3.2",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
     "node_modules/@inquirer/type": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz",
-      "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.7.tgz",
+      "integrity": "sha512-PfunHQcjwnju84L+ycmcMKB/pTPIngjUJvfnRhKY6FKPuYXlM4aQCb/nIdTFR6BEhMjFvngzvng/vBAJMZpLSA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "mute-stream": "^1.0.0"
+        "@isaacs/balanced-match": "^4.0.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": "20 || >=22"
       }
     },
     "node_modules/@isaacs/cliui": {
@@ -7694,11 +7225,23 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "camelcase": "^5.3.1",
@@ -7711,21 +7254,10 @@
         "node": ">=8"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
@@ -7735,25 +7267,10 @@
         "node": ">=8"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
@@ -7766,7 +7283,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
@@ -7782,7 +7298,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
@@ -7791,28 +7306,10 @@
         "node": ">=8"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -7822,7 +7319,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
       "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -7936,7 +7432,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
       "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/fake-timers": "^29.7.0",
@@ -7952,7 +7447,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "expect": "^29.7.0",
@@ -7966,7 +7460,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
       "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "jest-get-type": "^29.6.3"
@@ -7979,7 +7472,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
       "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -7997,7 +7489,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
       "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
@@ -8013,7 +7504,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
       "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
@@ -8054,10 +7544,9 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -8069,7 +7558,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -8090,7 +7578,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -8103,7 +7590,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
       "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@sinclair/typebox": "^0.27.8"
@@ -8116,7 +7602,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
       "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.18",
@@ -8131,7 +7616,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
       "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/console": "^29.7.0",
@@ -8147,7 +7631,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
       "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^29.7.0",
@@ -8163,7 +7646,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
       "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
@@ -8190,14 +7672,12 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@jest/types": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
       "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -8328,14 +7808,15 @@
       }
     },
     "node_modules/@koa/multer": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@koa/multer/-/multer-3.1.0.tgz",
-      "integrity": "sha512-ETf4OLpOew9XE9lyU+5HIqk3TCmdGAw9pUXgxzrlYip+PkxLGoU4meiVTxiW4B6lxdBNijb3DFQ7M2woLcDL1g==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@koa/multer/-/multer-4.0.0.tgz",
+      "integrity": "sha512-BY6hys3WVX1yL/gcfKWu94z1fJ6ayG1DEEw/s82DnulkaTbumwjF6XqSfNLKFcs8lnJb2QfMJ4DyK4bmF1NDZw==",
       "license": "MIT",
       "engines": {
-        "node": ">= 14"
+        "node": ">= 18"
       },
       "peerDependencies": {
+        "koa": ">=2",
         "multer": "*"
       }
     },
@@ -8361,19 +7842,42 @@
       "license": "MIT"
     },
     "node_modules/@listr2/prompt-adapter-inquirer": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.15.tgz",
-      "integrity": "sha512-MZrGem/Ujjd4cPTLYDfCZK2iKKeiO/8OX13S6jqxldLs0Prf2aGqVlJ77nMBqMv7fzqgXEgjrNHLXcKR8l9lOg==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.18.tgz",
+      "integrity": "sha512-0hz44rAcrphyXcA8IS7EJ2SCoaBZD2u5goE8S/e+q/DL+dOGpqpcLidVOFeLG3VgML62SXmfRLAhWt0zL1oW4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/type": "^1.5.1"
+        "@inquirer/type": "^1.5.5"
       },
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@inquirer/prompts": ">= 3 < 6"
+        "@inquirer/prompts": ">= 3 < 8"
+      }
+    },
+    "node_modules/@listr2/prompt-adapter-inquirer/node_modules/@inquirer/type": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz",
+      "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mute-stream": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@listr2/prompt-adapter-inquirer/node_modules/mute-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
+      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/@lit-labs/react": {
@@ -8410,9 +7914,9 @@
       }
     },
     "node_modules/@lmdb/lmdb-darwin-arm64": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.0.13.tgz",
-      "integrity": "sha512-uiKPB0Fv6WEEOZjruu9a6wnW/8jrjzlZbxXscMB8kuCJ1k6kHpcBnuvaAWcqhbI7rqX5GKziwWEdD+wi2gNLfA==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.2.6.tgz",
+      "integrity": "sha512-yF/ih9EJJZc72psFQbwnn8mExIWfTnzWJg+N02hnpXtDPETYLmQswIMBn7+V88lfCaFrMozJsUvcEQIkEPU0Gg==",
       "cpu": [
         "arm64"
       ],
@@ -8424,9 +7928,9 @@
       ]
     },
     "node_modules/@lmdb/lmdb-darwin-x64": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.0.13.tgz",
-      "integrity": "sha512-bEVIIfK5mSQoG1R19qA+fJOvCB+0wVGGnXHT3smchBVahYBdlPn2OsZZKzlHWfb1E+PhLBmYfqB5zQXFP7hJig==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.2.6.tgz",
+      "integrity": "sha512-5BbCumsFLbCi586Bb1lTWQFkekdQUw8/t8cy++Uq251cl3hbDIGEwD9HAwh8H6IS2F6QA9KdKmO136LmipRNkg==",
       "cpu": [
         "x64"
       ],
@@ -8438,9 +7942,9 @@
       ]
     },
     "node_modules/@lmdb/lmdb-linux-arm": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.0.13.tgz",
-      "integrity": "sha512-Yml1KlMzOnXj/tnW7yX8U78iAzTk39aILYvCPbqeewAq1kSzl+w59k/fiVkTBfvDi/oW/5YRxL+Fq+Y1Fr1r2Q==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.2.6.tgz",
+      "integrity": "sha512-+6XgLpMb7HBoWxXj+bLbiiB4s0mRRcDPElnRS3LpWRzdYSe+gFk5MT/4RrVNqd2MESUDmb53NUXw1+BP69bjiQ==",
       "cpu": [
         "arm"
       ],
@@ -8452,9 +7956,9 @@
       ]
     },
     "node_modules/@lmdb/lmdb-linux-arm64": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.0.13.tgz",
-      "integrity": "sha512-afbVrsMgZ9dUTNUchFpj5VkmJRxvht/u335jUJ7o23YTbNbnpmXif3VKQGCtnjSh+CZaqm6N3CPG8KO3zwyZ1Q==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.2.6.tgz",
+      "integrity": "sha512-l5VmJamJ3nyMmeD1ANBQCQqy7do1ESaJQfKPSm2IG9/ADZryptTyCj8N6QaYgIWewqNUrcbdMkJajRQAt5Qjfg==",
       "cpu": [
         "arm64"
       ],
@@ -8466,9 +7970,9 @@
       ]
     },
     "node_modules/@lmdb/lmdb-linux-x64": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.0.13.tgz",
-      "integrity": "sha512-vOtxu0xC0SLdQ2WRXg8Qgd8T32ak4SPqk5zjItRszrJk2BdeXqfGxBJbP7o4aOvSPSmSSv46Lr1EP4HXU8v7Kg==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.2.6.tgz",
+      "integrity": "sha512-nDYT8qN9si5+onHYYaI4DiauDMx24OAiuZAUsEqrDy+ja/3EbpXPX/VAkMV8AEaQhy3xc4dRC+KcYIvOFefJ4Q==",
       "cpu": [
         "x64"
       ],
@@ -8480,9 +7984,9 @@
       ]
     },
     "node_modules/@lmdb/lmdb-win32-x64": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.0.13.tgz",
-      "integrity": "sha512-UCrMJQY/gJnOl3XgbWRZZUvGGBuKy6i0YNSptgMzHBjs+QYDYR1Mt/RLTOPy4fzzves65O1EDmlL//OzEqoLlA==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.2.6.tgz",
+      "integrity": "sha512-XlqVtILonQnG+9fH2N3Aytria7P/1fwDgDhl29rde96uH2sLB8CHORIf2PfuLVzFQJ7Uqp8py9AYwr3ZUCFfWg==",
       "cpu": [
         "x64"
       ],
@@ -8626,10 +8130,9 @@
       }
     },
     "node_modules/@modelcontextprotocol/sdk": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.12.0.tgz",
-      "integrity": "sha512-m//7RlINx1F3sz3KqwY1WWzVgTcYX52HYk4bJ1hkBXV3zccAEth+jRvG8DBRrdaQuRsPAJOx2MH3zaHNCKL7Zg==",
-      "dev": true,
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.13.1.tgz",
+      "integrity": "sha512-8q6+9aF0yA39/qWT/uaIj6zTpC+Qu07DnN/lb9mjoquCJsAh6l3HyYqc9O3t2j7GilseOQOQimLg7W3By6jqvg==",
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.6",
@@ -8652,7 +8155,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -8669,7 +8171,6 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz",
       "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "eventsource-parser": "^3.0.1"
@@ -8682,7 +8183,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@msgpack/msgpack": {
@@ -8795,11 +8295,315 @@
         "url": "https://github.com/sponsors/Brooooooklyn"
       }
     },
+    "node_modules/@napi-rs/nice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice/-/nice-1.0.1.tgz",
+      "integrity": "sha512-zM0mVWSXE0a0h9aKACLwKmD6nHcRiKrPpCfvaKqG1CqDEyjEawId0ocXxVzPMCAm6kkWr2P025msfxXEnt8UGQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">= 10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Brooooooklyn"
+      },
+      "optionalDependencies": {
+        "@napi-rs/nice-android-arm-eabi": "1.0.1",
+        "@napi-rs/nice-android-arm64": "1.0.1",
+        "@napi-rs/nice-darwin-arm64": "1.0.1",
+        "@napi-rs/nice-darwin-x64": "1.0.1",
+        "@napi-rs/nice-freebsd-x64": "1.0.1",
+        "@napi-rs/nice-linux-arm-gnueabihf": "1.0.1",
+        "@napi-rs/nice-linux-arm64-gnu": "1.0.1",
+        "@napi-rs/nice-linux-arm64-musl": "1.0.1",
+        "@napi-rs/nice-linux-ppc64-gnu": "1.0.1",
+        "@napi-rs/nice-linux-riscv64-gnu": "1.0.1",
+        "@napi-rs/nice-linux-s390x-gnu": "1.0.1",
+        "@napi-rs/nice-linux-x64-gnu": "1.0.1",
+        "@napi-rs/nice-linux-x64-musl": "1.0.1",
+        "@napi-rs/nice-win32-arm64-msvc": "1.0.1",
+        "@napi-rs/nice-win32-ia32-msvc": "1.0.1",
+        "@napi-rs/nice-win32-x64-msvc": "1.0.1"
+      }
+    },
+    "node_modules/@napi-rs/nice-android-arm-eabi": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm-eabi/-/nice-android-arm-eabi-1.0.1.tgz",
+      "integrity": "sha512-5qpvOu5IGwDo7MEKVqqyAxF90I6aLj4n07OzpARdgDRfz8UbBztTByBp0RC59r3J1Ij8uzYi6jI7r5Lws7nn6w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-android-arm64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm64/-/nice-android-arm64-1.0.1.tgz",
+      "integrity": "sha512-GqvXL0P8fZ+mQqG1g0o4AO9hJjQaeYG84FRfZaYjyJtZZZcMjXW5TwkL8Y8UApheJgyE13TQ4YNUssQaTgTyvA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-darwin-arm64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-arm64/-/nice-darwin-arm64-1.0.1.tgz",
+      "integrity": "sha512-91k3HEqUl2fsrz/sKkuEkscj6EAj3/eZNCLqzD2AA0TtVbkQi8nqxZCZDMkfklULmxLkMxuUdKe7RvG/T6s2AA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-darwin-x64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-x64/-/nice-darwin-x64-1.0.1.tgz",
+      "integrity": "sha512-jXnMleYSIR/+TAN/p5u+NkCA7yidgswx5ftqzXdD5wgy/hNR92oerTXHc0jrlBisbd7DpzoaGY4cFD7Sm5GlgQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-freebsd-x64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-freebsd-x64/-/nice-freebsd-x64-1.0.1.tgz",
+      "integrity": "sha512-j+iJ/ezONXRQsVIB/FJfwjeQXX7A2tf3gEXs4WUGFrJjpe/z2KB7sOv6zpkm08PofF36C9S7wTNuzHZ/Iiccfw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-arm-gnueabihf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm-gnueabihf/-/nice-linux-arm-gnueabihf-1.0.1.tgz",
+      "integrity": "sha512-G8RgJ8FYXYkkSGQwywAUh84m946UTn6l03/vmEXBYNJxQJcD+I3B3k5jmjFG/OPiU8DfvxutOP8bi+F89MCV7Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-arm64-gnu": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-gnu/-/nice-linux-arm64-gnu-1.0.1.tgz",
+      "integrity": "sha512-IMDak59/W5JSab1oZvmNbrms3mHqcreaCeClUjwlwDr0m3BoR09ZiN8cKFBzuSlXgRdZ4PNqCYNeGQv7YMTjuA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-arm64-musl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-musl/-/nice-linux-arm64-musl-1.0.1.tgz",
+      "integrity": "sha512-wG8fa2VKuWM4CfjOjjRX9YLIbysSVV1S3Kgm2Fnc67ap/soHBeYZa6AGMeR5BJAylYRjnoVOzV19Cmkco3QEPw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-ppc64-gnu": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-ppc64-gnu/-/nice-linux-ppc64-gnu-1.0.1.tgz",
+      "integrity": "sha512-lxQ9WrBf0IlNTCA9oS2jg/iAjQyTI6JHzABV664LLrLA/SIdD+I1i3Mjf7TsnoUbgopBcCuDztVLfJ0q9ubf6Q==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-riscv64-gnu": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-riscv64-gnu/-/nice-linux-riscv64-gnu-1.0.1.tgz",
+      "integrity": "sha512-3xs69dO8WSWBb13KBVex+yvxmUeEsdWexxibqskzoKaWx9AIqkMbWmE2npkazJoopPKX2ULKd8Fm9veEn0g4Ig==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-s390x-gnu": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-s390x-gnu/-/nice-linux-s390x-gnu-1.0.1.tgz",
+      "integrity": "sha512-lMFI3i9rlW7hgToyAzTaEybQYGbQHDrpRkg+1gJWEpH0PLAQoZ8jiY0IzakLfNWnVda1eTYYlxxFYzW8Rqczkg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-x64-gnu": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-gnu/-/nice-linux-x64-gnu-1.0.1.tgz",
+      "integrity": "sha512-XQAJs7DRN2GpLN6Fb+ZdGFeYZDdGl2Fn3TmFlqEL5JorgWKrQGRUrpGKbgZ25UeZPILuTKJ+OowG2avN8mThBA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-linux-x64-musl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-musl/-/nice-linux-x64-musl-1.0.1.tgz",
+      "integrity": "sha512-/rodHpRSgiI9o1faq9SZOp/o2QkKQg7T+DK0R5AkbnI/YxvAIEHf2cngjYzLMQSQgUhxym+LFr+UGZx4vK4QdQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-win32-arm64-msvc": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-arm64-msvc/-/nice-win32-arm64-msvc-1.0.1.tgz",
+      "integrity": "sha512-rEcz9vZymaCB3OqEXoHnp9YViLct8ugF+6uO5McifTedjq4QMQs3DHz35xBEGhH3gJWEsXMUbzazkz5KNM5YUg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-win32-ia32-msvc": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-ia32-msvc/-/nice-win32-ia32-msvc-1.0.1.tgz",
+      "integrity": "sha512-t7eBAyPUrWL8su3gDxw9xxxqNwZzAqKo0Szv3IjVQd1GpXXVkb6vBBQUuxfIYaXMzZLwlxRQ7uzM2vdUE9ULGw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@napi-rs/nice-win32-x64-msvc": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-x64-msvc/-/nice-win32-x64-msvc-1.0.1.tgz",
+      "integrity": "sha512-JlF+uDcatt3St2ntBG8H02F1mM45i5SF9W+bIKiReVE6wiy3o16oBP/yxt+RZ+N6LbCImJXJ6bXNO2kn9AXicg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@napi-rs/wasm-runtime": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz",
       "integrity": "sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@emnapi/core": "^1.1.0",
@@ -8808,9 +8612,9 @@
       }
     },
     "node_modules/@ng-select/ng-select": {
-      "version": "13.9.1",
-      "resolved": "https://registry.npmjs.org/@ng-select/ng-select/-/ng-select-13.9.1.tgz",
-      "integrity": "sha512-+DzQkQp8coGWZREflJM/qx7BXipV6HEVpZCXoa6fJJRHJfmUMsxa5uV6kUVmClUE98Rkffk9CPHt6kZcj8PuqQ==",
+      "version": "14.9.0",
+      "resolved": "https://registry.npmjs.org/@ng-select/ng-select/-/ng-select-14.9.0.tgz",
+      "integrity": "sha512-f/E3EaSVwdKmwvZL43nS961bGaXR90F0Gtb8vA+ub8Hfwqjr1NTI6X7+yu5iMkqfy5ZW5cJdoGvo+kv8zcAkjQ==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.1"
@@ -8820,15 +8624,15 @@
         "npm": ">= 8"
       },
       "peerDependencies": {
-        "@angular/common": "^18.0.0",
-        "@angular/core": "^18.0.0",
-        "@angular/forms": "^18.0.0"
+        "@angular/common": "^19.0.0",
+        "@angular/core": "^19.0.0",
+        "@angular/forms": "^19.0.0"
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.19.tgz",
-      "integrity": "sha512-bExj5JrByKPibsqBbn5Pjn8lo91AUOTsyP2hgKpnOnmSr62rhWSiRwXltgz2MCiZRmuUznpt93WiOLixgYfYvQ==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-19.2.14.tgz",
+      "integrity": "sha512-PqrY+eeSUoF6JC6NCEQRPE/0Y2umSllD/fsDE6pnQrvGfztBpj0Jt1WMhgEI8BBcl4S7QW0LhPynkBmnCvTUmw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8837,8 +8641,8 @@
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": "^18.0.0",
-        "typescript": ">=5.4 <5.6",
+        "@angular/compiler-cli": "^19.0.0 || ^19.2.0-next.0",
+        "typescript": ">=5.5 <5.9",
         "webpack": "^5.54.0"
       }
     },
@@ -8881,9 +8685,9 @@
       }
     },
     "node_modules/@npmcli/agent": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz",
-      "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-3.0.0.tgz",
+      "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -8894,31 +8698,7 @@
         "socks-proxy-agent": "^8.0.3"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/agent/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@npmcli/agent/node_modules/http-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/agent/node_modules/lru-cache": {
@@ -8958,24 +8738,23 @@
       }
     },
     "node_modules/@npmcli/git": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz",
-      "integrity": "sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-6.0.3.tgz",
+      "integrity": "sha512-GUYESQlxZRAdhs3UhbB6pVRNUELQOHXwK9ruDkwmCv2aZ5y0SApQzUJCg02p3A7Ue2J5hxvlk1YI53c00NmRyQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/promise-spawn": "^7.0.0",
-        "ini": "^4.1.3",
+        "@npmcli/promise-spawn": "^8.0.0",
+        "ini": "^5.0.0",
         "lru-cache": "^10.0.1",
-        "npm-pick-manifest": "^9.0.0",
-        "proc-log": "^4.0.0",
-        "promise-inflight": "^1.0.1",
+        "npm-pick-manifest": "^10.0.0",
+        "proc-log": "^5.0.0",
         "promise-retry": "^2.0.1",
         "semver": "^7.3.5",
-        "which": "^4.0.0"
+        "which": "^5.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/git/node_modules/isexe": {
@@ -8996,19 +8775,19 @@
       "license": "ISC"
     },
     "node_modules/@npmcli/git/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
+      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/git/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -9018,24 +8797,24 @@
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/installed-package-contents": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz",
-      "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-3.0.0.tgz",
+      "integrity": "sha512-fkxoPuFGvxyrH+OQzyTkX2LUEamrF4jZSmxjAtPPHHGO0dqsQ8tTKjnIS8SAnPHdk2I03BDtSMR5K/4loKg79Q==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "npm-bundled": "^3.0.0",
-        "npm-normalize-package-bin": "^3.0.0"
+        "npm-bundled": "^4.0.0",
+        "npm-normalize-package-bin": "^4.0.0"
       },
       "bin": {
         "installed-package-contents": "bin/index.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/move-file": {
@@ -9054,9 +8833,9 @@
       }
     },
     "node_modules/@npmcli/move-file/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9117,32 +8896,32 @@
       }
     },
     "node_modules/@npmcli/node-gyp": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz",
-      "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz",
+      "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/package-json": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.1.tgz",
-      "integrity": "sha512-f7zYC6kQautXHvNbLEWgD/uGu1+xCn9izgqBfgItWSx22U0ZDekxN08A1vM8cTxj/cRVe0Q94Ode+tdoYmIOOQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-6.2.0.tgz",
+      "integrity": "sha512-rCNLSB/JzNvot0SEyXqWZ7tX2B5dD2a1br2Dp0vSYVo5jh8Z0EZ7lS9TsZ1UtziddB1UfNUaMCc538/HztnJGA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/git": "^5.0.0",
+        "@npmcli/git": "^6.0.0",
         "glob": "^10.2.2",
-        "hosted-git-info": "^7.0.0",
-        "json-parse-even-better-errors": "^3.0.0",
-        "normalize-package-data": "^6.0.0",
-        "proc-log": "^4.0.0",
-        "semver": "^7.5.3"
+        "hosted-git-info": "^8.0.0",
+        "json-parse-even-better-errors": "^4.0.0",
+        "proc-log": "^5.0.0",
+        "semver": "^7.5.3",
+        "validate-npm-package-license": "^3.0.4"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/package-json/node_modules/glob": {
@@ -9167,16 +8946,16 @@
       }
     },
     "node_modules/@npmcli/package-json/node_modules/hosted-git-info": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.1.0.tgz",
+      "integrity": "sha512-Rw/B2DNQaPBICNXEm8balFz9a6WpZrkCGpcWFpy7nCj+NyhSdqXipmfvtmWt9xGfp0wZnBxB+iVpLmQMYt47Tw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "lru-cache": "^10.0.1"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/package-json/node_modules/jackspeak": {
@@ -9202,6 +8981,22 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/@npmcli/package-json/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@npmcli/package-json/node_modules/path-scurry": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
@@ -9220,26 +9015,26 @@
       }
     },
     "node_modules/@npmcli/package-json/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
+      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/promise-spawn": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz",
-      "integrity": "sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.2.tgz",
+      "integrity": "sha512-/bNJhjc+o6qL+Dwz/bqfTQClkEO5nTQ1ZEcdCkAQjhkZMHIh22LPG7fNh1enJP1NKWDqYiiABnjFCY7E0zHYtQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "which": "^4.0.0"
+        "which": "^5.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/promise-spawn/node_modules/isexe": {
@@ -9253,9 +9048,9 @@
       }
     },
     "node_modules/@npmcli/promise-spawn/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -9265,35 +9060,35 @@
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/redact": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz",
-      "integrity": "sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-3.2.2.tgz",
+      "integrity": "sha512-7VmYAmk4csGv08QzrDKScdzn11jHPFGyqJW39FyPgPuAp3zIaUmuCo1yxw9aGs+NEJuTGQ9Gwqpt93vtJubucg==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/run-script": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-8.1.0.tgz",
-      "integrity": "sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-9.1.0.tgz",
+      "integrity": "sha512-aoNSbxtkePXUlbZB+anS1LqsJdctG5n3UVhfU47+CDdwMi6uNTBMF9gPcQRnqghQd2FGzcwwIFBruFMxjhBewg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/node-gyp": "^3.0.0",
-        "@npmcli/package-json": "^5.0.0",
-        "@npmcli/promise-spawn": "^7.0.0",
-        "node-gyp": "^10.0.0",
-        "proc-log": "^4.0.0",
-        "which": "^4.0.0"
+        "@npmcli/node-gyp": "^4.0.0",
+        "@npmcli/package-json": "^6.0.0",
+        "@npmcli/promise-spawn": "^8.0.0",
+        "node-gyp": "^11.0.0",
+        "proc-log": "^5.0.0",
+        "which": "^5.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/run-script/node_modules/isexe": {
@@ -9307,19 +9102,19 @@
       }
     },
     "node_modules/@npmcli/run-script/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
+      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/run-script/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -9329,177 +9124,391 @@
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@nx/devkit": {
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-21.1.2.tgz",
+      "integrity": "sha512-1dgjwSsNDdp/VXydZnSfzfVwySEB3C9yjzeIw6+3+nRvZfH16a7ggZE7MF5sJTq4d+01hAgIDz3KyvGa6Jf73g==",
+      "license": "MIT",
+      "dependencies": {
+        "ejs": "^3.1.7",
+        "enquirer": "~2.3.6",
+        "ignore": "^5.0.4",
+        "minimatch": "9.0.3",
+        "semver": "^7.5.3",
+        "tmp": "~0.2.1",
+        "tslib": "^2.3.0",
+        "yargs-parser": "21.1.1"
+      },
+      "peerDependencies": {
+        "nx": "21.1.2"
+      }
+    },
+    "node_modules/@nx/devkit/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@nx/eslint": {
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/eslint/-/eslint-21.1.2.tgz",
+      "integrity": "sha512-Mp8u0RlkhxYtZ47d2ou6t8XIpRy7N/n23OzikqMro4Wt/DK1irGyShSoNIqdGdwalAE5MG1OFXspttXB+y/wOQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@nx/devkit": "21.1.2",
+        "@nx/js": "21.1.2",
+        "semver": "^7.5.3",
+        "tslib": "^2.3.0",
+        "typescript": "~5.7.2"
+      },
+      "peerDependencies": {
+        "@zkochan/js-yaml": "0.0.7",
+        "eslint": "^8.0.0 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@zkochan/js-yaml": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nx/eslint/node_modules/typescript": {
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
+      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/@nx/jest": {
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/jest/-/jest-21.1.2.tgz",
+      "integrity": "sha512-y4VZita9LFb6XajulRIwjMcqHU6/f73C4SNSH6IM5BYmkN68ovICmzTGvoaL7wGTaYrA4Moh/WoKwEwQWKxRPQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/reporters": "^29.4.1",
+        "@jest/test-result": "^29.4.1",
+        "@nx/devkit": "21.1.2",
+        "@nx/js": "21.1.2",
+        "@phenomnomnominal/tsquery": "~5.0.1",
+        "identity-obj-proxy": "3.0.0",
+        "jest-config": "^29.4.1",
+        "jest-resolve": "^29.4.1",
+        "jest-util": "^29.4.1",
+        "minimatch": "9.0.3",
+        "picocolors": "^1.1.0",
+        "resolve.exports": "2.0.3",
+        "semver": "^7.5.3",
+        "tslib": "^2.3.0",
+        "yargs-parser": "21.1.1"
+      }
+    },
+    "node_modules/@nx/js": {
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/js/-/js-21.1.2.tgz",
+      "integrity": "sha512-ZF6Zf4Ys+RBvH0GoQHio94C/0N07Px/trAvseMuQ8PKc0tSkXycu/EBc1uAZQvgJThR5o3diAKtIQug77pPYMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.23.2",
+        "@babel/plugin-proposal-decorators": "^7.22.7",
+        "@babel/plugin-transform-class-properties": "^7.22.5",
+        "@babel/plugin-transform-runtime": "^7.23.2",
+        "@babel/preset-env": "^7.23.2",
+        "@babel/preset-typescript": "^7.22.5",
+        "@babel/runtime": "^7.22.6",
+        "@nx/devkit": "21.1.2",
+        "@nx/workspace": "21.1.2",
+        "@zkochan/js-yaml": "0.0.7",
+        "babel-plugin-const-enum": "^1.0.1",
+        "babel-plugin-macros": "^3.1.0",
+        "babel-plugin-transform-typescript-metadata": "^0.3.1",
+        "chalk": "^4.1.0",
+        "columnify": "^1.6.0",
+        "detect-port": "^1.5.1",
+        "enquirer": "~2.3.6",
+        "ignore": "^5.0.4",
+        "js-tokens": "^4.0.0",
+        "jsonc-parser": "3.2.0",
+        "npm-package-arg": "11.0.1",
+        "npm-run-path": "^4.0.1",
+        "ora": "5.3.0",
+        "picocolors": "^1.1.0",
+        "picomatch": "4.0.2",
+        "semver": "^7.5.3",
+        "source-map-support": "0.5.19",
+        "tinyglobby": "^0.2.12",
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "verdaccio": "^6.0.5"
+      },
+      "peerDependenciesMeta": {
+        "verdaccio": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nx/js/node_modules/hosted-git-info": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
+      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^10.0.1"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@nx/js/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@nx/js/node_modules/jsonc-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+      "license": "MIT"
+    },
+    "node_modules/@nx/js/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "license": "ISC"
+    },
+    "node_modules/@nx/js/node_modules/npm-package-arg": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz",
+      "integrity": "sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==",
+      "license": "ISC",
+      "dependencies": {
+        "hosted-git-info": "^7.0.0",
+        "proc-log": "^3.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-name": "^5.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@nx/js/node_modules/ora": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz",
+      "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==",
+      "license": "MIT",
+      "dependencies": {
+        "bl": "^4.0.3",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "log-symbols": "^4.0.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@nx/js/node_modules/proc-log": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
+      "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==",
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@nx/js/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@nx/js/node_modules/source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/@nx/js/node_modules/validate-npm-package-name": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+      "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/@nx/nx-darwin-arm64": {
-      "version": "20.8.0",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.8.0.tgz",
-      "integrity": "sha512-A6Te2KlINtcOo/depXJzPyjbk9E0cmgbom/sm/49XdQ8G94aDfyIIY1RIdwmDCK5NVd74KFG3JIByTk5+VnAhA==",
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-21.1.2.tgz",
+      "integrity": "sha512-9dO32jd+h7SrvQafJph6b7Bsmp2IotTE0w7dAGb4MGBQni3JWCXaxlMMpWUZXWW1pM5uIkFJO5AASW4UOI7w2w==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-darwin-x64": {
-      "version": "20.8.0",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.8.0.tgz",
-      "integrity": "sha512-UpqayUjgalArXaDvOoshqSelTrEp42cGDsZGy0sqpxwBpm3oPQ8wE1d7oBAmRo208rAxOuFP0LZRFUqRrwGvLA==",
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-21.1.2.tgz",
+      "integrity": "sha512-5sf+4PRVg9pDVgD53NE1hoPz4lC8Ni34UovQsOrZgDvwU5mqPbIhTzVYRDH86i/086AcCvjT5tEt7rEcuRwlKw==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-freebsd-x64": {
-      "version": "20.8.0",
-      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.8.0.tgz",
-      "integrity": "sha512-dUR2fsLyKZYMHByvjy2zvmdMbsdXAiP+6uTlIAuu8eHMZ2FPQCAtt7lPYLwOFUxUXChbek2AJ+uCI0gRAgK/eg==",
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-21.1.2.tgz",
+      "integrity": "sha512-E5HR44fimXlQuAgn/tP9esmvxbzt/92AIl0PBT6L3Juh/xYiXKWhda63H4+UNT8AcLRxVXwfZrGPuGCDs+7y/Q==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-linux-arm-gnueabihf": {
-      "version": "20.8.0",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.8.0.tgz",
-      "integrity": "sha512-GuZ7t0SzSX5ksLYva7koKZovQ5h/Kr1pFbOsQcBf3VLREBqFPSz6t7CVYpsIsMhiu/I3EKq6FZI3wDOJbee5uw==",
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-21.1.2.tgz",
+      "integrity": "sha512-V4n6DE+r12gwJHFjZs+e2GmWYZdhpgA2DYWbsYWRYb1XQCNUg4vPzt+YFzWZ+K2o91k93EBnlLfrag7CqxUslw==",
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-linux-arm64-gnu": {
-      "version": "20.8.0",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.8.0.tgz",
-      "integrity": "sha512-CiI955Q+XZmBBZ7cQqQg0MhGEFwZIgSpJnjPfWBt3iOYP8aE6nZpNOkmD7O8XcN/nEwwyeCOF8euXqEStwsk8w==",
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-21.1.2.tgz",
+      "integrity": "sha512-NFhsp27O+mS3r7PWLmJgyZy42WQ72c2pTQSpYfhaBbZPTI5DqBHdANa0sEPmV+ON24qkl5CZKvsmhzjsNmyW6A==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-linux-arm64-musl": {
-      "version": "20.8.0",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.8.0.tgz",
-      "integrity": "sha512-Iy9DpvVisxsfNh4gOinmMQ4cLWdBlgvt1wmry1UwvcXg479p1oJQ1Kp1wksUZoWYqrAG8VPZUmkE0f7gjyHTGg==",
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-21.1.2.tgz",
+      "integrity": "sha512-BgS9npARwcnw+hoaRsbas6vdBAJRBAj5qSeL57LO8Dva+e/6PYqoNyVJ0BgJ98xPXDpzM/NnpeRsndQGpLyhDw==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-linux-x64-gnu": {
-      "version": "20.8.0",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.8.0.tgz",
-      "integrity": "sha512-kZrrXXzVSbqwmdTmQ9xL4Jhi0/FSLrePSxYCL9oOM3Rsj0lmo/aC9kz4NBv1ZzuqT7fumpBOnhqiL1QyhOWOeQ==",
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-21.1.2.tgz",
+      "integrity": "sha512-tjBINbymQgxnIlNK/m6B0P5eiGRSHSYPNkFdh3+sra80AP/ymHGLRxxZy702Ga2xg8RVr9zEvuXYHI+QBa1YmA==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-linux-x64-musl": {
-      "version": "20.8.0",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.8.0.tgz",
-      "integrity": "sha512-0l9jEMN8NhULKYCFiDF7QVpMMNG40duya+OF8dH0OzFj52N0zTsvsgLY72TIhslCB/cC74oAzsmWEIiFslscnA==",
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-21.1.2.tgz",
+      "integrity": "sha512-+0V0YAOWMh1wvpQZuayQ7y+sj2MhE3l7z0JMD9SX/4xv9zLOWGv+EiUmN/fGoU/mwsSkH2wTCo6G6quKF1E8jQ==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-win32-arm64-msvc": {
-      "version": "20.8.0",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.8.0.tgz",
-      "integrity": "sha512-5miZJmRSwx1jybBsiB3NGocXL9TxGdT2D+dOqR2fsLklpGz0ItEWm8+i8lhDjgOdAr2nFcuQUfQMY57f9FOHrA==",
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-21.1.2.tgz",
+      "integrity": "sha512-E+ECMQIMJ6R47BMW5YpDyOhTqczvFaL8k24umRkcvlRh3SraczyxBVPkYHDukDp7tCeIszc5EvdWc83C3W8U4w==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-win32-x64-msvc": {
-      "version": "20.8.0",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.8.0.tgz",
-      "integrity": "sha512-0P5r+bDuSNvoWys+6C1/KqGpYlqwSHpigCcyRzR62iZpT3OooZv+nWO06RlURkxMR8LNvYXTSSLvoLkjxqM8uQ==",
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-21.1.2.tgz",
+      "integrity": "sha512-J9rNTBOS7Ld6CybU/cou1Fg52AHSYsiwpZISM2RNM0XIoVSDk3Jsvh4OJgS2rvV0Sp/cgDg3ieOMAreekH+TKw==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
+      ]
+    },
+    "node_modules/@nx/workspace": {
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-21.1.2.tgz",
+      "integrity": "sha512-I4e/X/GN0Vx3FDZv/7bFYmXfOPmcMI3cDO/rg+TqudsuxVM7tJ7+8jtwdpU4I2IEpI6oU9FZ7Fu9R2uNqL5rrQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@nx/devkit": "21.1.2",
+        "@zkochan/js-yaml": "0.0.7",
+        "chalk": "^4.1.0",
+        "enquirer": "~2.3.6",
+        "nx": "21.1.2",
+        "picomatch": "4.0.2",
+        "tslib": "^2.3.0",
+        "yargs-parser": "21.1.1"
       }
     },
     "node_modules/@parcel/watcher": {
@@ -9873,6 +9882,18 @@
         "node": ">=10"
       }
     },
+    "node_modules/@phenomnomnominal/tsquery": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@phenomnomnominal/tsquery/-/tsquery-5.0.1.tgz",
+      "integrity": "sha512-3nVv+e2FQwsW8Aw6qTU6f+1rfcJ3hrcnvH/mu9i8YhxO+9sqbOfpL8m6PbET5+xKOlz/VSbp0RoYWYCtIsnmuA==",
+      "license": "MIT",
+      "dependencies": {
+        "esquery": "^1.4.0"
+      },
+      "peerDependencies": {
+        "typescript": "^3 || ^4 || ^5"
+      }
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -9885,9 +9906,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
-      "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.8.tgz",
+      "integrity": "sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==",
       "cpu": [
         "arm"
       ],
@@ -9899,9 +9920,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
-      "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.8.tgz",
+      "integrity": "sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==",
       "cpu": [
         "arm64"
       ],
@@ -9913,9 +9934,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
-      "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.8.tgz",
+      "integrity": "sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==",
       "cpu": [
         "arm64"
       ],
@@ -9927,9 +9948,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
-      "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.8.tgz",
+      "integrity": "sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==",
       "cpu": [
         "x64"
       ],
@@ -9940,10 +9961,38 @@
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.8.tgz",
+      "integrity": "sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.8.tgz",
+      "integrity": "sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
-      "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.8.tgz",
+      "integrity": "sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==",
       "cpu": [
         "arm"
       ],
@@ -9955,9 +10004,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
-      "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.8.tgz",
+      "integrity": "sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==",
       "cpu": [
         "arm"
       ],
@@ -9969,9 +10018,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
-      "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.8.tgz",
+      "integrity": "sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==",
       "cpu": [
         "arm64"
       ],
@@ -9983,9 +10032,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
-      "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.8.tgz",
+      "integrity": "sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==",
       "cpu": [
         "arm64"
       ],
@@ -9996,10 +10045,24 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.8.tgz",
+      "integrity": "sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
-      "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.8.tgz",
+      "integrity": "sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==",
       "cpu": [
         "ppc64"
       ],
@@ -10011,9 +10074,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
-      "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.8.tgz",
+      "integrity": "sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==",
       "cpu": [
         "riscv64"
       ],
@@ -10024,10 +10087,25 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz",
+      "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
-      "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz",
+      "integrity": "sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==",
       "cpu": [
         "s390x"
       ],
@@ -10039,9 +10117,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
-      "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.8.tgz",
+      "integrity": "sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==",
       "cpu": [
         "x64"
       ],
@@ -10053,9 +10131,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
-      "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.8.tgz",
+      "integrity": "sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==",
       "cpu": [
         "x64"
       ],
@@ -10067,9 +10145,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
-      "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.8.tgz",
+      "integrity": "sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==",
       "cpu": [
         "arm64"
       ],
@@ -10081,9 +10159,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
-      "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.8.tgz",
+      "integrity": "sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==",
       "cpu": [
         "ia32"
       ],
@@ -10095,9 +10173,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
-      "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.8.tgz",
+      "integrity": "sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==",
       "cpu": [
         "x64"
       ],
@@ -10116,14 +10194,14 @@
       "license": "MIT"
     },
     "node_modules/@schematics/angular": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.19.tgz",
-      "integrity": "sha512-s9aynH/fwB/LT94miVfsaL2C4Qd5BLgjMzWFx7iJ8Hyv7FjOBGYO6eGVovjCt2c6/abG+GQAk4EBOCfg3AUtCA==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.2.14.tgz",
+      "integrity": "sha512-p/jvMwth67g7tOrziTx+yWRagIPtjx21TF2uU2Pv5bqTY+JjRTczJs3yHPmVpzJN+ptmw47K4/NeLJmVUGuBgA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "18.2.19",
-        "@angular-devkit/schematics": "18.2.19",
+        "@angular-devkit/core": "19.2.14",
+        "@angular-devkit/schematics": "19.2.14",
         "jsonc-parser": "3.3.1"
       },
       "engines": {
@@ -10133,9 +10211,9 @@
       }
     },
     "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.19.tgz",
-      "integrity": "sha512-Ptf92Zomc6FCr7GWmHKdgOUbA1GpctZwH/hRcpYpU3tM56MG2t5FOFpufnE595GgolOCktabkFEoODMG8PBVDQ==",
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.14.tgz",
+      "integrity": "sha512-aaPEnRNIBoYT4XrrYcZlHadX8vFDTUR+4wUgcmr0cNDLeWzWtoPFeVq8TQD6kFDeqovSx/UVEblGgg/28WvHyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10152,7 +10230,7 @@
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "chokidar": "^3.5.2"
+        "chokidar": "^4.0.0"
       },
       "peerDependenciesMeta": {
         "chokidar": {
@@ -10160,76 +10238,23 @@
         }
       }
     },
-    "node_modules/@schematics/angular/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+    "node_modules/@schematics/angular/node_modules/@angular-devkit/schematics": {
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.2.14.tgz",
+      "integrity": "sha512-s89/MWXHy8+GP/cRfFbSECIG3FQQQwNVv44OOmghPVgKQgQ+EoE/zygL2hqKYTUPoPaS/IhNXdXjSE5pS9yLeg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
+        "@angular-devkit/core": "19.2.14",
+        "jsonc-parser": "3.3.1",
+        "magic-string": "0.30.17",
+        "ora": "5.4.1",
+        "rxjs": "7.8.1"
       },
       "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/readdirp/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@sideway/address": {
@@ -10257,32 +10282,32 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@sigstore/bundle": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz",
-      "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz",
+      "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/protobuf-specs": "^0.3.2"
+        "@sigstore/protobuf-specs": "^0.4.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/core": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz",
-      "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz",
+      "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/protobuf-specs": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.3.tgz",
-      "integrity": "sha512-RpacQhBlwpBWd7KEJsRKcBQalbV28fvkxwTOJIqhIuDysMMaJW47V4OqW30iJB9uRpqOSxxEAQFdr8tTattReQ==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.4.3.tgz",
+      "integrity": "sha512-fk2zjD9117RL9BjqEwF7fwv7Q/P9yGsMV4MUJZ/DocaQJ6+3pKr+syBq1owU5Q5qGw5CUbXzm+4yJ2JVRDQeSA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -10290,44 +10315,44 @@
       }
     },
     "node_modules/@sigstore/sign": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz",
-      "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz",
+      "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/bundle": "^2.3.2",
-        "@sigstore/core": "^1.0.0",
-        "@sigstore/protobuf-specs": "^0.3.2",
-        "make-fetch-happen": "^13.0.1",
-        "proc-log": "^4.2.0",
+        "@sigstore/bundle": "^3.1.0",
+        "@sigstore/core": "^2.0.0",
+        "@sigstore/protobuf-specs": "^0.4.0",
+        "make-fetch-happen": "^14.0.2",
+        "proc-log": "^5.0.0",
         "promise-retry": "^2.0.1"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/sign/node_modules/@npmcli/fs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
-      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
+      "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/sign/node_modules/cacache": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
-      "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==",
+      "version": "19.0.1",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz",
+      "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/fs": "^3.1.0",
+        "@npmcli/fs": "^4.0.0",
         "fs-minipass": "^3.0.0",
         "glob": "^10.2.2",
         "lru-cache": "^10.0.1",
@@ -10335,13 +10360,23 @@
         "minipass-collect": "^2.0.1",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "p-map": "^4.0.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11",
-        "unique-filename": "^3.0.0"
+        "p-map": "^7.0.2",
+        "ssri": "^12.0.0",
+        "tar": "^7.4.3",
+        "unique-filename": "^4.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/chownr": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@sigstore/sign/node_modules/fs-minipass": {
@@ -10402,27 +10437,42 @@
       "license": "ISC"
     },
     "node_modules/@sigstore/sign/node_modules/make-fetch-happen": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
-      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz",
+      "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/agent": "^2.0.0",
-        "cacache": "^18.0.0",
+        "@npmcli/agent": "^3.0.0",
+        "cacache": "^19.0.1",
         "http-cache-semantics": "^4.1.1",
-        "is-lambda": "^1.0.1",
         "minipass": "^7.0.2",
-        "minipass-fetch": "^3.0.0",
+        "minipass-fetch": "^4.0.0",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "proc-log": "^4.2.0",
+        "negotiator": "^1.0.0",
+        "proc-log": "^5.0.0",
         "promise-retry": "^2.0.1",
-        "ssri": "^10.0.0"
+        "ssri": "^12.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/@sigstore/sign/node_modules/minipass-collect": {
@@ -10439,31 +10489,63 @@
       }
     },
     "node_modules/@sigstore/sign/node_modules/minipass-fetch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
-      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz",
+      "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "minipass": "^7.0.3",
         "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
+        "minizlib": "^3.0.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       },
       "optionalDependencies": {
         "encoding": "^0.1.13"
       }
     },
-    "node_modules/@sigstore/sign/node_modules/negotiator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+    "node_modules/@sigstore/sign/node_modules/minizlib": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
+      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/p-map": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz",
+      "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@sigstore/sign/node_modules/path-scurry": {
@@ -10484,88 +10566,115 @@
       }
     },
     "node_modules/@sigstore/sign/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
+      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/sign/node_modules/ssri": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
-      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz",
+      "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "minipass": "^7.0.3"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/@sigstore/sign/node_modules/unique-filename": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+    "node_modules/@sigstore/sign/node_modules/tar": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "unique-slug": "^4.0.0"
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/unique-filename": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz",
+      "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "unique-slug": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/sign/node_modules/unique-slug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz",
+      "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/yallist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@sigstore/tuf": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz",
-      "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.1.1.tgz",
+      "integrity": "sha512-eFFvlcBIoGwVkkwmTi/vEQFSva3xs5Ot3WmBcjgjVdiaoelBLQaQ/ZBfhlG0MnG0cmTYScPpk7eDdGDWUcFUmg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/protobuf-specs": "^0.3.2",
-        "tuf-js": "^2.2.1"
+        "@sigstore/protobuf-specs": "^0.4.1",
+        "tuf-js": "^3.0.1"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/verify": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz",
-      "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz",
+      "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/bundle": "^2.3.2",
-        "@sigstore/core": "^1.1.0",
-        "@sigstore/protobuf-specs": "^0.3.2"
+        "@sigstore/bundle": "^3.1.0",
+        "@sigstore/core": "^2.0.0",
+        "@sigstore/protobuf-specs": "^0.4.1"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
       "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@sindresorhus/is": {
@@ -10598,7 +10707,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
       "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "type-detect": "4.0.8"
@@ -10608,7 +10716,6 @@
       "version": "10.3.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
       "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^3.0.0"
@@ -11475,15 +11582,15 @@
       }
     },
     "node_modules/@swc/core": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.11.29.tgz",
-      "integrity": "sha512-g4mThMIpWbNhV8G2rWp5a5/Igv8/2UFRJx2yImrLGMgrDDYZIopqZ/z0jZxDgqNA1QDx93rpwNF7jGsxVWcMlA==",
-      "dev": true,
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.12.5.tgz",
+      "integrity": "sha512-KxA0PHHIuUBmQ/Oi+xFpVzILj2Oo37sTtftCbyowQlyx5YOknEOw1kLpas5hMcpznXgFyAWbpK71xQps4INPgA==",
+      "devOptional": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@swc/counter": "^0.1.3",
-        "@swc/types": "^0.1.21"
+        "@swc/types": "^0.1.23"
       },
       "engines": {
         "node": ">=10"
@@ -11493,16 +11600,16 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.11.29",
-        "@swc/core-darwin-x64": "1.11.29",
-        "@swc/core-linux-arm-gnueabihf": "1.11.29",
-        "@swc/core-linux-arm64-gnu": "1.11.29",
-        "@swc/core-linux-arm64-musl": "1.11.29",
-        "@swc/core-linux-x64-gnu": "1.11.29",
-        "@swc/core-linux-x64-musl": "1.11.29",
-        "@swc/core-win32-arm64-msvc": "1.11.29",
-        "@swc/core-win32-ia32-msvc": "1.11.29",
-        "@swc/core-win32-x64-msvc": "1.11.29"
+        "@swc/core-darwin-arm64": "1.12.5",
+        "@swc/core-darwin-x64": "1.12.5",
+        "@swc/core-linux-arm-gnueabihf": "1.12.5",
+        "@swc/core-linux-arm64-gnu": "1.12.5",
+        "@swc/core-linux-arm64-musl": "1.12.5",
+        "@swc/core-linux-x64-gnu": "1.12.5",
+        "@swc/core-linux-x64-musl": "1.12.5",
+        "@swc/core-win32-arm64-msvc": "1.12.5",
+        "@swc/core-win32-ia32-msvc": "1.12.5",
+        "@swc/core-win32-x64-msvc": "1.12.5"
       },
       "peerDependencies": {
         "@swc/helpers": ">=0.5.17"
@@ -11514,13 +11621,12 @@
       }
     },
     "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.11.29.tgz",
-      "integrity": "sha512-whsCX7URzbuS5aET58c75Dloby3Gtj/ITk2vc4WW6pSDQKSPDuONsIcZ7B2ng8oz0K6ttbi4p3H/PNPQLJ4maQ==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.12.5.tgz",
+      "integrity": "sha512-3WF+naP/qkt5flrTfJr+p07b522JcixKvIivM7FgvllA6LjJxf+pheoILrTS8IwrNAK/XtHfKWYcGY+3eaA4mA==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
@@ -11531,13 +11637,12 @@
       }
     },
     "node_modules/@swc/core-darwin-x64": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.11.29.tgz",
-      "integrity": "sha512-S3eTo/KYFk+76cWJRgX30hylN5XkSmjYtCBnM4jPLYn7L6zWYEPajsFLmruQEiTEDUg0gBEWLMNyUeghtswouw==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.12.5.tgz",
+      "integrity": "sha512-GCcD3dft8YN7unTBcW02Fx41jXp2MNQHCjx5ceWSEYOGvn7vBSUp7k7LkfTxGN5Ftxb9a1mxhPq8r4rD2u/aPw==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
@@ -11548,13 +11653,12 @@
       }
     },
     "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.11.29.tgz",
-      "integrity": "sha512-o9gdshbzkUMG6azldHdmKklcfrcMx+a23d/2qHQHPDLUPAN+Trd+sDQUYArK5Fcm7TlpG4sczz95ghN0DMkM7g==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.12.5.tgz",
+      "integrity": "sha512-jWlzP/Y4+wbE/EJM+WGIDQsklLFV3g5LmbYTBgrY4+5nb517P31mkBzf5y2knfNWPrL7HzNu0578j3Zi2E6Iig==",
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -11565,13 +11669,12 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.11.29.tgz",
-      "integrity": "sha512-sLoaciOgUKQF1KX9T6hPGzvhOQaJn+3DHy4LOHeXhQqvBgr+7QcZ+hl4uixPKTzxk6hy6Hb0QOvQEdBAAR1gXw==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.12.5.tgz",
+      "integrity": "sha512-GkzgIUz+2r6J6Tn3hb7/4ByaWHRrRZt4vuN9BLAd+y65m2Bt0vlEpPtWhrB/TVe4hEkFR+W5PDETLEbUT4i0tQ==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
@@ -11582,13 +11685,12 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.11.29.tgz",
-      "integrity": "sha512-PwjB10BC0N+Ce7RU/L23eYch6lXFHz7r3NFavIcwDNa/AAqywfxyxh13OeRy+P0cg7NDpWEETWspXeI4Ek8otw==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.12.5.tgz",
+      "integrity": "sha512-g0AJ7QmZPj3Uw+C5pDa48LAUG7JBgQmB0mN5cW+s2mjaFKT0mTSxYALtx/MDZwJExDPo0yJV8kSbFO1tvFPyhg==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
@@ -11599,13 +11701,12 @@
       }
     },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.11.29.tgz",
-      "integrity": "sha512-i62vBVoPaVe9A3mc6gJG07n0/e7FVeAvdD9uzZTtGLiuIfVfIBta8EMquzvf+POLycSk79Z6lRhGPZPJPYiQaA==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.12.5.tgz",
+      "integrity": "sha512-PeYoSziNy+iNiBHPtAsO84bzBne/mbCsG5ijYkAhS1GVsDgohClorUvRXXhcUZoX2gr8TfSI9WLHo30K+DKiHg==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
@@ -11616,13 +11717,12 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.11.29.tgz",
-      "integrity": "sha512-YER0XU1xqFdK0hKkfSVX1YIyCvMDI7K07GIpefPvcfyNGs38AXKhb2byySDjbVxkdl4dycaxxhRyhQ2gKSlsFQ==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.12.5.tgz",
+      "integrity": "sha512-EJrfCCIyuV5LLmYgKtIMwtgsnjVesdFe0IgQzEKs9OfB6cL6g7WO9conn8BkGX8jphVa7jChKxShDGkreWWDzA==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
@@ -11633,13 +11733,12 @@
       }
     },
     "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.11.29.tgz",
-      "integrity": "sha512-po+WHw+k9g6FAg5IJ+sMwtA/fIUL3zPQ4m/uJgONBATCVnDDkyW6dBA49uHNVtSEvjvhuD8DVWdFP847YTcITw==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.12.5.tgz",
+      "integrity": "sha512-FnwT7fxkJJMgsfiDoZKEVGyCzrPFbzpflFAAoTCUCu3MaHw6mW55o/MAAfofvJ1iIcEpec4o93OilsmKtpyO5Q==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
@@ -11650,13 +11749,12 @@
       }
     },
     "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.11.29.tgz",
-      "integrity": "sha512-h+NjOrbqdRBYr5ItmStmQt6x3tnhqgwbj9YxdGPepbTDamFv7vFnhZR0YfB3jz3UKJ8H3uGJ65Zw1VsC+xpFkg==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.12.5.tgz",
+      "integrity": "sha512-jW6l4KFt9mIXSpGseE6BQOEFmbIeXeShDuWgldEJXKeXf/uPs8wrqv80XBIUwVpK0ZbmJwPQ0waGVj8UM3th2Q==",
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
@@ -11667,13 +11765,12 @@
       }
     },
     "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.11.29.tgz",
-      "integrity": "sha512-Q8cs2BDV9wqDvqobkXOYdC+pLUSEpX/KvI0Dgfun1F+LzuLotRFuDhrvkU9ETJA6OnD2+Fn/ieHgloiKA/Mn/g==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.12.5.tgz",
+      "integrity": "sha512-AZszwuEjlz1tSNLQRm3T5OZJ5eebxjJlDQnnzXJmg0B7DJMRoaAe1HTLOmejxjFK6yWr7fh+pSeCw2PgQLxgqA==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
@@ -11687,7 +11784,7 @@
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
       "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "Apache-2.0"
     },
     "node_modules/@swc/jest": {
@@ -11709,10 +11806,10 @@
       }
     },
     "node_modules/@swc/types": {
-      "version": "0.1.21",
-      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.21.tgz",
-      "integrity": "sha512-2YEtj5HJVbKivud9N4bpPBAyZhj4S2Ipe5LkUG94alTpr7in/GU/EARgPAd3BwU+YOmFVJC2+kjqhGRi3r0ZpQ==",
-      "dev": true,
+      "version": "0.1.23",
+      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.23.tgz",
+      "integrity": "sha512-u1iIVZV9Q0jxY+yM2vw/hZGDNudsN85bBpTqzAQ9rzkxW9D+e3aEM4Han+ow518gSewkXgjmEK0BD79ZcNVgPw==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@swc/counter": "^0.1.3"
@@ -11818,9 +11915,9 @@
       }
     },
     "node_modules/@thednp/event-listener": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/@thednp/event-listener/-/event-listener-2.0.8.tgz",
-      "integrity": "sha512-bZY04sWSn2YWAqcuY/fYy03ynARYHwn8xzYgdqqcHBXsBXhOc+bbWwHyLwW28XAA2NjzjMPZZAM3N5D09i+zEQ==",
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/@thednp/event-listener/-/event-listener-2.0.10.tgz",
+      "integrity": "sha512-TH7YVKmoKg6GBLqZB+ETXObofcqJ/Tp5ycheolvYZMjLbMpzYf6MmOWTcBtx8+zrhWy8deV0hYkPvDFioDXdVQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11829,13 +11926,13 @@
       }
     },
     "node_modules/@thednp/position-observer": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@thednp/position-observer/-/position-observer-1.0.7.tgz",
-      "integrity": "sha512-MkUAMMgqZPxy71hpcrKr9ZtedMk+oIFbFs5B8uKD857iuYKRJxgJtC1Itus14EEM4qMyeN0x47AUZJmZJQyXbQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@thednp/position-observer/-/position-observer-1.1.0.tgz",
+      "integrity": "sha512-WgldP6Dltp2hJkSwp3+IVu05ClK/2IF33iftiQLb7UHcuO6eydjXiIUeOCClgCy3FDCGau2l/LRVg3oOO3Ytcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@thednp/shorty": "^2.0.10"
+        "@thednp/shorty": "^2.0.11"
       },
       "engines": {
         "node": ">=16",
@@ -11843,9 +11940,9 @@
       }
     },
     "node_modules/@thednp/shorty": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/@thednp/shorty/-/shorty-2.0.10.tgz",
-      "integrity": "sha512-H+hs1lw3Yc1NfwG0b7F7YmVjxQZ31NO2+6zx+I+9XabHxdwPKjvYJnkKKXr7bSItgm2AFrfOn5+3veB6W4iauw==",
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@thednp/shorty/-/shorty-2.0.11.tgz",
+      "integrity": "sha512-D+rLHt1l7c608yCuzXYJ75aDNWeMVbor+m1HO/XibhiWRbCpD8r6TUv3ayJI+feVfCnBNfrH+p6LSDn9l99uBA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11875,6 +11972,46 @@
         "tinyglobby": "^0.2.9"
       }
     },
+    "node_modules/@ts-morph/common/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+      "license": "MIT"
+    },
     "node_modules/@tufjs/canonical-json": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz",
@@ -11886,24 +12023,39 @@
       }
     },
     "node_modules/@tufjs/models": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz",
-      "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-3.0.1.tgz",
+      "integrity": "sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@tufjs/canonical-json": "2.0.0",
-        "minimatch": "^9.0.4"
+        "minimatch": "^9.0.5"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@tufjs/models/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/@tybys/wasm-util": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz",
       "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.4.0"
@@ -11937,7 +12089,6 @@
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
       "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.20.7",
@@ -11951,7 +12102,6 @@
       "version": "7.27.0",
       "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz",
       "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.0.0"
@@ -11961,7 +12111,6 @@
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
       "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.1.0",
@@ -11972,16 +12121,15 @@
       "version": "7.20.7",
       "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz",
       "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.20.7"
       }
     },
     "node_modules/@types/body-parser": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
-      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
+      "version": "1.19.6",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
+      "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12045,16 +12193,16 @@
       }
     },
     "node_modules/@types/content-disposition": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.8.tgz",
-      "integrity": "sha512-QVSSvno3dE0MgO76pJhmv4Qyi/j0Yk9pBp0Y7TJ2Tlj+KCgJWY6qX7nnxCOLkZ3VYRSIk1WTxCvwUSdx6CCLdg==",
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.9.tgz",
+      "integrity": "sha512-8uYXI3Gw35MhiVYhG3s295oihrxRyytcRHjSjqnqZVDDy/xcGBRny7+Xj1Wgfhv5QzRtN2hB2dVRBUX9XW3UcQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/cookies": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.9.0.tgz",
-      "integrity": "sha512-40Zk8qR147RABiQ7NQnBzWzDcjKzNrntB5BAmeGCb2p/MIyOE+4BVvc17wumsUqUw00bJYqoXFHYygQnEFh4/Q==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.9.1.tgz",
+      "integrity": "sha512-E/DPgzifH4sM1UMadJMWd6mO2jOd4g1Ejwzx8/uRCDpJis1IrlyQEcGAYEomtAqRYmD5ORbNXMeI9U0RiVGZbg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12097,16 +12245,15 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
-      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
-      "dev": true,
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
       "license": "MIT"
     },
     "node_modules/@types/express": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.2.tgz",
-      "integrity": "sha512-BtjL3ZwbCQriyb0DGw+Rt12qAXPiBTPs815lsUvtt1Grk0vLRMZNMUZ741d5rjk+UQOxfDiBZ3dxpX00vSkK3g==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.3.tgz",
+      "integrity": "sha512-wGA0NX93b19/dZC1J18tKWVIYWyyF2ZjT9vin/NRu0qzzvfVzWjs04iq2rQ3H65vCTQYlRqs3YHfY7zjdV+9Kw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12166,7 +12313,6 @@
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
       "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -12201,9 +12347,9 @@
       "license": "MIT"
     },
     "node_modules/@types/http-errors": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
-      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
+      "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
       "dev": true,
       "license": "MIT"
     },
@@ -12232,14 +12378,12 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
       "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
       "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
@@ -12249,16 +12393,15 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
       "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
     },
     "node_modules/@types/jest": {
-      "version": "29.5.12",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
-      "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
+      "version": "29.5.14",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
+      "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12317,7 +12460,6 @@
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/json5": {
@@ -12419,9 +12561,9 @@
       }
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.17",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.17.tgz",
-      "integrity": "sha512-RRVJ+J3J+WmyOTqnz3PiBLA501eKwXl2noseKOrNo/6+XEHjTAxO4xHvxQB6QuNm+s4WRbn6rSiap8+EA+ykFQ==",
+      "version": "4.17.18",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.18.tgz",
+      "integrity": "sha512-KJ65INaxqxmU6EoCiJmRPZC9H9RVWCRd349tXM2M3O5NA7cY6YL7c0bHAHQ93NOfTObEQ004kd2QVHs/r0+m4g==",
       "dev": true,
       "license": "MIT"
     },
@@ -12473,21 +12615,10 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/mute-stream": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz",
-      "integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/node": {
       "version": "22.15.3",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz",
       "integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
@@ -12582,9 +12713,9 @@
       }
     },
     "node_modules/@types/prop-types": {
-      "version": "15.7.14",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
-      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
+      "version": "15.7.15",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
+      "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
       "dev": true,
       "license": "MIT"
     },
@@ -12658,9 +12789,9 @@
       "license": "MIT"
     },
     "node_modules/@types/send": {
-      "version": "0.17.4",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
-      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
+      "version": "0.17.5",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",
+      "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12679,9 +12810,9 @@
       }
     },
     "node_modules/@types/serve-static": {
-      "version": "1.15.7",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
-      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
+      "version": "1.15.8",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz",
+      "integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12704,7 +12835,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
       "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/through": {
@@ -12769,13 +12899,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/wrap-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz",
-      "integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/ws": {
       "version": "8.18.1",
       "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
@@ -12790,7 +12913,6 @@
       "version": "17.0.33",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
       "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
@@ -12800,7 +12922,6 @@
       "version": "21.0.3",
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
       "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/yauzl": {
@@ -13187,9 +13308,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
-      "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
+      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13241,6 +13362,22 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@typescript-eslint/utils": {
       "version": "8.31.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.31.0.tgz",
@@ -13312,9 +13449,9 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -13324,10 +13461,38 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@unrs/resolver-binding-android-arm-eabi": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.9.1.tgz",
+      "integrity": "sha512-dd7yIp1hfJFX9ZlVLQRrh/Re9WMUHHmF9hrKD1yIvxcyNr2BhQ3xc1upAVhy8NijadnCswAxWQu8MkkSMC1qXQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-android-arm64": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.9.1.tgz",
+      "integrity": "sha512-EzUPcMFtDVlo5yrbzMqUsGq3HnLXw+3ZOhSd7CUaDmbTtnrzM+RO2ntw2dm2wjbbc5djWj3yX0wzbbg8pLhx8g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
     "node_modules/@unrs/resolver-binding-darwin-arm64": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.7.2.tgz",
-      "integrity": "sha512-vxtBno4xvowwNmO/ASL0Y45TpHqmNkAaDtz4Jqb+clmcVSSl8XCG/PNFFkGsXXXS6AMjP+ja/TtNCFFa1QwLRg==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.9.1.tgz",
+      "integrity": "sha512-nB+dna3q4kOleKFcSZJ/wDXIsAd1kpMO9XrVAt8tG3RDWJ6vi+Ic6bpz4cmg5tWNeCfHEY4KuqJCB+pKejPEmQ==",
       "cpu": [
         "arm64"
       ],
@@ -13339,9 +13504,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-darwin-x64": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.7.2.tgz",
-      "integrity": "sha512-qhVa8ozu92C23Hsmv0BF4+5Dyyd5STT1FolV4whNgbY6mj3kA0qsrGPe35zNR3wAN7eFict3s4Rc2dDTPBTuFQ==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.9.1.tgz",
+      "integrity": "sha512-aKWHCrOGaCGwZcekf3TnczQoBxk5w//W3RZ4EQyhux6rKDwBPgDU9Y2yGigCV1Z+8DWqZgVGQi+hdpnlSy3a1w==",
       "cpu": [
         "x64"
       ],
@@ -13353,9 +13518,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-freebsd-x64": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.7.2.tgz",
-      "integrity": "sha512-zKKdm2uMXqLFX6Ac7K5ElnnG5VIXbDlFWzg4WJ8CGUedJryM5A3cTgHuGMw1+P5ziV8CRhnSEgOnurTI4vpHpg==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.9.1.tgz",
+      "integrity": "sha512-4dIEMXrXt0UqDVgrsUd1I+NoIzVQWXy/CNhgpfS75rOOMK/4Abn0Mx2M2gWH4Mk9+ds/ASAiCmqoUFynmMY5hA==",
       "cpu": [
         "x64"
       ],
@@ -13367,9 +13532,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.7.2.tgz",
-      "integrity": "sha512-8N1z1TbPnHH+iDS/42GJ0bMPLiGK+cUqOhNbMKtWJ4oFGzqSJk/zoXFzcQkgtI63qMcUI7wW1tq2usZQSb2jxw==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.9.1.tgz",
+      "integrity": "sha512-vtvS13IXPs1eE8DuS/soiosqMBeyh50YLRZ+p7EaIKAPPeevRnA9G/wu/KbVt01ZD5qiGjxS+CGIdVC7I6gTOw==",
       "cpu": [
         "arm"
       ],
@@ -13381,9 +13546,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.7.2.tgz",
-      "integrity": "sha512-tjYzI9LcAXR9MYd9rO45m1s0B/6bJNuZ6jeOxo1pq1K6OBuRMMmfyvJYval3s9FPPGmrldYA3mi4gWDlWuTFGA==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.9.1.tgz",
+      "integrity": "sha512-BfdnN6aZ7NcX8djW8SR6GOJc+K+sFhWRF4vJueVE0vbUu5N1bLnBpxJg1TGlhSyo+ImC4SR0jcNiKN0jdoxt+A==",
       "cpu": [
         "arm"
       ],
@@ -13395,9 +13560,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.7.2.tgz",
-      "integrity": "sha512-jon9M7DKRLGZ9VYSkFMflvNqu9hDtOCEnO2QAryFWgT6o6AXU8du56V7YqnaLKr6rAbZBWYsYpikF226v423QA==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.9.1.tgz",
+      "integrity": "sha512-Jhge7lFtH0QqfRz2PyJjJXWENqywPteITd+nOS0L6AhbZli+UmEyGBd2Sstt1c+l9C+j/YvKTl9wJo9PPmsFNg==",
       "cpu": [
         "arm64"
       ],
@@ -13409,9 +13574,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.7.2.tgz",
-      "integrity": "sha512-c8Cg4/h+kQ63pL43wBNaVMmOjXI/X62wQmru51qjfTvI7kmCy5uHTJvK/9LrF0G8Jdx8r34d019P1DVJmhXQpA==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.9.1.tgz",
+      "integrity": "sha512-ofdK/ow+ZSbSU0pRoB7uBaiRHeaAOYQFU5Spp87LdcPL/P1RhbCTMSIYVb61XWzsVEmYKjHFtoIE0wxP6AFvrA==",
       "cpu": [
         "arm64"
       ],
@@ -13423,9 +13588,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.7.2.tgz",
-      "integrity": "sha512-A+lcwRFyrjeJmv3JJvhz5NbcCkLQL6Mk16kHTNm6/aGNc4FwPHPE4DR9DwuCvCnVHvF5IAd9U4VIs/VvVir5lg==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.9.1.tgz",
+      "integrity": "sha512-eC8SXVn8de67HacqU7PoGdHA+9tGbqfEdD05AEFRAB81ejeQtNi5Fx7lPcxpLH79DW0BnMAHau3hi4RVkHfSCw==",
       "cpu": [
         "ppc64"
       ],
@@ -13437,9 +13602,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.7.2.tgz",
-      "integrity": "sha512-hQQ4TJQrSQW8JlPm7tRpXN8OCNP9ez7PajJNjRD1ZTHQAy685OYqPrKjfaMw/8LiHCt8AZ74rfUVHP9vn0N69Q==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.9.1.tgz",
+      "integrity": "sha512-fIkwvAAQ41kfoGWfzeJ33iLGShl0JEDZHrMnwTHMErUcPkaaZRJYjQjsFhMl315NEQ4mmTlC+2nfK/J2IszDOw==",
       "cpu": [
         "riscv64"
       ],
@@ -13451,9 +13616,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.7.2.tgz",
-      "integrity": "sha512-NoAGbiqrxtY8kVooZ24i70CjLDlUFI7nDj3I9y54U94p+3kPxwd2L692YsdLa+cqQ0VoqMWoehDFp21PKRUoIQ==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.9.1.tgz",
+      "integrity": "sha512-RAAszxImSOFLk44aLwnSqpcOdce8sBcxASledSzuFAd8Q5ZhhVck472SisspnzHdc7THCvGXiUeZ2hOC7NUoBQ==",
       "cpu": [
         "riscv64"
       ],
@@ -13465,9 +13630,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.7.2.tgz",
-      "integrity": "sha512-KaZByo8xuQZbUhhreBTW+yUnOIHUsv04P8lKjQ5otiGoSJ17ISGYArc+4vKdLEpGaLbemGzr4ZeUbYQQsLWFjA==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.9.1.tgz",
+      "integrity": "sha512-QoP9vkY+THuQdZi05bA6s6XwFd6HIz3qlx82v9bTOgxeqin/3C12Ye7f7EOD00RQ36OtOPWnhEMMm84sv7d1XQ==",
       "cpu": [
         "s390x"
       ],
@@ -13479,9 +13644,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.7.2.tgz",
-      "integrity": "sha512-dEidzJDubxxhUCBJ/SHSMJD/9q7JkyfBMT77Px1npl4xpg9t0POLvnWywSk66BgZS/b2Hy9Y1yFaoMTFJUe9yg==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.9.1.tgz",
+      "integrity": "sha512-/p77cGN/h9zbsfCseAP5gY7tK+7+DdM8fkPfr9d1ye1fsF6bmtGbtZN6e/8j4jCZ9NEIBBkT0GhdgixSelTK9g==",
       "cpu": [
         "x64"
       ],
@@ -13493,9 +13658,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-x64-musl": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.7.2.tgz",
-      "integrity": "sha512-RvP+Ux3wDjmnZDT4XWFfNBRVG0fMsc+yVzNFUqOflnDfZ9OYujv6nkh+GOr+watwrW4wdp6ASfG/e7bkDradsw==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.9.1.tgz",
+      "integrity": "sha512-wInTqT3Bu9u50mDStEig1v8uxEL2Ht+K8pir/YhyyrM5ordJtxoqzsL1vR/CQzOJuDunUTrDkMM0apjW/d7/PA==",
       "cpu": [
         "x64"
       ],
@@ -13507,9 +13672,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-wasm32-wasi": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.7.2.tgz",
-      "integrity": "sha512-y797JBmO9IsvXVRCKDXOxjyAE4+CcZpla2GSoBQ33TVb3ILXuFnMrbR/QQZoauBYeOFuu4w3ifWLw52sdHGz6g==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.9.1.tgz",
+      "integrity": "sha512-eNwqO5kUa+1k7yFIircwwiniKWA0UFHo2Cfm8LYgkh9km7uMad+0x7X7oXbQonJXlqfitBTSjhA0un+DsHIrhw==",
       "cpu": [
         "wasm32"
       ],
@@ -13517,16 +13682,16 @@
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@napi-rs/wasm-runtime": "^0.2.9"
+        "@napi-rs/wasm-runtime": "^0.2.11"
       },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/@unrs/resolver-binding-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.10.tgz",
-      "integrity": "sha512-bCsCyeZEwVErsGmyPNSzwfwFn4OdxBj0mmv6hOFucB/k81Ojdu68RbZdxYsRQUPc9l6SU5F/cG+bXgWs3oUgsQ==",
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.11.tgz",
+      "integrity": "sha512-9DPkXtvHydrcOsopiYpUgPHpmj0HWZKMUnL2dZqpvC42lsratuBG06V5ipyno0fUek5VlFsNQ+AcFATSrJXgMA==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -13537,9 +13702,9 @@
       }
     },
     "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.7.2.tgz",
-      "integrity": "sha512-gtYTh4/VREVSLA+gHrfbWxaMO/00y+34htY7XpioBTy56YN2eBjkPrY1ML1Zys89X3RJDKVaogzwxlM1qU7egg==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.9.1.tgz",
+      "integrity": "sha512-Eaz1xMUnoa2mFqh20mPqSdbYl6crnk8HnIXDu6nsla9zpgZJZO8w3c1gvNN/4Eb0RXRq3K9OG6mu8vw14gIqiA==",
       "cpu": [
         "arm64"
       ],
@@ -13551,9 +13716,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.7.2.tgz",
-      "integrity": "sha512-Ywv20XHvHTDRQs12jd3MY8X5C8KLjDbg/jyaal/QLKx3fAShhJyD4blEANInsjxW3P7isHx1Blt56iUDDJO3jg==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.9.1.tgz",
+      "integrity": "sha512-H/+d+5BGlnEQif0gnwWmYbYv7HJj563PUKJfn8PlmzF8UmF+8KxdvXdwCsoOqh4HHnENnoLrav9NYBrv76x1wQ==",
       "cpu": [
         "ia32"
       ],
@@ -13565,9 +13730,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.7.2.tgz",
-      "integrity": "sha512-friS8NEQfHaDbkThxopGk+LuE5v3iY0StruifjQEt7SLbA46OnfgMO15sOTkbpJkol6RB+1l1TYPXh0sCddpvA==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.9.1.tgz",
+      "integrity": "sha512-rS86wI4R6cknYM3is3grCb/laE8XBEbpWAMSIPjYfmYp75KL5dT87jXF2orDa4tQYg5aajP5G8Fgh34dRyR+Rw==",
       "cpu": [
         "x64"
       ],
@@ -13579,16 +13744,16 @@
       ]
     },
     "node_modules/@vitejs/plugin-basic-ssl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
-      "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.2.0.tgz",
+      "integrity": "sha512-mkQnxTkcldAzIsomk1UuLfAu9n+kpQ3JbHcpCp7d2Oo6ITtji8pHS3QToOWjhPFvNQSnhlkAjmGbhv2QvwO/7Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=14.6.0"
+        "node": ">=14.21.3"
       },
       "peerDependencies": {
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
+        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
       }
     },
     "node_modules/@vitest/expect": {
@@ -13960,6 +14125,19 @@
         "pkg-fetch": "lib-es5/bin.js"
       }
     },
+    "node_modules/@yao-pkg/pkg-fetch/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
     "node_modules/@yao-pkg/pkg-fetch/node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
@@ -14043,7 +14221,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.2.tgz",
       "integrity": "sha512-/HcYgtUSiJiot/XWGLOlGxPYUG65+/31V8oqk17vZLW1xlCoR4PampyePljOxY2n8/3jz9+tIFzICsyGujJZoA==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "js-yaml": "^3.10.0",
@@ -14053,42 +14230,10 @@
         "node": ">=18.12.0"
       }
     },
-    "node_modules/@yarnpkg/parsers/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/@yarnpkg/parsers/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@yarnpkg/parsers/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
     "node_modules/@zkochan/js-yaml": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.7.tgz",
       "integrity": "sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -14135,7 +14280,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
       "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mime-types": "^3.0.0",
@@ -14146,10 +14290,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
-      "dev": true,
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -14169,21 +14312,10 @@
         "acorn-walk": "^8.0.2"
       }
     },
-    "node_modules/acorn-import-attributes": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
       "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -14193,7 +14325,6 @@
       "version": "8.3.4",
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
       "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "acorn": "^8.11.0"
@@ -14202,6 +14333,15 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/address": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
+      "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/adjust-sourcemap-loader": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
@@ -14232,16 +14372,12 @@
       }
     },
     "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
       "license": "MIT",
-      "dependencies": {
-        "debug": "4"
-      },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 14"
       }
     },
     "node_modules/agentkeepalive": {
@@ -14320,19 +14456,19 @@
       }
     },
     "node_modules/angular-eslint": {
-      "version": "18.4.3",
-      "resolved": "https://registry.npmjs.org/angular-eslint/-/angular-eslint-18.4.3.tgz",
-      "integrity": "sha512-0ZjLzzADGRLUhZC8ZpwSo6CE/m6QhQB/oljMJ0mEfP+lB1sy1v8PBKNsJboIcfEEgGW669Z/efVQ3df88yJLYg==",
+      "version": "19.6.0",
+      "resolved": "https://registry.npmjs.org/angular-eslint/-/angular-eslint-19.6.0.tgz",
+      "integrity": "sha512-9qfP6rR6De5xe9WyviD9Vdpg2F3iHTlo7T1129ms0AQXrG9/U/upIQmNUN+Jz9CiJcHDUsniyd+EL8hjuNYnOg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": ">= 18.0.0 < 19.0.0",
-        "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0",
-        "@angular-eslint/builder": "18.4.3",
-        "@angular-eslint/eslint-plugin": "18.4.3",
-        "@angular-eslint/eslint-plugin-template": "18.4.3",
-        "@angular-eslint/schematics": "18.4.3",
-        "@angular-eslint/template-parser": "18.4.3",
+        "@angular-devkit/core": ">= 19.0.0 < 20.0.0",
+        "@angular-devkit/schematics": ">= 19.0.0 < 20.0.0",
+        "@angular-eslint/builder": "19.6.0",
+        "@angular-eslint/eslint-plugin": "19.6.0",
+        "@angular-eslint/eslint-plugin-template": "19.6.0",
+        "@angular-eslint/schematics": "19.6.0",
+        "@angular-eslint/template-parser": "19.6.0",
         "@typescript-eslint/types": "^8.0.0",
         "@typescript-eslint/utils": "^8.0.0"
       },
@@ -14342,111 +14478,10 @@
         "typescript-eslint": "^8.0.0"
       }
     },
-    "node_modules/angular-eslint/node_modules/@angular-devkit/core": {
-      "version": "18.2.19",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.19.tgz",
-      "integrity": "sha512-Ptf92Zomc6FCr7GWmHKdgOUbA1GpctZwH/hRcpYpU3tM56MG2t5FOFpufnE595GgolOCktabkFEoODMG8PBVDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "8.17.1",
-        "ajv-formats": "3.0.1",
-        "jsonc-parser": "3.3.1",
-        "picomatch": "4.0.2",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/angular-eslint/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/angular-eslint/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/angular-eslint/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/angular-eslint/node_modules/readdirp/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/ansi-colors": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
       "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -14527,7 +14562,6 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
@@ -14541,7 +14575,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -14574,59 +14607,65 @@
       }
     },
     "node_modules/app-builder-bin": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-4.0.0.tgz",
-      "integrity": "sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==",
+      "version": "5.0.0-alpha.12",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz",
+      "integrity": "sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/app-builder-lib": {
-      "version": "24.13.3",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.13.3.tgz",
-      "integrity": "sha512-FAzX6IBit2POXYGnTCT8YHFO/lr5AapAII6zzhQO3Rw4cEDOgK+t1xhLc5tNcKlicTHlo9zxIwnYCX9X2DLkig==",
+      "version": "26.0.12",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.0.12.tgz",
+      "integrity": "sha512-+/CEPH1fVKf6HowBUs6LcAIoRcjeqgvAeoSE+cl7Y7LndyQ9ViGPYibNk7wmhMHzNgHIuIbw4nWADPO+4mjgWw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@develar/schema-utils": "~2.6.5",
-        "@electron/notarize": "2.2.1",
-        "@electron/osx-sign": "1.0.5",
-        "@electron/universal": "1.5.1",
+        "@electron/asar": "3.2.18",
+        "@electron/fuses": "^1.8.0",
+        "@electron/notarize": "2.5.0",
+        "@electron/osx-sign": "1.3.1",
+        "@electron/rebuild": "3.7.0",
+        "@electron/universal": "2.0.1",
         "@malept/flatpak-bundler": "^0.4.0",
         "@types/fs-extra": "9.0.13",
         "async-exit-hook": "^2.0.1",
-        "bluebird-lst": "^1.0.9",
-        "builder-util": "24.13.1",
-        "builder-util-runtime": "9.2.4",
+        "builder-util": "26.0.11",
+        "builder-util-runtime": "9.3.1",
         "chromium-pickle-js": "^0.2.0",
+        "config-file-ts": "0.2.8-rc1",
         "debug": "^4.3.4",
+        "dotenv": "^16.4.5",
+        "dotenv-expand": "^11.0.6",
         "ejs": "^3.1.8",
-        "electron-publish": "24.13.1",
-        "form-data": "^4.0.0",
+        "electron-publish": "26.0.11",
         "fs-extra": "^10.1.0",
         "hosted-git-info": "^4.1.0",
         "is-ci": "^3.0.0",
         "isbinaryfile": "^5.0.0",
         "js-yaml": "^4.1.0",
+        "json5": "^2.2.3",
         "lazy-val": "^1.0.5",
-        "minimatch": "^5.1.1",
-        "read-config-file": "6.3.2",
-        "sanitize-filename": "^1.6.3",
+        "minimatch": "^10.0.0",
+        "plist": "3.1.0",
+        "resedit": "^1.7.0",
         "semver": "^7.3.8",
         "tar": "^6.1.12",
-        "temp-file": "^3.4.0"
+        "temp-file": "^3.4.0",
+        "tiny-async-pool": "1.3.0"
       },
       "engines": {
         "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "dmg-builder": "24.13.3",
-        "electron-builder-squirrel-windows": "24.13.3"
+        "dmg-builder": "26.0.12",
+        "electron-builder-squirrel-windows": "26.0.12"
       }
     },
     "node_modules/app-builder-lib/node_modules/@electron/notarize": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.2.1.tgz",
-      "integrity": "sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz",
+      "integrity": "sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14654,6 +14693,35 @@
         "node": ">=10"
       }
     },
+    "node_modules/app-builder-lib/node_modules/@electron/rebuild": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.7.0.tgz",
+      "integrity": "sha512-VW++CNSlZwMYP7MyXEbrKjpzEwhB5kDNbzGtiPEjwYysqyTCF+YbNJ210Dj3AjWsGSV4iEEwNkmJN9yGZmVvmw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@electron/node-gyp": "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2",
+        "@malept/cross-spawn-promise": "^2.0.0",
+        "chalk": "^4.0.0",
+        "debug": "^4.1.1",
+        "detect-libc": "^2.0.1",
+        "fs-extra": "^10.0.0",
+        "got": "^11.7.0",
+        "node-abi": "^3.45.0",
+        "node-api-version": "^0.2.0",
+        "ora": "^5.1.0",
+        "read-binary-file-arch": "^1.0.6",
+        "semver": "^7.3.5",
+        "tar": "^6.0.5",
+        "yargs": "^17.0.1"
+      },
+      "bin": {
+        "electron-rebuild": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=12.13.0"
+      }
+    },
     "node_modules/app-builder-lib/node_modules/fs-extra": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
@@ -14669,17 +14737,33 @@
         "node": ">=12"
       }
     },
+    "node_modules/app-builder-lib/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/app-builder-lib/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
+      "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/append-field": {
@@ -14701,142 +14785,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/archiver": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz",
-      "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "archiver-utils": "^2.1.0",
-        "async": "^3.2.4",
-        "buffer-crc32": "^0.2.1",
-        "readable-stream": "^3.6.0",
-        "readdir-glob": "^1.1.2",
-        "tar-stream": "^2.2.0",
-        "zip-stream": "^4.1.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/archiver-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz",
-      "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.0",
-        "lazystream": "^1.0.0",
-        "lodash.defaults": "^4.2.0",
-        "lodash.difference": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.union": "^4.6.0",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/archiver-utils/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/archiver-utils/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "peer": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/archiver-utils/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
-    "node_modules/archiver-utils/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "license": "ISC",
-      "peer": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/archiver-utils/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/archiver-utils/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
-    "node_modules/archiver-utils/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
@@ -14876,7 +14824,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
       "license": "Python-2.0"
     },
     "node_modules/aria-query": {
@@ -14914,18 +14861,20 @@
       "license": "MIT"
     },
     "node_modules/array-includes": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
-      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
+      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "is-string": "^1.0.7"
+        "es-abstract": "^1.24.0",
+        "es-object-atoms": "^1.1.1",
+        "get-intrinsic": "^1.3.0",
+        "is-string": "^1.1.1",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15075,7 +15024,6 @@
       "version": "3.2.6",
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
       "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/async-exit-hook": {
@@ -15162,9 +15110,9 @@
       }
     },
     "node_modules/autoprefixer/node_modules/browserslist": {
-      "version": "4.24.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
-      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
+      "version": "4.25.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
+      "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
       "dev": true,
       "funding": [
         {
@@ -15182,8 +15130,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001716",
-        "electron-to-chromium": "^1.5.149",
+        "caniuse-lite": "^1.0.30001718",
+        "electron-to-chromium": "^1.5.160",
         "node-releases": "^2.0.19",
         "update-browserslist-db": "^1.1.3"
       },
@@ -15254,10 +15202,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz",
-      "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==",
-      "dev": true,
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.10.0.tgz",
+      "integrity": "sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -15279,7 +15226,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
       "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/transform": "^29.7.0",
@@ -15315,11 +15261,24 @@
         "webpack": ">=5"
       }
     },
+    "node_modules/babel-plugin-const-enum": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-const-enum/-/babel-plugin-const-enum-1.2.0.tgz",
+      "integrity": "sha512-o1m/6iyyFnp9MRsK1dHF3bneqyf3AlM2q3A/YbgQr2pCat6B6XJVDv2TXqzfY2RYUi4mak6WAksSBPlyYGx9dg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-typescript": "^7.3.3",
+        "@babel/traverse": "^7.16.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
       "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -15336,7 +15295,6 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
       "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.12.3",
@@ -15353,7 +15311,6 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -15363,7 +15320,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
       "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.3.3",
@@ -15428,7 +15384,6 @@
       "version": "0.4.13",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.13.tgz",
       "integrity": "sha512-3sX/eOms8kd3q2KZ6DAhKPc0dgm525Gqq5NtWKZ7QYYZEv57OQ54KtblzJzH1lQF/eQxO8KjWGIK9IPUJNus5g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
@@ -15443,7 +15398,6 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -15453,7 +15407,6 @@
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz",
       "integrity": "sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.6.3",
@@ -15467,7 +15420,6 @@
       "version": "0.6.4",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.4.tgz",
       "integrity": "sha512-7gD3pRadPrbjhjLyxebmx/WrFYcuSjZ0XbdUujQMZ/fcE9oeewk2U/7PCvez84UeuK3oSjmPZ0Ch0dlupQvGzw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.6.4"
@@ -15476,11 +15428,19 @@
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
+    "node_modules/babel-plugin-transform-typescript-metadata": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-typescript-metadata/-/babel-plugin-transform-typescript-metadata-0.3.2.tgz",
+      "integrity": "sha512-mWEvCQTgXQf48yDqgN7CH50waTyYBeP2Lpqx4nNWab9sxEpdXVeKgfj1qYI2/TgUPQtNFZ85i3PemRtnXVYYJg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
     "node_modules/babel-preset-current-node-syntax": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
       "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
@@ -15507,7 +15467,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
       "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "babel-plugin-jest-hoist": "^29.6.3",
@@ -15598,6 +15557,26 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/beasties": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/beasties/-/beasties-0.3.2.tgz",
+      "integrity": "sha512-p4AF8uYzm9Fwu8m/hSVTCPXrRBPmB34hQpHsec2KOaR9CZmgoU8IOv4Cvwq4hgz2p4hLMNbsdNl5XeA6XbAQwA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "css-select": "^5.1.0",
+        "css-what": "^6.1.0",
+        "dom-serializer": "^2.0.0",
+        "domhandler": "^5.0.3",
+        "htmlparser2": "^10.0.0",
+        "picocolors": "^1.1.1",
+        "postcss": "^8.4.49",
+        "postcss-media-query-parser": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/bent": {
       "version": "7.3.12",
       "resolved": "https://registry.npmjs.org/bent/-/bent-7.3.12.tgz",
@@ -15623,6 +15602,63 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/better-opn/node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/better-opn/node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/better-opn/node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/better-opn/node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/big-integer": {
       "version": "1.6.52",
       "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz",
@@ -15690,28 +15726,24 @@
         "ieee754": "^1.1.13"
       }
     },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/bluebird-lst": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz",
-      "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==",
-      "dev": true,
+    "node_modules/bl/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "license": "MIT",
       "dependencies": {
-        "bluebird": "^3.5.5"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
     "node_modules/body-parser": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
       "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "bytes": "^3.1.2",
@@ -15770,15 +15802,15 @@
       }
     },
     "node_modules/bootstrap.native": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/bootstrap.native/-/bootstrap.native-5.1.2.tgz",
-      "integrity": "sha512-jkXzWs1EopckMT5FIc2CS9PsGloOfmHqyC4dHv3nVC5gpnOFoJPVDpUCKsoMta46SBh46g312BI3aWth0zkRDw==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/bootstrap.native/-/bootstrap.native-5.1.5.tgz",
+      "integrity": "sha512-sQdFng2Szpseyo1TlpG5pV+se4nbGeQWFXBemsPSnrVzd82ps9F6hti+lHFwcGgS80oIc54dY5ycOYJwUpQn3A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@thednp/event-listener": "^2.0.8",
-        "@thednp/position-observer": "^1.0.7",
-        "@thednp/shorty": "^2.0.10"
+        "@thednp/event-listener": "^2.0.10",
+        "@thednp/position-observer": "^1.1.0",
+        "@thednp/shorty": "^2.0.11"
       },
       "engines": {
         "node": ">=16",
@@ -15786,10 +15818,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -15860,7 +15891,6 @@
       "version": "4.23.2",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
       "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -15906,7 +15936,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "node-int64": "^0.4.0"
@@ -15946,19 +15975,6 @@
         "node": "*"
       }
     },
-    "node_modules/buffer-equal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz",
-      "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -15979,34 +15995,35 @@
       }
     },
     "node_modules/builder-util": {
-      "version": "24.13.1",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.13.1.tgz",
-      "integrity": "sha512-NhbCSIntruNDTOVI9fdXz0dihaqX2YuE1D6zZMrwiErzH4ELZHE6mdiB40wEgZNprDia+FghRFgKoAqMZRRjSA==",
+      "version": "26.0.11",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-26.0.11.tgz",
+      "integrity": "sha512-xNjXfsldUEe153h1DraD0XvDOpqGR0L5eKFkdReB7eFW5HqysDZFfly4rckda6y9dF39N3pkPlOblcfHKGw+uA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/debug": "^4.1.6",
         "7zip-bin": "~5.2.0",
-        "app-builder-bin": "4.0.0",
-        "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "9.2.4",
+        "app-builder-bin": "5.0.0-alpha.12",
+        "builder-util-runtime": "9.3.1",
         "chalk": "^4.1.2",
-        "cross-spawn": "^7.0.3",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.4",
         "fs-extra": "^10.1.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.0",
         "is-ci": "^3.0.0",
         "js-yaml": "^4.1.0",
+        "sanitize-filename": "^1.6.3",
         "source-map-support": "^0.5.19",
         "stat-mode": "^1.0.0",
-        "temp-file": "^3.4.0"
+        "temp-file": "^3.4.0",
+        "tiny-async-pool": "1.3.0"
       }
     },
     "node_modules/builder-util-runtime": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",
-      "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.3.1.tgz",
+      "integrity": "sha512-2/egrNDDnRaxVwK3A+cJq6UOlqOdedGA7JPqCeJjN2Zjk1/QB/6QUi3b714ScIGS7HafFXTyzJEOr5b44I3kvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16032,25 +16049,23 @@
         "node": ">=12"
       }
     },
-    "node_modules/builder-util/node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+    "node_modules/builder-util/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">= 6"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
     "node_modules/bundle-name": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
       "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "run-applescript": "^7.0.0"
@@ -16194,9 +16209,9 @@
       }
     },
     "node_modules/cacache/node_modules/rimraf/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16451,7 +16466,6 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -16468,10 +16482,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001718",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
-      "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==",
-      "dev": true,
+      "version": "1.0.30001724",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001724.tgz",
+      "integrity": "sha512-WqJo7p0TbHDOythNTqYujmaJTvtYRZrjpP8TCvH6Vb9CYJerJNKamKzIWOM4BkQatWj9H2lYulpdAQNBe7QhNA==",
       "funding": [
         {
           "type": "opencollective",
@@ -16568,7 +16581,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -16641,6 +16653,26 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
+    "node_modules/cheerio/node_modules/htmlparser2": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1",
+        "entities": "^4.4.0"
+      }
+    },
     "node_modules/chokidar": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
@@ -16668,9 +16700,9 @@
       }
     },
     "node_modules/chromatic": {
-      "version": "11.28.2",
-      "resolved": "https://registry.npmjs.org/chromatic/-/chromatic-11.28.2.tgz",
-      "integrity": "sha512-aCmUPcZUs4/p9zRZdMreOoO/5JqO2DiJC3md1/vRx8dlMRcmR/YI5ZbgXZcai2absVR+6hsXZ5XiPxV2sboTuQ==",
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/chromatic/-/chromatic-13.1.2.tgz",
+      "integrity": "sha512-jgVptQabJHOnzmmvLjbtfutREkWGhDDk2gVqMH6N+V7z56oIy4Sd2/U7ZxNvnVFPinZQMSjSdUce4b6JIP64Dg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -16727,7 +16759,6 @@
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
       "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/clean-css": {
@@ -16819,7 +16850,6 @@
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
@@ -16834,7 +16864,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -17005,7 +17034,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
       "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/color-convert": {
@@ -17053,6 +17081,19 @@
         "node": ">=0.1.90"
       }
     },
+    "node_modules/columnify": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz",
+      "integrity": "sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==",
+      "license": "MIT",
+      "dependencies": {
+        "strip-ansi": "^6.0.1",
+        "wcwidth": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -17108,23 +17149,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/compress-commons": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz",
-      "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "buffer-crc32": "^0.2.13",
-        "crc32-stream": "^4.0.2",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -17205,42 +17229,6 @@
         "typedarray": "^0.0.6"
       }
     },
-    "node_modules/concat-stream/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "license": "MIT"
-    },
-    "node_modules/concat-stream/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/concat-stream/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "license": "MIT"
-    },
-    "node_modules/concat-stream/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/concurrently": {
       "version": "9.1.2",
       "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.1.2.tgz",
@@ -17327,14 +17315,14 @@
       }
     },
     "node_modules/config-file-ts": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/config-file-ts/-/config-file-ts-0.2.6.tgz",
-      "integrity": "sha512-6boGVaglwblBgJqGyxm4+xCmEGcWgnWHSWHY5jad58awQhB6gftq0G8HbzU39YqCIYHMLAiL1yjwiZ36m/CL8w==",
+      "version": "0.2.8-rc1",
+      "resolved": "https://registry.npmjs.org/config-file-ts/-/config-file-ts-0.2.8-rc1.tgz",
+      "integrity": "sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "glob": "^10.3.10",
-        "typescript": "^5.3.3"
+        "glob": "^10.3.12",
+        "typescript": "^5.4.3"
       }
     },
     "node_modules/config-file-ts/node_modules/glob": {
@@ -17381,6 +17369,22 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/config-file-ts/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/config-file-ts/node_modules/path-scurry": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
@@ -17452,7 +17456,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
       "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "5.2.1"
@@ -17480,7 +17483,6 @@
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
       "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -17490,7 +17492,6 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
       "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.6.0"
@@ -17564,13 +17565,12 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.42.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.42.0.tgz",
-      "integrity": "sha512-bQasjMfyDGyaeWKBIu33lHh9qlSR0MFE/Nmc6nMjf/iU9b3rSMdAYz1Baxrv4lPdGUsTqZudHA4jIGSJy0SWZQ==",
-      "dev": true,
+      "version": "3.43.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.43.0.tgz",
+      "integrity": "sha512-2GML2ZsCc5LR7hZYz4AXmjQw8zuy2T//2QntwdnpuYI7jteT6GVYJL7F6C2C57R7gSYrcqVW3lAALefdbhBLDA==",
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.4"
+        "browserslist": "^4.25.0"
       },
       "funding": {
         "type": "opencollective",
@@ -17578,10 +17578,9 @@
       }
     },
     "node_modules/core-js-compat/node_modules/browserslist": {
-      "version": "4.24.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
-      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
-      "dev": true,
+      "version": "4.25.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
+      "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
       "funding": [
         {
           "type": "opencollective",
@@ -17598,8 +17597,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001716",
-        "electron-to-chromium": "^1.5.149",
+        "caniuse-lite": "^1.0.30001718",
+        "electron-to-chromium": "^1.5.160",
         "node-releases": "^2.0.19",
         "update-browserslist-db": "^1.1.3"
       },
@@ -17611,16 +17610,15 @@
       }
     },
     "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "license": "MIT"
     },
     "node_modules/cors": {
       "version": "2.8.5",
       "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
       "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "object-assign": "^4",
@@ -17657,6 +17655,19 @@
         }
       }
     },
+    "node_modules/cosmiconfig/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/crc": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
@@ -17668,20 +17679,6 @@
         "buffer": "^5.1.0"
       }
     },
-    "node_modules/crc-32": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
-      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "peer": true,
-      "bin": {
-        "crc32": "bin/crc32.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/crc/node_modules/buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -17708,21 +17705,6 @@
         "ieee754": "^1.1.13"
       }
     },
-    "node_modules/crc32-stream": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz",
-      "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "crc-32": "^1.2.0",
-        "readable-stream": "^3.4.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/create-jest": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
@@ -17745,28 +17727,26 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "license": "MIT"
+    },
     "node_modules/credit-card-type": {
       "version": "10.0.1",
       "resolved": "https://registry.npmjs.org/credit-card-type/-/credit-card-type-10.0.1.tgz",
       "integrity": "sha512-vQOuWmBgsgG1ovGeDi8m6Zeu1JaqH/JncrxKmaqMbv/LunyOQdLiQhPHtOsNlbUI05TocR5nod/Mbs3HYtr6sQ==",
       "license": "MIT"
     },
-    "node_modules/critters": {
-      "version": "0.0.24",
-      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.24.tgz",
-      "integrity": "sha512-Oyqew0FGM0wYUSNqR0L6AteO5MpMoUU0rhKRieXeiKs+PmRTxiJMyaunYB2KF6fQ3dzChXKCpbFOEJx3OQ1v/Q==",
-      "deprecated": "Ownership of Critters has moved to the Nuxt team, who will be maintaining the project going forward. If you'd like to keep using Critters, please switch to the actively-maintained fork at https://github.com/danielroe/beasties",
+    "node_modules/cross-dirname": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz",
+      "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "css-select": "^5.1.0",
-        "dom-serializer": "^2.0.0",
-        "domhandler": "^5.0.2",
-        "htmlparser2": "^8.0.2",
-        "postcss": "^8.4.23",
-        "postcss-media-query-parser": "^0.2.3"
-      }
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/cross-env": {
       "version": "7.0.3",
@@ -17901,12 +17881,12 @@
       "license": "MIT"
     },
     "node_modules/cssstyle": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.1.tgz",
-      "integrity": "sha512-ZgW+Jgdd7i52AaLYCriF8Mxqft0gD/R9i9wi6RWBhs1pqdPEzPjym7rvRKi397WmQFf3SlyUsszhw+VVCbx79Q==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.5.0.tgz",
+      "integrity": "sha512-/7gw8TGrvH/0g564EnhgFZogTMVe+lifpB7LWU+PEsiq5o83TUXR3fDbzTRXOJhoJwck5IS9ez3Em5LNMMO2aw==",
       "license": "MIT",
       "dependencies": {
-        "@asamuzakjp/css-color": "^3.1.2",
+        "@asamuzakjp/css-color": "^3.2.0",
         "rrweb-cssom": "^0.8.0"
       },
       "engines": {
@@ -18063,9 +18043,9 @@
       "license": "MIT"
     },
     "node_modules/decode-named-character-reference": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.1.0.tgz",
-      "integrity": "sha512-Wy+JTSbFThEOXQIR2L6mxJvEs+veIzpmqD7ynWxMXGpnk3smkHQOp6forLdHsKpAMW9iJpaBBIxz285t1n1C3w==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.2.0.tgz",
+      "integrity": "sha512-c6fcElNV6ShtZXmsgNgFFV5tVX2PaV4g+MOAkb8eXHvn6sryJBrZa9r0zV6+dtTyoCKxtDy5tyQ5ZwQuidtd+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18109,7 +18089,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz",
       "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==",
-      "dev": true,
       "license": "MIT",
       "peerDependencies": {
         "babel-plugin-macros": "^3.1.0"
@@ -18150,14 +18129,12 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -18167,7 +18144,6 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
       "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "bundle-name": "^4.1.0",
@@ -18184,7 +18160,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
       "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -18193,19 +18168,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "execa": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/default-require-extensions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz",
@@ -18262,12 +18224,15 @@
       }
     },
     "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/define-properties": {
@@ -18346,7 +18311,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -18359,6 +18323,23 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/detect-port": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.6.1.tgz",
+      "integrity": "sha512-CmnVc+Hek2egPx1PeTFVta2W78xy2K/9Rkf6cC4T59S50tVnzKj+tnx5mmx5lwvCkujZ4uRrpRSuV+IVs3f90Q==",
+      "license": "MIT",
+      "dependencies": {
+        "address": "^1.0.1",
+        "debug": "4"
+      },
+      "bin": {
+        "detect": "bin/detect-port.js",
+        "detect-port": "bin/detect-port.js"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/devlop": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
@@ -18380,11 +18361,19 @@
       "dev": true,
       "license": "Apache-2.0"
     },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
     "node_modules/diff-sequences": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
       "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -18484,21 +18473,36 @@
         "readable-stream": "^3.1.1"
       }
     },
-    "node_modules/dir-compare": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-3.3.0.tgz",
-      "integrity": "sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==",
+    "node_modules/diffable-html/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "buffer-equal": "^1.0.0",
-        "minimatch": "^3.0.4"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/dir-compare": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-4.2.0.tgz",
+      "integrity": "sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimatch": "^3.0.5",
+        "p-limit": "^3.1.0 "
       }
     },
     "node_modules/dir-compare/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18550,15 +18554,15 @@
       "license": "MIT"
     },
     "node_modules/dmg-builder": {
-      "version": "24.13.3",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.13.3.tgz",
-      "integrity": "sha512-rcJUkMfnJpfCboZoOOPf4L29TRtEieHNOeAbYPWPxlaBw/Z1RKrRA86dOI9rwaI4tQSc/RD82zTNHprfUHXsoQ==",
+      "version": "26.0.12",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.0.12.tgz",
+      "integrity": "sha512-59CAAjAhTaIMCN8y9kD573vDkxbs1uhDcrFLHSgutYdPcGOU35Rf95725snvzEOy4BFB7+eLJ8djCNPmGwG67w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "app-builder-lib": "24.13.3",
-        "builder-util": "24.13.1",
-        "builder-util-runtime": "9.2.4",
+        "app-builder-lib": "26.0.12",
+        "builder-util": "26.0.11",
+        "builder-util-runtime": "9.3.1",
         "fs-extra": "^10.1.0",
         "iconv-lite": "^0.6.2",
         "js-yaml": "^4.1.0"
@@ -18582,6 +18586,19 @@
         "node": ">=12"
       }
     },
+    "node_modules/dmg-builder/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/dmg-license": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
@@ -18786,10 +18803,9 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.4.7",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
-      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
-      "dev": true,
+      "version": "16.5.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
+      "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -18802,7 +18818,6 @@
       "version": "11.0.7",
       "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
       "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "dotenv": "^16.4.5"
@@ -18852,7 +18867,6 @@
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
       "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "jake": "^10.8.5"
@@ -18865,15 +18879,15 @@
       }
     },
     "node_modules/electron": {
-      "version": "34.0.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-34.0.0.tgz",
-      "integrity": "sha512-fpaPb0lifoUJ6UJa4Lk8/0B2Ku/xDZWdc1Gkj67jbygTCrvSon0qquju6Ltx1Kz23GRqqlIHXiy9EvrjpY7/Wg==",
+      "version": "36.4.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-36.4.0.tgz",
+      "integrity": "sha512-LLOOZEuW5oqvnjC7HBQhIqjIIJAZCIFjQxltQGLfEC7XFsBoZgQ3u3iFj+Kzw68Xj97u1n57Jdt7P98qLvUibQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@electron/get": "^2.0.0",
-        "@types/node": "^20.9.0",
+        "@types/node": "^22.7.7",
         "extract-zip": "^2.0.1"
       },
       "bin": {
@@ -18884,21 +18898,20 @@
       }
     },
     "node_modules/electron-builder": {
-      "version": "24.13.3",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.13.3.tgz",
-      "integrity": "sha512-yZSgVHft5dNVlo31qmJAe4BVKQfFdwpRw7sFp1iQglDRCDD6r22zfRJuZlhtB5gp9FHUxCMEoWGq10SkCnMAIg==",
+      "version": "26.0.12",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-26.0.12.tgz",
+      "integrity": "sha512-cD1kz5g2sgPTMFHjLxfMjUK5JABq3//J4jPswi93tOPFz6btzXYtK5NrDt717NRbukCUDOrrvmYVOWERlqoiXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "app-builder-lib": "24.13.3",
-        "builder-util": "24.13.1",
-        "builder-util-runtime": "9.2.4",
+        "app-builder-lib": "26.0.12",
+        "builder-util": "26.0.11",
+        "builder-util-runtime": "9.3.1",
         "chalk": "^4.1.2",
-        "dmg-builder": "24.13.3",
+        "dmg-builder": "26.0.12",
         "fs-extra": "^10.1.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
-        "read-config-file": "6.3.2",
         "simple-update-notifier": "2.0.0",
         "yargs": "^17.6.2"
       },
@@ -18911,33 +18924,16 @@
       }
     },
     "node_modules/electron-builder-squirrel-windows": {
-      "version": "24.13.3",
-      "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-24.13.3.tgz",
-      "integrity": "sha512-oHkV0iogWfyK+ah9ZIvMDpei1m9ZRpdXcvde1wTpra2U8AFDNNpqJdnin5z+PM1GbQ5BoaKCWas2HSjtR0HwMg==",
+      "version": "26.0.12",
+      "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.0.12.tgz",
+      "integrity": "sha512-kpwXM7c/ayRUbYVErQbsZ0nQZX4aLHQrPEG9C4h9vuJCXylwFH8a7Jgi2VpKIObzCXO7LKHiCw4KdioFLFOgqA==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "app-builder-lib": "24.13.3",
-        "archiver": "^5.3.1",
-        "builder-util": "24.13.1",
-        "fs-extra": "^10.1.0"
-      }
-    },
-    "node_modules/electron-builder-squirrel-windows/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "app-builder-lib": "26.0.12",
+        "builder-util": "26.0.11",
+        "electron-winstaller": "5.4.0"
       }
     },
     "node_modules/electron-builder/node_modules/fs-extra": {
@@ -18956,9 +18952,9 @@
       }
     },
     "node_modules/electron-log": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.2.4.tgz",
-      "integrity": "sha512-iX12WXc5XAaKeHg2QpiFjVwL+S1NVHPFd3V5RXtCmKhpAzXsVQnR3UEc0LovM6p6NkUQxDWnkdkaam9FNUVmCA==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.4.0.tgz",
+      "integrity": "sha512-AXI5OVppskrWxEAmCxuv8ovX+s2Br39CpCAgkGMNHQtjYT3IiVbSQTncEjFVGPgoH35ZygRm/mvUMBDWwhRxgg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -18966,16 +18962,17 @@
       }
     },
     "node_modules/electron-publish": {
-      "version": "24.13.1",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.13.1.tgz",
-      "integrity": "sha512-2ZgdEqJ8e9D17Hwp5LEq5mLQPjqU3lv/IALvgp+4W8VeNhryfGhYEQC/PgDPMrnWUp+l60Ou5SJLsu+k4mhQ8A==",
+      "version": "26.0.11",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-26.0.11.tgz",
+      "integrity": "sha512-a8QRH0rAPIWH9WyyS5LbNvW9Ark6qe63/LqDB7vu2JXYpi0Gma5Q60Dh4tmTqhOBQt0xsrzD8qE7C+D7j+B24A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/fs-extra": "^9.0.11",
-        "builder-util": "24.13.1",
-        "builder-util-runtime": "9.2.4",
+        "builder-util": "26.0.11",
+        "builder-util-runtime": "9.3.1",
         "chalk": "^4.1.2",
+        "form-data": "^4.0.0",
         "fs-extra": "^10.1.0",
         "lazy-val": "^1.0.5",
         "mime": "^2.5.2"
@@ -19085,10 +19082,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.157",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.157.tgz",
-      "integrity": "sha512-/0ybgsQd1muo8QlnuTpKwtl0oX5YMlUGbm8xyqgDU00motRkKFFbUJySAQBWcY79rVqNLWIWa87BGVGClwAB2w==",
-      "dev": true,
+      "version": "1.5.172",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.172.tgz",
+      "integrity": "sha512-fnKW9dGgmBfsebbYognQSv0CGGLFH1a5iV9EDYTBwmAQn+whbzHbLFlC+3XbHc8xaNtpO0etm8LOcRXs1qMRkQ==",
       "license": "ISC"
     },
     "node_modules/electron-updater": {
@@ -19137,22 +19133,78 @@
         "node": ">=12"
       }
     },
-    "node_modules/electron/node_modules/@types/node": {
-      "version": "20.17.50",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.50.tgz",
-      "integrity": "sha512-Mxiq0ULv/zo1OzOhwPqOA13I81CV/W3nvd3ChtQZRT5Cwz3cr0FKo/wMSsbTqL3EXpaBAEQhva2B8ByRkOIh9A==",
+    "node_modules/electron-updater/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.19.2"
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/electron/node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+    "node_modules/electron-winstaller": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-5.4.0.tgz",
+      "integrity": "sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==",
       "dev": true,
-      "license": "MIT"
+      "hasInstallScript": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@electron/asar": "^3.2.1",
+        "debug": "^4.1.1",
+        "fs-extra": "^7.0.1",
+        "lodash": "^4.17.21",
+        "temp": "^0.9.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@electron/windows-sign": "^1.1.2"
+      }
+    },
+    "node_modules/electron-winstaller/node_modules/fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/electron-winstaller/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/electron-winstaller/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
     },
     "node_modules/emitter-component": {
       "version": "1.1.2",
@@ -19167,7 +19219,6 @@
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
       "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -19196,7 +19247,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
       "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -19213,10 +19263,9 @@
       }
     },
     "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
       "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
@@ -19240,7 +19289,6 @@
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
       "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-colors": "^4.1.1"
@@ -19341,9 +19389,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.10",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.10.tgz",
-      "integrity": "sha512-MtUbM072wlJNyeYAe0mhzrD+M6DIJa96CZAOBBrhDbgKnB4MApIKefcyAB1eOdYn8cUNZgvwBvEzdoAYsxgEIw==",
+      "version": "1.24.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -19374,7 +19422,9 @@
         "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
         "is-data-view": "^1.0.2",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
         "is-shared-array-buffer": "^1.0.4",
         "is-string": "^1.1.1",
         "is-typed-array": "^1.1.15",
@@ -19389,6 +19439,7 @@
         "safe-push-apply": "^1.0.0",
         "safe-regex-test": "^1.1.0",
         "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
         "string.prototype.trim": "^1.2.10",
         "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
@@ -19447,7 +19498,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
       "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
@@ -19505,9 +19555,9 @@
       "license": "MIT"
     },
     "node_modules/esbuild": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz",
-      "integrity": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz",
+      "integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -19518,30 +19568,31 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.23.0",
-        "@esbuild/android-arm": "0.23.0",
-        "@esbuild/android-arm64": "0.23.0",
-        "@esbuild/android-x64": "0.23.0",
-        "@esbuild/darwin-arm64": "0.23.0",
-        "@esbuild/darwin-x64": "0.23.0",
-        "@esbuild/freebsd-arm64": "0.23.0",
-        "@esbuild/freebsd-x64": "0.23.0",
-        "@esbuild/linux-arm": "0.23.0",
-        "@esbuild/linux-arm64": "0.23.0",
-        "@esbuild/linux-ia32": "0.23.0",
-        "@esbuild/linux-loong64": "0.23.0",
-        "@esbuild/linux-mips64el": "0.23.0",
-        "@esbuild/linux-ppc64": "0.23.0",
-        "@esbuild/linux-riscv64": "0.23.0",
-        "@esbuild/linux-s390x": "0.23.0",
-        "@esbuild/linux-x64": "0.23.0",
-        "@esbuild/netbsd-x64": "0.23.0",
-        "@esbuild/openbsd-arm64": "0.23.0",
-        "@esbuild/openbsd-x64": "0.23.0",
-        "@esbuild/sunos-x64": "0.23.0",
-        "@esbuild/win32-arm64": "0.23.0",
-        "@esbuild/win32-ia32": "0.23.0",
-        "@esbuild/win32-x64": "0.23.0"
+        "@esbuild/aix-ppc64": "0.25.4",
+        "@esbuild/android-arm": "0.25.4",
+        "@esbuild/android-arm64": "0.25.4",
+        "@esbuild/android-x64": "0.25.4",
+        "@esbuild/darwin-arm64": "0.25.4",
+        "@esbuild/darwin-x64": "0.25.4",
+        "@esbuild/freebsd-arm64": "0.25.4",
+        "@esbuild/freebsd-x64": "0.25.4",
+        "@esbuild/linux-arm": "0.25.4",
+        "@esbuild/linux-arm64": "0.25.4",
+        "@esbuild/linux-ia32": "0.25.4",
+        "@esbuild/linux-loong64": "0.25.4",
+        "@esbuild/linux-mips64el": "0.25.4",
+        "@esbuild/linux-ppc64": "0.25.4",
+        "@esbuild/linux-riscv64": "0.25.4",
+        "@esbuild/linux-s390x": "0.25.4",
+        "@esbuild/linux-x64": "0.25.4",
+        "@esbuild/netbsd-arm64": "0.25.4",
+        "@esbuild/netbsd-x64": "0.25.4",
+        "@esbuild/openbsd-arm64": "0.25.4",
+        "@esbuild/openbsd-x64": "0.25.4",
+        "@esbuild/sunos-x64": "0.25.4",
+        "@esbuild/win32-arm64": "0.25.4",
+        "@esbuild/win32-ia32": "0.25.4",
+        "@esbuild/win32-x64": "0.25.4"
       }
     },
     "node_modules/esbuild-register": {
@@ -19558,9 +19609,9 @@
       }
     },
     "node_modules/esbuild-wasm": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.23.0.tgz",
-      "integrity": "sha512-6jP8UmWy6R6TUUV8bMuC3ZyZ6lZKI56x0tkxyCIqWwRRJ/DgeQKneh/Oid5EoGoPFLrGNkz47ZEtWAYuiY/u9g==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.25.4.tgz",
+      "integrity": "sha512-2HlCS6rNvKWaSKhWaG/YIyRsTsL3gUrMP2ToZMBIjw9LM7vVcIs+rz8kE2vExvTJgvM8OKPqNpcHawY/BQc/qQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -19574,7 +19625,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
       "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -19635,7 +19685,6 @@
       "version": "9.26.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.26.0.tgz",
       "integrity": "sha512-Hx0MOjPh6uK9oq9nVsATZKE/Wlbai7KFjfCuw9UHaguDW3x+HF0O5nIi3ud39TWgrTjTO5nHxmL3R1eANinWHQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
@@ -19780,9 +19829,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
-      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz",
+      "integrity": "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -19842,9 +19891,9 @@
       }
     },
     "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -19961,10 +20010,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
-      "dev": true,
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -19981,7 +20029,6 @@
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -19994,7 +20041,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -20008,10 +20054,9 @@
       }
     },
     "node_modules/eslint/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -20019,10 +20064,9 @@
       }
     },
     "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-      "dev": true,
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -20035,7 +20079,6 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
       "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -20045,14 +20088,12 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/eslint/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -20062,15 +20103,14 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
-      "dev": true,
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -20080,10 +20120,9 @@
       }
     },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-      "dev": true,
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -20109,7 +20148,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
       "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -20122,7 +20160,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
@@ -20135,7 +20172,6 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
@@ -20155,7 +20191,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -20165,7 +20200,6 @@
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -20226,7 +20260,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.2.tgz",
       "integrity": "sha512-6RxOBZ/cYgd8usLwsEl+EC09Au/9BcmCKYF2/xbml6DNczf7nv0MQb+7BA2F+li6//I+28VNlQR37XfQtcAJuA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
@@ -20280,7 +20313,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
       "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-      "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -20312,7 +20344,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/expect-utils": "^29.7.0",
@@ -20343,7 +20374,6 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
       "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "accepts": "^2.0.0",
@@ -20383,10 +20413,9 @@
       }
     },
     "node_modules/express-rate-limit": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz",
-      "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==",
-      "dev": true,
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.1.tgz",
+      "integrity": "sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==",
       "license": "MIT",
       "engines": {
         "node": ">= 16"
@@ -20395,14 +20424,13 @@
         "url": "https://github.com/sponsors/express-rate-limit"
       },
       "peerDependencies": {
-        "express": "^4.11 || 5 || ^5.0.0-beta.1"
+        "express": ">= 4.11"
       }
     },
     "node_modules/express/node_modules/finalhandler": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz",
       "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "debug": "^4.4.0",
@@ -20449,6 +20477,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/external-editor/node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "license": "MIT",
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
     "node_modules/extract-zip": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -20498,13 +20538,12 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -20512,7 +20551,7 @@
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "micromatch": "^4.0.8"
       },
       "engines": {
         "node": ">=8.6.0"
@@ -20535,14 +20574,12 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/fast-uri": {
@@ -20599,7 +20636,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
       "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "bser": "2.1.1"
@@ -20626,10 +20662,9 @@
       }
     },
     "node_modules/fdir": {
-      "version": "6.4.4",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
-      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
-      "dev": true,
+      "version": "6.4.6",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
       "license": "MIT",
       "peerDependencies": {
         "picomatch": "^3 || ^4"
@@ -20678,7 +20713,6 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
       "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "flat-cache": "^4.0.0"
@@ -20691,7 +20725,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
       "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "minimatch": "^5.0.1"
@@ -20701,7 +20734,6 @@
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
       "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -20870,7 +20902,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
@@ -20896,7 +20927,6 @@
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
       "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "bin": {
         "flat": "cli.js"
@@ -20906,7 +20936,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
       "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
@@ -20920,14 +20949,12 @@
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
       "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
       "version": "1.15.9",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
       "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
-      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -21034,9 +21061,9 @@
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21200,13 +21227,14 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
-      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -21238,7 +21266,6 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -21277,7 +21304,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
       "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -21301,46 +21327,6 @@
         "readable-stream": "^2.0.0"
       }
     },
-    "node_modules/from2/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/from2/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/from2/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/from2/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/fromentries": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
@@ -21366,48 +21352,15 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz",
       "integrity": "sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "js-yaml": "^3.13.1"
       }
     },
-    "node_modules/front-matter/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/front-matter/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/front-matter/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/fs-exists-sync": {
@@ -21485,7 +21438,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -21540,7 +21492,6 @@
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -21550,7 +21501,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
@@ -21597,7 +21547,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8.0.0"
@@ -21671,15 +21620,15 @@
       "license": "MIT"
     },
     "node_modules/glob": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.2.tgz",
-      "integrity": "sha512-YT7U7Vye+t5fZ/QMkBFrTJ7ZQxInIUjwyAjVj84CYXqgBdv30MFUPGnBR6sQaVq6Is15wYJUsnzTuWaGRBhBAQ==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.3.tgz",
+      "integrity": "sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^4.0.1",
-        "minimatch": "^10.0.0",
+        "foreground-child": "^3.3.1",
+        "jackspeak": "^4.1.1",
+        "minimatch": "^10.0.3",
         "minipass": "^7.1.2",
         "package-json-from-dist": "^1.0.0",
         "path-scurry": "^2.0.0"
@@ -21698,7 +21647,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
@@ -21715,13 +21663,13 @@
       "license": "BSD-2-Clause"
     },
     "node_modules/glob/node_modules/minimatch": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
-      "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
+      "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
         "node": "20 || >=22"
@@ -21846,46 +21794,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/globby/node_modules/fast-glob": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.8"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/globby/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/globby/node_modules/ignore": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz",
-      "integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/globby/node_modules/slash": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
@@ -21999,6 +21907,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/harmony-reflect": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
+      "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==",
+      "license": "(Apache-2.0 OR MPL-1.1)"
+    },
     "node_modules/has-bigints": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
@@ -22184,46 +22098,6 @@
         "wbuf": "^1.1.0"
       }
     },
-    "node_modules/hpack.js/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/hpack.js/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/hpack.js/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/hpack.js/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/html-encoding-sniffer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
@@ -22257,7 +22131,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/html-loader": {
@@ -22386,9 +22259,9 @@
       }
     },
     "node_modules/htmlparser2": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
-      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.0.0.tgz",
+      "integrity": "sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==",
       "dev": true,
       "funding": [
         "https://github.com/fb55/htmlparser2?sponsor=1",
@@ -22401,8 +22274,21 @@
       "dependencies": {
         "domelementtype": "^2.3.0",
         "domhandler": "^5.0.3",
-        "domutils": "^3.0.1",
-        "entities": "^4.4.0"
+        "domutils": "^3.2.1",
+        "entities": "^6.0.0"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/entities": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
     "node_modules/http-assert": {
@@ -22518,6 +22404,15 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/http-parser-js": {
       "version": "0.5.10",
       "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz",
@@ -22541,18 +22436,16 @@
       }
     },
     "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
       "license": "MIT",
       "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/http-proxy-middleware": {
@@ -22600,15 +22493,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/https-proxy-agent/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/human-signals": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
@@ -22730,6 +22614,18 @@
         "postcss": "^8.1.0"
       }
     },
+    "node_modules/identity-obj-proxy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
+      "integrity": "sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==",
+      "license": "MIT",
+      "dependencies": {
+        "harmony-reflect": "^1.4.6"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -22751,9 +22647,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/ignore": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz",
-      "integrity": "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz",
+      "integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -22761,16 +22657,16 @@
       }
     },
     "node_modules/ignore-walk": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz",
-      "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-7.0.0.tgz",
+      "integrity": "sha512-T4gbf83A4NH95zvhVYZc+qWocBBGlpzUXLPGurJggw/WIOwicfXJChLDP/iBZnN5WqROSu5Bm3hhle4z8a8YGQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "minimatch": "^9.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/image-size": {
@@ -22794,9 +22690,9 @@
       "license": "MIT"
     },
     "node_modules/immutable": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.2.tgz",
-      "integrity": "sha512-qHKXW1q6liAk1Oys6umoaZbDRqjcjgSrbnrifHsfsttza7zcvRAsL7mMV6xWcyhwQy7Xj5v4hhbr6b+iDYwlmQ==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz",
+      "integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==",
       "dev": true,
       "license": "MIT"
     },
@@ -22816,6 +22712,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/import-local": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
@@ -22909,7 +22814,6 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
@@ -22959,13 +22863,13 @@
       "license": "ISC"
     },
     "node_modules/ini": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
-      "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-5.0.0.tgz",
+      "integrity": "sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/inject-stylesheet": {
@@ -23075,7 +22979,6 @@
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.10"
@@ -23198,19 +23101,6 @@
         "semver": "^7.7.1"
       }
     },
-    "node_modules/is-bun-module/node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -23288,15 +23178,15 @@
       }
     },
     "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
       "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -23306,7 +23196,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -23341,7 +23230,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -23369,7 +23257,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
@@ -23382,7 +23269,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
       "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-docker": "^3.0.0"
@@ -23397,22 +23283,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-inside-container/node_modules/is-docker": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-interactive": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
@@ -23442,6 +23312,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-network-error": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz",
@@ -23720,15 +23603,18 @@
       }
     },
     "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
+      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
       "license": "MIT",
       "dependencies": {
-        "is-docker": "^2.0.0"
+        "is-inside-container": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/isarray": {
@@ -23770,7 +23656,6 @@
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
       "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
@@ -23793,7 +23678,6 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
       "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.23.9",
@@ -23825,9 +23709,9 @@
       }
     },
     "node_modules/istanbul-lib-processinfo/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -23914,7 +23798,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
@@ -23929,7 +23812,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "debug": "^4.1.1",
@@ -23944,7 +23826,6 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -23954,7 +23835,6 @@
       "version": "3.1.7",
       "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
       "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0",
@@ -23984,7 +23864,6 @@
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
       "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "async": "^3.2.3",
@@ -24000,10 +23879,9 @@
       }
     },
     "node_modules/jake/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -24014,7 +23892,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -24069,7 +23946,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
       "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
@@ -24101,7 +23977,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -24114,7 +23989,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -24129,7 +24003,6 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jest-cli": {
@@ -24170,7 +24043,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
       "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
@@ -24216,7 +24088,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -24226,10 +24097,9 @@
       }
     },
     "node_modules/jest-config/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -24241,7 +24111,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -24262,7 +24131,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -24275,7 +24143,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -24290,14 +24157,12 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jest-diff": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
       "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
@@ -24313,7 +24178,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -24326,7 +24190,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -24341,14 +24204,12 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jest-docblock": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
       "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "detect-newline": "^3.0.0"
@@ -24361,7 +24222,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
       "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -24378,7 +24238,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -24391,7 +24250,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -24406,7 +24264,6 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jest-environment-jsdom": {
@@ -24449,6 +24306,19 @@
         "parse5": "^7.0.0"
       }
     },
+    "node_modules/jest-environment-jsdom/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
     "node_modules/jest-environment-jsdom/node_modules/cssstyle": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
@@ -24497,6 +24367,21 @@
         "node": ">=12"
       }
     },
+    "node_modules/jest-environment-jsdom/node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/jest-environment-jsdom/node_modules/https-proxy-agent": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
@@ -24634,7 +24519,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
       "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
@@ -24652,7 +24536,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
       "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -24662,7 +24545,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
       "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -24714,7 +24596,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
       "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "jest-get-type": "^29.6.3",
@@ -24728,7 +24609,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -24741,7 +24621,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -24756,14 +24635,12 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jest-matcher-utils": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
       "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
@@ -24779,7 +24656,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -24792,7 +24668,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -24807,14 +24682,12 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jest-message-util": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
       "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
@@ -24835,7 +24708,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -24848,7 +24720,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -24863,14 +24734,12 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jest-mock": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
       "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -24917,9 +24786,9 @@
       }
     },
     "node_modules/jest-playwright-preset/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -24993,7 +24862,6 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -25008,18 +24876,18 @@
       }
     },
     "node_modules/jest-preset-angular": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-14.1.1.tgz",
-      "integrity": "sha512-mWW2WlndHetTp4PQov05v7JE6HZQB5uTzGd+oW2RPH1OOTCLUKI8mSIU4DXCBJ4LDg5gIMMfqHsxT/Qmpu2dQQ==",
+      "version": "14.6.0",
+      "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-14.6.0.tgz",
+      "integrity": "sha512-LGSKLCsUhtrs2dw6f7ega/HOS8/Ni/1gV+oXmxPHmJDLHFpM6cI78Monmz8Z1P87a/A4OwnKilxgPRr+6Pzmgg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "bs-logger": "^0.2.6",
         "esbuild-wasm": ">=0.15.13",
-        "jest-environment-jsdom": "^29.0.0",
-        "jest-util": "^29.0.0",
-        "pretty-format": "^29.0.0",
-        "ts-jest": "^29.0.0"
+        "jest-environment-jsdom": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0",
+        "ts-jest": "^29.3.0"
       },
       "engines": {
         "node": "^14.15.0 || >=16.10.0"
@@ -25028,12 +24896,17 @@
         "esbuild": ">=0.15.13"
       },
       "peerDependencies": {
-        "@angular-devkit/build-angular": ">=15.0.0 <19.0.0",
-        "@angular/compiler-cli": ">=15.0.0 <19.0.0",
-        "@angular/core": ">=15.0.0 <19.0.0",
-        "@angular/platform-browser-dynamic": ">=15.0.0 <19.0.0",
+        "@angular/compiler-cli": ">=15.0.0 <21.0.0",
+        "@angular/core": ">=15.0.0 <21.0.0",
+        "@angular/platform-browser-dynamic": ">=15.0.0 <21.0.0",
         "jest": "^29.0.0",
+        "jsdom": ">=20.0.0",
         "typescript": ">=4.8"
+      },
+      "peerDependenciesMeta": {
+        "jsdom": {
+          "optional": true
+        }
       }
     },
     "node_modules/jest-preset-angular/node_modules/ansi-styles": {
@@ -25121,7 +24994,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
       "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -25131,7 +25003,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
       "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
@@ -25166,7 +25037,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
       "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/console": "^29.7.0",
@@ -25199,7 +25069,6 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -25209,7 +25078,6 @@
       "version": "0.5.13",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
       "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
@@ -25220,7 +25088,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
       "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
@@ -25251,10 +25118,9 @@
       }
     },
     "node_modules/jest-runtime/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -25266,7 +25132,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -25287,7 +25152,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -25310,7 +25174,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
       "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
@@ -25342,7 +25205,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -25355,7 +25217,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -25370,14 +25231,12 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jest-util": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
       "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -25395,7 +25254,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -25408,7 +25266,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
       "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
@@ -25426,7 +25283,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -25439,7 +25295,6 @@
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
       "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -25452,7 +25307,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -25467,7 +25321,6 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jest-watch-typeahead": {
@@ -25591,7 +25444,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
       "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^29.7.0",
@@ -25611,7 +25463,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
       "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -25627,7 +25478,6 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -25643,7 +25493,7 @@
       "version": "1.21.7",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
       "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "bin": {
         "jiti": "bin/jiti.js"
@@ -25677,18 +25527,33 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "license": "MIT",
       "dependencies": {
-        "argparse": "^2.0.1"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       },
       "bin": {
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/js-yaml/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/js-yaml/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "license": "BSD-3-Clause"
+    },
     "node_modules/jsbn": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
@@ -25745,28 +25610,6 @@
         }
       }
     },
-    "node_modules/jsdom/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/jsdom/node_modules/http-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/jsdom/node_modules/tldts": {
       "version": "6.1.86",
       "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
@@ -25813,17 +25656,16 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/json-parse-even-better-errors": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
-      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz",
+      "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/json-schema-traverse": {
@@ -25863,7 +25705,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/json-stringify-safe": {
@@ -25876,7 +25717,6 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
@@ -25941,42 +25781,6 @@
         "setimmediate": "^1.0.5"
       }
     },
-    "node_modules/jszip/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "license": "MIT"
-    },
-    "node_modules/jszip/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/jszip/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "license": "MIT"
-    },
-    "node_modules/jszip/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/junit-report-builder": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/junit-report-builder/-/junit-report-builder-5.1.1.tgz",
@@ -26056,7 +25860,6 @@
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
@@ -26364,68 +26167,10 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lazystream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
-      "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "readable-stream": "^2.0.5"
-      },
-      "engines": {
-        "node": ">= 0.6.3"
-      }
-    },
-    "node_modules/lazystream/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
-    "node_modules/lazystream/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/lazystream/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
-    "node_modules/lazystream/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/less": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.2.0.tgz",
-      "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/less/-/less-4.2.2.tgz",
+      "integrity": "sha512-tkuLHQlvWUTeQ3doAqnHbNn8T6WX1KA8yvbKG9x4VtKtIjHsVKQZCH11zRgAfbDAXC2UNIg/K9BYAAcEzUIrNg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -26542,7 +26287,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -26552,7 +26296,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
@@ -26606,7 +26349,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz",
       "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
@@ -26821,9 +26563,9 @@
       }
     },
     "node_modules/listr2": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz",
-      "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==",
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.5.tgz",
+      "integrity": "sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -27009,29 +26751,30 @@
       }
     },
     "node_modules/lmdb": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.0.13.tgz",
-      "integrity": "sha512-UGe+BbaSUQtAMZobTb4nHvFMrmvuAQKSeaqAX2meTEQjfsbpl5sxdHD8T72OnwD4GU9uwNhYXIVe4QGs8N9Zyw==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.2.6.tgz",
+      "integrity": "sha512-SuHqzPl7mYStna8WRotY8XX/EUZBjjv3QyKIByeCLFfC9uXT/OIHByEcA07PzbMfQAM0KYJtLgtpMRlIe5dErQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "msgpackr": "^1.10.2",
+        "msgpackr": "^1.11.2",
         "node-addon-api": "^6.1.0",
         "node-gyp-build-optional-packages": "5.2.2",
-        "ordered-binary": "^1.4.1",
+        "ordered-binary": "^1.5.3",
         "weak-lru-cache": "^1.2.2"
       },
       "bin": {
         "download-lmdb-prebuilds": "bin/download-prebuilds.js"
       },
       "optionalDependencies": {
-        "@lmdb/lmdb-darwin-arm64": "3.0.13",
-        "@lmdb/lmdb-darwin-x64": "3.0.13",
-        "@lmdb/lmdb-linux-arm": "3.0.13",
-        "@lmdb/lmdb-linux-arm64": "3.0.13",
-        "@lmdb/lmdb-linux-x64": "3.0.13",
-        "@lmdb/lmdb-win32-x64": "3.0.13"
+        "@lmdb/lmdb-darwin-arm64": "3.2.6",
+        "@lmdb/lmdb-darwin-x64": "3.2.6",
+        "@lmdb/lmdb-linux-arm": "3.2.6",
+        "@lmdb/lmdb-linux-arm64": "3.2.6",
+        "@lmdb/lmdb-linux-x64": "3.2.6",
+        "@lmdb/lmdb-win32-x64": "3.2.6"
       }
     },
     "node_modules/lmdb/node_modules/node-addon-api": {
@@ -27039,7 +26782,8 @@
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
       "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/loader-runner": {
       "version": "4.3.0",
@@ -27065,7 +26809,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
@@ -27087,25 +26830,8 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.defaults": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
-    "node_modules/lodash.difference": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/lodash.escaperegexp": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
@@ -27113,14 +26839,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/lodash.flattendeep": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
@@ -27136,14 +26854,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -27155,17 +26865,8 @@
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.union": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
-      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -27431,9 +27132,9 @@
       }
     },
     "node_modules/loupe": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
-      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.4.tgz",
+      "integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
       "dev": true,
       "license": "MIT"
     },
@@ -27477,7 +27178,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
@@ -27513,9 +27213,9 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.11",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "version": "0.30.17",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -27526,7 +27226,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "semver": "^7.5.3"
@@ -27542,7 +27241,6 @@
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
       "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/make-fetch-happen": {
@@ -27573,6 +27271,34 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
+    "node_modules/make-fetch-happen/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/make-fetch-happen/node_modules/https-proxy-agent": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
@@ -27631,7 +27357,6 @@
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
       "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "tmpl": "1.0.5"
@@ -27915,7 +27640,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
       "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -27948,7 +27672,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
       "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -27961,7 +27684,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/merge2": {
@@ -28617,7 +28339,6 @@
       "version": "1.54.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
       "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -28627,7 +28348,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
       "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mime-db": "^1.54.0"
@@ -28708,10 +28428,9 @@
       "license": "ISC"
     },
     "node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -29024,9 +28743,9 @@
       }
     },
     "node_modules/mrmime": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
-      "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz",
+      "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -29045,6 +28764,7 @@
       "integrity": "sha512-uaff7RG9VIC4jacFW9xzL3jc0iM32DNHe4jYVycBcjUePT/Klnfj7pqtWJt9khvDFizmjN2TlYniYmSS2LIaZg==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
       "optionalDependencies": {
         "msgpackr-extract": "^3.0.2"
       }
@@ -29185,6 +28905,21 @@
         "readable-stream": "^3.6.0"
       }
     },
+    "node_modules/multistream/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/mustache": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
@@ -29196,13 +28931,13 @@
       }
     },
     "node_modules/mute-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
-      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
+      "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/mz": {
@@ -29276,7 +29011,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/needle": {
@@ -29301,7 +29035,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
       "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -29338,30 +29071,6 @@
         "@angular/platform-browser": ">=16.0.0-0"
       }
     },
-    "node_modules/nice-napi": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz",
-      "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "!win32"
-      ],
-      "dependencies": {
-        "node-addon-api": "^3.0.0",
-        "node-gyp-build": "^4.2.2"
-      }
-    },
-    "node_modules/nice-napi/node_modules/node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/no-case": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
@@ -29394,9 +29103,9 @@
       "license": "MIT"
     },
     "node_modules/node-addon-api": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.1.tgz",
-      "integrity": "sha512-lytcDEdxKjGJPTLEfW4mYMigRezMlyJY8W4wxJK8zE533Jlb8L8dRuObJFWg2P+AuOIxoCgKF+2Oq4d4Zd0OUA==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.4.0.tgz",
+      "integrity": "sha512-D9DI/gXHvVmjHS08SVch0Em8G5S1P+QWtU31appcKT/8wFSPRcdHadIFSAntdMMVM5zz+/DL+bL/gz3UDppqtg==",
       "license": "MIT",
       "engines": {
         "node": "^18 || ^20 || >= 21"
@@ -29464,28 +29173,28 @@
       }
     },
     "node_modules/node-gyp": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.3.1.tgz",
-      "integrity": "sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ==",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.2.0.tgz",
+      "integrity": "sha512-T0S1zqskVUSxcsSTkAsLc7xCycrRYmtDHadDinzocrThjyQCn5kMlEBSj6H4qDbgsIOSLmmlRIeb0lZXj+UArA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
         "exponential-backoff": "^3.1.1",
-        "glob": "^10.3.10",
         "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^13.0.0",
-        "nopt": "^7.0.0",
-        "proc-log": "^4.1.0",
+        "make-fetch-happen": "^14.0.3",
+        "nopt": "^8.0.0",
+        "proc-log": "^5.0.0",
         "semver": "^7.3.5",
-        "tar": "^6.2.1",
-        "which": "^4.0.0"
+        "tar": "^7.4.3",
+        "tinyglobby": "^0.2.12",
+        "which": "^5.0.0"
       },
       "bin": {
         "node-gyp": "bin/node-gyp.js"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/node-gyp-build": {
@@ -29505,6 +29214,7 @@
       "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "detect-libc": "^2.0.1"
       },
@@ -29515,36 +29225,36 @@
       }
     },
     "node_modules/node-gyp/node_modules/@npmcli/fs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
-      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
+      "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/node-gyp/node_modules/abbrev": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
-      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz",
+      "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/node-gyp/node_modules/cacache": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
-      "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==",
+      "version": "19.0.1",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz",
+      "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/fs": "^3.1.0",
+        "@npmcli/fs": "^4.0.0",
         "fs-minipass": "^3.0.0",
         "glob": "^10.2.2",
         "lru-cache": "^10.0.1",
@@ -29552,13 +29262,23 @@
         "minipass-collect": "^2.0.1",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "p-map": "^4.0.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11",
-        "unique-filename": "^3.0.0"
+        "p-map": "^7.0.2",
+        "ssri": "^12.0.0",
+        "tar": "^7.4.3",
+        "unique-filename": "^4.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/chownr": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/node-gyp/node_modules/fs-minipass": {
@@ -29629,27 +29349,42 @@
       "license": "ISC"
     },
     "node_modules/node-gyp/node_modules/make-fetch-happen": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
-      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz",
+      "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/agent": "^2.0.0",
-        "cacache": "^18.0.0",
+        "@npmcli/agent": "^3.0.0",
+        "cacache": "^19.0.1",
         "http-cache-semantics": "^4.1.1",
-        "is-lambda": "^1.0.1",
         "minipass": "^7.0.2",
-        "minipass-fetch": "^3.0.0",
+        "minipass-fetch": "^4.0.0",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "proc-log": "^4.2.0",
+        "negotiator": "^1.0.0",
+        "proc-log": "^5.0.0",
         "promise-retry": "^2.0.1",
-        "ssri": "^10.0.0"
+        "ssri": "^12.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/node-gyp/node_modules/minipass-collect": {
@@ -29666,47 +29401,79 @@
       }
     },
     "node_modules/node-gyp/node_modules/minipass-fetch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
-      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz",
+      "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "minipass": "^7.0.3",
         "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
+        "minizlib": "^3.0.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       },
       "optionalDependencies": {
         "encoding": "^0.1.13"
       }
     },
-    "node_modules/node-gyp/node_modules/negotiator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+    "node_modules/node-gyp/node_modules/minizlib": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
+      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.1.2"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 18"
+      }
+    },
+    "node_modules/node-gyp/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/node-gyp/node_modules/nopt": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
-      "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz",
+      "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "abbrev": "^2.0.0"
+        "abbrev": "^3.0.0"
       },
       "bin": {
         "nopt": "bin/nopt.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/p-map": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz",
+      "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/node-gyp/node_modules/path-scurry": {
@@ -29727,58 +29494,76 @@
       }
     },
     "node_modules/node-gyp/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
+      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/node-gyp/node_modules/ssri": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
-      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz",
+      "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "minipass": "^7.0.3"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/node-gyp/node_modules/unique-filename": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+    "node_modules/node-gyp/node_modules/tar": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "unique-slug": "^4.0.0"
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=18"
+      }
+    },
+    "node_modules/node-gyp/node_modules/unique-filename": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz",
+      "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "unique-slug": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/node-gyp/node_modules/unique-slug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz",
+      "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/node-gyp/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -29788,21 +29573,29 @@
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/yallist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
       "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/node-machine-id": {
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
       "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/node-preload": {
@@ -29822,7 +29615,6 @@
       "version": "2.0.19",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
       "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/nopt": {
@@ -29841,46 +29633,10 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
-    "node_modules/normalize-package-data": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
-      "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "hosted-git-info": "^7.0.0",
-        "semver": "^7.3.5",
-        "validate-npm-package-license": "^3.0.4"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/hosted-git-info": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^10.0.1"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -29910,68 +29666,68 @@
       }
     },
     "node_modules/npm-bundled": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz",
-      "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-4.0.0.tgz",
+      "integrity": "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "npm-normalize-package-bin": "^3.0.0"
+        "npm-normalize-package-bin": "^4.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-install-checks": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz",
-      "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.1.tgz",
+      "integrity": "sha512-u6DCwbow5ynAX5BdiHQ9qvexme4U3qHW3MWe5NqH+NeBm0LbiH6zvGjNNew1fY+AZZUtVHbOPF3j7mJxbUzpXg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "semver": "^7.1.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-normalize-package-bin": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
-      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz",
+      "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-package-arg": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz",
-      "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==",
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-12.0.2.tgz",
+      "integrity": "sha512-f1NpFjNI9O4VbKMOlA5QoBq/vSQPORHcTZ2feJpFkTHJ9eQkdlmZEKSjcAhxTGInC7RlEyScT9ui67NaOsjFWA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "hosted-git-info": "^7.0.0",
-        "proc-log": "^4.0.0",
+        "hosted-git-info": "^8.0.0",
+        "proc-log": "^5.0.0",
         "semver": "^7.3.5",
-        "validate-npm-package-name": "^5.0.0"
+        "validate-npm-package-name": "^6.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-package-arg/node_modules/hosted-git-info": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.1.0.tgz",
+      "integrity": "sha512-Rw/B2DNQaPBICNXEm8balFz9a6WpZrkCGpcWFpy7nCj+NyhSdqXipmfvtmWt9xGfp0wZnBxB+iVpLmQMYt47Tw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "lru-cache": "^10.0.1"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-package-arg/node_modules/lru-cache": {
@@ -29982,85 +29738,85 @@
       "license": "ISC"
     },
     "node_modules/npm-package-arg/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
+      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-packlist": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz",
-      "integrity": "sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-9.0.0.tgz",
+      "integrity": "sha512-8qSayfmHJQTx3nJWYbbUmflpyarbLMBc6LCAjYsiGtXxDB68HaZpb8re6zeaLGxZzDuMdhsg70jryJe+RrItVQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "ignore-walk": "^6.0.4"
+        "ignore-walk": "^7.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-pick-manifest": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz",
-      "integrity": "sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-10.0.0.tgz",
+      "integrity": "sha512-r4fFa4FqYY8xaM7fHecQ9Z2nE9hgNfJR+EmoKv0+chvzWkBcORX3r0FpTByP+CbOVJDladMXnPQGVN8PBLGuTQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "npm-install-checks": "^6.0.0",
-        "npm-normalize-package-bin": "^3.0.0",
-        "npm-package-arg": "^11.0.0",
+        "npm-install-checks": "^7.1.0",
+        "npm-normalize-package-bin": "^4.0.0",
+        "npm-package-arg": "^12.0.0",
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-registry-fetch": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz",
-      "integrity": "sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==",
+      "version": "18.0.2",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-18.0.2.tgz",
+      "integrity": "sha512-LeVMZBBVy+oQb5R6FDV9OlJCcWDU+al10oKpe+nsvcHnG24Z3uM3SvJYKfGJlfGjVU8v9liejCrUR/M5HO5NEQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/redact": "^2.0.0",
+        "@npmcli/redact": "^3.0.0",
         "jsonparse": "^1.3.1",
-        "make-fetch-happen": "^13.0.0",
+        "make-fetch-happen": "^14.0.0",
         "minipass": "^7.0.2",
-        "minipass-fetch": "^3.0.0",
-        "minizlib": "^2.1.2",
-        "npm-package-arg": "^11.0.0",
-        "proc-log": "^4.0.0"
+        "minipass-fetch": "^4.0.0",
+        "minizlib": "^3.0.1",
+        "npm-package-arg": "^12.0.0",
+        "proc-log": "^5.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-registry-fetch/node_modules/@npmcli/fs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
-      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
+      "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-registry-fetch/node_modules/cacache": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
-      "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==",
+      "version": "19.0.1",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz",
+      "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/fs": "^3.1.0",
+        "@npmcli/fs": "^4.0.0",
         "fs-minipass": "^3.0.0",
         "glob": "^10.2.2",
         "lru-cache": "^10.0.1",
@@ -30068,13 +29824,23 @@
         "minipass-collect": "^2.0.1",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "p-map": "^4.0.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11",
-        "unique-filename": "^3.0.0"
+        "p-map": "^7.0.2",
+        "ssri": "^12.0.0",
+        "tar": "^7.4.3",
+        "unique-filename": "^4.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/chownr": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/npm-registry-fetch/node_modules/fs-minipass": {
@@ -30135,27 +29901,42 @@
       "license": "ISC"
     },
     "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
-      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz",
+      "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/agent": "^2.0.0",
-        "cacache": "^18.0.0",
+        "@npmcli/agent": "^3.0.0",
+        "cacache": "^19.0.1",
         "http-cache-semantics": "^4.1.1",
-        "is-lambda": "^1.0.1",
         "minipass": "^7.0.2",
-        "minipass-fetch": "^3.0.0",
+        "minipass-fetch": "^4.0.0",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "proc-log": "^4.2.0",
+        "negotiator": "^1.0.0",
+        "proc-log": "^5.0.0",
         "promise-retry": "^2.0.1",
-        "ssri": "^10.0.0"
+        "ssri": "^12.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/npm-registry-fetch/node_modules/minipass-collect": {
@@ -30172,31 +29953,63 @@
       }
     },
     "node_modules/npm-registry-fetch/node_modules/minipass-fetch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
-      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz",
+      "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "minipass": "^7.0.3",
         "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
+        "minizlib": "^3.0.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       },
       "optionalDependencies": {
         "encoding": "^0.1.13"
       }
     },
-    "node_modules/npm-registry-fetch/node_modules/negotiator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+    "node_modules/npm-registry-fetch/node_modules/minizlib": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
+      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/p-map": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz",
+      "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/npm-registry-fetch/node_modules/path-scurry": {
@@ -30217,59 +30030,86 @@
       }
     },
     "node_modules/npm-registry-fetch/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
+      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-registry-fetch/node_modules/ssri": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
-      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz",
+      "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "minipass": "^7.0.3"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/npm-registry-fetch/node_modules/unique-filename": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+    "node_modules/npm-registry-fetch/node_modules/tar": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "unique-slug": "^4.0.0"
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=18"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/unique-filename": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz",
+      "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "unique-slug": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-registry-fetch/node_modules/unique-slug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz",
+      "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/yallist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
@@ -30298,10 +30138,9 @@
       "license": "MIT"
     },
     "node_modules/nx": {
-      "version": "20.8.0",
-      "resolved": "https://registry.npmjs.org/nx/-/nx-20.8.0.tgz",
-      "integrity": "sha512-+BN5B5DFBB5WswD8flDDTnr4/bf1VTySXOv60aUAllHqR+KS6deT0p70TTMZF4/A2n/L2UCWDaDro37MGaYozA==",
-      "dev": true,
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/nx/-/nx-21.1.2.tgz",
+      "integrity": "sha512-oczAEOOkQHElxCXs2g2jXDRabDRsmub/h5SAgqAUDSJ2CRnYGVVlgZX7l+o+A9kSqfONyLy5FlJ1pSWlvPuG4w==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -30334,6 +30173,7 @@
         "string-width": "^4.2.3",
         "tar-stream": "~2.2.0",
         "tmp": "~0.2.1",
+        "tree-kill": "^1.2.2",
         "tsconfig-paths": "^4.1.2",
         "tslib": "^2.3.0",
         "yaml": "^2.6.0",
@@ -30345,16 +30185,16 @@
         "nx-cloud": "bin/nx-cloud.js"
       },
       "optionalDependencies": {
-        "@nx/nx-darwin-arm64": "20.8.0",
-        "@nx/nx-darwin-x64": "20.8.0",
-        "@nx/nx-freebsd-x64": "20.8.0",
-        "@nx/nx-linux-arm-gnueabihf": "20.8.0",
-        "@nx/nx-linux-arm64-gnu": "20.8.0",
-        "@nx/nx-linux-arm64-musl": "20.8.0",
-        "@nx/nx-linux-x64-gnu": "20.8.0",
-        "@nx/nx-linux-x64-musl": "20.8.0",
-        "@nx/nx-win32-arm64-msvc": "20.8.0",
-        "@nx/nx-win32-x64-msvc": "20.8.0"
+        "@nx/nx-darwin-arm64": "21.1.2",
+        "@nx/nx-darwin-x64": "21.1.2",
+        "@nx/nx-freebsd-x64": "21.1.2",
+        "@nx/nx-linux-arm-gnueabihf": "21.1.2",
+        "@nx/nx-linux-arm64-gnu": "21.1.2",
+        "@nx/nx-linux-arm64-musl": "21.1.2",
+        "@nx/nx-linux-x64-gnu": "21.1.2",
+        "@nx/nx-linux-x64-musl": "21.1.2",
+        "@nx/nx-win32-arm64-msvc": "21.1.2",
+        "@nx/nx-win32-x64-msvc": "21.1.2"
       },
       "peerDependencies": {
         "@swc-node/register": "^1.8.0",
@@ -30369,44 +30209,90 @@
         }
       }
     },
+    "node_modules/nx/node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nx/node_modules/dotenv": {
+      "version": "16.4.7",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
+      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/nx/node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
       "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
+    "node_modules/nx/node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nx/node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/nx/node_modules/jsonc-parser": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
       "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-      "dev": true,
       "license": "MIT"
     },
-    "node_modules/nx/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/nx/node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/nx/node_modules/ora": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz",
       "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "bl": "^4.0.3",
@@ -30429,27 +30315,15 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/nx/node_modules/tmp": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
     "node_modules/nx/node_modules/tsconfig-paths": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
       "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "json5": "^2.2.2",
@@ -30503,9 +30377,9 @@
       }
     },
     "node_modules/nyc/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -30716,16 +30590,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/nyc/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/nyc/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -30999,17 +30863,18 @@
       "integrity": "sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ=="
     },
     "node_modules/open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-10.1.2.tgz",
+      "integrity": "sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==",
       "license": "MIT",
       "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
+        "default-browser": "^5.2.1",
+        "define-lazy-prop": "^3.0.0",
+        "is-inside-container": "^1.0.0",
+        "is-wsl": "^3.1.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -31029,7 +30894,6 @@
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
       "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "deep-is": "^0.1.3",
@@ -31071,7 +30935,8 @@
       "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.3.tgz",
       "integrity": "sha512-oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/os-homedir": {
       "version": "1.0.2",
@@ -31151,7 +31016,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
@@ -31167,7 +31031,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
@@ -31234,7 +31097,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -31264,58 +31126,58 @@
       "license": "BlueOak-1.0.0"
     },
     "node_modules/pacote": {
-      "version": "18.0.6",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-18.0.6.tgz",
-      "integrity": "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==",
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-20.0.0.tgz",
+      "integrity": "sha512-pRjC5UFwZCgx9kUFDVM9YEahv4guZ1nSLqwmWiLUnDbGsjs+U5w7z6Uc8HNR1a6x8qnu5y9xtGE6D1uAuYz+0A==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/git": "^5.0.0",
-        "@npmcli/installed-package-contents": "^2.0.1",
-        "@npmcli/package-json": "^5.1.0",
-        "@npmcli/promise-spawn": "^7.0.0",
-        "@npmcli/run-script": "^8.0.0",
-        "cacache": "^18.0.0",
+        "@npmcli/git": "^6.0.0",
+        "@npmcli/installed-package-contents": "^3.0.0",
+        "@npmcli/package-json": "^6.0.0",
+        "@npmcli/promise-spawn": "^8.0.0",
+        "@npmcli/run-script": "^9.0.0",
+        "cacache": "^19.0.0",
         "fs-minipass": "^3.0.0",
         "minipass": "^7.0.2",
-        "npm-package-arg": "^11.0.0",
-        "npm-packlist": "^8.0.0",
-        "npm-pick-manifest": "^9.0.0",
-        "npm-registry-fetch": "^17.0.0",
-        "proc-log": "^4.0.0",
+        "npm-package-arg": "^12.0.0",
+        "npm-packlist": "^9.0.0",
+        "npm-pick-manifest": "^10.0.0",
+        "npm-registry-fetch": "^18.0.0",
+        "proc-log": "^5.0.0",
         "promise-retry": "^2.0.1",
-        "sigstore": "^2.2.0",
-        "ssri": "^10.0.0",
+        "sigstore": "^3.0.0",
+        "ssri": "^12.0.0",
         "tar": "^6.1.11"
       },
       "bin": {
         "pacote": "bin/index.js"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/pacote/node_modules/@npmcli/fs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
-      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
+      "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/pacote/node_modules/cacache": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
-      "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==",
+      "version": "19.0.1",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz",
+      "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/fs": "^3.1.0",
+        "@npmcli/fs": "^4.0.0",
         "fs-minipass": "^3.0.0",
         "glob": "^10.2.2",
         "lru-cache": "^10.0.1",
@@ -31323,13 +31185,41 @@
         "minipass-collect": "^2.0.1",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "p-map": "^4.0.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11",
-        "unique-filename": "^3.0.0"
+        "p-map": "^7.0.2",
+        "ssri": "^12.0.0",
+        "tar": "^7.4.3",
+        "unique-filename": "^4.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/pacote/node_modules/cacache/node_modules/tar": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/pacote/node_modules/chownr": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/pacote/node_modules/fs-minipass": {
@@ -31389,6 +31279,22 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/pacote/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/pacote/node_modules/minipass-collect": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
@@ -31402,6 +31308,48 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
+    "node_modules/pacote/node_modules/minizlib": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
+      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/pacote/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/pacote/node_modules/p-map": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz",
+      "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/pacote/node_modules/path-scurry": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
@@ -31420,52 +31368,62 @@
       }
     },
     "node_modules/pacote/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
+      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/pacote/node_modules/ssri": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
-      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz",
+      "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "minipass": "^7.0.3"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/pacote/node_modules/unique-filename": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz",
+      "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "unique-slug": "^4.0.0"
+        "unique-slug": "^5.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/pacote/node_modules/unique-slug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz",
+      "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/pacote/node_modules/yallist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/pako": {
@@ -31658,9 +31616,9 @@
       }
     },
     "node_modules/patch-package/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -31703,6 +31661,33 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/patch-package/node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/patch-package/node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/patch-package/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -31753,6 +31738,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/patch-package/node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "license": "MIT",
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
     "node_modules/path-browserify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
@@ -31764,7 +31761,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -31863,6 +31859,21 @@
         "through": "~2.3"
       }
     },
+    "node_modules/pe-library": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/pe-library/-/pe-library-0.4.1.tgz",
+      "integrity": "sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/jet2jet"
+      }
+    },
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -31880,7 +31891,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -31915,27 +31925,25 @@
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
       "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/piscina": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.6.1.tgz",
-      "integrity": "sha512-z30AwWGtQE+Apr+2WBZensP2lIvwoaMcOPkQlIEmSGMJNUvaYACylPYrQM6wSdUNJlnDVMSpLv7xTMJqlVshOA==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.8.0.tgz",
+      "integrity": "sha512-EZJb+ZxDrQf3dihsUL7p42pjNyrNIFJCrRHPMgxu/svsj+P3xS3fuEWp7k2+rfsavfl1N0G29b1HGs7J0m8rZA==",
       "dev": true,
       "license": "MIT",
       "optionalDependencies": {
-        "nice-napi": "^1.0.2"
+        "@napi-rs/nice": "^1.0.1"
       }
     },
     "node_modules/pkce-challenge": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz",
       "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=16.20.0"
@@ -32125,13 +32133,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.52.0.tgz",
-      "integrity": "sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==",
+      "version": "1.53.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.53.1.tgz",
+      "integrity": "sha512-LJ13YLr/ocweuwxyGf1XNFWIU4M2zUSo149Qbp+A4cpwDjsxRPj7k6H25LBrEHiEwxvRbD8HdwvQmRMSvquhYw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.52.0"
+        "playwright-core": "1.53.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -32144,9 +32152,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz",
-      "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==",
+      "version": "1.53.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.53.1.tgz",
+      "integrity": "sha512-Z46Oq7tLAyT0lGoFx4DOuB1IA9D1TPj0QkYxpPVUnGDqHHvDpCftu1J2hM2PiWsNMoZh8+LQaarAWcDfPBc6zg==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -32487,6 +32495,36 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/postject": {
+      "version": "1.0.0-alpha.6",
+      "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz",
+      "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "commander": "^9.4.0"
+      },
+      "bin": {
+        "postject": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/postject/node_modules/commander": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
     "node_modules/prebuild-install": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
@@ -32518,7 +32556,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
@@ -32789,7 +32826,6 @@
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
       "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "forwarded": "0.2.0",
@@ -32803,7 +32839,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/proxy-middleware": {
@@ -32837,9 +32872,9 @@
       }
     },
     "node_modules/pump": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
-      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -32860,7 +32895,6 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
       "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
-      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -32957,7 +32991,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -32967,7 +33000,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
       "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
@@ -33079,79 +33111,32 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/read-config-file": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.3.2.tgz",
-      "integrity": "sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "config-file-ts": "^0.2.4",
-        "dotenv": "^9.0.2",
-        "dotenv-expand": "^5.1.0",
-        "js-yaml": "^4.1.0",
-        "json5": "^2.2.0",
-        "lazy-val": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/read-config-file/node_modules/dotenv": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz",
-      "integrity": "sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/read-config-file/node_modules/dotenv-expand": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
-      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
     "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/readdir-glob": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
-      "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "peer": true,
-      "dependencies": {
-        "minimatch": "^5.1.0"
-      }
+    "node_modules/readable-stream/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "license": "MIT"
     },
-    "node_modules/readdir-glob/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "dev": true,
-      "license": "ISC",
-      "peer": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+    "node_modules/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
     },
     "node_modules/readdirp": {
       "version": "4.1.2",
@@ -33255,14 +33240,12 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/regenerate-unicode-properties": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
       "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2"
@@ -33309,7 +33292,6 @@
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
       "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2",
@@ -33327,14 +33309,12 @@
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
       "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/regjsparser": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
       "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "jsesc": "~3.0.2"
@@ -33347,7 +33327,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
       "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
@@ -33542,7 +33521,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -33581,19 +33559,40 @@
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "license": "MIT"
     },
-    "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+    "node_modules/resedit": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/resedit/-/resedit-1.7.2.tgz",
+      "integrity": "sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "pe-library": "^0.4.1"
+      },
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/jet2jet"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -33618,16 +33617,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/resolve-dir": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
@@ -33643,12 +33632,12 @@
       }
     },
     "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/resolve-pkg-maps": {
@@ -33707,7 +33696,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
       "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -33827,13 +33815,13 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
-      "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.8.tgz",
+      "integrity": "sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -33843,29 +33831,32 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.22.4",
-        "@rollup/rollup-android-arm64": "4.22.4",
-        "@rollup/rollup-darwin-arm64": "4.22.4",
-        "@rollup/rollup-darwin-x64": "4.22.4",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
-        "@rollup/rollup-linux-arm-musleabihf": "4.22.4",
-        "@rollup/rollup-linux-arm64-gnu": "4.22.4",
-        "@rollup/rollup-linux-arm64-musl": "4.22.4",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
-        "@rollup/rollup-linux-riscv64-gnu": "4.22.4",
-        "@rollup/rollup-linux-s390x-gnu": "4.22.4",
-        "@rollup/rollup-linux-x64-gnu": "4.22.4",
-        "@rollup/rollup-linux-x64-musl": "4.22.4",
-        "@rollup/rollup-win32-arm64-msvc": "4.22.4",
-        "@rollup/rollup-win32-ia32-msvc": "4.22.4",
-        "@rollup/rollup-win32-x64-msvc": "4.22.4",
+        "@rollup/rollup-android-arm-eabi": "4.34.8",
+        "@rollup/rollup-android-arm64": "4.34.8",
+        "@rollup/rollup-darwin-arm64": "4.34.8",
+        "@rollup/rollup-darwin-x64": "4.34.8",
+        "@rollup/rollup-freebsd-arm64": "4.34.8",
+        "@rollup/rollup-freebsd-x64": "4.34.8",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.34.8",
+        "@rollup/rollup-linux-arm-musleabihf": "4.34.8",
+        "@rollup/rollup-linux-arm64-gnu": "4.34.8",
+        "@rollup/rollup-linux-arm64-musl": "4.34.8",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.34.8",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.34.8",
+        "@rollup/rollup-linux-riscv64-gnu": "4.34.8",
+        "@rollup/rollup-linux-s390x-gnu": "4.34.8",
+        "@rollup/rollup-linux-x64-gnu": "4.34.8",
+        "@rollup/rollup-linux-x64-musl": "4.34.8",
+        "@rollup/rollup-win32-arm64-msvc": "4.34.8",
+        "@rollup/rollup-win32-ia32-msvc": "4.34.8",
+        "@rollup/rollup-win32-x64-msvc": "4.34.8",
         "fsevents": "~2.3.2"
       }
     },
     "node_modules/rollup/node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
       "dev": true,
       "license": "MIT"
     },
@@ -33873,7 +33864,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
       "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "debug": "^4.4.0",
@@ -33890,14 +33880,12 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/router/node_modules/path-to-regexp": {
       "version": "8.2.0",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
       "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=16"
@@ -33913,7 +33901,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
       "integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -33984,9 +33971,9 @@
       }
     },
     "node_modules/rxjs-report-usage/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -34270,9 +34257,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -34293,7 +34280,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz",
       "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "debug": "^4.3.5",
@@ -34490,7 +34476,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz",
       "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "encodeurl": "^2.0.0",
@@ -34610,9 +34595,9 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
-      "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
+      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -34715,21 +34700,21 @@
       "license": "Apache-2.0"
     },
     "node_modules/sigstore": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz",
-      "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-3.1.0.tgz",
+      "integrity": "sha512-ZpzWAFHIFqyFE56dXqgX/DkDRZdz+rRcjoIk/RQU4IX0wiCv1l8S7ZrXDHcCc+uaf+6o7w3h2l3g6GYG5TKN9Q==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/bundle": "^2.3.2",
-        "@sigstore/core": "^1.0.0",
-        "@sigstore/protobuf-specs": "^0.3.2",
-        "@sigstore/sign": "^2.3.2",
-        "@sigstore/tuf": "^2.3.4",
-        "@sigstore/verify": "^1.2.1"
+        "@sigstore/bundle": "^3.1.0",
+        "@sigstore/core": "^2.0.0",
+        "@sigstore/protobuf-specs": "^0.4.0",
+        "@sigstore/sign": "^3.1.0",
+        "@sigstore/tuf": "^3.1.0",
+        "@sigstore/verify": "^2.1.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/simple-concat": {
@@ -34803,7 +34788,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -34859,9 +34843,9 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
-      "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.5.tgz",
+      "integrity": "sha512-iF+tNDQla22geJdTyJB1wM/qrX9DMRwWrciEPwWLPRWAUEM8sQiyxgckLxWT1f7+9VabJS0jTGGr4QgBuvi6Ww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -34888,6 +34872,19 @@
         "node": ">= 10"
       }
     },
+    "node_modules/socks-proxy-agent/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
     "node_modules/source-map": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
@@ -34969,9 +34966,9 @@
       }
     },
     "node_modules/spawn-wrap/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -35176,6 +35173,21 @@
         "wbuf": "^1.7.3"
       }
     },
+    "node_modules/spdy-transport/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/split": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
@@ -35240,7 +35252,6 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
       "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
@@ -35253,7 +35264,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -35270,9 +35280,9 @@
       }
     },
     "node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -35287,6 +35297,20 @@
         "graceful-fs": "^4.1.3"
       }
     },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/storybook": {
       "version": "8.6.12",
       "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.6.12.tgz",
@@ -35335,46 +35359,6 @@
         "readable-stream": "^2.1.4"
       }
     },
-    "node_modules/stream-meter/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/stream-meter/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/stream-meter/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/stream-meter/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/streaming-json-stringify": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/streaming-json-stringify/-/streaming-json-stringify-3.1.0.tgz",
@@ -35385,42 +35369,6 @@
         "readable-stream": "2"
       }
     },
-    "node_modules/streaming-json-stringify/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "license": "MIT"
-    },
-    "node_modules/streaming-json-stringify/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/streaming-json-stringify/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "license": "MIT"
-    },
-    "node_modules/streaming-json-stringify/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/streamsearch": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
@@ -35430,14 +35378,20 @@
       }
     },
     "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "license": "MIT",
       "dependencies": {
-        "safe-buffer": "~5.2.0"
+        "safe-buffer": "~5.1.0"
       }
     },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
     "node_modules/string-argv": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
@@ -35452,7 +35406,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "char-regex": "^1.0.2",
@@ -35581,7 +35534,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -35614,7 +35566,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -35730,6 +35681,22 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/sucrase/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/sucrase/node_modules/path-scurry": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
@@ -35992,7 +35959,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "bl": "^4.0.3",
@@ -36005,6 +35971,20 @@
         "node": ">=6"
       }
     },
+    "node_modules/tar-stream/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/tar/node_modules/minipass": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
@@ -36032,6 +36012,21 @@
         "memoizerific": "^1.11.3"
       }
     },
+    "node_modules/temp": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz",
+      "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "mkdirp": "^0.5.1",
+        "rimraf": "~2.6.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/temp-file": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz",
@@ -36058,10 +36053,88 @@
         "node": ">=12"
       }
     },
+    "node_modules/temp/node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/temp/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "peer": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/temp/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/temp/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/temp/node_modules/rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "peer": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
     "node_modules/terser": {
-      "version": "5.31.6",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
-      "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
+      "version": "5.39.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
+      "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -36154,7 +36227,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
@@ -36166,10 +36238,9 @@
       }
     },
     "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -36181,7 +36252,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -36202,7 +36272,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -36260,6 +36329,26 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/tiny-async-pool": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/tiny-async-pool/-/tiny-async-pool-1.3.0.tgz",
+      "integrity": "sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^5.5.0"
+      }
+    },
+    "node_modules/tiny-async-pool/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/tiny-invariant": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
@@ -36275,10 +36364,9 @@
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
-      "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
-      "dev": true,
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.4.4",
@@ -36324,21 +36412,18 @@
       }
     },
     "node_modules/tldts-core": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.7.tgz",
-      "integrity": "sha512-ECqb8imSroX1UmUuhRBNPkkmtZ8mHEenieim80UVxG0M5wXVjY2Fp2tYXCPvk+nLy1geOhFpeD5YQhM/gF63Jg==",
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.9.tgz",
+      "integrity": "sha512-/FGY1+CryHsxF9SFiPZlMOcwQsfABkAvOJO5VEKE8TNifVEqgMF7+UVXHGhm1z4gPUfvVS/EYcwhiRU3vUa1ag==",
       "license": "MIT"
     },
     "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
       "license": "MIT",
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
       "engines": {
-        "node": ">=0.6.0"
+        "node": ">=14.14"
       }
     },
     "node_modules/tmp-promise": {
@@ -36351,21 +36436,10 @@
         "tmp": "^0.2.0"
       }
     },
-    "node_modules/tmp-promise/node_modules/tmp": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
       "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true,
       "license": "BSD-3-Clause"
     },
     "node_modules/to-regex-range": {
@@ -36446,7 +36520,6 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
       "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "tree-kill": "cli.js"
@@ -36497,9 +36570,9 @@
       }
     },
     "node_modules/ts-essentials": {
-      "version": "10.0.4",
-      "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-10.0.4.tgz",
-      "integrity": "sha512-lwYdz28+S4nicm+jFi6V58LaAIpxzhg9rLdgNC1VsdP/xiFBseGhF1M/shwCk6zMmwahBZdXcl34LVHrEang3A==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-10.1.1.tgz",
+      "integrity": "sha512-4aTB7KLHKmUvkjNj8V+EdnmuVTiECzn3K+zIbRthumvHu+j44x3w63xpfs0JL3NGIzGXqoQ7AV591xHO+XrOTw==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -36519,21 +36592,22 @@
       "license": "Apache-2.0"
     },
     "node_modules/ts-jest": {
-      "version": "29.2.2",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.2.tgz",
-      "integrity": "sha512-sSW7OooaKT34AAngP6k1VS669a0HdLxkQZnlC7T76sckGCokXFnvJ3yRlQZGRTAoV5K19HfSgCiSwWOSIfcYlg==",
+      "version": "29.3.4",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.4.tgz",
+      "integrity": "sha512-Iqbrm8IXOmV+ggWHOTEbjwyCf2xZlUMv5npExksXohL+tk8va4Fjhb+X2+Rt9NBmgO7bJ8WpnMLOwih/DnMlFA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bs-logger": "0.x",
-        "ejs": "^3.0.0",
-        "fast-json-stable-stringify": "2.x",
+        "bs-logger": "^0.2.6",
+        "ejs": "^3.1.10",
+        "fast-json-stable-stringify": "^2.1.0",
         "jest-util": "^29.0.0",
         "json5": "^2.2.3",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "semver": "^7.5.3",
-        "yargs-parser": "^21.0.1"
+        "lodash.memoize": "^4.1.2",
+        "make-error": "^1.3.6",
+        "semver": "^7.7.2",
+        "type-fest": "^4.41.0",
+        "yargs-parser": "^21.1.1"
       },
       "bin": {
         "ts-jest": "cli.js"
@@ -36567,6 +36641,19 @@
         }
       }
     },
+    "node_modules/ts-jest/node_modules/type-fest": {
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/ts-loader": {
       "version": "9.5.2",
       "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.2.tgz",
@@ -36599,6 +36686,55 @@
         "code-block-writer": "^13.0.3"
       }
     },
+    "node_modules/ts-node": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-node/node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "license": "MIT"
+    },
     "node_modules/tsconfig-paths": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
@@ -36677,9 +36813,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
     "node_modules/tsscmp": {
@@ -36734,41 +36870,41 @@
       "license": "0BSD"
     },
     "node_modules/tuf-js": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz",
-      "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-3.0.1.tgz",
+      "integrity": "sha512-+68OP1ZzSF84rTckf3FA95vJ1Zlx/uaXyiiKyPd1pA4rZNkpEvDAKmsu1xUSmbF/chCRYgZ6UZkDwC7PmzmAyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@tufjs/models": "2.0.1",
-        "debug": "^4.3.4",
-        "make-fetch-happen": "^13.0.1"
+        "@tufjs/models": "3.0.1",
+        "debug": "^4.3.6",
+        "make-fetch-happen": "^14.0.1"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/tuf-js/node_modules/@npmcli/fs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
-      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
+      "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/tuf-js/node_modules/cacache": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
-      "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==",
+      "version": "19.0.1",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz",
+      "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/fs": "^3.1.0",
+        "@npmcli/fs": "^4.0.0",
         "fs-minipass": "^3.0.0",
         "glob": "^10.2.2",
         "lru-cache": "^10.0.1",
@@ -36776,13 +36912,23 @@
         "minipass-collect": "^2.0.1",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "p-map": "^4.0.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11",
-        "unique-filename": "^3.0.0"
+        "p-map": "^7.0.2",
+        "ssri": "^12.0.0",
+        "tar": "^7.4.3",
+        "unique-filename": "^4.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/tuf-js/node_modules/chownr": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/tuf-js/node_modules/fs-minipass": {
@@ -36843,27 +36989,42 @@
       "license": "ISC"
     },
     "node_modules/tuf-js/node_modules/make-fetch-happen": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
-      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz",
+      "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/agent": "^2.0.0",
-        "cacache": "^18.0.0",
+        "@npmcli/agent": "^3.0.0",
+        "cacache": "^19.0.1",
         "http-cache-semantics": "^4.1.1",
-        "is-lambda": "^1.0.1",
         "minipass": "^7.0.2",
-        "minipass-fetch": "^3.0.0",
+        "minipass-fetch": "^4.0.0",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "proc-log": "^4.2.0",
+        "negotiator": "^1.0.0",
+        "proc-log": "^5.0.0",
         "promise-retry": "^2.0.1",
-        "ssri": "^10.0.0"
+        "ssri": "^12.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/tuf-js/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/tuf-js/node_modules/minipass-collect": {
@@ -36880,31 +37041,63 @@
       }
     },
     "node_modules/tuf-js/node_modules/minipass-fetch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
-      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz",
+      "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "minipass": "^7.0.3",
         "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
+        "minizlib": "^3.0.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       },
       "optionalDependencies": {
         "encoding": "^0.1.13"
       }
     },
-    "node_modules/tuf-js/node_modules/negotiator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+    "node_modules/tuf-js/node_modules/minizlib": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
+      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/tuf-js/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/tuf-js/node_modules/p-map": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz",
+      "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/tuf-js/node_modules/path-scurry": {
@@ -36925,52 +37118,80 @@
       }
     },
     "node_modules/tuf-js/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
+      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/tuf-js/node_modules/ssri": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
-      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz",
+      "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "minipass": "^7.0.3"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/tuf-js/node_modules/unique-filename": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+    "node_modules/tuf-js/node_modules/tar": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "unique-slug": "^4.0.0"
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=18"
+      }
+    },
+    "node_modules/tuf-js/node_modules/unique-filename": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz",
+      "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "unique-slug": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/tuf-js/node_modules/unique-slug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz",
+      "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/tuf-js/node_modules/yallist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/tunnel-agent": {
@@ -36990,7 +37211,6 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
@@ -37003,7 +37223,6 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -37026,7 +37245,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
       "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "content-type": "^1.0.5",
@@ -37142,7 +37360,6 @@
       "version": "5.5.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
       "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
-      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -37344,14 +37561,12 @@
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
       "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
       "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -37361,7 +37576,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
       "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "unicode-canonical-property-names-ecmascript": "^2.0.0",
@@ -37375,7 +37589,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
       "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -37385,7 +37598,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
       "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -37549,9 +37761,9 @@
       }
     },
     "node_modules/unrs-resolver": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.7.2.tgz",
-      "integrity": "sha512-BBKpaylOW8KbHsu378Zky/dGh4ckT/4NW/0SHRABdqRLcQJ2dAOjDo9g97p04sWflm0kqPqpUatxReNV/dqI5A==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.9.1.tgz",
+      "integrity": "sha512-4AZVxP05JGN6DwqIkSP4VKLOcwQa5l37SWHF/ahcuqBMbfxbpN1L1QKafEhWCziHhzKex9H/AR09H0OuVyU+9g==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -37559,33 +37771,34 @@
         "napi-postinstall": "^0.2.2"
       },
       "funding": {
-        "url": "https://github.com/sponsors/JounQin"
+        "url": "https://opencollective.com/unrs-resolver"
       },
       "optionalDependencies": {
-        "@unrs/resolver-binding-darwin-arm64": "1.7.2",
-        "@unrs/resolver-binding-darwin-x64": "1.7.2",
-        "@unrs/resolver-binding-freebsd-x64": "1.7.2",
-        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.7.2",
-        "@unrs/resolver-binding-linux-arm-musleabihf": "1.7.2",
-        "@unrs/resolver-binding-linux-arm64-gnu": "1.7.2",
-        "@unrs/resolver-binding-linux-arm64-musl": "1.7.2",
-        "@unrs/resolver-binding-linux-ppc64-gnu": "1.7.2",
-        "@unrs/resolver-binding-linux-riscv64-gnu": "1.7.2",
-        "@unrs/resolver-binding-linux-riscv64-musl": "1.7.2",
-        "@unrs/resolver-binding-linux-s390x-gnu": "1.7.2",
-        "@unrs/resolver-binding-linux-x64-gnu": "1.7.2",
-        "@unrs/resolver-binding-linux-x64-musl": "1.7.2",
-        "@unrs/resolver-binding-wasm32-wasi": "1.7.2",
-        "@unrs/resolver-binding-win32-arm64-msvc": "1.7.2",
-        "@unrs/resolver-binding-win32-ia32-msvc": "1.7.2",
-        "@unrs/resolver-binding-win32-x64-msvc": "1.7.2"
+        "@unrs/resolver-binding-android-arm-eabi": "1.9.1",
+        "@unrs/resolver-binding-android-arm64": "1.9.1",
+        "@unrs/resolver-binding-darwin-arm64": "1.9.1",
+        "@unrs/resolver-binding-darwin-x64": "1.9.1",
+        "@unrs/resolver-binding-freebsd-x64": "1.9.1",
+        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.9.1",
+        "@unrs/resolver-binding-linux-arm-musleabihf": "1.9.1",
+        "@unrs/resolver-binding-linux-arm64-gnu": "1.9.1",
+        "@unrs/resolver-binding-linux-arm64-musl": "1.9.1",
+        "@unrs/resolver-binding-linux-ppc64-gnu": "1.9.1",
+        "@unrs/resolver-binding-linux-riscv64-gnu": "1.9.1",
+        "@unrs/resolver-binding-linux-riscv64-musl": "1.9.1",
+        "@unrs/resolver-binding-linux-s390x-gnu": "1.9.1",
+        "@unrs/resolver-binding-linux-x64-gnu": "1.9.1",
+        "@unrs/resolver-binding-linux-x64-musl": "1.9.1",
+        "@unrs/resolver-binding-wasm32-wasi": "1.9.1",
+        "@unrs/resolver-binding-win32-arm64-msvc": "1.9.1",
+        "@unrs/resolver-binding-win32-ia32-msvc": "1.9.1",
+        "@unrs/resolver-binding-win32-x64-msvc": "1.9.1"
       }
     },
     "node_modules/update-browserslist-db": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
       "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -37616,7 +37829,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
@@ -37724,11 +37936,16 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "license": "MIT"
+    },
     "node_modules/v8-to-istanbul": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
       "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.12",
@@ -37743,7 +37960,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/validate-npm-package-license": {
@@ -37758,13 +37974,13 @@
       }
     },
     "node_modules/validate-npm-package-name": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
-      "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.1.tgz",
+      "integrity": "sha512-OaI//3H0J7ZkR1OqlhGA8cA+Cbk/2xFOQpJOt5+s27/ta9eZwpeervh4Mxh4w0im/kdgktowaqVNR7QOrUd7Yg==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/vary": {
@@ -37792,6 +38008,14 @@
         "node": ">=0.6.0"
       }
     },
+    "node_modules/verror/node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/vfile": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
@@ -37838,21 +38062,25 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.4.19",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.19.tgz",
-      "integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==",
+      "version": "6.3.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
+      "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "esbuild": "^0.21.3",
-        "postcss": "^8.4.43",
-        "rollup": "^4.20.0"
+        "esbuild": "^0.25.0",
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2",
+        "postcss": "^8.5.3",
+        "rollup": "^4.34.9",
+        "tinyglobby": "^0.2.13"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^18.0.0 || >=20.0.0"
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
       },
       "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -37861,19 +38089,25 @@
         "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "jiti": ">=1.21.0",
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
         "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
-        "terser": "^5.4.0"
+        "terser": "^5.16.0",
+        "tsx": "^4.8.1",
+        "yaml": "^2.4.2"
       },
       "peerDependenciesMeta": {
         "@types/node": {
           "optional": true
         },
+        "jiti": {
+          "optional": true
+        },
         "less": {
           "optional": true
         },
@@ -37894,30 +38128,19 @@
         },
         "terser": {
           "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
         }
       }
     },
-    "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+    "node_modules/vite/node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz",
+      "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==",
       "cpu": [
         "arm"
       ],
@@ -37927,14 +38150,12 @@
       "os": [
         "android"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+    "node_modules/vite/node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz",
+      "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==",
       "cpu": [
         "arm64"
       ],
@@ -37944,31 +38165,12 @@
       "os": [
         "android"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+    "node_modules/vite/node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz",
+      "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==",
       "cpu": [
         "arm64"
       ],
@@ -37978,14 +38180,12 @@
       "os": [
         "darwin"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+    "node_modules/vite/node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz",
+      "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==",
       "cpu": [
         "x64"
       ],
@@ -37995,14 +38195,12 @@
       "os": [
         "darwin"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+    "node_modules/vite/node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz",
+      "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==",
       "cpu": [
         "arm64"
       ],
@@ -38012,14 +38210,12 @@
       "os": [
         "freebsd"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+    "node_modules/vite/node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz",
+      "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==",
       "cpu": [
         "x64"
       ],
@@ -38029,14 +38225,12 @@
       "os": [
         "freebsd"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+    "node_modules/vite/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz",
+      "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==",
       "cpu": [
         "arm"
       ],
@@ -38046,14 +38240,27 @@
       "os": [
         "linux"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+    "node_modules/vite/node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz",
+      "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz",
+      "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==",
       "cpu": [
         "arm64"
       ],
@@ -38063,16 +38270,14 @@
       "os": [
         "linux"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+    "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz",
+      "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==",
       "cpu": [
-        "ia32"
+        "arm64"
       ],
       "dev": true,
       "license": "MIT",
@@ -38080,14 +38285,12 @@
       "os": [
         "linux"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+    "node_modules/vite/node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz",
+      "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==",
       "cpu": [
         "loong64"
       ],
@@ -38097,31 +38300,12 @@
       "os": [
         "linux"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+    "node_modules/vite/node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz",
+      "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==",
       "cpu": [
         "ppc64"
       ],
@@ -38131,14 +38315,12 @@
       "os": [
         "linux"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+    "node_modules/vite/node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz",
+      "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==",
       "cpu": [
         "riscv64"
       ],
@@ -38148,14 +38330,12 @@
       "os": [
         "linux"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+    "node_modules/vite/node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz",
+      "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==",
       "cpu": [
         "s390x"
       ],
@@ -38165,14 +38345,12 @@
       "os": [
         "linux"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+    "node_modules/vite/node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz",
+      "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==",
       "cpu": [
         "x64"
       ],
@@ -38182,14 +38360,12 @@
       "os": [
         "linux"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+    "node_modules/vite/node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz",
+      "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==",
       "cpu": [
         "x64"
       ],
@@ -38197,50 +38373,14 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "netbsd"
+        "linux"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+    "node_modules/vite/node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz",
+      "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==",
       "cpu": [
         "arm64"
       ],
@@ -38250,14 +38390,12 @@
       "os": [
         "win32"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+    "node_modules/vite/node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz",
+      "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==",
       "cpu": [
         "ia32"
       ],
@@ -38267,14 +38405,12 @@
       "os": [
         "win32"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+    "node_modules/vite/node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz",
+      "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==",
       "cpu": [
         "x64"
       ],
@@ -38284,47 +38420,47 @@
       "os": [
         "win32"
       ],
-      "engines": {
-        "node": ">=12"
-      }
+      "peer": true
     },
-    "node_modules/vite/node_modules/esbuild": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+    "node_modules/vite/node_modules/rollup": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz",
+      "integrity": "sha512-qHcdEzLCiktQIfwBq420pn2dP+30uzqYxv9ETm91wdt2R9AFcWfjNAmje4NWlnCIQ5RMTzVf0ZyisOKqHR6RwA==",
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/estree": "1.0.8"
+      },
       "bin": {
-        "esbuild": "bin/esbuild"
+        "rollup": "dist/bin/rollup"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
+        "@rollup/rollup-android-arm-eabi": "4.44.0",
+        "@rollup/rollup-android-arm64": "4.44.0",
+        "@rollup/rollup-darwin-arm64": "4.44.0",
+        "@rollup/rollup-darwin-x64": "4.44.0",
+        "@rollup/rollup-freebsd-arm64": "4.44.0",
+        "@rollup/rollup-freebsd-x64": "4.44.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.44.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.44.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.44.0",
+        "@rollup/rollup-linux-arm64-musl": "4.44.0",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.44.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.44.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.44.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.44.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.44.0",
+        "@rollup/rollup-linux-x64-gnu": "4.44.0",
+        "@rollup/rollup-linux-x64-musl": "4.44.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.44.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.44.0",
+        "@rollup/rollup-win32-x64-msvc": "4.44.0",
+        "fsevents": "~2.3.2"
       }
     },
     "node_modules/w3c-xmlserializer": {
@@ -38483,16 +38619,15 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
       "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "makeerror": "1.0.12"
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
-      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -38527,7 +38662,8 @@
       "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
       "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/webidl-conversions": {
       "version": "7.0.0",
@@ -38713,15 +38849,16 @@
       }
     },
     "node_modules/webpack-dev-server": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.0.tgz",
-      "integrity": "sha512-90SqqYXA2SK36KcT6o1bvwvZfJFcmoamqeJY7+boioffX9g9C0wjjJRGUrQIuh43pb0ttX7+ssavmj/WN2RHtA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.1.tgz",
+      "integrity": "sha512-ml/0HIj9NLpVKOMq+SuBPLHcmbG+TGIjXRHsYfZwocUBIqEvws8NnS/V9AFQ5FKP+tgn5adwVwRrTEpGL33QFQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/bonjour": "^3.5.13",
         "@types/connect-history-api-fallback": "^1.5.4",
         "@types/express": "^4.17.21",
+        "@types/express-serve-static-core": "^4.17.21",
         "@types/serve-index": "^1.9.4",
         "@types/serve-static": "^1.15.5",
         "@types/sockjs": "^0.3.36",
@@ -38770,9 +38907,9 @@
       }
     },
     "node_modules/webpack-dev-server/node_modules/@types/express": {
-      "version": "4.17.22",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.22.tgz",
-      "integrity": "sha512-eZUmSnhRX9YRSkplpz0N+k6NljUUn5l3EWZIKZvYzhvMphEuNiyyy1viH/ejgt66JWgALwC/gtSUAeQKtSwW/w==",
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz",
+      "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -38906,19 +39043,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/webpack-dev-server/node_modules/define-lazy-prop": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
-      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/express": {
       "version": "4.21.2",
       "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
@@ -39069,22 +39193,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/is-wsl": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
-      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-inside-container": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -39151,25 +39259,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/open": {
-      "version": "10.1.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-10.1.2.tgz",
-      "integrity": "sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "default-browser": "^5.2.1",
-        "define-lazy-prop": "^3.0.0",
-        "is-inside-container": "^1.0.0",
-        "is-wsl": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/path-to-regexp": {
       "version": "0.1.12",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
@@ -39286,6 +39375,16 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/webpack-dev-server/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/webpack-dev-server/node_modules/type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -39338,9 +39437,9 @@
       }
     },
     "node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
+      "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -39377,9 +39476,9 @@
       "license": "MIT"
     },
     "node_modules/webpack/node_modules/browserslist": {
-      "version": "4.24.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
-      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
+      "version": "4.25.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
+      "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
       "dev": true,
       "funding": [
         {
@@ -39397,8 +39496,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001716",
-        "electron-to-chromium": "^1.5.149",
+        "caniuse-lite": "^1.0.30001718",
+        "electron-to-chromium": "^1.5.160",
         "node-releases": "^2.0.19",
         "update-browserslist-db": "^1.1.3"
       },
@@ -39701,7 +39800,6 @@
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -39757,7 +39855,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
       "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
@@ -39771,7 +39868,6 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/ws": {
@@ -39840,7 +39936,6 @@
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=10"
@@ -39850,7 +39945,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/yaml": {
@@ -39869,7 +39963,6 @@
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "cliui": "^8.0.1",
@@ -39888,7 +39981,6 @@
       "version": "21.1.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=12"
@@ -39914,11 +40006,19 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -39940,99 +40040,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/zip-stream": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz",
-      "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "archiver-utils": "^3.0.4",
-        "compress-commons": "^4.1.2",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/zip-stream/node_modules/archiver-utils": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz",
-      "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "glob": "^7.2.3",
-        "graceful-fs": "^4.2.0",
-        "lazystream": "^1.0.0",
-        "lodash.defaults": "^4.2.0",
-        "lodash.difference": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.union": "^4.6.0",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/zip-stream/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/zip-stream/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "peer": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/zip-stream/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "license": "ISC",
-      "peer": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/zod": {
-      "version": "3.25.23",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.23.tgz",
-      "integrity": "sha512-Od2bdMosahjSrSgJtakrwjMDb1zM1A3VIHCPGveZt/3/wlrTWBya2lmEh2OYe4OIu8mPTmmr0gnLHIWQXdtWBg==",
-      "dev": true,
+      "version": "3.25.67",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
+      "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
@@ -40042,16 +40053,15 @@
       "version": "3.24.5",
       "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.5.tgz",
       "integrity": "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==",
-      "dev": true,
       "license": "ISC",
       "peerDependencies": {
         "zod": "^3.24.1"
       }
     },
     "node_modules/zone.js": {
-      "version": "0.14.10",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz",
-      "integrity": "sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.1.tgz",
+      "integrity": "sha512-XE96n56IQpJM7NAoXswY3XRLcWFW83xe0BiAOeMD7K5k5xecOeul3Qcpx6GqEeeHNkW5DWL5zOyTbEfB4eti8w==",
       "license": "MIT"
     },
     "node_modules/zwitch": {
diff --git a/package.json b/package.json
index 84164696f46..d94295c5ea3 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "test:locales": "tsc --project ./scripts/tsconfig.json && node ./scripts/dist/test-locales.js",
     "lint:dep-ownership": "tsc --project ./scripts/tsconfig.json && node ./scripts/dist/dep-ownership.js",
     "docs:json": "compodoc -p ./tsconfig.json -e json -d . --disableRoutesGraph",
-    "storybook": "ng run components:storybook",
+    "storybook": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" ng run components:storybook",
     "build-storybook": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" ng run components:build-storybook",
     "build-storybook:ci": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" ng run components:build-storybook --webpack-stats-json",
     "test-stories": "test-storybook --url http://localhost:6006",
@@ -38,18 +38,18 @@
     "libs/**/*"
   ],
   "devDependencies": {
-    "@angular-devkit/build-angular": "18.2.19",
-    "@angular-eslint/schematics": "18.4.3",
-    "@angular/cli": "18.2.19",
-    "@angular/compiler-cli": "18.2.13",
+    "@angular-devkit/build-angular": "19.2.14",
+    "@angular-eslint/schematics": "19.6.0",
+    "@angular/cli": "19.2.14",
+    "@angular/compiler-cli": "19.2.14",
     "@babel/core": "7.24.9",
     "@babel/preset-env": "7.24.8",
     "@compodoc/compodoc": "1.1.26",
-    "@electron/notarize": "2.5.0",
+    "@electron/notarize": "3.0.1",
     "@electron/rebuild": "3.7.2",
     "@eslint/compat": "1.2.9",
     "@lit-labs/signals": "0.1.2",
-    "@ngtools/webpack": "18.2.19",
+    "@ngtools/webpack": "19.2.14",
     "@storybook/addon-a11y": "8.6.12",
     "@storybook/addon-actions": "8.6.12",
     "@storybook/addon-designs": "8.2.1",
@@ -66,7 +66,7 @@
     "@types/chrome": "0.0.306",
     "@types/firefox-webext-browser": "120.0.4",
     "@types/inquirer": "8.2.10",
-    "@types/jest": "29.5.12",
+    "@types/jest": "29.5.14",
     "@types/jsdom": "21.1.7",
     "@types/koa": "2.15.0",
     "@types/koa__multer": "2.0.7",
@@ -86,20 +86,20 @@
     "@typescript-eslint/utils": "8.31.0",
     "@webcomponents/custom-elements": "1.6.0",
     "@yao-pkg/pkg": "5.16.1",
-    "angular-eslint": "18.4.3",
+    "angular-eslint": "19.6.0",
     "autoprefixer": "10.4.21",
     "axe-playwright": "2.1.0",
     "babel-loader": "9.2.1",
     "base64-loader": "1.0.0",
     "browserslist": "4.23.2",
-    "chromatic": "11.28.2",
+    "chromatic": "13.1.2",
     "concurrently": "9.1.2",
     "copy-webpack-plugin": "13.0.0",
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",
-    "electron": "34.0.0",
-    "electron-builder": "24.13.3",
-    "electron-log": "5.2.4",
+    "electron": "36.4.0",
+    "electron-builder": "26.0.12",
+    "electron-log": "5.4.0",
     "electron-reload": "2.0.0-alpha.1",
     "electron-store": "8.2.0",
     "electron-updater": "6.6.4",
@@ -118,11 +118,11 @@
     "jest-diff": "29.7.0",
     "jest-junit": "16.0.0",
     "jest-mock-extended": "3.0.7",
-    "jest-preset-angular": "14.1.1",
+    "jest-preset-angular": "14.6.0",
     "json5": "2.2.3",
     "lint-staged": "16.0.0",
     "mini-css-extract-plugin": "2.9.2",
-    "nx": "20.8.0",
+    "nx": "21.1.2",
     "postcss": "8.5.3",
     "postcss-loader": "8.1.1",
     "prettier": "3.5.3",
@@ -135,7 +135,7 @@
     "storybook": "8.6.12",
     "style-loader": "4.0.0",
     "tailwindcss": "3.4.17",
-    "ts-jest": "29.2.2",
+    "ts-jest": "29.3.4",
     "ts-loader": "9.5.2",
     "tsconfig-paths-webpack-plugin": "4.2.0",
     "type-fest": "2.19.0",
@@ -147,27 +147,31 @@
     "wait-on": "8.0.3",
     "webpack": "5.99.7",
     "webpack-cli": "6.0.1",
-    "webpack-dev-server": "5.2.0",
+    "webpack-dev-server": "5.2.1",
     "webpack-node-externals": "3.0.0"
   },
   "dependencies": {
-    "@angular/animations": "18.2.13",
-    "@angular/cdk": "18.2.14",
-    "@angular/common": "18.2.13",
-    "@angular/compiler": "18.2.13",
-    "@angular/core": "18.2.13",
-    "@angular/forms": "18.2.13",
-    "@angular/platform-browser": "18.2.13",
-    "@angular/platform-browser-dynamic": "18.2.13",
-    "@angular/router": "18.2.13",
-    "@bitwarden/sdk-internal": "0.2.0-main.177",
+    "@angular/animations": "19.2.14",
+    "@angular/cdk": "19.2.18",
+    "@angular/common": "19.2.14",
+    "@angular/compiler": "19.2.14",
+    "@angular/core": "19.2.14",
+    "@angular/forms": "19.2.14",
+    "@angular/platform-browser": "19.2.14",
+    "@angular/platform-browser-dynamic": "19.2.14",
+    "@angular/router": "19.2.14",
+    "@bitwarden/sdk-internal": "0.2.0-main.225",
     "@electron/fuses": "1.8.0",
     "@emotion/css": "11.13.5",
-    "@koa/multer": "3.1.0",
+    "@koa/multer": "4.0.0",
     "@koa/router": "13.1.0",
     "@microsoft/signalr": "8.0.7",
     "@microsoft/signalr-protocol-msgpack": "8.0.7",
-    "@ng-select/ng-select": "13.9.1",
+    "@ng-select/ng-select": "14.9.0",
+    "@nx/devkit": "21.1.2",
+    "@nx/eslint": "21.1.2",
+    "@nx/jest": "21.1.2",
+    "@nx/js": "21.1.2",
     "argon2": "0.41.1",
     "argon2-browser": "1.18.0",
     "big-integer": "1.6.52",
@@ -178,7 +182,7 @@
     "chalk": "4.1.2",
     "commander": "11.1.0",
     "core-js": "3.42.0",
-    "form-data": "4.0.1",
+    "form-data": "4.0.2",
     "https-proxy-agent": "7.0.6",
     "inquirer": "8.2.6",
     "jsdom": "26.1.0",
@@ -194,17 +198,19 @@
     "node-fetch": "2.6.12",
     "node-forge": "1.3.1",
     "oidc-client-ts": "2.4.1",
-    "open": "8.4.2",
+    "open": "10.1.2",
     "papaparse": "5.5.3",
     "patch-package": "8.0.0",
     "proper-lockfile": "4.1.2",
     "qrcode-parser": "2.1.3",
     "qrious": "4.0.2",
     "rxjs": "7.8.1",
+    "semver": "7.7.2",
     "tabbable": "6.2.0",
     "tldts": "7.0.1",
+    "ts-node": "10.9.2",
     "utf-8-validate": "6.0.5",
-    "zone.js": "0.14.10",
+    "zone.js": "0.15.1",
     "zxcvbn": "4.4.2"
   },
   "overrides": {
@@ -215,21 +221,17 @@
       "eslint": "$eslint"
     },
     "tailwindcss": "$tailwindcss",
-    "@storybook/angular": {
-      "zone.js": "$zone.js"
-    },
     "parse5": "7.2.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "@types/react": "18.3.20",
-    "replacestream": "4.0.3"
+    "@types/react": "18.3.20"
   },
   "lint-staged": {
     "*": "prettier --cache --ignore-unknown --write",
     "*.ts": "eslint --cache --cache-strategy content --fix"
   },
   "engines": {
-    "node": "~20",
+    "node": "~22",
     "npm": "~10"
   }
 }
diff --git a/scripts/test-types.js b/scripts/test-types.js
index 9534558af30..f71f236c607 100644
--- a/scripts/test-types.js
+++ b/scripts/test-types.js
@@ -19,7 +19,7 @@ function getFiles(dir) {
 const files = getFiles(path.join(__dirname, "..", "libs"))
   .filter((file) => {
     const name = path.basename(file);
-    return name === "tsconfig.spec.json";
+    return name === "tsconfig.json";
   })
   .filter((path) => {
     // Exclude shared since it's not actually a library
diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json
index 18ce94164c9..c346fdde300 100644
--- a/scripts/tsconfig.json
+++ b/scripts/tsconfig.json
@@ -1,7 +1,6 @@
 {
-  "extends": "../libs/shared/tsconfig",
+  "extends": "../tsconfig.base",
   "compilerOptions": {
-    "strict": true,
     "outDir": "dist",
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
diff --git a/tsconfig.base.json b/tsconfig.base.json
new file mode 100644
index 00000000000..c462ab97d37
--- /dev/null
+++ b/tsconfig.base.json
@@ -0,0 +1,63 @@
+{
+  "compilerOptions": {
+    "strict": false,
+    "pretty": true,
+    "moduleResolution": "node",
+    "noImplicitAny": true,
+    "target": "ES2016",
+    "module": "ES2020",
+    "lib": ["es5", "es6", "es7", "dom", "ES2021", "ESNext.Disposable"],
+    "allowSyntheticDefaultImports": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "declaration": false,
+    "outDir": "dist",
+    "baseUrl": ".",
+    "resolveJsonModule": true,
+    "allowJs": true,
+    "sourceMap": true,
+    "skipLibCheck": true,
+    "paths": {
+      "@bitwarden/admin-console/common": ["./libs/admin-console/src/common"],
+      "@bitwarden/angular/*": ["./libs/angular/src/*"],
+      "@bitwarden/auth/angular": ["./libs/auth/src/angular"],
+      "@bitwarden/auth/common": ["./libs/auth/src/common"],
+      "@bitwarden/billing": ["./libs/billing/src"],
+      "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"],
+      "@bitwarden/cli/*": ["./apps/cli/src/*"],
+      "@bitwarden/common/*": ["./libs/common/src/*"],
+      "@bitwarden/components": ["./libs/components/src"],
+      "@bitwarden/dirt-card": ["./libs/dirt/card/src"],
+      "@bitwarden/generator-components": ["./libs/tools/generator/components/src"],
+      "@bitwarden/generator-core": ["./libs/tools/generator/core/src"],
+      "@bitwarden/generator-history": ["./libs/tools/generator/extensions/history/src"],
+      "@bitwarden/generator-legacy": ["./libs/tools/generator/extensions/legacy/src"],
+      "@bitwarden/generator-navigation": ["./libs/tools/generator/extensions/navigation/src"],
+      "@bitwarden/importer-core": ["./libs/importer/src"],
+      "@bitwarden/importer-ui": ["./libs/importer/src/components"],
+      "@bitwarden/key-management": ["./libs/key-management/src"],
+      "@bitwarden/key-management-ui": ["./libs/key-management-ui/src"],
+      "@bitwarden/logging": ["libs/logging/src"],
+      "@bitwarden/node/*": ["./libs/node/src/*"],
+      "@bitwarden/nx-plugin": ["libs/nx-plugin/src/index.ts"],
+      "@bitwarden/platform": ["./libs/platform/src"],
+      "@bitwarden/platform/*": ["./libs/platform/src/*"],
+      "@bitwarden/send-ui": ["./libs/tools/send/send-ui/src"],
+      "@bitwarden/storage-core": ["libs/storage-core/src/index.ts"],
+      "@bitwarden/storage-test-utils": ["libs/storage-test-utils/src/index.ts"],
+      "@bitwarden/ui-common": ["./libs/ui/common/src"],
+      "@bitwarden/ui-common/setup-jest": ["./libs/ui/common/src/setup-jest"],
+      "@bitwarden/user-core": ["libs/user-core/src/index.ts"],
+      "@bitwarden/vault": ["./libs/vault/src"],
+      "@bitwarden/vault-export-core": ["./libs/tools/export/vault-export/vault-export-core/src"],
+      "@bitwarden/vault-export-ui": ["./libs/tools/export/vault-export/vault-export-ui/src"],
+      "@bitwarden/web-vault/*": ["./apps/web/src/*"]
+    },
+    "plugins": [
+      {
+        "name": "typescript-strict-plugin"
+      }
+    ],
+    "useDefineForClassFields": false
+  }
+}
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index e8c3f669c0c..34ee7e719c1 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -1,51 +1,10 @@
 {
-  "compilerOptions": {
-    "pretty": true,
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "target": "ES6",
-    "module": "commonjs",
-    "lib": ["es5", "es6", "es7", "dom"],
-    "sourceMap": true,
-    "declaration": true,
-    "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "declarationDir": "dist/types",
-    "outDir": "dist",
-    "baseUrl": ".",
-    "allowJs": true,
-    "paths": {
-      "@bitwarden/admin-console": ["./libs/admin-console/src"],
-      "@bitwarden/angular/*": ["./libs/angular/src/*"],
-      "@bitwarden/auth": ["./libs/auth/src"],
-      "@bitwarden/billing": ["./libs/billing/src"],
-      "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"],
-      "@bitwarden/common/*": ["./libs/common/src/*"],
-      "@bitwarden/components": ["./libs/components/src"],
-      "@bitwarden/generator-components": ["./libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["./libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["./libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["./libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["./libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer-core": ["./libs/importer/src"],
-      "@bitwarden/importer-ui": ["./libs/importer/src/components"],
-      "@bitwarden/key-management": ["./libs/key-management/src"],
-      "@bitwarden/key-management-ui": ["./libs/key-management-ui/src/index,ts"],
-      "@bitwarden/node/*": ["./libs/node/src/*"],
-      "@bitwarden/platform": ["./libs/platform/src"],
-      "@bitwarden/send-ui": [".libs/tools/send/send-ui/src"],
-      "@bitwarden/tools-card": [".libs/tools/card/src"],
-      "@bitwarden/ui-common": ["./libs/ui/common/src"],
-      "@bitwarden/vault-export-core": [".libs/tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault-export-ui": [".libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["./libs/vault/src"]
-    }
-  },
+  "extends": "./tsconfig.base",
   "files": [
     ".storybook/main.ts",
     ".storybook/manager.js",
     ".storybook/test-runner.ts",
+    ".storybook/format-args-for-code-snippet.ts",
     "apps/browser/src/autofill/content/components/.lit-storybook/main.ts"
   ],
   "include": ["apps/**/*", "libs/**/*", "bitwarden_license/**/*", "scripts/**/*"],
diff --git a/tsconfig.json b/tsconfig.json
index c82851d50c8..35200efa430 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,63 +1,11 @@
 {
-  "compilerOptions": {
-    "strict": false,
-    "pretty": true,
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "target": "ES2016",
-    "module": "ES2020",
-    "lib": ["es5", "es6", "es7", "dom", "ES2021", "ESNext.Disposable"],
-    "sourceMap": true,
-    "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "declaration": false,
-    "outDir": "dist",
-    "baseUrl": ".",
-    "resolveJsonModule": true,
-    "paths": {
-      "@bitwarden/admin-console/common": ["./libs/admin-console/src/common"],
-      "@bitwarden/angular/*": ["./libs/angular/src/*"],
-      "@bitwarden/auth/angular": ["./libs/auth/src/angular"],
-      "@bitwarden/auth/common": ["./libs/auth/src/common"],
-      "@bitwarden/billing": ["./libs/billing/src"],
-      "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"],
-      "@bitwarden/common/*": ["./libs/common/src/*"],
-      "@bitwarden/components": ["./libs/components/src"],
-      "@bitwarden/generator-components": ["./libs/tools/generator/components/src"],
-      "@bitwarden/generator-core": ["./libs/tools/generator/core/src"],
-      "@bitwarden/generator-history": ["./libs/tools/generator/extensions/history/src"],
-      "@bitwarden/generator-legacy": ["./libs/tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["./libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/importer-core": ["./libs/importer/src"],
-      "@bitwarden/importer-ui": ["./libs/importer/src/components"],
-      "@bitwarden/key-management": ["./libs/key-management/src"],
-      "@bitwarden/key-management-ui": ["./libs/key-management-ui/src"],
-      "@bitwarden/node/*": ["./libs/node/src/*"],
-      "@bitwarden/platform": ["./libs/platform/src"],
-      "@bitwarden/platform/*": ["./libs/platform/src/*"],
-      "@bitwarden/send-ui": ["./libs/tools/send/send-ui/src"],
-      "@bitwarden/tools-card": ["./libs/tools/card/src"],
-      "@bitwarden/ui-common": ["./libs/ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["./libs/ui/common/src/setup-jest"],
-      "@bitwarden/vault-export-core": ["./libs/tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault-export-ui": ["./libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["./libs/vault/src"],
-      "@bitwarden/web-vault/*": ["./apps/web/src/*"]
-    },
-    "plugins": [
-      {
-        "name": "typescript-strict-plugin"
-      }
-    ],
-    "useDefineForClassFields": false
-  },
+  "extends": "./tsconfig.base.json",
   "include": [
     "apps/web/src/**/*",
     "apps/browser/src/**/*",
     "libs/*/src/**/*",
     "libs/tools/send/**/src/**/*",
-    "libs/tools/card/src/**/*",
+    "libs/dirt/card/src/**/*",
     "bitwarden_license/bit-web/src/**/*",
     "bitwarden_license/bit-common/src/**/*"
   ],